29 files changed, 97357 insertions, 94506 deletions

diff --git a/translations/subsurface_bg_BG.ts b/translations/subsurface_bg_BG.ts
index a110d8f9b..00fb50f53 100644
--- a/translations/subsurface_bg_BG.ts
+++ b/translations/subsurface_bg_BG.ts
@@ -5,18 +5,19 @@
         <location filename="../mobile-widgets/qml/About.qml" line="10"/>
         <location filename="../mobile-widgets/qml/About.qml" line="19"/>
         <source>About Subsurface-mobile</source>
-        <translation type="unfinished"/>
+        <translation>За Subsurface-mobile</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/About.qml" line="36"/>
         <source>A mobile version of the free Subsurface divelog software.
 </source>
-        <translation type="unfinished"/>
+        <translation>Мобилна версия на гмуркаческия софтуер Subsurface.
+</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/About.qml" line="37"/>
         <source>View your dive logs while on the go.</source>
-        <translation type="unfinished"/>
+        <translation>Разглеждайте гмурканията си докато сте на път.</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/About.qml" line="48"/>
@@ -24,7 +25,10 @@
 
 © Subsurface developer team
 2011-2016</source>
-        <translation type="unfinished"/>
+        <translation>Версия: %1
+
+© Subsurface екипа
+2011-2016</translation>
     </message>
 </context>
 <context>
@@ -105,6 +109,11 @@
         <translation>Име:</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="56"/>
+        <source>Could not initialize Winsock version 2.2</source>
+        <translation>Winsock версия 2.2 не може да бъде стартиран.</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="134"/>
         <source>Trying to turn on the local Bluetooth device...</source>
         <translation>Опит за включване нa Bluetooth устройство...</translation>
@@ -115,6 +124,11 @@
         <translation>Опит за изключване нa Bluetooth устройство...</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="167"/>
+        <source>Remote devices list was cleared.</source>
+        <translation>Списъка на дистанционни устройства бе изчиствен.</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="183"/>
         <source>Scanning for remote devices...</source>
         <translation>Сканиране на дистанционни устройства...</translation>
@@ -125,6 +139,22 @@
         <translation>Скиранирането приключи успешно.</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="208"/>
+        <source>The local Bluetooth device was %1.</source>
+        <extracomment>%1 will be replaced with &quot;turned on&quot; or &quot;turned off&quot;</extracomment>
+        <translation>Локалното Bluetooth устройство бе %1.</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
+        <source>turned on</source>
+        <translation>включено</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
+        <source>turned off</source>
+        <translation>изключено</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="225"/>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="339"/>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="359"/>
@@ -172,37 +202,6 @@
         <translation>Чифт</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="352"/>
-        <source>Device %1 was paired and is authorized.</source>
-        <translation>Устроството %1 бе чифтосано и оторизирано.</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="56"/>
-        <source>Could not initialize Winsock version 2.2</source>
-        <translation>Winsock версия 2.2 не може да бъде стартиран.</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="167"/>
-        <source>Remote devices list was cleared.</source>
-        <translation>Списъка на дистанционни устройства бе изчиствен.</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="208"/>
-        <source>The local Bluetooth device was %1.</source>
-        <extracomment>%1 will be replaced with &quot;turned on&quot; or &quot;turned off&quot;</extracomment>
-        <translation>Локалното Bluetooth устройство бе %1.</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
-        <source>turned on</source>
-        <translation>включено</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
-        <source>turned off</source>
-        <translation>изключено</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="307"/>
         <source>Remove pairing</source>
         <translation>Дистанционно чифтосване</translation>
@@ -228,6 +227,11 @@
         <translation>Устройство %1 бе чифтосано.</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="352"/>
+        <source>Device %1 was paired and is authorized.</source>
+        <translation>Устроството %1 бе чифтосано и оторизирано.</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="378"/>
         <source>The device %1 can now be used for connection. You can press the Save button.</source>
         <translation>Устройството %1 може да бъде използвано за връзка. Може да натиснете бутона Запиши.</translation>
@@ -286,12 +290,12 @@
 <context>
     <name>BuddyFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="621"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="619"/>
         <source>Person: </source>
         <translation>Лице:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="622"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="620"/>
         <source>Searches for buddies and divemasters</source>
         <translation>Търсене за партньори и водачи</translation>
     </message>
@@ -299,7 +303,7 @@
 <context>
     <name>BuddyFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="243"/>
+        <location filename="../qt-models/filtermodels.cpp" line="248"/>
         <source>No buddies</source>
         <translation>Няма партньори</translation>
     </message>
@@ -307,23 +311,28 @@
 <context>
     <name>CloudCredentials</name>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="49"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="50"/>
         <source>Cloud credentials</source>
-        <translation type="unfinished"/>
+        <translation>Облакови пълномощия</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="55"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="56"/>
         <source>Email</source>
-        <translation type="unfinished"/>
+        <translation>Е-мейл</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="67"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="68"/>
         <source>Password</source>
         <translation>Парола</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="90"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="92"/>
         <source>Show password</source>
+        <translation>Покажи парола</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="97"/>
+        <source>PIN</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -381,6 +390,16 @@
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
+        <source>Max. depth</source>
+        <translation>Макс. дълбочина</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
+        <source>Avg. depth</source>
+        <translation>Средна дълбочина</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
         <source>Divemaster</source>
         <translation>Водач</translation>
     </message>
@@ -391,6 +410,11 @@
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
+        <source>Suit</source>
+        <translation>Водолазен костюм</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
         <source>Notes</source>
         <translation>Бележки</translation>
     </message>
@@ -410,21 +434,6 @@
         <translation>Темп. на водата</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
-        <source>Max. depth</source>
-        <translation>Макс. дълбочина</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
-        <source>Avg. depth</source>
-        <translation>Средна дълбочина</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
-        <source>Suit</source>
-        <translation>Водолазен костюм</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="44"/>
         <source>O₂</source>
         <translation>O₂</translation>
@@ -538,7 +547,7 @@
         <translation>Не може да бъде създаден libdivecomputer контекст</translation>
     </message>
     <message>
-        <location filename="../core/configuredivecomputer.cpp" line="660"/>
+        <location filename="../core/configuredivecomputer.cpp" line="656"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation>Не може да се осъществи връзка с леководолазния компютър.</translation>
     </message>
@@ -558,11 +567,19 @@
         <translation>Устройсто или входна точка</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="170"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1520"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1533"/>
-        <source>...</source>
-        <translation>...</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="47"/>
+        <source>Connect via Bluetooth</source>
+        <translation>Вържи се чрез Bluetooth</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="54"/>
+        <source>Connect</source>
+        <translation>Вържи</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="64"/>
+        <source>Disconnect</source>
+        <translation>Изключи</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="80"/>
@@ -571,12 +588,24 @@
         <translation>Изтегли детайли</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="90"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1523"/>
+        <source>Read settings from backup file or from device before writing to the device</source>
+        <translation>Прочети настройки от бекъп файл или от устройството преди запис</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="93"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1525"/>
         <source>Save changes to device</source>
         <translation>Запиши промени на устройство</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="116"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1527"/>
+        <source>Read settings from backup file or from device before writing to a backup file</source>
+        <translation>Прочети настройки от бекъп файл или от устройството преди запис на бекъп файл</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="119"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1529"/>
         <source>Backup</source>
@@ -595,15 +624,40 @@
         <translation>Обнови фърмуер</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="163"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1532"/>
+        <source>Save libdivecomputer logfile</source>
+        <translation>Запиши libdivecomputer регистър файл</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="170"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1520"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1533"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="177"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1534"/>
         <source>Cancel</source>
         <translation>Отмяна</translation>
     </message>
     <message>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1539"/>
-        <source>OSTC 3</source>
-        <translation>OSTC 3</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="214"/>
+        <source>OSTC 3,Sport,Cr,2</source>
+        <translation>OSTC 3,Sport,Cr,2</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="223"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1541"/>
+        <source>Suunto Vyper family</source>
+        <translation>Suunto Vyper Family</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="232"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1543"/>
+        <source>OSTC, Mk.2/2N/2C</source>
+        <translation>OSTC, Mk.2/2N/2C</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="253"/>
@@ -616,40 +670,56 @@
         <translation>Общи настройки</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="326"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1656"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1943"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1546"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1726"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1766"/>
-        <source>Serial No.</source>
-        <translation>Сериен номер</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="260"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1575"/>
+        <source>Eco</source>
+        <translation>Еко</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="349"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1679"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1980"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1547"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1727"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1767"/>
-        <source>Firmware version</source>
-        <translation>Фърмуер версия</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="265"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1576"/>
+        <source>Medium</source>
+        <translation>Средно</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="538"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1713"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1990"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1548"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1729"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1768"/>
-        <source>Custom text</source>
-        <translation>Потребителски текс</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="270"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1577"/>
+        <source>High</source>
+        <translation>Високо</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="385"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1549"/>
-        <source>Language</source>
-        <translation>Език</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="278"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="826"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="849"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="875"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="927"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="993"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1019"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1101"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1117"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1450"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2278"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2382"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2408"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2434"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2474"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2497"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1586"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1621"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1623"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1625"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1628"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1637"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1638"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1710"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1785"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1789"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1801"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1803"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1806"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1807"/>
+        <source>%</source>
+        <translation>%</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="289"/>
@@ -676,44 +746,36 @@
         <translation>Италиански</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="579"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1557"/>
-        <source>Dive mode</source>
-        <translation>Режим на гмуркане</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="556"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1560"/>
-        <source>OC</source>
-        <translation>OC</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="561"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1561"/>
-        <source>CC</source>
-        <translation>CC</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="313"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1582"/>
+        <source>m/°C</source>
+        <translation>м/°C</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="566"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2336"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1562"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1793"/>
-        <source>Gauge</source>
-        <translation>Калибър</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="318"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1583"/>
+        <source>ft/°F</source>
+        <translation>фута/°F</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="571"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1563"/>
-        <source>Apnea</source>
-        <translation>Апнеа</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="326"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1656"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1943"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1546"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1726"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1766"/>
+        <source>Serial No.</source>
+        <translation>Сериен номер</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="395"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2063"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1565"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1780"/>
-        <source>Date format</source>
-        <translation>Формат на датата</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="349"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1679"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1980"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1547"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1727"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1767"/>
+        <source>Firmware version</source>
+        <translation>Фърмуер версия</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="360"/>
@@ -734,108 +796,147 @@
         <translation>ГГММДД</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1042"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2457"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1639"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1805"/>
-        <source>Saturation</source>
-        <translation>Сатурация</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="385"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1549"/>
+        <source>Language</source>
+        <translation>Език</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="278"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="826"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="849"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="875"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="927"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="993"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1019"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1101"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1117"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1450"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2278"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2382"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2408"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2434"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2474"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2497"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1586"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1621"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1623"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1625"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1628"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1637"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1638"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1710"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1785"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1789"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1801"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1803"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1806"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1807"/>
-        <source>%</source>
-        <translation>%</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="395"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2063"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1565"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1780"/>
+        <source>Date format</source>
+        <translation>Формат на датата</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="865"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2261"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1624"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1784"/>
-        <source>Desaturation</source>
-        <translation>Десатурация</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="405"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1572"/>
+        <source>Brightness</source>
+        <translation>Яркост</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="983"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2398"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1636"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1800"/>
-        <source>Last deco</source>
-        <translation>Последна декомпресия</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="415"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1850"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1579"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1753"/>
+        <source>Units</source>
+        <translation>Единици</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="711"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="736"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="758"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="904"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2181"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2206"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2228"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2307"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1626"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1786"/>
-        <source> m</source>
-        <translation>м</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="425"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1585"/>
+        <source>Salinity (0-5%)</source>
+        <translation>Соленост (0-5%)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="405"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1572"/>
-        <source>Brightness</source>
-        <translation>Яркост</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="438"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1615"/>
+        <source>Reset device to default settings</source>
+        <translation>Рестартирай настройки по подразбиране</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="260"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1575"/>
-        <source>Eco</source>
-        <translation>Еко</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="452"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1590"/>
+        <source>230LSB/Gauss</source>
+        <translation>230LSB/Gauss</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="265"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1576"/>
-        <source>Medium</source>
-        <translation>Средно</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="457"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1591"/>
+        <source>330LSB/Gauss</source>
+        <translation>330LSB/Gauss</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="270"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1577"/>
-        <source>High</source>
-        <translation>Високо</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="462"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1592"/>
+        <source>390LSB/Gauss</source>
+        <translation>390LSB/Gauss</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="603"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2034"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1599"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1779"/>
-        <source>Sampling rate</source>
-        <translation>Честота</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="467"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1593"/>
+        <source>440LSB/Gauss</source>
+        <translation>440LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="472"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1594"/>
+        <source>660LSB/Gauss</source>
+        <translation>660LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="477"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1595"/>
+        <source>820LSB/Gauss</source>
+        <translation>820LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="482"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1596"/>
+        <source>1090LSB/Gauss</source>
+        <translation>1090LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="487"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1597"/>
+        <source>1370LSB/Gauss</source>
+        <translation>1370LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="521"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1587"/>
+        <source>Compass gain</source>
+        <translation>Компас настройка</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="531"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1799"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1745"/>
+        <source>Computer model</source>
+        <translation>Модел на комютъра</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="538"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1713"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1990"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1548"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1729"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1768"/>
+        <source>Custom text</source>
+        <translation>Потребителски текс</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="556"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1560"/>
+        <source>OC</source>
+        <translation>OC</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="561"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1561"/>
+        <source>CC</source>
+        <translation>CC</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="566"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2336"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1562"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1793"/>
+        <source>Gauge</source>
+        <translation>Калибър</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="571"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1563"/>
+        <source>Apnea</source>
+        <translation>Апнеа</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="579"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1557"/>
+        <source>Dive mode</source>
+        <translation>Режим на гмуркане</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="590"/>
@@ -852,30 +953,12 @@
         <translation>10сек.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="415"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1850"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1579"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1753"/>
-        <source>Units</source>
-        <translation>Единици</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="313"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1582"/>
-        <source>m/°C</source>
-        <translation>м/°C</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="318"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1583"/>
-        <source>ft/°F</source>
-        <translation>фута/°F</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="644"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1605"/>
-        <source>Dive mode color</source>
-        <translation>Цветови режим</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="603"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2034"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1599"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1779"/>
+        <source>Sampling rate</source>
+        <translation>Честота</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="614"/>
@@ -902,12 +985,6 @@
         <translation>Син</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="425"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1585"/>
-        <source>Salinity (0-5%)</source>
-        <translation>Соленост (0-5%)</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="637"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2092"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1613"/>
@@ -916,90 +993,80 @@
         <translation>Синхронизирай времето на Г.К. с PC</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="521"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1587"/>
-        <source>Compass gain</source>
-        <translation>Компас настройка</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="90"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1523"/>
-        <source>Read settings from backup file or from device before writing to the device</source>
-        <translation>Прочети настройки от бекъп файл или от устройството преди запис</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="116"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1527"/>
-        <source>Read settings from backup file or from device before writing to a backup file</source>
-        <translation>Прочети настройки от бекъп файл или от устройството преди запис на бекъп файл</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="232"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1543"/>
-        <source>OSTC, Mk.2/2N/2C</source>
-        <translation>OSTC, Mk.2/2N/2C</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="644"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1605"/>
+        <source>Dive mode color</source>
+        <translation>Цветови режим</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="452"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1590"/>
-        <source>230LSB/Gauss</source>
-        <translation>230LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="654"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2020"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1614"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1771"/>
+        <source>Show safety stop</source>
+        <translation>Покажи безопасен стоп</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="457"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1591"/>
-        <source>330LSB/Gauss</source>
-        <translation>330LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="661"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2145"/>
+        <source>End Depth</source>
+        <translation>Крайна дълбочина</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="462"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1592"/>
-        <source>390LSB/Gauss</source>
-        <translation>390LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="671"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2162"/>
+        <source> s</source>
+        <translation>сек</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="467"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1593"/>
-        <source>440LSB/Gauss</source>
-        <translation>440LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="687"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1953"/>
+        <source>Length</source>
+        <translation>Дължина</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="472"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1594"/>
-        <source>660LSB/Gauss</source>
-        <translation>660LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="694"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2138"/>
+        <source>Start Depth</source>
+        <translation>Начална дълбочина</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="477"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1595"/>
-        <source>820LSB/Gauss</source>
-        <translation>820LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="701"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2152"/>
+        <source>Reset Depth</source>
+        <translation>Ресет дълбочина</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="482"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1596"/>
-        <source>1090LSB/Gauss</source>
-        <translation>1090LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="711"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="736"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="758"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="904"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2181"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2206"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2228"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2307"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1626"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1786"/>
+        <source> m</source>
+        <translation>м</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="487"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1597"/>
-        <source>1370LSB/Gauss</source>
-        <translation>1370LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="778"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2248"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1643"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1810"/>
+        <source>Advanced settings</source>
+        <translation>Разширени настройки</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="654"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2020"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1614"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1771"/>
-        <source>Show safety stop</source>
-        <translation>Покажи безопасен стоп</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="784"/>
+        <source>Left button sensitivity</source>
+        <translation>Чувствителност на левия бутон</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="438"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1615"/>
-        <source>Reset device to default settings</source>
-        <translation>Рестартирай настройки по подразбиране</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="791"/>
+        <source>Always show ppO2</source>
+        <translation>Винаги покажи ppO2</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="798"/>
@@ -1010,20 +1077,6 @@
         <translation>Alt GF може да бъде избран по водата</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="223"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1541"/>
-        <source>Suunto Vyper family</source>
-        <translation>Suunto Vyper Family</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="778"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2248"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1643"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1810"/>
-        <source>Advanced settings</source>
-        <translation>Разширени настройки</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="805"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2271"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1618"/>
@@ -1054,6 +1107,14 @@
         <translation>GFHigh</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="865"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2261"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1624"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1784"/>
+        <source>Desaturation</source>
+        <translation>Десатурация</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="917"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2320"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1627"/>
@@ -1068,14 +1129,6 @@
         <translation>м.бара</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="973"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2369"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1630"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1788"/>
-        <source> min</source>
-        <translation>мин</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="960"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2331"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1633"/>
@@ -1084,63 +1137,28 @@
         <translation>ZH-L16</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="47"/>
-        <source>Connect via Bluetooth</source>
-        <translation>Вържи се чрез Bluetooth</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="163"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1532"/>
-        <source>Save libdivecomputer logfile</source>
-        <translation>Запиши libdivecomputer регистър файл</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="661"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2145"/>
-        <source>End Depth</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="671"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2162"/>
-        <source> s</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="687"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1953"/>
-        <source>Length</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="694"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2138"/>
-        <source>Start Depth</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="701"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2152"/>
-        <source>Reset Depth</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="784"/>
-        <source>Left button sensitivity</source>
-        <translation>Чувствителност на левия бутон</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="791"/>
-        <source>Always show ppO2</source>
-        <translation>Винаги покажи ppO2</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="965"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1634"/>
         <source>ZH-L16+GF</source>
         <translation>ZH-L16+GF</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="973"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2369"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1630"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1788"/>
+        <source> min</source>
+        <translation>мин</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="983"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2398"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1636"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1800"/>
+        <source>Last deco</source>
+        <translation>Последна декомпресия</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1009"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2424"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1640"/>
@@ -1157,6 +1175,14 @@
         <translation>Alt GFHigh</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1042"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2457"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1639"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1805"/>
+        <source>Saturation</source>
+        <translation>Сатурация</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1052"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1642"/>
         <source>Flip screen</source>
@@ -1168,12 +1194,22 @@
         <translation>Чувствителност на десния бутон</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1066"/>
+        <source>MOD warning</source>
+        <translation>MOD предупреждение</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1073"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2513"/>
         <source>Graphical speed indicator</source>
         <translation>Графичен индикатор на скоростта</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1080"/>
+        <source>Dynamic ascent rate</source>
+        <translation>Скорост на дънамично покачване</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1087"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2552"/>
         <source>Bottom gas consumption</source>
@@ -1186,14 +1222,22 @@
         <translation>Деко газ консумация</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1133"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1149"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2520"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2536"/>
+        <source> ℓ/min</source>
+        <translation>л/мин</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1165"/>
         <source>Temperature sensor offset</source>
-        <translation type="unfinished"/>
+        <translation>Отклонение на датчика за температура</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1172"/>
         <source>°C</source>
-        <translation type="unfinished"/>
+        <translation>°C</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1192"/>
@@ -1204,6 +1248,18 @@
         <translation>Газ настройки</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1235"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1320"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2610"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2695"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1645"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1668"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1812"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1835"/>
+        <source>%O₂</source>
+        <translation>%O₂</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1240"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1325"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2615"/>
@@ -1322,16 +1378,10 @@
         <translation>Dil 5</translation>
     </message>
     <message>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1691"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1858"/>
-        <source>Set point [cbar]</source>
-        <translation>Постави точка [сенти бар]</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1693"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1860"/>
-        <source>Change depth [m]</source>
-        <translation>Промени дълбочина [м]</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1405"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2770"/>
+        <source>Setpoint</source>
+        <translation>Сетпойнт</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1415"/>
@@ -1370,6 +1420,12 @@
         <translation>SP 5</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1443"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1709"/>
+        <source>O₂ in calibration gas</source>
+        <translation>O₂ в газ за настройка</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1467"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1713"/>
         <source>Fixed setpoint</source>
@@ -1400,101 +1456,6 @@
         <translation>сенти бара</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1748"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1733"/>
-        <source>P1 (medium)</source>
-        <extracomment>Suunto safety level</extracomment>
-        <translation>P1 (средно)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1753"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1734"/>
-        <source>P2 (high)</source>
-        <extracomment>Suunto safety level</extracomment>
-        <translation>P2 (високо)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1792"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1744"/>
-        <source>Total dive time</source>
-        <translation>Време на гмуркане</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2109"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1769"/>
-        <source>kg/ℓ</source>
-        <translation>кг/л</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2346"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1795"/>
-        <source>Apnoea</source>
-        <translation>Апнея</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1583"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1722"/>
-        <source>Safety level</source>
-        <translation>Ниво на сугурност</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="54"/>
-        <source>Connect</source>
-        <translation>Вържи</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="64"/>
-        <source>Disconnect</source>
-        <translation>Изключи</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="214"/>
-        <source>OSTC 3,Sport,Cr,2</source>
-        <translation>OSTC 3,Sport,Cr,2</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1066"/>
-        <source>MOD warning</source>
-        <translation>MOD предупреждение</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1080"/>
-        <source>Dynamic ascent rate</source>
-        <translation>Скорост на дънамично покачване</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1133"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1149"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2520"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2536"/>
-        <source> ℓ/min</source>
-        <translation>л/мин</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1235"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1320"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2610"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2695"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1645"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1668"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1812"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1835"/>
-        <source>%O₂</source>
-        <translation>%O₂</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1405"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2770"/>
-        <source>Setpoint</source>
-        <translation>Сетпойнт</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1443"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1709"/>
-        <source>O₂ in calibration gas</source>
-        <translation>O₂ в газ за настройка</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1535"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2843"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1719"/>
@@ -1511,6 +1472,12 @@
         <translation>pO₂ мин</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1583"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1722"/>
+        <source>Safety level</source>
+        <translation>Ниво на сугурност</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1609"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1723"/>
         <source>Altitude range</source>
@@ -1544,6 +1511,20 @@
         <translation>P0 (няма)</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1748"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1733"/>
+        <source>P1 (medium)</source>
+        <extracomment>Suunto safety level</extracomment>
+        <translation>P1 (средно)</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1753"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1734"/>
+        <source>P2 (high)</source>
+        <extracomment>Suunto safety level</extracomment>
+        <translation>P2 (високо)</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1761"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1736"/>
         <source>Sample rate</source>
@@ -1568,11 +1549,10 @@
         <translation>60сек</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="531"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1799"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1745"/>
-        <source>Computer model</source>
-        <translation>Модел на комютъра</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1792"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1744"/>
+        <source>Total dive time</source>
+        <translation>Време на гмуркане</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1816"/>
@@ -1637,12 +1617,6 @@
         <translation>Времева аларма</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2099"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1765"/>
-        <source>Salinity</source>
-        <translation>Соленост</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2074"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1774"/>
         <source>MM/DD/YY</source>
@@ -1661,12 +1635,30 @@
         <translation>ГГ/ММ/ДД</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2099"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1765"/>
+        <source>Salinity</source>
+        <translation>Соленост</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2109"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1769"/>
+        <source>kg/ℓ</source>
+        <translation>кг/л</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2341"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1794"/>
         <source>ZH-L16 CC</source>
         <translation>ZH-L16 CC</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2346"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1795"/>
+        <source>Apnoea</source>
+        <translation>Апнея</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2351"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1796"/>
         <source>L16-GF OC</source>
@@ -1685,87 +1677,112 @@
         <translation>PSCR-GF</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1108"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1129"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1539"/>
+        <source>OSTC 3</source>
+        <translation>OSTC 3</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1691"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1858"/>
+        <source>Set point [cbar]</source>
+        <translation>Постави точка [сенти бар]</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1693"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1860"/>
+        <source>Change depth [m]</source>
+        <translation>Промени дълбочина [м]</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1110"/>
+        <source>Backup dive computer settings</source>
+        <translation>Бекъп на настройки на гмуркачески компютър</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1111"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1132"/>
         <source>Backup files (*.xml)</source>
         <translation>Бекъп файлове (*.xml)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1113"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1115"/>
+        <source>XML backup error</source>
+        <translation>XML бекъп грешка</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1116"/>
         <source>An error occurred while saving the backup file.
 %1</source>
         <translation>Грешка при запис на бекъп файл.
 %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1116"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1119"/>
         <source>Backup succeeded</source>
         <translation>Бекъп успешен</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1117"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1120"/>
         <source>Your settings have been saved to: %1</source>
         <translation>Вашите настройки бяха записани в: %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1107"/>
-        <source>Backup dive computer settings</source>
-        <translation>Бекъп на настройки на гмуркачески компютър</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1112"/>
-        <source>XML backup error</source>
-        <translation>XML бекъп грешка</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1128"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1131"/>
         <source>Restore dive computer settings</source>
         <translation>Върни настройки на гмуркачески компютър</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1134"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1137"/>
         <source>XML restore error</source>
         <translation>Грешка при XML връщане</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1135"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1138"/>
         <source>An error occurred while restoring the backup file.
 %1</source>
         <translation>Настъпи грешка докато се връщаше бекъп файла.
 %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1139"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1142"/>
         <source>Restore succeeded</source>
         <translation>Връщане успешно</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1140"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1143"/>
         <source>Your settings have been restored successfully.</source>
         <translation>Вашите настройки бяха върнати успешно.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1150"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1153"/>
         <source>Select firmware file</source>
         <translation>Изберете фърмуер файл</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1151"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1154"/>
         <source>All files (*.*)</source>
         <translation>Всички файлове (*.*)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1207"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1210"/>
         <source>Choose file for divecomputer download logfile</source>
         <translation>Изберете регистър файл при изтегляне</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1208"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1211"/>
         <source>Log files (*.log)</source>
         <translation>Регистър файлове (*.log)</translation>
     </message>
 </context>
 <context>
+    <name>ContextDrawer</name>
+    <message>
+        <location filename="../mobile-widgets/qml/kirigami/src/controls/ContextDrawer.qml" line="76"/>
+        <source>Actions</source>
+        <translation>Действия</translation>
+    </message>
+</context>
+<context>
     <name>CylindersModel</name>
     <message>
         <location filename="../qt-models/cylindermodel.cpp" line="16"/>
@@ -1779,11 +1796,6 @@
     </message>
     <message>
         <location filename="../qt-models/cylindermodel.cpp" line="16"/>
-        <source>He%</source>
-        <translation>He%</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="16"/>
         <source>Work press.</source>
         <translation>Работно налягане</translation>
     </message>
@@ -1803,9 +1815,24 @@
         <translation>O₂%</translation>
     </message>
     <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="16"/>
+        <source>He%</source>
+        <translation>He%</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
+        <source>Deco switch at</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../qt-models/cylindermodel.cpp" line="17"/>
-        <source>Switch at</source>
-        <translation>Превключи при</translation>
+        <source>Bot. MOD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
+        <source>MND</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-models/cylindermodel.cpp" line="17"/>
@@ -1823,17 +1850,32 @@
         <translation>ℓ</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="161"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="177"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation>Кликнете тук за да изтриете бутилка</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="383"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="180"/>
+        <source>Switch depth for deco gas. Calculated using Deco pO₂ preference, unless set manually.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="183"/>
+        <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to &apos;*&apos; for best O₂% for max depth.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="186"/>
+        <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to &apos;*&apos; for best He% for max depth.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="444"/>
         <source>Cylinder cannot be removed</source>
         <translation>Бутилката не може да бъде премахната</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="384"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="445"/>
         <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source>
         <translation>Този газ се използвза. Само бутилки, които не се използват в гмуркането могат да бъдат премахнати.</translation>
     </message>
@@ -1853,42 +1895,24 @@
         <translation>Кои компоненти бихте желали да копирате</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="73"/>
+        <location filename="../build/ui_divecomponentselection.h" line="141"/>
+        <source>Dive site</source>
+        <translation>Място за гмуркане</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="80"/>
         <location filename="../build/ui_divecomponentselection.h" line="142"/>
         <source>Suit</source>
         <translation>Водолазен костюм</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="122"/>
-        <location filename="../build/ui_divecomponentselection.h" line="148"/>
-        <source>Divemaster</source>
-        <translation>Водач</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="129"/>
-        <location filename="../build/ui_divecomponentselection.h" line="149"/>
-        <source>Buddy</source>
-        <translation>Партньор</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="136"/>
-        <location filename="../build/ui_divecomponentselection.h" line="150"/>
-        <source>Rating</source>
-        <translation>Оценка</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="87"/>
         <location filename="../build/ui_divecomponentselection.h" line="143"/>
         <source>Visibility</source>
         <translation>Видимост</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="73"/>
-        <location filename="../build/ui_divecomponentselection.h" line="141"/>
-        <source>Dive site</source>
-        <translation>Място за гмуркане</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="94"/>
         <location filename="../build/ui_divecomponentselection.h" line="144"/>
         <source>Notes</source>
@@ -1912,10 +1936,34 @@
         <source>Cylinders</source>
         <translation>Бутилки</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="122"/>
+        <location filename="../build/ui_divecomponentselection.h" line="148"/>
+        <source>Divemaster</source>
+        <translation>Водач</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="129"/>
+        <location filename="../build/ui_divecomponentselection.h" line="149"/>
+        <source>Buddy</source>
+        <translation>Партньор</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="136"/>
+        <location filename="../build/ui_divecomponentselection.h" line="150"/>
+        <source>Rating</source>
+        <translation>Оценка</translation>
+    </message>
 </context>
 <context>
     <name>DiveComputerManagementDialog</name>
     <message>
+        <location filename="../desktop-widgets/divecomputermanagementdialog.ui" line="17"/>
+        <location filename="../build/ui_divecomputermanagementdialog.h" line="65"/>
+        <source>Edit dive computer nicknames</source>
+        <translation>Редактирай прякори на гмуркачерски комютри</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divecomputermanagementdialog.cpp" line="49"/>
         <source>Remove the selected dive computer?</source>
         <translation>Изтриване на леководолазен компютър?</translation>
@@ -1927,12 +1975,6 @@
         <translation>Сигурни ли се, че искате да изтриете
 избрания леководолазен компютър?</translation>
     </message>
-    <message>
-        <location filename="../desktop-widgets/divecomputermanagementdialog.ui" line="17"/>
-        <location filename="../build/ui_divecomputermanagementdialog.h" line="65"/>
-        <source>Edit dive computer nicknames</source>
-        <translation>Редактирай прякори на гмуркачерски комютри</translation>
-    </message>
 </context>
 <context>
     <name>DiveComputerModel</name>
@@ -1960,106 +2002,112 @@
 <context>
     <name>DiveDetails</name>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="33"/>
+        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="38"/>
         <source>Dive details</source>
-        <translation type="unfinished"/>
+        <translation>Данни за гмуркане</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="67"/>
+        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="72"/>
         <source>Delete dive</source>
         <translation>Изтрий гмуркане</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="84"/>
+        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="89"/>
         <source>Show on map</source>
-        <translation type="unfinished"/>
+        <translation>Покажи на карта</translation>
     </message>
 </context>
 <context>
     <name>DiveDetailsEdit</name>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="74"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="80"/>
         <source>Dive %1</source>
-        <translation type="unfinished"/>
+        <translation>Гмуркане %1</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="78"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="84"/>
         <source>Date:</source>
         <translation>Дата:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="86"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="92"/>
         <source>Location:</source>
         <translation>Местонахождение:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="95"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="101"/>
         <source>Coordinates:</source>
-        <translation type="unfinished"/>
+        <translation>Координати:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="104"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="110"/>
         <source>Use current
 GPS location:</source>
-        <translation type="unfinished"/>
+        <translation>Използвай текуща
+GPS позиция:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="118"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="124"/>
         <source>Depth:</source>
         <translation>Дълбочина:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="127"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="133"/>
         <source>Duration:</source>
         <translation>Продължителност:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="137"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="143"/>
         <source>Air Temp:</source>
         <translation>Темп. на въздух:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="146"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="152"/>
         <source>Water Temp:</source>
         <translation>Темп. на водата:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="155"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="161"/>
         <source>Suit:</source>
         <translation>Водолазен костюм:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="164"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="176"/>
         <source>Buddy:</source>
         <translation>Партньор:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="173"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="191"/>
         <source>Dive Master:</source>
-        <translation type="unfinished"/>
+        <translation>Водач:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="182"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="206"/>
         <source>Weight:</source>
         <translation>Тегло:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="192"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="216"/>
+        <source>Cylinder:</source>
+        <translation>Бутилка:</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="231"/>
         <source>Gas mix:</source>
-        <translation type="unfinished"/>
+        <translation>Газ микс:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="203"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="241"/>
         <source>Start Pressure:</source>
-        <translation type="unfinished"/>
+        <translation>Начално налягане:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="213"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="250"/>
         <source>End Pressure:</source>
-        <translation type="unfinished"/>
+        <translation>Крайно налягане:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="224"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="260"/>
         <source>Notes:</source>
         <translation>Бележки:</translation>
     </message>
@@ -2069,27 +2117,27 @@ GPS location:</source>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="63"/>
         <source>Date: </source>
-        <translation type="unfinished"/>
+        <translation>Дата:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="80"/>
         <source>Depth: </source>
-        <translation type="unfinished"/>
+        <translation>Дълбочина:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="89"/>
         <source>Duration: </source>
-        <translation type="unfinished"/>
+        <translation>Продължителност:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="121"/>
         <source>No profile to show</source>
-        <translation type="unfinished"/>
+        <translation>Няма профил за показ</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="139"/>
         <source>Dive Details</source>
-        <translation type="unfinished"/>
+        <translation>Данни за гмуркане</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="144"/>
@@ -2097,42 +2145,42 @@ GPS location:</source>
         <translation>Водолазен костюм:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="159"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="158"/>
         <source>Air Temp:</source>
         <translation>Темп. на въздух:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="175"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="172"/>
         <source>Cylinder:</source>
-        <translation type="unfinished"/>
+        <translation>Бутилка:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="189"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="185"/>
         <source>Water Temp:</source>
         <translation>Темп. на водата:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="205"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="198"/>
         <source>Dive Master:</source>
-        <translation type="unfinished"/>
+        <translation>Водач:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="220"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="211"/>
         <source>Weight:</source>
         <translation>Тегло:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="249"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="224"/>
         <source>Buddy:</source>
         <translation>Партньор:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="263"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="237"/>
         <source>SAC:</source>
         <translation>SAC:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="280"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="252"/>
         <source>Notes</source>
         <translation>Бележки</translation>
     </message>
@@ -2140,18 +2188,18 @@ GPS location:</source>
 <context>
     <name>DiveEventItem</name>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="134"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="165"/>
         <source>Manual switch to OC</source>
         <translation>Ръчно включване на OC</translation>
     </message>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="136"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="167"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation> начало</translation>
     </message>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="137"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="168"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation> край</translation>
@@ -2160,27 +2208,27 @@ GPS location:</source>
 <context>
     <name>DiveImportedModel</name>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="646"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="656"/>
         <source>Date/time</source>
         <translation>Дата/време</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="648"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="658"/>
         <source>Duration</source>
         <translation>Продълж. (мин.)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="650"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="660"/>
         <source>Depth</source>
         <translation>Дълбочина</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="672"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="682"/>
         <source>h:</source>
         <translation>ч:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="672"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="682"/>
         <source>min</source>
         <translation>мин</translation>
     </message>
@@ -2189,126 +2237,131 @@ GPS location:</source>
     <name>DiveList</name>
     <message>
         <location filename="../mobile-widgets/qml/DiveList.qml" line="12"/>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="226"/>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="232"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="227"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="233"/>
         <source>Dive list</source>
-        <translation type="unfinished"/>
+        <translation>Списък на гмуркания</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveList.qml" line="95"/>
         <source>Depth: </source>
-        <translation type="unfinished"/>
+        <translation>Дълбочина:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveList.qml" line="106"/>
         <source>Duration: </source>
-        <translation type="unfinished"/>
+        <translation>Продължителност:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="222"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="223"/>
         <source>Cloud credentials</source>
-        <translation type="unfinished"/>
+        <translation>Облакови пълномощия</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="228"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="229"/>
         <source>Please tap the &apos;+&apos; button to add a dive</source>
+        <translation>Моля натиснете бутона &apos;+&apos; за да добавите гмуркане</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="248"/>
+        <source>No dives in dive list</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DiveListView</name>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="846"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="849"/>
         <source>Expand all</source>
         <translation>Разшири всички</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="848"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="851"/>
         <source>Collapse all</source>
         <translation>Свиване на всички</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="852"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="855"/>
         <source>Collapse others</source>
         <translation>Свиване на други</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="856"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="859"/>
         <source>Remove dive(s) from trip</source>
         <translation>Изтрий гмуркане (гмуркания) от пътуване</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="857"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="860"/>
         <source>Create new trip above</source>
         <translation>Създай ново пътуване</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="871"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="874"/>
         <source>Add dive(s) to trip immediately above</source>
         <translation>Добави гмуркане (гмуркания) веднага над пътуване</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="873"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="876"/>
         <source>Add dive(s) to trip immediately below</source>
         <translation>Добави гмуркане(гмуркания) веднага под пътуване</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="877"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="880"/>
         <source>Merge trip with trip above</source>
         <translation>Слей пътуване с горно пътуване</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="878"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="881"/>
         <source>Merge trip with trip below</source>
         <translation>Слей пътуване с долно пътуване</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="882"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="885"/>
         <source>Delete dive(s)</source>
         <translation>Изтрий гмуркане (гмуркания)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="884"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="887"/>
         <source>Mark dive(s) invalid</source>
         <translation>Маркирай гмуркания (гмуркане) като невалидни</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="888"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="891"/>
         <source>Merge selected dives</source>
         <translation>Слей избраните гмуркания</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="890"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="893"/>
         <source>Renumber dive(s)</source>
         <translation>Преномерирай гмуркане (гмуркания)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="891"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="894"/>
         <source>Shift dive times</source>
         <translation>Измести времена на гмуркания</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="892"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="895"/>
         <source>Split selected dives</source>
         <translation>Рздели избраните гмуркания</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="893"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="896"/>
         <source>Load image(s) from file(s)</source>
         <translation>Зареди изображение(изображения) от файл(файлове).</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="894"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="897"/>
         <source>Load image(s) from web</source>
         <translation>Зареди изображение(изображения) от интернет</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="917"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="919"/>
         <source>Open image files</source>
         <translation>Отвори изображения</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="917"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="919"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>Изображения (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -2329,56 +2382,6 @@ GPS location:</source>
 <context>
     <name>DiveLogExportDialog</name>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="103"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="351"/>
-        <source>Export format</source>
-        <translation>Експорт формат</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="134"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="353"/>
-        <source>UDDF</source>
-        <translation>UDDF</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="187"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="358"/>
-        <source>Worldmap</source>
-        <translation>Световна карта</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="197"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="359"/>
-        <source>I&amp;mage depths</source>
-        <translation>&amp;Дълбочина на изображения</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="243"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="360"/>
-        <source>Selection</source>
-        <translation>Селекция</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="252"/>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="346"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="361"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="372"/>
-        <source>Selected dives</source>
-        <translation>Избрани гмуркания</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="262"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="362"/>
-        <source>All dives</source>
-        <translation>Всички гмуркания</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="306"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="396"/>
-        <source>HTML</source>
-        <translation>HTML</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="14"/>
         <location filename="../build/ui_divelogexportdialog.h" line="349"/>
         <source>Export dive log files</source>
@@ -2391,12 +2394,24 @@ GPS location:</source>
         <translation>Общ експорт</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="103"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="351"/>
+        <source>Export format</source>
+        <translation>Експорт формат</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="115"/>
         <location filename="../build/ui_divelogexportdialog.h" line="352"/>
         <source>Subsurface &amp;XML</source>
         <translation>Subsurface &amp;XML</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="134"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="353"/>
+        <source>UDDF</source>
+        <translation>UDDF</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="147"/>
         <location filename="../build/ui_divelogexportdialog.h" line="354"/>
         <source>di&amp;velogs.de</source>
@@ -2421,238 +2436,297 @@ GPS location:</source>
         <translation>CSV гмуркачески данни</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="275"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="187"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="358"/>
+        <source>Worldmap</source>
+        <translation>Световна карта</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="197"/>
+        <source>TeX</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="207"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="359"/>
+        <source>I&amp;mage depths</source>
+        <translation>&amp;Дълбочина на изображения</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="253"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="360"/>
+        <source>Selection</source>
+        <translation>Селекция</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="262"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="356"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="361"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="372"/>
+        <source>Selected dives</source>
+        <translation>Избрани гмуркания</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="272"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="362"/>
+        <source>All dives</source>
+        <translation>Всички гмуркания</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="285"/>
         <location filename="../build/ui_divelogexportdialog.h" line="363"/>
         <source>CSV units</source>
         <translation>CSV гмуркачески единици</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="288"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="298"/>
         <location filename="../build/ui_divelogexportdialog.h" line="366"/>
         <source>Metric</source>
         <translation>Метрична</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="293"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="303"/>
         <location filename="../build/ui_divelogexportdialog.h" line="367"/>
         <source>Imperial</source>
         <translation>Империална</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="324"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="316"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="396"/>
+        <source>HTML</source>
+        <translation>HTML</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="334"/>
         <location filename="../build/ui_divelogexportdialog.h" line="370"/>
         <source>General settings</source>
         <translation>Общи настройки</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="330"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="340"/>
         <location filename="../build/ui_divelogexportdialog.h" line="371"/>
         <source>Subsurface numbers</source>
         <translation>Subsurface числа</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="359"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="369"/>
         <location filename="../build/ui_divelogexportdialog.h" line="373"/>
         <source>Export yearly statistics</source>
         <translation>Изтегли годишни статистики</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="375"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="385"/>
         <location filename="../build/ui_divelogexportdialog.h" line="374"/>
         <source>All di&amp;ves</source>
         <translation>Всички гмуркания</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="385"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="395"/>
         <location filename="../build/ui_divelogexportdialog.h" line="375"/>
         <source>Export list only</source>
         <translation>Експортирай само списъка</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="392"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="402"/>
         <location filename="../build/ui_divelogexportdialog.h" line="376"/>
         <source>Export photos</source>
         <translation>Експорт на снимки</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="408"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="418"/>
         <location filename="../build/ui_divelogexportdialog.h" line="377"/>
         <source>Style options</source>
         <translation>Стилови настройки</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="423"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="433"/>
         <location filename="../build/ui_divelogexportdialog.h" line="378"/>
         <source>Font</source>
         <translation>Шрифт</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="433"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="443"/>
         <location filename="../build/ui_divelogexportdialog.h" line="379"/>
         <source>Font size</source>
         <translation>Големина на шрифта</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="444"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="454"/>
         <location filename="../build/ui_divelogexportdialog.h" line="382"/>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="449"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="459"/>
         <location filename="../build/ui_divelogexportdialog.h" line="383"/>
         <source>10</source>
         <translation>10</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="454"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="464"/>
         <location filename="../build/ui_divelogexportdialog.h" line="384"/>
         <source>12</source>
         <translation>12</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="459"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="469"/>
         <location filename="../build/ui_divelogexportdialog.h" line="385"/>
         <source>14</source>
         <translation>14</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="464"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="474"/>
         <location filename="../build/ui_divelogexportdialog.h" line="386"/>
         <source>16</source>
         <translation>16</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="469"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="479"/>
         <location filename="../build/ui_divelogexportdialog.h" line="387"/>
         <source>18</source>
         <translation>18</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="474"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="484"/>
         <location filename="../build/ui_divelogexportdialog.h" line="388"/>
         <source>20</source>
         <translation>20</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="482"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="492"/>
         <location filename="../build/ui_divelogexportdialog.h" line="390"/>
         <source>Theme</source>
         <translation>Тема</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="493"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="503"/>
         <location filename="../build/ui_divelogexportdialog.h" line="393"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="95"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="99"/>
         <source>Light</source>
         <translation>Светла</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="498"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="508"/>
         <location filename="../build/ui_divelogexportdialog.h" line="394"/>
         <source>Sand</source>
         <translation>Пясък</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="134"/>
-        <source>UDDF files (*.uddf *.UDDF)</source>
-        <translation>UDDF файлове (*.uddf *.UDDF)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="142"/>
-        <source>CSV files (*.csv *.CSV)</source>
-        <translation>CSV файлове (*.csv *.CSV)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="74"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="76"/>
         <source>Generic format that is used for data exchange between a variety of diving related programs.</source>
         <translation>Общ формат, който се използва за обмен на данни между различни видове програми.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="76"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="78"/>
         <source>Comma separated values describing the dive profile.</source>
         <translation>Данни разделени със запетая, описващи гмуркаческия профил.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="78"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="80"/>
         <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source>
         <translation>Данни разделени със запетая описващи гмуркането. Това не включва информация за профила.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="80"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="82"/>
         <source>Send the dive data to divelogs.de website.</source>
         <translation>Изпрати данните от гмуркането към сайта divelogs.de.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="82"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="84"/>
         <source>Send the dive data to dive-share.appspot.com website</source>
         <translation>Изпрати данните към сайта dive-share.appspot.com</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="84"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="86"/>
         <source>HTML export of the dive locations, visualized on a world map.</source>
         <translation>HTML експорт на местонахождения, визуализирани на световната карта.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="86"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="88"/>
         <source>Subsurface native XML format.</source>
         <translation>Subsurface XML формат</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="88"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="90"/>
         <source>Write depths of images to file.</source>
         <translation>Запиши дълбочините във файл.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="133"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="92"/>
+        <source>Write dive as TeX macros to file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="137"/>
         <source>Export UDDF file as</source>
         <translation>Експорт на като UDDF файл</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="137"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/>
+        <source>UDDF files (*.uddf *.UDDF)</source>
+        <translation>UDDF файлове (*.uddf *.UDDF)</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divelogexportdialog.cpp" line="141"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="145"/>
         <source>Export CSV file as</source>
         <translation>Експорт на СSV файл като</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="148"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="142"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="146"/>
+        <source>CSV files (*.csv *.CSV)</source>
+        <translation>CSV файлове (*.csv *.CSV)</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="152"/>
         <source>Export world map</source>
         <translation>Експорт на световна карта</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="149"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="169"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="153"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="177"/>
         <source>HTML files (*.html)</source>
         <translation>HTML файлове (*.html)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="153"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="157"/>
         <source>Export Subsurface XML</source>
         <translation>Експорт на Subsurface XML</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="158"/>
         <source>XML files (*.xml *.ssrf)</source>
         <translation>XML файлове (*.xml *.ssrf)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="162"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="166"/>
         <source>Save image depths</source>
         <translation>Запиши дълбочините</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="168"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="170"/>
+        <source>Export to TeX file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="170"/>
+        <source>TeX files (*.tex)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="176"/>
         <source>Export HTML files as</source>
         <translation>Експортирай HTML файлове като</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="184"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="192"/>
         <source>Please wait, exporting...</source>
         <translation>Моля изчакайте, експортиране...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="219"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="227"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="311"/>
         <source>Can&apos;t open file %s</source>
         <translation>Не може да бъде отворен файл %s</translation>
     </message>
@@ -2666,25 +2740,6 @@ GPS location:</source>
         <translation>Вмъкни гмуркачески регистър</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="643"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="727"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="856"/>
-        <source>Time</source>
-        <translation>Време</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.ui" line="127"/>
-        <location filename="../build/ui_divelogimportdialog.h" line="164"/>
-        <source>Metric</source>
-        <translation>Метрична</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.ui" line="132"/>
-        <location filename="../build/ui_divelogimportdialog.h" line="165"/>
-        <source>Imperial</source>
-        <translation>Империална</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divelogimportdialog.ui" line="89"/>
         <location filename="../build/ui_divelogimportdialog.h" line="152"/>
         <source>dd.mm.yyyy</source>
@@ -2703,74 +2758,6 @@ GPS location:</source>
         <translation>гггг-мм-дд</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.ui" line="155"/>
-        <location filename="../build/ui_divelogimportdialog.h" line="167"/>
-        <source>Drag the tags above to each corresponding column below</source>
-        <translation>Може да завлечете таговете към определена колона долу</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="641"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="729"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="852"/>
-        <source>Dive #</source>
-        <translation>Гмуркане №</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="642"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="723"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="854"/>
-        <source>Date</source>
-        <translation>Дата</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="644"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="858"/>
-        <source>Duration</source>
-        <translation>Продълж. (мин.)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="655"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="862"/>
-        <source>GPS</source>
-        <translation>GPS</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="645"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="864"/>
-        <source>Max. depth</source>
-        <translation>Макс. дълбочина</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="646"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="866"/>
-        <source>Avg. depth</source>
-        <translation>Средна дълбочина</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="658"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="872"/>
-        <source>Suit</source>
-        <translation>Водолазен костюм</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="663"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="878"/>
-        <source>Tags</source>
-        <translation>Тагове</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="652"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="894"/>
-        <source>O₂</source>
-        <translation>O₂</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="653"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="896"/>
-        <source>He</source>
-        <translation>He</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divelogimportdialog.ui" line="108"/>
         <location filename="../build/ui_divelogimportdialog.h" line="158"/>
         <source>Seconds</source>
@@ -2789,202 +2776,288 @@ GPS location:</source>
         <translation>Минути:секунди</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="654"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="860"/>
-        <source>Location</source>
-        <translation>Местонахождение</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.ui" line="127"/>
+        <location filename="../build/ui_divelogimportdialog.h" line="164"/>
+        <source>Metric</source>
+        <translation>Метрична</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.ui" line="132"/>
+        <location filename="../build/ui_divelogimportdialog.h" line="165"/>
+        <source>Imperial</source>
+        <translation>Империална</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.ui" line="155"/>
+        <location filename="../build/ui_divelogimportdialog.h" line="167"/>
+        <source>Drag the tags above to each corresponding column below</source>
+        <translation>Може да завлечете таговете към определена колона долу</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="354"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="499"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="505"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="355"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="528"/>
         <source>Tab</source>
         <translation>Етикет</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="575"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="598"/>
         <source>Some column headers were pre-populated; please drag and drop the headers so they match the column they are in.</source>
         <translation>Някой заглавия на колони бяха популирани. Моля завлечете ги за да паснат на колоната към която са.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="613"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="731"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="782"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="848"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="636"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="761"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="857"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="925"/>
         <source>Sample time</source>
         <translation>Време на проба</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="615"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="733"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="784"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="638"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="763"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="859"/>
         <source>Sample depth</source>
         <translation>Дълбочина на проба</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="617"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="735"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="786"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="640"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="765"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="861"/>
         <source>Sample temperature</source>
         <translation>Температура на проба</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="621"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="739"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="790"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="642"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="767"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="863"/>
+        <source>Sample pO₂</source>
+        <translation>pO₂ на проба</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="644"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="769"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="865"/>
         <source>Sample sensor1 pO₂</source>
         <translation>Проба сензор1 pO₂</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="623"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="741"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="792"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="646"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="771"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="867"/>
         <source>Sample sensor2 pO₂</source>
         <translation>Проба сензор2 pO₂</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="625"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="743"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="794"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="648"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="773"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="869"/>
         <source>Sample sensor3 pO₂</source>
         <translation>Проба сензор3pO₂</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="633"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="751"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="802"/>
-        <source>Sample stopdepth</source>
-        <translation>Дълбоч. стоп на проба</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="637"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="755"/>
-        <source>Sample setpoint</source>
-        <translation>Сетпойнт проба</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="619"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="737"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="788"/>
-        <source>Sample pO₂</source>
-        <translation>pO₂ на проба</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="627"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="745"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="796"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="650"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="775"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="871"/>
         <source>Sample CNS</source>
         <translation>CNS на проба</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="629"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="747"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="798"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="652"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="777"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="873"/>
         <source>Sample NDL</source>
         <translation>NDL na проба</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="631"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="749"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="800"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="654"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="779"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="875"/>
         <source>Sample TTS</source>
         <translation>TTS на проба</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="635"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="753"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="804"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="656"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="781"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="877"/>
+        <source>Sample stopdepth</source>
+        <translation>Дълбоч. стоп на проба</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="658"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="783"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="879"/>
         <source>Sample pressure</source>
         <translation>Налягане на проба</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="656"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="868"/>
-        <source>Divemaster</source>
-        <translation>Водач</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="660"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="785"/>
+        <source>Sample setpoint</source>
+        <translation>Сетпойнт проба</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="657"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="870"/>
-        <source>Buddy</source>
-        <translation>Партньор</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="664"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="759"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="929"/>
+        <source>Dive #</source>
+        <translation>Гмуркане №</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="659"/>
-        <source>Rating</source>
-        <translation>Оценка</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="665"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="753"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="931"/>
+        <source>Date</source>
+        <translation>Дата</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="660"/>
-        <source>Visibility</source>
-        <translation>Видимост</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="666"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="757"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="933"/>
+        <source>Time</source>
+        <translation>Време</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="661"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="874"/>
-        <source>Notes</source>
-        <translation>Бележки</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="667"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="935"/>
+        <source>Duration</source>
+        <translation>Продълж. (мин.)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="662"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="876"/>
-        <source>Weight</source>
-        <translation>Тежест</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="668"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="941"/>
+        <source>Max. depth</source>
+        <translation>Макс. дълбочина</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="669"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="943"/>
+        <source>Avg. depth</source>
+        <translation>Средна дълбочина</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="670"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="975"/>
+        <source>Air temp.</source>
+        <translation>Темп. на въздух</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="649"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="888"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="671"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="977"/>
+        <source>Water temp.</source>
+        <translation>Темп. на водата</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="672"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="965"/>
         <source>Cyl. size</source>
         <translation>Големина на бутилката</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="650"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="890"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="673"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="967"/>
         <source>Start pressure</source>
         <translation>Начално налягане</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="651"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="892"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="674"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="969"/>
         <source>End pressure</source>
         <translation>Крайно налягане</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="647"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="898"/>
-        <source>Air temp.</source>
-        <translation>Темп. на въздух</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="675"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="971"/>
+        <source>O₂</source>
+        <translation>O₂</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="648"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="900"/>
-        <source>Water temp.</source>
-        <translation>Темп. на водата</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="676"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="973"/>
+        <source>He</source>
+        <translation>He</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="677"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="937"/>
+        <source>Location</source>
+        <translation>Местонахождение</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="678"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="939"/>
+        <source>GPS</source>
+        <translation>GPS</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="679"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="945"/>
+        <source>Divemaster</source>
+        <translation>Водач</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="680"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="947"/>
+        <source>Buddy</source>
+        <translation>Партньор</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="681"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="949"/>
+        <source>Suit</source>
+        <translation>Водолазен костюм</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="682"/>
+        <source>Rating</source>
+        <translation>Оценка</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="683"/>
+        <source>Visibility</source>
+        <translation>Видимост</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="684"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="951"/>
+        <source>Notes</source>
+        <translation>Бележки</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="685"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="953"/>
+        <source>Weight</source>
+        <translation>Тежест</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="686"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="955"/>
+        <source>Tags</source>
+        <translation>Тагове</translation>
     </message>
 </context>
 <context>
     <name>DiveObjectHelper</name>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="287"/>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="323"/>
         <source>%1 dive(s)</source>
-        <translation type="unfinished"/>
+        <translation>%1 гмуркане (гмуркания)</translation>
     </message>
 </context>
 <context>
     <name>DivePlanner</name>
     <message>
-        <location filename="../desktop-widgets/diveplanner.ui" line="152"/>
-        <location filename="../build/ui_diveplanner.h" line="190"/>
-        <source>Altitude</source>
-        <translation>Височина</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/diveplanner.ui" line="109"/>
         <location filename="../build/ui_diveplanner.h" line="189"/>
         <source>Planned dive time</source>
         <translation>Планирано гмуркаческо време</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/diveplanner.ui" line="152"/>
+        <location filename="../build/ui_diveplanner.h" line="190"/>
+        <source>Altitude</source>
+        <translation>Височина</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/diveplanner.ui" line="159"/>
         <location filename="../build/ui_diveplanner.h" line="191"/>
         <source>ATM pressure</source>
@@ -3018,32 +3091,32 @@ GPS location:</source>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="134"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="136"/>
         <source>unknown</source>
         <translation>неизвестно</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="312"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="326"/>
         <source>Final depth</source>
         <translation>Финална дълбочина</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="314"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="328"/>
         <source>Run time</source>
         <translation>Teчащо време</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="316"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="330"/>
         <source>Duration</source>
         <translation>Продълж. (мин.)</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="318"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="332"/>
         <source>Used gas</source>
         <translation>Използван газ</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="320"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="334"/>
         <source>CC setpoint</source>
         <translation>CC setpoint</translation>
     </message>
@@ -3051,22 +3124,22 @@ GPS location:</source>
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="108"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="112"/>
         <source>Dive planner points</source>
         <translation>Точки в гмуркачески плановик</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="112"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="116"/>
         <source>Available gases</source>
         <translation>Достъпни газове</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="137"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="143"/>
         <source>Add dive data point</source>
         <translation>Добави точка в гмуркането</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="146"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="152"/>
         <source>Save new</source>
         <translation>Запиши нов</translation>
     </message>
@@ -3099,11 +3172,36 @@ GPS location:</source>
         <translation>Цвят</translation>
     </message>
     <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="124"/>
+        <source>User entered</source>
+        <translation>Въведено от потребителя</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="126"/>
+        <source>Cylinder index</source>
+        <translation>Индекс на бутилка</translation>
+    </message>
+    <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="128"/>
         <source>Pressure S</source>
         <translation>Налягане S</translation>
     </message>
     <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="130"/>
+        <source>Pressure I</source>
+        <translation>Налягане I</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="132"/>
+        <source>Ceiling</source>
+        <translation>Таван</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="134"/>
+        <source>SAC</source>
+        <translation>SAC</translation>
+    </message>
+    <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="136"/>
         <source>pN₂</source>
         <translation>pN₂</translation>
@@ -3139,49 +3237,24 @@ GPS location:</source>
         <translation>Сензор 3</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="152"/>
-        <source>Heart rate</source>
-        <translation>Сърдечен ритъм</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="156"/>
-        <source>Mean depth @ s</source>
-        <translation>Средна дълбочина @ сек</translation>
-    </message>
-    <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="150"/>
         <source>Ambient pressure</source>
         <translation>Околно налягане</translation>
     </message>
     <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="152"/>
+        <source>Heart rate</source>
+        <translation>Сърдечен ритъм</translation>
+    </message>
+    <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="154"/>
         <source>Gradient factor</source>
         <translation>Градиент фактор</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="130"/>
-        <source>Pressure I</source>
-        <translation>Налягане I</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="124"/>
-        <source>User entered</source>
-        <translation>Въведено от потребителя</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="126"/>
-        <source>Cylinder index</source>
-        <translation>Индекс на бутилка</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="132"/>
-        <source>Ceiling</source>
-        <translation>Таван</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="134"/>
-        <source>SAC</source>
-        <translation>SAC</translation>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="156"/>
+        <source>Mean depth @ s</source>
+        <translation>Средна дълбочина @ сек</translation>
     </message>
 </context>
 <context>
@@ -3252,311 +3325,315 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="395"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="441"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="434"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="483"/>
         <source>#</source>
         <translation>№</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="398"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="444"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="437"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="486"/>
         <source>Date</source>
         <translation>Дата</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="401"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="447"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="440"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="489"/>
         <source>Rating</source>
         <translation>Оценка</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="404"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="443"/>
         <source>Depth</source>
         <translation>Дълбочина</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="410"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="446"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="495"/>
+        <source>Duration</source>
+        <translation>Продълж. (мин.)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="449"/>
         <source>Temp</source>
         <translation>Температура</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="413"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="452"/>
         <source>Weight</source>
         <translation>Тежест</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="425"/>
-        <source>SAC</source>
-        <translation>SAC</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
-        <source>m</source>
-        <translation>м</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
-        <source>ft</source>
-        <translation>фута</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
-        <source>Weight(%1)</source>
-        <translation>Тежест(%1)</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="416"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="462"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="455"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="504"/>
         <source>Suit</source>
         <translation>Водолазен костюм</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="419"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="465"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="458"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="507"/>
         <source>Cyl</source>
         <translation>Бут.</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="422"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="468"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="461"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="510"/>
         <source>Gas</source>
         <translation>Газ</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
-        <source>SAC(%1)</source>
-        <translation>SAC(%1)</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="464"/>
+        <source>SAC</source>
+        <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
-        <source>/min</source>
-        <translation>/м</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="467"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="518"/>
+        <source>OTU</source>
+        <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="431"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="479"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="470"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="521"/>
         <source>Max CNS</source>
         <translation>Макс. CNS</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="434"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="482"/>
-        <source>Location</source>
-        <translation>Местонахождение</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
+        <source>Photos</source>
+        <translation>Снимки</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
-        <source>kg</source>
-        <translation>кг</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="476"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="527"/>
+        <source>Location</source>
+        <translation>Местонахождение</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="492"/>
         <source>Depth(%1)</source>
         <translation>Дълбочина(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="407"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="453"/>
-        <source>Duration</source>
-        <translation>Продълж. (мин.)</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="492"/>
+        <source>m</source>
+        <translation>м</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="492"/>
+        <source>ft</source>
+        <translation>фута</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="456"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="498"/>
         <source>Temp(%1%2)</source>
         <translation>Температура(%1%2)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="501"/>
+        <source>Weight(%1)</source>
+        <translation>Тежест(%1)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="501"/>
+        <source>kg</source>
+        <translation>кг</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="501"/>
         <source>lbs</source>
         <translation>паунда</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="428"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="476"/>
-        <source>OTU</source>
-        <translation>OTU</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="515"/>
+        <source>SAC(%1)</source>
+        <translation>SAC(%1)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="515"/>
+        <source>/min</source>
+        <translation>/м</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="524"/>
+        <source>Photos before/during/after dive</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="164"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="165"/>
         <source>no dives were selected</source>
         <translation>няма избрани гмуркания</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="174"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="175"/>
         <source>stylesheet to export to divelogs.de is not found</source>
         <translation>стиловете за експорт към divelogs.de не могат да бъдат намерени</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="184"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="185"/>
         <source>failed to create zip file for upload: %s</source>
         <translation>не може да бъде създаден ZIP файл за качване: %s</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="236"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="237"/>
         <source>internal error</source>
         <translation>вътрешна грешка</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="244"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="245"/>
         <source>Conversion of dive %1 to divelogs.de format failed</source>
         <translation>Конверсията на гмуркане %1 към формата на divelogs.de не може да бъде извършена</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="272"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="273"/>
         <source>error writing zip file: %s zip error %d system error %d - %s</source>
         <translation>грешка при писане на zip файл: %s zip грешка %d системна грешка %d - %s</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="745"/>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="935"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="936"/>
         <source>Done</source>
         <translation>Готово</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="778"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="779"/>
         <source>Uploading dive list...</source>
         <translation>Обновяване на списъка от гмуркания...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="810"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="811"/>
         <source>Downloading dive list...</source>
         <translation>Изтегляне на списък от гмуркания...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="851"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="852"/>
         <source>Downloading %1 dives...</source>
         <translation>Изтегляне на %1 гмуркания...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="885"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="886"/>
         <source>Download finished - %1</source>
         <translation>Изтеглянето приключи - %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="899"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="900"/>
         <source>Problem with download</source>
         <translation>Проблем при тегленето</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="900"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="901"/>
         <source>The archive could not be opened:
 </source>
         <translation>Архива не може да бъде отворен:
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="909"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="910"/>
         <source>Corrupted download</source>
         <translation>Неправилно изтегляне</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="910"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="911"/>
         <source>The archive could not be opened:
 %1</source>
         <translation>Архива не може да бъде отворен:
 %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="937"/>
+        <source>Upload finished</source>
+        <translation>Качването приключи</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="950"/>
         <source>Upload failed</source>
         <translation>Грешка при качването</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="952"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="953"/>
         <source>Upload successful</source>
         <translation>Успешно качване</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="955"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="956"/>
         <source>Login failed</source>
         <translation>Грешка при логин</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="958"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="959"/>
         <source>Cannot parse response</source>
         <translation>Не може да бъде направен разбор на отговора</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="970"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="971"/>
         <source>Error: %1</source>
         <translation>Грешка: %1</translation>
     </message>
-    <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="936"/>
-        <source>Upload finished</source>
-        <translation>Качването приключи</translation>
-    </message>
 </context>
 <context>
     <name>DownloadFromDCWidget</name>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="185"/>
-        <source>Error</source>
-        <translation>Грешка</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="436"/>
-        <source>Retry</source>
-        <translation>Опитай пак</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="280"/>
-        <source>Find Uemis dive computer</source>
-        <translation>Намери Uemis леководолазен компютър</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="101"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="107"/>
         <source>Download</source>
         <translation>Изтегли</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="104"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="110"/>
         <source>Choose Bluetooth download mode</source>
         <translation>Избери режим на Bluetooth теглене</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="382"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="191"/>
+        <source>Error</source>
+        <translation>Грешка</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="286"/>
+        <source>Find Uemis dive computer</source>
+        <translation>Намери Uemis леководолазен компютър</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="392"/>
         <source>Choose file for divecomputer download logfile</source>
         <translation>Изберете регистър файл при изтегляне</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="383"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="393"/>
         <source>Log files (*.log)</source>
         <translation>Регистър файлове (*.log)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="398"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="408"/>
         <source>Warning</source>
         <translation>Предупреждение</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="399"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="409"/>
         <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source>
         <translation>Записването на libdivecomputer дъмп НЕ обновява списъка на гмуркания</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="410"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="420"/>
         <source>Choose file for divecomputer binary dump file</source>
         <translation>Изберете файл за libdivecomputer дъмп</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="411"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="421"/>
         <source>Dump files (*.bin)</source>
         <translation>Дъмп файлове (*.bin)</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="446"/>
+        <source>Retry</source>
+        <translation>Опитай пак</translation>
+    </message>
 </context>
 <context>
     <name>DownloadFromDiveComputer</name>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="139"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="275"/>
-        <source>Vendor</source>
-        <translation>Производител</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="14"/>
         <location filename="../build/ui_downloadfromdivecomputer.h" line="265"/>
         <source>Download from dive computer</source>
@@ -3569,17 +3646,6 @@ p, li { white-space: pre-wrap; }
         <translation>Устройсто или входна точка</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="122"/>
-        <source>Choose Bluetooth download mode</source>
-        <translation>Избери режим на Bluetooth теглене</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="149"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="276"/>
-        <source>Dive computer</source>
-        <translation>Леководолазен компютър</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="66"/>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="101"/>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="115"/>
@@ -3603,11 +3669,46 @@ p, li { white-space: pre-wrap; }
         <translation>Винаги предпочитай изтегленото гмуркане</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="87"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="270"/>
+        <source>Download into new trip</source>
+        <translation>Изтегли в ново пътуване</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="94"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="271"/>
+        <source>Save libdivecomputer logfile</source>
+        <translation>Запиши libdivecomputer регистър файл</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="108"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="273"/>
+        <source>Save libdivecomputer dumpfile</source>
+        <translation>Запиши libdivecomputer дъмп файл</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="122"/>
+        <source>Choose Bluetooth download mode</source>
+        <translation>Избери режим на Bluetooth теглене</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="129"/>
         <source>Select a remote Bluetooth device.</source>
         <translation>Избери дистанционно Bluetooth устройство.</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="139"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="275"/>
+        <source>Vendor</source>
+        <translation>Производител</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="149"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="276"/>
+        <source>Dive computer</source>
+        <translation>Леководолазен компютър</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/>
         <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="52"/>
         <location filename="../build/ui_downloadfromdivecomputer.h" line="277"/>
@@ -3615,18 +3716,6 @@ p, li { white-space: pre-wrap; }
         <translation>Изтегли</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="284"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="281"/>
-        <source>OK</source>
-        <translation>ОК</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="291"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="282"/>
-        <source>Cancel</source>
-        <translation>Отмяна</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="226"/>
         <location filename="../build/ui_downloadfromdivecomputer.h" line="278"/>
         <source>Downloaded dives</source>
@@ -3645,22 +3734,16 @@ p, li { white-space: pre-wrap; }
         <translation>Деселектирай всички</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="94"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="271"/>
-        <source>Save libdivecomputer logfile</source>
-        <translation>Запиши libdivecomputer регистър файл</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="108"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="273"/>
-        <source>Save libdivecomputer dumpfile</source>
-        <translation>Запиши libdivecomputer дъмп файл</translation>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="284"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="281"/>
+        <source>OK</source>
+        <translation>ОК</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="87"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="270"/>
-        <source>Download into new trip</source>
-        <translation>Изтегли в ново пътуване</translation>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="291"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="282"/>
+        <source>Cancel</source>
+        <translation>Отмяна</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="16"/>
@@ -3670,12 +3753,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="38"/>
         <source> Vendor name : </source>
-        <translation type="unfinished"/>
+        <translation>Име на продавача:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="42"/>
         <source> Dive Computer:</source>
-        <translation type="unfinished"/>
+        <translation>Леководолазен компютър</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="54"/>
@@ -3691,12 +3774,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="68"/>
         <source> Downloaded dives</source>
-        <translation type="unfinished"/>
+        <translation>Изтеглени гмуркания</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="79"/>
         <source>Date / Time</source>
-        <translation type="unfinished"/>
+        <translation>Дата / време</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="84"/>
@@ -3721,7 +3804,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="115"/>
         <source>Unselect All</source>
-        <translation type="unfinished"/>
+        <translation>Деселектирай всички</translation>
     </message>
 </context>
 <context>
@@ -3750,12 +3833,12 @@ p, li { white-space: pre-wrap; }
         <translation>Свързване с Facebook текст контейнер</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="297"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="242"/>
         <source>To disconnect Subsurface from your Facebook account, use the button below</source>
         <translation>За да прекъснете връзката на Subsurface с вашия Facebook акаунт, моля натиснете бутона по-долу.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="306"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="251"/>
         <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source>
         <translation>За да се свържете с Facebook, моля въведете потребител и парола. Това позволява на Subsurface да публикува гмуркания на вашия таймлайн.</translation>
     </message>
@@ -3763,22 +3846,22 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>FacebookManager</name>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="266"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="211"/>
         <source>Photo upload sucessfull</source>
         <translation>Успешно качване на снимка</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="267"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="212"/>
         <source>Your dive profile was updated to Facebook.</source>
         <translation>Гмуркаческия профил бе качен във Facebook</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="271"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="216"/>
         <source>Photo upload failed</source>
         <translation>Грешка при качването на снимката</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="272"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="217"/>
         <source>Your dive profile was not updated to Facebook, 
  please send the following to the developer. 
 </source>
@@ -3840,17 +3923,25 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>FirmwareUpdateThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1750"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1739"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Тази функционалност не е достъпна за избрания леководолазен комютър.</translation>
     </message>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1755"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1744"/>
         <source>Firmware update failed!</source>
         <translation>Фърмуера не може да бъде обновен!</translation>
     </message>
 </context>
 <context>
+    <name>GlobalDrawer</name>
+    <message>
+        <location filename="../mobile-widgets/qml/kirigami/src/controls/GlobalDrawer.qml" line="364"/>
+        <source>Back</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>GlobeGPS</name>
     <message>
         <location filename="../desktop-widgets/globe.cpp" line="124"/>
@@ -3863,32 +3954,32 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../mobile-widgets/qml/GpsList.qml" line="16"/>
         <source>GPS Fixes</source>
-        <translation type="unfinished"/>
+        <translation>GPS позиции</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="40"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="32"/>
         <source>Date: </source>
-        <translation type="unfinished"/>
+        <translation>Дата:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="50"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="42"/>
         <source>Name: </source>
         <translation>Име:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="60"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="52"/>
         <source>Latitude: </source>
-        <translation type="unfinished"/>
+        <translation>Геогр. ширина:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="69"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="61"/>
         <source>Longitude: </source>
-        <translation type="unfinished"/>
+        <translation>Геогр. дължина:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="113"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="105"/>
         <source>List of stored GPS fixes</source>
-        <translation type="unfinished"/>
+        <translation>Списък на запазени GPS позиции</translation>
     </message>
 </context>
 <context>
@@ -3896,7 +3987,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../core/gpslocation.cpp" line="121"/>
         <source>Unknown GPS location</source>
-        <translation type="unfinished"/>
+        <translation>Непозната GPS позиция</translation>
     </message>
 </context>
 <context>
@@ -3915,7 +4006,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>LocationFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="648"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="646"/>
         <source>Location: </source>
         <translation>Местонахождение: </translation>
     </message>
@@ -3956,7 +4047,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>LocationFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="299"/>
+        <location filename="../qt-models/filtermodels.cpp" line="304"/>
         <source>No location set</source>
         <translation>Няма зададено местонахождение</translation>
     </message>
@@ -4074,24 +4165,59 @@ p, li { white-space: pre-wrap; }
         <location filename="../mobile-widgets/qml/Log.qml" line="15"/>
         <location filename="../mobile-widgets/qml/Log.qml" line="23"/>
         <source>Application Log</source>
-        <translation type="unfinished"/>
+        <translation>Регистър на приложението</translation>
     </message>
 </context>
 <context>
-    <name>MainForm.ui</name>
+    <name>MainTab</name>
     <message>
-        <location filename="../packaging/ios/Subsurface-mobile/MainForm.ui.qml" line="17"/>
-        <source>Press Me 1</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/maintab.ui" line="18"/>
+        <location filename="../desktop-widgets/maintab.ui" line="439"/>
+        <location filename="../build/ui_maintab.h" line="961"/>
+        <location filename="../build/ui_maintab.h" line="963"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="539"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="571"/>
+        <source>Notes</source>
+        <translation>Бележки</translation>
     </message>
     <message>
-        <location filename="../packaging/ios/Subsurface-mobile/MainForm.ui.qml" line="22"/>
-        <source>Press Me 2</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/maintab.ui" line="21"/>
+        <location filename="../build/ui_maintab.h" line="964"/>
+        <source>General notes about the current selection</source>
+        <translation>Общи бележки за текущия избор</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="92"/>
+        <location filename="../desktop-widgets/maintab.ui" line="646"/>
+        <location filename="../build/ui_maintab.h" line="947"/>
+        <location filename="../build/ui_maintab.h" line="967"/>
+        <source>Date</source>
+        <translation>Дата</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="102"/>
+        <location filename="../build/ui_maintab.h" line="948"/>
+        <source>Time</source>
+        <translation>Време</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="112"/>
+        <location filename="../desktop-widgets/maintab.ui" line="836"/>
+        <location filename="../build/ui_maintab.h" line="949"/>
+        <location filename="../build/ui_maintab.h" line="987"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="306"/>
+        <source>Air temp.</source>
+        <translation>Темп. на въздух</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="122"/>
+        <location filename="../desktop-widgets/maintab.ui" line="855"/>
+        <location filename="../build/ui_maintab.h" line="950"/>
+        <location filename="../build/ui_maintab.h" line="989"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="307"/>
+        <source>Water temp.</source>
+        <translation>Темп. на водата</translation>
     </message>
-</context>
-<context>
-    <name>MainTab</name>
     <message>
         <location filename="../desktop-widgets/maintab.ui" line="184"/>
         <location filename="../build/ui_maintab.h" line="951"/>
@@ -4100,6 +4226,17 @@ p, li { white-space: pre-wrap; }
         <translation>Местонахождение</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="214"/>
+        <source>Edit dive site</source>
+        <translation>Редакция на място за гмуркане</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="217"/>
+        <location filename="../build/ui_maintab.h" line="953"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="252"/>
         <location filename="../build/ui_maintab.h" line="954"/>
         <source>Divemaster</source>
@@ -4112,12 +4249,6 @@ p, li { white-space: pre-wrap; }
         <translation>Партньор</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.ui" line="387"/>
-        <location filename="../build/ui_maintab.h" line="959"/>
-        <source>Tags</source>
-        <translation>Тагове</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/maintab.ui" line="308"/>
         <location filename="../build/ui_maintab.h" line="956"/>
         <source>Rating</source>
@@ -4136,57 +4267,18 @@ p, li { white-space: pre-wrap; }
         <translation>Водолазен костюм</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="387"/>
+        <location filename="../build/ui_maintab.h" line="959"/>
+        <source>Tags</source>
+        <translation>Тагове</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="397"/>
         <location filename="../build/ui_maintab.h" line="960"/>
         <source>Dive mode</source>
         <translation>Режим на гмуркане</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.ui" line="112"/>
-        <location filename="../desktop-widgets/maintab.ui" line="836"/>
-        <location filename="../build/ui_maintab.h" line="949"/>
-        <location filename="../build/ui_maintab.h" line="987"/>
-        <location filename="../desktop-widgets/maintab.cpp" line="306"/>
-        <source>Air temp.</source>
-        <translation>Темп. на въздух</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="122"/>
-        <location filename="../desktop-widgets/maintab.ui" line="855"/>
-        <location filename="../build/ui_maintab.h" line="950"/>
-        <location filename="../build/ui_maintab.h" line="989"/>
-        <location filename="../desktop-widgets/maintab.cpp" line="307"/>
-        <source>Water temp.</source>
-        <translation>Темп. на водата</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="18"/>
-        <location filename="../desktop-widgets/maintab.ui" line="439"/>
-        <location filename="../build/ui_maintab.h" line="961"/>
-        <location filename="../build/ui_maintab.h" line="963"/>
-        <location filename="../desktop-widgets/maintab.cpp" line="539"/>
-        <location filename="../desktop-widgets/maintab.cpp" line="571"/>
-        <source>Notes</source>
-        <translation>Бележки</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="21"/>
-        <location filename="../build/ui_maintab.h" line="964"/>
-        <source>General notes about the current selection</source>
-        <translation>Общи бележки за текущия избор</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="214"/>
-        <source>Edit dive site</source>
-        <translation>Редакция на място за гмуркане</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="217"/>
-        <location filename="../build/ui_maintab.h" line="953"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/maintab.ui" line="491"/>
         <location filename="../build/ui_maintab.h" line="965"/>
         <source>Equipment</source>
@@ -4211,6 +4303,12 @@ p, li { white-space: pre-wrap; }
         <translation>Информация за гмуркане</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="665"/>
+        <location filename="../build/ui_maintab.h" line="969"/>
+        <source>Interval</source>
+        <translation>Интервал</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="684"/>
         <location filename="../build/ui_maintab.h" line="971"/>
         <source>Gases used</source>
@@ -4223,18 +4321,38 @@ p, li { white-space: pre-wrap; }
         <translation>Консумиран газ</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="722"/>
+        <location filename="../desktop-widgets/maintab.ui" line="1094"/>
+        <location filename="../build/ui_maintab.h" line="975"/>
+        <location filename="../build/ui_maintab.h" line="1003"/>
+        <source>SAC</source>
+        <translation>SAC</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="741"/>
         <location filename="../build/ui_maintab.h" line="977"/>
         <source>CNS</source>
         <translation>CNS</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="760"/>
+        <location filename="../build/ui_maintab.h" line="979"/>
+        <source>OTU</source>
+        <translation>OTU</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="779"/>
         <location filename="../build/ui_maintab.h" line="981"/>
         <source>Max. depth</source>
         <translation>Макс. дълбочина</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="798"/>
+        <location filename="../build/ui_maintab.h" line="983"/>
+        <source>Avg. depth</source>
+        <translation>Средна дълбочина</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="817"/>
         <location filename="../build/ui_maintab.h" line="985"/>
         <source>Air pressure</source>
@@ -4247,82 +4365,6 @@ p, li { white-space: pre-wrap; }
         <translation>Време</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.ui" line="933"/>
-        <location filename="../build/ui_maintab.h" line="1007"/>
-        <source>Simple statistics about the selection</source>
-        <translation>Прости статистики за избора</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1039"/>
-        <location filename="../build/ui_maintab.h" line="999"/>
-        <source>Total time</source>
-        <translation>Общо време</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1106"/>
-        <location filename="../build/ui_maintab.h" line="1004"/>
-        <source>Gas consumption</source>
-        <translation>Консумация на газ</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1151"/>
-        <location filename="../build/ui_maintab.h" line="1009"/>
-        <source>All photos from the current selection</source>
-        <translation>Всички снимки от текущия избор</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1177"/>
-        <location filename="../build/ui_maintab.h" line="1010"/>
-        <source>Extra data</source>
-        <translation>Допълнителни данни</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1180"/>
-        <location filename="../build/ui_maintab.h" line="1011"/>
-        <source>Adittional data from the dive computer</source>
-        <translation>Допълнителни данни от текущия гмуркачески комютър</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="92"/>
-        <location filename="../desktop-widgets/maintab.ui" line="646"/>
-        <location filename="../build/ui_maintab.h" line="947"/>
-        <location filename="../build/ui_maintab.h" line="967"/>
-        <source>Date</source>
-        <translation>Дата</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="102"/>
-        <location filename="../build/ui_maintab.h" line="948"/>
-        <source>Time</source>
-        <translation>Време</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="665"/>
-        <location filename="../build/ui_maintab.h" line="969"/>
-        <source>Interval</source>
-        <translation>Интервал</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="722"/>
-        <location filename="../desktop-widgets/maintab.ui" line="1094"/>
-        <location filename="../build/ui_maintab.h" line="975"/>
-        <location filename="../build/ui_maintab.h" line="1003"/>
-        <source>SAC</source>
-        <translation>SAC</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="798"/>
-        <location filename="../build/ui_maintab.h" line="983"/>
-        <source>Avg. depth</source>
-        <translation>Средна дълбочина</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="760"/>
-        <location filename="../build/ui_maintab.h" line="979"/>
-        <source>OTU</source>
-        <translation>OTU</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/maintab.ui" line="893"/>
         <location filename="../build/ui_maintab.h" line="993"/>
         <source>Salinity</source>
@@ -4335,22 +4377,34 @@ p, li { white-space: pre-wrap; }
         <translation>Статистики</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="933"/>
+        <location filename="../build/ui_maintab.h" line="1007"/>
+        <source>Simple statistics about the selection</source>
+        <translation>Прости статистики за избора</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="986"/>
         <location filename="../build/ui_maintab.h" line="996"/>
         <source>Depth</source>
         <translation>Дълбочина</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="998"/>
+        <location filename="../build/ui_maintab.h" line="997"/>
+        <source>Duration</source>
+        <translation>Продълж. (мин.)</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="1027"/>
         <location filename="../build/ui_maintab.h" line="998"/>
         <source>Temperature</source>
         <translation>Температура:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.ui" line="998"/>
-        <location filename="../build/ui_maintab.h" line="997"/>
-        <source>Duration</source>
-        <translation>Продълж. (мин.)</translation>
+        <location filename="../desktop-widgets/maintab.ui" line="1039"/>
+        <location filename="../build/ui_maintab.h" line="999"/>
+        <source>Total time</source>
+        <translation>Общо време</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/maintab.ui" line="1058"/>
@@ -4359,20 +4413,34 @@ p, li { white-space: pre-wrap; }
         <translation>Гмуркания</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="1106"/>
+        <location filename="../build/ui_maintab.h" line="1004"/>
+        <source>Gas consumption</source>
+        <translation>Консумация на газ</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="1148"/>
         <location filename="../build/ui_maintab.h" line="1008"/>
         <source>Photos</source>
         <translation>Снимки</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.cpp" line="88"/>
-        <source>Cylinders</source>
-        <translation>Бутилки</translation>
+        <location filename="../desktop-widgets/maintab.ui" line="1151"/>
+        <location filename="../build/ui_maintab.h" line="1009"/>
+        <source>All photos from the current selection</source>
+        <translation>Всички снимки от текущия избор</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.cpp" line="92"/>
-        <source>Weights</source>
-        <translation>Тежести</translation>
+        <location filename="../desktop-widgets/maintab.ui" line="1177"/>
+        <location filename="../build/ui_maintab.h" line="1010"/>
+        <source>Extra data</source>
+        <translation>Допълнителни данни</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="1180"/>
+        <location filename="../build/ui_maintab.h" line="1011"/>
+        <source>Adittional data from the dive computer</source>
+        <translation>Допълнителни данни от текущия гмуркачески комютър</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/maintab.cpp" line="63"/>
@@ -4385,11 +4453,21 @@ p, li { white-space: pre-wrap; }
         <translation>Отмени промените</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.cpp" line="88"/>
+        <source>Cylinders</source>
+        <translation>Бутилки</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.cpp" line="89"/>
         <source>Add cylinder</source>
         <translation>Добави бутилка</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.cpp" line="92"/>
+        <source>Weights</source>
+        <translation>Тежести</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.cpp" line="93"/>
         <source>Add weight system</source>
         <translation>Добави система за тежест</translation>
@@ -4545,12 +4623,12 @@ mixed from Air and using:
     <message>
         <location filename="../desktop-widgets/maintab.cpp" line="1594"/>
         <source>Deleting Images</source>
-        <translation type="unfinished"/>
+        <translation>Изтриване на изображения</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/maintab.cpp" line="1594"/>
         <source>Are you sure you want to delete all images?</source>
-        <translation type="unfinished"/>
+        <translation>Сигурни ли сте, че искате на изтриете всички изображения?</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/maintab.cpp" line="1653"/>
@@ -4565,12 +4643,12 @@ mixed from Air and using:
     <message>
         <location filename="../desktop-widgets/maintab.cpp" line="1656"/>
         <source>Delete selected images</source>
-        <translation type="unfinished"/>
+        <translation>Изтрий избраните изображения</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/maintab.cpp" line="1657"/>
         <source>Delete all images</source>
-        <translation type="unfinished"/>
+        <translation>Изтрий всички изображения</translation>
     </message>
 </context>
 <context>
@@ -4582,659 +4660,685 @@ mixed from Air and using:
         <translation>&amp;Файл</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="455"/>
-        <location filename="../build/ui_mainwindow.h" line="534"/>
-        <source>Export dive logs</source>
-        <translation>Експорт на гмуркачески регистри</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="510"/>
-        <location filename="../build/ui_mainwindow.h" line="542"/>
-        <source>Toggle pHe graph</source>
-        <translation>Превключи pHе диаграма</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="546"/>
-        <location filename="../build/ui_mainwindow.h" line="545"/>
-        <source>Toggle calculating all tissues</source>
-        <translation>Превключи калкулация на всички тъкани</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="522"/>
-        <location filename="../build/ui_mainwindow.h" line="543"/>
-        <source>Toggle DC reported ceiling</source>
-        <translation>Превключи отчетен таван на гмуркачески компютър</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="534"/>
-        <location filename="../build/ui_mainwindow.h" line="544"/>
-        <source>Toggle calculated ceiling</source>
-        <translation>Превключи калкулиран таван</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="606"/>
-        <location filename="../build/ui_mainwindow.h" line="550"/>
-        <source>Toggle NDL, TTS</source>
-        <translation>Превключи NDL. TTS</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="558"/>
-        <location filename="../build/ui_mainwindow.h" line="546"/>
-        <source>Toggle calculated ceiling with 3m increments</source>
-        <translation>Превключи калкулиран таван с 3м нарастване</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="463"/>
-        <location filename="../build/ui_mainwindow.h" line="537"/>
-        <source>Configure &amp;dive computer</source>
-        <translation>Настрой &amp;леководолазен комютър</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="570"/>
-        <location filename="../build/ui_mainwindow.h" line="547"/>
-        <source>Toggle heart rate</source>
-        <translation>Превключи показване на пулс</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="582"/>
-        <location filename="../build/ui_mainwindow.h" line="548"/>
-        <source>Toggle MOD</source>
-        <translation>Превключи MOD</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="594"/>
-        <location filename="../build/ui_mainwindow.h" line="549"/>
-        <source>Toggle EAD, END, EADD</source>
-        <translation>Превключи EAD, END, EADD</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="618"/>
-        <location filename="../build/ui_mainwindow.h" line="551"/>
-        <source>Toggle SAC rate</source>
-        <translation>Превключи SAC скорост</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="630"/>
-        <location filename="../build/ui_mainwindow.h" line="552"/>
-        <source>Toggle ruler</source>
-        <translation>Превключи линеал</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="86"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="87"/>
         <location filename="../build/ui_mainwindow.h" line="569"/>
         <source>&amp;Log</source>
         <translation>&amp;Регистър</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="105"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="104"/>
         <location filename="../build/ui_mainwindow.h" line="570"/>
         <source>&amp;View</source>
         <translation>&amp;Изглед</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="121"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="120"/>
         <location filename="../build/ui_mainwindow.h" line="571"/>
         <source>&amp;Help</source>
         <translation>&amp;Помощ</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="130"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="129"/>
         <location filename="../build/ui_mainwindow.h" line="572"/>
         <source>&amp;Import</source>
         <translation>&amp;Вмъкване</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="139"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="138"/>
         <location filename="../build/ui_mainwindow.h" line="573"/>
         <source>&amp;Edit</source>
         <translation>&amp;Редактирай</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="144"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="143"/>
         <source>Share on</source>
         <translation>Сподели на</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="158"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="157"/>
         <location filename="../build/ui_mainwindow.h" line="453"/>
         <source>&amp;New logbook</source>
         <translation>&amp;Нов регистър</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="161"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="160"/>
         <location filename="../build/ui_mainwindow.h" line="455"/>
         <source>New</source>
         <translation>Нов</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="164"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="163"/>
         <location filename="../build/ui_mainwindow.h" line="457"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="169"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="168"/>
         <location filename="../build/ui_mainwindow.h" line="458"/>
         <source>&amp;Open logbook</source>
         <translation>&amp;Отвори регистър</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="172"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="171"/>
         <location filename="../build/ui_mainwindow.h" line="460"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="508"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="502"/>
         <source>Open</source>
         <translation>Отвори</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="175"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="174"/>
         <location filename="../build/ui_mainwindow.h" line="462"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="180"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="179"/>
         <location filename="../build/ui_mainwindow.h" line="463"/>
         <source>&amp;Save</source>
         <translation>&amp;Запиши</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="183"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="182"/>
         <location filename="../build/ui_mainwindow.h" line="465"/>
         <source>Save</source>
         <translation>Запиши</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="186"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="185"/>
         <location filename="../build/ui_mainwindow.h" line="467"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="191"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="190"/>
         <location filename="../build/ui_mainwindow.h" line="468"/>
         <source>Sa&amp;ve as</source>
         <translation>З&amp;апиши като</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="194"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="193"/>
         <location filename="../build/ui_mainwindow.h" line="470"/>
         <source>Save as</source>
         <translation>Запиши като...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="197"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="196"/>
         <location filename="../build/ui_mainwindow.h" line="472"/>
         <source>Ctrl+Shift+S</source>
         <translation>Ctrl+Shift+S</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="202"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="201"/>
         <location filename="../build/ui_mainwindow.h" line="473"/>
         <source>&amp;Close</source>
         <translation>&amp;Затвори</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="205"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="204"/>
         <location filename="../build/ui_mainwindow.h" line="475"/>
         <source>Close</source>
         <translation>Затвори</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="208"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="207"/>
         <location filename="../build/ui_mainwindow.h" line="477"/>
         <source>Ctrl+W</source>
         <translation>Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="221"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="212"/>
+        <location filename="../build/ui_mainwindow.h" line="478"/>
+        <source>&amp;Print</source>
+        <translation>&amp;Напечатай</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="215"/>
+        <location filename="../build/ui_mainwindow.h" line="479"/>
+        <source>Ctrl+P</source>
+        <translation>Ctrl+P</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="220"/>
         <location filename="../build/ui_mainwindow.h" line="480"/>
         <source>P&amp;references</source>
         <translation>На&amp;стройки</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="251"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="223"/>
+        <location filename="../build/ui_mainwindow.h" line="481"/>
+        <source>Ctrl+,</source>
+        <translation>Ctrl+,</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="231"/>
+        <location filename="../build/ui_mainwindow.h" line="482"/>
+        <source>&amp;Quit</source>
+        <translation>&amp;Изход</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="234"/>
+        <location filename="../build/ui_mainwindow.h" line="483"/>
+        <source>Ctrl+Q</source>
+        <translation>Ctrl+Q</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="242"/>
+        <location filename="../build/ui_mainwindow.h" line="484"/>
+        <source>Import from &amp;dive computer</source>
+        <translation>Изтегли от леководолазен &amp;компютър</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="245"/>
+        <location filename="../build/ui_mainwindow.h" line="485"/>
+        <source>Ctrl+D</source>
+        <translation>Ctrl+D</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="250"/>
         <location filename="../build/ui_mainwindow.h" line="486"/>
         <source>Import &amp;GPS data from Subsurface web service</source>
         <translation>Вмъкни &amp;GPS данни от Subsurface уеб услуга</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="259"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="253"/>
+        <location filename="../build/ui_mainwindow.h" line="487"/>
+        <source>Ctrl+G</source>
+        <translation>Ctrl+G</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="258"/>
         <location filename="../build/ui_mainwindow.h" line="488"/>
         <source>Edit device &amp;names</source>
         <translation>&amp;Редактирай имена на устройства</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="272"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="263"/>
+        <location filename="../build/ui_mainwindow.h" line="489"/>
+        <source>&amp;Add dive</source>
+        <translation>Добави гмуркане</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="266"/>
+        <location filename="../build/ui_mainwindow.h" line="490"/>
+        <source>Ctrl++</source>
+        <translation>Ctrl++</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="271"/>
         <location filename="../build/ui_mainwindow.h" line="491"/>
         <source>&amp;Edit dive</source>
         <translation>§Редактиране на гмуркане</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="277"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="276"/>
         <location filename="../build/ui_mainwindow.h" line="492"/>
         <source>&amp;Copy dive components</source>
         <translation>&amp;Копирай компоненти на гмуркане</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="280"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="279"/>
         <location filename="../build/ui_mainwindow.h" line="493"/>
         <source>Ctrl+C</source>
         <translation>Ctrl+C</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="285"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="284"/>
         <location filename="../build/ui_mainwindow.h" line="494"/>
         <source>&amp;Paste dive components</source>
         <translation>&amp;Залепи компоненти на гмуркане</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="288"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="287"/>
         <location filename="../build/ui_mainwindow.h" line="495"/>
         <source>Ctrl+V</source>
         <translation>Ctrl+V</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="325"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="292"/>
+        <location filename="../build/ui_mainwindow.h" line="496"/>
+        <source>&amp;Renumber</source>
+        <translation>&amp;Преномерирай</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="295"/>
+        <location filename="../build/ui_mainwindow.h" line="497"/>
+        <source>Ctrl+R</source>
+        <translation>Ctrl+R</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="303"/>
+        <location filename="../build/ui_mainwindow.h" line="498"/>
+        <source>Auto &amp;group</source>
+        <translation>Автоматично &amp;групиране</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="308"/>
+        <location filename="../build/ui_mainwindow.h" line="499"/>
+        <source>&amp;Yearly statistics</source>
+        <translation>Годишни &amp;статистики</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="311"/>
+        <location filename="../build/ui_mainwindow.h" line="500"/>
+        <source>Ctrl+Y</source>
+        <translation>Ctrl+Y</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="316"/>
+        <location filename="../build/ui_mainwindow.h" line="501"/>
+        <source>&amp;Dive list</source>
+        <translation>&amp;Списък на гмуркания</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="319"/>
+        <location filename="../build/ui_mainwindow.h" line="502"/>
+        <source>Ctrl+2</source>
+        <translation>Ctrl+2</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="324"/>
         <location filename="../build/ui_mainwindow.h" line="503"/>
         <source>&amp;Profile</source>
         <translation>&amp;Профил</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="333"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="327"/>
+        <location filename="../build/ui_mainwindow.h" line="504"/>
+        <source>Ctrl+3</source>
+        <translation>Ctrl+3</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="332"/>
         <location filename="../build/ui_mainwindow.h" line="505"/>
         <source>&amp;Info</source>
         <translation>&amp;Информация</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="341"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="335"/>
+        <location filename="../build/ui_mainwindow.h" line="506"/>
+        <source>Ctrl+4</source>
+        <translation>Ctrl+4</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="340"/>
         <location filename="../build/ui_mainwindow.h" line="507"/>
         <source>&amp;All</source>
         <translation>&amp;Всички</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="357"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="343"/>
+        <location filename="../build/ui_mainwindow.h" line="508"/>
+        <source>Ctrl+1</source>
+        <translation>Ctrl+1</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="348"/>
+        <location filename="../build/ui_mainwindow.h" line="509"/>
+        <source>P&amp;revious DC</source>
+        <translation>&amp;Предишен ГК</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="351"/>
+        <location filename="../build/ui_mainwindow.h" line="510"/>
+        <source>Left</source>
+        <translation>Ляво</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="356"/>
         <location filename="../build/ui_mainwindow.h" line="511"/>
         <source>&amp;Next DC</source>
         <translation>&amp;Следващ ГК</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="365"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="359"/>
+        <location filename="../build/ui_mainwindow.h" line="512"/>
+        <source>Right</source>
+        <translation>Дясно</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="364"/>
         <location filename="../build/ui_mainwindow.h" line="513"/>
         <source>&amp;About Subsurface</source>
         <translation>&amp;За Subsurface</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="381"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="372"/>
+        <location filename="../build/ui_mainwindow.h" line="514"/>
+        <source>User &amp;manual</source>
+        <translation>Ръководство за &amp;потребителя</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="375"/>
+        <location filename="../build/ui_mainwindow.h" line="515"/>
+        <source>F1</source>
+        <translation>F1</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="380"/>
         <location filename="../build/ui_mainwindow.h" line="516"/>
         <source>&amp;Globe</source>
         <translation>&amp;Глобус</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="403"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="383"/>
+        <location filename="../build/ui_mainwindow.h" line="517"/>
+        <source>Ctrl+5</source>
+        <translation>Ctrl+5</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="388"/>
+        <location filename="../build/ui_mainwindow.h" line="518"/>
+        <source>P&amp;lan dive</source>
+        <translation>&amp;Планирай гмуркане</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="391"/>
+        <location filename="../build/ui_mainwindow.h" line="519"/>
+        <source>Ctrl+L</source>
+        <translation>Ctrl+L</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="396"/>
+        <location filename="../build/ui_mainwindow.h" line="520"/>
+        <source>&amp;Import log files</source>
+        <translation>&amp;Вмъкни регистър файлове</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="399"/>
+        <location filename="../build/ui_mainwindow.h" line="522"/>
+        <source>Import divelog files from other applications</source>
+        <translation>Вмъкни регистър файлове от други приложения</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="402"/>
         <location filename="../build/ui_mainwindow.h" line="524"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="408"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="407"/>
         <location filename="../build/ui_mainwindow.h" line="525"/>
         <source>Import &amp;from divelogs.de</source>
         <translation>&amp;Вмъкни от divelogs.de</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="416"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="415"/>
         <location filename="../build/ui_mainwindow.h" line="526"/>
         <source>&amp;Full screen</source>
         <translation>&amp;Цял екран</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="419"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="418"/>
         <location filename="../build/ui_mainwindow.h" line="528"/>
         <source>Toggle full screen</source>
         <translation>Превключи цял екран</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="447"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="421"/>
+        <location filename="../build/ui_mainwindow.h" line="530"/>
+        <source>F11</source>
+        <translation>F11</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="446"/>
         <location filename="../build/ui_mainwindow.h" line="531"/>
         <source>&amp;Check for updates</source>
         <translation>&amp;Провери за обновления</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="452"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="451"/>
         <location filename="../build/ui_mainwindow.h" line="532"/>
         <source>&amp;Export</source>
         <translation>&amp;Експорт</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="458"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="454"/>
+        <location filename="../build/ui_mainwindow.h" line="534"/>
+        <source>Export dive logs</source>
+        <translation>Експорт на гмуркачески регистри</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="457"/>
         <location filename="../build/ui_mainwindow.h" line="536"/>
         <source>Ctrl+E</source>
         <translation>Ctrl+E</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="466"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="462"/>
+        <location filename="../build/ui_mainwindow.h" line="537"/>
+        <source>Configure &amp;dive computer</source>
+        <translation>Настрой &amp;леководолазен комютър</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="465"/>
         <location filename="../build/ui_mainwindow.h" line="538"/>
         <source>Ctrl+Shift+C</source>
         <translation>Ctrl+Shift+C</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="474"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="473"/>
         <location filename="../build/ui_mainwindow.h" line="539"/>
         <source>Edit &amp;dive in planner</source>
         <translation>Редакция на гмуркането в плановика</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="486"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="485"/>
         <location filename="../build/ui_mainwindow.h" line="540"/>
         <source>Toggle pO₂ graph</source>
         <translation>Превключи pО₂ диаграма</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="498"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="497"/>
         <location filename="../build/ui_mainwindow.h" line="541"/>
         <source>Toggle pN₂ graph</source>
         <translation>Превключи pN₂ диаграма</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="642"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="509"/>
+        <location filename="../build/ui_mainwindow.h" line="542"/>
+        <source>Toggle pHe graph</source>
+        <translation>Превключи pHе диаграма</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="521"/>
+        <location filename="../build/ui_mainwindow.h" line="543"/>
+        <source>Toggle DC reported ceiling</source>
+        <translation>Превключи отчетен таван на гмуркачески компютър</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="533"/>
+        <location filename="../build/ui_mainwindow.h" line="544"/>
+        <source>Toggle calculated ceiling</source>
+        <translation>Превключи калкулиран таван</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="545"/>
+        <location filename="../build/ui_mainwindow.h" line="545"/>
+        <source>Toggle calculating all tissues</source>
+        <translation>Превключи калкулация на всички тъкани</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="557"/>
+        <location filename="../build/ui_mainwindow.h" line="546"/>
+        <source>Toggle calculated ceiling with 3m increments</source>
+        <translation>Превключи калкулиран таван с 3м нарастване</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="569"/>
+        <location filename="../build/ui_mainwindow.h" line="547"/>
+        <source>Toggle heart rate</source>
+        <translation>Превключи показване на пулс</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="581"/>
+        <location filename="../build/ui_mainwindow.h" line="548"/>
+        <source>Toggle MOD</source>
+        <translation>Превключи MOD</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="593"/>
+        <location filename="../build/ui_mainwindow.h" line="549"/>
+        <source>Toggle EAD, END, EADD</source>
+        <translation>Превключи EAD, END, EADD</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="605"/>
+        <location filename="../build/ui_mainwindow.h" line="550"/>
+        <source>Toggle NDL, TTS</source>
+        <translation>Превключи NDL. TTS</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="617"/>
+        <location filename="../build/ui_mainwindow.h" line="551"/>
+        <source>Toggle SAC rate</source>
+        <translation>Превключи SAC скорост</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="629"/>
+        <location filename="../build/ui_mainwindow.h" line="552"/>
+        <source>Toggle ruler</source>
+        <translation>Превключи линеал</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="641"/>
         <location filename="../build/ui_mainwindow.h" line="553"/>
         <source>Scale graph</source>
         <translation>Скалирай диаграмата</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="654"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="653"/>
         <location filename="../build/ui_mainwindow.h" line="554"/>
         <source>Toggle pictures</source>
         <translation>Превключи изображения</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="666"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="665"/>
         <location filename="../build/ui_mainwindow.h" line="555"/>
         <source>Toggle tank bar</source>
         <translation>Преключи бутилки</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="674"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="673"/>
         <location filename="../build/ui_mainwindow.h" line="556"/>
         <source>&amp;Filter divelist</source>
         <translation>&amp;Филтрирай списъка</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="689"/>
-        <location filename="../build/ui_mainwindow.h" line="558"/>
-        <source>Toggle tissue graph</source>
-        <translation>Превключи тъканна диаграма</translation>
+        <location filename="../desktop-widgets/mainwindow.ui" line="676"/>
+        <location filename="../build/ui_mainwindow.h" line="557"/>
+        <source>Ctrl+F</source>
+        <translation>Ctrl+F</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="694"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="688"/>
+        <source>Toggle tissue heat-map</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="693"/>
         <location filename="../build/ui_mainwindow.h" line="559"/>
         <source>User &amp;survey</source>
         <translation>Потребителско &amp;изследване</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="699"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="698"/>
         <location filename="../build/ui_mainwindow.h" line="560"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="238"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="231"/>
         <source>&amp;Undo</source>
         <translation>&amp;Отмени</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="702"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="701"/>
         <location filename="../build/ui_mainwindow.h" line="561"/>
         <source>Ctrl+Z</source>
         <translation>Ctrl+Z</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="707"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="706"/>
         <location filename="../build/ui_mainwindow.h" line="562"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="239"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="232"/>
         <source>&amp;Redo</source>
         <translation>&amp;Върни</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="710"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="709"/>
         <location filename="../build/ui_mainwindow.h" line="563"/>
         <source>Ctrl+Shift+Z</source>
         <translation>Ctrl+Shift+Z</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="715"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="714"/>
         <location filename="../build/ui_mainwindow.h" line="564"/>
         <source>&amp;Find moved images</source>
         <translation>&amp;Намери преместени изображения</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="720"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="719"/>
         <source>Open c&amp;loud storage</source>
         <translation>&amp;Отвори облаковия склад</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="725"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="724"/>
         <source>Save to clo&amp;ud storage</source>
         <translation>&amp;Запиши в облковия склад</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="730"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="729"/>
         <location filename="../build/ui_mainwindow.h" line="567"/>
         <source>&amp;Manage dive sites</source>
         <translation>&amp;Редакция на места за гмуркане</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="735"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="734"/>
         <source>Dive Site &amp;Edit</source>
         <translation>&amp;Редакция на място за гмуркане</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="740"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="739"/>
         <source>Facebook</source>
         <translation>Facebook</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="745"/>
-        <source>Add GPS location here</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="744"/>
+        <source>Take cloud storage online</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="677"/>
-        <location filename="../build/ui_mainwindow.h" line="557"/>
-        <source>Ctrl+F</source>
-        <translation>Ctrl+F</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="213"/>
-        <location filename="../build/ui_mainwindow.h" line="478"/>
-        <source>&amp;Print</source>
-        <translation>&amp;Напечатай</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="224"/>
-        <location filename="../build/ui_mainwindow.h" line="481"/>
-        <source>Ctrl+,</source>
-        <translation>Ctrl+,</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="232"/>
-        <location filename="../build/ui_mainwindow.h" line="482"/>
-        <source>&amp;Quit</source>
-        <translation>&amp;Изход</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="243"/>
-        <location filename="../build/ui_mainwindow.h" line="484"/>
-        <source>Import from &amp;dive computer</source>
-        <translation>Изтегли от леководолазен &amp;компютър</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="254"/>
-        <location filename="../build/ui_mainwindow.h" line="487"/>
-        <source>Ctrl+G</source>
-        <translation>Ctrl+G</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="267"/>
-        <location filename="../build/ui_mainwindow.h" line="490"/>
-        <source>Ctrl++</source>
-        <translation>Ctrl++</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="293"/>
-        <location filename="../build/ui_mainwindow.h" line="496"/>
-        <source>&amp;Renumber</source>
-        <translation>&amp;Преномерирай</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="296"/>
-        <location filename="../build/ui_mainwindow.h" line="497"/>
-        <source>Ctrl+R</source>
-        <translation>Ctrl+R</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="312"/>
-        <location filename="../build/ui_mainwindow.h" line="500"/>
-        <source>Ctrl+Y</source>
-        <translation>Ctrl+Y</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="392"/>
-        <location filename="../build/ui_mainwindow.h" line="519"/>
-        <source>Ctrl+L</source>
-        <translation>Ctrl+L</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="216"/>
-        <location filename="../build/ui_mainwindow.h" line="479"/>
-        <source>Ctrl+P</source>
-        <translation>Ctrl+P</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="235"/>
-        <location filename="../build/ui_mainwindow.h" line="483"/>
-        <source>Ctrl+Q</source>
-        <translation>Ctrl+Q</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="246"/>
-        <location filename="../build/ui_mainwindow.h" line="485"/>
-        <source>Ctrl+D</source>
-        <translation>Ctrl+D</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="264"/>
-        <location filename="../build/ui_mainwindow.h" line="489"/>
-        <source>&amp;Add dive</source>
-        <translation>Добави гмуркане</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="304"/>
-        <location filename="../build/ui_mainwindow.h" line="498"/>
-        <source>Auto &amp;group</source>
-        <translation>Автоматично &amp;групиране</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="309"/>
-        <location filename="../build/ui_mainwindow.h" line="499"/>
-        <source>&amp;Yearly statistics</source>
-        <translation>Годишни &amp;статистики</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="317"/>
-        <location filename="../build/ui_mainwindow.h" line="501"/>
-        <source>&amp;Dive list</source>
-        <translation>&amp;Списък на гмуркания</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="320"/>
-        <location filename="../build/ui_mainwindow.h" line="502"/>
-        <source>Ctrl+2</source>
-        <translation>Ctrl+2</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="328"/>
-        <location filename="../build/ui_mainwindow.h" line="504"/>
-        <source>Ctrl+3</source>
-        <translation>Ctrl+3</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="336"/>
-        <location filename="../build/ui_mainwindow.h" line="506"/>
-        <source>Ctrl+4</source>
-        <translation>Ctrl+4</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="344"/>
-        <location filename="../build/ui_mainwindow.h" line="508"/>
-        <source>Ctrl+1</source>
-        <translation>Ctrl+1</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="349"/>
-        <location filename="../build/ui_mainwindow.h" line="509"/>
-        <source>P&amp;revious DC</source>
-        <translation>&amp;Предишен ГК</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="352"/>
-        <location filename="../build/ui_mainwindow.h" line="510"/>
-        <source>Left</source>
-        <translation>Ляво</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="360"/>
-        <location filename="../build/ui_mainwindow.h" line="512"/>
-        <source>Right</source>
-        <translation>Дясно</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="373"/>
-        <location filename="../build/ui_mainwindow.h" line="514"/>
-        <source>User &amp;manual</source>
-        <translation>Ръководство за &amp;потребителя</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="376"/>
-        <location filename="../build/ui_mainwindow.h" line="515"/>
-        <source>F1</source>
-        <translation>F1</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="384"/>
-        <location filename="../build/ui_mainwindow.h" line="517"/>
-        <source>Ctrl+5</source>
-        <translation>Ctrl+5</translation>
+        <location filename="../build/ui_mainwindow.h" line="558"/>
+        <source>Toggle tissue graph</source>
+        <translation>Превключи тъканна диаграма</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="389"/>
-        <location filename="../build/ui_mainwindow.h" line="518"/>
-        <source>P&amp;lan dive</source>
-        <translation>&amp;Планирай гмуркане</translation>
+        <location filename="../build/ui_mainwindow.h" line="565"/>
+        <source>Open cloud storage</source>
+        <translation>Отвори облаковия склад</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="397"/>
-        <location filename="../build/ui_mainwindow.h" line="520"/>
-        <source>&amp;Import log files</source>
-        <translation>&amp;Вмъкни регистър файлове</translation>
+        <location filename="../build/ui_mainwindow.h" line="566"/>
+        <source>Save to cloud storage</source>
+        <translation>Запиши в облковия склад</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="400"/>
-        <location filename="../build/ui_mainwindow.h" line="522"/>
-        <source>Import divelog files from other applications</source>
-        <translation>Вмъкни регистър файлове от други приложения</translation>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="331"/>
+        <source>Connect to</source>
+        <translation>Свържи се към</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="422"/>
-        <location filename="../build/ui_mainwindow.h" line="530"/>
-        <source>F11</source>
-        <translation>F11</translation>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="493"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="538"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1545"/>
+        <source>Please save or cancel the current dive edit before opening a new file.</source>
+        <translation>Моля запишете или отменете текущата редакция на гмуркане преди да отворите нов файл.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="505"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="499"/>
         <source>Open file</source>
         <translation>Отвори файл</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="509"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="503"/>
         <location filename="../desktop-widgets/mainwindow.cpp" line="614"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1972"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1978"/>
         <source>Cancel</source>
         <translation>Отмяна</translation>
     </message>
@@ -5254,6 +5358,16 @@ mixed from Air and using:
         <translation>Сканиране за изборажения...(това може да отнеме доста време)</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="649"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="796"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="977"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="983"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1849"/>
+        <source>Warning</source>
+        <translation>Предупреждение</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="674"/>
         <source>Please save or cancel the current dive edit before closing the file.</source>
         <translation>Моля затворете текущата редакция на гмуркане преди да затворите файла.</translation>
@@ -5269,124 +5383,97 @@ mixed from Air and using:
         <translation>Напечатай рунтайм таблица</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="982"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
+        <source>Trying to replan a dive that&apos;s not a planned dive.</source>
+        <translation>Опит за плануване на гмуркане, което не е планувано гмуркане.</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="977"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1849"/>
+        <source>Please, first finish the current edition before trying to do another.</source>
+        <translation>Моля, първо приключете с редакцията преди да започнете нова.</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="983"/>
         <source>Trying to edit a dive that&apos;s not a manually added dive.</source>
         <translation>Опит за редакция на гмуркане, което не е ръчно добавено.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1243"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1030"/>
+        <source>Yearly statistics</source>
+        <translation>Годишни статистики</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1244"/>
         <source>Do you want to save the changes that you made in the file %1?</source>
         <translation>Желаете ли да запишете промените във файла %1?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1246"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1247"/>
         <source>Do you want to save the changes that you made in the data file?</source>
         <translation>Желаете ли да запишете промените във файла с данни?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1251"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1252"/>
         <source>Save changes?</source>
         <translation>Запиши промените?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1587"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1253"/>
+        <source>Changes will be lost if you don&apos;t save them.</source>
+        <translation>Промените ще бъдат изгубени ако не ги запишете.</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1572"/>
         <source>Save file as</source>
         <translation>Запиши файла като</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1682"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1573"/>
+        <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
+        <translation>Subsurface XML файлове (*.ssrf *.xml *.XML)</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1670"/>
+        <source>[local cache for] %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1672"/>
         <source>[cloud storage for] %1</source>
         <translation>[облаков склад за] %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1782"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1788"/>
         <source>Opening datafile from older version</source>
         <translation>Отваряне на файл от стара версия</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1783"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1789"/>
         <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly.
 Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source>
         <translation>Вие отворихте файл от стара версия на Subsurface. Моля прочетете Ръковордството на потребителя за да разберете за промените в новата версия и конкретно за редакцията на места за гмуркане. Subsurface вече се опита да попълни данните автоматично, но би било добре да проверите дали местата за гмуркане са правилни.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1794"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1800"/>
         <source>Open dive log file</source>
         <translation>Отвори регистър файл</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1795"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1801"/>
         <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;All files (*)</source>
-        <translation type="unfinished"/>
+        <translation>Dive log файлове (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran файлове (*.can *.CAN);;CSV файлове (*.csv *.CSV);;DiveLog.de файлове (*.dld *.DLD);;JDiveLog файлове (*.jlb *.JLB);;Liquivision файлове (*.lvd *.LVD);;MkVI файлове (*.txt *.TXT);;Suunto файлове (*.sde *.db *.SDE *.DB);;Divesoft файлове (*.dlf *.DLF);;UDDF/UDCF файлове (*.uddf *.udcf *.UDDF *.UDCF);;XML файлове (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog файлове (*.log *.LOG);;OSTCtools файлове (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;Всички файлове (*)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1972"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1978"/>
         <source>Contacting cloud service...</source>
         <translation>Връзване към обклаковия склад...</translation>
     </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1252"/>
-        <source>Changes will be lost if you don&apos;t save them.</source>
-        <translation>Промените ще бъдат изгубени ако не ги запишете.</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="649"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="796"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="976"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="982"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/>
-        <source>Warning</source>
-        <translation>Предупреждение</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="499"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="544"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1560"/>
-        <source>Please save or cancel the current dive edit before opening a new file.</source>
-        <translation>Моля запишете или отменете текущата редакция на гмуркане преди да отворите нов файл.</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="338"/>
-        <source>Connect to</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
-        <source>Trying to replan a dive that&apos;s not a planned dive.</source>
-        <translation>Опит за плануване на гмуркане, което не е планувано гмуркане.</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1029"/>
-        <source>Yearly statistics</source>
-        <translation>Годишни статистики</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1588"/>
-        <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
-        <translation>Subsurface XML файлове (*.ssrf *.xml *.XML)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="976"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/>
-        <source>Please, first finish the current edition before trying to do another.</source>
-        <translation>Моля, първо приключете с редакцията преди да започнете нова.</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_mainwindow.h" line="565"/>
-        <source>Open cloud storage</source>
-        <translation>Отвори облаковия склад</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_mainwindow.h" line="566"/>
-        <source>Save to cloud storage</source>
-        <translation>Запиши в облковия склад</translation>
-    </message>
 </context>
 <context>
     <name>MultiFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="733"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="731"/>
         <source>Filter shows %1 (of %2) dives</source>
         <translation>Филтърът показва %1 (от %2) гмуркания</translation>
     </message>
@@ -5394,12 +5481,12 @@ Subsurface has already tried to pre-populate the data but it might be worth whil
 <context>
     <name>OstcFirmwareCheck</name>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="269"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="271"/>
         <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source>
         <translation>Препоръчваме да обновите фърмуера на вашия гмуркачески компютър: имате версия %1, а последната стабилна версия е %2</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="273"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="275"/>
         <source>
 
 Please start Bluetooth on your OSTC Sport and do the same preparations as for a logbook download before continuing with the update</source>
@@ -5408,27 +5495,27 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 Моля стартирайте Bluetooth на вашия OSTC Sport и направете настройките за теглене на гмуркачески регистър преди да продължите с обновлението</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="274"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="276"/>
         <source>Not now</source>
         <translation>Не сега</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="275"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="277"/>
         <source>Update firmware</source>
         <translation>Обнови фърмуер</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="277"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="279"/>
         <source>Firmware upgrade notice</source>
         <translation>Уведомление за обновяване на фърмуера</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="295"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="297"/>
         <source>Save the downloaded firmware as</source>
         <translation>Запиши изтегления фърмуер като</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="296"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="298"/>
         <source>HEX files (*.hex)</source>
         <translation>HEX файлове (*.hex)</translation>
     </message>
@@ -5436,79 +5523,89 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PlannerSettingsWidget</name>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="322"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="302"/>
         <source>Open circuit</source>
         <translation>Отворена верига</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="322"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="302"/>
         <source>CCR</source>
         <translation>CCR</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="322"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="302"/>
         <source>pSCR</source>
         <translation>pSCR</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="421"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="388"/>
         <source>ft/min</source>
         <translation>фута/мин</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="422"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="389"/>
         <source>Last stop at 20ft</source>
         <translation>Последен стоп на 20фута</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="423"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="390"/>
         <source>50% avg. depth to 20ft</source>
         <translation>50% средна дълбочина до 20фута</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="424"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="391"/>
         <source>20ft to surface</source>
         <translation>20фута то повърхността</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="426"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="392"/>
+        <source>ft</source>
+        <translation>фута</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="394"/>
         <source>m/min</source>
         <translation>м/мин</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="427"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="395"/>
         <source>Last stop at 6m</source>
         <translation>Последен стоп на 6 метра</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="428"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="396"/>
         <source>50% avg. depth to 6m</source>
         <translation>50% средна дълбочина до 6м</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="429"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="397"/>
         <source>6m to surface</source>
         <translation>6м до повърхността</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="432"/>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="433"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="398"/>
+        <source>m</source>
+        <translation>м</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="401"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="402"/>
         <source>cuft/min</source>
         <translation>кб.фута/мин</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="441"/>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="442"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="410"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="411"/>
         <source>ℓ/min</source>
         <translation>л/мин</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="451"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="420"/>
         <source>bar</source>
         <translation>бара</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="456"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="425"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
@@ -5529,17 +5626,17 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     <message>
         <location filename="../mobile-widgets/qml/Preferences.qml" line="43"/>
         <source>Subsurface GPS data webservice</source>
-        <translation type="unfinished"/>
+        <translation>Subsurface GPS уеб услуга</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/Preferences.qml" line="51"/>
         <source>Distance threshold (meters)</source>
-        <translation type="unfinished"/>
+        <translation>Праг на разстояние (метри)</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/Preferences.qml" line="62"/>
         <source>Time threshold (minutes)</source>
-        <translation type="unfinished"/>
+        <translation>Праг на време (минути)</translation>
     </message>
 </context>
 <context>
@@ -5658,6 +5755,11 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PreferencesDialog</name>
     <message>
+        <location filename="../build/ui_preferences.h" line="1283"/>
+        <source>Preferences</source>
+        <translation>Настройки</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1288"/>
         <source>Defaults</source>
         <translation>По подразбиране</translation>
@@ -5693,6 +5795,11 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>Геореференция</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1303"/>
+        <source>Lists and tables</source>
+        <translation>Списъци и таблици</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1304"/>
         <source>Font</source>
         <translation>Шрифт</translation>
@@ -5708,6 +5815,11 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>Гмуркания</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1307"/>
+        <source>Default dive log file</source>
+        <translation>Файл по подразбиране</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1308"/>
         <source>No default file</source>
         <translation>Няма файл по подразбиране</translation>
@@ -5738,6 +5850,21 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>...</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1314"/>
+        <source>Display invalid</source>
+        <translation>Невалиден дисплей</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1316"/>
+        <source>Default cylinder</source>
+        <translation>Бутилка по подразбиране</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1317"/>
+        <source>Use default cylinder</source>
+        <translation>Използвай бутилка по подразбиране</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1318"/>
         <source>Animations</source>
         <translation>Анимации</translation>
@@ -5768,40 +5895,24 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>Състема</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1401"/>
-        <source>Dive site geo lookup</source>
-        <translation>Гео търсене на място за гмуркане</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1402"/>
-        <source>Enable geocoding for dive site management</source>
-        <translation>Включи геокодиране за редакцията на места за гмуркане</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1403"/>
-        <source>Parse site without GPS data</source>
-        <translation>Разбор на място без GPS данни</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1404"/>
-        <source>Same format for existing dives</source>
-        <translation>Същия формат за съществуващи гмуркания</translation>
+        <location filename="../build/ui_preferences.h" line="1324"/>
+        <source>&amp;Metric</source>
+        <translation>&amp;Метрична</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1405"/>
-        <source>Dive Site Layout</source>
-        <translation>Оформление на мяста за гмуркане</translation>
+        <location filename="../build/ui_preferences.h" line="1325"/>
+        <source>Imperial</source>
+        <translation>Империална</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1406"/>
-        <location filename="../build/ui_preferences.h" line="1407"/>
-        <source>/</source>
-        <translation>/</translation>
+        <location filename="../build/ui_preferences.h" line="1326"/>
+        <source>Personali&amp;ze</source>
+        <translation>&amp;Персонализация</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1325"/>
-        <source>Imperial</source>
-        <translation>Империална</translation>
+        <location filename="../build/ui_preferences.h" line="1327"/>
+        <source>Individual settings</source>
+        <translation>Индивидуални настройки</translation>
     </message>
     <message>
         <location filename="../build/ui_preferences.h" line="1328"/>
@@ -5819,6 +5930,11 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>фута</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1331"/>
+        <source>Pressure</source>
+        <translation>Налягане</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1332"/>
         <location filename="../build/ui_preferences.h" line="1366"/>
         <source>bar</source>
@@ -5830,11 +5946,26 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>psi</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1334"/>
+        <source>Volume</source>
+        <translation>Обем</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1335"/>
+        <source>&amp;liter</source>
+        <translation>&amp;литра</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1336"/>
         <source>cu ft</source>
         <translation>кб. фут</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1337"/>
+        <source>Temperature</source>
+        <translation>Температура:</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1338"/>
         <source>celsius</source>
         <translation>целзии</translation>
@@ -5845,11 +5976,121 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>фаренхайт</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1340"/>
+        <source>Weight</source>
+        <translation>Тежест</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1341"/>
         <source>kg</source>
         <translation>кг</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1342"/>
+        <source>lbs</source>
+        <translation>паунда</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1343"/>
+        <source>Time units</source>
+        <translation>Единици за време</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1344"/>
+        <source>Ascent/descent speed denominator</source>
+        <translation>Знаменател за скорост на изкачване/спускане</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1345"/>
+        <source>Minutes</source>
+        <translation>Минути</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1346"/>
+        <source>Seconds</source>
+        <translation>Секунди</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1347"/>
+        <source>GPS coordinates</source>
+        <translation>GPS координати</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1348"/>
+        <source>Location Display</source>
+        <translation>Дисплей на местонахождение:</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1349"/>
+        <source>traditional (dms)</source>
+        <translation>традиционен (dms)</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1350"/>
+        <source>decimal</source>
+        <translation>десетичен</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1351"/>
+        <source>Show</source>
+        <translation>Покажи</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1352"/>
+        <source>Threshold when showing pO₂</source>
+        <translation>Праг при показване на pO₂</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1353"/>
+        <source>Threshold when showing pN₂</source>
+        <translation>Праг при показване на pN₂</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1354"/>
+        <source>Threshold when showing pHe</source>
+        <translation>Праг при показване на pHe</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1355"/>
+        <source>Max pO₂ when showing MOD</source>
+        <translation>Макс. pO₂ при показване на MOD</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1356"/>
+        <source>Draw dive computer reported ceiling red</source>
+        <translation>Покажи таван на гмуркачески компютър в червено</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1357"/>
+        <source>Show unused cylinders in Equipment tab</source>
+        <translation>Покажи неизползвани бутилки в екипировка</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1358"/>
+        <source>Show average depth</source>
+        <translation>Покажи средна дълбочина</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1359"/>
+        <source>Misc</source>
+        <translation>Общи</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1360"/>
+        <source>GFLow</source>
+        <translation>GFLow</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1361"/>
+        <source>GFHigh</source>
+        <translation>GFHigh</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1362"/>
+        <source>GFLow at max depth</source>
+        <translation>GFLow на макс. дълбочина</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1363"/>
         <source>CCR: show setpoints when viewing pO₂</source>
         <translation>CCR: покажи сетпойнт за pO₂</translation>
@@ -5895,14 +6136,19 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>По подразбиране на системата</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1374"/>
+        <source>Filter</source>
+        <translation>Филтър</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1375"/>
         <source>Proxy</source>
         <translation>Прокси</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1379"/>
-        <source>Proxy type</source>
-        <translation>Прокси тип</translation>
+        <location filename="../build/ui_preferences.h" line="1376"/>
+        <source>Port</source>
+        <translation>Порт</translation>
     </message>
     <message>
         <location filename="../build/ui_preferences.h" line="1377"/>
@@ -5910,16 +6156,16 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>Хост</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1376"/>
-        <source>Port</source>
-        <translation>Порт</translation>
-    </message>
-    <message>
         <location filename="../build/ui_preferences.h" line="1378"/>
         <source>Requires authentication</source>
         <translation>Изисква автентификация</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1379"/>
+        <source>Proxy type</source>
+        <translation>Прокси тип</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1380"/>
         <source>Username</source>
         <translation>Потребителско име</translation>
@@ -5931,46 +6177,6 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>Парола</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1400"/>
-        <source>Disconnect from Facebook</source>
-        <translation>Прекъсване на връзката с Facebook</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1374"/>
-        <source>Filter</source>
-        <translation>Филтър</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1331"/>
-        <source>Pressure</source>
-        <translation>Налягане</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1303"/>
-        <source>Lists and tables</source>
-        <translation>Списъци и таблици</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1307"/>
-        <source>Default dive log file</source>
-        <translation>Файл по подразбиране</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1314"/>
-        <source>Display invalid</source>
-        <translation>Невалиден дисплей</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1316"/>
-        <source>Default cylinder</source>
-        <translation>Бутилка по подразбиране</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1317"/>
-        <source>Use default cylinder</source>
-        <translation>Използвай бутилка по подразбиране</translation>
-    </message>
-    <message>
         <location filename="../build/ui_preferences.h" line="1382"/>
         <source>Subsurface cloud storage</source>
         <translation>Subsurface облков склад</translation>
@@ -6011,149 +6217,40 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>Запази потребителски ID локално</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1334"/>
-        <source>Volume</source>
-        <translation>Обем</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1337"/>
-        <source>Temperature</source>
-        <translation>Температура:</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1340"/>
-        <source>Weight</source>
-        <translation>Тежест</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1342"/>
-        <source>lbs</source>
-        <translation>паунда</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1343"/>
-        <source>Time units</source>
-        <translation>Единици за време</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1345"/>
-        <source>Minutes</source>
-        <translation>Минути</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1346"/>
-        <source>Seconds</source>
-        <translation>Секунди</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1351"/>
-        <source>Show</source>
-        <translation>Покажи</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1362"/>
-        <source>GFLow at max depth</source>
-        <translation>GFLow на макс. дълбочина</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1359"/>
-        <source>Misc</source>
-        <translation>Общи</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1283"/>
-        <source>Preferences</source>
-        <translation>Настройки</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1324"/>
-        <source>&amp;Metric</source>
-        <translation>&amp;Метрична</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1326"/>
-        <source>Personali&amp;ze</source>
-        <translation>&amp;Персонализация</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1327"/>
-        <source>Individual settings</source>
-        <translation>Индивидуални настройки</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1335"/>
-        <source>&amp;liter</source>
-        <translation>&amp;литра</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1344"/>
-        <source>Ascent/descent speed denominator</source>
-        <translation>Знаменател за скорост на изкачване/спускане</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1347"/>
-        <source>GPS coordinates</source>
-        <translation>GPS координати</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1348"/>
-        <source>Location Display</source>
-        <translation>Дисплей на местонахождение:</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1349"/>
-        <source>traditional (dms)</source>
-        <translation>традиционен (dms)</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1350"/>
-        <source>decimal</source>
-        <translation>десетичен</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1352"/>
-        <source>Threshold when showing pO₂</source>
-        <translation>Праг при показване на pO₂</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1353"/>
-        <source>Threshold when showing pN₂</source>
-        <translation>Праг при показване на pN₂</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1354"/>
-        <source>Threshold when showing pHe</source>
-        <translation>Праг при показване на pHe</translation>
+        <location filename="../build/ui_preferences.h" line="1400"/>
+        <source>Disconnect from Facebook</source>
+        <translation>Прекъсване на връзката с Facebook</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1355"/>
-        <source>Max pO₂ when showing MOD</source>
-        <translation>Макс. pO₂ при показване на MOD</translation>
+        <location filename="../build/ui_preferences.h" line="1401"/>
+        <source>Dive site geo lookup</source>
+        <translation>Гео търсене на място за гмуркане</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1356"/>
-        <source>Draw dive computer reported ceiling red</source>
-        <translation>Покажи таван на гмуркачески компютър в червено</translation>
+        <location filename="../build/ui_preferences.h" line="1402"/>
+        <source>Enable geocoding for dive site management</source>
+        <translation>Включи геокодиране за редакцията на места за гмуркане</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1357"/>
-        <source>Show unused cylinders in Equipment tab</source>
-        <translation>Покажи неизползвани бутилки в екипировка</translation>
+        <location filename="../build/ui_preferences.h" line="1403"/>
+        <source>Parse site without GPS data</source>
+        <translation>Разбор на място без GPS данни</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1358"/>
-        <source>Show average depth</source>
-        <translation>Покажи средна дълбочина</translation>
+        <location filename="../build/ui_preferences.h" line="1404"/>
+        <source>Same format for existing dives</source>
+        <translation>Същия формат за съществуващи гмуркания</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1360"/>
-        <source>GFLow</source>
-        <translation>GFLow</translation>
+        <location filename="../build/ui_preferences.h" line="1405"/>
+        <source>Dive Site Layout</source>
+        <translation>Оформление на мяста за гмуркане</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1361"/>
-        <source>GFHigh</source>
-        <translation>GFHigh</translation>
+        <location filename="../build/ui_preferences.h" line="1406"/>
+        <location filename="../build/ui_preferences.h" line="1407"/>
+        <source>/</source>
+        <translation>/</translation>
     </message>
 </context>
 <context>
@@ -6209,106 +6306,136 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="20"/>
-        <source>Show</source>
-        <translation>Покажи</translation>
+        <source>Gas pressure display setup</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="29"/>
-        <source>Threshold when showing pO₂</source>
-        <translation>Праг при показване на pO₂</translation>
+        <source>Threshold for pO₂ (bar)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="49"/>
-        <source>Threshold when showing pN₂</source>
-        <translation>Праг при показване на pN₂</translation>
+        <source>Threshold for pN₂ (bar)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="69"/>
-        <source>Threshold when showing pHe</source>
-        <translation>Праг при показване на pHe</translation>
+        <source>Threshold for pHe (bar)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="89"/>
-        <source>Max pO₂ when showing MOD</source>
-        <translation>Макс. pO₂ при показване на MOD</translation>
+        <source>pO₂ in calculating MOD (bar)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="106"/>
+        <source>CCR options:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="113"/>
+        <source>Dive planner default setpoint (bar)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="133"/>
+        <source>Show setpoints when viewing pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="140"/>
+        <source>Show individual O₂ sensor values when viewing pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="150"/>
+        <source>Ceiling display setup</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="109"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="159"/>
         <source>Draw dive computer reported ceiling red</source>
         <translation>Покажи таван на гмуркачески компютър в червено</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="116"/>
-        <source>Show unused cylinders in Equipment tab</source>
-        <translation>Покажи неизползвани бутилки в екипировка</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="169"/>
+        <source>Algorithm for calculated ceiling:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="123"/>
-        <source>Show mean depth</source>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="176"/>
+        <source>VPM-B</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="133"/>
-        <source>Misc</source>
-        <translation>Общи</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="183"/>
+        <source>VPM-B Conservatism</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="149"/>
-        <source>bar</source>
-        <translation>бара</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="193"/>
+        <source>+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="165"/>
-        <source>Default CCR set-point for dive planning</source>
-        <translation>Стандартен CCR сетпойнт за плануване на гмуркане</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="206"/>
+        <source>Bühlmann</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="172"/>
-        <source>pSCR O₂ metabolism rate</source>
-        <translation>pSCR O₂ честота от метаболизъм</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="216"/>
+        <source>GFHigh</source>
+        <translation>GFHigh</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="179"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="236"/>
         <source>GFLow</source>
         <translation>GFLow</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="186"/>
-        <source>GFHigh</source>
-        <translation>GFHigh</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="256"/>
+        <source>GFLow at max depth</source>
+        <translation>GFLow на макс. дълбочина</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="203"/>
-        <source>ℓ/min</source>
-        <translation>л/мин.</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="263"/>
+        <source>pSCR options:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="213"/>
-        <source>pSCR ratio</source>
-        <translation>pSCR съотношение</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="270"/>
+        <source>Metabolic rate (ℓ O₂/min)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="287"/>
+        <source>Dilution ratio</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="223"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="300"/>
         <source>1:</source>
         <translation>1:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="230"/>
-        <source>CCR: show individual O₂ sensor values when viewing pO₂</source>
-        <translation>CCR: покажи индивидуални O₂ сензор стойности за pO₂</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="310"/>
+        <source>Misc</source>
+        <translation>Общи</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="237"/>
-        <source>CCR: show setpoints when viewing pO₂</source>
-        <translation>CCR: покажи сетпойнт за pO₂</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="316"/>
+        <source>Show unused cylinders in Equipment tab</source>
+        <translation>Покажи неизползвани бутилки в екипировка</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="244"/>
-        <source>GFLow at max depth</source>
-        <translation>GFLow на макс. дълбочина</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="323"/>
+        <source>Show mean depth in Profile</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="10"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="9"/>
         <source>Graph</source>
         <translation>Диаграма</translation>
     </message>
@@ -6328,7 +6455,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     <message>
         <location filename="../desktop-widgets/preferences/prefs_language.ui" line="32"/>
         <source>Use system default</source>
-        <translation type="unfinished"/>
+        <translation>По подразбиране на системата</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/prefs_language.ui" line="55"/>
@@ -6343,23 +6470,23 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     <message>
         <location filename="../desktop-widgets/preferences/prefs_language.ui" line="80"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Preferred date format. Commonly used fields are&lt;/p&gt;&lt;p&gt;d (day of month)&lt;/p&gt;&lt;p&gt;ddd (abbr. day name)&lt;/p&gt;&lt;p&gt;M (month number)&lt;/p&gt;&lt;p&gt;MMM (abbr. month name)&lt;/p&gt;&lt;p&gt;yy/yyyy (2/4 digit year)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Предпочитан формат на дата. Често използвани полета са&lt;/p&gt;&lt;p&gt;d (ден от месеца)&lt;/p&gt;&lt;p&gt;ddd (абрев. на ден)&lt;/p&gt;&lt;p&gt;M (номер на месеца)&lt;/p&gt;&lt;p&gt;MMM (абрев. на месеца)&lt;/p&gt;&lt;p&gt;yy/yyyy (2/4 цифрова година)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/prefs_language.ui" line="87"/>
         <location filename="../desktop-widgets/preferences/prefs_language.ui" line="135"/>
         <source>Use UI language default</source>
-        <translation type="unfinished"/>
+        <translation>Изполвай UI език по подразбиране</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/prefs_language.ui" line="97"/>
         <source>This is used in places where there is less space to show the full date</source>
-        <translation type="unfinished"/>
+        <translation>Това се използва на места, където няма пространство за да се покаже пълната дата</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/prefs_language.ui" line="100"/>
         <source>Short format</source>
-        <translation type="unfinished"/>
+        <translation>Къс формат</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/prefs_language.ui" line="129"/>
@@ -6369,7 +6496,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     <message>
         <location filename="../desktop-widgets/preferences/prefs_language.ui" line="142"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Preferred time format&lt;/p&gt;&lt;p&gt;Commonly used format specifiers are&lt;/p&gt;&lt;p&gt;h (hours in 12h format)&lt;/p&gt;&lt;p&gt;H (hours in 24h format)&lt;/p&gt;&lt;p&gt;mm (2 digit minutes)&lt;/p&gt;&lt;p&gt;ss (2 digit seconds)&lt;/p&gt;&lt;p&gt;t/tt (a/p or am/pm)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Предпочитан формат на време&lt;/p&gt;&lt;p&gt;Често използвани полета са&lt;/p&gt;&lt;p&gt;h (час в 12 часов формат)&lt;/p&gt;&lt;p&gt;H (час в 24 часов формат)&lt;/p&gt;&lt;p&gt;mm (двуцифрени минути)&lt;/p&gt;&lt;p&gt;ss (двуцифрени секунди)&lt;/p&gt;&lt;p&gt;t/tt (a/p или am/pm)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="12"/>
@@ -6377,15 +6504,29 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>Език</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="57"/>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="53"/>
         <source>Restart required</source>
         <translation>Нужен рестарт</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="58"/>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="54"/>
         <source>To correctly load a new language you must restart Subsurface.</source>
         <translation>За да смените успешно език е необходим рестарт на Subsurface.</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="76"/>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="82"/>
+        <source>Literal characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="77"/>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="83"/>
+        <source>Non-special character(s) in time format.
+These will be used as is. This might not be what you intended.
+See http://doc.qt.io/qt-5/qdatetime.html#toString</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PreferencesNetwork</name>
@@ -6432,7 +6573,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_network.ui" line="156"/>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="148"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="134"/>
         <source>Subsurface cloud storage</source>
         <translation>Subsurface облков склад</translation>
     </message>
@@ -6477,39 +6618,39 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>Запази потребителски ID локално</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="11"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="10"/>
         <source>Network</source>
         <translation>Мрежа</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="15"/>
         <source>No proxy</source>
         <translation>Без прокси</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/>
         <source>System proxy</source>
         <translation>Системно прокси</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/>
         <source>HTTP proxy</source>
         <translation>HTTP прокси</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="19"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/>
         <source>SOCKS proxy</source>
         <translation>SOCKS прокси</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="75"/>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="97"/>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="110"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="72"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="93"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="106"/>
         <source>Cloud storage email and password can only consist of letters, numbers, and &apos;.&apos;, &apos;-&apos;, &apos;_&apos;, and &apos;+&apos;.</source>
         <translation>Е-мейла и паролата за облаковия склад могат да съдържат букви, числа, &apos;.&apos;, &apos;-&apos;, &apos;_&apos; и &apos;+&apos;.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="146"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="132"/>
         <source>Subsurface cloud storage (credentials verified)</source>
         <translation>Subsurface облков склад (паролата проверена)</translation>
     </message>
@@ -6667,7 +6808,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>десетичен</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="8"/>
+        <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="7"/>
         <source>Units</source>
         <translation>Единици</translation>
     </message>
@@ -6675,17 +6816,17 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PrintDialog</name>
     <message>
-        <location filename="../desktop-widgets/printdialog.cpp" line="118"/>
-        <source>&amp;Preview</source>
-        <translation>&amp;Преглед</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/printdialog.cpp" line="115"/>
+        <location filename="../desktop-widgets/printdialog.cpp" line="102"/>
         <source>P&amp;rint</source>
         <translation>Пе&amp;чатане</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/printdialog.cpp" line="130"/>
+        <location filename="../desktop-widgets/printdialog.cpp" line="105"/>
+        <source>&amp;Preview</source>
+        <translation>&amp;Преглед</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/printdialog.cpp" line="117"/>
         <source>Print</source>
         <translation>Напечатай</translation>
     </message>
@@ -6693,19 +6834,10 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PrintOptions</name>
     <message>
-        <location filename="../build/ui_printoptions.h" line="150"/>
-        <source>&amp;Table print</source>
-        <translation>&amp;Печат на таблица</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_printoptions.h" line="158"/>
-        <source>One dive per page</source>
-        <translation>Едно гмуркане на страница</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_printoptions.h" line="159"/>
-        <source>Two dives per page</source>
-        <translation>Две гмуркания на страница</translation>
+        <location filename="../desktop-widgets/printoptions.ui" line="29"/>
+        <location filename="../build/ui_printoptions.h" line="148"/>
+        <source>Print type</source>
+        <translation>Тип на печата</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/printoptions.ui" line="41"/>
@@ -6765,10 +6897,19 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>Импорт</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/printoptions.ui" line="29"/>
-        <location filename="../build/ui_printoptions.h" line="148"/>
-        <source>Print type</source>
-        <translation>Тип на печата</translation>
+        <location filename="../build/ui_printoptions.h" line="150"/>
+        <source>&amp;Table print</source>
+        <translation>&amp;Печат на таблица</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_printoptions.h" line="158"/>
+        <source>One dive per page</source>
+        <translation>Едно гмуркане на страница</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_printoptions.h" line="159"/>
+        <source>Two dives per page</source>
+        <translation>Две гмуркания на страница</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/printoptions.cpp" line="128"/>
@@ -6810,103 +6951,103 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>Непознат гмуркачески компютър</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="755"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="752"/>
         <source>Show NDL / TTS was disabled because of excessive processing time</source>
         <translation>Показването на NDL / TTS бе изключено поради прекалено дълго време за обработка на данните</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1344"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1338"/>
         <source>Make first divecomputer</source>
         <translation>Направи първи гмуркачески компютър</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1346"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1340"/>
         <source>Delete this divecomputer</source>
         <translation>Изтрий този гмуркачески компютър</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1360"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1354"/>
         <source>Add gas change</source>
         <translation>Добави промяна на газа</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1363"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1357"/>
         <source> (Tank %1)</source>
         <translation>(Танк %1)</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1371"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1365"/>
         <source>Add set-point change</source>
         <translation>Добави set-point промяна</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1373"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1367"/>
         <source>Add bookmark</source>
         <translation>Добави бележка</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1377"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1371"/>
         <source>Edit the profile</source>
         <translation>Редакция на профил</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1381"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1375"/>
         <source>Remove event</source>
         <translation>Премахни събитие</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1386"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1380"/>
         <source>Hide similar events</source>
         <translation>Премахни малки събития</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1393"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1387"/>
         <source>Edit name</source>
         <translation>Редактирай име</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1422"/>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1429"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1416"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1423"/>
         <source>Adjust pressure of tank %1 (currently interpolated as %2)</source>
         <translation>Промени налягането на бутилка %1 (текущо интерполирана като %2)</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1444"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1438"/>
         <source>Unhide all events</source>
         <translation>Покажи всички събития</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1479"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1473"/>
         <source>Hide events</source>
         <translation>Скрий събития</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1479"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1473"/>
         <source>Hide all %1 events?</source>
         <translation>Скрий всички %1 събития?</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1514"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1508"/>
         <source>Remove the selected event?</source>
         <translation>Премахни избраните събития?</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1515"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1509"/>
         <source>%1 @ %2:%3</source>
         <translation>%1 @ %2:%3</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1638"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1632"/>
         <source>Edit name of bookmark</source>
         <translation>Редактирай име в показалец</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1639"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1633"/>
         <source>Custom name:</source>
         <translation>Потребителско име:</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1644"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1638"/>
         <source>Name is too long!</source>
         <translation> Името е прекалено дълго!</translation>
     </message>
@@ -6914,218 +7055,228 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>QMLManager</name>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="95"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="97"/>
         <source>Starting...</source>
-        <translation type="unfinished"/>
+        <translation>Стартиране...</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="202"/>
         <source>working in no-cloud mode</source>
-        <translation type="unfinished"/>
+        <translation>режим на работа без облак</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="213"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="216"/>
         <source>no cloud credentials</source>
-        <translation type="unfinished"/>
+        <translation>няма облакови пълномощия</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="214"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="270"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="217"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="269"/>
         <source>Please enter valid cloud credentials.</source>
-        <translation type="unfinished"/>
+        <translation>Моля въведете валидни облакови пълномощия</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="285"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="284"/>
         <source>Attempting to open cloud storage with new credentials</source>
-        <translation type="unfinished"/>
+        <translation>Опит за отваряна не облаковия склад с нови пълномощия</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="304"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="306"/>
         <source>Testing cloud credentials</source>
+        <translation>Тестване на облакови пълномощия</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="320"/>
+        <source>No response from cloud server to validate the credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="331"/>
-        <source>Cloud credentials are invalid</source>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="329"/>
+        <source>Cannot connect to cloud storage - cloud account not verified</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="344"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="361"/>
+        <source>Cloud credentials are invalid</source>
+        <translation>Облаковите пълномощия са невалидни</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="374"/>
         <source>Cannot open cloud storage: Error creating https connection</source>
-        <translation type="unfinished"/>
+        <translation>Облаковия склад не може да бъде отворен: грешка в HTTPS връзката</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="357"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="387"/>
         <source>Cannot open cloud storage: %1</source>
-        <translation type="unfinished"/>
+        <translation>Облаковия склад не може да бъде отворен: %1</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="369"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="399"/>
         <source>Cannot connect to cloud storage</source>
-        <translation type="unfinished"/>
+        <translation>Няма връзка към облаковия слад</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="411"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="441"/>
         <source>Cloud storage error: %1</source>
-        <translation type="unfinished"/>
+        <translation>Грешка в облаков слад: %1</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="501"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="531"/>
         <source>Failed to connect to cloud server, reverting to no cloud status</source>
-        <translation type="unfinished"/>
+        <translation>Не може да бъде осъществена връзка с облаковия слад</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="520"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="550"/>
         <source>Cloud storage open successfully. No dives in dive list.</source>
-        <translation type="unfinished"/>
+        <translation>Облаковия слад беше отворен успешно. Няма гмуркания в регистъра.</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="689"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="690"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="721"/>
         <source>h</source>
-        <translation type="unfinished"/>
+        <translation>ч.</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="689"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="690"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="691"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="721"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="722"/>
         <source>min</source>
         <translation>мин</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="689"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/>
         <source>sec</source>
-        <translation type="unfinished"/>
+        <translation>сек.</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="1041"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="1102"/>
         <source>Unknown GPS location</source>
-        <translation type="unfinished"/>
+        <translation>Непозната GPS позиция</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../core/qthelper.cpp" line="866"/>
-        <location filename="../core/qthelper.cpp" line="1214"/>
-        <source>AIR</source>
-        <translation>Въздух</translation>
+        <location filename="../core/gpslocation.h" line="13"/>
+        <source>Waiting to aquire GPS location</source>
+        <translation>Усвояване на GPS позиция</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="1214"/>
-        <source>OXYGEN</source>
-        <translation>КИСЛОРОД</translation>
+        <location filename="../core/qthelper.cpp" line="766"/>
+        <location filename="../core/qthelper.cpp" line="1275"/>
+        <source>m</source>
+        <translation>м</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="59"/>
-        <source>Remove this point</source>
-        <translation>Изтрий тази точка</translation>
+        <location filename="../core/qthelper.cpp" line="768"/>
+        <location filename="../core/qthelper.cpp" line="1274"/>
+        <source>ft</source>
+        <translation>фута</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="32"/>
-        <source>Average</source>
-        <translation>Средно</translation>
+        <location filename="../core/qthelper.cpp" line="794"/>
+        <source>C</source>
+        <translation>C</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="35"/>
-        <source>Minimum</source>
-        <translation>Минимум</translation>
+        <location filename="../core/qthelper.cpp" line="796"/>
+        <source>F</source>
+        <translation>F</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="38"/>
-        <source>Maximum</source>
-        <translation>Максимум</translation>
+        <location filename="../core/qthelper.cpp" line="821"/>
+        <location filename="../core/qthelper.cpp" line="1250"/>
+        <source>kg</source>
+        <translation>кг</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/globe.cpp" line="327"/>
-        <source>Move the map and double-click to set the dive location</source>
-        <translation>Кликнете два пъти на глобус картата за да дефинирате местонахождение на гмуркането.</translation>
+        <location filename="../core/qthelper.cpp" line="823"/>
+        <location filename="../core/qthelper.cpp" line="1251"/>
+        <source>lbs</source>
+        <translation>паунда</translation>
     </message>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="28"/>
-        <source>unknown</source>
-        <translation>неизвестно</translation>
+        <location filename="../core/qthelper.cpp" line="848"/>
+        <location filename="../core/qthelper.cpp" line="1300"/>
+        <source>bar</source>
+        <translation>бара</translation>
     </message>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="105"/>
-        <source>h:</source>
-        <translation>ч:</translation>
+        <location filename="../core/qthelper.cpp" line="850"/>
+        <location filename="../core/qthelper.cpp" line="1299"/>
+        <source>psi</source>
+        <translation>psi</translation>
     </message>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="105"/>
-        <source>min</source>
-        <translation>мин</translation>
+        <location filename="../core/qthelper.cpp" line="871"/>
+        <location filename="../core/qthelper.cpp" line="1235"/>
+        <source>AIR</source>
+        <translation>Въздух</translation>
     </message>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="337"/>
-        <source>Multiple</source>
-        <translation type="unfinished"/>
+        <location filename="../core/qthelper.cpp" line="873"/>
+        <source>EAN</source>
+        <translation>EAN</translation>
     </message>
     <message numerus="yes">
-        <location filename="../core/qthelper.cpp" line="957"/>
+        <location filename="../core/qthelper.cpp" line="962"/>
         <source>(%n dive(s))</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="816"/>
-        <location filename="../core/qthelper.cpp" line="1228"/>
-        <source>kg</source>
-        <translation>кг</translation>
+        <location filename="../core/qthelper.cpp" line="1235"/>
+        <source>OXYGEN</source>
+        <translation>КИСЛОРОД</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="818"/>
-        <location filename="../core/qthelper.cpp" line="1229"/>
-        <source>lbs</source>
-        <translation>паунда</translation>
+        <location filename="../core/qthelper.cpp" line="1322"/>
+        <source>l</source>
+        <translation>л</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="763"/>
-        <location filename="../core/qthelper.cpp" line="1252"/>
-        <source>ft</source>
-        <translation>фута</translation>
+        <location filename="../core/qthelper.cpp" line="1323"/>
+        <source>cuft</source>
+        <translation>кб.фута</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="761"/>
-        <location filename="../core/qthelper.cpp" line="1253"/>
-        <source>m</source>
-        <translation>м</translation>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="29"/>
+        <source>unknown</source>
+        <translation>неизвестно</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="789"/>
-        <source>C</source>
-        <translation>C</translation>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="114"/>
+        <source>h:</source>
+        <translation>ч:</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="791"/>
-        <source>F</source>
-        <translation>F</translation>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="114"/>
+        <source>min</source>
+        <translation>мин</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="845"/>
-        <location filename="../core/qthelper.cpp" line="1275"/>
-        <source>psi</source>
-        <translation>psi</translation>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="63"/>
+        <source>Remove this point</source>
+        <translation>Изтрий тази точка</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="843"/>
-        <location filename="../core/qthelper.cpp" line="1276"/>
-        <source>bar</source>
-        <translation>бара</translation>
+        <location filename="../desktop-widgets/globe.cpp" line="327"/>
+        <source>Move the map and double-click to set the dive location</source>
+        <translation>Кликнете два пъти на глобус картата за да дефинирате местонахождение на гмуркането.</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="868"/>
-        <source>EAN</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="32"/>
+        <source>Average</source>
+        <translation>Средно</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="1298"/>
-        <source>l</source>
-        <translation>л</translation>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="35"/>
+        <source>Minimum</source>
+        <translation>Минимум</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="1299"/>
-        <source>cuft</source>
-        <translation>кб.фута</translation>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="38"/>
+        <source>Maximum</source>
+        <translation>Максимум</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="625"/>
@@ -7147,17 +7298,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <source>Malformed XML response. Line %1: %2</source>
         <translation>Грешен XML отговор. Ред %1: %2</translation>
     </message>
-    <message>
-        <location filename="../core/gpslocation.h" line="13"/>
-        <source>Waiting to aquire GPS location</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>ReadSettingsThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1651"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1676"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1640"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1665"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Тази функционалност не е достъпна за избрания леководолазен комютър.</translation>
     </message>
@@ -7186,7 +7332,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ResetSettingsThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1775"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1764"/>
         <source>Reset settings failed!</source>
         <translation>Изчистването на настройките се провали!</translation>
     </message>
@@ -7224,6 +7370,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ShiftImageTimesDialog</name>
     <message>
+        <location filename="../desktop-widgets/shiftimagetimes.ui" line="23"/>
+        <location filename="../build/ui_shiftimagetimes.h" line="184"/>
+        <source>Shift selected image times</source>
+        <translation>Измести избраните времена</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/shiftimagetimes.ui" line="34"/>
         <location filename="../build/ui_shiftimagetimes.h" line="185"/>
         <source>Shift times of image(s) by</source>
@@ -7236,12 +7388,6 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>ч:мм</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/shiftimagetimes.ui" line="23"/>
-        <location filename="../build/ui_shiftimagetimes.h" line="184"/>
-        <source>Shift selected image times</source>
-        <translation>Измести избраните времена</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/shiftimagetimes.ui" line="105"/>
         <location filename="../build/ui_shiftimagetimes.h" line="187"/>
         <source>Earlier</source>
@@ -7292,12 +7438,12 @@ Not all images have timestamps in the range between
         <translation>Коя дата и час са показани на снимката?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="297"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="296"/>
         <source>Open image file</source>
         <translation>Отвори изображения</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="299"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="298"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>Изображения (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -7393,28 +7539,28 @@ Not all images have timestamps in the range between
     <message>
         <location filename="../smtk-import/smrtk2ssrfc_window.ui" line="20"/>
         <source>SmartTrak files importer</source>
-        <translation type="unfinished"/>
+        <translation>SmartTrak вмъкване на файлове</translation>
     </message>
     <message>
         <location filename="../smtk-import/smrtk2ssrfc_window.ui" line="79"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#6ebeb9;&quot;&gt;Subsurface divelog&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#6ebeb9;&quot;&gt;Subsurface гмуркачески регистър&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location filename="../smtk-import/smrtk2ssrfc_window.ui" line="111"/>
         <location filename="../smtk-import/smrtk2ssrfc_window.ui" line="177"/>
         <source>Choose</source>
-        <translation type="unfinished"/>
+        <translation>Избери</translation>
     </message>
     <message>
         <location filename="../smtk-import/smrtk2ssrfc_window.ui" line="133"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#6ebeb9;&quot;&gt;Smartrak divelog&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#6ebeb9;&quot;&gt;Smartrak гмуркачески регистър&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location filename="../smtk-import/smrtk2ssrfc_window.ui" line="242"/>
         <source>Exit</source>
-        <translation type="unfinished"/>
+        <translation>Изход</translation>
     </message>
     <message>
         <location filename="../smtk-import/smrtk2ssrfc_window.ui" line="270"/>
@@ -7424,85 +7570,85 @@ Not all images have timestamps in the range between
     <message>
         <location filename="../smtk-import/smrtk2ssrfc_window.ui" line="295"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600; color:#6ebeb9;&quot;&gt;Select the .slg file(s) you want to import to Subsurface format, and the exported .xml file. It&apos;s advisable to use a new output file, as its actual content will be erased.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600; color:#6ebeb9;&quot;&gt;Изберете .slg файла (файловете), които искате да бъдат вмъкнати в Subsurface формат и изходящия .xml файл. Изполвайте нов файл или съдържанието на стар такъв ще бъде изтрито.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location filename="../smtk-import/smrtk2ssrfc_window.ui" line="377"/>
         <source>Import messages (Errors, warnings, etc)</source>
-        <translation type="unfinished"/>
+        <translation>Съобщения при вмъкване (грешки, предупреждения и пр.)</translation>
     </message>
     <message>
         <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="50"/>
         <source>Open SmartTrak files</source>
-        <translation type="unfinished"/>
+        <translation>Отварене на SmartTrak файлове</translation>
     </message>
     <message>
         <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="51"/>
         <source>SmartTrak files (*.slg *.SLG);;All files (*)</source>
-        <translation type="unfinished"/>
+        <translation>SmartTrak файлове (*.slg *.SLG);;Всички файлове (*)</translation>
     </message>
     <message>
         <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="62"/>
         <source>Open Subsurface files</source>
-        <translation type="unfinished"/>
+        <translation>Отвори Subsurface файлове</translation>
     </message>
     <message>
         <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="63"/>
         <source>Subsurface files (*.ssrf *SSRF *.xml *.XML);;All files (*)</source>
-        <translation type="unfinished"/>
+        <translation>Subsurface файлове (*.ssrf *SSRF *.xml *.XML);;Всички файлове (*)</translation>
     </message>
 </context>
 <context>
     <name>SocialNetworkDialog</name>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="339"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="284"/>
         <source>Dive date: %1 
 </source>
         <translation>Дата на гмуркане: %1 
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="342"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="287"/>
         <source>Duration: %1 
 </source>
         <translation>Времетраене: %1 
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="343"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="288"/>
         <source>h:</source>
         <comment>abbreviation for hours plus separator</comment>
         <translation>ч:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="344"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="289"/>
         <source>min</source>
         <comment>abbreviation for minutes</comment>
         <translation>мин</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="347"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="292"/>
         <source>Dive location: %1 
 </source>
         <translation>Местонахождение: %1 
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="350"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="295"/>
         <source>Buddy: %1 
 </source>
         <translation>Партньор: %1 
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="353"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="298"/>
         <source>Divemaster: %1 
 </source>
         <translation>Водач: %1 
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="356"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="301"/>
         <source>
 %1</source>
         <translation>
@@ -7588,9 +7734,20 @@ Not all images have timestamps in the range between
     <name>StartPage</name>
     <message>
         <location filename="../mobile-widgets/qml/StartPage.qml" line="19"/>
-        <source>To use Subsurface-mobile with Subsurface cloud storage, please enteryour cloud credentials.
+        <source>To use Subsurface-mobile with Subsurface cloud storage, please enter your cloud credentials.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/StartPage.qml" line="20"/>
+        <source>If this is the first time you use Subsurface cloud storage, enter a valid email (all lower case) and a password of your choice (letters and numbers). The server will send a PIN to the email address provided that you will have to enter here.
 
-To use Subsurface-mobile only with local data on this device, tap on the no cloud icon below.</source>
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/StartPage.qml" line="23"/>
+        <source>To use Subsurface-mobile only with local data on this device, tap on the no cloud icon below.</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -7623,13 +7780,18 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
     <message>
         <location filename="../desktop-widgets/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, Tomaz Canabrava, and others, 2011-2016&lt;/span&gt;</source>
-        <translation type="unfinished"/>
+        <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-2016&lt;/span&gt;</translation>
     </message>
 </context>
 <context>
     <name>SubsurfaceWebServices</name>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="419"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="395"/>
+        <source>Enter User ID and click Download</source>
+        <translation>Въведете потребителски ID и натиснете &quot;Изтегли&quot;</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="417"/>
         <source>Webservice</source>
         <translation>Уеб услуга</translation>
     </message>
@@ -7654,30 +7816,25 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
         <translation>Грешка при връзка: </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="557"/>
-        <source>Download successful</source>
-        <translation>Успешно изтегляне</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="551"/>
         <source>Invalid user identifier!</source>
         <translation>Грешен потребителски ключ</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="397"/>
-        <source>Enter User ID and click Download</source>
-        <translation>Въведете потребителски ID и натиснете &quot;Изтегли&quot;</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="554"/>
         <source>Cannot parse response!</source>
         <translation>Не може да бъде напревен разряд!</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="557"/>
+        <source>Download successful</source>
+        <translation>Успешно изтегляне</translation>
+    </message>
 </context>
 <context>
     <name>SuitFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="674"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="672"/>
         <source>Suits: </source>
         <translation>Костюми:</translation>
     </message>
@@ -7685,7 +7842,7 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>SuitsFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="123"/>
+        <location filename="../qt-models/filtermodels.cpp" line="128"/>
         <source>No suit set</source>
         <translation>Няма избран костюм</translation>
     </message>
@@ -7704,7 +7861,7 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>TagFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="595"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="593"/>
         <source>Tags: </source>
         <translation>Тагове:</translation>
     </message>
@@ -7712,7 +7869,7 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>TagFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="148"/>
+        <location filename="../qt-models/filtermodels.cpp" line="153"/>
         <source>Empty tags</source>
         <translation>Празни тагове</translation>
     </message>
@@ -7738,6 +7895,11 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>TemplateEdit</name>
     <message>
+        <location filename="../desktop-widgets/templateedit.ui" line="14"/>
+        <source>Edit template</source>
+        <translation>Редакция на шаблон</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/templateedit.ui" line="37"/>
         <source>Preview</source>
         <translation>Преглед</translation>
@@ -7783,11 +7945,6 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
         <translation>Големина на шрифта</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/templateedit.ui" line="14"/>
-        <source>Edit template</source>
-        <translation>Редакция на шаблон</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/templateedit.ui" line="165"/>
         <source>Color palette</source>
         <translation>Цветова палитра</translation>
@@ -7969,82 +8126,9 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>TextHyperlinkEventFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="817"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="815"/>
         <source>%1click to visit %2</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>ThemeTest</name>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="29"/>
-        <source>Theme Information</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="33"/>
-        <source>Screen</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="42"/>
-        <source>Geometry (pixels):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="49"/>
-        <source>Geometry (gridUnits):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="56"/>
-        <source>Units.gridUnit:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="63"/>
-        <source>Units.devicePixelRatio:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="70"/>
-        <source>Font Metrics</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="76"/>
-        <source>FontMetrics pointSize:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="83"/>
-        <source>FontMetrics pixelSize:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="90"/>
-        <source>FontMetrics devicePixelRatio:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="97"/>
-        <source>Text item pixelSize:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="104"/>
-        <source>Text item pointSize:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="111"/>
-        <source>Pixel density:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="118"/>
-        <source>Height of default font:</source>
-        <translation type="unfinished"/>
+        <translation>%1щтракни за да посетиш %2</translation>
     </message>
 </context>
 <context>
@@ -8058,102 +8142,107 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>TripItem</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="67"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="68"/>
         <source>(%1 shown)</source>
         <translation>(%1 показани)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="194"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
         <source>#</source>
         <translation>№</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="197"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="215"/>
         <source>Date</source>
         <translation>Дата</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="200"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="218"/>
         <source>Rating</source>
         <translation>Оценка</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
         <source>Depth(%1)</source>
         <translation>Дълбочина(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
         <source>m</source>
         <translation>м</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
         <source>ft</source>
         <translation>фута</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="206"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="224"/>
         <source>Duration</source>
         <translation>Продълж. (мин.)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="209"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="227"/>
         <source>Temp(%1%2)</source>
         <translation>Температура(%1%2)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
         <source>Weight(%1)</source>
         <translation>Тежест(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
         <source>kg</source>
         <translation>кг</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
         <source>lbs</source>
         <translation>паунда</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="215"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="233"/>
         <source>Suit</source>
         <translation>Водолазен костюм</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="218"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="236"/>
         <source>Cyl</source>
         <translation>Бут.</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="239"/>
         <source>Gas</source>
         <translation>Газ</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="244"/>
         <source>SAC(%1)</source>
         <translation>SAC(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="244"/>
         <source>/min</source>
         <translation>/м</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="229"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="247"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="232"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="250"/>
         <source>Max CNS</source>
         <translation>Макс. CNS</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="235"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="253"/>
+        <source>Photos before/during/after dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="256"/>
         <source>Location</source>
         <translation>Местонахождение</translation>
     </message>
@@ -8176,72 +8265,73 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>UpdateManager</name>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="69"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="61"/>
         <source>Check for updates.</source>
         <translation>Провери за обновления</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="70"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="62"/>
         <source>Subsurface was unable to check for updates.</source>
         <translation>Subsurface не успя да провери за обновления.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="75"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="67"/>
         <source>The following error occurred:</source>
         <translation>Грешка:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="76"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="68"/>
         <source>Please check your internet connection.</source>
         <translation>Моля проверете интернет връзката си.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="86"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="78"/>
         <source>You are using the latest version of Subsurface.</source>
         <translation>Вие използватe последната версия на Subsurface.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="89"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="81"/>
         <source>A new version of Subsurface is available.&lt;br/&gt;Click on:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; to download it.</source>
         <translation>Има нова версия на Subsruface.&lt;br/&gt;Щракнете на:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; за да я изтеглите.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="95"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="87"/>
         <source>A new version of Subsurface is available.</source>
         <translation>Има нова версия на Subsurface.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="96"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="88"/>
         <source>Latest version is %1, please check %2 our download page %3 for information in how to update.</source>
         <translation>Последната версия е %1, моля проверете %2 нашата страница %3 за информация как да обновите.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="106"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="98"/>
         <source>Newest release version is </source>
         <translation>Най-новата весия е</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="107"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="99"/>
         <source>The server returned the following information:</source>
         <translation>Сървъра върна следната информация:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="125"/>
-        <source>Subsurface is checking every two weeks if a new version is available. If you don&apos;t want Subsurface to continue checking, please click Decline.</source>
-        <translation>Subsurface проверява всеки две седмици ако нова версия е налична. Ако не искате тази проверка да продължи моля изберете Decline/Oткажи.</translation>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="117"/>
+        <source>Subsurface is checking every two weeks if a new version is available. 
+ If you don&apos;t want Subsurface to continue checking, please click Decline.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="126"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="119"/>
         <source>Decline</source>
         <translation>Откажи</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="127"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="120"/>
         <source>Accept</source>
         <translation>Приеми</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="129"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="122"/>
         <source>Automatic check for updates</source>
         <translation>Автоматична проверка за обновления</translation>
     </message>
@@ -8263,24 +8353,6 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>UserSurvey</name>
     <message>
-        <location filename="../desktop-widgets/usersurvey.ui" line="44"/>
-        <location filename="../build/ui_usersurvey.h" line="151"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;We would love to learn more about our users, their preferences and their usage habits. Please spare a minute to fill out this form and submit it to the Subsurface team.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;С удоволствие бихме научили повече за нашите потребители, техните настройки и навици. Моля отделете минута да попълнете тази форма и да я изпратите на Subsurface екипа.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/usersurvey.ui" line="115"/>
-        <location filename="../build/ui_usersurvey.h" line="156"/>
-        <source>Other software/sources</source>
-        <translation>Друг софтуер/източници</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/usersurvey.ui" line="128"/>
-        <location filename="../build/ui_usersurvey.h" line="157"/>
-        <source>Manually entering dives</source>
-        <translation>Ръчно въвеждане на гмуркания</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="14"/>
         <location filename="../build/ui_usersurvey.h" line="149"/>
         <source>User survey</source>
@@ -8293,6 +8365,12 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
         <translation>Subsurface потребителско изследвание</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/usersurvey.ui" line="44"/>
+        <location filename="../build/ui_usersurvey.h" line="151"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;We would love to learn more about our users, their preferences and their usage habits. Please spare a minute to fill out this form and submit it to the Subsurface team.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;С удоволствие бихме научили повече за нашите потребители, техните настройки и навици. Моля отделете минута да попълнете тази форма и да я изпратите на Subsurface екипа.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="63"/>
         <location filename="../build/ui_usersurvey.h" line="152"/>
         <source>Technical diver</source>
@@ -8317,6 +8395,18 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
         <translation>Потдържан леководолазен компютър</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/usersurvey.ui" line="115"/>
+        <location filename="../build/ui_usersurvey.h" line="156"/>
+        <source>Other software/sources</source>
+        <translation>Друг софтуер/източници</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/usersurvey.ui" line="128"/>
+        <location filename="../build/ui_usersurvey.h" line="157"/>
+        <source>Manually entering dives</source>
+        <translation>Ръчно въвеждане на гмуркания</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="141"/>
         <location filename="../build/ui_usersurvey.h" line="158"/>
         <source>Android/iPhone companion app</source>
@@ -8347,6 +8437,11 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
         <translation>От къде вмъквате данни?</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/usersurvey.cpp" line="18"/>
+        <source>Send</source>
+        <translation>Изпрати</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/usersurvey.cpp" line="43"/>
         <source>
 Operating system: %1</source>
@@ -8390,19 +8485,14 @@ Language: %1</source>
         <translation>Попитайте ме отново</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/usersurvey.cpp" line="101"/>
-        <source>Submit user survey.</source>
-        <translation>Изпрати потребителско изследване</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/usersurvey.cpp" line="82"/>
         <source>Ask again?</source>
         <translation>Да ви попитаме отново?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/usersurvey.cpp" line="18"/>
-        <source>Send</source>
-        <translation>Изпрати</translation>
+        <location filename="../desktop-widgets/usersurvey.cpp" line="101"/>
+        <source>Submit user survey.</source>
+        <translation>Изпрати потребителско изследване</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/usersurvey.cpp" line="102"/>
@@ -8494,12 +8584,12 @@ Language: %1</source>
         <translation>Качи</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="324"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="325"/>
         <source>Operation timed out</source>
         <translation>Времето за операцията изтече</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="345"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="346"/>
         <source>Transferring data...</source>
         <translation>Трансфер на данни...</translation>
     </message>
@@ -8534,18 +8624,18 @@ Language: %1</source>
 <context>
     <name>WriteSettingsThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1702"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1709"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1718"/>
-        <source>Failed!</source>
-        <translation>Неуспешна операция!</translation>
-    </message>
-    <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1700"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1721"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1689"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1710"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Тази функционалност не е достъпна за избрания леководолазен комютър.</translation>
     </message>
+    <message>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1691"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1698"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1707"/>
+        <source>Failed!</source>
+        <translation>Неуспешна операция!</translation>
+    </message>
 </context>
 <context>
     <name>YearlyStatisticsModel</name>
@@ -8670,7 +8760,7 @@ Maximum</source>
 <context>
     <name>getextFromC</name>
     <message>
-        <location filename="../core/libdivecomputer.c" line="674"/>
+        <location filename="../core/libdivecomputer.c" line="737"/>
         <source>Error parsing the header</source>
         <translation>Грешка при рaзряд на хедър</translation>
     </message>
@@ -8678,38 +8768,377 @@ Maximum</source>
 <context>
     <name>gettextFromC</name>
     <message>
+        <location filename="../core/cochran.c" line="309"/>
+        <location filename="../core/cochran.c" line="315"/>
+        <location filename="../core/cochran.c" line="385"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>deco stop</source>
+        <translation>деко. стоп</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="336"/>
+        <location filename="../core/cochran.c" line="390"/>
+        <location filename="../core/file.c" line="777"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>ascent</source>
+        <translation>покачване</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="342"/>
+        <location filename="../core/file.c" line="755"/>
+        <source>battery</source>
+        <translation>батерия</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="348"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
+        <source>OLF</source>
+        <translation>OLF</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="353"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
+        <source>maxdepth</source>
+        <translation>макс. дълбочина</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="358"/>
+        <location filename="../core/cochran.c" line="404"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
+        <source>pO₂</source>
+        <translation>pO₂</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="365"/>
+        <location filename="../core/cochran.c" line="414"/>
+        <location filename="../core/cochran.c" line="421"/>
+        <location filename="../core/file.c" line="868"/>
+        <location filename="../core/libdivecomputer.c" line="225"/>
+        <location filename="../core/libdivecomputer.c" line="228"/>
+        <source>gaschange</source>
+        <translation>смяна на газ</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="370"/>
+        <location filename="../core/cochran.c" line="409"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>rbt</source>
+        <translation>rbt</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="379"/>
+        <location filename="../core/cochran.c" line="426"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>ceiling</source>
+        <translation>таван</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="395"/>
+        <location filename="../core/libdivecomputer.c" line="224"/>
+        <source>transmitter</source>
+        <translation>предавател</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="153"/>
+        <source>Error: the file does not appear to be a DATATRAK divelog</source>
+        <translation>Грешка: файлът не е DATATRAK регистър</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="286"/>
+        <source>clear</source>
+        <translation>чисто</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="289"/>
+        <source>misty</source>
+        <translation>мъгляво</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="292"/>
+        <source>fog</source>
+        <translation>мъгла</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="295"/>
+        <source>rain</source>
+        <translation>дъжд</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="298"/>
+        <source>storm</source>
+        <translation>буря</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="301"/>
+        <source>snow</source>
+        <translation>сняг</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="321"/>
+        <source>No suit</source>
+        <translation>Няма костюм</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="324"/>
+        <source>Shorty</source>
+        <translation>Шорти</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="327"/>
+        <source>Combi</source>
+        <translation>Комби</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="330"/>
+        <source>Wet suit</source>
+        <translation>Мокър костюм</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="333"/>
+        <source>Semidry suit</source>
+        <translation>Полумокър костюм</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="336"/>
+        <source>Dry suit</source>
+        <translation>Сух костюм</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="396"/>
+        <source>no stop</source>
+        <translation>няма стоп</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="398"/>
+        <location filename="../core/dive.c" line="29"/>
+        <source>deco</source>
+        <translation>деко</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="400"/>
+        <source>single ascent</source>
+        <translation>единично изкачване</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="402"/>
+        <source>multiple ascent</source>
+        <translation>множествено изкачване</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="404"/>
+        <location filename="../core/dive.c" line="27"/>
+        <source>fresh</source>
+        <translation>нов</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="406"/>
+        <source>salt water</source>
+        <translation>солена вода</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="431"/>
+        <source>sight seeing</source>
+        <translation>забележителности</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="433"/>
+        <source>club dive</source>
+        <translation>клубно гмуркане</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="435"/>
+        <location filename="../core/dive.c" line="28"/>
+        <source>instructor</source>
+        <translation>инструктор</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="437"/>
+        <source>instruction</source>
+        <translation>инструкция</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="439"/>
+        <location filename="../core/dive.c" line="27"/>
+        <source>night</source>
+        <translation>вечер</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="441"/>
+        <location filename="../core/dive.c" line="25"/>
+        <source>cave</source>
+        <translation>пещера</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="443"/>
+        <location filename="../core/dive.c" line="24"/>
+        <source>ice</source>
+        <translation>лед</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="445"/>
+        <source>search</source>
+        <translation>търсене</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="455"/>
+        <location filename="../core/dive.c" line="25"/>
+        <source>wreck</source>
+        <translation>останки</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="457"/>
+        <location filename="../core/dive.c" line="26"/>
+        <source>river</source>
+        <translation>река</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="459"/>
+        <location filename="../core/dive.c" line="23"/>
+        <source>drift</source>
+        <translation>дрейф</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="461"/>
+        <location filename="../core/dive.c" line="28"/>
+        <source>photo</source>
+        <translation>снимка</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="463"/>
+        <source>other</source>
+        <translation>друго</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="474"/>
+        <source>Other activities</source>
+        <translation>Други активности</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="498"/>
+        <source>Datatrak/Wlog notes</source>
+        <translation>Datatrak/Wlog бележки</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="537"/>
+        <source>Manually entered dive</source>
+        <translation>Ръчно въведено гмуркане</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="588"/>
+        <source>Unknown</source>
+        <translation>Непознато</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="674"/>
+        <source>Error: couldn&apos;t open the file %s</source>
+        <translation>Грешка: файла %s не може да бъде отворен</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="687"/>
+        <source>Error: no dive</source>
+        <translation>Грешка: няма гмуркане</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="23"/>
+        <source>boat</source>
+        <translation>кораб</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="23"/>
+        <source>shore</source>
+        <translation>бряг</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="24"/>
+        <source>deep</source>
+        <translation>дълбоко</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="24"/>
+        <source>cavern</source>
+        <translation>каверна</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="25"/>
+        <source>altitude</source>
+        <translation>височина</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="26"/>
+        <source>pool</source>
+        <translation>басейн</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="26"/>
+        <source>lake</source>
+        <translation>езеро</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="27"/>
+        <source>student</source>
+        <translation>студент</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="28"/>
+        <source>video</source>
+        <translation>видео</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="33"/>
+        <source>OC-gas</source>
+        <translation>OC-газ</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="33"/>
+        <source>diluent</source>
+        <translation>разредител</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="33"/>
+        <location filename="../core/equipment.c" line="88"/>
+        <location filename="../core/planner.c" line="1436"/>
+        <location filename="../core/planner.c" line="1439"/>
+        <source>oxygen</source>
+        <translation>кислород</translation>
+    </message>
+    <message>
         <location filename="../core/dive.c" line="181"/>
         <source>pascal</source>
         <translation>паскала</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="186"/>
-        <location filename="../core/qthelper.cpp" line="669"/>
+        <location filename="../core/qthelper.cpp" line="674"/>
         <source>bar</source>
         <translation>бара</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="190"/>
-        <location filename="../core/qthelper.cpp" line="672"/>
+        <location filename="../core/qthelper.cpp" line="677"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
+        <location filename="../core/dive.c" line="227"/>
+        <source>ℓ</source>
+        <translation>ℓ</translation>
+    </message>
+    <message>
         <location filename="../core/dive.c" line="232"/>
         <source>cuft</source>
         <translation>кб.фута</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="269"/>
-        <location filename="../core/qthelper.cpp" line="590"/>
-        <location filename="../core/qthelper.cpp" line="605"/>
+        <location filename="../core/qthelper.cpp" line="595"/>
+        <location filename="../core/qthelper.cpp" line="610"/>
         <source>m</source>
         <translation>м</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="274"/>
-        <location filename="../core/qthelper.cpp" line="593"/>
-        <location filename="../core/qthelper.cpp" line="607"/>
+        <location filename="../core/qthelper.cpp" line="598"/>
+        <location filename="../core/qthelper.cpp" line="612"/>
         <source>ft</source>
         <translation>фута</translation>
     </message>
@@ -8735,53 +9164,58 @@ Maximum</source>
     </message>
     <message>
         <location filename="../core/dive.c" line="325"/>
-        <location filename="../core/qthelper.cpp" line="616"/>
-        <location filename="../core/qthelper.cpp" line="626"/>
+        <location filename="../core/qthelper.cpp" line="621"/>
+        <location filename="../core/qthelper.cpp" line="631"/>
         <source>lbs</source>
         <translation>паунда</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="329"/>
-        <location filename="../core/qthelper.cpp" line="614"/>
-        <location filename="../core/qthelper.cpp" line="624"/>
+        <location filename="../core/qthelper.cpp" line="619"/>
+        <location filename="../core/qthelper.cpp" line="629"/>
         <source>kg</source>
         <translation>кг</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="1772"/>
+        <location filename="../core/dive.c" line="1751"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) или (%s)</translation>
     </message>
     <message>
-        <location filename="../core/divelist.c" line="484"/>
+        <location filename="../core/divelist.c" line="487"/>
         <location filename="../core/equipment.c" line="84"/>
-        <location filename="../core/planner.c" line="1411"/>
-        <location filename="../core/planner.c" line="1414"/>
+        <location filename="../core/planner.c" line="1432"/>
+        <location filename="../core/planner.c" line="1435"/>
         <source>air</source>
         <translation>въздух</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="197"/>
+        <location filename="../core/equipment.c" line="86"/>
+        <source>EAN%d</source>
+        <translation>EAN%d</translation>
+    </message>
+    <message>
+        <location filename="../core/equipment.c" line="198"/>
         <source>integrated</source>
         <translation>вградена</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="198"/>
+        <location filename="../core/equipment.c" line="199"/>
         <source>belt</source>
         <translation>колан</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="199"/>
+        <location filename="../core/equipment.c" line="200"/>
         <source>ankle</source>
         <translation>глезен</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="200"/>
+        <location filename="../core/equipment.c" line="201"/>
         <source>backplate weight</source>
         <translation>нагръбна</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="201"/>
+        <location filename="../core/equipment.c" line="202"/>
         <source>clip-on</source>
         <translation>щипка</translation>
     </message>
@@ -8794,8 +9228,8 @@ Maximum</source>
         <location filename="../core/file.c" line="121"/>
         <location filename="../core/file.c" line="512"/>
         <location filename="../core/file.c" line="597"/>
-        <location filename="../core/file.c" line="924"/>
-        <location filename="../core/file.c" line="1056"/>
+        <location filename="../core/file.c" line="909"/>
+        <location filename="../core/file.c" line="1092"/>
         <location filename="../core/ostctools.c" line="80"/>
         <source>Failed to read &apos;%s&apos;</source>
         <translation>Не може да бъде прочетен &apos;%s&apos;</translation>
@@ -8853,486 +9287,496 @@ Maximum</source>
         <translation>O₂ калибрация</translation>
     </message>
     <message>
-        <location filename="../core/file.c" line="887"/>
-        <source>No matching DC found for file &apos;%s&apos;</source>
-        <translation>Няма подходящ Л.К. за файла &apos;%s&apos;</translation>
+        <location filename="../core/git-access.c" line="134"/>
+        <source>Local cache directory %s corrupted - can&apos;t sync with Subsurface cloud storage</source>
+        <translation>Локалната кеш папка %s е повредена - не може да се синхронизира с облаковия склад.</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>none</source>
-        <translation>няма</translation>
+        <location filename="../core/git-access.c" line="157"/>
+        <location filename="../core/git-access.c" line="177"/>
+        <source>Could not update local cache to newer remote data</source>
+        <translation>Локалния кеш не може да бъде обновен.</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="309"/>
-        <location filename="../core/cochran.c" line="315"/>
-        <location filename="../core/cochran.c" line="385"/>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>deco stop</source>
-        <translation>деко. стоп</translation>
+        <location filename="../core/git-access.c" line="170"/>
+        <source>Subsurface cloud storage corrupted</source>
+        <translation>Облаковия слад е повреден</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="342"/>
-        <location filename="../core/file.c" line="755"/>
-        <source>battery</source>
-        <translation>батерия</translation>
+        <location filename="../core/git-access.c" line="284"/>
+        <source>Could not update Subsurface cloud storage, try again later</source>
+        <translation>Не може да бъде обновен облаковия слад. Моля опитайте по-късно.</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="370"/>
-        <location filename="../core/cochran.c" line="409"/>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>rbt</source>
-        <translation>rbt</translation>
+        <location filename="../core/git-access.c" line="344"/>
+        <source>Remote storage and local data diverged. Error: merge failed (%s)</source>
+        <translation>Дистанционния склад и локалните данни се разминават . Грешка: сливането се провали (%s)</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="336"/>
-        <location filename="../core/cochran.c" line="390"/>
-        <location filename="../core/file.c" line="777"/>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>ascent</source>
-        <translation>покачване</translation>
+        <location filename="../core/git-access.c" line="374"/>
+        <source>Remote storage and local data diverged. Cannot combine local and remote changes</source>
+        <translation>Облаковия слад и локалните данни се разминават. Данните не могат да бъдат сляти.</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="379"/>
-        <location filename="../core/cochran.c" line="426"/>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>ceiling</source>
-        <translation>таван</translation>
+        <location filename="../core/git-access.c" line="408"/>
+        <source>Remote storage and local data diverged</source>
+        <translation>Облаковия слад и локалните данни се разминават</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>workload</source>
-        <translation>натовареност</translation>
+        <location filename="../core/git-access.c" line="411"/>
+        <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source>
+        <translation>Облаковия слад и локалните данни се разминават. Грешка: записа на данни се провали (%s)</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="395"/>
-        <location filename="../core/libdivecomputer.c" line="203"/>
-        <source>transmitter</source>
-        <translation>предавател</translation>
+        <location filename="../core/git-access.c" line="420"/>
+        <source>Problems with local cache of Subsurface cloud data</source>
+        <translation>Проблем с локалния кеш на облаковия слад</translation>
+    </message>
+    <message>
+        <location filename="../core/git-access.c" line="421"/>
+        <source>Moved cache data to %s. Please try the operation again.</source>
+        <translation>Преместване на кеша в %s. Моля опитайте отново.</translation>
+    </message>
+    <message>
+        <location filename="../core/git-access.c" line="743"/>
+        <source>Error connecting to Subsurface cloud storage</source>
+        <translation>Грешка при връзка с облаковия склад</translation>
+    </message>
+    <message>
+        <location filename="../core/git-access.c" line="746"/>
+        <source>git clone of %s failed (%s)</source>
+        <translation>git clone на %s се провали (%s)</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="210"/>
+        <location filename="../core/parse-xml.c" line="3317"/>
+        <location filename="../core/uemis-downloader.c" line="134"/>
+        <source>unknown</source>
+        <translation>неизвестно</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="203"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>none</source>
+        <translation>няма</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>workload</source>
+        <translation>натовареност</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="224"/>
         <source>violation</source>
         <translation>нарушение</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="203"/>
+        <location filename="../core/libdivecomputer.c" line="224"/>
         <source>bookmark</source>
         <translation>бележка</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="203"/>
+        <location filename="../core/libdivecomputer.c" line="224"/>
         <source>surface</source>
         <translation>повърхност</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="203"/>
+        <location filename="../core/libdivecomputer.c" line="224"/>
         <source>safety stop</source>
         <translation>безопасен стоп</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="365"/>
-        <location filename="../core/cochran.c" line="414"/>
-        <location filename="../core/cochran.c" line="421"/>
-        <location filename="../core/file.c" line="868"/>
-        <location filename="../core/libdivecomputer.c" line="204"/>
-        <location filename="../core/libdivecomputer.c" line="207"/>
-        <source>gaschange</source>
-        <translation>смяна на газ</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="204"/>
+        <location filename="../core/libdivecomputer.c" line="225"/>
         <source>safety stop (voluntary)</source>
         <translation>безопасен стоп (свободен)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="204"/>
+        <location filename="../core/libdivecomputer.c" line="225"/>
         <source>safety stop (mandatory)</source>
         <translation>безопасен стоп (задължителен)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="205"/>
+        <location filename="../core/libdivecomputer.c" line="226"/>
         <source>deepstop</source>
         <translation>дълбочина на спиране</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="205"/>
+        <location filename="../core/libdivecomputer.c" line="226"/>
         <source>ceiling (safety stop)</source>
         <translation>таван (безопасен стоп)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="205"/>
-        <source>divetime</source>
-        <translation>време за гмуркане</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="205"/>
+        <location filename="../core/libdivecomputer.c" line="226"/>
         <source>below floor</source>
         <comment>event showing dive is below deco floor and adding deco time</comment>
         <translation>под</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="353"/>
-        <location filename="../core/libdivecomputer.c" line="206"/>
-        <source>maxdepth</source>
-        <translation>макс. дълбочина</translation>
-    </message>
-    <message>
-        <location filename="../core/cochran.c" line="348"/>
-        <location filename="../core/libdivecomputer.c" line="206"/>
-        <source>OLF</source>
-        <translation>OLF</translation>
+        <location filename="../core/libdivecomputer.c" line="226"/>
+        <source>divetime</source>
+        <translation>време за гмуркане</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="206"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
         <source>airtime</source>
         <translation>време за въздух</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="206"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
         <source>rgbm</source>
         <translation>rgbm</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="206"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
         <source>heading</source>
         <translation>посока</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="358"/>
-        <location filename="../core/cochran.c" line="404"/>
-        <location filename="../core/libdivecomputer.c" line="206"/>
-        <source>pO₂</source>
-        <translation>pO₂</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="207"/>
+        <location filename="../core/libdivecomputer.c" line="228"/>
         <source>tissue level warning</source>
         <translation>внимание: ниво на тъканта</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="207"/>
+        <location filename="../core/libdivecomputer.c" line="228"/>
         <source>non stop time</source>
         <translation>нон стоп време</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="224"/>
+        <location filename="../core/libdivecomputer.c" line="237"/>
         <source>invalid event number</source>
         <translation>грешен номер на събитие</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="658"/>
-        <source>Unable to create parser for %s %s</source>
-        <translation>Не може да бъде създаден разряд за %s %s</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="664"/>
-        <source>Error registering the data</source>
-        <translation>Грешка при регистриране на данни</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="495"/>
+        <location filename="../core/libdivecomputer.c" line="553"/>
         <source>Error parsing the datetime</source>
         <translation>Грешка при разряд на дата и час</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="513"/>
+        <location filename="../core/libdivecomputer.c" line="571"/>
         <source>Dive %d: %s</source>
         <translation>Гмуркане №%d: %s</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="519"/>
+        <location filename="../core/libdivecomputer.c" line="577"/>
         <source>Error parsing the divetime</source>
         <translation>Грешка при рaзряд на време за гмуркане</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="529"/>
+        <location filename="../core/libdivecomputer.c" line="587"/>
         <source>Error parsing the maxdepth</source>
         <translation>Грешка при рaзряд на максимална дълбочина</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="548"/>
+        <location filename="../core/libdivecomputer.c" line="606"/>
         <source>Error parsing temperature</source>
         <translation>Грешка при рaзряд на температура</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="568"/>
+        <location filename="../core/libdivecomputer.c" line="626"/>
         <source>Error parsing the gas mix count</source>
         <translation>Грешка при рaзряд на газ микс брой</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="580"/>
+        <location filename="../core/libdivecomputer.c" line="638"/>
         <source>Error obtaining water salinity</source>
         <translation>Грешка при прием на водна соленост</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="589"/>
+        <location filename="../core/libdivecomputer.c" line="647"/>
         <source>Error obtaining surface pressure</source>
         <translation>Грешка при прием на повърхностно налягане</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="614"/>
+        <location filename="../core/libdivecomputer.c" line="672"/>
         <source>Error obtaining divemode</source>
         <translation>Грешка при прием на режим на гмуркане</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="634"/>
+        <location filename="../core/libdivecomputer.c" line="692"/>
         <source>Error parsing the gas mix</source>
         <translation>Грешка при рaзряд на газ микс</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="684"/>
+        <location filename="../core/libdivecomputer.c" line="717"/>
+        <source>Unable to create parser for %s %s</source>
+        <translation>Не може да бъде създаден разряд за %s %s</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="723"/>
+        <source>Error registering the data</source>
+        <translation>Грешка при регистриране на данни</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="744"/>
         <source>Error parsing the samples</source>
         <translation>Грешка при рaзряд на стойности</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="822"/>
+        <location filename="../core/libdivecomputer.c" line="882"/>
         <source>Event: waiting for user action</source>
         <translation>Събитие: изчаквание на действие от потребителя</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="830"/>
+        <location filename="../core/libdivecomputer.c" line="890"/>
         <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="../core/libdivecomputer.c" line="894"/>
+        <location filename="../core/libdivecomputer.c" line="954"/>
         <source>Error registering the event handler.</source>
         <translation>Грешка при регистриране на направление за събития</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="899"/>
+        <location filename="../core/libdivecomputer.c" line="959"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Грешка при регистриране на направление за отменяне</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="920"/>
+        <location filename="../core/libdivecomputer.c" line="980"/>
         <source>Dive data import error</source>
         <translation>Грешка при вход на данни</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="959"/>
+        <location filename="../core/libdivecomputer.c" line="1019"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Не може да бъде създаден libdivecomputer контекст</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="966"/>
+        <location filename="../core/libdivecomputer.c" line="1026"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Не може да бъдe отворен %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="992"/>
+        <location filename="../core/libdivecomputer.c" line="1048"/>
         <source>Insufficient privileges to open the device %s %s (%s)</source>
         <translation>Недостатъчни привилегии да бъде отврено устройсто %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../core/parse-xml.c" line="517"/>
-        <source>Strange percentage reading %s
+        <location filename="../core/load-git.c" line="194"/>
+        <location filename="../core/parse-xml.c" line="1242"/>
+        <source>multiple GPS locations for this dive site; also %s
 </source>
-        <translation>Неразпозната стойност за проценти %s
+        <translation>повече от една GPS локации за това място на гмуркане; също така %s
 </translation>
     </message>
     <message>
-        <location filename="../core/load-git.c" line="194"/>
-        <location filename="../core/parse-xml.c" line="1238"/>
-        <source>multiple GPS locations for this dive site; also %s
+        <location filename="../core/load-git.c" line="222"/>
+        <location filename="../core/parse-xml.c" line="1304"/>
+        <source>additional name for site: %s
 </source>
-        <translation>повече от една GPS локации за това място на гмуркане; също така %s
+        <translation>допълнително име за място: %s
+</translation>
+    </message>
+    <message>
+        <location filename="../core/ostctools.c" line="120"/>
+        <location filename="../core/ostctools.c" line="152"/>
+        <source>Unknown DC in dive %d</source>
+        <translation>непознат ГК в гмуркане %d</translation>
+    </message>
+    <message>
+        <location filename="../core/ostctools.c" line="165"/>
+        <source>Error - %s - parsing dive %d</source>
+        <translation>Грешка - %s - резряд на гмуркане %d</translation>
+    </message>
+    <message>
+        <location filename="../core/parse-xml.c" line="517"/>
+        <source>Strange percentage reading %s
+</source>
+        <translation>Неразпозната стойност за проценти %s
 </translation>
     </message>
     <message>
-        <location filename="../core/parse-xml.c" line="2044"/>
+        <location filename="../core/parse-xml.c" line="2051"/>
         <source>Failed to parse &apos;%s&apos;</source>
         <translation>Не може да бъде напревен разбор на &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../core/parse-xml.c" line="3741"/>
+        <location filename="../core/parse-xml.c" line="3774"/>
         <source>Can&apos;t open stylesheet %s</source>
         <translation>Не може да бъде отворен стилов файл %s</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="86"/>
-        <source>EAN%d</source>
-        <translation>EAN%d</translation>
+        <location filename="../core/planner.c" line="555"/>
+        <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE %s ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source>
+        <translation>ВНИМАНИЕ: ТОВА Е НОВА ИМПЛЕМЕНТАЦИЯ НА АЛГОРИТЪМА %s И ПЛАНОВИКА, КОИТО НЕ СА ТЕСТВАНИ ДОСТАТЪЧНО! СИЛНО ПРЕПОРЪЧВАМЕ ДА НЕ БАЗИРАТЕ ГМУРКАНИЯТА СИ САМО НА ТЕЗИ ДАННИ!</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="1032"/>
-        <location filename="../core/planner.c" line="1184"/>
-        <source>Can&apos;t find gas %s</source>
-        <translation>Не може да бъде намерен газ %s</translation>
+        <location filename="../core/planner.c" line="569"/>
+        <source>Decompression calculation aborted due to excessive time</source>
+        <translation>Калкулирането на декомпресия е прекратено заради дълга продължителност</translation>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="571"/>
+        <location filename="../core/planner.c" line="829"/>
+        <location filename="../core/planner.c" line="834"/>
+        <location filename="../core/planner.c" line="860"/>
+        <location filename="../core/planner.c" line="870"/>
+        <source>Warning:</source>
+        <translation>Предупреждение:</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="368"/>
-        <source>Too many gas mixes</source>
-        <translation>Твърде много газови смеси</translation>
+        <location filename="../core/planner.c" line="581"/>
+        <source>based on Bühlmann ZHL-16C with GFlow = %d and GFhigh = %d</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="568"/>
-        <source>Decompression calculation aborted due to excessive time</source>
-        <translation>Калкулирането на декомпресия е прекратено заради дълга продължителност</translation>
+        <location filename="../core/planner.c" line="586"/>
+        <source>based on VPM-B at nominal conservatism</source>
+        <translation>базирано на VPM-B с номинален консерватизъм</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="592"/>
+        <location filename="../core/planner.c" line="588"/>
+        <source>based on VPM-B at +%d conservatism</source>
+        <translation>базирано на VPM-B с +%d консерватизъм</translation>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="590"/>
+        <source>, effective GF=%d/%d</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="594"/>
+        <source>recreational mode based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source>
+        <translation>режим за развлечение базиран на Bühlmann ZHL-16B с GFlow = %d и GFhigh = %d</translation>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="598"/>
         <source>Subsurface dive plan</source>
         <translation>Subsurface гмуркачески план</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="596"/>
-        <source>depth</source>
-        <translation>дълбочина</translation>
+        <location filename="../core/planner.c" line="599"/>
+        <source>&lt;div&gt;Runtime: %dmin&lt;/div&gt;&lt;br&gt;</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="602"/>
-        <source>runtime</source>
-        <translation>времетраене</translation>
+        <location filename="../core/planner.c" line="604"/>
+        <source>depth</source>
+        <translation>дълбочина</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="599"/>
+        <location filename="../core/planner.c" line="607"/>
         <source>duration</source>
         <translation>продължителност</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="554"/>
-        <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE %s ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source>
-        <translation>ВНИМАНИЕ: ТОВА Е НОВА ИМПЛЕМЕНТАЦИЯ НА АЛГОРИТЪМА %s И ПЛАНОВИКА, КОИТО НЕ СА ТЕСТВАНИ ДОСТАТЪЧНО! СИЛНО ПРЕПОРЪЧВАМЕ ДА НЕ БАЗИРАТЕ ГМУРКАНИЯТА СИ САМО НА ТЕЗИ ДАННИ!</translation>
+        <location filename="../core/planner.c" line="610"/>
+        <source>runtime</source>
+        <translation>времетраене</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="605"/>
+        <location filename="../core/planner.c" line="613"/>
         <source>gas</source>
         <translation>газ</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="648"/>
+        <location filename="../core/planner.c" line="656"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation>Преход към %.*f %s за %d:%02d мин - времетраене %d:%02u на %s (SP = %.1f бара)</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="656"/>
+        <location filename="../core/planner.c" line="664"/>
         <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="../core/planner.c" line="669"/>
+        <location filename="../core/planner.c" line="677"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation>Остани на %.*f %s за %d:%02d мин - времетраене %d:%02u на %s (SP = %.1f бара)</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="676"/>
+        <location filename="../core/planner.c" line="684"/>
         <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="../core/planner.c" line="721"/>
+        <location filename="../core/planner.c" line="729"/>
         <source>%3.0f%s</source>
         <translation>%3.0f%s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="724"/>
-        <location filename="../core/planner.c" line="728"/>
+        <location filename="../core/planner.c" line="732"/>
+        <location filename="../core/planner.c" line="736"/>
         <source>%3dmin</source>
         <translation>%3dмин</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="737"/>
-        <location filename="../core/planner.c" line="749"/>
+        <location filename="../core/planner.c" line="745"/>
+        <location filename="../core/planner.c" line="757"/>
         <source>(SP = %.1fbar)</source>
         <translation>(SP = %.1f бара)</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="772"/>
+        <location filename="../core/planner.c" line="780"/>
         <source>Switch gas to %s (SP = %.1fbar)</source>
         <translation>Превключи газ към %s (SP = %.1f бара)</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="774"/>
+        <location filename="../core/planner.c" line="782"/>
         <source>Switch gas to %s</source>
         <translation>Превключи газ на %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="793"/>
+        <location filename="../core/planner.c" line="801"/>
         <source>CNS</source>
         <translation>CNS</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="795"/>
+        <location filename="../core/planner.c" line="803"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="799"/>
+        <location filename="../core/planner.c" line="807"/>
         <source>Gas consumption (CCR legs excluded):</source>
         <translation>Консумация на газ (CCR крака включени):</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="801"/>
+        <location filename="../core/planner.c" line="809"/>
         <source>Gas consumption:</source>
         <translation>Консумация на газ:</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="570"/>
-        <location filename="../core/planner.c" line="821"/>
-        <location filename="../core/planner.c" line="826"/>
-        <location filename="../core/planner.c" line="851"/>
-        <location filename="../core/planner.c" line="861"/>
-        <source>Warning:</source>
-        <translation>Предупреждение:</translation>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="580"/>
-        <source>based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source>
-        <translation>базиран на Bühlmann ZHL-16B с GFlow = %d и GFhigh = %d</translation>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="584"/>
-        <source>based on VPM-B at nominal conservatism</source>
-        <translation>базирано на VPM-B с номинален консерватизъм</translation>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="586"/>
-        <source>based on VPM-B at +%d conservatism</source>
-        <translation>базирано на VPM-B с +%d консерватизъм</translation>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="588"/>
-        <source>recreational mode based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source>
-        <translation>режим за развлечение базиран на Bühlmann ZHL-16B с GFlow = %d и GFhigh = %d</translation>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="822"/>
+        <location filename="../core/planner.c" line="830"/>
         <source>this is more gas than available in the specified cylinder!</source>
         <translation>има повече газ от този на разположение в избраната бултилка</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="827"/>
+        <location filename="../core/planner.c" line="835"/>
         <source>not enough reserve for gas sharing on ascent!</source>
         <translation>няма достатъчно резерв за газово споделяне при изкачване!</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="829"/>
+        <location filename="../core/planner.c" line="837"/>
         <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source>
         <translation>%.0f%s/%.0f%s от %s (%.0f%s/%.0f%s в планирано покачване)</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="831"/>
+        <location filename="../core/planner.c" line="839"/>
         <source>%.0f%s (%.0f%s during planned ascent) of %s</source>
         <translation>%.0f%s (%.0f%s по време на плануваното изкачване) на %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="848"/>
+        <location filename="../core/planner.c" line="857"/>
         <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
         <translation>висока pO₂ стойност %.2f при %d:%02u с газ %s на дълбочина %.*f %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="858"/>
+        <location filename="../core/planner.c" line="867"/>
         <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
         <translation>ниска pO₂ стойност %.2f към %d:%02u с газ %s при дълбочина %.*f %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="1419"/>
+        <location filename="../core/planner.c" line="1194"/>
+        <source>Can&apos;t find gas %s</source>
+        <translation>Не може да бъде намерен газ %s</translation>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="1440"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1280"/>
+        <location filename="../core/profile.c" line="1298"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
@@ -9341,70 +9785,70 @@ D: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1283"/>
+        <location filename="../core/profile.c" line="1301"/>
         <source>P: %d%s
 </source>
         <translation>P: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1287"/>
+        <location filename="../core/profile.c" line="1305"/>
         <source>T: %.1f%s
 </source>
         <translation>T: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1293"/>
+        <location filename="../core/profile.c" line="1311"/>
         <source>V: %.1f%s
 </source>
         <translation>V: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1296"/>
+        <location filename="../core/profile.c" line="1314"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation>SAC: %.*f%s/мин
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1298"/>
+        <location filename="../core/profile.c" line="1316"/>
         <source>CNS: %u%%
 </source>
         <translation>CNS: %u%%
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1300"/>
+        <location filename="../core/profile.c" line="1318"/>
         <source>pO%s: %.2fbar
 </source>
         <translation>pO%s: %.2fбара
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1302"/>
+        <location filename="../core/profile.c" line="1320"/>
         <source>pN%s: %.2fbar
 </source>
         <translation>pN%s: %.2fбара
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1304"/>
+        <location filename="../core/profile.c" line="1322"/>
         <source>pHe: %.2fbar
 </source>
         <translation>pHe: %.2fбар
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1307"/>
+        <location filename="../core/profile.c" line="1325"/>
         <source>MOD: %d%s
 </source>
         <translation>MOD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1314"/>
+        <location filename="../core/profile.c" line="1332"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
@@ -9413,7 +9857,7 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1318"/>
+        <location filename="../core/profile.c" line="1336"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
@@ -9422,14 +9866,14 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1331"/>
+        <location filename="../core/profile.c" line="1349"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation>Стоп: %uмин @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1334"/>
+        <location filename="../core/profile.c" line="1352"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation>Стоп: неопр. време @ %.0f%s
@@ -9437,160 +9881,165 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1339"/>
+        <location filename="../core/profile.c" line="1357"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation>Deco: %uмин @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1342"/>
+        <location filename="../core/profile.c" line="1360"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation>Deco: неопр. време @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1346"/>
+        <location filename="../core/profile.c" line="1364"/>
         <source>In deco
 </source>
         <translation>В Deco
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1348"/>
+        <location filename="../core/profile.c" line="1366"/>
         <source>NDL: %umin
 </source>
         <translation>NDL: %uмин
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1351"/>
+        <location filename="../core/profile.c" line="1369"/>
         <source>TTS: %umin
 </source>
         <translation>TTS: %uмин
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1354"/>
+        <location filename="../core/profile.c" line="1372"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation>Deco: %uмин @ %.0f%s (калк.)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1362"/>
+        <location filename="../core/profile.c" line="1380"/>
         <source>In deco (calc)
 </source>
         <translation>В Deco (калк.)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1365"/>
+        <location filename="../core/profile.c" line="1383"/>
         <source>NDL: %umin (calc)
 </source>
         <translation>NDL: %uмин (калк.)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1367"/>
+        <location filename="../core/profile.c" line="1385"/>
         <source>NDL: &gt;2h (calc)
 </source>
         <translation>NDL: &gt;2ч (калк.)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1371"/>
+        <location filename="../core/profile.c" line="1389"/>
         <source>TTS: %umin (calc)
 </source>
         <translation>TTS: %uмин (калк.)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1373"/>
+        <location filename="../core/profile.c" line="1391"/>
         <source>TTS: &gt;2h (calc)
 </source>
         <translation>TTS: &gt;2ч (калк.)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1376"/>
+        <location filename="../core/profile.c" line="1394"/>
         <source>RBT: %umin
 </source>
         <translation>RBT: %uмин
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1379"/>
+        <location filename="../core/profile.c" line="1397"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation>Калкулиран таван %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1385"/>
+        <location filename="../core/profile.c" line="1403"/>
         <source>Tissue %.0fmin: %.1f%s
 </source>
         <translation>Тъкан %.0fмин: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1391"/>
+        <location filename="../core/profile.c" line="1409"/>
         <source>heartbeat: %d
 </source>
         <translation>пулс: %d
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1393"/>
+        <location filename="../core/profile.c" line="1411"/>
         <source>bearing: %d
 </source>
         <translation>лагер: %d
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1396"/>
+        <location filename="../core/profile.c" line="1414"/>
         <source>mean depth to here %.1f%s
 </source>
         <translation>средна дълбочина до %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1491"/>
+        <location filename="../core/profile.c" line="1515"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d мин</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1495"/>
-        <location filename="../core/profile.c" line="1499"/>
-        <location filename="../core/profile.c" line="1503"/>
+        <location filename="../core/profile.c" line="1519"/>
+        <location filename="../core/profile.c" line="1523"/>
+        <location filename="../core/profile.c" line="1527"/>
         <source>%s %sD:%.1f%s</source>
         <translation>%s %sD:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1507"/>
+        <location filename="../core/profile.c" line="1531"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sD:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1511"/>
+        <location filename="../core/profile.c" line="1535"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1515"/>
-        <location filename="../core/profile.c" line="1519"/>
+        <location filename="../core/profile.c" line="1539"/>
+        <location filename="../core/profile.c" line="1543"/>
         <source>%s %sV:%.2f%s</source>
         <translation>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1526"/>
+        <location filename="../core/profile.c" line="1550"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s</translation>
     </message>
     <message>
+        <location filename="../core/profile.c" line="1575"/>
+        <source>%s SAC:%.*f %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../core/qthelper.cpp" line="67"/>
         <source>%1km</source>
         <translation>%1км</translation>
@@ -9611,446 +10060,460 @@ EADD: %d%s
         <translation>%1yd</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="635"/>
+        <location filename="../core/qthelper.cpp" line="91"/>
+        <location filename="../core/qthelper.cpp" line="226"/>
+        <source>N</source>
+        <translation>С</translation>
+    </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="91"/>
+        <location filename="../core/qthelper.cpp" line="227"/>
+        <source>S</source>
+        <translation>Ю</translation>
+    </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="92"/>
+        <location filename="../core/qthelper.cpp" line="228"/>
+        <source>E</source>
+        <translation>И</translation>
+    </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="92"/>
+        <location filename="../core/qthelper.cpp" line="229"/>
+        <source>W</source>
+        <translation>З</translation>
+    </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="640"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="638"/>
+        <location filename="../core/qthelper.cpp" line="643"/>
         <source>F</source>
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="23"/>
-        <source>boat</source>
-        <translation>кораб</translation>
+        <location filename="../core/save-html.c" line="469"/>
+        <location filename="../core/save-html.c" line="553"/>
+        <location filename="../core/worldmap-save.c" line="111"/>
+        <source>Can&apos;t open file %s</source>
+        <translation>Не може да бъде отворен файл %s</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="23"/>
-        <source>shore</source>
-        <translation>бряг</translation>
+        <location filename="../core/save-html.c" line="488"/>
+        <source>Number</source>
+        <translation>Номер</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="459"/>
-        <location filename="../core/dive.c" line="23"/>
-        <source>drift</source>
-        <translation>дрейф</translation>
+        <location filename="../core/save-html.c" line="489"/>
+        <source>Date</source>
+        <translation>Дата</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="24"/>
-        <source>deep</source>
-        <translation>дълбоко</translation>
+        <location filename="../core/save-html.c" line="490"/>
+        <source>Time</source>
+        <translation>Време</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="24"/>
-        <source>cavern</source>
-        <translation>каверна</translation>
+        <location filename="../core/save-html.c" line="491"/>
+        <source>Location</source>
+        <translation>Местонахождение</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="443"/>
-        <location filename="../core/dive.c" line="24"/>
-        <source>ice</source>
-        <translation>лед</translation>
+        <location filename="../core/save-html.c" line="492"/>
+        <source>Air temp.</source>
+        <translation>Темп. на въздух</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="445"/>
-        <source>search</source>
-        <translation>търсене</translation>
+        <location filename="../core/save-html.c" line="493"/>
+        <source>Water temp.</source>
+        <translation>Темп. на водата</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="455"/>
-        <location filename="../core/dive.c" line="25"/>
-        <source>wreck</source>
-        <translation>останки</translation>
+        <location filename="../core/save-html.c" line="494"/>
+        <source>Dives</source>
+        <translation>Гмуркания</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="441"/>
-        <location filename="../core/dive.c" line="25"/>
-        <source>cave</source>
-        <translation>пещера</translation>
+        <location filename="../core/save-html.c" line="495"/>
+        <source>Expand all</source>
+        <translation>Разшири всички</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="25"/>
-        <source>altitude</source>
-        <translation>височина</translation>
+        <location filename="../core/save-html.c" line="496"/>
+        <source>Collapse all</source>
+        <translation>Свиване на всички</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="26"/>
-        <source>pool</source>
-        <translation>басейн</translation>
+        <location filename="../core/save-html.c" line="497"/>
+        <source>Trips</source>
+        <translation>Пътувания</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="26"/>
-        <source>lake</source>
-        <translation>езеро</translation>
+        <location filename="../core/save-html.c" line="498"/>
+        <source>Statistics</source>
+        <translation>Статистика</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="457"/>
-        <location filename="../core/dive.c" line="26"/>
-        <source>river</source>
-        <translation>река</translation>
+        <location filename="../core/save-html.c" line="499"/>
+        <source>Advanced search</source>
+        <translation>Разширено търсене</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="439"/>
-        <location filename="../core/dive.c" line="27"/>
-        <source>night</source>
-        <translation>вечер</translation>
+        <location filename="../core/save-html.c" line="502"/>
+        <source>Rating</source>
+        <translation>Оценка</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="153"/>
-        <source>Error: the file does not appear to be a DATATRAK divelog</source>
-        <translation>Грешка: файлът не е DATATRAK регистър</translation>
+        <location filename="../core/save-html.c" line="503"/>
+        <source>Visibility</source>
+        <translation>Видимост</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="286"/>
-        <source>clear</source>
-        <translation>чисто</translation>
+        <location filename="../core/save-html.c" line="504"/>
+        <source>Duration</source>
+        <translation>Продълж. (мин.)</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="289"/>
-        <source>misty</source>
-        <translation>мъгляво</translation>
+        <location filename="../core/save-html.c" line="505"/>
+        <source>Divemaster</source>
+        <translation>Водач</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="292"/>
-        <source>fog</source>
-        <translation>мъгла</translation>
+        <location filename="../core/save-html.c" line="506"/>
+        <source>Buddy</source>
+        <translation>Партньор</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="295"/>
-        <source>rain</source>
-        <translation>дъжд</translation>
+        <location filename="../core/save-html.c" line="507"/>
+        <source>Suit</source>
+        <translation>Водолазен костюм</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="298"/>
-        <source>storm</source>
-        <translation>буря</translation>
+        <location filename="../core/save-html.c" line="508"/>
+        <source>Tags</source>
+        <translation>Тагове</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="301"/>
-        <source>snow</source>
-        <translation>сняг</translation>
+        <location filename="../core/save-html.c" line="509"/>
+        <location filename="../smtk-import/smartrak.c" line="251"/>
+        <location filename="../smtk-import/smartrak.c" line="321"/>
+        <source>Notes</source>
+        <translation>Бележки</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="321"/>
-        <source>No suit</source>
-        <translation>Няма костюм</translation>
+        <location filename="../core/save-html.c" line="510"/>
+        <source>Show more details</source>
+        <translation>Покажи повече детайли</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="324"/>
-        <source>Shorty</source>
-        <translation>Шорти</translation>
+        <location filename="../core/save-html.c" line="513"/>
+        <source>Yearly statistics</source>
+        <translation>Годишни статистики</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="327"/>
-        <source>Combi</source>
-        <translation>Комби</translation>
+        <location filename="../core/save-html.c" line="514"/>
+        <source>Year</source>
+        <translation>Година</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="330"/>
-        <source>Wet suit</source>
-        <translation>Мокър костюм</translation>
+        <location filename="../core/save-html.c" line="515"/>
+        <source>Total time</source>
+        <translation>Общо време</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="333"/>
-        <source>Semidry suit</source>
-        <translation>Полумокър костюм</translation>
+        <location filename="../core/save-html.c" line="516"/>
+        <source>Average time</source>
+        <translation>Средно време</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="336"/>
-        <source>Dry suit</source>
-        <translation>Сух костюм</translation>
+        <location filename="../core/save-html.c" line="517"/>
+        <source>Shortest time</source>
+        <translation>Най-кратко време</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="396"/>
-        <source>no stop</source>
-        <translation>няма стоп</translation>
+        <location filename="../core/save-html.c" line="518"/>
+        <source>Longest time</source>
+        <translation>Най-дълго време</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="400"/>
-        <source>single ascent</source>
-        <translation>единично изкачване</translation>
+        <location filename="../core/save-html.c" line="519"/>
+        <source>Average depth</source>
+        <translation>Средна дълбочина</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="402"/>
-        <source>multiple ascent</source>
-        <translation>множествено изкачване</translation>
+        <location filename="../core/save-html.c" line="520"/>
+        <source>Min. depth</source>
+        <translation>Мин. дълбочина</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="404"/>
-        <location filename="../core/dive.c" line="27"/>
-        <source>fresh</source>
-        <translation>нов</translation>
+        <location filename="../core/save-html.c" line="521"/>
+        <source>Max. depth</source>
+        <translation>Макс. дълбочина</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="406"/>
-        <source>salt water</source>
-        <translation>солена вода</translation>
+        <location filename="../core/save-html.c" line="522"/>
+        <source>Average SAC</source>
+        <translation>Средно SAC</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="431"/>
-        <source>sight seeing</source>
-        <translation>забележителности</translation>
+        <location filename="../core/save-html.c" line="523"/>
+        <source>Min. SAC</source>
+        <translation>Мин. SAC</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="433"/>
-        <source>club dive</source>
-        <translation>клубно гмуркане</translation>
+        <location filename="../core/save-html.c" line="524"/>
+        <source>Max. SAC</source>
+        <translation>Макс. SAC</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="437"/>
-        <source>instruction</source>
-        <translation>инструкция</translation>
+        <location filename="../core/save-html.c" line="525"/>
+        <source>Average temp.</source>
+        <translation>Средна темп.</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="463"/>
-        <source>other</source>
-        <translation>друго</translation>
+        <location filename="../core/save-html.c" line="526"/>
+        <source>Min. temp.</source>
+        <translation>Мин. темп.</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="474"/>
-        <source>Other activities</source>
-        <translation>Други активности</translation>
+        <location filename="../core/save-html.c" line="527"/>
+        <source>Max. temp.</source>
+        <translation>Макс. темп.</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="498"/>
-        <source>Datatrak/Wlog notes</source>
-        <translation>Datatrak/Wlog бележки</translation>
+        <location filename="../core/save-html.c" line="528"/>
+        <source>Back to list</source>
+        <translation>Назад към списъка</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="537"/>
-        <source>Manually entered dive</source>
-        <translation>Ръчно въведено гмуркане</translation>
+        <location filename="../core/save-html.c" line="531"/>
+        <source>Dive No.</source>
+        <translation>Гмуркане №</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="588"/>
-        <source>Unknown</source>
-        <translation>Непознато</translation>
+        <location filename="../core/save-html.c" line="532"/>
+        <source>Dive profile</source>
+        <translation>Гмуркачески профил</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="674"/>
-        <source>Error: couldn&apos;t open the file %s</source>
-        <translation>Грешка: файла %s не може да бъде отворен</translation>
+        <location filename="../core/save-html.c" line="533"/>
+        <source>Dive information</source>
+        <translation>Информация за гмуркане</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="687"/>
-        <source>Error: no dive</source>
-        <translation>Грешка: няма гмуркане</translation>
+        <location filename="../core/save-html.c" line="534"/>
+        <source>Dive equipment</source>
+        <translation>Екипировка</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="27"/>
-        <source>student</source>
-        <translation>студент</translation>
+        <location filename="../core/save-html.c" line="535"/>
+        <location filename="../core/save-html.c" line="542"/>
+        <source>Type</source>
+        <translation>Тип</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="461"/>
-        <location filename="../core/dive.c" line="28"/>
-        <source>photo</source>
-        <translation>снимка</translation>
+        <location filename="../core/save-html.c" line="536"/>
+        <source>Size</source>
+        <translation>Големина</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="28"/>
-        <source>video</source>
-        <translation>видео</translation>
+        <location filename="../core/save-html.c" line="537"/>
+        <source>Work pressure</source>
+        <translation>Работно налягане</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="435"/>
-        <location filename="../core/dive.c" line="28"/>
-        <source>instructor</source>
-        <translation>инструктор</translation>
+        <location filename="../core/save-html.c" line="538"/>
+        <source>Start pressure</source>
+        <translation>Начално налягане</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="398"/>
-        <location filename="../core/dive.c" line="29"/>
-        <source>deco</source>
-        <translation>деко</translation>
+        <location filename="../core/save-html.c" line="539"/>
+        <source>End pressure</source>
+        <translation>Крайно налягане</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="33"/>
-        <source>OC-gas</source>
-        <translation>OC-газ</translation>
+        <location filename="../core/save-html.c" line="540"/>
+        <source>Gas</source>
+        <translation>Газ</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="33"/>
-        <source>diluent</source>
-        <translation>разредител</translation>
+        <location filename="../core/save-html.c" line="541"/>
+        <source>Weight</source>
+        <translation>Тежест</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="33"/>
-        <location filename="../core/equipment.c" line="88"/>
-        <location filename="../core/planner.c" line="1415"/>
-        <location filename="../core/planner.c" line="1418"/>
-        <source>oxygen</source>
-        <translation>кислород</translation>
+        <location filename="../core/save-html.c" line="543"/>
+        <source>Events</source>
+        <translation>Събития</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="227"/>
-        <source>ℓ</source>
-        <translation>ℓ</translation>
+        <location filename="../core/save-html.c" line="544"/>
+        <source>Name</source>
+        <translation>Име</translation>
+    </message>
+    <message>
+        <location filename="../core/save-html.c" line="545"/>
+        <source>Value</source>
+        <translation>Стойност</translation>
+    </message>
+    <message>
+        <location filename="../core/save-html.c" line="546"/>
+        <source>Coordinates</source>
+        <translation>Координати</translation>
+    </message>
+    <message>
+        <location filename="../core/save-html.c" line="547"/>
+        <source>Dive status</source>
+        <translation>Статус на гмуркане</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="239"/>
+        <location filename="../core/statistics.c" line="242"/>
         <source>more than %d days</source>
         <translation>повече от %d дни</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="246"/>
+        <location filename="../core/statistics.c" line="249"/>
         <source>%dd %dh %dmin</source>
         <translation>%dд %dч %dмин</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="249"/>
+        <location filename="../core/statistics.c" line="252"/>
         <source>%dmin %dsecs</source>
         <translation>%dмин. %dсек.</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="251"/>
+        <location filename="../core/statistics.c" line="254"/>
         <source>%dh %dmin</source>
         <translation>%dч %dмин</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="263"/>
+        <location filename="../core/statistics.c" line="266"/>
         <source>for dives #</source>
         <translation>за гмуркания №</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="269"/>
+        <location filename="../core/statistics.c" line="272"/>
         <source>for selected dives</source>
         <translation>за избраните гмуркания</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="304"/>
+        <location filename="../core/statistics.c" line="307"/>
         <source>for dive #%d</source>
         <translation>за гмуркане №%d</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="306"/>
+        <location filename="../core/statistics.c" line="309"/>
         <source>for selected dive</source>
         <translation>за избраните гмуркане</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="308"/>
+        <location filename="../core/statistics.c" line="311"/>
         <source>for all dives</source>
         <translation>за вички гмуркания</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="310"/>
+        <location filename="../core/statistics.c" line="313"/>
         <source>(no dives)</source>
         <translation>(няма гмуркания)</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Sun</source>
         <translation>Нед</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Mon</source>
         <translation>Пон</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Tue</source>
         <translation>Вт</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Wed</source>
         <translation>Ср</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Thu</source>
         <translation>Чет</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Fri</source>
         <translation>Пет</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Sat</source>
         <translation>Съб</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Jan</source>
         <translation>Ян</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Feb</source>
         <translation>Фев</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Mar</source>
         <translation>Март</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Apr</source>
         <translation>Апр</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>May</source>
         <translation>Май</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Jun</source>
         <translation>Юни</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Jul</source>
         <translation>Юли</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Aug</source>
         <translation>Авг</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Sep</source>
         <translation>Сеп</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Oct</source>
         <translation>Окт</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Nov</source>
         <translation>Нов</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Dec</source>
         <translation>Дек</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="191"/>
-        <location filename="../core/parse-xml.c" line="3284"/>
-        <location filename="../core/uemis-downloader.c" line="134"/>
-        <source>unknown</source>
-        <translation>неизвестно</translation>
-    </message>
-    <message>
-        <location filename="../core/uemis-downloader.c" line="467"/>
-        <source>data</source>
-        <translation>данни</translation>
-    </message>
-    <message>
-        <location filename="../core/uemis-downloader.c" line="447"/>
-        <source>%s %s</source>
-        <translation>%s %s</translation>
-    </message>
-    <message>
         <location filename="../core/uemis-downloader.c" line="27"/>
         <source>Uemis Zurich: the file system is almost full.
 Disconnect/reconnect the dive computer
@@ -10081,6 +10544,16 @@ Uemis Zurich включен ли е правилно?</translation>
         <translation>Няма гмуркания за теглене</translation>
     </message>
     <message>
+        <location filename="../core/uemis-downloader.c" line="447"/>
+        <source>%s %s</source>
+        <translation>%s %s</translation>
+    </message>
+    <message>
+        <location filename="../core/uemis-downloader.c" line="467"/>
+        <source>data</source>
+        <translation>данни</translation>
+    </message>
+    <message>
         <location filename="../core/uemis-downloader.c" line="495"/>
         <source>divelog #</source>
         <translation>divelog #</translation>
@@ -10251,281 +10724,6 @@ Uemis Zurich включен ли е правилно?</translation>
         <translation>Тревога: слаба батерия</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="469"/>
-        <location filename="../core/save-html.c" line="553"/>
-        <location filename="../core/worldmap-save.c" line="111"/>
-        <source>Can&apos;t open file %s</source>
-        <translation>Не може да бъде отворен файл %s</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="488"/>
-        <source>Number</source>
-        <translation>Номер</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="489"/>
-        <source>Date</source>
-        <translation>Дата</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="490"/>
-        <source>Time</source>
-        <translation>Време</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="491"/>
-        <source>Location</source>
-        <translation>Местонахождение</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="492"/>
-        <source>Air temp.</source>
-        <translation>Темп. на въздух</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="493"/>
-        <source>Water temp.</source>
-        <translation>Темп. на водата</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="498"/>
-        <source>Statistics</source>
-        <translation>Статистика</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="502"/>
-        <source>Rating</source>
-        <translation>Оценка</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="503"/>
-        <source>Visibility</source>
-        <translation>Видимост</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="504"/>
-        <source>Duration</source>
-        <translation>Продълж. (мин.)</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="494"/>
-        <source>Dives</source>
-        <translation>Гмуркания</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="495"/>
-        <source>Expand all</source>
-        <translation>Разшири всички</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="496"/>
-        <source>Collapse all</source>
-        <translation>Свиване на всички</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="497"/>
-        <source>Trips</source>
-        <translation>Пътувания</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="499"/>
-        <source>Advanced search</source>
-        <translation>Разширено търсене</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="505"/>
-        <source>Divemaster</source>
-        <translation>Водач</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="506"/>
-        <source>Buddy</source>
-        <translation>Партньор</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="507"/>
-        <source>Suit</source>
-        <translation>Водолазен костюм</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="508"/>
-        <source>Tags</source>
-        <translation>Тагове</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="509"/>
-        <location filename="../smtk-import/smartrak.c" line="251"/>
-        <location filename="../smtk-import/smartrak.c" line="321"/>
-        <source>Notes</source>
-        <translation>Бележки</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="510"/>
-        <source>Show more details</source>
-        <translation>Покажи повече детайли</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="513"/>
-        <source>Yearly statistics</source>
-        <translation>Годишни статистики</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="514"/>
-        <source>Year</source>
-        <translation>Година</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="515"/>
-        <source>Total time</source>
-        <translation>Общо време</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="516"/>
-        <source>Average time</source>
-        <translation>Средно време</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="517"/>
-        <source>Shortest time</source>
-        <translation>Най-кратко време</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="518"/>
-        <source>Longest time</source>
-        <translation>Най-дълго време</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="519"/>
-        <source>Average depth</source>
-        <translation>Средна дълбочина</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="520"/>
-        <source>Min. depth</source>
-        <translation>Мин. дълбочина</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="521"/>
-        <source>Max. depth</source>
-        <translation>Макс. дълбочина</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="523"/>
-        <source>Min. SAC</source>
-        <translation>Мин. SAC</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="524"/>
-        <source>Max. SAC</source>
-        <translation>Макс. SAC</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="525"/>
-        <source>Average temp.</source>
-        <translation>Средна темп.</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="526"/>
-        <source>Min. temp.</source>
-        <translation>Мин. темп.</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="527"/>
-        <source>Max. temp.</source>
-        <translation>Макс. темп.</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="528"/>
-        <source>Back to list</source>
-        <translation>Назад към списъка</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="534"/>
-        <source>Dive equipment</source>
-        <translation>Екипировка</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="537"/>
-        <source>Work pressure</source>
-        <translation>Работно налягане</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="538"/>
-        <source>Start pressure</source>
-        <translation>Начално налягане</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="539"/>
-        <source>End pressure</source>
-        <translation>Крайно налягане</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="547"/>
-        <source>Dive status</source>
-        <translation>Статус на гмуркане</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="522"/>
-        <source>Average SAC</source>
-        <translation>Средно SAC</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="531"/>
-        <source>Dive No.</source>
-        <translation>Гмуркане №</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="532"/>
-        <source>Dive profile</source>
-        <translation>Гмуркачески профил</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="533"/>
-        <source>Dive information</source>
-        <translation>Информация за гмуркане</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="535"/>
-        <location filename="../core/save-html.c" line="542"/>
-        <source>Type</source>
-        <translation>Тип</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="536"/>
-        <source>Size</source>
-        <translation>Големина</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="540"/>
-        <source>Gas</source>
-        <translation>Газ</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="541"/>
-        <source>Weight</source>
-        <translation>Тежест</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="543"/>
-        <source>Events</source>
-        <translation>Събития</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="544"/>
-        <source>Name</source>
-        <translation>Име</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="545"/>
-        <source>Value</source>
-        <translation>Стойност</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="546"/>
-        <source>Coordinates</source>
-        <translation>Координати</translation>
-    </message>
-    <message>
         <location filename="../core/worldmap-save.c" line="39"/>
         <source>Date:</source>
         <translation>Дата:</translation>
@@ -10571,173 +10769,69 @@ Uemis Zurich включен ли е правилно?</translation>
         <translation>Бележки:</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="91"/>
-        <location filename="../core/qthelper.cpp" line="226"/>
-        <source>N</source>
-        <translation>С</translation>
-    </message>
-    <message>
-        <location filename="../core/qthelper.cpp" line="91"/>
-        <location filename="../core/qthelper.cpp" line="227"/>
-        <source>S</source>
-        <translation>Ю</translation>
-    </message>
-    <message>
-        <location filename="../core/qthelper.cpp" line="92"/>
-        <location filename="../core/qthelper.cpp" line="228"/>
-        <source>E</source>
-        <translation>И</translation>
-    </message>
-    <message>
-        <location filename="../core/qthelper.cpp" line="92"/>
-        <location filename="../core/qthelper.cpp" line="229"/>
-        <source>W</source>
-        <translation>З</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="341"/>
-        <source>Remote storage and local data diverged. Error: merge failed (%s)</source>
-        <translation>Дистанционния склад и локалните данни се разминават . Грешка: сливането се провали (%s)</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="134"/>
-        <source>Local cache directory %s corrupted - can&apos;t sync with Subsurface cloud storage</source>
-        <translation>Локалната кеш папка %s е повредена - не може да се синхронизира с облаковия склад.</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="157"/>
-        <location filename="../core/git-access.c" line="177"/>
-        <source>Could not update local cache to newer remote data</source>
-        <translation>Локалния кеш не може да бъде обновен.</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="170"/>
-        <source>Subsurface cloud storage corrupted</source>
-        <translation>Облаковия слад е повреден</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="285"/>
-        <source>Could not update Subsurface cloud storage, try again later</source>
-        <translation>Не може да бъде обновен облаковия слад. Моля опитайте по-късно.</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="371"/>
-        <source>Remote storage and local data diverged. Cannot combine local and remote changes</source>
-        <translation>Облаковия слад и локалните данни се разминават. Данните не могат да бъдат сляти.</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="405"/>
-        <source>Remote storage and local data diverged</source>
-        <translation>Облаковия слад и локалните данни се разминават</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="408"/>
-        <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source>
-        <translation>Облаковия слад и локалните данни се разминават. Грешка: записа на данни се провали (%s)</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="417"/>
-        <source>Problems with local cache of Subsurface cloud data</source>
-        <translation>Проблем с локалния кеш на облаковия слад</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="418"/>
-        <source>Moved cache data to %s. Please try the operation again.</source>
-        <translation>Преместване на кеша в %s. Моля опитайте отново.</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="737"/>
-        <source>Error connecting to Subsurface cloud storage</source>
-        <translation>Грешка при връзка с облаковия склад</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="740"/>
-        <source>git clone of %s failed (%s)</source>
-        <translation>git clone на %s се провали (%s)</translation>
-    </message>
-    <message>
-        <location filename="../core/load-git.c" line="222"/>
-        <location filename="../core/parse-xml.c" line="1300"/>
-        <source>additional name for site: %s
-</source>
-        <translation>допълнително име за място: %s
-</translation>
-    </message>
-    <message>
-        <location filename="../core/ostctools.c" line="120"/>
-        <location filename="../core/ostctools.c" line="152"/>
-        <source>Unknown DC in dive %d</source>
-        <translation>непознат ГК в гмуркане %d</translation>
-    </message>
-    <message>
-        <location filename="../core/ostctools.c" line="165"/>
-        <source>Error - %s - parsing dive %d</source>
-        <translation>Грешка - %s - резряд на гмуркане %d</translation>
-    </message>
-    <message>
         <location filename="../smtk-import/smartrak.c" line="247"/>
         <source>Built</source>
-        <translation type="unfinished"/>
+        <translation>Сглобен</translation>
     </message>
     <message>
         <location filename="../smtk-import/smartrak.c" line="247"/>
         <source>Sank</source>
-        <translation type="unfinished"/>
+        <translation>Потънал</translation>
     </message>
     <message>
         <location filename="../smtk-import/smartrak.c" line="247"/>
         <source>SankTime</source>
-        <translation type="unfinished"/>
+        <translation>Време на потъване</translation>
     </message>
     <message>
         <location filename="../smtk-import/smartrak.c" line="248"/>
         <source>Reason</source>
-        <translation type="unfinished"/>
+        <translation>Причина</translation>
     </message>
     <message>
         <location filename="../smtk-import/smartrak.c" line="248"/>
         <source>Nationality</source>
-        <translation type="unfinished"/>
+        <translation>Националност</translation>
     </message>
     <message>
         <location filename="../smtk-import/smartrak.c" line="248"/>
         <source>Shipyard</source>
-        <translation type="unfinished"/>
+        <translation>Корабостроителница</translation>
     </message>
     <message>
         <location filename="../smtk-import/smartrak.c" line="249"/>
         <source>ShipType</source>
-        <translation type="unfinished"/>
+        <translation>Вид на кораб</translation>
     </message>
     <message>
         <location filename="../smtk-import/smartrak.c" line="249"/>
         <source>Length</source>
-        <translation type="unfinished"/>
+        <translation>Дължина</translation>
     </message>
     <message>
         <location filename="../smtk-import/smartrak.c" line="249"/>
         <source>Beam</source>
-        <translation type="unfinished"/>
+        <translation>Теглич</translation>
     </message>
     <message>
         <location filename="../smtk-import/smartrak.c" line="250"/>
         <source>Draught</source>
-        <translation type="unfinished"/>
+        <translation>Течение</translation>
     </message>
     <message>
         <location filename="../smtk-import/smartrak.c" line="250"/>
         <source>Displacement</source>
-        <translation type="unfinished"/>
+        <translation>Отклонение</translation>
     </message>
     <message>
         <location filename="../smtk-import/smartrak.c" line="250"/>
         <source>Cargo</source>
-        <translation type="unfinished"/>
+        <translation>Товар</translation>
     </message>
     <message>
         <location filename="../smtk-import/smartrak.c" line="263"/>
         <source>Wreck Data</source>
-        <translation type="unfinished"/>
+        <translation>Данни за останки</translation>
     </message>
     <message>
         <location filename="../smtk-import/smartrak.c" line="320"/>
@@ -10755,157 +10849,122 @@ Uemis Zurich включен ли е правилно?</translation>
     <message>
         <location filename="../mobile-widgets/qml/main.qml" line="13"/>
         <source>Subsurface-mobile</source>
-        <translation type="unfinished"/>
+        <translation>Subsurface-mobile</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="91"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="103"/>
         <source>Subsurface</source>
         <translation>Subsurface</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="97"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="110"/>
         <source>Dive list</source>
-        <translation type="unfinished"/>
+        <translation>Списък на гмуркания</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="112"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="125"/>
         <source>Cloud credentials</source>
-        <translation type="unfinished"/>
+        <translation>Облакови пълномощия</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="126"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="139"/>
         <source>Manage dives</source>
-        <translation type="unfinished"/>
+        <translation>Редакция на гмуркания</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="138"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="141"/>
         <source>Add dive manually</source>
-        <translation type="unfinished"/>
+        <translation>Ръчно добавяне на гмъркане</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="146"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="149"/>
         <source>Manual sync with cloud</source>
-        <translation type="unfinished"/>
+        <translation>Ръчна синхронизация с облака</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="164"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="167"/>
         <source>Offline mode</source>
-        <translation type="unfinished"/>
+        <translation>Офлайн режим</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="164"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="167"/>
         <source>Enable auto cloud sync</source>
-        <translation type="unfinished"/>
+        <translation>Включи авто-синхронизиране с облака</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="182"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="187"/>
         <source>GPS</source>
         <translation>GPS</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="185"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="190"/>
         <source>GPS-tag dives</source>
-        <translation type="unfinished"/>
+        <translation>GPS-таг гмуркания</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="192"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="197"/>
         <source>Upload GPS data</source>
-        <translation type="unfinished"/>
+        <translation>Качване на GPS данни</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="199"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="204"/>
         <source>Download GPS data</source>
-        <translation type="unfinished"/>
+        <translation>Теглене на GPS данни</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="206"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="211"/>
         <source>Show GPS fixes</source>
-        <translation type="unfinished"/>
+        <translation>Покажи GPS позиции</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="215"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="220"/>
         <source>Clear GPS cache</source>
-        <translation type="unfinished"/>
+        <translation>Изчисти GPS кеш</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="221"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="226"/>
         <source>Preferences</source>
         <translation>Настройки</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="230"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="237"/>
         <source>Developer</source>
-        <translation type="unfinished"/>
+        <translation>Разработчик</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="232"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="239"/>
         <source>App log</source>
-        <translation type="unfinished"/>
+        <translation>Регистър на приложението</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="239"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="246"/>
         <source>Theme information</source>
-        <translation type="unfinished"/>
+        <translation>Информация за темата</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="246"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="253"/>
         <source>User manual</source>
         <translation>Ръководство за потребителя</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="252"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="259"/>
         <source>About</source>
-        <translation type="unfinished"/>
+        <translation>За приложението</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="283"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="304"/>
         <source>Run location service</source>
-        <translation type="unfinished"/>
+        <translation>Стартирай услугата за локализиране</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="283"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="304"/>
         <source>No GPS source available</source>
-        <translation type="unfinished"/>
+        <translation>Няма GPS услуга</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="295"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="316"/>
         <source>Actions</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="9"/>
-        <source>Hello World</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="13"/>
-        <source>File</source>
-        <translation>Файл</translation>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="15"/>
-        <source>&amp;Open</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="19"/>
-        <source>Exit</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="27"/>
-        <source>Button 1 pressed</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="28"/>
-        <source>Button 2 pressed</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="33"/>
-        <source>May I have your attention, please?</source>
-        <translation type="unfinished"/>
+        <translation>Действия</translation>
     </message>
 </context>
 <context>
@@ -10984,6 +11043,24 @@ p, li { white-space: pre-wrap; }
         <translation>м/мин</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="121"/>
+        <location filename="../build/ui_plannerSettings.h" line="425"/>
+        <source>75% to 50% avg. depth</source>
+        <translation>75% до 50% средна дълбочина</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="138"/>
+        <location filename="../build/ui_plannerSettings.h" line="427"/>
+        <source>50% avg. depth to 6m</source>
+        <translation>50% средна дълбочина до 6м</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="155"/>
+        <location filename="../build/ui_plannerSettings.h" line="429"/>
+        <source>6m to surface</source>
+        <translation>6м до повърхността</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="175"/>
         <location filename="../build/ui_plannerSettings.h" line="431"/>
         <source>Descent</source>
@@ -11007,12 +11084,35 @@ p, li { white-space: pre-wrap; }
         <translation>VPM-B деко</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="268"/>
+        <source>Bühlmann deco</source>
+        <translation>Bühlmann деко</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="278"/>
         <location filename="../build/ui_plannerSettings.h" line="445"/>
         <source>Reserve gas</source>
         <translation>Обратен газ</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="288"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="549"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="578"/>
+        <location filename="../build/ui_plannerSettings.h" line="446"/>
+        <location filename="../build/ui_plannerSettings.h" line="459"/>
+        <location filename="../build/ui_plannerSettings.h" line="461"/>
+        <source>bar</source>
+        <translation>бара</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="307"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="416"/>
+        <location filename="../build/ui_plannerSettings.h" line="437"/>
+        <location filename="../build/ui_plannerSettings.h" line="440"/>
+        <source>%</source>
+        <translation>%</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="320"/>
         <location filename="../build/ui_plannerSettings.h" line="449"/>
         <source>Postpone gas change if a stop is not required</source>
@@ -11031,12 +11131,10 @@ p, li { white-space: pre-wrap; }
         <translation>GF low</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="307"/>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="416"/>
-        <location filename="../build/ui_plannerSettings.h" line="437"/>
-        <location filename="../build/ui_plannerSettings.h" line="440"/>
-        <source>%</source>
-        <translation>%</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="353"/>
+        <location filename="../build/ui_plannerSettings.h" line="436"/>
+        <source>Plan backgas breaks</source>
+        <translation>Планирай &quot;бекгас брейкс&quot;</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="360"/>
@@ -11045,10 +11143,10 @@ p, li { white-space: pre-wrap; }
         <translation>GF high</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="429"/>
-        <location filename="../build/ui_plannerSettings.h" line="441"/>
-        <source>Drop to first depth</source>
-        <translation>Спускане до първа дълбочина</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="370"/>
+        <location filename="../build/ui_plannerSettings.h" line="453"/>
+        <source>min</source>
+        <translation>мин</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="389"/>
@@ -11057,163 +11155,139 @@ p, li { white-space: pre-wrap; }
         <translation>Последен стоп на 6 метра</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="353"/>
-        <location filename="../build/ui_plannerSettings.h" line="436"/>
-        <source>Plan backgas breaks</source>
-        <translation>Планирай &quot;бекгас брейкс&quot;</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="396"/>
+        <source>Maximize bottom time allowed by gas and no decompression limits</source>
+        <translation>Увеличи долното време позволено от газ и не от границите на декомпресия.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="515"/>
-        <location filename="../build/ui_plannerSettings.h" line="455"/>
-        <source>Gas options</source>
-        <translation>Газ настройки</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="399"/>
+        <location filename="../build/ui_plannerSettings.h" line="443"/>
+        <source>Recreational mode</source>
+        <translation>Режим за развлечение</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="594"/>
-        <location filename="../build/ui_plannerSettings.h" line="456"/>
-        <source>Bottom SAC</source>
-        <translation>Долен SAC</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="429"/>
+        <location filename="../build/ui_plannerSettings.h" line="441"/>
+        <source>Drop to first depth</source>
+        <translation>Спускане до първа дълбочина</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="692"/>
-        <location filename="../build/ui_plannerSettings.h" line="457"/>
-        <source>Deco SAC</source>
-        <translation>Деко SAC</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="436"/>
+        <location filename="../build/ui_plannerSettings.h" line="452"/>
+        <source>Min. switch duration</source>
+        <translation>Мин. дължина на превключване</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="601"/>
-        <location filename="../build/ui_plannerSettings.h" line="458"/>
-        <source>Bottom pO₂</source>
-        <translation>Долен pO₂</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="459"/>
+        <location filename="../build/ui_plannerSettings.h" line="444"/>
+        <source>Safety stop</source>
+        <translation>Безопасен стоп</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="685"/>
-        <location filename="../build/ui_plannerSettings.h" line="460"/>
-        <source>Deco pO₂</source>
-        <translation>Деко pO₂</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="495"/>
+        <source>Conservatism level</source>
+        <translation>Ниво на консерватизъм</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="515"/>
+        <location filename="../build/ui_plannerSettings.h" line="455"/>
+        <source>Gas options</source>
+        <translation>Газ настройки</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="565"/>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="672"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="698"/>
         <location filename="../build/ui_plannerSettings.h" line="462"/>
         <location filename="../build/ui_plannerSettings.h" line="463"/>
         <source>ℓ/min</source>
         <translation>л/мин.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="632"/>
-        <location filename="../build/ui_plannerSettings.h" line="468"/>
-        <source>Display runtime</source>
-        <translation>Покажи времетраене</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="645"/>
-        <location filename="../build/ui_plannerSettings.h" line="472"/>
-        <source>Display segment duration</source>
-        <translation>Покажи времетраене на сегментацията</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="655"/>
-        <location filename="../build/ui_plannerSettings.h" line="476"/>
-        <source>Display transitions in deco</source>
-        <translation>Покажи транзиции в декомпресията</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="662"/>
-        <location filename="../build/ui_plannerSettings.h" line="477"/>
-        <source>Verbatim dive plan</source>
-        <translation>Дословен гмуркачески план</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="288"/>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="549"/>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="578"/>
-        <location filename="../build/ui_plannerSettings.h" line="446"/>
-        <location filename="../build/ui_plannerSettings.h" line="459"/>
-        <location filename="../build/ui_plannerSettings.h" line="461"/>
-        <source>bar</source>
-        <translation>бара</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="121"/>
-        <location filename="../build/ui_plannerSettings.h" line="425"/>
-        <source>75% to 50% avg. depth</source>
-        <translation>75% до 50% средна дълбочина</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="138"/>
-        <location filename="../build/ui_plannerSettings.h" line="427"/>
-        <source>50% avg. depth to 6m</source>
-        <translation>50% средна дълбочина до 6м</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="155"/>
-        <location filename="../build/ui_plannerSettings.h" line="429"/>
-        <source>6m to surface</source>
-        <translation>6м до повърхността</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="268"/>
-        <source>Bühlmann deco</source>
-        <translation>Bühlmann деко</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="370"/>
-        <location filename="../build/ui_plannerSettings.h" line="453"/>
-        <source>min</source>
-        <translation>мин</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="396"/>
-        <source>Maximize bottom time allowed by gas and no decompression limits</source>
-        <translation>Увеличи долното време позволено от газ и не от границите на декомпресия.</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="594"/>
+        <source>m</source>
+        <translation>м</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="399"/>
-        <location filename="../build/ui_plannerSettings.h" line="443"/>
-        <source>Recreational mode</source>
-        <translation>Режим за развлечение</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="606"/>
+        <source>Used to calculate best mix. Select best mix depth in &apos;Available gases&apos; table by entering gas depth, followed by &quot;B&quot; (best trimix mix) or &quot;BN&quot; (best nitrox mix)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="436"/>
-        <location filename="../build/ui_plannerSettings.h" line="452"/>
-        <source>Min. switch duration</source>
-        <translation>Мин. дължина на превключване</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="613"/>
+        <location filename="../build/ui_plannerSettings.h" line="456"/>
+        <source>Bottom SAC</source>
+        <translation>Долен SAC</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="459"/>
-        <location filename="../build/ui_plannerSettings.h" line="444"/>
-        <source>Safety stop</source>
-        <translation>Безопасен стоп</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="620"/>
+        <location filename="../build/ui_plannerSettings.h" line="458"/>
+        <source>Bottom pO₂</source>
+        <translation>Долен pO₂</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="495"/>
-        <source>Conservatism level</source>
-        <translation>Ниво на консерватизъм</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="627"/>
+        <source>Best mix END</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="608"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="634"/>
         <location filename="../build/ui_plannerSettings.h" line="464"/>
         <source>Notes</source>
         <translation>Бележки</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="629"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="655"/>
         <location filename="../build/ui_plannerSettings.h" line="466"/>
         <source>In dive plan, show runtime (absolute time) of stops</source>
         <translation>Покажи времетраене (абсолютно време) на стоповете в гмуркаческия план</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="642"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="658"/>
+        <location filename="../build/ui_plannerSettings.h" line="468"/>
+        <source>Display runtime</source>
+        <translation>Покажи времетраене</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="668"/>
         <location filename="../build/ui_plannerSettings.h" line="470"/>
         <source>In dive plan, show duration (relative time) of stops</source>
         <translation>Покажи времетраене (oтносително време) на стоповете в гмуркаческия план</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="652"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="671"/>
+        <location filename="../build/ui_plannerSettings.h" line="472"/>
+        <source>Display segment duration</source>
+        <translation>Покажи времетраене на сегментацията</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="678"/>
         <location filename="../build/ui_plannerSettings.h" line="474"/>
         <source>In diveplan, list transitions or treat them as implicit</source>
         <translation>Покажи преводи или ги третирай като косвени в гмуркаческия план</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="681"/>
+        <location filename="../build/ui_plannerSettings.h" line="476"/>
+        <source>Display transitions in deco</source>
+        <translation>Покажи транзиции в декомпресията</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="688"/>
+        <location filename="../build/ui_plannerSettings.h" line="477"/>
+        <source>Verbatim dive plan</source>
+        <translation>Дословен гмуркачески план</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="711"/>
+        <location filename="../build/ui_plannerSettings.h" line="460"/>
+        <source>Deco pO₂</source>
+        <translation>Деко pO₂</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="718"/>
+        <location filename="../build/ui_plannerSettings.h" line="457"/>
+        <source>Deco SAC</source>
+        <translation>Деко SAC</translation>
+    </message>
 </context>
 </TS>
\ No newline at end of file
diff --git a/translations/subsurface_cs.ts b/translations/subsurface_cs.ts
index 33fc7ecaf..79c5104a9 100644
--- a/translations/subsurface_cs.ts
+++ b/translations/subsurface_cs.ts
@@ -105,6 +105,11 @@
         <translation>Název:</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="56"/>
+        <source>Could not initialize Winsock version 2.2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="134"/>
         <source>Trying to turn on the local Bluetooth device...</source>
         <translation type="unfinished"/>
@@ -115,6 +120,11 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="167"/>
+        <source>Remote devices list was cleared.</source>
+        <translation>Seznam vzdálených zařízení byl vyprázdněn.</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="183"/>
         <source>Scanning for remote devices...</source>
         <translation>Hledají se vzdálená zařízení...</translation>
@@ -125,6 +135,22 @@
         <translation>Hledání úspěšně dokončeno.</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="208"/>
+        <source>The local Bluetooth device was %1.</source>
+        <extracomment>%1 will be replaced with &quot;turned on&quot; or &quot;turned off&quot;</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
+        <source>turned on</source>
+        <translation>zapnuto</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
+        <source>turned off</source>
+        <translation>vypnuto</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="225"/>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="339"/>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="359"/>
@@ -172,37 +198,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="352"/>
-        <source>Device %1 was paired and is authorized.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="56"/>
-        <source>Could not initialize Winsock version 2.2</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="167"/>
-        <source>Remote devices list was cleared.</source>
-        <translation>Seznam vzdálených zařízení byl vyprázdněn.</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="208"/>
-        <source>The local Bluetooth device was %1.</source>
-        <extracomment>%1 will be replaced with &quot;turned on&quot; or &quot;turned off&quot;</extracomment>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
-        <source>turned on</source>
-        <translation>zapnuto</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
-        <source>turned off</source>
-        <translation>vypnuto</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="307"/>
         <source>Remove pairing</source>
         <translation type="unfinished"/>
@@ -228,6 +223,11 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="352"/>
+        <source>Device %1 was paired and is authorized.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="378"/>
         <source>The device %1 can now be used for connection. You can press the Save button.</source>
         <translation type="unfinished"/>
@@ -286,12 +286,12 @@
 <context>
     <name>BuddyFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="621"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="619"/>
         <source>Person: </source>
         <translation>Osoba:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="622"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="620"/>
         <source>Searches for buddies and divemasters</source>
         <translation>Hledání společníků při potápění a učitelů potápění (vedoucích skupiny)</translation>
     </message>
@@ -299,7 +299,7 @@
 <context>
     <name>BuddyFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="243"/>
+        <location filename="../qt-models/filtermodels.cpp" line="248"/>
         <source>No buddies</source>
         <translation>Žádný společník při potápění</translation>
     </message>
@@ -307,25 +307,30 @@
 <context>
     <name>CloudCredentials</name>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="49"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="50"/>
         <source>Cloud credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="55"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="56"/>
         <source>Email</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="67"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="68"/>
         <source>Password</source>
         <translation>Heslo</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="90"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="92"/>
         <source>Show password</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="97"/>
+        <source>PIN</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>ColumnNameProvider</name>
@@ -381,6 +386,16 @@
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
+        <source>Max. depth</source>
+        <translation>Největší hloubka</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
+        <source>Avg. depth</source>
+        <translation>Průměrná hloubka</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
         <source>Divemaster</source>
         <translation>Vedoucí skupiny potápečů</translation>
     </message>
@@ -391,6 +406,11 @@
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
+        <source>Suit</source>
+        <translation>Oblek</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
         <source>Notes</source>
         <translation>Poznámky</translation>
     </message>
@@ -410,21 +430,6 @@
         <translation>Teplota vody</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
-        <source>Max. depth</source>
-        <translation>Největší hloubka</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
-        <source>Avg. depth</source>
-        <translation>Průměrná hloubka</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
-        <source>Suit</source>
-        <translation>Oblek</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="44"/>
         <source>O₂</source>
         <translation>O₂</translation>
@@ -538,7 +543,7 @@
         <translation>Potíže při inicializaci libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../core/configuredivecomputer.cpp" line="660"/>
+        <location filename="../core/configuredivecomputer.cpp" line="656"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation>Nepodařilo se zřídit spojení s potápěcím počítačem.</translation>
     </message>
@@ -558,11 +563,19 @@
         <translation>Zařízení nebo přípojný bod</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="170"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1520"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1533"/>
-        <source>...</source>
-        <translation>...</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="47"/>
+        <source>Connect via Bluetooth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="54"/>
+        <source>Connect</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="64"/>
+        <source>Disconnect</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="80"/>
@@ -571,12 +584,24 @@
         <translation>Nahrát dostupné podrobnosti</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="90"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1523"/>
+        <source>Read settings from backup file or from device before writing to the device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="93"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1525"/>
         <source>Save changes to device</source>
         <translation>Uložit změny do zařízení</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="116"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1527"/>
+        <source>Read settings from backup file or from device before writing to a backup file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="119"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1529"/>
         <source>Backup</source>
@@ -595,15 +620,40 @@
         <translation>Aktualizovat firmware</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="163"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1532"/>
+        <source>Save libdivecomputer logfile</source>
+        <translation>Uložit soubor se záznamem libdivecomputer</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="170"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1520"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1533"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="177"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1534"/>
         <source>Cancel</source>
         <translation>Zrušit</translation>
     </message>
     <message>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1539"/>
-        <source>OSTC 3</source>
-        <translation>OSTC 3</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="214"/>
+        <source>OSTC 3,Sport,Cr,2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="223"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1541"/>
+        <source>Suunto Vyper family</source>
+        <translation>Rodina Suunto Vyper</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="232"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1543"/>
+        <source>OSTC, Mk.2/2N/2C</source>
+        <translation>OSTC, Mk.2/2N/2C</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="253"/>
@@ -616,40 +666,56 @@
         <translation>Základní nastavení</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="326"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1656"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1943"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1546"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1726"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1766"/>
-        <source>Serial No.</source>
-        <translation>Sériové číslo</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="260"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1575"/>
+        <source>Eco</source>
+        <translation>Eko</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="349"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1679"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1980"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1547"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1727"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1767"/>
-        <source>Firmware version</source>
-        <translation>Verze firmware</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="265"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1576"/>
+        <source>Medium</source>
+        <translation>Střední</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="538"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1713"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1990"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1548"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1729"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1768"/>
-        <source>Custom text</source>
-        <translation>Vlastní text</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="270"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1577"/>
+        <source>High</source>
+        <translation>Vysoký</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="385"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1549"/>
-        <source>Language</source>
-        <translation>Jazyk</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="278"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="826"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="849"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="875"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="927"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="993"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1019"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1101"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1117"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1450"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2278"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2382"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2408"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2434"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2474"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2497"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1586"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1621"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1623"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1625"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1628"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1637"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1638"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1710"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1785"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1789"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1801"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1803"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1806"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1807"/>
+        <source>%</source>
+        <translation>%</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="289"/>
@@ -676,44 +742,36 @@
         <translation>Italský</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="579"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1557"/>
-        <source>Dive mode</source>
-        <translation>Režim potápění</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="556"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1560"/>
-        <source>OC</source>
-        <translation>OC</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="561"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1561"/>
-        <source>CC</source>
-        <translation>CC</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="313"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1582"/>
+        <source>m/°C</source>
+        <translation>m/°C</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="566"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2336"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1562"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1793"/>
-        <source>Gauge</source>
-        <translation>Gauge</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="318"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1583"/>
+        <source>ft/°F</source>
+        <translation>st/°F</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="571"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1563"/>
-        <source>Apnea</source>
-        <translation>Apnoe</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="326"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1656"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1943"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1546"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1726"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1766"/>
+        <source>Serial No.</source>
+        <translation>Sériové číslo</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="395"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2063"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1565"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1780"/>
-        <source>Date format</source>
-        <translation>Formát data</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="349"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1679"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1980"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1547"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1727"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1767"/>
+        <source>Firmware version</source>
+        <translation>Verze firmware</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="360"/>
@@ -734,108 +792,147 @@
         <translation>RRMMDD</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1042"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2457"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1639"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1805"/>
-        <source>Saturation</source>
-        <translation>Nasycení</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="385"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1549"/>
+        <source>Language</source>
+        <translation>Jazyk</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="278"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="826"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="849"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="875"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="927"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="993"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1019"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1101"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1117"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1450"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2278"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2382"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2408"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2434"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2474"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2497"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1586"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1621"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1623"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1625"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1628"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1637"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1638"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1710"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1785"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1789"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1801"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1803"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1806"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1807"/>
-        <source>%</source>
-        <translation>%</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="395"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2063"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1565"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1780"/>
+        <source>Date format</source>
+        <translation>Formát data</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="865"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2261"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1624"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1784"/>
-        <source>Desaturation</source>
-        <translation>Odsycení</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="405"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1572"/>
+        <source>Brightness</source>
+        <translation>Jas</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="983"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2398"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1636"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1800"/>
-        <source>Last deco</source>
-        <translation>Poslední zastavení</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="415"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1850"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1579"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1753"/>
+        <source>Units</source>
+        <translation>Jednotky</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="711"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="736"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="758"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="904"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2181"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2206"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2228"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2307"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1626"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1786"/>
-        <source> m</source>
-        <translation> m</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="425"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1585"/>
+        <source>Salinity (0-5%)</source>
+        <translation>Obsah soli (0-5 %)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="405"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1572"/>
-        <source>Brightness</source>
-        <translation>Jas</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="438"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1615"/>
+        <source>Reset device to default settings</source>
+        <translation>Nastavit zařízení znovu na výchozí nastavení</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="260"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1575"/>
-        <source>Eco</source>
-        <translation>Eko</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="452"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1590"/>
+        <source>230LSB/Gauss</source>
+        <translation>230LSB/Gauss</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="265"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1576"/>
-        <source>Medium</source>
-        <translation>Střední</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="457"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1591"/>
+        <source>330LSB/Gauss</source>
+        <translation>330LSB/Gauss</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="270"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1577"/>
-        <source>High</source>
-        <translation>Vysoký</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="462"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1592"/>
+        <source>390LSB/Gauss</source>
+        <translation>390LSB/Gauss</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="603"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2034"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1599"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1779"/>
-        <source>Sampling rate</source>
-        <translation>Rychlost snímání</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="467"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1593"/>
+        <source>440LSB/Gauss</source>
+        <translation>440LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="472"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1594"/>
+        <source>660LSB/Gauss</source>
+        <translation>660LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="477"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1595"/>
+        <source>820LSB/Gauss</source>
+        <translation>820LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="482"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1596"/>
+        <source>1090LSB/Gauss</source>
+        <translation>1090LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="487"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1597"/>
+        <source>1370LSB/Gauss</source>
+        <translation>1370LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="521"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1587"/>
+        <source>Compass gain</source>
+        <translation>Citlivost kompasu</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="531"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1799"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1745"/>
+        <source>Computer model</source>
+        <translation>Počítačový model</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="538"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1713"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1990"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1548"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1729"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1768"/>
+        <source>Custom text</source>
+        <translation>Vlastní text</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="556"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1560"/>
+        <source>OC</source>
+        <translation>OC</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="561"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1561"/>
+        <source>CC</source>
+        <translation>CC</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="566"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2336"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1562"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1793"/>
+        <source>Gauge</source>
+        <translation>Gauge</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="571"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1563"/>
+        <source>Apnea</source>
+        <translation>Apnoe</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="579"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1557"/>
+        <source>Dive mode</source>
+        <translation>Režim potápění</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="590"/>
@@ -852,30 +949,12 @@
         <translation>10 s</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="415"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1850"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1579"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1753"/>
-        <source>Units</source>
-        <translation>Jednotky</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="313"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1582"/>
-        <source>m/°C</source>
-        <translation>m/°C</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="318"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1583"/>
-        <source>ft/°F</source>
-        <translation>st/°F</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="644"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1605"/>
-        <source>Dive mode color</source>
-        <translation>Barva režimu potápění</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="603"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2034"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1599"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1779"/>
+        <source>Sampling rate</source>
+        <translation>Rychlost snímání</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="614"/>
@@ -902,12 +981,6 @@
         <translation>Modrá</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="425"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1585"/>
-        <source>Salinity (0-5%)</source>
-        <translation>Obsah soli (0-5 %)</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="637"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2092"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1613"/>
@@ -916,90 +989,80 @@
         <translation>Seřízení času potápěcího počítače s PC</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="521"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1587"/>
-        <source>Compass gain</source>
-        <translation>Citlivost kompasu</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="644"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1605"/>
+        <source>Dive mode color</source>
+        <translation>Barva režimu potápění</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="90"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1523"/>
-        <source>Read settings from backup file or from device before writing to the device</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="654"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2020"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1614"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1771"/>
+        <source>Show safety stop</source>
+        <translation>Ukázat bezpečnostní zastávku</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="116"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1527"/>
-        <source>Read settings from backup file or from device before writing to a backup file</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="661"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2145"/>
+        <source>End Depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="232"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1543"/>
-        <source>OSTC, Mk.2/2N/2C</source>
-        <translation>OSTC, Mk.2/2N/2C</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="452"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1590"/>
-        <source>230LSB/Gauss</source>
-        <translation>230LSB/Gauss</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="457"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1591"/>
-        <source>330LSB/Gauss</source>
-        <translation>330LSB/Gauss</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="462"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1592"/>
-        <source>390LSB/Gauss</source>
-        <translation>390LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="671"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2162"/>
+        <source> s</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="467"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1593"/>
-        <source>440LSB/Gauss</source>
-        <translation>440LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="687"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1953"/>
+        <source>Length</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="472"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1594"/>
-        <source>660LSB/Gauss</source>
-        <translation>660LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="694"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2138"/>
+        <source>Start Depth</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="477"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1595"/>
-        <source>820LSB/Gauss</source>
-        <translation>820LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="701"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2152"/>
+        <source>Reset Depth</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="482"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1596"/>
-        <source>1090LSB/Gauss</source>
-        <translation>1090LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="711"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="736"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="758"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="904"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2181"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2206"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2228"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2307"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1626"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1786"/>
+        <source> m</source>
+        <translation> m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="487"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1597"/>
-        <source>1370LSB/Gauss</source>
-        <translation>1370LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="778"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2248"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1643"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1810"/>
+        <source>Advanced settings</source>
+        <translation>Pokročilá nastavení</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="654"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2020"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1614"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1771"/>
-        <source>Show safety stop</source>
-        <translation>Ukázat bezpečnostní zastávku</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="784"/>
+        <source>Left button sensitivity</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="438"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1615"/>
-        <source>Reset device to default settings</source>
-        <translation>Nastavit zařízení znovu na výchozí nastavení</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="791"/>
+        <source>Always show ppO2</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="798"/>
@@ -1010,20 +1073,6 @@
         <translation>Alt GF lze vybrat pod vodou</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="223"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1541"/>
-        <source>Suunto Vyper family</source>
-        <translation>Rodina Suunto Vyper</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="778"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2248"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1643"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1810"/>
-        <source>Advanced settings</source>
-        <translation>Pokročilá nastavení</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="805"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2271"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1618"/>
@@ -1054,6 +1103,14 @@
         <translation>GFHigh</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="865"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2261"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1624"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1784"/>
+        <source>Desaturation</source>
+        <translation>Odsycení</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="917"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2320"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1627"/>
@@ -1068,14 +1125,6 @@
         <translation> mbar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="973"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2369"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1630"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1788"/>
-        <source> min</source>
-        <translation> min</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="960"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2331"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1633"/>
@@ -1084,63 +1133,28 @@
         <translation>ZH-L16</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="47"/>
-        <source>Connect via Bluetooth</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="163"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1532"/>
-        <source>Save libdivecomputer logfile</source>
-        <translation>Uložit soubor se záznamem libdivecomputer</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="661"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2145"/>
-        <source>End Depth</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="671"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2162"/>
-        <source> s</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="687"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1953"/>
-        <source>Length</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="694"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2138"/>
-        <source>Start Depth</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="701"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2152"/>
-        <source>Reset Depth</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="784"/>
-        <source>Left button sensitivity</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="791"/>
-        <source>Always show ppO2</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="965"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1634"/>
         <source>ZH-L16+GF</source>
         <translation>ZH-L16+GF</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="973"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2369"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1630"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1788"/>
+        <source> min</source>
+        <translation> min</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="983"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2398"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1636"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1800"/>
+        <source>Last deco</source>
+        <translation>Poslední zastavení</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1009"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2424"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1640"/>
@@ -1157,6 +1171,14 @@
         <translation>Alternativní GFHigh</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1042"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2457"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1639"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1805"/>
+        <source>Saturation</source>
+        <translation>Nasycení</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1052"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1642"/>
         <source>Flip screen</source>
@@ -1168,12 +1190,22 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1066"/>
+        <source>MOD warning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1073"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2513"/>
         <source>Graphical speed indicator</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1080"/>
+        <source>Dynamic ascent rate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1087"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2552"/>
         <source>Bottom gas consumption</source>
@@ -1186,6 +1218,14 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1133"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1149"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2520"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2536"/>
+        <source> ℓ/min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1165"/>
         <source>Temperature sensor offset</source>
         <translation type="unfinished"/>
@@ -1204,6 +1244,18 @@
         <translation>Nastavení směsi</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1235"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1320"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2610"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2695"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1645"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1668"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1812"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1835"/>
+        <source>%O₂</source>
+        <translation>%O₂</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1240"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1325"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2615"/>
@@ -1322,16 +1374,10 @@
         <translation>Dil 5</translation>
     </message>
     <message>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1691"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1858"/>
-        <source>Set point [cbar]</source>
-        <translation>Nastavení bodu [cbar]</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1693"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1860"/>
-        <source>Change depth [m]</source>
-        <translation>Hloubka změny [m]</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1405"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2770"/>
+        <source>Setpoint</source>
+        <translation>Nastavovací hodnota</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1415"/>
@@ -1370,6 +1416,12 @@
         <translation>SP 5</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1443"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1709"/>
+        <source>O₂ in calibration gas</source>
+        <translation>O₂ v kalibrační směsi</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1467"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1713"/>
         <source>Fixed setpoint</source>
@@ -1400,101 +1452,6 @@
         <translation> cbar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1748"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1733"/>
-        <source>P1 (medium)</source>
-        <extracomment>Suunto safety level</extracomment>
-        <translation>P1 (střední)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1753"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1734"/>
-        <source>P2 (high)</source>
-        <extracomment>Suunto safety level</extracomment>
-        <translation>P2 (vysoká)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1792"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1744"/>
-        <source>Total dive time</source>
-        <translation>Celkový čas potápění</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2109"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1769"/>
-        <source>kg/ℓ</source>
-        <translation> kg/ℓ</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2346"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1795"/>
-        <source>Apnoea</source>
-        <translation>Apnoea</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1583"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1722"/>
-        <source>Safety level</source>
-        <translation>Úroveň bezpečnosti</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="54"/>
-        <source>Connect</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="64"/>
-        <source>Disconnect</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="214"/>
-        <source>OSTC 3,Sport,Cr,2</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1066"/>
-        <source>MOD warning</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1080"/>
-        <source>Dynamic ascent rate</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1133"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1149"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2520"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2536"/>
-        <source> ℓ/min</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1235"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1320"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2610"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2695"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1645"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1668"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1812"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1835"/>
-        <source>%O₂</source>
-        <translation>%O₂</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1405"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2770"/>
-        <source>Setpoint</source>
-        <translation>Nastavovací hodnota</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1443"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1709"/>
-        <source>O₂ in calibration gas</source>
-        <translation>O₂ v kalibrační směsi</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1535"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2843"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1719"/>
@@ -1511,6 +1468,12 @@
         <translation>pO₂ min</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1583"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1722"/>
+        <source>Safety level</source>
+        <translation>Úroveň bezpečnosti</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1609"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1723"/>
         <source>Altitude range</source>
@@ -1544,6 +1507,20 @@
         <translation>P0 (žádná)</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1748"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1733"/>
+        <source>P1 (medium)</source>
+        <extracomment>Suunto safety level</extracomment>
+        <translation>P1 (střední)</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1753"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1734"/>
+        <source>P2 (high)</source>
+        <extracomment>Suunto safety level</extracomment>
+        <translation>P2 (vysoká)</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1761"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1736"/>
         <source>Sample rate</source>
@@ -1568,11 +1545,10 @@
         <translation>60 s</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="531"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1799"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1745"/>
-        <source>Computer model</source>
-        <translation>Počítačový model</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1792"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1744"/>
+        <source>Total dive time</source>
+        <translation>Celkový čas potápění</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1816"/>
@@ -1637,12 +1613,6 @@
         <translation>Časový poplach</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2099"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1765"/>
-        <source>Salinity</source>
-        <translation>Obsah soli</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2074"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1774"/>
         <source>MM/DD/YY</source>
@@ -1661,12 +1631,30 @@
         <translation>RR/MM/DD</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2099"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1765"/>
+        <source>Salinity</source>
+        <translation>Obsah soli</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2109"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1769"/>
+        <source>kg/ℓ</source>
+        <translation> kg/ℓ</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2341"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1794"/>
         <source>ZH-L16 CC</source>
         <translation>ZH-L16 CC</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2346"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1795"/>
+        <source>Apnoea</source>
+        <translation>Apnoea</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2351"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1796"/>
         <source>L16-GF OC</source>
@@ -1685,87 +1673,112 @@
         <translation>PSCR-GF</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1108"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1129"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1539"/>
+        <source>OSTC 3</source>
+        <translation>OSTC 3</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1691"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1858"/>
+        <source>Set point [cbar]</source>
+        <translation>Nastavení bodu [cbar]</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1693"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1860"/>
+        <source>Change depth [m]</source>
+        <translation>Hloubka změny [m]</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1110"/>
+        <source>Backup dive computer settings</source>
+        <translation>Nastavení záložního potápěcího počítače</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1111"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1132"/>
         <source>Backup files (*.xml)</source>
         <translation>Soubory se zálohou (*.xml)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1113"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1115"/>
+        <source>XML backup error</source>
+        <translation>Chyba zálohy XML</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1116"/>
         <source>An error occurred while saving the backup file.
 %1</source>
         <translation>Chyba při ukládání souboru se zálohou.
 %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1116"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1119"/>
         <source>Backup succeeded</source>
         <translation>Vytvoření zálohy úspěšné</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1117"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1120"/>
         <source>Your settings have been saved to: %1</source>
         <translation>Nastavení bylo uloženo do: %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1107"/>
-        <source>Backup dive computer settings</source>
-        <translation>Nastavení záložního potápěcího počítače</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1112"/>
-        <source>XML backup error</source>
-        <translation>Chyba zálohy XML</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1128"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1131"/>
         <source>Restore dive computer settings</source>
         <translation>Obnova nastavení potápěcího počítače</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1134"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1137"/>
         <source>XML restore error</source>
         <translation>Chyba obnovy XML</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1135"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1138"/>
         <source>An error occurred while restoring the backup file.
 %1</source>
         <translation>Při obnově zálohy nastala chyba.
 %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1139"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1142"/>
         <source>Restore succeeded</source>
         <translation>Úspěšná obnova</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1140"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1143"/>
         <source>Your settings have been restored successfully.</source>
         <translation>Nastavení byla obnovena úspěšně.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1150"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1153"/>
         <source>Select firmware file</source>
         <translation>Vyberte soubor s firmware</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1151"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1154"/>
         <source>All files (*.*)</source>
         <translation>Všechny soubory (*.*)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1207"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1210"/>
         <source>Choose file for divecomputer download logfile</source>
         <translation>Vyberte soubor ke stažení souboru se záznamem potápecího počítače</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1208"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1211"/>
         <source>Log files (*.log)</source>
         <translation>Soubory se záznamy (*.log)</translation>
     </message>
 </context>
 <context>
+    <name>ContextDrawer</name>
+    <message>
+        <location filename="../mobile-widgets/qml/kirigami/src/controls/ContextDrawer.qml" line="76"/>
+        <source>Actions</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>CylindersModel</name>
     <message>
         <location filename="../qt-models/cylindermodel.cpp" line="16"/>
@@ -1779,11 +1792,6 @@
     </message>
     <message>
         <location filename="../qt-models/cylindermodel.cpp" line="16"/>
-        <source>He%</source>
-        <translation>He%</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="16"/>
         <source>Work press.</source>
         <translation>Provozní tlak</translation>
     </message>
@@ -1803,9 +1811,24 @@
         <translation>O₂%</translation>
     </message>
     <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="16"/>
+        <source>He%</source>
+        <translation>He%</translation>
+    </message>
+    <message>
         <location filename="../qt-models/cylindermodel.cpp" line="17"/>
-        <source>Switch at</source>
-        <translation>Změna při</translation>
+        <source>Deco switch at</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
+        <source>Bot. MOD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
+        <source>MND</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-models/cylindermodel.cpp" line="17"/>
@@ -1823,17 +1846,32 @@
         <translation> ℓ</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="161"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="177"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation>Klepnutí zde odstraní tuto láhev.</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="383"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="180"/>
+        <source>Switch depth for deco gas. Calculated using Deco pO₂ preference, unless set manually.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="183"/>
+        <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to &apos;*&apos; for best O₂% for max depth.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="186"/>
+        <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to &apos;*&apos; for best He% for max depth.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="444"/>
         <source>Cylinder cannot be removed</source>
         <translation>Láhev nelze odstranit</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="384"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="445"/>
         <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source>
         <translation>Tento plyn se používá. Lze odstranit jen ty láhve, jež nejsou při potápění používány.</translation>
     </message>
@@ -1853,42 +1891,24 @@
         <translation>Které součásti chcete kopírovat</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="73"/>
+        <location filename="../build/ui_divecomponentselection.h" line="141"/>
+        <source>Dive site</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="80"/>
         <location filename="../build/ui_divecomponentselection.h" line="142"/>
         <source>Suit</source>
         <translation>Oblek</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="122"/>
-        <location filename="../build/ui_divecomponentselection.h" line="148"/>
-        <source>Divemaster</source>
-        <translation>Vedoucí skupiny potápečů</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="129"/>
-        <location filename="../build/ui_divecomponentselection.h" line="149"/>
-        <source>Buddy</source>
-        <translation>Společník při potápění</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="136"/>
-        <location filename="../build/ui_divecomponentselection.h" line="150"/>
-        <source>Rating</source>
-        <translation>Hodnocení</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="87"/>
         <location filename="../build/ui_divecomponentselection.h" line="143"/>
         <source>Visibility</source>
         <translation>Viditelnost</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="73"/>
-        <location filename="../build/ui_divecomponentselection.h" line="141"/>
-        <source>Dive site</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="94"/>
         <location filename="../build/ui_divecomponentselection.h" line="144"/>
         <source>Notes</source>
@@ -1912,10 +1932,34 @@
         <source>Cylinders</source>
         <translation>Láhve</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="122"/>
+        <location filename="../build/ui_divecomponentselection.h" line="148"/>
+        <source>Divemaster</source>
+        <translation>Vedoucí skupiny potápečů</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="129"/>
+        <location filename="../build/ui_divecomponentselection.h" line="149"/>
+        <source>Buddy</source>
+        <translation>Společník při potápění</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="136"/>
+        <location filename="../build/ui_divecomponentselection.h" line="150"/>
+        <source>Rating</source>
+        <translation>Hodnocení</translation>
+    </message>
 </context>
 <context>
     <name>DiveComputerManagementDialog</name>
     <message>
+        <location filename="../desktop-widgets/divecomputermanagementdialog.ui" line="17"/>
+        <location filename="../build/ui_divecomputermanagementdialog.h" line="65"/>
+        <source>Edit dive computer nicknames</source>
+        <translation>Upravit označení potápěcího počítače</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divecomputermanagementdialog.cpp" line="49"/>
         <source>Remove the selected dive computer?</source>
         <translation>Odstranit vybraný potápecí počítač?</translation>
@@ -1926,12 +1970,6 @@
  remove the selected dive computer?</source>
         <translation>Jste si jistý, že chcete odstranit vybraný potápecí počítač?</translation>
     </message>
-    <message>
-        <location filename="../desktop-widgets/divecomputermanagementdialog.ui" line="17"/>
-        <location filename="../build/ui_divecomputermanagementdialog.h" line="65"/>
-        <source>Edit dive computer nicknames</source>
-        <translation>Upravit označení potápěcího počítače</translation>
-    </message>
 </context>
 <context>
     <name>DiveComputerModel</name>
@@ -1959,17 +1997,17 @@
 <context>
     <name>DiveDetails</name>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="33"/>
+        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="38"/>
         <source>Dive details</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="67"/>
+        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="72"/>
         <source>Delete dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="84"/>
+        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="89"/>
         <source>Show on map</source>
         <translation type="unfinished"/>
     </message>
@@ -1977,88 +2015,93 @@
 <context>
     <name>DiveDetailsEdit</name>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="74"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="80"/>
         <source>Dive %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="78"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="84"/>
         <source>Date:</source>
         <translation>Datum:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="86"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="92"/>
         <source>Location:</source>
         <translation>Místo:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="95"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="101"/>
         <source>Coordinates:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="104"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="110"/>
         <source>Use current
 GPS location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="118"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="124"/>
         <source>Depth:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="127"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="133"/>
         <source>Duration:</source>
         <translation>Délka:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="137"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="143"/>
         <source>Air Temp:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="146"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="152"/>
         <source>Water Temp:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="155"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="161"/>
         <source>Suit:</source>
         <translation>Oblek:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="164"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="176"/>
         <source>Buddy:</source>
         <translation>Společník při potápění:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="173"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="191"/>
         <source>Dive Master:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="182"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="206"/>
         <source>Weight:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="192"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="216"/>
+        <source>Cylinder:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="231"/>
         <source>Gas mix:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="203"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="241"/>
         <source>Start Pressure:</source>
         <translation>Počáteční tlak:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="213"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="250"/>
         <source>End Pressure:</source>
         <translation>Koncový tlak:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="224"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="260"/>
         <source>Notes:</source>
         <translation>Poznámky:</translation>
     </message>
@@ -2096,42 +2139,42 @@ GPS location:</source>
         <translation>Oblek:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="159"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="158"/>
         <source>Air Temp:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="175"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="172"/>
         <source>Cylinder:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="189"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="185"/>
         <source>Water Temp:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="205"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="198"/>
         <source>Dive Master:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="220"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="211"/>
         <source>Weight:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="249"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="224"/>
         <source>Buddy:</source>
         <translation>Společník při potápění:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="263"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="237"/>
         <source>SAC:</source>
         <translation>SAC:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="280"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="252"/>
         <source>Notes</source>
         <translation>Poznámky</translation>
     </message>
@@ -2139,18 +2182,18 @@ GPS location:</source>
 <context>
     <name>DiveEventItem</name>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="134"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="165"/>
         <source>Manual switch to OC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="136"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="167"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation> začátek</translation>
     </message>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="137"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="168"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation> konec</translation>
@@ -2159,27 +2202,27 @@ GPS location:</source>
 <context>
     <name>DiveImportedModel</name>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="646"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="656"/>
         <source>Date/time</source>
         <translation>Datum/Čas</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="648"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="658"/>
         <source>Duration</source>
         <translation>Délka</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="650"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="660"/>
         <source>Depth</source>
         <translation>Hloubka</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="672"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="682"/>
         <source>h:</source>
         <translation>h:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="672"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="682"/>
         <source>min</source>
         <translation>min</translation>
     </message>
@@ -2188,8 +2231,8 @@ GPS location:</source>
     <name>DiveList</name>
     <message>
         <location filename="../mobile-widgets/qml/DiveList.qml" line="12"/>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="226"/>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="232"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="227"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="233"/>
         <source>Dive list</source>
         <translation type="unfinished"/>
     </message>
@@ -2204,110 +2247,115 @@ GPS location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="222"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="223"/>
         <source>Cloud credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="228"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="229"/>
         <source>Please tap the &apos;+&apos; button to add a dive</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="248"/>
+        <source>No dives in dive list</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DiveListView</name>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="846"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="849"/>
         <source>Expand all</source>
         <translation>Rozbalit vše</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="848"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="851"/>
         <source>Collapse all</source>
         <translation>Sbalit vše</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="852"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="855"/>
         <source>Collapse others</source>
         <translation>Složit ostatní</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="856"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="859"/>
         <source>Remove dive(s) from trip</source>
         <translation>Odstranit potápení z cesty</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="857"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="860"/>
         <source>Create new trip above</source>
         <translation>Vytvořit novou cestu výše</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="871"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="874"/>
         <source>Add dive(s) to trip immediately above</source>
         <translation>Přidat potápění k cestě bezprostředně výše</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="873"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="876"/>
         <source>Add dive(s) to trip immediately below</source>
         <translation>Přidat potápění k cestě bezprostředně níže</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="877"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="880"/>
         <source>Merge trip with trip above</source>
         <translation>Spojit cestu s cestou výše</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="878"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="881"/>
         <source>Merge trip with trip below</source>
         <translation>Spojit cestu s cestou níže</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="882"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="885"/>
         <source>Delete dive(s)</source>
         <translation>Smazat potápění</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="884"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="887"/>
         <source>Mark dive(s) invalid</source>
         <translation>Označit potápění jako neplatné</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="888"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="891"/>
         <source>Merge selected dives</source>
         <translation>Sloučit vybraná potápění</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="890"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="893"/>
         <source>Renumber dive(s)</source>
         <translation>Přečíslovat potápění</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="891"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="894"/>
         <source>Shift dive times</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="892"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="895"/>
         <source>Split selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="893"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="896"/>
         <source>Load image(s) from file(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="894"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="897"/>
         <source>Load image(s) from web</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="917"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="919"/>
         <source>Open image files</source>
         <translation>Otevřít soubory s obrázky</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="917"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="919"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>Soubory s obrázky (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -2328,56 +2376,6 @@ GPS location:</source>
 <context>
     <name>DiveLogExportDialog</name>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="103"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="351"/>
-        <source>Export format</source>
-        <translation>Ukládací formát</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="134"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="353"/>
-        <source>UDDF</source>
-        <translation>UDDF</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="187"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="358"/>
-        <source>Worldmap</source>
-        <translation>Mapa světa</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="197"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="359"/>
-        <source>I&amp;mage depths</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="243"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="360"/>
-        <source>Selection</source>
-        <translation>Výběr</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="252"/>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="346"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="361"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="372"/>
-        <source>Selected dives</source>
-        <translation>Vybraná potápění</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="262"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="362"/>
-        <source>All dives</source>
-        <translation>Všechna potápění</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="306"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="396"/>
-        <source>HTML</source>
-        <translation>HTML</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="14"/>
         <location filename="../build/ui_divelogexportdialog.h" line="349"/>
         <source>Export dive log files</source>
@@ -2390,12 +2388,24 @@ GPS location:</source>
         <translation>Obecné vyvedení</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="103"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="351"/>
+        <source>Export format</source>
+        <translation>Ukládací formát</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="115"/>
         <location filename="../build/ui_divelogexportdialog.h" line="352"/>
         <source>Subsurface &amp;XML</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="134"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="353"/>
+        <source>UDDF</source>
+        <translation>UDDF</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="147"/>
         <location filename="../build/ui_divelogexportdialog.h" line="354"/>
         <source>di&amp;velogs.de</source>
@@ -2420,238 +2430,297 @@ GPS location:</source>
         <translation>Podrobnosti potápění CSV</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="275"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="187"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="358"/>
+        <source>Worldmap</source>
+        <translation>Mapa světa</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="197"/>
+        <source>TeX</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="207"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="359"/>
+        <source>I&amp;mage depths</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="253"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="360"/>
+        <source>Selection</source>
+        <translation>Výběr</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="262"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="356"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="361"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="372"/>
+        <source>Selected dives</source>
+        <translation>Vybraná potápění</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="272"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="362"/>
+        <source>All dives</source>
+        <translation>Všechna potápění</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="285"/>
         <location filename="../build/ui_divelogexportdialog.h" line="363"/>
         <source>CSV units</source>
         <translation>Jednotky CSV</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="288"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="298"/>
         <location filename="../build/ui_divelogexportdialog.h" line="366"/>
         <source>Metric</source>
         <translation>Metrický</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="293"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="303"/>
         <location filename="../build/ui_divelogexportdialog.h" line="367"/>
         <source>Imperial</source>
         <translation>Anglický palcový</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="324"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="316"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="396"/>
+        <source>HTML</source>
+        <translation>HTML</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="334"/>
         <location filename="../build/ui_divelogexportdialog.h" line="370"/>
         <source>General settings</source>
         <translation>Obecná nastavení</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="330"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="340"/>
         <location filename="../build/ui_divelogexportdialog.h" line="371"/>
         <source>Subsurface numbers</source>
         <translation>Čísla Subsurface</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="359"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="369"/>
         <location filename="../build/ui_divelogexportdialog.h" line="373"/>
         <source>Export yearly statistics</source>
         <translation>Vyvést roční statistiky</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="375"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="385"/>
         <location filename="../build/ui_divelogexportdialog.h" line="374"/>
         <source>All di&amp;ves</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="385"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="395"/>
         <location filename="../build/ui_divelogexportdialog.h" line="375"/>
         <source>Export list only</source>
         <translation>Vyvést pouze seznamy</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="392"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="402"/>
         <location filename="../build/ui_divelogexportdialog.h" line="376"/>
         <source>Export photos</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="408"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="418"/>
         <location filename="../build/ui_divelogexportdialog.h" line="377"/>
         <source>Style options</source>
         <translation>Volby pro styl</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="423"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="433"/>
         <location filename="../build/ui_divelogexportdialog.h" line="378"/>
         <source>Font</source>
         <translation>Písmo</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="433"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="443"/>
         <location filename="../build/ui_divelogexportdialog.h" line="379"/>
         <source>Font size</source>
         <translation>Velikost písma</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="444"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="454"/>
         <location filename="../build/ui_divelogexportdialog.h" line="382"/>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="449"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="459"/>
         <location filename="../build/ui_divelogexportdialog.h" line="383"/>
         <source>10</source>
         <translation>10</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="454"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="464"/>
         <location filename="../build/ui_divelogexportdialog.h" line="384"/>
         <source>12</source>
         <translation>12</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="459"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="469"/>
         <location filename="../build/ui_divelogexportdialog.h" line="385"/>
         <source>14</source>
         <translation>14</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="464"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="474"/>
         <location filename="../build/ui_divelogexportdialog.h" line="386"/>
         <source>16</source>
         <translation>16</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="469"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="479"/>
         <location filename="../build/ui_divelogexportdialog.h" line="387"/>
         <source>18</source>
         <translation>18</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="474"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="484"/>
         <location filename="../build/ui_divelogexportdialog.h" line="388"/>
         <source>20</source>
         <translation>20</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="482"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="492"/>
         <location filename="../build/ui_divelogexportdialog.h" line="390"/>
         <source>Theme</source>
         <translation>Vzhled</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="493"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="503"/>
         <location filename="../build/ui_divelogexportdialog.h" line="393"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="95"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="99"/>
         <source>Light</source>
         <translation>Světlý</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="498"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="508"/>
         <location filename="../build/ui_divelogexportdialog.h" line="394"/>
         <source>Sand</source>
         <translation>Pískový</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="134"/>
-        <source>UDDF files (*.uddf *.UDDF)</source>
-        <translation>Soubory UDDF (*.uddf *.UDDF)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="142"/>
-        <source>CSV files (*.csv *.CSV)</source>
-        <translation>Soubory CSV (*.csv *.CSV)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="74"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="76"/>
         <source>Generic format that is used for data exchange between a variety of diving related programs.</source>
         <translation>Všeobecný formát používaný pro výměnu dat mezi různými potápěčskými programy.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="76"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="78"/>
         <source>Comma separated values describing the dive profile.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="78"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="80"/>
         <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="80"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="82"/>
         <source>Send the dive data to divelogs.de website.</source>
         <translation>Odeslat data o potápění na stránku divelogs.de.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="82"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="84"/>
         <source>Send the dive data to dive-share.appspot.com website</source>
         <translation>Odeslat data o potápění na stránku dive-share.appspot.com</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="84"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="86"/>
         <source>HTML export of the dive locations, visualized on a world map.</source>
         <translation>Vyvedení potápěčského místa do HTML zobrazené na mapě světa.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="86"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="88"/>
         <source>Subsurface native XML format.</source>
         <translation>Původní formát XML programu Subsurface.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="88"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="90"/>
         <source>Write depths of images to file.</source>
         <translation>Zapsat hloubku, v níž byl obrázek pořízen, do souboru.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="133"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="92"/>
+        <source>Write dive as TeX macros to file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="137"/>
         <source>Export UDDF file as</source>
         <translation>Vyvést soubor UDDF jako</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="137"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/>
+        <source>UDDF files (*.uddf *.UDDF)</source>
+        <translation>Soubory UDDF (*.uddf *.UDDF)</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divelogexportdialog.cpp" line="141"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="145"/>
         <source>Export CSV file as</source>
         <translation>Vyvést soubor CSV jako</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="148"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="142"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="146"/>
+        <source>CSV files (*.csv *.CSV)</source>
+        <translation>Soubory CSV (*.csv *.CSV)</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="152"/>
         <source>Export world map</source>
         <translation>Vyvést mapu světa</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="149"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="169"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="153"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="177"/>
         <source>HTML files (*.html)</source>
         <translation>Soubory HTML (*.html)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="153"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="157"/>
         <source>Export Subsurface XML</source>
         <translation>Vyvést Subsurface XML</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="158"/>
         <source>XML files (*.xml *.ssrf)</source>
         <translation>Soubory XML (*.xml *.ssrf)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="162"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="166"/>
         <source>Save image depths</source>
         <translation>Uložit hloubku, v níž byl obrázek pořízen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="168"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="170"/>
+        <source>Export to TeX file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="170"/>
+        <source>TeX files (*.tex)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="176"/>
         <source>Export HTML files as</source>
         <translation>Vyvést soubor HTML jako</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="184"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="192"/>
         <source>Please wait, exporting...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="219"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="227"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="311"/>
         <source>Can&apos;t open file %s</source>
         <translation>Nelze otevřít soubor %s</translation>
     </message>
@@ -2665,25 +2734,6 @@ GPS location:</source>
         <translation>Zavést soubory se záznamy o potápění</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="643"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="727"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="856"/>
-        <source>Time</source>
-        <translation>Čas</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.ui" line="127"/>
-        <location filename="../build/ui_divelogimportdialog.h" line="164"/>
-        <source>Metric</source>
-        <translation>Metrické</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.ui" line="132"/>
-        <location filename="../build/ui_divelogimportdialog.h" line="165"/>
-        <source>Imperial</source>
-        <translation>Anglické</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divelogimportdialog.ui" line="89"/>
         <location filename="../build/ui_divelogimportdialog.h" line="152"/>
         <source>dd.mm.yyyy</source>
@@ -2702,74 +2752,6 @@ GPS location:</source>
         <translation>rrrr-mm-dd</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.ui" line="155"/>
-        <location filename="../build/ui_divelogimportdialog.h" line="167"/>
-        <source>Drag the tags above to each corresponding column below</source>
-        <translation>Značky nahoře přetáhněte na odpovídající sloupce dole</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="641"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="729"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="852"/>
-        <source>Dive #</source>
-        <translation>Číslo potápění</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="642"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="723"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="854"/>
-        <source>Date</source>
-        <translation>Datum</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="644"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="858"/>
-        <source>Duration</source>
-        <translation>Délka</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="655"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="862"/>
-        <source>GPS</source>
-        <translation>GPS</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="645"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="864"/>
-        <source>Max. depth</source>
-        <translation>Největší hloubka</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="646"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="866"/>
-        <source>Avg. depth</source>
-        <translation>Průměrná hloubka</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="658"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="872"/>
-        <source>Suit</source>
-        <translation>Oblek</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="663"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="878"/>
-        <source>Tags</source>
-        <translation>Značky</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="652"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="894"/>
-        <source>O₂</source>
-        <translation>O₂</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="653"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="896"/>
-        <source>He</source>
-        <translation>He</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divelogimportdialog.ui" line="108"/>
         <location filename="../build/ui_divelogimportdialog.h" line="158"/>
         <source>Seconds</source>
@@ -2788,183 +2770,269 @@ GPS location:</source>
         <translation>Minuty:sekundy</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="654"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="860"/>
-        <source>Location</source>
-        <translation>Místo</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.ui" line="127"/>
+        <location filename="../build/ui_divelogimportdialog.h" line="164"/>
+        <source>Metric</source>
+        <translation>Metrické</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.ui" line="132"/>
+        <location filename="../build/ui_divelogimportdialog.h" line="165"/>
+        <source>Imperial</source>
+        <translation>Anglické</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.ui" line="155"/>
+        <location filename="../build/ui_divelogimportdialog.h" line="167"/>
+        <source>Drag the tags above to each corresponding column below</source>
+        <translation>Značky nahoře přetáhněte na odpovídající sloupce dole</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="354"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="499"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="505"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="355"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="528"/>
         <source>Tab</source>
         <translation>Karta</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="575"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="598"/>
         <source>Some column headers were pre-populated; please drag and drop the headers so they match the column they are in.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="613"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="731"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="782"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="848"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="636"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="761"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="857"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="925"/>
         <source>Sample time</source>
         <translation>Čas vzorku</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="615"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="733"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="784"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="638"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="763"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="859"/>
         <source>Sample depth</source>
         <translation>Hloubka vzorku</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="617"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="735"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="786"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="640"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="765"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="861"/>
         <source>Sample temperature</source>
         <translation>Teplota vzorku</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="621"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="739"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="790"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="642"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="767"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="863"/>
+        <source>Sample pO₂</source>
+        <translation>pO₂ vzorku</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="644"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="769"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="865"/>
         <source>Sample sensor1 pO₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="623"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="741"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="792"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="646"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="771"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="867"/>
         <source>Sample sensor2 pO₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="625"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="743"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="794"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="648"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="773"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="869"/>
         <source>Sample sensor3 pO₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="633"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="751"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="802"/>
-        <source>Sample stopdepth</source>
-        <translation>Hloubka zastavení vzorku</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="637"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="755"/>
-        <source>Sample setpoint</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="619"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="737"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="788"/>
-        <source>Sample pO₂</source>
-        <translation>pO₂ vzorku</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="627"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="745"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="796"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="650"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="775"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="871"/>
         <source>Sample CNS</source>
         <translation>CNS vzorku</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="629"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="747"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="798"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="652"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="777"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="873"/>
         <source>Sample NDL</source>
         <translation>NDL vzorku</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="631"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="749"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="800"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="654"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="779"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="875"/>
         <source>Sample TTS</source>
         <translation>TTS vzorku</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="635"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="753"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="804"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="656"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="781"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="877"/>
+        <source>Sample stopdepth</source>
+        <translation>Hloubka zastavení vzorku</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="658"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="783"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="879"/>
         <source>Sample pressure</source>
         <translation>Tlak vzorku</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="656"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="868"/>
-        <source>Divemaster</source>
-        <translation>Vedoucí skupiny potápečů</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="660"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="785"/>
+        <source>Sample setpoint</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="657"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="870"/>
-        <source>Buddy</source>
-        <translation>Společník při potápění</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="664"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="759"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="929"/>
+        <source>Dive #</source>
+        <translation>Číslo potápění</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="659"/>
-        <source>Rating</source>
-        <translation>Hodnocení</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="665"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="753"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="931"/>
+        <source>Date</source>
+        <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="660"/>
-        <source>Visibility</source>
-        <translation>Viditelnost</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="666"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="757"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="933"/>
+        <source>Time</source>
+        <translation>Čas</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="661"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="874"/>
-        <source>Notes</source>
-        <translation>Poznámky</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="667"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="935"/>
+        <source>Duration</source>
+        <translation>Délka</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="662"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="876"/>
-        <source>Weight</source>
-        <translation>Váha</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="668"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="941"/>
+        <source>Max. depth</source>
+        <translation>Největší hloubka</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="669"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="943"/>
+        <source>Avg. depth</source>
+        <translation>Průměrná hloubka</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="649"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="888"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="670"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="975"/>
+        <source>Air temp.</source>
+        <translation>Teplota vzduchu</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="671"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="977"/>
+        <source>Water temp.</source>
+        <translation>Teplota vody</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="672"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="965"/>
         <source>Cyl. size</source>
         <translation>Velikost láhve</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="650"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="890"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="673"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="967"/>
         <source>Start pressure</source>
         <translation>Počáteční tlak</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="651"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="892"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="674"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="969"/>
         <source>End pressure</source>
         <translation>Koncový tlak</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="647"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="898"/>
-        <source>Air temp.</source>
-        <translation>Teplota vzduchu</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="675"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="971"/>
+        <source>O₂</source>
+        <translation>O₂</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="648"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="900"/>
-        <source>Water temp.</source>
-        <translation>Teplota vody</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="676"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="973"/>
+        <source>He</source>
+        <translation>He</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="677"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="937"/>
+        <source>Location</source>
+        <translation>Místo</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="678"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="939"/>
+        <source>GPS</source>
+        <translation>GPS</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="679"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="945"/>
+        <source>Divemaster</source>
+        <translation>Vedoucí skupiny potápečů</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="680"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="947"/>
+        <source>Buddy</source>
+        <translation>Společník při potápění</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="681"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="949"/>
+        <source>Suit</source>
+        <translation>Oblek</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="682"/>
+        <source>Rating</source>
+        <translation>Hodnocení</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="683"/>
+        <source>Visibility</source>
+        <translation>Viditelnost</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="684"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="951"/>
+        <source>Notes</source>
+        <translation>Poznámky</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="685"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="953"/>
+        <source>Weight</source>
+        <translation>Váha</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="686"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="955"/>
+        <source>Tags</source>
+        <translation>Značky</translation>
     </message>
 </context>
 <context>
     <name>DiveObjectHelper</name>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="287"/>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="323"/>
         <source>%1 dive(s)</source>
         <translation type="unfinished"/>
     </message>
@@ -2972,18 +3040,18 @@ GPS location:</source>
 <context>
     <name>DivePlanner</name>
     <message>
-        <location filename="../desktop-widgets/diveplanner.ui" line="152"/>
-        <location filename="../build/ui_diveplanner.h" line="190"/>
-        <source>Altitude</source>
-        <translation>Nadmořská výška</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/diveplanner.ui" line="109"/>
         <location filename="../build/ui_diveplanner.h" line="189"/>
         <source>Planned dive time</source>
         <translation>Plánovaná doba trvání</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/diveplanner.ui" line="152"/>
+        <location filename="../build/ui_diveplanner.h" line="190"/>
+        <source>Altitude</source>
+        <translation>Nadmořská výška</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/diveplanner.ui" line="159"/>
         <location filename="../build/ui_diveplanner.h" line="191"/>
         <source>ATM pressure</source>
@@ -3017,32 +3085,32 @@ GPS location:</source>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="134"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="136"/>
         <source>unknown</source>
         <translation>Neznámý</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="312"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="326"/>
         <source>Final depth</source>
         <translation>Konečná hloubka</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="314"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="328"/>
         <source>Run time</source>
         <translation>Doba potápění</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="316"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="330"/>
         <source>Duration</source>
         <translation>Délka</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="318"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="332"/>
         <source>Used gas</source>
         <translation>Spotřeba plynu</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="320"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="334"/>
         <source>CC setpoint</source>
         <translation type="unfinished"/>
     </message>
@@ -3050,22 +3118,22 @@ GPS location:</source>
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="108"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="112"/>
         <source>Dive planner points</source>
         <translation>Body plánovače potápění</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="112"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="116"/>
         <source>Available gases</source>
         <translation>Dostupné plyny</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="137"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="143"/>
         <source>Add dive data point</source>
         <translation>Přidat bod potápěcích dat</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="146"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="152"/>
         <source>Save new</source>
         <translation>Uložit nový</translation>
     </message>
@@ -3098,11 +3166,36 @@ GPS location:</source>
         <translation>Barva</translation>
     </message>
     <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="124"/>
+        <source>User entered</source>
+        <translation>Zadání uživatele</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="126"/>
+        <source>Cylinder index</source>
+        <translation>Lahvový index</translation>
+    </message>
+    <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="128"/>
         <source>Pressure S</source>
         <translation>Tlak S</translation>
     </message>
     <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="130"/>
+        <source>Pressure I</source>
+        <translation>Tlak I</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="132"/>
+        <source>Ceiling</source>
+        <translation>Strop</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="134"/>
+        <source>SAC</source>
+        <translation>Spotřeba plynu</translation>
+    </message>
+    <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="136"/>
         <source>pN₂</source>
         <translation>pN₂</translation>
@@ -3138,49 +3231,24 @@ GPS location:</source>
         <translation>Čidlo 3</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="152"/>
-        <source>Heart rate</source>
-        <translation>Srdeční rytmus</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="156"/>
-        <source>Mean depth @ s</source>
-        <translation>Průměrná hloubka @ s</translation>
-    </message>
-    <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="150"/>
         <source>Ambient pressure</source>
         <translation>Okolní tlak</translation>
     </message>
     <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="152"/>
+        <source>Heart rate</source>
+        <translation>Srdeční rytmus</translation>
+    </message>
+    <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="154"/>
         <source>Gradient factor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="130"/>
-        <source>Pressure I</source>
-        <translation>Tlak I</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="124"/>
-        <source>User entered</source>
-        <translation>Zadání uživatele</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="126"/>
-        <source>Cylinder index</source>
-        <translation>Lahvový index</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="132"/>
-        <source>Ceiling</source>
-        <translation>Strop</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="134"/>
-        <source>SAC</source>
-        <translation>Spotřeba plynu</translation>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="156"/>
+        <source>Mean depth @ s</source>
+        <translation>Průměrná hloubka @ s</translation>
     </message>
 </context>
 <context>
@@ -3247,310 +3315,314 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="395"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="441"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="434"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="483"/>
         <source>#</source>
         <translation>Číslo</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="398"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="444"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="437"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="486"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="401"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="447"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="440"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="489"/>
         <source>Rating</source>
         <translation>Hodnocení</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="404"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="443"/>
         <source>Depth</source>
         <translation>Hloubka</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="410"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="446"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="495"/>
+        <source>Duration</source>
+        <translation>Délka</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="449"/>
         <source>Temp</source>
         <translation>Teplota</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="413"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="452"/>
         <source>Weight</source>
         <translation>Váha</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="425"/>
-        <source>SAC</source>
-        <translation>Spotřeba plynu</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
-        <source>m</source>
-        <translation>m</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
-        <source>ft</source>
-        <translation>st</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
-        <source>Weight(%1)</source>
-        <translation>Váha (%1)</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="416"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="462"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="455"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="504"/>
         <source>Suit</source>
         <translation>Oblek</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="419"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="465"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="458"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="507"/>
         <source>Cyl</source>
         <translation>Láhev</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="422"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="468"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="461"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="510"/>
         <source>Gas</source>
         <translation>Plyn</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
-        <source>SAC(%1)</source>
-        <translation>Spotřeba plynu (%1)</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="464"/>
+        <source>SAC</source>
+        <translation>Spotřeba plynu</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
-        <source>/min</source>
-        <translation>/min</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="467"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="518"/>
+        <source>OTU</source>
+        <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="431"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="479"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="470"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="521"/>
         <source>Max CNS</source>
         <translation>Max. CNS</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="434"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="482"/>
-        <source>Location</source>
-        <translation>Místo</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
+        <source>Photos</source>
+        <translation>Fotografie</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
-        <source>kg</source>
-        <translation>kg</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="476"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="527"/>
+        <source>Location</source>
+        <translation>Místo</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="492"/>
         <source>Depth(%1)</source>
         <translation>Hloubka (%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="407"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="453"/>
-        <source>Duration</source>
-        <translation>Délka</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="492"/>
+        <source>m</source>
+        <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="456"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="492"/>
+        <source>ft</source>
+        <translation>st</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="498"/>
         <source>Temp(%1%2)</source>
         <translation>Teplota (%1%2)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="501"/>
+        <source>Weight(%1)</source>
+        <translation>Váha (%1)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="501"/>
+        <source>kg</source>
+        <translation>kg</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="501"/>
         <source>lbs</source>
         <translation>libra US</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="428"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="476"/>
-        <source>OTU</source>
-        <translation>OTU</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="515"/>
+        <source>SAC(%1)</source>
+        <translation>Spotřeba plynu (%1)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="515"/>
+        <source>/min</source>
+        <translation>/min</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="524"/>
+        <source>Photos before/during/after dive</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="164"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="165"/>
         <source>no dives were selected</source>
         <translation>Nebyla vybrána žádná potápění</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="174"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="175"/>
         <source>stylesheet to export to divelogs.de is not found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="184"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="185"/>
         <source>failed to create zip file for upload: %s</source>
         <translation>Nepodařilo se vytvořit soubor s archivem ve formátu zip pro nahrání: %s</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="236"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="237"/>
         <source>internal error</source>
         <translation>Vnitřní chyba</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="244"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="245"/>
         <source>Conversion of dive %1 to divelogs.de format failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="272"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="273"/>
         <source>error writing zip file: %s zip error %d system error %d - %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="745"/>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="935"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="936"/>
         <source>Done</source>
         <translation>Hotovo</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="778"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="779"/>
         <source>Uploading dive list...</source>
         <translation>Nahrává se seznam potápění...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="810"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="811"/>
         <source>Downloading dive list...</source>
         <translation>Stahuje se seznam potápění...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="851"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="852"/>
         <source>Downloading %1 dives...</source>
         <translation>Stahuje se %1 potápění...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="885"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="886"/>
         <source>Download finished - %1</source>
         <translation>Stahování dokončeno - %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="899"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="900"/>
         <source>Problem with download</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="900"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="901"/>
         <source>The archive could not be opened:
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="909"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="910"/>
         <source>Corrupted download</source>
         <translation>Poškozené stahování</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="910"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="911"/>
         <source>The archive could not be opened:
 %1</source>
         <translation>Archiv se nepodařilo otevřít:
 %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="937"/>
+        <source>Upload finished</source>
+        <translation>Přenos dokončen</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="950"/>
         <source>Upload failed</source>
         <translation>Přenos se nezdařil</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="952"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="953"/>
         <source>Upload successful</source>
         <translation>Přenos se zdařil</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="955"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="956"/>
         <source>Login failed</source>
         <translation>Přihlášení se nezdařilo</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="958"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="959"/>
         <source>Cannot parse response</source>
         <translation>Odpověď nelze zpracovat</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="970"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="971"/>
         <source>Error: %1</source>
         <translation>Chyba: %1</translation>
     </message>
-    <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="936"/>
-        <source>Upload finished</source>
-        <translation>Přenos dokončen</translation>
-    </message>
 </context>
 <context>
     <name>DownloadFromDCWidget</name>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="185"/>
-        <source>Error</source>
-        <translation>Chyba</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="436"/>
-        <source>Retry</source>
-        <translation>Opakovat</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="280"/>
-        <source>Find Uemis dive computer</source>
-        <translation>Najít potápecí počítač Uemis</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="101"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="107"/>
         <source>Download</source>
         <translation>Stáhnout</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="104"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="110"/>
         <source>Choose Bluetooth download mode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="382"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="191"/>
+        <source>Error</source>
+        <translation>Chyba</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="286"/>
+        <source>Find Uemis dive computer</source>
+        <translation>Najít potápecí počítač Uemis</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="392"/>
         <source>Choose file for divecomputer download logfile</source>
         <translation>Vyberte soubor ke stažení souboru se záznamem potápecího počítače</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="383"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="393"/>
         <source>Log files (*.log)</source>
         <translation>Soubory se záznamy (*.log)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="398"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="408"/>
         <source>Warning</source>
         <translation>Varování</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="399"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="409"/>
         <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="410"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="420"/>
         <source>Choose file for divecomputer binary dump file</source>
         <translation>Vyberte soubor, do něhož se má ukládat soubor Dump potápecího počítače</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="411"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="421"/>
         <source>Dump files (*.bin)</source>
         <translation>Soubory Dump (*.bin)</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="446"/>
+        <source>Retry</source>
+        <translation>Opakovat</translation>
+    </message>
 </context>
 <context>
     <name>DownloadFromDiveComputer</name>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="139"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="275"/>
-        <source>Vendor</source>
-        <translation>Dodavatel</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="14"/>
         <location filename="../build/ui_downloadfromdivecomputer.h" line="265"/>
         <source>Download from dive computer</source>
@@ -3563,17 +3635,6 @@ p, li { white-space: pre-wrap; }
         <translation>Zařízení nebo přípojný bod</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="122"/>
-        <source>Choose Bluetooth download mode</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="149"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="276"/>
-        <source>Dive computer</source>
-        <translation>Potápecí počítač</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="66"/>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="101"/>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="115"/>
@@ -3597,11 +3658,46 @@ p, li { white-space: pre-wrap; }
         <translation>Vždy dávat přednnost staženým potápěním</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="87"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="270"/>
+        <source>Download into new trip</source>
+        <translation>Stáhnout do nové cesty</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="94"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="271"/>
+        <source>Save libdivecomputer logfile</source>
+        <translation>Uložit soubor se záznamem libdivecomputer</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="108"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="273"/>
+        <source>Save libdivecomputer dumpfile</source>
+        <translation>Uložit soubor Dump přenosu libdivecomputer</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="122"/>
+        <source>Choose Bluetooth download mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="129"/>
         <source>Select a remote Bluetooth device.</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="139"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="275"/>
+        <source>Vendor</source>
+        <translation>Dodavatel</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="149"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="276"/>
+        <source>Dive computer</source>
+        <translation>Potápecí počítač</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/>
         <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="52"/>
         <location filename="../build/ui_downloadfromdivecomputer.h" line="277"/>
@@ -3609,18 +3705,6 @@ p, li { white-space: pre-wrap; }
         <translation>Stáhnout</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="284"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="281"/>
-        <source>OK</source>
-        <translation>OK</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="291"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="282"/>
-        <source>Cancel</source>
-        <translation>Zrušit</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="226"/>
         <location filename="../build/ui_downloadfromdivecomputer.h" line="278"/>
         <source>Downloaded dives</source>
@@ -3639,22 +3723,16 @@ p, li { white-space: pre-wrap; }
         <translation>Odznačit vše</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="94"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="271"/>
-        <source>Save libdivecomputer logfile</source>
-        <translation>Uložit soubor se záznamem libdivecomputer</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="108"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="273"/>
-        <source>Save libdivecomputer dumpfile</source>
-        <translation>Uložit soubor Dump přenosu libdivecomputer</translation>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="284"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="281"/>
+        <source>OK</source>
+        <translation>OK</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="87"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="270"/>
-        <source>Download into new trip</source>
-        <translation>Stáhnout do nové cesty</translation>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="291"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="282"/>
+        <source>Cancel</source>
+        <translation>Zrušit</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="16"/>
@@ -3744,12 +3822,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="297"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="242"/>
         <source>To disconnect Subsurface from your Facebook account, use the button below</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="306"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="251"/>
         <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source>
         <translation type="unfinished"/>
     </message>
@@ -3757,22 +3835,22 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>FacebookManager</name>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="266"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="211"/>
         <source>Photo upload sucessfull</source>
         <translation>Fotografie nahrána úspěšně</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="267"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="212"/>
         <source>Your dive profile was updated to Facebook.</source>
         <translation>Váš potápěcí profil byl aktualizován na Facebooku.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="271"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="216"/>
         <source>Photo upload failed</source>
         <translation>Nahrání fotografie se nezdařilo</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="272"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="217"/>
         <source>Your dive profile was not updated to Facebook, 
  please send the following to the developer. 
 </source>
@@ -3832,17 +3910,25 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>FirmwareUpdateThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1750"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1739"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Tato funkce ještě není pro vybraný potápěcí počítač dostupná.</translation>
     </message>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1755"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1744"/>
         <source>Firmware update failed!</source>
         <translation>Aktualizace firmware selhala!</translation>
     </message>
 </context>
 <context>
+    <name>GlobalDrawer</name>
+    <message>
+        <location filename="../mobile-widgets/qml/kirigami/src/controls/GlobalDrawer.qml" line="364"/>
+        <source>Back</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>GlobeGPS</name>
     <message>
         <location filename="../desktop-widgets/globe.cpp" line="124"/>
@@ -3858,27 +3944,27 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="40"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="32"/>
         <source>Date: </source>
         <translation>Datum:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="50"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="42"/>
         <source>Name: </source>
         <translation>Název:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="60"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="52"/>
         <source>Latitude: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="69"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="61"/>
         <source>Longitude: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="113"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="105"/>
         <source>List of stored GPS fixes</source>
         <translation type="unfinished"/>
     </message>
@@ -3907,7 +3993,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>LocationFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="648"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="646"/>
         <source>Location: </source>
         <translation>Místo: </translation>
     </message>
@@ -3948,7 +4034,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>LocationFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="299"/>
+        <location filename="../qt-models/filtermodels.cpp" line="304"/>
         <source>No location set</source>
         <translation>Nestanoveno žádné místo</translation>
     </message>
@@ -4069,20 +4155,55 @@ p, li { white-space: pre-wrap; }
     </message>
 </context>
 <context>
-    <name>MainForm.ui</name>
+    <name>MainTab</name>
     <message>
-        <location filename="../packaging/ios/Subsurface-mobile/MainForm.ui.qml" line="17"/>
-        <source>Press Me 1</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/maintab.ui" line="18"/>
+        <location filename="../desktop-widgets/maintab.ui" line="439"/>
+        <location filename="../build/ui_maintab.h" line="961"/>
+        <location filename="../build/ui_maintab.h" line="963"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="539"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="571"/>
+        <source>Notes</source>
+        <translation>Poznámky</translation>
     </message>
     <message>
-        <location filename="../packaging/ios/Subsurface-mobile/MainForm.ui.qml" line="22"/>
-        <source>Press Me 2</source>
+        <location filename="../desktop-widgets/maintab.ui" line="21"/>
+        <location filename="../build/ui_maintab.h" line="964"/>
+        <source>General notes about the current selection</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>MainTab</name>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="92"/>
+        <location filename="../desktop-widgets/maintab.ui" line="646"/>
+        <location filename="../build/ui_maintab.h" line="947"/>
+        <location filename="../build/ui_maintab.h" line="967"/>
+        <source>Date</source>
+        <translation>Datum</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="102"/>
+        <location filename="../build/ui_maintab.h" line="948"/>
+        <source>Time</source>
+        <translation>Čas</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="112"/>
+        <location filename="../desktop-widgets/maintab.ui" line="836"/>
+        <location filename="../build/ui_maintab.h" line="949"/>
+        <location filename="../build/ui_maintab.h" line="987"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="306"/>
+        <source>Air temp.</source>
+        <translation>Teplota vzduchu</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="122"/>
+        <location filename="../desktop-widgets/maintab.ui" line="855"/>
+        <location filename="../build/ui_maintab.h" line="950"/>
+        <location filename="../build/ui_maintab.h" line="989"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="307"/>
+        <source>Water temp.</source>
+        <translation>Teplota vody</translation>
+    </message>
     <message>
         <location filename="../desktop-widgets/maintab.ui" line="184"/>
         <location filename="../build/ui_maintab.h" line="951"/>
@@ -4091,6 +4212,17 @@ p, li { white-space: pre-wrap; }
         <translation>Místo</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="214"/>
+        <source>Edit dive site</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="217"/>
+        <location filename="../build/ui_maintab.h" line="953"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="252"/>
         <location filename="../build/ui_maintab.h" line="954"/>
         <source>Divemaster</source>
@@ -4103,12 +4235,6 @@ p, li { white-space: pre-wrap; }
         <translation>Společník při potápění</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.ui" line="387"/>
-        <location filename="../build/ui_maintab.h" line="959"/>
-        <source>Tags</source>
-        <translation>Značky</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/maintab.ui" line="308"/>
         <location filename="../build/ui_maintab.h" line="956"/>
         <source>Rating</source>
@@ -4127,57 +4253,18 @@ p, li { white-space: pre-wrap; }
         <translation>Oblek</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="387"/>
+        <location filename="../build/ui_maintab.h" line="959"/>
+        <source>Tags</source>
+        <translation>Značky</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="397"/>
         <location filename="../build/ui_maintab.h" line="960"/>
         <source>Dive mode</source>
         <translation>Režim potápění</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.ui" line="112"/>
-        <location filename="../desktop-widgets/maintab.ui" line="836"/>
-        <location filename="../build/ui_maintab.h" line="949"/>
-        <location filename="../build/ui_maintab.h" line="987"/>
-        <location filename="../desktop-widgets/maintab.cpp" line="306"/>
-        <source>Air temp.</source>
-        <translation>Teplota vzduchu</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="122"/>
-        <location filename="../desktop-widgets/maintab.ui" line="855"/>
-        <location filename="../build/ui_maintab.h" line="950"/>
-        <location filename="../build/ui_maintab.h" line="989"/>
-        <location filename="../desktop-widgets/maintab.cpp" line="307"/>
-        <source>Water temp.</source>
-        <translation>Teplota vody</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="18"/>
-        <location filename="../desktop-widgets/maintab.ui" line="439"/>
-        <location filename="../build/ui_maintab.h" line="961"/>
-        <location filename="../build/ui_maintab.h" line="963"/>
-        <location filename="../desktop-widgets/maintab.cpp" line="539"/>
-        <location filename="../desktop-widgets/maintab.cpp" line="571"/>
-        <source>Notes</source>
-        <translation>Poznámky</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="21"/>
-        <location filename="../build/ui_maintab.h" line="964"/>
-        <source>General notes about the current selection</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="214"/>
-        <source>Edit dive site</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="217"/>
-        <location filename="../build/ui_maintab.h" line="953"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/maintab.ui" line="491"/>
         <location filename="../build/ui_maintab.h" line="965"/>
         <source>Equipment</source>
@@ -4202,6 +4289,12 @@ p, li { white-space: pre-wrap; }
         <translation>Informace o potápění</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="665"/>
+        <location filename="../build/ui_maintab.h" line="969"/>
+        <source>Interval</source>
+        <translation>Hladinová přestávka</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="684"/>
         <location filename="../build/ui_maintab.h" line="971"/>
         <source>Gases used</source>
@@ -4214,18 +4307,38 @@ p, li { white-space: pre-wrap; }
         <translation>Spotřeba plynu</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="722"/>
+        <location filename="../desktop-widgets/maintab.ui" line="1094"/>
+        <location filename="../build/ui_maintab.h" line="975"/>
+        <location filename="../build/ui_maintab.h" line="1003"/>
+        <source>SAC</source>
+        <translation>Spotřeba plynu</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="741"/>
         <location filename="../build/ui_maintab.h" line="977"/>
         <source>CNS</source>
         <translation>CNS</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="760"/>
+        <location filename="../build/ui_maintab.h" line="979"/>
+        <source>OTU</source>
+        <translation>OTU</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="779"/>
         <location filename="../build/ui_maintab.h" line="981"/>
         <source>Max. depth</source>
         <translation>Největší hloubka</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="798"/>
+        <location filename="../build/ui_maintab.h" line="983"/>
+        <source>Avg. depth</source>
+        <translation>Průměrná hloubka</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="817"/>
         <location filename="../build/ui_maintab.h" line="985"/>
         <source>Air pressure</source>
@@ -4238,82 +4351,6 @@ p, li { white-space: pre-wrap; }
         <translation>Doba trvání potápění</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.ui" line="933"/>
-        <location filename="../build/ui_maintab.h" line="1007"/>
-        <source>Simple statistics about the selection</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1039"/>
-        <location filename="../build/ui_maintab.h" line="999"/>
-        <source>Total time</source>
-        <translation>Celkový čas</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1106"/>
-        <location filename="../build/ui_maintab.h" line="1004"/>
-        <source>Gas consumption</source>
-        <translation>Spotřeba plynu</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1151"/>
-        <location filename="../build/ui_maintab.h" line="1009"/>
-        <source>All photos from the current selection</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1177"/>
-        <location filename="../build/ui_maintab.h" line="1010"/>
-        <source>Extra data</source>
-        <translation>Další data</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1180"/>
-        <location filename="../build/ui_maintab.h" line="1011"/>
-        <source>Adittional data from the dive computer</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="92"/>
-        <location filename="../desktop-widgets/maintab.ui" line="646"/>
-        <location filename="../build/ui_maintab.h" line="947"/>
-        <location filename="../build/ui_maintab.h" line="967"/>
-        <source>Date</source>
-        <translation>Datum</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="102"/>
-        <location filename="../build/ui_maintab.h" line="948"/>
-        <source>Time</source>
-        <translation>Čas</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="665"/>
-        <location filename="../build/ui_maintab.h" line="969"/>
-        <source>Interval</source>
-        <translation>Hladinová přestávka</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="722"/>
-        <location filename="../desktop-widgets/maintab.ui" line="1094"/>
-        <location filename="../build/ui_maintab.h" line="975"/>
-        <location filename="../build/ui_maintab.h" line="1003"/>
-        <source>SAC</source>
-        <translation>Spotřeba plynu</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="798"/>
-        <location filename="../build/ui_maintab.h" line="983"/>
-        <source>Avg. depth</source>
-        <translation>Průměrná hloubka</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="760"/>
-        <location filename="../build/ui_maintab.h" line="979"/>
-        <source>OTU</source>
-        <translation>OTU</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/maintab.ui" line="893"/>
         <location filename="../build/ui_maintab.h" line="993"/>
         <source>Salinity</source>
@@ -4326,22 +4363,34 @@ p, li { white-space: pre-wrap; }
         <translation>Statistika</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="933"/>
+        <location filename="../build/ui_maintab.h" line="1007"/>
+        <source>Simple statistics about the selection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="986"/>
         <location filename="../build/ui_maintab.h" line="996"/>
         <source>Depth</source>
         <translation>Hloubka</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="998"/>
+        <location filename="../build/ui_maintab.h" line="997"/>
+        <source>Duration</source>
+        <translation>Délka</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="1027"/>
         <location filename="../build/ui_maintab.h" line="998"/>
         <source>Temperature</source>
         <translation>Teplota</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.ui" line="998"/>
-        <location filename="../build/ui_maintab.h" line="997"/>
-        <source>Duration</source>
-        <translation>Délka</translation>
+        <location filename="../desktop-widgets/maintab.ui" line="1039"/>
+        <location filename="../build/ui_maintab.h" line="999"/>
+        <source>Total time</source>
+        <translation>Celkový čas</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/maintab.ui" line="1058"/>
@@ -4350,20 +4399,34 @@ p, li { white-space: pre-wrap; }
         <translation>Potápění</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="1106"/>
+        <location filename="../build/ui_maintab.h" line="1004"/>
+        <source>Gas consumption</source>
+        <translation>Spotřeba plynu</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="1148"/>
         <location filename="../build/ui_maintab.h" line="1008"/>
         <source>Photos</source>
         <translation>Fotografie</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.cpp" line="88"/>
-        <source>Cylinders</source>
-        <translation>Láhve</translation>
+        <location filename="../desktop-widgets/maintab.ui" line="1151"/>
+        <location filename="../build/ui_maintab.h" line="1009"/>
+        <source>All photos from the current selection</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.cpp" line="92"/>
-        <source>Weights</source>
-        <translation>Olovo</translation>
+        <location filename="../desktop-widgets/maintab.ui" line="1177"/>
+        <location filename="../build/ui_maintab.h" line="1010"/>
+        <source>Extra data</source>
+        <translation>Další data</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="1180"/>
+        <location filename="../build/ui_maintab.h" line="1011"/>
+        <source>Adittional data from the dive computer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/maintab.cpp" line="63"/>
@@ -4376,11 +4439,21 @@ p, li { white-space: pre-wrap; }
         <translation>Zahodit změny</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.cpp" line="88"/>
+        <source>Cylinders</source>
+        <translation>Láhve</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.cpp" line="89"/>
         <source>Add cylinder</source>
         <translation>Přidat láhev</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.cpp" line="92"/>
+        <source>Weights</source>
+        <translation>Olovo</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.cpp" line="93"/>
         <source>Add weight system</source>
         <translation>Přidat závaží</translation>
@@ -4572,659 +4645,685 @@ ze vzduchu a následujících plynů:</translation>
         <translation>&amp;Soubor</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="455"/>
-        <location filename="../build/ui_mainwindow.h" line="534"/>
-        <source>Export dive logs</source>
-        <translation>Vyvést soubory se záznamy o potápění</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="510"/>
-        <location filename="../build/ui_mainwindow.h" line="542"/>
-        <source>Toggle pHe graph</source>
-        <translation>Zapnout/Vypnout křivku pHe</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="546"/>
-        <location filename="../build/ui_mainwindow.h" line="545"/>
-        <source>Toggle calculating all tissues</source>
-        <translation>Zapnout/Vypnout výpočet všech tkání</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="522"/>
-        <location filename="../build/ui_mainwindow.h" line="543"/>
-        <source>Toggle DC reported ceiling</source>
-        <translation>Zapnout/Vypnout potápěcí počítač pro horní mez (hranici vynoření)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="534"/>
-        <location filename="../build/ui_mainwindow.h" line="544"/>
-        <source>Toggle calculated ceiling</source>
-        <translation>Zapnout/Vypnout vypočítanou horní mez (hranici vynoření)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="606"/>
-        <location filename="../build/ui_mainwindow.h" line="550"/>
-        <source>Toggle NDL, TTS</source>
-        <translation>Zapnout/Vypnout nulový čas, celkový čas výstupu</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="558"/>
-        <location filename="../build/ui_mainwindow.h" line="546"/>
-        <source>Toggle calculated ceiling with 3m increments</source>
-        <translation>Zapnout/Vypnout vypočítanou horní mez (hranici vynoření) v 3 m krocích</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="463"/>
-        <location filename="../build/ui_mainwindow.h" line="537"/>
-        <source>Configure &amp;dive computer</source>
-        <translation>Nastavit &amp;potápěcí počítač</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="570"/>
-        <location filename="../build/ui_mainwindow.h" line="547"/>
-        <source>Toggle heart rate</source>
-        <translation>Zapnout/Vypnout srdeční rytmus</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="582"/>
-        <location filename="../build/ui_mainwindow.h" line="548"/>
-        <source>Toggle MOD</source>
-        <translation>Zapnout/Vypnout MOD</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="594"/>
-        <location filename="../build/ui_mainwindow.h" line="549"/>
-        <source>Toggle EAD, END, EADD</source>
-        <translation>Zapnout/Vypnout EAD, END, EADD</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="618"/>
-        <location filename="../build/ui_mainwindow.h" line="551"/>
-        <source>Toggle SAC rate</source>
-        <translation>Prepnout spotřebu plynu (SAC)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="630"/>
-        <location filename="../build/ui_mainwindow.h" line="552"/>
-        <source>Toggle ruler</source>
-        <translation>Zapnout/Vypnout pravítko</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="86"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="87"/>
         <location filename="../build/ui_mainwindow.h" line="569"/>
         <source>&amp;Log</source>
         <translation>&amp;Záznam</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="105"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="104"/>
         <location filename="../build/ui_mainwindow.h" line="570"/>
         <source>&amp;View</source>
         <translation>&amp;Pohled</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="121"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="120"/>
         <location filename="../build/ui_mainwindow.h" line="571"/>
         <source>&amp;Help</source>
         <translation>&amp;Nápověda</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="130"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="129"/>
         <location filename="../build/ui_mainwindow.h" line="572"/>
         <source>&amp;Import</source>
         <translation>Za&amp;vedení</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="139"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="138"/>
         <location filename="../build/ui_mainwindow.h" line="573"/>
         <source>&amp;Edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="144"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="143"/>
         <source>Share on</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="158"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="157"/>
         <location filename="../build/ui_mainwindow.h" line="453"/>
         <source>&amp;New logbook</source>
         <translation>&amp;Nová záznamní kniha</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="161"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="160"/>
         <location filename="../build/ui_mainwindow.h" line="455"/>
         <source>New</source>
         <translation>Nová</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="164"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="163"/>
         <location filename="../build/ui_mainwindow.h" line="457"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="169"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="168"/>
         <location filename="../build/ui_mainwindow.h" line="458"/>
         <source>&amp;Open logbook</source>
         <translation>&amp;Otevřít záznamní knihu</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="172"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="171"/>
         <location filename="../build/ui_mainwindow.h" line="460"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="508"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="502"/>
         <source>Open</source>
         <translation>Otevřít</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="175"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="174"/>
         <location filename="../build/ui_mainwindow.h" line="462"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="180"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="179"/>
         <location filename="../build/ui_mainwindow.h" line="463"/>
         <source>&amp;Save</source>
         <translation>&amp;Uložit</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="183"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="182"/>
         <location filename="../build/ui_mainwindow.h" line="465"/>
         <source>Save</source>
         <translation>Uložit</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="186"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="185"/>
         <location filename="../build/ui_mainwindow.h" line="467"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="191"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="190"/>
         <location filename="../build/ui_mainwindow.h" line="468"/>
         <source>Sa&amp;ve as</source>
         <translation>Uložit &amp;jako</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="194"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="193"/>
         <location filename="../build/ui_mainwindow.h" line="470"/>
         <source>Save as</source>
         <translation>Uložit jako</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="197"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="196"/>
         <location filename="../build/ui_mainwindow.h" line="472"/>
         <source>Ctrl+Shift+S</source>
         <translation>Ctrl+Shift+S</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="202"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="201"/>
         <location filename="../build/ui_mainwindow.h" line="473"/>
         <source>&amp;Close</source>
         <translation>&amp;Zavřít</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="205"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="204"/>
         <location filename="../build/ui_mainwindow.h" line="475"/>
         <source>Close</source>
         <translation>Zavřít</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="208"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="207"/>
         <location filename="../build/ui_mainwindow.h" line="477"/>
         <source>Ctrl+W</source>
         <translation>Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="221"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="212"/>
+        <location filename="../build/ui_mainwindow.h" line="478"/>
+        <source>&amp;Print</source>
+        <translation>&amp;Tisk</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="215"/>
+        <location filename="../build/ui_mainwindow.h" line="479"/>
+        <source>Ctrl+P</source>
+        <translation>Ctrl+P</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="220"/>
         <location filename="../build/ui_mainwindow.h" line="480"/>
         <source>P&amp;references</source>
         <translation>&amp;Nastavení</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="251"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="223"/>
+        <location filename="../build/ui_mainwindow.h" line="481"/>
+        <source>Ctrl+,</source>
+        <translation>Ctrl+,</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="231"/>
+        <location filename="../build/ui_mainwindow.h" line="482"/>
+        <source>&amp;Quit</source>
+        <translation>&amp;Ukončit</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="234"/>
+        <location filename="../build/ui_mainwindow.h" line="483"/>
+        <source>Ctrl+Q</source>
+        <translation>Ctrl+Q</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="242"/>
+        <location filename="../build/ui_mainwindow.h" line="484"/>
+        <source>Import from &amp;dive computer</source>
+        <translation>Zavést z p&amp;otápecího počítače</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="245"/>
+        <location filename="../build/ui_mainwindow.h" line="485"/>
+        <source>Ctrl+D</source>
+        <translation>Ctrl+D</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="250"/>
         <location filename="../build/ui_mainwindow.h" line="486"/>
         <source>Import &amp;GPS data from Subsurface web service</source>
         <translation>Zavedení dat &amp;GPS ze stránek Subsurface</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="259"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="253"/>
+        <location filename="../build/ui_mainwindow.h" line="487"/>
+        <source>Ctrl+G</source>
+        <translation>Ctrl+G</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="258"/>
         <location filename="../build/ui_mainwindow.h" line="488"/>
         <source>Edit device &amp;names</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="272"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="263"/>
+        <location filename="../build/ui_mainwindow.h" line="489"/>
+        <source>&amp;Add dive</source>
+        <translation>&amp;Přidat potápění</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="266"/>
+        <location filename="../build/ui_mainwindow.h" line="490"/>
+        <source>Ctrl++</source>
+        <translation>Ctrl++</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="271"/>
         <location filename="../build/ui_mainwindow.h" line="491"/>
         <source>&amp;Edit dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="277"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="276"/>
         <location filename="../build/ui_mainwindow.h" line="492"/>
         <source>&amp;Copy dive components</source>
         <translation>&amp;Kopírovat součásti potápění</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="280"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="279"/>
         <location filename="../build/ui_mainwindow.h" line="493"/>
         <source>Ctrl+C</source>
         <translation>Ctrl+C</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="285"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="284"/>
         <location filename="../build/ui_mainwindow.h" line="494"/>
         <source>&amp;Paste dive components</source>
         <translation>&amp;Vložit součásti potápění</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="288"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="287"/>
         <location filename="../build/ui_mainwindow.h" line="495"/>
         <source>Ctrl+V</source>
         <translation>Ctrl+V</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="325"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="292"/>
+        <location filename="../build/ui_mainwindow.h" line="496"/>
+        <source>&amp;Renumber</source>
+        <translation>&amp;Přečíslovat</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="295"/>
+        <location filename="../build/ui_mainwindow.h" line="497"/>
+        <source>Ctrl+R</source>
+        <translation>Ctrl+R</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="303"/>
+        <location filename="../build/ui_mainwindow.h" line="498"/>
+        <source>Auto &amp;group</source>
+        <translation>&amp;Seskupit automaticky</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="308"/>
+        <location filename="../build/ui_mainwindow.h" line="499"/>
+        <source>&amp;Yearly statistics</source>
+        <translation>&amp;Roční statistiky</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="311"/>
+        <location filename="../build/ui_mainwindow.h" line="500"/>
+        <source>Ctrl+Y</source>
+        <translation>Ctrl+Y</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="316"/>
+        <location filename="../build/ui_mainwindow.h" line="501"/>
+        <source>&amp;Dive list</source>
+        <translation>S&amp;eznam potápění</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="319"/>
+        <location filename="../build/ui_mainwindow.h" line="502"/>
+        <source>Ctrl+2</source>
+        <translation>Ctrl+2</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="324"/>
         <location filename="../build/ui_mainwindow.h" line="503"/>
         <source>&amp;Profile</source>
         <translation>&amp;Profil</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="333"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="327"/>
+        <location filename="../build/ui_mainwindow.h" line="504"/>
+        <source>Ctrl+3</source>
+        <translation>Ctrl+3</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="332"/>
         <location filename="../build/ui_mainwindow.h" line="505"/>
         <source>&amp;Info</source>
         <translation>&amp;Informace</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="341"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="335"/>
+        <location filename="../build/ui_mainwindow.h" line="506"/>
+        <source>Ctrl+4</source>
+        <translation>Ctrl+4</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="340"/>
         <location filename="../build/ui_mainwindow.h" line="507"/>
         <source>&amp;All</source>
         <translation>&amp;Vše</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="357"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="343"/>
+        <location filename="../build/ui_mainwindow.h" line="508"/>
+        <source>Ctrl+1</source>
+        <translation>Ctrl+1</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="348"/>
+        <location filename="../build/ui_mainwindow.h" line="509"/>
+        <source>P&amp;revious DC</source>
+        <translation>&amp;Předchozí PP</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="351"/>
+        <location filename="../build/ui_mainwindow.h" line="510"/>
+        <source>Left</source>
+        <translation>Vlevo</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="356"/>
         <location filename="../build/ui_mainwindow.h" line="511"/>
         <source>&amp;Next DC</source>
         <translation>&amp;Další PP</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="365"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="359"/>
+        <location filename="../build/ui_mainwindow.h" line="512"/>
+        <source>Right</source>
+        <translation>Vpravo</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="364"/>
         <location filename="../build/ui_mainwindow.h" line="513"/>
         <source>&amp;About Subsurface</source>
         <translation>&amp;O programu Subsurface</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="381"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="372"/>
+        <location filename="../build/ui_mainwindow.h" line="514"/>
+        <source>User &amp;manual</source>
+        <translation>Uživatelská &amp;příručka</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="375"/>
+        <location filename="../build/ui_mainwindow.h" line="515"/>
+        <source>F1</source>
+        <translation>F1</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="380"/>
         <location filename="../build/ui_mainwindow.h" line="516"/>
         <source>&amp;Globe</source>
         <translation>Země&amp;koule</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="403"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="383"/>
+        <location filename="../build/ui_mainwindow.h" line="517"/>
+        <source>Ctrl+5</source>
+        <translation>Ctrl+5</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="388"/>
+        <location filename="../build/ui_mainwindow.h" line="518"/>
+        <source>P&amp;lan dive</source>
+        <translation>&amp;Naplánovat potápění</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="391"/>
+        <location filename="../build/ui_mainwindow.h" line="519"/>
+        <source>Ctrl+L</source>
+        <translation>Ctrl+L</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="396"/>
+        <location filename="../build/ui_mainwindow.h" line="520"/>
+        <source>&amp;Import log files</source>
+        <translation>&amp;Zavést soubory se záznamy</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="399"/>
+        <location filename="../build/ui_mainwindow.h" line="522"/>
+        <source>Import divelog files from other applications</source>
+        <translation>Zavést soubory se záznamy o potápění z jiných programů</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="402"/>
         <location filename="../build/ui_mainwindow.h" line="524"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="408"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="407"/>
         <location filename="../build/ui_mainwindow.h" line="525"/>
         <source>Import &amp;from divelogs.de</source>
         <translation>&amp;Zavést z divelogs.de</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="416"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="415"/>
         <location filename="../build/ui_mainwindow.h" line="526"/>
         <source>&amp;Full screen</source>
         <translation>&amp;Celá obrazovka</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="419"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="418"/>
         <location filename="../build/ui_mainwindow.h" line="528"/>
         <source>Toggle full screen</source>
         <translation>Přepnout zobrazení na celou obrazovku</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="447"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="421"/>
+        <location filename="../build/ui_mainwindow.h" line="530"/>
+        <source>F11</source>
+        <translation>F11</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="446"/>
         <location filename="../build/ui_mainwindow.h" line="531"/>
         <source>&amp;Check for updates</source>
         <translation>&amp;Zkontrolovat aktualizace</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="452"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="451"/>
         <location filename="../build/ui_mainwindow.h" line="532"/>
         <source>&amp;Export</source>
         <translation>&amp;Vyvést</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="458"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="454"/>
+        <location filename="../build/ui_mainwindow.h" line="534"/>
+        <source>Export dive logs</source>
+        <translation>Vyvést soubory se záznamy o potápění</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="457"/>
         <location filename="../build/ui_mainwindow.h" line="536"/>
         <source>Ctrl+E</source>
         <translation>Ctrl+E</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="466"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="462"/>
+        <location filename="../build/ui_mainwindow.h" line="537"/>
+        <source>Configure &amp;dive computer</source>
+        <translation>Nastavit &amp;potápěcí počítač</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="465"/>
         <location filename="../build/ui_mainwindow.h" line="538"/>
         <source>Ctrl+Shift+C</source>
         <translation>Ctrl+Shift+C</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="474"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="473"/>
         <location filename="../build/ui_mainwindow.h" line="539"/>
         <source>Edit &amp;dive in planner</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="486"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="485"/>
         <location filename="../build/ui_mainwindow.h" line="540"/>
         <source>Toggle pO₂ graph</source>
         <translation>Přepnout nákres pO₂</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="498"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="497"/>
         <location filename="../build/ui_mainwindow.h" line="541"/>
         <source>Toggle pN₂ graph</source>
         <translation>Přepnout nákres pN₂</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="642"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="509"/>
+        <location filename="../build/ui_mainwindow.h" line="542"/>
+        <source>Toggle pHe graph</source>
+        <translation>Zapnout/Vypnout křivku pHe</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="521"/>
+        <location filename="../build/ui_mainwindow.h" line="543"/>
+        <source>Toggle DC reported ceiling</source>
+        <translation>Zapnout/Vypnout potápěcí počítač pro horní mez (hranici vynoření)</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="533"/>
+        <location filename="../build/ui_mainwindow.h" line="544"/>
+        <source>Toggle calculated ceiling</source>
+        <translation>Zapnout/Vypnout vypočítanou horní mez (hranici vynoření)</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="545"/>
+        <location filename="../build/ui_mainwindow.h" line="545"/>
+        <source>Toggle calculating all tissues</source>
+        <translation>Zapnout/Vypnout výpočet všech tkání</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="557"/>
+        <location filename="../build/ui_mainwindow.h" line="546"/>
+        <source>Toggle calculated ceiling with 3m increments</source>
+        <translation>Zapnout/Vypnout vypočítanou horní mez (hranici vynoření) v 3 m krocích</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="569"/>
+        <location filename="../build/ui_mainwindow.h" line="547"/>
+        <source>Toggle heart rate</source>
+        <translation>Zapnout/Vypnout srdeční rytmus</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="581"/>
+        <location filename="../build/ui_mainwindow.h" line="548"/>
+        <source>Toggle MOD</source>
+        <translation>Zapnout/Vypnout MOD</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="593"/>
+        <location filename="../build/ui_mainwindow.h" line="549"/>
+        <source>Toggle EAD, END, EADD</source>
+        <translation>Zapnout/Vypnout EAD, END, EADD</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="605"/>
+        <location filename="../build/ui_mainwindow.h" line="550"/>
+        <source>Toggle NDL, TTS</source>
+        <translation>Zapnout/Vypnout nulový čas, celkový čas výstupu</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="617"/>
+        <location filename="../build/ui_mainwindow.h" line="551"/>
+        <source>Toggle SAC rate</source>
+        <translation>Prepnout spotřebu plynu (SAC)</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="629"/>
+        <location filename="../build/ui_mainwindow.h" line="552"/>
+        <source>Toggle ruler</source>
+        <translation>Zapnout/Vypnout pravítko</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="641"/>
         <location filename="../build/ui_mainwindow.h" line="553"/>
         <source>Scale graph</source>
         <translation>Měřítko grafu</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="654"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="653"/>
         <location filename="../build/ui_mainwindow.h" line="554"/>
         <source>Toggle pictures</source>
         <translation>Přepnout obrázky</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="666"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="665"/>
         <location filename="../build/ui_mainwindow.h" line="555"/>
         <source>Toggle tank bar</source>
         <translation>Přepnout pruh s nádrží</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="674"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="673"/>
         <location filename="../build/ui_mainwindow.h" line="556"/>
         <source>&amp;Filter divelist</source>
         <translation>&amp;Filtrovat seznam potápění</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="689"/>
-        <location filename="../build/ui_mainwindow.h" line="558"/>
-        <source>Toggle tissue graph</source>
-        <translation>Zapnout/Vypnout křivku nasycení-tkáně</translation>
+        <location filename="../desktop-widgets/mainwindow.ui" line="676"/>
+        <location filename="../build/ui_mainwindow.h" line="557"/>
+        <source>Ctrl+F</source>
+        <translation>Ctrl+F</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="694"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="688"/>
+        <source>Toggle tissue heat-map</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="693"/>
         <location filename="../build/ui_mainwindow.h" line="559"/>
         <source>User &amp;survey</source>
         <translation>Uživatelský &amp;průzkum.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="699"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="698"/>
         <location filename="../build/ui_mainwindow.h" line="560"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="238"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="231"/>
         <source>&amp;Undo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="702"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="701"/>
         <location filename="../build/ui_mainwindow.h" line="561"/>
         <source>Ctrl+Z</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="707"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="706"/>
         <location filename="../build/ui_mainwindow.h" line="562"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="239"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="232"/>
         <source>&amp;Redo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="710"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="709"/>
         <location filename="../build/ui_mainwindow.h" line="563"/>
         <source>Ctrl+Shift+Z</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="715"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="714"/>
         <location filename="../build/ui_mainwindow.h" line="564"/>
         <source>&amp;Find moved images</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="720"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="719"/>
         <source>Open c&amp;loud storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="725"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="724"/>
         <source>Save to clo&amp;ud storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="730"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="729"/>
         <location filename="../build/ui_mainwindow.h" line="567"/>
         <source>&amp;Manage dive sites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="735"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="734"/>
         <source>Dive Site &amp;Edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="740"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="739"/>
         <source>Facebook</source>
         <translation>Facebook</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="745"/>
-        <source>Add GPS location here</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="744"/>
+        <source>Take cloud storage online</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="677"/>
-        <location filename="../build/ui_mainwindow.h" line="557"/>
-        <source>Ctrl+F</source>
-        <translation>Ctrl+F</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="213"/>
-        <location filename="../build/ui_mainwindow.h" line="478"/>
-        <source>&amp;Print</source>
-        <translation>&amp;Tisk</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="224"/>
-        <location filename="../build/ui_mainwindow.h" line="481"/>
-        <source>Ctrl+,</source>
-        <translation>Ctrl+,</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="232"/>
-        <location filename="../build/ui_mainwindow.h" line="482"/>
-        <source>&amp;Quit</source>
-        <translation>&amp;Ukončit</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="243"/>
-        <location filename="../build/ui_mainwindow.h" line="484"/>
-        <source>Import from &amp;dive computer</source>
-        <translation>Zavést z p&amp;otápecího počítače</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="254"/>
-        <location filename="../build/ui_mainwindow.h" line="487"/>
-        <source>Ctrl+G</source>
-        <translation>Ctrl+G</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="267"/>
-        <location filename="../build/ui_mainwindow.h" line="490"/>
-        <source>Ctrl++</source>
-        <translation>Ctrl++</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="293"/>
-        <location filename="../build/ui_mainwindow.h" line="496"/>
-        <source>&amp;Renumber</source>
-        <translation>&amp;Přečíslovat</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="296"/>
-        <location filename="../build/ui_mainwindow.h" line="497"/>
-        <source>Ctrl+R</source>
-        <translation>Ctrl+R</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="312"/>
-        <location filename="../build/ui_mainwindow.h" line="500"/>
-        <source>Ctrl+Y</source>
-        <translation>Ctrl+Y</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="392"/>
-        <location filename="../build/ui_mainwindow.h" line="519"/>
-        <source>Ctrl+L</source>
-        <translation>Ctrl+L</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="216"/>
-        <location filename="../build/ui_mainwindow.h" line="479"/>
-        <source>Ctrl+P</source>
-        <translation>Ctrl+P</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="235"/>
-        <location filename="../build/ui_mainwindow.h" line="483"/>
-        <source>Ctrl+Q</source>
-        <translation>Ctrl+Q</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="246"/>
-        <location filename="../build/ui_mainwindow.h" line="485"/>
-        <source>Ctrl+D</source>
-        <translation>Ctrl+D</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="264"/>
-        <location filename="../build/ui_mainwindow.h" line="489"/>
-        <source>&amp;Add dive</source>
-        <translation>&amp;Přidat potápění</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="304"/>
-        <location filename="../build/ui_mainwindow.h" line="498"/>
-        <source>Auto &amp;group</source>
-        <translation>&amp;Seskupit automaticky</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="309"/>
-        <location filename="../build/ui_mainwindow.h" line="499"/>
-        <source>&amp;Yearly statistics</source>
-        <translation>&amp;Roční statistiky</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="317"/>
-        <location filename="../build/ui_mainwindow.h" line="501"/>
-        <source>&amp;Dive list</source>
-        <translation>S&amp;eznam potápění</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="320"/>
-        <location filename="../build/ui_mainwindow.h" line="502"/>
-        <source>Ctrl+2</source>
-        <translation>Ctrl+2</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="328"/>
-        <location filename="../build/ui_mainwindow.h" line="504"/>
-        <source>Ctrl+3</source>
-        <translation>Ctrl+3</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="336"/>
-        <location filename="../build/ui_mainwindow.h" line="506"/>
-        <source>Ctrl+4</source>
-        <translation>Ctrl+4</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="344"/>
-        <location filename="../build/ui_mainwindow.h" line="508"/>
-        <source>Ctrl+1</source>
-        <translation>Ctrl+1</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="349"/>
-        <location filename="../build/ui_mainwindow.h" line="509"/>
-        <source>P&amp;revious DC</source>
-        <translation>&amp;Předchozí PP</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="352"/>
-        <location filename="../build/ui_mainwindow.h" line="510"/>
-        <source>Left</source>
-        <translation>Vlevo</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="360"/>
-        <location filename="../build/ui_mainwindow.h" line="512"/>
-        <source>Right</source>
-        <translation>Vpravo</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="373"/>
-        <location filename="../build/ui_mainwindow.h" line="514"/>
-        <source>User &amp;manual</source>
-        <translation>Uživatelská &amp;příručka</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="376"/>
-        <location filename="../build/ui_mainwindow.h" line="515"/>
-        <source>F1</source>
-        <translation>F1</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="384"/>
-        <location filename="../build/ui_mainwindow.h" line="517"/>
-        <source>Ctrl+5</source>
-        <translation>Ctrl+5</translation>
+        <location filename="../build/ui_mainwindow.h" line="558"/>
+        <source>Toggle tissue graph</source>
+        <translation>Zapnout/Vypnout křivku nasycení-tkáně</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="389"/>
-        <location filename="../build/ui_mainwindow.h" line="518"/>
-        <source>P&amp;lan dive</source>
-        <translation>&amp;Naplánovat potápění</translation>
+        <location filename="../build/ui_mainwindow.h" line="565"/>
+        <source>Open cloud storage</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="397"/>
-        <location filename="../build/ui_mainwindow.h" line="520"/>
-        <source>&amp;Import log files</source>
-        <translation>&amp;Zavést soubory se záznamy</translation>
+        <location filename="../build/ui_mainwindow.h" line="566"/>
+        <source>Save to cloud storage</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="400"/>
-        <location filename="../build/ui_mainwindow.h" line="522"/>
-        <source>Import divelog files from other applications</source>
-        <translation>Zavést soubory se záznamy o potápění z jiných programů</translation>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="331"/>
+        <source>Connect to</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="422"/>
-        <location filename="../build/ui_mainwindow.h" line="530"/>
-        <source>F11</source>
-        <translation>F11</translation>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="493"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="538"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1545"/>
+        <source>Please save or cancel the current dive edit before opening a new file.</source>
+        <translation>Uložte, prosím, nebo zrušte nynější upravování potápění před otevřením nového souboru.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="505"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="499"/>
         <source>Open file</source>
         <translation>Otevřít soubor</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="509"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="503"/>
         <location filename="../desktop-widgets/mainwindow.cpp" line="614"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1972"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1978"/>
         <source>Cancel</source>
         <translation>Zrušit</translation>
     </message>
@@ -5244,6 +5343,16 @@ ze vzduchu a následujících plynů:</translation>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="649"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="796"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="977"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="983"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1849"/>
+        <source>Warning</source>
+        <translation>Varování</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="674"/>
         <source>Please save or cancel the current dive edit before closing the file.</source>
         <translation>Uložte, prosím, nebo zrušte nynější upravování potápění před zavřením souboru.</translation>
@@ -5259,124 +5368,97 @@ ze vzduchu a následujících plynů:</translation>
         <translation>Vypsat provozní tabulku</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="982"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
+        <source>Trying to replan a dive that&apos;s not a planned dive.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="977"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1849"/>
+        <source>Please, first finish the current edition before trying to do another.</source>
+        <translation>Nejprve, prosím, skončete nynější upravování před pokusem o provádění dalších úprav.</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="983"/>
         <source>Trying to edit a dive that&apos;s not a manually added dive.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1243"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1030"/>
+        <source>Yearly statistics</source>
+        <translation>Roční statistiky</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1244"/>
         <source>Do you want to save the changes that you made in the file %1?</source>
         <translation>Chcete uložit změny provedené v souboru %1?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1246"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1247"/>
         <source>Do you want to save the changes that you made in the data file?</source>
         <translation>Chcete uložit změny provedené v souboru s daty?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1251"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1252"/>
         <source>Save changes?</source>
         <translation>Uložit změny?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1587"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1253"/>
+        <source>Changes will be lost if you don&apos;t save them.</source>
+        <translation>Změny budou ztraceny, pokud je neuložíte.</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1572"/>
         <source>Save file as</source>
         <translation>Uložit soubor jako</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1682"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1573"/>
+        <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
+        <translation>Soubory Subsurface XML (*.ssrf *.xml *.XML)</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1670"/>
+        <source>[local cache for] %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1672"/>
         <source>[cloud storage for] %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1782"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1788"/>
         <source>Opening datafile from older version</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1783"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1789"/>
         <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly.
 Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1794"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1800"/>
         <source>Open dive log file</source>
         <translation>Otevřít soubor se záznamem o potápění</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1795"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1801"/>
         <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1972"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1978"/>
         <source>Contacting cloud service...</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1252"/>
-        <source>Changes will be lost if you don&apos;t save them.</source>
-        <translation>Změny budou ztraceny, pokud je neuložíte.</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="649"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="796"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="976"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="982"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/>
-        <source>Warning</source>
-        <translation>Varování</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="499"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="544"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1560"/>
-        <source>Please save or cancel the current dive edit before opening a new file.</source>
-        <translation>Uložte, prosím, nebo zrušte nynější upravování potápění před otevřením nového souboru.</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="338"/>
-        <source>Connect to</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
-        <source>Trying to replan a dive that&apos;s not a planned dive.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1029"/>
-        <source>Yearly statistics</source>
-        <translation>Roční statistiky</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1588"/>
-        <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
-        <translation>Soubory Subsurface XML (*.ssrf *.xml *.XML)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="976"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/>
-        <source>Please, first finish the current edition before trying to do another.</source>
-        <translation>Nejprve, prosím, skončete nynější upravování před pokusem o provádění dalších úprav.</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_mainwindow.h" line="565"/>
-        <source>Open cloud storage</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../build/ui_mainwindow.h" line="566"/>
-        <source>Save to cloud storage</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>MultiFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="733"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="731"/>
         <source>Filter shows %1 (of %2) dives</source>
         <translation>Filtr ukazuje %1 (z %2) potápění</translation>
     </message>
@@ -5384,39 +5466,39 @@ Subsurface has already tried to pre-populate the data but it might be worth whil
 <context>
     <name>OstcFirmwareCheck</name>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="269"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="271"/>
         <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="273"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="275"/>
         <source>
 
 Please start Bluetooth on your OSTC Sport and do the same preparations as for a logbook download before continuing with the update</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="274"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="276"/>
         <source>Not now</source>
         <translation>Teď ne</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="275"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="277"/>
         <source>Update firmware</source>
         <translation>Aktualizovat firmware</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="277"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="279"/>
         <source>Firmware upgrade notice</source>
         <translation>Upozornění na aktualizaci firmware</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="295"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="297"/>
         <source>Save the downloaded firmware as</source>
         <translation>Uložit stažený firmware jako</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="296"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="298"/>
         <source>HEX files (*.hex)</source>
         <translation>Soubory HEX (*.hex)</translation>
     </message>
@@ -5424,79 +5506,89 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PlannerSettingsWidget</name>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="322"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="302"/>
         <source>Open circuit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="322"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="302"/>
         <source>CCR</source>
         <translation>CCR</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="322"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="302"/>
         <source>pSCR</source>
         <translation>pSCR</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="421"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="388"/>
         <source>ft/min</source>
         <translation>stop/min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="422"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="389"/>
         <source>Last stop at 20ft</source>
         <translation>Poslední zastavení v 20 stopách</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="423"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="390"/>
         <source>50% avg. depth to 20ft</source>
         <translation>50 % průměrná hloubka do 20 stop</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="424"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="391"/>
         <source>20ft to surface</source>
         <translation>20 stop k hladině</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="426"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="392"/>
+        <source>ft</source>
+        <translation>st</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="394"/>
         <source>m/min</source>
         <translation> m/min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="427"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="395"/>
         <source>Last stop at 6m</source>
         <translation>Poslední zastavení v 6 metrech</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="428"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="396"/>
         <source>50% avg. depth to 6m</source>
         <translation>50 % průměrná hloubka do 6 metrů</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="429"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="397"/>
         <source>6m to surface</source>
         <translation>6 metrů k hladině</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="432"/>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="433"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="398"/>
+        <source>m</source>
+        <translation> m</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="401"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="402"/>
         <source>cuft/min</source>
         <translation>cu st/min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="441"/>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="442"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="410"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="411"/>
         <source>ℓ/min</source>
         <translation> ℓ/min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="451"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="420"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="456"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="425"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
@@ -5646,6 +5738,11 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PreferencesDialog</name>
     <message>
+        <location filename="../build/ui_preferences.h" line="1283"/>
+        <source>Preferences</source>
+        <translation>Nastavení</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1288"/>
         <source>Defaults</source>
         <translation>Výchozí</translation>
@@ -5681,6 +5778,11 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1303"/>
+        <source>Lists and tables</source>
+        <translation>Seznamy a tabulky</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1304"/>
         <source>Font</source>
         <translation>Písmo</translation>
@@ -5696,6 +5798,11 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>Potápění</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1307"/>
+        <source>Default dive log file</source>
+        <translation>Výchozí soubor se záznamem o potápění</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1308"/>
         <source>No default file</source>
         <translation type="unfinished"/>
@@ -5726,6 +5833,21 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>...</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1314"/>
+        <source>Display invalid</source>
+        <translation>Zobrazit neplatné</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1316"/>
+        <source>Default cylinder</source>
+        <translation>Standardní láhev</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1317"/>
+        <source>Use default cylinder</source>
+        <translation>Použít standardní láhev</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1318"/>
         <source>Animations</source>
         <translation>Animace</translation>
@@ -5756,42 +5878,26 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>Systém</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1401"/>
-        <source>Dive site geo lookup</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1402"/>
-        <source>Enable geocoding for dive site management</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1403"/>
-        <source>Parse site without GPS data</source>
+        <location filename="../build/ui_preferences.h" line="1324"/>
+        <source>&amp;Metric</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1404"/>
-        <source>Same format for existing dives</source>
-        <translation type="unfinished"/>
+        <location filename="../build/ui_preferences.h" line="1325"/>
+        <source>Imperial</source>
+        <translation>Anglický palcový</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1405"/>
-        <source>Dive Site Layout</source>
+        <location filename="../build/ui_preferences.h" line="1326"/>
+        <source>Personali&amp;ze</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1406"/>
-        <location filename="../build/ui_preferences.h" line="1407"/>
-        <source>/</source>
+        <location filename="../build/ui_preferences.h" line="1327"/>
+        <source>Individual settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1325"/>
-        <source>Imperial</source>
-        <translation>Anglický palcový</translation>
-    </message>
-    <message>
         <location filename="../build/ui_preferences.h" line="1328"/>
         <source>Depth</source>
         <translation>Hloubka</translation>
@@ -5807,6 +5913,11 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>stopa</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1331"/>
+        <source>Pressure</source>
+        <translation>Tlak</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1332"/>
         <location filename="../build/ui_preferences.h" line="1366"/>
         <source>bar</source>
@@ -5818,11 +5929,26 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>psi</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1334"/>
+        <source>Volume</source>
+        <translation>Objem</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1335"/>
+        <source>&amp;liter</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1336"/>
         <source>cu ft</source>
         <translation>cu stopa</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1337"/>
+        <source>Temperature</source>
+        <translation>Teplota</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1338"/>
         <source>celsius</source>
         <translation>celsius</translation>
@@ -5833,11 +5959,121 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>stupně Fahrenheita</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1340"/>
+        <source>Weight</source>
+        <translation>Váha</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1341"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1342"/>
+        <source>lbs</source>
+        <translation>libra US</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1343"/>
+        <source>Time units</source>
+        <translation>Jednotky času</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1344"/>
+        <source>Ascent/descent speed denominator</source>
+        <translation>Jednotky času pro rychlost při výstupu/sestupu</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1345"/>
+        <source>Minutes</source>
+        <translation>Minuty</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1346"/>
+        <source>Seconds</source>
+        <translation>Sekundy</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1347"/>
+        <source>GPS coordinates</source>
+        <translation>Souřadnice GPS</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1348"/>
+        <source>Location Display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1349"/>
+        <source>traditional (dms)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1350"/>
+        <source>decimal</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1351"/>
+        <source>Show</source>
+        <translation>Ukázat</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1352"/>
+        <source>Threshold when showing pO₂</source>
+        <translation>Prahová hodnota při ukázání pO₂</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1353"/>
+        <source>Threshold when showing pN₂</source>
+        <translation>Prahová hodnota při ukázání pN₂</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1354"/>
+        <source>Threshold when showing pHe</source>
+        <translation>Prahová hodnota při ukázání pHe</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1355"/>
+        <source>Max pO₂ when showing MOD</source>
+        <translation>Největší pO₂ při ukázání MOD</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1356"/>
+        <source>Draw dive computer reported ceiling red</source>
+        <translation>Kreslit hranici potápění potápěcího počítače červenou barvou</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1357"/>
+        <source>Show unused cylinders in Equipment tab</source>
+        <translation>Ukázat nepoužité láhve na kartě s výstrojí</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1358"/>
+        <source>Show average depth</source>
+        <translation>Ukázat průměrnou hloubku</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1359"/>
+        <source>Misc</source>
+        <translation>Různé</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1360"/>
+        <source>GFLow</source>
+        <translation>GFLow</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1361"/>
+        <source>GFHigh</source>
+        <translation>GFHigh</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1362"/>
+        <source>GFLow at max depth</source>
+        <translation>Použít GFLow při největší hloubce</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1363"/>
         <source>CCR: show setpoints when viewing pO₂</source>
         <translation>CCR: Ukazovat nastavovací hodnoty, když se zobrazuje pO₂</translation>
@@ -5883,14 +6119,19 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>Výchozí nastavení systému</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1374"/>
+        <source>Filter</source>
+        <translation>Filtr</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1375"/>
         <source>Proxy</source>
         <translation>Proxy</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1379"/>
-        <source>Proxy type</source>
-        <translation>Typ proxy</translation>
+        <location filename="../build/ui_preferences.h" line="1376"/>
+        <source>Port</source>
+        <translation>Přípojka</translation>
     </message>
     <message>
         <location filename="../build/ui_preferences.h" line="1377"/>
@@ -5898,16 +6139,16 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>Hostitel</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1376"/>
-        <source>Port</source>
-        <translation>Přípojka</translation>
-    </message>
-    <message>
         <location filename="../build/ui_preferences.h" line="1378"/>
         <source>Requires authentication</source>
         <translation>Vyžaduje ověření</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1379"/>
+        <source>Proxy type</source>
+        <translation>Typ proxy</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1380"/>
         <source>Username</source>
         <translation>Uživatelské jméno</translation>
@@ -5919,46 +6160,6 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>Heslo</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1400"/>
-        <source>Disconnect from Facebook</source>
-        <translation>Odpojit od Facebooku</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1374"/>
-        <source>Filter</source>
-        <translation>Filtr</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1331"/>
-        <source>Pressure</source>
-        <translation>Tlak</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1303"/>
-        <source>Lists and tables</source>
-        <translation>Seznamy a tabulky</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1307"/>
-        <source>Default dive log file</source>
-        <translation>Výchozí soubor se záznamem o potápění</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1314"/>
-        <source>Display invalid</source>
-        <translation>Zobrazit neplatné</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1316"/>
-        <source>Default cylinder</source>
-        <translation>Standardní láhev</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1317"/>
-        <source>Use default cylinder</source>
-        <translation>Použít standardní láhev</translation>
-    </message>
-    <message>
         <location filename="../build/ui_preferences.h" line="1382"/>
         <source>Subsurface cloud storage</source>
         <translation type="unfinished"/>
@@ -5999,150 +6200,41 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>Uložit označení uživatele místně?</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1334"/>
-        <source>Volume</source>
-        <translation>Objem</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1337"/>
-        <source>Temperature</source>
-        <translation>Teplota</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1340"/>
-        <source>Weight</source>
-        <translation>Váha</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1342"/>
-        <source>lbs</source>
-        <translation>libra US</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1343"/>
-        <source>Time units</source>
-        <translation>Jednotky času</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1345"/>
-        <source>Minutes</source>
-        <translation>Minuty</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1346"/>
-        <source>Seconds</source>
-        <translation>Sekundy</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1351"/>
-        <source>Show</source>
-        <translation>Ukázat</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1362"/>
-        <source>GFLow at max depth</source>
-        <translation>Použít GFLow při největší hloubce</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1359"/>
-        <source>Misc</source>
-        <translation>Různé</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1283"/>
-        <source>Preferences</source>
-        <translation>Nastavení</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1324"/>
-        <source>&amp;Metric</source>
-        <translation type="unfinished"/>
+        <location filename="../build/ui_preferences.h" line="1400"/>
+        <source>Disconnect from Facebook</source>
+        <translation>Odpojit od Facebooku</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1326"/>
-        <source>Personali&amp;ze</source>
+        <location filename="../build/ui_preferences.h" line="1401"/>
+        <source>Dive site geo lookup</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1327"/>
-        <source>Individual settings</source>
+        <location filename="../build/ui_preferences.h" line="1402"/>
+        <source>Enable geocoding for dive site management</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1335"/>
-        <source>&amp;liter</source>
+        <location filename="../build/ui_preferences.h" line="1403"/>
+        <source>Parse site without GPS data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1344"/>
-        <source>Ascent/descent speed denominator</source>
-        <translation>Jednotky času pro rychlost při výstupu/sestupu</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1347"/>
-        <source>GPS coordinates</source>
-        <translation>Souřadnice GPS</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1348"/>
-        <source>Location Display</source>
+        <location filename="../build/ui_preferences.h" line="1404"/>
+        <source>Same format for existing dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1349"/>
-        <source>traditional (dms)</source>
+        <location filename="../build/ui_preferences.h" line="1405"/>
+        <source>Dive Site Layout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1350"/>
-        <source>decimal</source>
+        <location filename="../build/ui_preferences.h" line="1406"/>
+        <location filename="../build/ui_preferences.h" line="1407"/>
+        <source>/</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1352"/>
-        <source>Threshold when showing pO₂</source>
-        <translation>Prahová hodnota při ukázání pO₂</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1353"/>
-        <source>Threshold when showing pN₂</source>
-        <translation>Prahová hodnota při ukázání pN₂</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1354"/>
-        <source>Threshold when showing pHe</source>
-        <translation>Prahová hodnota při ukázání pHe</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1355"/>
-        <source>Max pO₂ when showing MOD</source>
-        <translation>Největší pO₂ při ukázání MOD</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1356"/>
-        <source>Draw dive computer reported ceiling red</source>
-        <translation>Kreslit hranici potápění potápěcího počítače červenou barvou</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1357"/>
-        <source>Show unused cylinders in Equipment tab</source>
-        <translation>Ukázat nepoužité láhve na kartě s výstrojí</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1358"/>
-        <source>Show average depth</source>
-        <translation>Ukázat průměrnou hloubku</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1360"/>
-        <source>GFLow</source>
-        <translation>GFLow</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1361"/>
-        <source>GFHigh</source>
-        <translation>GFHigh</translation>
-    </message>
 </context>
 <context>
     <name>PreferencesGeoreference</name>
@@ -6197,106 +6289,136 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="20"/>
-        <source>Show</source>
-        <translation>Ukázat</translation>
+        <source>Gas pressure display setup</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="29"/>
-        <source>Threshold when showing pO₂</source>
-        <translation>Prahová hodnota při ukázání pO₂</translation>
+        <source>Threshold for pO₂ (bar)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="49"/>
-        <source>Threshold when showing pN₂</source>
-        <translation>Prahová hodnota při ukázání pN₂</translation>
+        <source>Threshold for pN₂ (bar)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="69"/>
-        <source>Threshold when showing pHe</source>
-        <translation>Prahová hodnota při ukázání pHe</translation>
+        <source>Threshold for pHe (bar)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="89"/>
-        <source>Max pO₂ when showing MOD</source>
-        <translation>Největší pO₂ při ukázání MOD</translation>
+        <source>pO₂ in calculating MOD (bar)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="106"/>
+        <source>CCR options:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="113"/>
+        <source>Dive planner default setpoint (bar)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="133"/>
+        <source>Show setpoints when viewing pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="140"/>
+        <source>Show individual O₂ sensor values when viewing pO₂</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="109"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="150"/>
+        <source>Ceiling display setup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="159"/>
         <source>Draw dive computer reported ceiling red</source>
         <translation>Kreslit hranici potápění potápěcího počítače červenou barvou</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="116"/>
-        <source>Show unused cylinders in Equipment tab</source>
-        <translation>Ukázat nepoužité láhve na kartě s výstrojí</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="169"/>
+        <source>Algorithm for calculated ceiling:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="123"/>
-        <source>Show mean depth</source>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="176"/>
+        <source>VPM-B</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="133"/>
-        <source>Misc</source>
-        <translation>Různé</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="183"/>
+        <source>VPM-B Conservatism</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="149"/>
-        <source>bar</source>
-        <translation>bar</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="193"/>
+        <source>+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="165"/>
-        <source>Default CCR set-point for dive planning</source>
-        <translation>Výchozí nastavovací hodnota CCR pro plánování potápění</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="206"/>
+        <source>Bühlmann</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="172"/>
-        <source>pSCR O₂ metabolism rate</source>
-        <translation>pSCR rychlost látkové výměny O₂</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="216"/>
+        <source>GFHigh</source>
+        <translation>GFHigh</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="179"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="236"/>
         <source>GFLow</source>
         <translation>GFLow</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="186"/>
-        <source>GFHigh</source>
-        <translation>GFHigh</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="256"/>
+        <source>GFLow at max depth</source>
+        <translation>Použít GFLow při největší hloubce</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="203"/>
-        <source>ℓ/min</source>
-        <translation> ℓ/min</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="263"/>
+        <source>pSCR options:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="213"/>
-        <source>pSCR ratio</source>
-        <translation>Poměr pSCR</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="270"/>
+        <source>Metabolic rate (ℓ O₂/min)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="223"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="287"/>
+        <source>Dilution ratio</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="300"/>
         <source>1:</source>
         <translation>1:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="230"/>
-        <source>CCR: show individual O₂ sensor values when viewing pO₂</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="310"/>
+        <source>Misc</source>
+        <translation>Různé</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="237"/>
-        <source>CCR: show setpoints when viewing pO₂</source>
-        <translation>CCR: Ukazovat nastavovací hodnoty, když se zobrazuje pO₂</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="316"/>
+        <source>Show unused cylinders in Equipment tab</source>
+        <translation>Ukázat nepoužité láhve na kartě s výstrojí</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="244"/>
-        <source>GFLow at max depth</source>
-        <translation>Použít GFLow při největší hloubce</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="323"/>
+        <source>Show mean depth in Profile</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="10"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="9"/>
         <source>Graph</source>
         <translation>Nákres</translation>
     </message>
@@ -6365,15 +6487,29 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>Jazyk</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="57"/>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="53"/>
         <source>Restart required</source>
         <translation>Vyžadováno znovuspuštění</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="58"/>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="54"/>
         <source>To correctly load a new language you must restart Subsurface.</source>
         <translation>Pro nahrání nového jazyka se musí program Subsurface spustit znovu.</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="76"/>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="82"/>
+        <source>Literal characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="77"/>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="83"/>
+        <source>Non-special character(s) in time format.
+These will be used as is. This might not be what you intended.
+See http://doc.qt.io/qt-5/qdatetime.html#toString</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PreferencesNetwork</name>
@@ -6420,7 +6556,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_network.ui" line="156"/>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="148"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="134"/>
         <source>Subsurface cloud storage</source>
         <translation type="unfinished"/>
     </message>
@@ -6465,39 +6601,39 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>Uložit označení uživatele místně?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="11"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="10"/>
         <source>Network</source>
         <translation>Síť</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="15"/>
         <source>No proxy</source>
         <translation>Žádná proxy</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/>
         <source>System proxy</source>
         <translation>Systémová proxy</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/>
         <source>HTTP proxy</source>
         <translation>Proxy HTTP</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="19"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/>
         <source>SOCKS proxy</source>
         <translation>Proxy SOCKS</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="75"/>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="97"/>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="110"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="72"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="93"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="106"/>
         <source>Cloud storage email and password can only consist of letters, numbers, and &apos;.&apos;, &apos;-&apos;, &apos;_&apos;, and &apos;+&apos;.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="146"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="132"/>
         <source>Subsurface cloud storage (credentials verified)</source>
         <translation type="unfinished"/>
     </message>
@@ -6655,7 +6791,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="8"/>
+        <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="7"/>
         <source>Units</source>
         <translation>Jednotky</translation>
     </message>
@@ -6663,17 +6799,17 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PrintDialog</name>
     <message>
-        <location filename="../desktop-widgets/printdialog.cpp" line="118"/>
-        <source>&amp;Preview</source>
-        <translation>&amp;Náhled</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/printdialog.cpp" line="115"/>
+        <location filename="../desktop-widgets/printdialog.cpp" line="102"/>
         <source>P&amp;rint</source>
         <translation>&amp;Tisk</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/printdialog.cpp" line="130"/>
+        <location filename="../desktop-widgets/printdialog.cpp" line="105"/>
+        <source>&amp;Preview</source>
+        <translation>&amp;Náhled</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/printdialog.cpp" line="117"/>
         <source>Print</source>
         <translation>Tisk</translation>
     </message>
@@ -6681,19 +6817,10 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PrintOptions</name>
     <message>
-        <location filename="../build/ui_printoptions.h" line="150"/>
-        <source>&amp;Table print</source>
-        <translation>Tisk &amp;tabulky</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_printoptions.h" line="158"/>
-        <source>One dive per page</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../build/ui_printoptions.h" line="159"/>
-        <source>Two dives per page</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/printoptions.ui" line="29"/>
+        <location filename="../build/ui_printoptions.h" line="148"/>
+        <source>Print type</source>
+        <translation>Druh tisku</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/printoptions.ui" line="41"/>
@@ -6753,10 +6880,19 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/printoptions.ui" line="29"/>
-        <location filename="../build/ui_printoptions.h" line="148"/>
-        <source>Print type</source>
-        <translation>Druh tisku</translation>
+        <location filename="../build/ui_printoptions.h" line="150"/>
+        <source>&amp;Table print</source>
+        <translation>Tisk &amp;tabulky</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_printoptions.h" line="158"/>
+        <source>One dive per page</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../build/ui_printoptions.h" line="159"/>
+        <source>Two dives per page</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/printoptions.cpp" line="128"/>
@@ -6798,103 +6934,103 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>Neznámý potápěcí počítač</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="755"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="752"/>
         <source>Show NDL / TTS was disabled because of excessive processing time</source>
         <translation>Nulový čas/Čas vynoření byl zakázán kvůli překročení času</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1344"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1338"/>
         <source>Make first divecomputer</source>
         <translation>Hlavní potápěcí počítač</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1346"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1340"/>
         <source>Delete this divecomputer</source>
         <translation>Smazat tento potápěcí počítač</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1360"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1354"/>
         <source>Add gas change</source>
         <translation>Přidat změnu plynu</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1363"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1357"/>
         <source> (Tank %1)</source>
         <translation> (nádrž %1)</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1371"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1365"/>
         <source>Add set-point change</source>
         <translation>Přidat změnu nastavení bodu</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1373"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1367"/>
         <source>Add bookmark</source>
         <translation>Přidat záložku</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1377"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1371"/>
         <source>Edit the profile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1381"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1375"/>
         <source>Remove event</source>
         <translation>Odstranit událost</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1386"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1380"/>
         <source>Hide similar events</source>
         <translation>Skrýt podobné události</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1393"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1387"/>
         <source>Edit name</source>
         <translation>Upravit název</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1422"/>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1429"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1416"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1423"/>
         <source>Adjust pressure of tank %1 (currently interpolated as %2)</source>
         <translation>Upravit tlak v láhvi (nádrži)  %1 (v současnosti interpolován jako %2)</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1444"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1438"/>
         <source>Unhide all events</source>
         <translation>Zrušit skrytí všech událostí</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1479"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1473"/>
         <source>Hide events</source>
         <translation>Skrýt události</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1479"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1473"/>
         <source>Hide all %1 events?</source>
         <translation>Skrýt všech %1 událostí?</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1514"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1508"/>
         <source>Remove the selected event?</source>
         <translation>Odstranit vybranou událost?</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1515"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1509"/>
         <source>%1 @ %2:%3</source>
         <translation>%1 @ %2:%3</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1638"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1632"/>
         <source>Edit name of bookmark</source>
         <translation>Upravit název záložky</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1639"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1633"/>
         <source>Custom name:</source>
         <translation>Vlastní název:</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1644"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1638"/>
         <source>Name is too long!</source>
         <translation>Název je příliš dlouhý!</translation>
     </message>
@@ -6902,91 +7038,101 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>QMLManager</name>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="95"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="97"/>
         <source>Starting...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="202"/>
         <source>working in no-cloud mode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="213"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="216"/>
         <source>no cloud credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="214"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="270"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="217"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="269"/>
         <source>Please enter valid cloud credentials.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="285"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="284"/>
         <source>Attempting to open cloud storage with new credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="304"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="306"/>
         <source>Testing cloud credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="331"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="320"/>
+        <source>No response from cloud server to validate the credentials</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="329"/>
+        <source>Cannot connect to cloud storage - cloud account not verified</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="361"/>
         <source>Cloud credentials are invalid</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="344"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="374"/>
         <source>Cannot open cloud storage: Error creating https connection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="357"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="387"/>
         <source>Cannot open cloud storage: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="369"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="399"/>
         <source>Cannot connect to cloud storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="411"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="441"/>
         <source>Cloud storage error: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="501"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="531"/>
         <source>Failed to connect to cloud server, reverting to no cloud status</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="520"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="550"/>
         <source>Cloud storage open successfully. No dives in dive list.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="689"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="690"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="721"/>
         <source>h</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="689"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="690"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="691"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="721"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="722"/>
         <source>min</source>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="689"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/>
         <source>sec</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="1041"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="1102"/>
         <source>Unknown GPS location</source>
         <translation type="unfinished"/>
     </message>
@@ -6994,126 +7140,126 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../core/qthelper.cpp" line="866"/>
-        <location filename="../core/qthelper.cpp" line="1214"/>
-        <source>AIR</source>
-        <translation>VZDUCH</translation>
+        <location filename="../core/gpslocation.h" line="13"/>
+        <source>Waiting to aquire GPS location</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="1214"/>
-        <source>OXYGEN</source>
-        <translation>KYSLÍK</translation>
+        <location filename="../core/qthelper.cpp" line="766"/>
+        <location filename="../core/qthelper.cpp" line="1275"/>
+        <source>m</source>
+        <translation> m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="59"/>
-        <source>Remove this point</source>
-        <translation>Odstranit tento bod</translation>
+        <location filename="../core/qthelper.cpp" line="768"/>
+        <location filename="../core/qthelper.cpp" line="1274"/>
+        <source>ft</source>
+        <translation>st</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="32"/>
-        <source>Average</source>
-        <translation>Průměr</translation>
+        <location filename="../core/qthelper.cpp" line="794"/>
+        <source>C</source>
+        <translation>C</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="35"/>
-        <source>Minimum</source>
-        <translation>Nejmenší</translation>
+        <location filename="../core/qthelper.cpp" line="796"/>
+        <source>F</source>
+        <translation>F</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="38"/>
-        <source>Maximum</source>
-        <translation>Největší</translation>
+        <location filename="../core/qthelper.cpp" line="821"/>
+        <location filename="../core/qthelper.cpp" line="1250"/>
+        <source>kg</source>
+        <translation>kg</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/globe.cpp" line="327"/>
-        <source>Move the map and double-click to set the dive location</source>
-        <translation>Posunout mapu a dvojitým klepnutím označit místo potápění</translation>
+        <location filename="../core/qthelper.cpp" line="823"/>
+        <location filename="../core/qthelper.cpp" line="1251"/>
+        <source>lbs</source>
+        <translation>libra US</translation>
     </message>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="28"/>
-        <source>unknown</source>
-        <translation>Neznámý</translation>
+        <location filename="../core/qthelper.cpp" line="848"/>
+        <location filename="../core/qthelper.cpp" line="1300"/>
+        <source>bar</source>
+        <translation>bar</translation>
     </message>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="105"/>
-        <source>h:</source>
-        <translation>h:</translation>
+        <location filename="../core/qthelper.cpp" line="850"/>
+        <location filename="../core/qthelper.cpp" line="1299"/>
+        <source>psi</source>
+        <translation>psi</translation>
     </message>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="105"/>
-        <source>min</source>
-        <translation>min</translation>
+        <location filename="../core/qthelper.cpp" line="871"/>
+        <location filename="../core/qthelper.cpp" line="1235"/>
+        <source>AIR</source>
+        <translation>VZDUCH</translation>
     </message>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="337"/>
-        <source>Multiple</source>
+        <location filename="../core/qthelper.cpp" line="873"/>
+        <source>EAN</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="../core/qthelper.cpp" line="957"/>
+        <location filename="../core/qthelper.cpp" line="962"/>
         <source>(%n dive(s))</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="816"/>
-        <location filename="../core/qthelper.cpp" line="1228"/>
-        <source>kg</source>
-        <translation>kg</translation>
+        <location filename="../core/qthelper.cpp" line="1235"/>
+        <source>OXYGEN</source>
+        <translation>KYSLÍK</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="818"/>
-        <location filename="../core/qthelper.cpp" line="1229"/>
-        <source>lbs</source>
-        <translation>libra US</translation>
+        <location filename="../core/qthelper.cpp" line="1322"/>
+        <source>l</source>
+        <translation>l</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="763"/>
-        <location filename="../core/qthelper.cpp" line="1252"/>
-        <source>ft</source>
-        <translation>st</translation>
+        <location filename="../core/qthelper.cpp" line="1323"/>
+        <source>cuft</source>
+        <translation>cu stopa</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="761"/>
-        <location filename="../core/qthelper.cpp" line="1253"/>
-        <source>m</source>
-        <translation> m</translation>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="29"/>
+        <source>unknown</source>
+        <translation>Neznámý</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="789"/>
-        <source>C</source>
-        <translation>C</translation>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="114"/>
+        <source>h:</source>
+        <translation>h:</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="791"/>
-        <source>F</source>
-        <translation>F</translation>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="114"/>
+        <source>min</source>
+        <translation>min</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="845"/>
-        <location filename="../core/qthelper.cpp" line="1275"/>
-        <source>psi</source>
-        <translation>psi</translation>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="63"/>
+        <source>Remove this point</source>
+        <translation>Odstranit tento bod</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="843"/>
-        <location filename="../core/qthelper.cpp" line="1276"/>
-        <source>bar</source>
-        <translation>bar</translation>
+        <location filename="../desktop-widgets/globe.cpp" line="327"/>
+        <source>Move the map and double-click to set the dive location</source>
+        <translation>Posunout mapu a dvojitým klepnutím označit místo potápění</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="868"/>
-        <source>EAN</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="32"/>
+        <source>Average</source>
+        <translation>Průměr</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="1298"/>
-        <source>l</source>
-        <translation>l</translation>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="35"/>
+        <source>Minimum</source>
+        <translation>Nejmenší</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="1299"/>
-        <source>cuft</source>
-        <translation>cu stopa</translation>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="38"/>
+        <source>Maximum</source>
+        <translation>Největší</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="625"/>
@@ -7135,17 +7281,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <source>Malformed XML response. Line %1: %2</source>
         <translation>Neplatná odpověď XML. Řádek %1: %2</translation>
     </message>
-    <message>
-        <location filename="../core/gpslocation.h" line="13"/>
-        <source>Waiting to aquire GPS location</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>ReadSettingsThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1651"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1676"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1640"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1665"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Tato funkce ještě není pro vybraný potápěcí počítač dostupná.</translation>
     </message>
@@ -7174,7 +7315,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ResetSettingsThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1775"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1764"/>
         <source>Reset settings failed!</source>
         <translation type="unfinished"/>
     </message>
@@ -7212,6 +7353,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ShiftImageTimesDialog</name>
     <message>
+        <location filename="../desktop-widgets/shiftimagetimes.ui" line="23"/>
+        <location filename="../build/ui_shiftimagetimes.h" line="184"/>
+        <source>Shift selected image times</source>
+        <translation>Posunout vybrané časy obrázků</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/shiftimagetimes.ui" line="34"/>
         <location filename="../build/ui_shiftimagetimes.h" line="185"/>
         <source>Shift times of image(s) by</source>
@@ -7224,12 +7371,6 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>h:mm</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/shiftimagetimes.ui" line="23"/>
-        <location filename="../build/ui_shiftimagetimes.h" line="184"/>
-        <source>Shift selected image times</source>
-        <translation>Posunout vybrané časy obrázků</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/shiftimagetimes.ui" line="105"/>
         <location filename="../build/ui_shiftimagetimes.h" line="187"/>
         <source>Earlier</source>
@@ -7279,12 +7420,12 @@ Not all images have timestamps in the range between
         <translation>Jaké datum a čas jsou zobrazeny na obrázku?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="297"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="296"/>
         <source>Open image file</source>
         <translation>Otevřít soubor s obrázkem</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="299"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="298"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>Soubory s obrázky (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -7442,54 +7583,54 @@ Not all images have timestamps in the range between
 <context>
     <name>SocialNetworkDialog</name>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="339"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="284"/>
         <source>Dive date: %1 
 </source>
         <translation>Datum potápění: %1 
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="342"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="287"/>
         <source>Duration: %1 
 </source>
         <translation>Doba trvání: %1 min
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="343"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="288"/>
         <source>h:</source>
         <comment>abbreviation for hours plus separator</comment>
         <translation>h:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="344"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="289"/>
         <source>min</source>
         <comment>abbreviation for minutes</comment>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="347"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="292"/>
         <source>Dive location: %1 
 </source>
         <translation>Místo potápění: %1 min
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="350"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="295"/>
         <source>Buddy: %1 
 </source>
         <translation>Společník při potápění: %1
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="353"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="298"/>
         <source>Divemaster: %1 
 </source>
         <translation>Vedoucí skupiny potápečů: %1
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="356"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="301"/>
         <source>
 %1</source>
         <translation>
@@ -7575,9 +7716,20 @@ Not all images have timestamps in the range between
     <name>StartPage</name>
     <message>
         <location filename="../mobile-widgets/qml/StartPage.qml" line="19"/>
-        <source>To use Subsurface-mobile with Subsurface cloud storage, please enteryour cloud credentials.
+        <source>To use Subsurface-mobile with Subsurface cloud storage, please enter your cloud credentials.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/StartPage.qml" line="20"/>
+        <source>If this is the first time you use Subsurface cloud storage, enter a valid email (all lower case) and a password of your choice (letters and numbers). The server will send a PIN to the email address provided that you will have to enter here.
 
-To use Subsurface-mobile only with local data on this device, tap on the no cloud icon below.</source>
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/StartPage.qml" line="23"/>
+        <source>To use Subsurface-mobile only with local data on this device, tap on the no cloud icon below.</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -7616,7 +7768,12 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>SubsurfaceWebServices</name>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="419"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="395"/>
+        <source>Enter User ID and click Download</source>
+        <translation>Zadejte označení uživatele a klepněte na Stáhnout</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="417"/>
         <source>Webservice</source>
         <translation>Internetová služba</translation>
     </message>
@@ -7641,30 +7798,25 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
         <translation>Chyba spojení: </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="557"/>
-        <source>Download successful</source>
-        <translation>Stažení se zdařilo</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="551"/>
         <source>Invalid user identifier!</source>
         <translation>Neplatné označení uživatele!</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="397"/>
-        <source>Enter User ID and click Download</source>
-        <translation>Zadejte označení uživatele a klepněte na Stáhnout</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="554"/>
         <source>Cannot parse response!</source>
         <translation>Odpověď nelze zpracovat!</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="557"/>
+        <source>Download successful</source>
+        <translation>Stažení se zdařilo</translation>
+    </message>
 </context>
 <context>
     <name>SuitFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="674"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="672"/>
         <source>Suits: </source>
         <translation>Obleky:</translation>
     </message>
@@ -7672,7 +7824,7 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>SuitsFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="123"/>
+        <location filename="../qt-models/filtermodels.cpp" line="128"/>
         <source>No suit set</source>
         <translation>Nenastaven žádný oblek</translation>
     </message>
@@ -7691,7 +7843,7 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>TagFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="595"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="593"/>
         <source>Tags: </source>
         <translation>Značky:</translation>
     </message>
@@ -7699,7 +7851,7 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>TagFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="148"/>
+        <location filename="../qt-models/filtermodels.cpp" line="153"/>
         <source>Empty tags</source>
         <translation>Prázdné značky</translation>
     </message>
@@ -7725,6 +7877,11 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>TemplateEdit</name>
     <message>
+        <location filename="../desktop-widgets/templateedit.ui" line="14"/>
+        <source>Edit template</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/templateedit.ui" line="37"/>
         <source>Preview</source>
         <translation type="unfinished"/>
@@ -7770,11 +7927,6 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
         <translation>Velikost písma</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/templateedit.ui" line="14"/>
-        <source>Edit template</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/templateedit.ui" line="165"/>
         <source>Color palette</source>
         <translation type="unfinished"/>
@@ -7956,85 +8108,12 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>TextHyperlinkEventFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="817"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="815"/>
         <source>%1click to visit %2</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>ThemeTest</name>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="29"/>
-        <source>Theme Information</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="33"/>
-        <source>Screen</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="42"/>
-        <source>Geometry (pixels):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="49"/>
-        <source>Geometry (gridUnits):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="56"/>
-        <source>Units.gridUnit:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="63"/>
-        <source>Units.devicePixelRatio:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="70"/>
-        <source>Font Metrics</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="76"/>
-        <source>FontMetrics pointSize:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="83"/>
-        <source>FontMetrics pixelSize:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="90"/>
-        <source>FontMetrics devicePixelRatio:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="97"/>
-        <source>Text item pixelSize:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="104"/>
-        <source>Text item pointSize:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="111"/>
-        <source>Pixel density:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="118"/>
-        <source>Height of default font:</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
     <name>ToolTipItem</name>
     <message>
         <location filename="../profile-widget/divetooltipitem.cpp" line="136"/>
@@ -8045,102 +8124,107 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>TripItem</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="67"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="68"/>
         <source>(%1 shown)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="194"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
         <source>#</source>
         <translation>Číslo</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="197"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="215"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="200"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="218"/>
         <source>Rating</source>
         <translation>Hodnocení</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
         <source>Depth(%1)</source>
         <translation>Hloubka (%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
         <source>m</source>
         <translation> m</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
         <source>ft</source>
         <translation>st</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="206"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="224"/>
         <source>Duration</source>
         <translation>Délka</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="209"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="227"/>
         <source>Temp(%1%2)</source>
         <translation>Teplota (%1%2)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
         <source>Weight(%1)</source>
         <translation>Váha (%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
         <source>lbs</source>
         <translation>libra US</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="215"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="233"/>
         <source>Suit</source>
         <translation>Oblek</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="218"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="236"/>
         <source>Cyl</source>
         <translation>Láhev</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="239"/>
         <source>Gas</source>
         <translation>Směs</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="244"/>
         <source>SAC(%1)</source>
         <translation>Spotřeba plynu (%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="244"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="229"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="247"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="232"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="250"/>
         <source>Max CNS</source>
         <translation>Max. CNS</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="235"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="253"/>
+        <source>Photos before/during/after dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="256"/>
         <source>Location</source>
         <translation>Místo</translation>
     </message>
@@ -8163,72 +8247,73 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>UpdateManager</name>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="69"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="61"/>
         <source>Check for updates.</source>
         <translation>Zkontrolovat aktualizace</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="70"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="62"/>
         <source>Subsurface was unable to check for updates.</source>
         <translation>Subsurface se nepodařilo najít novou verzi.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="75"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="67"/>
         <source>The following error occurred:</source>
         <translation>Vyskytla se následující chyba:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="76"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="68"/>
         <source>Please check your internet connection.</source>
         <translation>Prověřte, prosím, vaše internetové připojení.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="86"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="78"/>
         <source>You are using the latest version of Subsurface.</source>
         <translation>Používáte nejnovější verzi programu Subsurface.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="89"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="81"/>
         <source>A new version of Subsurface is available.&lt;br/&gt;Click on:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; to download it.</source>
         <translation>Je dostupná nová verze Subsurface.&lt;br/&gt;Klepněte na:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; pro její stažení.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="95"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="87"/>
         <source>A new version of Subsurface is available.</source>
         <translation>Je dostupná nová verze Subsurface.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="96"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="88"/>
         <source>Latest version is %1, please check %2 our download page %3 for information in how to update.</source>
         <translation>Nejnovější verze je %1. Podívejte se, prosím, na %2 naši stahovací stránku %3 kvůli informaci o tom, jak aktualizovat.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="106"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="98"/>
         <source>Newest release version is </source>
         <translation>Poslední vydaná verze je </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="107"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="99"/>
         <source>The server returned the following information:</source>
         <translation>Server vrátil následující informace:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="125"/>
-        <source>Subsurface is checking every two weeks if a new version is available. If you don&apos;t want Subsurface to continue checking, please click Decline.</source>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="117"/>
+        <source>Subsurface is checking every two weeks if a new version is available. 
+ If you don&apos;t want Subsurface to continue checking, please click Decline.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="126"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="119"/>
         <source>Decline</source>
         <translation>Odmítnout</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="127"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="120"/>
         <source>Accept</source>
         <translation>Přijmout</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="129"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="122"/>
         <source>Automatic check for updates</source>
         <translation>Automatická kontrola aktualizací</translation>
     </message>
@@ -8250,24 +8335,6 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>UserSurvey</name>
     <message>
-        <location filename="../desktop-widgets/usersurvey.ui" line="44"/>
-        <location filename="../build/ui_usersurvey.h" line="151"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;We would love to learn more about our users, their preferences and their usage habits. Please spare a minute to fill out this form and submit it to the Subsurface team.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/usersurvey.ui" line="115"/>
-        <location filename="../build/ui_usersurvey.h" line="156"/>
-        <source>Other software/sources</source>
-        <translation>Jiné programy/zdroje</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/usersurvey.ui" line="128"/>
-        <location filename="../build/ui_usersurvey.h" line="157"/>
-        <source>Manually entering dives</source>
-        <translation>Ruční zadávání potápění</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="14"/>
         <location filename="../build/ui_usersurvey.h" line="149"/>
         <source>User survey</source>
@@ -8280,6 +8347,12 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/usersurvey.ui" line="44"/>
+        <location filename="../build/ui_usersurvey.h" line="151"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;We would love to learn more about our users, their preferences and their usage habits. Please spare a minute to fill out this form and submit it to the Subsurface team.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="63"/>
         <location filename="../build/ui_usersurvey.h" line="152"/>
         <source>Technical diver</source>
@@ -8304,6 +8377,18 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
         <translation>Podporovaný potápěcí počítač</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/usersurvey.ui" line="115"/>
+        <location filename="../build/ui_usersurvey.h" line="156"/>
+        <source>Other software/sources</source>
+        <translation>Jiné programy/zdroje</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/usersurvey.ui" line="128"/>
+        <location filename="../build/ui_usersurvey.h" line="157"/>
+        <source>Manually entering dives</source>
+        <translation>Ruční zadávání potápění</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="141"/>
         <location filename="../build/ui_usersurvey.h" line="158"/>
         <source>Android/iPhone companion app</source>
@@ -8334,6 +8419,11 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
         <translation>Odkud zavádíte data?</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/usersurvey.cpp" line="18"/>
+        <source>Send</source>
+        <translation>Poslat</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/usersurvey.cpp" line="43"/>
         <source>
 Operating system: %1</source>
@@ -8377,19 +8467,14 @@ Jazyk: %1</translation>
         <translation>Zeptat se později</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/usersurvey.cpp" line="101"/>
-        <source>Submit user survey.</source>
-        <translation>Odeslat uživatelský průzkum.</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/usersurvey.cpp" line="82"/>
         <source>Ask again?</source>
         <translation>Zeptat se znovu?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/usersurvey.cpp" line="18"/>
-        <source>Send</source>
-        <translation>Poslat</translation>
+        <location filename="../desktop-widgets/usersurvey.cpp" line="101"/>
+        <source>Submit user survey.</source>
+        <translation>Odeslat uživatelský průzkum.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/usersurvey.cpp" line="102"/>
@@ -8481,12 +8566,12 @@ Jazyk: %1</translation>
         <translation>Nahrát</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="324"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="325"/>
         <source>Operation timed out</source>
         <translation>Operace trvala příliš dlouho</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="345"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="346"/>
         <source>Transferring data...</source>
         <translation>Probíhá přenos dat...</translation>
     </message>
@@ -8521,18 +8606,18 @@ Jazyk: %1</translation>
 <context>
     <name>WriteSettingsThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1702"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1709"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1718"/>
-        <source>Failed!</source>
-        <translation>Nepodařilo se!</translation>
-    </message>
-    <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1700"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1721"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1689"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1710"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Tato funkce ještě není pro vybraný potápěcí počítač dostupná.</translation>
     </message>
+    <message>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1691"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1698"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1707"/>
+        <source>Failed!</source>
+        <translation>Nepodařilo se!</translation>
+    </message>
 </context>
 <context>
     <name>YearlyStatisticsModel</name>
@@ -8657,7 +8742,7 @@ Průměr</translation>
 <context>
     <name>getextFromC</name>
     <message>
-        <location filename="../core/libdivecomputer.c" line="674"/>
+        <location filename="../core/libdivecomputer.c" line="737"/>
         <source>Error parsing the header</source>
         <translation type="unfinished"/>
     </message>
@@ -8665,38 +8750,377 @@ Průměr</translation>
 <context>
     <name>gettextFromC</name>
     <message>
+        <location filename="../core/cochran.c" line="309"/>
+        <location filename="../core/cochran.c" line="315"/>
+        <location filename="../core/cochran.c" line="385"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>deco stop</source>
+        <translation>dekompresní zastávka</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="336"/>
+        <location filename="../core/cochran.c" line="390"/>
+        <location filename="../core/file.c" line="777"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>ascent</source>
+        <translation>výstup</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="342"/>
+        <location filename="../core/file.c" line="755"/>
+        <source>battery</source>
+        <translation>baterie</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="348"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
+        <source>OLF</source>
+        <translation>OLF</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="353"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
+        <source>maxdepth</source>
+        <translation>největší hloubka</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="358"/>
+        <location filename="../core/cochran.c" line="404"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
+        <source>pO₂</source>
+        <translation>pO₂</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="365"/>
+        <location filename="../core/cochran.c" line="414"/>
+        <location filename="../core/cochran.c" line="421"/>
+        <location filename="../core/file.c" line="868"/>
+        <location filename="../core/libdivecomputer.c" line="225"/>
+        <location filename="../core/libdivecomputer.c" line="228"/>
+        <source>gaschange</source>
+        <translation>změna plynu</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="370"/>
+        <location filename="../core/cochran.c" line="409"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>rbt</source>
+        <translation>rbt</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="379"/>
+        <location filename="../core/cochran.c" line="426"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>ceiling</source>
+        <translation>strop</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="395"/>
+        <location filename="../core/libdivecomputer.c" line="224"/>
+        <source>transmitter</source>
+        <translation>vysílač</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="153"/>
+        <source>Error: the file does not appear to be a DATATRAK divelog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="286"/>
+        <source>clear</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="289"/>
+        <source>misty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="292"/>
+        <source>fog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="295"/>
+        <source>rain</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="298"/>
+        <source>storm</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="301"/>
+        <source>snow</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="321"/>
+        <source>No suit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="324"/>
+        <source>Shorty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="327"/>
+        <source>Combi</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="330"/>
+        <source>Wet suit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="333"/>
+        <source>Semidry suit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="336"/>
+        <source>Dry suit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="396"/>
+        <source>no stop</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="398"/>
+        <location filename="../core/dive.c" line="29"/>
+        <source>deco</source>
+        <translation>dekomprese</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="400"/>
+        <source>single ascent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="402"/>
+        <source>multiple ascent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="404"/>
+        <location filename="../core/dive.c" line="27"/>
+        <source>fresh</source>
+        <translation>čerstvý</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="406"/>
+        <source>salt water</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="431"/>
+        <source>sight seeing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="433"/>
+        <source>club dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="435"/>
+        <location filename="../core/dive.c" line="28"/>
+        <source>instructor</source>
+        <translation>instruktor</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="437"/>
+        <source>instruction</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="439"/>
+        <location filename="../core/dive.c" line="27"/>
+        <source>night</source>
+        <translation>noční</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="441"/>
+        <location filename="../core/dive.c" line="25"/>
+        <source>cave</source>
+        <translation>jeskyně</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="443"/>
+        <location filename="../core/dive.c" line="24"/>
+        <source>ice</source>
+        <translation>led</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="445"/>
+        <source>search</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="455"/>
+        <location filename="../core/dive.c" line="25"/>
+        <source>wreck</source>
+        <translation>vrak</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="457"/>
+        <location filename="../core/dive.c" line="26"/>
+        <source>river</source>
+        <translation>řeka</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="459"/>
+        <location filename="../core/dive.c" line="23"/>
+        <source>drift</source>
+        <translation>proudový</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="461"/>
+        <location filename="../core/dive.c" line="28"/>
+        <source>photo</source>
+        <translation>focení</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="463"/>
+        <source>other</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="474"/>
+        <source>Other activities</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="498"/>
+        <source>Datatrak/Wlog notes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="537"/>
+        <source>Manually entered dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="588"/>
+        <source>Unknown</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="674"/>
+        <source>Error: couldn&apos;t open the file %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="687"/>
+        <source>Error: no dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="23"/>
+        <source>boat</source>
+        <translation>z lodi</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="23"/>
+        <source>shore</source>
+        <translation>z břehu</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="24"/>
+        <source>deep</source>
+        <translation>hluboký</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="24"/>
+        <source>cavern</source>
+        <translation>dutina</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="25"/>
+        <source>altitude</source>
+        <translation>výškový</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="26"/>
+        <source>pool</source>
+        <translation>bazén</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="26"/>
+        <source>lake</source>
+        <translation>jezero</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="27"/>
+        <source>student</source>
+        <translation>student</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="28"/>
+        <source>video</source>
+        <translation>video</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="33"/>
+        <source>OC-gas</source>
+        <translation>OC-směs</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="33"/>
+        <source>diluent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="33"/>
+        <location filename="../core/equipment.c" line="88"/>
+        <location filename="../core/planner.c" line="1436"/>
+        <location filename="../core/planner.c" line="1439"/>
+        <source>oxygen</source>
+        <translation>kyslík</translation>
+    </message>
+    <message>
         <location filename="../core/dive.c" line="181"/>
         <source>pascal</source>
         <translation>pascal</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="186"/>
-        <location filename="../core/qthelper.cpp" line="669"/>
+        <location filename="../core/qthelper.cpp" line="674"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="190"/>
-        <location filename="../core/qthelper.cpp" line="672"/>
+        <location filename="../core/qthelper.cpp" line="677"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
+        <location filename="../core/dive.c" line="227"/>
+        <source>ℓ</source>
+        <translation> ℓ</translation>
+    </message>
+    <message>
         <location filename="../core/dive.c" line="232"/>
         <source>cuft</source>
         <translation>cu stopa</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="269"/>
-        <location filename="../core/qthelper.cpp" line="590"/>
-        <location filename="../core/qthelper.cpp" line="605"/>
+        <location filename="../core/qthelper.cpp" line="595"/>
+        <location filename="../core/qthelper.cpp" line="610"/>
         <source>m</source>
         <translation> m</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="274"/>
-        <location filename="../core/qthelper.cpp" line="593"/>
-        <location filename="../core/qthelper.cpp" line="607"/>
+        <location filename="../core/qthelper.cpp" line="598"/>
+        <location filename="../core/qthelper.cpp" line="612"/>
         <source>ft</source>
         <translation>st</translation>
     </message>
@@ -8722,53 +9146,58 @@ Průměr</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="325"/>
-        <location filename="../core/qthelper.cpp" line="616"/>
-        <location filename="../core/qthelper.cpp" line="626"/>
+        <location filename="../core/qthelper.cpp" line="621"/>
+        <location filename="../core/qthelper.cpp" line="631"/>
         <source>lbs</source>
         <translation>libra US</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="329"/>
-        <location filename="../core/qthelper.cpp" line="614"/>
-        <location filename="../core/qthelper.cpp" line="624"/>
+        <location filename="../core/qthelper.cpp" line="619"/>
+        <location filename="../core/qthelper.cpp" line="629"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="1772"/>
+        <location filename="../core/dive.c" line="1751"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) nebo (%s)</translation>
     </message>
     <message>
-        <location filename="../core/divelist.c" line="484"/>
+        <location filename="../core/divelist.c" line="487"/>
         <location filename="../core/equipment.c" line="84"/>
-        <location filename="../core/planner.c" line="1411"/>
-        <location filename="../core/planner.c" line="1414"/>
+        <location filename="../core/planner.c" line="1432"/>
+        <location filename="../core/planner.c" line="1435"/>
         <source>air</source>
         <translation>vzduch</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="197"/>
+        <location filename="../core/equipment.c" line="86"/>
+        <source>EAN%d</source>
+        <translation>EAN %d</translation>
+    </message>
+    <message>
+        <location filename="../core/equipment.c" line="198"/>
         <source>integrated</source>
         <translation>integrovaný</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="198"/>
+        <location filename="../core/equipment.c" line="199"/>
         <source>belt</source>
         <translation>pásek</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="199"/>
+        <location filename="../core/equipment.c" line="200"/>
         <source>ankle</source>
         <translation>kotník</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="200"/>
+        <location filename="../core/equipment.c" line="201"/>
         <source>backplate weight</source>
         <translation>Váha zadního plátu</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="201"/>
+        <location filename="../core/equipment.c" line="202"/>
         <source>clip-on</source>
         <translation>připínací (se svorkou/sponou)</translation>
     </message>
@@ -8781,8 +9210,8 @@ Průměr</translation>
         <location filename="../core/file.c" line="121"/>
         <location filename="../core/file.c" line="512"/>
         <location filename="../core/file.c" line="597"/>
-        <location filename="../core/file.c" line="924"/>
-        <location filename="../core/file.c" line="1056"/>
+        <location filename="../core/file.c" line="909"/>
+        <location filename="../core/file.c" line="1092"/>
         <location filename="../core/ostctools.c" line="80"/>
         <source>Failed to read &apos;%s&apos;</source>
         <translation>Nepodařilo se přečíst &apos;%s&apos;</translation>
@@ -8840,484 +9269,493 @@ Průměr</translation>
         <translation>Přesné změření (kalibrace) O₂</translation>
     </message>
     <message>
-        <location filename="../core/file.c" line="887"/>
-        <source>No matching DC found for file &apos;%s&apos;</source>
-        <translation>Pro soubor &apos;%s&apos; nebyl nalezen odpovídající počítač</translation>
+        <location filename="../core/git-access.c" line="134"/>
+        <source>Local cache directory %s corrupted - can&apos;t sync with Subsurface cloud storage</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>none</source>
-        <translation>žádný</translation>
+        <location filename="../core/git-access.c" line="157"/>
+        <location filename="../core/git-access.c" line="177"/>
+        <source>Could not update local cache to newer remote data</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="309"/>
-        <location filename="../core/cochran.c" line="315"/>
-        <location filename="../core/cochran.c" line="385"/>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>deco stop</source>
-        <translation>dekompresní zastávka</translation>
+        <location filename="../core/git-access.c" line="170"/>
+        <source>Subsurface cloud storage corrupted</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="342"/>
-        <location filename="../core/file.c" line="755"/>
-        <source>battery</source>
-        <translation>baterie</translation>
+        <location filename="../core/git-access.c" line="284"/>
+        <source>Could not update Subsurface cloud storage, try again later</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="370"/>
-        <location filename="../core/cochran.c" line="409"/>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>rbt</source>
-        <translation>rbt</translation>
+        <location filename="../core/git-access.c" line="344"/>
+        <source>Remote storage and local data diverged. Error: merge failed (%s)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="336"/>
-        <location filename="../core/cochran.c" line="390"/>
-        <location filename="../core/file.c" line="777"/>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>ascent</source>
-        <translation>výstup</translation>
+        <location filename="../core/git-access.c" line="374"/>
+        <source>Remote storage and local data diverged. Cannot combine local and remote changes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="379"/>
-        <location filename="../core/cochran.c" line="426"/>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>ceiling</source>
-        <translation>strop</translation>
+        <location filename="../core/git-access.c" line="408"/>
+        <source>Remote storage and local data diverged</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>workload</source>
-        <translation>zátěž</translation>
+        <location filename="../core/git-access.c" line="411"/>
+        <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="395"/>
-        <location filename="../core/libdivecomputer.c" line="203"/>
-        <source>transmitter</source>
-        <translation>vysílač</translation>
+        <location filename="../core/git-access.c" line="420"/>
+        <source>Problems with local cache of Subsurface cloud data</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/git-access.c" line="421"/>
+        <source>Moved cache data to %s. Please try the operation again.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/git-access.c" line="743"/>
+        <source>Error connecting to Subsurface cloud storage</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/git-access.c" line="746"/>
+        <source>git clone of %s failed (%s)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="210"/>
+        <location filename="../core/parse-xml.c" line="3317"/>
+        <location filename="../core/uemis-downloader.c" line="134"/>
+        <source>unknown</source>
+        <translation>Neznámý</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>none</source>
+        <translation>žádný</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="203"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>workload</source>
+        <translation>zátěž</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="224"/>
         <source>violation</source>
         <translation>překročení</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="203"/>
+        <location filename="../core/libdivecomputer.c" line="224"/>
         <source>bookmark</source>
         <translation>záložka</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="203"/>
+        <location filename="../core/libdivecomputer.c" line="224"/>
         <source>surface</source>
         <translation>povrch</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="203"/>
+        <location filename="../core/libdivecomputer.c" line="224"/>
         <source>safety stop</source>
         <translation>bezpečnostní zastávka</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="365"/>
-        <location filename="../core/cochran.c" line="414"/>
-        <location filename="../core/cochran.c" line="421"/>
-        <location filename="../core/file.c" line="868"/>
-        <location filename="../core/libdivecomputer.c" line="204"/>
-        <location filename="../core/libdivecomputer.c" line="207"/>
-        <source>gaschange</source>
-        <translation>změna plynu</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="204"/>
+        <location filename="../core/libdivecomputer.c" line="225"/>
         <source>safety stop (voluntary)</source>
         <translation>bezpečnostní zastávka (dobrovolná)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="204"/>
+        <location filename="../core/libdivecomputer.c" line="225"/>
         <source>safety stop (mandatory)</source>
         <translation>bezpečnostní zastávka (povinná)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="205"/>
+        <location filename="../core/libdivecomputer.c" line="226"/>
         <source>deepstop</source>
         <translation>hloubková zastávka</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="205"/>
+        <location filename="../core/libdivecomputer.c" line="226"/>
         <source>ceiling (safety stop)</source>
         <translation>strop (bezpečnostní zastávka)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="205"/>
-        <source>divetime</source>
-        <translation>čas potápění</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="205"/>
+        <location filename="../core/libdivecomputer.c" line="226"/>
         <source>below floor</source>
         <comment>event showing dive is below deco floor and adding deco time</comment>
         <translation>pod stropem</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="353"/>
-        <location filename="../core/libdivecomputer.c" line="206"/>
-        <source>maxdepth</source>
-        <translation>největší hloubka</translation>
-    </message>
-    <message>
-        <location filename="../core/cochran.c" line="348"/>
-        <location filename="../core/libdivecomputer.c" line="206"/>
-        <source>OLF</source>
-        <translation>OLF</translation>
+        <location filename="../core/libdivecomputer.c" line="226"/>
+        <source>divetime</source>
+        <translation>čas potápění</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="206"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
         <source>airtime</source>
         <translation>čas na vzduchu</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="206"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
         <source>rgbm</source>
         <translation>rgbm</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="206"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
         <source>heading</source>
         <translation>směr</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="358"/>
-        <location filename="../core/cochran.c" line="404"/>
-        <location filename="../core/libdivecomputer.c" line="206"/>
-        <source>pO₂</source>
-        <translation>pO₂</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="207"/>
+        <location filename="../core/libdivecomputer.c" line="228"/>
         <source>tissue level warning</source>
         <translation>upozornění na nasycení tkaniv</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="207"/>
+        <location filename="../core/libdivecomputer.c" line="228"/>
         <source>non stop time</source>
         <translation>non stop čas</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="224"/>
+        <location filename="../core/libdivecomputer.c" line="237"/>
         <source>invalid event number</source>
         <translation>neplatné číslo události</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="658"/>
-        <source>Unable to create parser for %s %s</source>
-        <translation>Nelze zpracovat %s %s</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="664"/>
-        <source>Error registering the data</source>
-        <translation>Chyba registrace dat</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="495"/>
+        <location filename="../core/libdivecomputer.c" line="553"/>
         <source>Error parsing the datetime</source>
         <translation>Chyba při zpracování času</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="513"/>
+        <location filename="../core/libdivecomputer.c" line="571"/>
         <source>Dive %d: %s</source>
         <translation>Potápění #%d: %s</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="519"/>
+        <location filename="../core/libdivecomputer.c" line="577"/>
         <source>Error parsing the divetime</source>
         <translation>Chyba při zpracování času potápění</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="529"/>
+        <location filename="../core/libdivecomputer.c" line="587"/>
         <source>Error parsing the maxdepth</source>
         <translation>Chyba při zpracování největší hloubky</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="548"/>
+        <location filename="../core/libdivecomputer.c" line="606"/>
         <source>Error parsing temperature</source>
         <translation>Chyba při zpracování teploty</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="568"/>
+        <location filename="../core/libdivecomputer.c" line="626"/>
         <source>Error parsing the gas mix count</source>
         <translation>Chyba při zpracování dýchacích směsí</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="580"/>
+        <location filename="../core/libdivecomputer.c" line="638"/>
         <source>Error obtaining water salinity</source>
         <translation>Chyba při získávání slanosti vody</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="589"/>
+        <location filename="../core/libdivecomputer.c" line="647"/>
         <source>Error obtaining surface pressure</source>
         <translation>Chyba při získávání tlaku na povrchu</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="614"/>
+        <location filename="../core/libdivecomputer.c" line="672"/>
         <source>Error obtaining divemode</source>
         <translation>Chyba při získávání režimu potápění</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="634"/>
+        <location filename="../core/libdivecomputer.c" line="692"/>
         <source>Error parsing the gas mix</source>
         <translation>Chyba při zpracování směsi plynu</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="684"/>
+        <location filename="../core/libdivecomputer.c" line="717"/>
+        <source>Unable to create parser for %s %s</source>
+        <translation>Nelze zpracovat %s %s</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="723"/>
+        <source>Error registering the data</source>
+        <translation>Chyba registrace dat</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="744"/>
         <source>Error parsing the samples</source>
         <translation>Chyba při zpracování vzorků</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="822"/>
+        <location filename="../core/libdivecomputer.c" line="882"/>
         <source>Event: waiting for user action</source>
         <translation>Událost: Čekání na vstup uživatele</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="830"/>
+        <location filename="../core/libdivecomputer.c" line="890"/>
         <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="../core/libdivecomputer.c" line="894"/>
+        <location filename="../core/libdivecomputer.c" line="954"/>
         <source>Error registering the event handler.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="899"/>
+        <location filename="../core/libdivecomputer.c" line="959"/>
         <source>Error registering the cancellation handler.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="920"/>
+        <location filename="../core/libdivecomputer.c" line="980"/>
         <source>Dive data import error</source>
         <translation>Chyba při zavádění dat o potápění</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="959"/>
+        <location filename="../core/libdivecomputer.c" line="1019"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Potíže při inicializaci libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="966"/>
+        <location filename="../core/libdivecomputer.c" line="1026"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Nelze otevřít %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="992"/>
+        <location filename="../core/libdivecomputer.c" line="1048"/>
         <source>Insufficient privileges to open the device %s %s (%s)</source>
         <translation>Nedostatečná oprávnění k otevření zařízení %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../core/parse-xml.c" line="517"/>
-        <source>Strange percentage reading %s
+        <location filename="../core/load-git.c" line="194"/>
+        <location filename="../core/parse-xml.c" line="1242"/>
+        <source>multiple GPS locations for this dive site; also %s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/load-git.c" line="194"/>
-        <location filename="../core/parse-xml.c" line="1238"/>
-        <source>multiple GPS locations for this dive site; also %s
+        <location filename="../core/load-git.c" line="222"/>
+        <location filename="../core/parse-xml.c" line="1304"/>
+        <source>additional name for site: %s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/ostctools.c" line="120"/>
+        <location filename="../core/ostctools.c" line="152"/>
+        <source>Unknown DC in dive %d</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/ostctools.c" line="165"/>
+        <source>Error - %s - parsing dive %d</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/parse-xml.c" line="517"/>
+        <source>Strange percentage reading %s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/parse-xml.c" line="2044"/>
+        <location filename="../core/parse-xml.c" line="2051"/>
         <source>Failed to parse &apos;%s&apos;</source>
         <translation>Nepodařilo se zpracovat &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../core/parse-xml.c" line="3741"/>
+        <location filename="../core/parse-xml.c" line="3774"/>
         <source>Can&apos;t open stylesheet %s</source>
         <translation>Nelze otevřít stylový list %s</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="86"/>
-        <source>EAN%d</source>
-        <translation>EAN %d</translation>
+        <location filename="../core/planner.c" line="555"/>
+        <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE %s ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="1032"/>
-        <location filename="../core/planner.c" line="1184"/>
-        <source>Can&apos;t find gas %s</source>
-        <translation>Nelze najít směs %s</translation>
+        <location filename="../core/planner.c" line="569"/>
+        <source>Decompression calculation aborted due to excessive time</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="368"/>
-        <source>Too many gas mixes</source>
-        <translation>Příliš mnoho směsí plynu</translation>
+        <location filename="../core/planner.c" line="571"/>
+        <location filename="../core/planner.c" line="829"/>
+        <location filename="../core/planner.c" line="834"/>
+        <location filename="../core/planner.c" line="860"/>
+        <location filename="../core/planner.c" line="870"/>
+        <source>Warning:</source>
+        <translation>Varování:</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="568"/>
-        <source>Decompression calculation aborted due to excessive time</source>
+        <location filename="../core/planner.c" line="581"/>
+        <source>based on Bühlmann ZHL-16C with GFlow = %d and GFhigh = %d</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="592"/>
+        <location filename="../core/planner.c" line="586"/>
+        <source>based on VPM-B at nominal conservatism</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="588"/>
+        <source>based on VPM-B at +%d conservatism</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="590"/>
+        <source>, effective GF=%d/%d</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="594"/>
+        <source>recreational mode based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="598"/>
         <source>Subsurface dive plan</source>
         <translation>Plán potápění Subsurface</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="596"/>
-        <source>depth</source>
-        <translation>Hloubka</translation>
+        <location filename="../core/planner.c" line="599"/>
+        <source>&lt;div&gt;Runtime: %dmin&lt;/div&gt;&lt;br&gt;</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="602"/>
-        <source>runtime</source>
-        <translation>Průběh</translation>
+        <location filename="../core/planner.c" line="604"/>
+        <source>depth</source>
+        <translation>Hloubka</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="599"/>
+        <location filename="../core/planner.c" line="607"/>
         <source>duration</source>
         <translation>Délka</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="554"/>
-        <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE %s ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source>
-        <translation type="unfinished"/>
+        <location filename="../core/planner.c" line="610"/>
+        <source>runtime</source>
+        <translation>Průběh</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="605"/>
+        <location filename="../core/planner.c" line="613"/>
         <source>gas</source>
         <translation>Směs</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="648"/>
+        <location filename="../core/planner.c" line="656"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="656"/>
+        <location filename="../core/planner.c" line="664"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="669"/>
+        <location filename="../core/planner.c" line="677"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="676"/>
+        <location filename="../core/planner.c" line="684"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="721"/>
+        <location filename="../core/planner.c" line="729"/>
         <source>%3.0f%s</source>
         <translation>%3.0f%s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="724"/>
-        <location filename="../core/planner.c" line="728"/>
+        <location filename="../core/planner.c" line="732"/>
+        <location filename="../core/planner.c" line="736"/>
         <source>%3dmin</source>
         <translation>%3dmin</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="737"/>
-        <location filename="../core/planner.c" line="749"/>
+        <location filename="../core/planner.c" line="745"/>
+        <location filename="../core/planner.c" line="757"/>
         <source>(SP = %.1fbar)</source>
         <translation>(SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="772"/>
+        <location filename="../core/planner.c" line="780"/>
         <source>Switch gas to %s (SP = %.1fbar)</source>
         <translation>Změna plynu na %s (SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="774"/>
+        <location filename="../core/planner.c" line="782"/>
         <source>Switch gas to %s</source>
         <translation>Změna plynu na %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="793"/>
+        <location filename="../core/planner.c" line="801"/>
         <source>CNS</source>
         <translation>CNS</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="795"/>
+        <location filename="../core/planner.c" line="803"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="799"/>
+        <location filename="../core/planner.c" line="807"/>
         <source>Gas consumption (CCR legs excluded):</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="801"/>
+        <location filename="../core/planner.c" line="809"/>
         <source>Gas consumption:</source>
         <translation>Spotřeba plynu:</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="570"/>
-        <location filename="../core/planner.c" line="821"/>
-        <location filename="../core/planner.c" line="826"/>
-        <location filename="../core/planner.c" line="851"/>
-        <location filename="../core/planner.c" line="861"/>
-        <source>Warning:</source>
-        <translation>Varování:</translation>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="580"/>
-        <source>based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="584"/>
-        <source>based on VPM-B at nominal conservatism</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="586"/>
-        <source>based on VPM-B at +%d conservatism</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="588"/>
-        <source>recreational mode based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="822"/>
+        <location filename="../core/planner.c" line="830"/>
         <source>this is more gas than available in the specified cylinder!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="827"/>
+        <location filename="../core/planner.c" line="835"/>
         <source>not enough reserve for gas sharing on ascent!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="829"/>
+        <location filename="../core/planner.c" line="837"/>
         <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source>
         <translation>%.0f%s/%.0f%s z %s (%.0f%s/%.0f%s v plánovaném výstupu)</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="831"/>
+        <location filename="../core/planner.c" line="839"/>
         <source>%.0f%s (%.0f%s during planned ascent) of %s</source>
         <translation>%.0f%s (%.0f%s po dobu plánovaného výstupu) z %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="848"/>
+        <location filename="../core/planner.c" line="857"/>
         <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
         <translation>vysoká pO₂ hodnota %.2f v %d:%02u se směsí %s v hloubce %.*f %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="858"/>
+        <location filename="../core/planner.c" line="867"/>
         <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="1419"/>
+        <location filename="../core/planner.c" line="1194"/>
+        <source>Can&apos;t find gas %s</source>
+        <translation>Nelze najít směs %s</translation>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="1440"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1280"/>
+        <location filename="../core/profile.c" line="1298"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
@@ -9326,70 +9764,70 @@ D: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1283"/>
+        <location filename="../core/profile.c" line="1301"/>
         <source>P: %d%s
 </source>
         <translation>P: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1287"/>
+        <location filename="../core/profile.c" line="1305"/>
         <source>T: %.1f%s
 </source>
         <translation>T: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1293"/>
+        <location filename="../core/profile.c" line="1311"/>
         <source>V: %.1f%s
 </source>
         <translation>V: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1296"/>
+        <location filename="../core/profile.c" line="1314"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation>Spotřeba plynu (SAC): %.*f%s/min
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1298"/>
+        <location filename="../core/profile.c" line="1316"/>
         <source>CNS: %u%%
 </source>
         <translation>CNS: %u%%
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1300"/>
+        <location filename="../core/profile.c" line="1318"/>
         <source>pO%s: %.2fbar
 </source>
         <translation>pO%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1302"/>
+        <location filename="../core/profile.c" line="1320"/>
         <source>pN%s: %.2fbar
 </source>
         <translation>pN%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1304"/>
+        <location filename="../core/profile.c" line="1322"/>
         <source>pHe: %.2fbar
 </source>
         <translation>pHe: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1307"/>
+        <location filename="../core/profile.c" line="1325"/>
         <source>MOD: %d%s
 </source>
         <translation>MOD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1314"/>
+        <location filename="../core/profile.c" line="1332"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
@@ -9398,7 +9836,7 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1318"/>
+        <location filename="../core/profile.c" line="1336"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
@@ -9407,169 +9845,174 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1331"/>
+        <location filename="../core/profile.c" line="1349"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation>Bezpečnostní zastávka: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1334"/>
+        <location filename="../core/profile.c" line="1352"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation>Bezpečnostní zastávka: neznáma @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1339"/>
+        <location filename="../core/profile.c" line="1357"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation>Dekomprese: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1342"/>
+        <location filename="../core/profile.c" line="1360"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation>Dekomprese: Neznámý čas @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1346"/>
+        <location filename="../core/profile.c" line="1364"/>
         <source>In deco
 </source>
         <translation>Dekomprese
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1348"/>
+        <location filename="../core/profile.c" line="1366"/>
         <source>NDL: %umin
 </source>
         <translation>NDL: %umin
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1351"/>
+        <location filename="../core/profile.c" line="1369"/>
         <source>TTS: %umin
 </source>
         <translation>TTS: %umin
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1354"/>
+        <location filename="../core/profile.c" line="1372"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation>Dekomprese: %umin @ %.0f%s (spočítáno)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1362"/>
+        <location filename="../core/profile.c" line="1380"/>
         <source>In deco (calc)
 </source>
         <translation>Dekomprese (spočítáno)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1365"/>
+        <location filename="../core/profile.c" line="1383"/>
         <source>NDL: %umin (calc)
 </source>
         <translation>NDL: %umin (calc)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1367"/>
+        <location filename="../core/profile.c" line="1385"/>
         <source>NDL: &gt;2h (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1371"/>
+        <location filename="../core/profile.c" line="1389"/>
         <source>TTS: %umin (calc)
 </source>
         <translation>TTS: %umin (calc)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1373"/>
+        <location filename="../core/profile.c" line="1391"/>
         <source>TTS: &gt;2h (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1376"/>
+        <location filename="../core/profile.c" line="1394"/>
         <source>RBT: %umin
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1379"/>
+        <location filename="../core/profile.c" line="1397"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation>Vypočítaný strop %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1385"/>
+        <location filename="../core/profile.c" line="1403"/>
         <source>Tissue %.0fmin: %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1391"/>
+        <location filename="../core/profile.c" line="1409"/>
         <source>heartbeat: %d
 </source>
         <translation>tep srdce: %d
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1393"/>
+        <location filename="../core/profile.c" line="1411"/>
         <source>bearing: %d
 </source>
         <translation>směr: %d
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1396"/>
+        <location filename="../core/profile.c" line="1414"/>
         <source>mean depth to here %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1491"/>
+        <location filename="../core/profile.c" line="1515"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1495"/>
-        <location filename="../core/profile.c" line="1499"/>
-        <location filename="../core/profile.c" line="1503"/>
+        <location filename="../core/profile.c" line="1519"/>
+        <location filename="../core/profile.c" line="1523"/>
+        <location filename="../core/profile.c" line="1527"/>
         <source>%s %sD:%.1f%s</source>
         <translation>%s %sD:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1507"/>
+        <location filename="../core/profile.c" line="1531"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sD:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1511"/>
+        <location filename="../core/profile.c" line="1535"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1515"/>
-        <location filename="../core/profile.c" line="1519"/>
+        <location filename="../core/profile.c" line="1539"/>
+        <location filename="../core/profile.c" line="1543"/>
         <source>%s %sV:%.2f%s</source>
         <translation>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1526"/>
+        <location filename="../core/profile.c" line="1550"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s</translation>
     </message>
     <message>
+        <location filename="../core/profile.c" line="1575"/>
+        <source>%s SAC:%.*f %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../core/qthelper.cpp" line="67"/>
         <source>%1km</source>
         <translation type="unfinished"/>
@@ -9590,446 +10033,460 @@ EADD: %d%s
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="635"/>
+        <location filename="../core/qthelper.cpp" line="91"/>
+        <location filename="../core/qthelper.cpp" line="226"/>
+        <source>N</source>
+        <translation>S</translation>
+    </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="91"/>
+        <location filename="../core/qthelper.cpp" line="227"/>
+        <source>S</source>
+        <translation>J</translation>
+    </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="92"/>
+        <location filename="../core/qthelper.cpp" line="228"/>
+        <source>E</source>
+        <translation>V</translation>
+    </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="92"/>
+        <location filename="../core/qthelper.cpp" line="229"/>
+        <source>W</source>
+        <translation>Z</translation>
+    </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="640"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="638"/>
+        <location filename="../core/qthelper.cpp" line="643"/>
         <source>F</source>
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="23"/>
-        <source>boat</source>
-        <translation>z lodi</translation>
+        <location filename="../core/save-html.c" line="469"/>
+        <location filename="../core/save-html.c" line="553"/>
+        <location filename="../core/worldmap-save.c" line="111"/>
+        <source>Can&apos;t open file %s</source>
+        <translation>Nelze otevřít soubor %s</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="23"/>
-        <source>shore</source>
-        <translation>z břehu</translation>
+        <location filename="../core/save-html.c" line="488"/>
+        <source>Number</source>
+        <translation>Číslo</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="459"/>
-        <location filename="../core/dive.c" line="23"/>
-        <source>drift</source>
-        <translation>proudový</translation>
+        <location filename="../core/save-html.c" line="489"/>
+        <source>Date</source>
+        <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="24"/>
-        <source>deep</source>
-        <translation>hluboký</translation>
+        <location filename="../core/save-html.c" line="490"/>
+        <source>Time</source>
+        <translation>Čas</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="24"/>
-        <source>cavern</source>
-        <translation>dutina</translation>
+        <location filename="../core/save-html.c" line="491"/>
+        <source>Location</source>
+        <translation>Místo</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="443"/>
-        <location filename="../core/dive.c" line="24"/>
-        <source>ice</source>
-        <translation>led</translation>
+        <location filename="../core/save-html.c" line="492"/>
+        <source>Air temp.</source>
+        <translation>Teplota vzduchu</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="445"/>
-        <source>search</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="493"/>
+        <source>Water temp.</source>
+        <translation>Teplota vody</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="455"/>
-        <location filename="../core/dive.c" line="25"/>
-        <source>wreck</source>
-        <translation>vrak</translation>
+        <location filename="../core/save-html.c" line="494"/>
+        <source>Dives</source>
+        <translation>Potápění</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="441"/>
-        <location filename="../core/dive.c" line="25"/>
-        <source>cave</source>
-        <translation>jeskyně</translation>
+        <location filename="../core/save-html.c" line="495"/>
+        <source>Expand all</source>
+        <translation>Rozbalit vše</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="25"/>
-        <source>altitude</source>
-        <translation>výškový</translation>
+        <location filename="../core/save-html.c" line="496"/>
+        <source>Collapse all</source>
+        <translation>Sbalit vše</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="26"/>
-        <source>pool</source>
-        <translation>bazén</translation>
+        <location filename="../core/save-html.c" line="497"/>
+        <source>Trips</source>
+        <translation>Cesty</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="26"/>
-        <source>lake</source>
-        <translation>jezero</translation>
+        <location filename="../core/save-html.c" line="498"/>
+        <source>Statistics</source>
+        <translation>Statistika</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="457"/>
-        <location filename="../core/dive.c" line="26"/>
-        <source>river</source>
-        <translation>řeka</translation>
+        <location filename="../core/save-html.c" line="499"/>
+        <source>Advanced search</source>
+        <translation>Pokročilé hledání</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="439"/>
-        <location filename="../core/dive.c" line="27"/>
-        <source>night</source>
-        <translation>noční</translation>
+        <location filename="../core/save-html.c" line="502"/>
+        <source>Rating</source>
+        <translation>Hodnocení</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="153"/>
-        <source>Error: the file does not appear to be a DATATRAK divelog</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="503"/>
+        <source>Visibility</source>
+        <translation>Viditelnost</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="286"/>
-        <source>clear</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="504"/>
+        <source>Duration</source>
+        <translation>Délka</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="289"/>
-        <source>misty</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="505"/>
+        <source>Divemaster</source>
+        <translation>Vedoucí skupiny potápečů</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="292"/>
-        <source>fog</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="506"/>
+        <source>Buddy</source>
+        <translation>Společník při potápění</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="295"/>
-        <source>rain</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="507"/>
+        <source>Suit</source>
+        <translation>Oblek</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="298"/>
-        <source>storm</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="508"/>
+        <source>Tags</source>
+        <translation>Značky</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="301"/>
-        <source>snow</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="509"/>
+        <location filename="../smtk-import/smartrak.c" line="251"/>
+        <location filename="../smtk-import/smartrak.c" line="321"/>
+        <source>Notes</source>
+        <translation>Poznámky</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="321"/>
-        <source>No suit</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="510"/>
+        <source>Show more details</source>
+        <translation>Ukázat více podrobností</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="324"/>
-        <source>Shorty</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="513"/>
+        <source>Yearly statistics</source>
+        <translation>Roční statistiky</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="327"/>
-        <source>Combi</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="514"/>
+        <source>Year</source>
+        <translation>Rok</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="330"/>
-        <source>Wet suit</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="515"/>
+        <source>Total time</source>
+        <translation>Celkový čas</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="333"/>
-        <source>Semidry suit</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="516"/>
+        <source>Average time</source>
+        <translation>Průměrný čas</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="336"/>
-        <source>Dry suit</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="517"/>
+        <source>Shortest time</source>
+        <translation>Nejkratší čas</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="396"/>
-        <source>no stop</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="518"/>
+        <source>Longest time</source>
+        <translation>Nejdelší čas</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="400"/>
-        <source>single ascent</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="519"/>
+        <source>Average depth</source>
+        <translation>Průměrná hloubka</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="402"/>
-        <source>multiple ascent</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="520"/>
+        <source>Min. depth</source>
+        <translation>Nejmenší hloubka</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="404"/>
-        <location filename="../core/dive.c" line="27"/>
-        <source>fresh</source>
-        <translation>čerstvý</translation>
+        <location filename="../core/save-html.c" line="521"/>
+        <source>Max. depth</source>
+        <translation>Největší hloubka</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="406"/>
-        <source>salt water</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="522"/>
+        <source>Average SAC</source>
+        <translation>Průměrná spotřeba (SAC)</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="431"/>
-        <source>sight seeing</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="523"/>
+        <source>Min. SAC</source>
+        <translation>Nejmenší spotřeba</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="433"/>
-        <source>club dive</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="524"/>
+        <source>Max. SAC</source>
+        <translation>Největší spotřeba</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="437"/>
-        <source>instruction</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="525"/>
+        <source>Average temp.</source>
+        <translation>Průměrná teplota</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="463"/>
-        <source>other</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="526"/>
+        <source>Min. temp.</source>
+        <translation>Nejmenší teplota</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="474"/>
-        <source>Other activities</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="527"/>
+        <source>Max. temp.</source>
+        <translation>Největší teplota</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="498"/>
-        <source>Datatrak/Wlog notes</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="528"/>
+        <source>Back to list</source>
+        <translation>Zpět na seznam</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="537"/>
-        <source>Manually entered dive</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="531"/>
+        <source>Dive No.</source>
+        <translation>Číslo potápění</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="588"/>
-        <source>Unknown</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="532"/>
+        <source>Dive profile</source>
+        <translation>Profil potápění</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="674"/>
-        <source>Error: couldn&apos;t open the file %s</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="533"/>
+        <source>Dive information</source>
+        <translation>Informace o potápění</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="687"/>
-        <source>Error: no dive</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="534"/>
+        <source>Dive equipment</source>
+        <translation>Vybavení pro potápění</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="27"/>
-        <source>student</source>
-        <translation>student</translation>
+        <location filename="../core/save-html.c" line="535"/>
+        <location filename="../core/save-html.c" line="542"/>
+        <source>Type</source>
+        <translation>Typ</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="461"/>
-        <location filename="../core/dive.c" line="28"/>
-        <source>photo</source>
-        <translation>focení</translation>
+        <location filename="../core/save-html.c" line="536"/>
+        <source>Size</source>
+        <translation>Velikost</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="28"/>
-        <source>video</source>
-        <translation>video</translation>
+        <location filename="../core/save-html.c" line="537"/>
+        <source>Work pressure</source>
+        <translation>Pracovní tlak</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="435"/>
-        <location filename="../core/dive.c" line="28"/>
-        <source>instructor</source>
-        <translation>instruktor</translation>
+        <location filename="../core/save-html.c" line="538"/>
+        <source>Start pressure</source>
+        <translation>Počáteční tlak</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="398"/>
-        <location filename="../core/dive.c" line="29"/>
-        <source>deco</source>
-        <translation>dekomprese</translation>
+        <location filename="../core/save-html.c" line="539"/>
+        <source>End pressure</source>
+        <translation>Koncový tlak</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="33"/>
-        <source>OC-gas</source>
-        <translation>OC-směs</translation>
+        <location filename="../core/save-html.c" line="540"/>
+        <source>Gas</source>
+        <translation>Směs</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="33"/>
-        <source>diluent</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="541"/>
+        <source>Weight</source>
+        <translation>Hmotnost</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="33"/>
-        <location filename="../core/equipment.c" line="88"/>
-        <location filename="../core/planner.c" line="1415"/>
-        <location filename="../core/planner.c" line="1418"/>
-        <source>oxygen</source>
-        <translation>kyslík</translation>
+        <location filename="../core/save-html.c" line="543"/>
+        <source>Events</source>
+        <translation>Událost</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="227"/>
-        <source>ℓ</source>
-        <translation> ℓ</translation>
+        <location filename="../core/save-html.c" line="544"/>
+        <source>Name</source>
+        <translation>Název</translation>
+    </message>
+    <message>
+        <location filename="../core/save-html.c" line="545"/>
+        <source>Value</source>
+        <translation>Hodnota</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="239"/>
+        <location filename="../core/save-html.c" line="546"/>
+        <source>Coordinates</source>
+        <translation>Souřadnice</translation>
+    </message>
+    <message>
+        <location filename="../core/save-html.c" line="547"/>
+        <source>Dive status</source>
+        <translation>Stav potápění</translation>
+    </message>
+    <message>
+        <location filename="../core/statistics.c" line="242"/>
         <source>more than %d days</source>
         <translation>víc než %d dní</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="246"/>
+        <location filename="../core/statistics.c" line="249"/>
         <source>%dd %dh %dmin</source>
         <translation>%dd %dh %dmin</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="249"/>
+        <location filename="../core/statistics.c" line="252"/>
         <source>%dmin %dsecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="251"/>
+        <location filename="../core/statistics.c" line="254"/>
         <source>%dh %dmin</source>
         <translation>%dh %dmin</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="263"/>
+        <location filename="../core/statistics.c" line="266"/>
         <source>for dives #</source>
         <translation>pro potápění</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="269"/>
+        <location filename="../core/statistics.c" line="272"/>
         <source>for selected dives</source>
         <translation>pro vybraná potápění</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="304"/>
+        <location filename="../core/statistics.c" line="307"/>
         <source>for dive #%d</source>
         <translation>pro potápění #%d</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="306"/>
+        <location filename="../core/statistics.c" line="309"/>
         <source>for selected dive</source>
         <translation>pro vybrané potápění</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="308"/>
+        <location filename="../core/statistics.c" line="311"/>
         <source>for all dives</source>
         <translation>pro všechna potápění</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="310"/>
+        <location filename="../core/statistics.c" line="313"/>
         <source>(no dives)</source>
         <translation>(žádná potápění)</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Sun</source>
         <translation>Ne</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Mon</source>
         <translation>Po</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Tue</source>
         <translation>Út</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Wed</source>
         <translation>St</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Thu</source>
         <translation>Čt</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Fri</source>
         <translation>Pá</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Sat</source>
         <translation>So</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Jan</source>
         <translation>led</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Feb</source>
         <translation>úno</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Mar</source>
         <translation>bře</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Apr</source>
         <translation>dub</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>May</source>
         <translation>kvě</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Jun</source>
         <translation>čer</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Jul</source>
         <translation>čeč</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Aug</source>
         <translation>srp</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Sep</source>
         <translation>zář</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Oct</source>
         <translation>říj</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Nov</source>
         <translation>lis</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Dec</source>
         <translation>pro</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="191"/>
-        <location filename="../core/parse-xml.c" line="3284"/>
-        <location filename="../core/uemis-downloader.c" line="134"/>
-        <source>unknown</source>
-        <translation>Neznámý</translation>
-    </message>
-    <message>
-        <location filename="../core/uemis-downloader.c" line="467"/>
-        <source>data</source>
-        <translation>data</translation>
-    </message>
-    <message>
-        <location filename="../core/uemis-downloader.c" line="447"/>
-        <source>%s %s</source>
-        <translation>%s %s</translation>
-    </message>
-    <message>
         <location filename="../core/uemis-downloader.c" line="27"/>
         <source>Uemis Zurich: the file system is almost full.
 Disconnect/reconnect the dive computer
@@ -10055,6 +10512,16 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../core/uemis-downloader.c" line="447"/>
+        <source>%s %s</source>
+        <translation>%s %s</translation>
+    </message>
+    <message>
+        <location filename="../core/uemis-downloader.c" line="467"/>
+        <source>data</source>
+        <translation>data</translation>
+    </message>
+    <message>
         <location filename="../core/uemis-downloader.c" line="495"/>
         <source>divelog #</source>
         <translation>potápěčský deník #</translation>
@@ -10225,281 +10692,6 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation>Poplach: Slabá baterie</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="469"/>
-        <location filename="../core/save-html.c" line="553"/>
-        <location filename="../core/worldmap-save.c" line="111"/>
-        <source>Can&apos;t open file %s</source>
-        <translation>Nelze otevřít soubor %s</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="488"/>
-        <source>Number</source>
-        <translation>Číslo</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="489"/>
-        <source>Date</source>
-        <translation>Datum</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="490"/>
-        <source>Time</source>
-        <translation>Čas</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="491"/>
-        <source>Location</source>
-        <translation>Místo</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="492"/>
-        <source>Air temp.</source>
-        <translation>Teplota vzduchu</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="493"/>
-        <source>Water temp.</source>
-        <translation>Teplota vody</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="498"/>
-        <source>Statistics</source>
-        <translation>Statistika</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="502"/>
-        <source>Rating</source>
-        <translation>Hodnocení</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="503"/>
-        <source>Visibility</source>
-        <translation>Viditelnost</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="504"/>
-        <source>Duration</source>
-        <translation>Délka</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="494"/>
-        <source>Dives</source>
-        <translation>Potápění</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="495"/>
-        <source>Expand all</source>
-        <translation>Rozbalit vše</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="496"/>
-        <source>Collapse all</source>
-        <translation>Sbalit vše</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="497"/>
-        <source>Trips</source>
-        <translation>Cesty</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="499"/>
-        <source>Advanced search</source>
-        <translation>Pokročilé hledání</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="505"/>
-        <source>Divemaster</source>
-        <translation>Vedoucí skupiny potápečů</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="506"/>
-        <source>Buddy</source>
-        <translation>Společník při potápění</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="507"/>
-        <source>Suit</source>
-        <translation>Oblek</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="508"/>
-        <source>Tags</source>
-        <translation>Značky</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="509"/>
-        <location filename="../smtk-import/smartrak.c" line="251"/>
-        <location filename="../smtk-import/smartrak.c" line="321"/>
-        <source>Notes</source>
-        <translation>Poznámky</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="510"/>
-        <source>Show more details</source>
-        <translation>Ukázat více podrobností</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="513"/>
-        <source>Yearly statistics</source>
-        <translation>Roční statistiky</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="514"/>
-        <source>Year</source>
-        <translation>Rok</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="515"/>
-        <source>Total time</source>
-        <translation>Celkový čas</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="516"/>
-        <source>Average time</source>
-        <translation>Průměrný čas</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="517"/>
-        <source>Shortest time</source>
-        <translation>Nejkratší čas</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="518"/>
-        <source>Longest time</source>
-        <translation>Nejdelší čas</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="519"/>
-        <source>Average depth</source>
-        <translation>Průměrná hloubka</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="520"/>
-        <source>Min. depth</source>
-        <translation>Nejmenší hloubka</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="521"/>
-        <source>Max. depth</source>
-        <translation>Největší hloubka</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="523"/>
-        <source>Min. SAC</source>
-        <translation>Nejmenší spotřeba</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="524"/>
-        <source>Max. SAC</source>
-        <translation>Největší spotřeba</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="525"/>
-        <source>Average temp.</source>
-        <translation>Průměrná teplota</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="526"/>
-        <source>Min. temp.</source>
-        <translation>Nejmenší teplota</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="527"/>
-        <source>Max. temp.</source>
-        <translation>Největší teplota</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="528"/>
-        <source>Back to list</source>
-        <translation>Zpět na seznam</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="534"/>
-        <source>Dive equipment</source>
-        <translation>Vybavení pro potápění</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="537"/>
-        <source>Work pressure</source>
-        <translation>Pracovní tlak</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="538"/>
-        <source>Start pressure</source>
-        <translation>Počáteční tlak</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="539"/>
-        <source>End pressure</source>
-        <translation>Koncový tlak</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="547"/>
-        <source>Dive status</source>
-        <translation>Stav potápění</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="522"/>
-        <source>Average SAC</source>
-        <translation>Průměrná spotřeba (SAC)</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="531"/>
-        <source>Dive No.</source>
-        <translation>Číslo potápění</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="532"/>
-        <source>Dive profile</source>
-        <translation>Profil potápění</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="533"/>
-        <source>Dive information</source>
-        <translation>Informace o potápění</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="535"/>
-        <location filename="../core/save-html.c" line="542"/>
-        <source>Type</source>
-        <translation>Typ</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="536"/>
-        <source>Size</source>
-        <translation>Velikost</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="540"/>
-        <source>Gas</source>
-        <translation>Směs</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="541"/>
-        <source>Weight</source>
-        <translation>Hmotnost</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="543"/>
-        <source>Events</source>
-        <translation>Událost</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="544"/>
-        <source>Name</source>
-        <translation>Název</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="545"/>
-        <source>Value</source>
-        <translation>Hodnota</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="546"/>
-        <source>Coordinates</source>
-        <translation>Souřadnice</translation>
-    </message>
-    <message>
         <location filename="../core/worldmap-save.c" line="39"/>
         <source>Date:</source>
         <translation>Datum:</translation>
@@ -10545,109 +10737,6 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation>Poznámky:</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="91"/>
-        <location filename="../core/qthelper.cpp" line="226"/>
-        <source>N</source>
-        <translation>S</translation>
-    </message>
-    <message>
-        <location filename="../core/qthelper.cpp" line="91"/>
-        <location filename="../core/qthelper.cpp" line="227"/>
-        <source>S</source>
-        <translation>J</translation>
-    </message>
-    <message>
-        <location filename="../core/qthelper.cpp" line="92"/>
-        <location filename="../core/qthelper.cpp" line="228"/>
-        <source>E</source>
-        <translation>V</translation>
-    </message>
-    <message>
-        <location filename="../core/qthelper.cpp" line="92"/>
-        <location filename="../core/qthelper.cpp" line="229"/>
-        <source>W</source>
-        <translation>Z</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="341"/>
-        <source>Remote storage and local data diverged. Error: merge failed (%s)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="134"/>
-        <source>Local cache directory %s corrupted - can&apos;t sync with Subsurface cloud storage</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="157"/>
-        <location filename="../core/git-access.c" line="177"/>
-        <source>Could not update local cache to newer remote data</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="170"/>
-        <source>Subsurface cloud storage corrupted</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="285"/>
-        <source>Could not update Subsurface cloud storage, try again later</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="371"/>
-        <source>Remote storage and local data diverged. Cannot combine local and remote changes</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="405"/>
-        <source>Remote storage and local data diverged</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="408"/>
-        <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="417"/>
-        <source>Problems with local cache of Subsurface cloud data</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="418"/>
-        <source>Moved cache data to %s. Please try the operation again.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="737"/>
-        <source>Error connecting to Subsurface cloud storage</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="740"/>
-        <source>git clone of %s failed (%s)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/load-git.c" line="222"/>
-        <location filename="../core/parse-xml.c" line="1300"/>
-        <source>additional name for site: %s
-</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/ostctools.c" line="120"/>
-        <location filename="../core/ostctools.c" line="152"/>
-        <source>Unknown DC in dive %d</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/ostctools.c" line="165"/>
-        <source>Error - %s - parsing dive %d</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../smtk-import/smartrak.c" line="247"/>
         <source>Built</source>
         <translation type="unfinished"/>
@@ -10731,155 +10820,120 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="91"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="103"/>
         <source>Subsurface</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="97"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="110"/>
         <source>Dive list</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="112"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="125"/>
         <source>Cloud credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="126"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="139"/>
         <source>Manage dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="138"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="141"/>
         <source>Add dive manually</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="146"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="149"/>
         <source>Manual sync with cloud</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="164"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="167"/>
         <source>Offline mode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="164"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="167"/>
         <source>Enable auto cloud sync</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="182"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="187"/>
         <source>GPS</source>
         <translation>GPS</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="185"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="190"/>
         <source>GPS-tag dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="192"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="197"/>
         <source>Upload GPS data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="199"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="204"/>
         <source>Download GPS data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="206"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="211"/>
         <source>Show GPS fixes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="215"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="220"/>
         <source>Clear GPS cache</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="221"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="226"/>
         <source>Preferences</source>
         <translation>Nastavení</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="230"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="237"/>
         <source>Developer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="232"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="239"/>
         <source>App log</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="239"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="246"/>
         <source>Theme information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="246"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="253"/>
         <source>User manual</source>
         <translation>Uživatelská příručka</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="252"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="259"/>
         <source>About</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="283"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="304"/>
         <source>Run location service</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="283"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="304"/>
         <source>No GPS source available</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="295"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="316"/>
         <source>Actions</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="9"/>
-        <source>Hello World</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="13"/>
-        <source>File</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="15"/>
-        <source>&amp;Open</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="19"/>
-        <source>Exit</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="27"/>
-        <source>Button 1 pressed</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="28"/>
-        <source>Button 2 pressed</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="33"/>
-        <source>May I have your attention, please?</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>plannerDetails</name>
@@ -10957,6 +11011,24 @@ p, li { white-space: pre-wrap; }
         <translation> m/min</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="121"/>
+        <location filename="../build/ui_plannerSettings.h" line="425"/>
+        <source>75% to 50% avg. depth</source>
+        <translation>75 % až 50 % průměrné hloubky</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="138"/>
+        <location filename="../build/ui_plannerSettings.h" line="427"/>
+        <source>50% avg. depth to 6m</source>
+        <translation>50 % průměrné hloubky do 6m</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="155"/>
+        <location filename="../build/ui_plannerSettings.h" line="429"/>
+        <source>6m to surface</source>
+        <translation>6 m na povrch</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="175"/>
         <location filename="../build/ui_plannerSettings.h" line="431"/>
         <source>Descent</source>
@@ -10980,12 +11052,35 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="268"/>
+        <source>Bühlmann deco</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="278"/>
         <location filename="../build/ui_plannerSettings.h" line="445"/>
         <source>Reserve gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="288"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="549"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="578"/>
+        <location filename="../build/ui_plannerSettings.h" line="446"/>
+        <location filename="../build/ui_plannerSettings.h" line="459"/>
+        <location filename="../build/ui_plannerSettings.h" line="461"/>
+        <source>bar</source>
+        <translation>bar</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="307"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="416"/>
+        <location filename="../build/ui_plannerSettings.h" line="437"/>
+        <location filename="../build/ui_plannerSettings.h" line="440"/>
+        <source>%</source>
+        <translation>%</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="320"/>
         <location filename="../build/ui_plannerSettings.h" line="449"/>
         <source>Postpone gas change if a stop is not required</source>
@@ -11004,12 +11099,10 @@ p, li { white-space: pre-wrap; }
         <translation>GFLow</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="307"/>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="416"/>
-        <location filename="../build/ui_plannerSettings.h" line="437"/>
-        <location filename="../build/ui_plannerSettings.h" line="440"/>
-        <source>%</source>
-        <translation>%</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="353"/>
+        <location filename="../build/ui_plannerSettings.h" line="436"/>
+        <source>Plan backgas breaks</source>
+        <translation>Plánovat vzduchové přestávky</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="360"/>
@@ -11018,10 +11111,10 @@ p, li { white-space: pre-wrap; }
         <translation>GFHigh</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="429"/>
-        <location filename="../build/ui_plannerSettings.h" line="441"/>
-        <source>Drop to first depth</source>
-        <translation>Přímý sestup k první hloubce</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="370"/>
+        <location filename="../build/ui_plannerSettings.h" line="453"/>
+        <source>min</source>
+        <translation>min</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="389"/>
@@ -11030,163 +11123,139 @@ p, li { white-space: pre-wrap; }
         <translation>Poslední zastavení v 6 metrech</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="353"/>
-        <location filename="../build/ui_plannerSettings.h" line="436"/>
-        <source>Plan backgas breaks</source>
-        <translation>Plánovat vzduchové přestávky</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="396"/>
+        <source>Maximize bottom time allowed by gas and no decompression limits</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="515"/>
-        <location filename="../build/ui_plannerSettings.h" line="455"/>
-        <source>Gas options</source>
-        <translation>Nastavení směsi</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="399"/>
+        <location filename="../build/ui_plannerSettings.h" line="443"/>
+        <source>Recreational mode</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="594"/>
-        <location filename="../build/ui_plannerSettings.h" line="456"/>
-        <source>Bottom SAC</source>
-        <translation>SAC na dně</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="429"/>
+        <location filename="../build/ui_plannerSettings.h" line="441"/>
+        <source>Drop to first depth</source>
+        <translation>Přímý sestup k první hloubce</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="692"/>
-        <location filename="../build/ui_plannerSettings.h" line="457"/>
-        <source>Deco SAC</source>
-        <translation>SAC při dekompresi</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="436"/>
+        <location filename="../build/ui_plannerSettings.h" line="452"/>
+        <source>Min. switch duration</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="601"/>
-        <location filename="../build/ui_plannerSettings.h" line="458"/>
-        <source>Bottom pO₂</source>
-        <translation>pO₂ na dně</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="459"/>
+        <location filename="../build/ui_plannerSettings.h" line="444"/>
+        <source>Safety stop</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="685"/>
-        <location filename="../build/ui_plannerSettings.h" line="460"/>
-        <source>Deco pO₂</source>
-        <translation>pO₂ při dekompresi</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="495"/>
+        <source>Conservatism level</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="515"/>
+        <location filename="../build/ui_plannerSettings.h" line="455"/>
+        <source>Gas options</source>
+        <translation>Nastavení směsi</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="565"/>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="672"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="698"/>
         <location filename="../build/ui_plannerSettings.h" line="462"/>
         <location filename="../build/ui_plannerSettings.h" line="463"/>
         <source>ℓ/min</source>
         <translation> ℓ/min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="632"/>
-        <location filename="../build/ui_plannerSettings.h" line="468"/>
-        <source>Display runtime</source>
-        <translation>Zobrazit průběh</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="645"/>
-        <location filename="../build/ui_plannerSettings.h" line="472"/>
-        <source>Display segment duration</source>
-        <translation>Zobrazit trvání segmentu</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="655"/>
-        <location filename="../build/ui_plannerSettings.h" line="476"/>
-        <source>Display transitions in deco</source>
-        <translation>Zobrazit přechody mezi zastaveními dekomprese</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="662"/>
-        <location filename="../build/ui_plannerSettings.h" line="477"/>
-        <source>Verbatim dive plan</source>
-        <translation>Podrobný plán potápění</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="288"/>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="549"/>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="578"/>
-        <location filename="../build/ui_plannerSettings.h" line="446"/>
-        <location filename="../build/ui_plannerSettings.h" line="459"/>
-        <location filename="../build/ui_plannerSettings.h" line="461"/>
-        <source>bar</source>
-        <translation>bar</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="121"/>
-        <location filename="../build/ui_plannerSettings.h" line="425"/>
-        <source>75% to 50% avg. depth</source>
-        <translation>75 % až 50 % průměrné hloubky</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="138"/>
-        <location filename="../build/ui_plannerSettings.h" line="427"/>
-        <source>50% avg. depth to 6m</source>
-        <translation>50 % průměrné hloubky do 6m</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="155"/>
-        <location filename="../build/ui_plannerSettings.h" line="429"/>
-        <source>6m to surface</source>
-        <translation>6 m na povrch</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="268"/>
-        <source>Bühlmann deco</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="370"/>
-        <location filename="../build/ui_plannerSettings.h" line="453"/>
-        <source>min</source>
-        <translation>min</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="396"/>
-        <source>Maximize bottom time allowed by gas and no decompression limits</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="594"/>
+        <source>m</source>
+        <translation> m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="399"/>
-        <location filename="../build/ui_plannerSettings.h" line="443"/>
-        <source>Recreational mode</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="606"/>
+        <source>Used to calculate best mix. Select best mix depth in &apos;Available gases&apos; table by entering gas depth, followed by &quot;B&quot; (best trimix mix) or &quot;BN&quot; (best nitrox mix)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="436"/>
-        <location filename="../build/ui_plannerSettings.h" line="452"/>
-        <source>Min. switch duration</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="613"/>
+        <location filename="../build/ui_plannerSettings.h" line="456"/>
+        <source>Bottom SAC</source>
+        <translation>SAC na dně</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="459"/>
-        <location filename="../build/ui_plannerSettings.h" line="444"/>
-        <source>Safety stop</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="620"/>
+        <location filename="../build/ui_plannerSettings.h" line="458"/>
+        <source>Bottom pO₂</source>
+        <translation>pO₂ na dně</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="495"/>
-        <source>Conservatism level</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="627"/>
+        <source>Best mix END</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="608"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="634"/>
         <location filename="../build/ui_plannerSettings.h" line="464"/>
         <source>Notes</source>
         <translation>Poznámky</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="629"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="655"/>
         <location filename="../build/ui_plannerSettings.h" line="466"/>
         <source>In dive plan, show runtime (absolute time) of stops</source>
         <translation>Zobrazit průběh zastávek (absolutní čas) v plánu potápění</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="642"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="658"/>
+        <location filename="../build/ui_plannerSettings.h" line="468"/>
+        <source>Display runtime</source>
+        <translation>Zobrazit průběh</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="668"/>
         <location filename="../build/ui_plannerSettings.h" line="470"/>
         <source>In dive plan, show duration (relative time) of stops</source>
         <translation>V plánu potápění zobrazit trvání (poměrný čas) zastávek</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="652"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="671"/>
+        <location filename="../build/ui_plannerSettings.h" line="472"/>
+        <source>Display segment duration</source>
+        <translation>Zobrazit trvání segmentu</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="678"/>
         <location filename="../build/ui_plannerSettings.h" line="474"/>
         <source>In diveplan, list transitions or treat them as implicit</source>
         <translation>Zobrazit přechody v plánu potápění anebo je předpokládat implicitně</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="681"/>
+        <location filename="../build/ui_plannerSettings.h" line="476"/>
+        <source>Display transitions in deco</source>
+        <translation>Zobrazit přechody mezi zastaveními dekomprese</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="688"/>
+        <location filename="../build/ui_plannerSettings.h" line="477"/>
+        <source>Verbatim dive plan</source>
+        <translation>Podrobný plán potápění</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="711"/>
+        <location filename="../build/ui_plannerSettings.h" line="460"/>
+        <source>Deco pO₂</source>
+        <translation>pO₂ při dekompresi</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="718"/>
+        <location filename="../build/ui_plannerSettings.h" line="457"/>
+        <source>Deco SAC</source>
+        <translation>SAC při dekompresi</translation>
+    </message>
 </context>
 </TS>
\ No newline at end of file
diff --git a/translations/subsurface_da_DK.ts b/translations/subsurface_da_DK.ts
index df48b5a9c..c041bc01d 100644
--- a/translations/subsurface_da_DK.ts
+++ b/translations/subsurface_da_DK.ts
@@ -105,6 +105,11 @@
         <translation>Navn:</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="56"/>
+        <source>Could not initialize Winsock version 2.2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="134"/>
         <source>Trying to turn on the local Bluetooth device...</source>
         <translation>Forsøger at tænde Bluetooth enhed...</translation>
@@ -115,6 +120,11 @@
         <translation>Forsøger at slukke Bluetooth enhed ....</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="167"/>
+        <source>Remote devices list was cleared.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="183"/>
         <source>Scanning for remote devices...</source>
         <translation>Skanner for enheder....</translation>
@@ -125,6 +135,22 @@
         <translation>Skanning afsluttet med succes.</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="208"/>
+        <source>The local Bluetooth device was %1.</source>
+        <extracomment>%1 will be replaced with &quot;turned on&quot; or &quot;turned off&quot;</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
+        <source>turned on</source>
+        <translation>Tændt</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
+        <source>turned off</source>
+        <translation>Slukket</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="225"/>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="339"/>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="359"/>
@@ -172,37 +198,6 @@
         <translation>Pair</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="352"/>
-        <source>Device %1 was paired and is authorized.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="56"/>
-        <source>Could not initialize Winsock version 2.2</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="167"/>
-        <source>Remote devices list was cleared.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="208"/>
-        <source>The local Bluetooth device was %1.</source>
-        <extracomment>%1 will be replaced with &quot;turned on&quot; or &quot;turned off&quot;</extracomment>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
-        <source>turned on</source>
-        <translation>Tændt</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
-        <source>turned off</source>
-        <translation>Slukket</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="307"/>
         <source>Remove pairing</source>
         <translation type="unfinished"/>
@@ -228,6 +223,11 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="352"/>
+        <source>Device %1 was paired and is authorized.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="378"/>
         <source>The device %1 can now be used for connection. You can press the Save button.</source>
         <translation type="unfinished"/>
@@ -286,12 +286,12 @@
 <context>
     <name>BuddyFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="621"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="619"/>
         <source>Person: </source>
         <translation>Person:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="622"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="620"/>
         <source>Searches for buddies and divemasters</source>
         <translation>Søger efter makkere og divemasters</translation>
     </message>
@@ -299,7 +299,7 @@
 <context>
     <name>BuddyFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="243"/>
+        <location filename="../qt-models/filtermodels.cpp" line="248"/>
         <source>No buddies</source>
         <translation>Ingen makkere</translation>
     </message>
@@ -307,25 +307,30 @@
 <context>
     <name>CloudCredentials</name>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="49"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="50"/>
         <source>Cloud credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="55"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="56"/>
         <source>Email</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="67"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="68"/>
         <source>Password</source>
         <translation>Password</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="90"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="92"/>
         <source>Show password</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="97"/>
+        <source>PIN</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>ColumnNameProvider</name>
@@ -381,6 +386,16 @@
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
+        <source>Max. depth</source>
+        <translation>Max dybde</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
+        <source>Avg. depth</source>
+        <translation>Gnm. dybde</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
         <source>Divemaster</source>
         <translation>Divemaster</translation>
     </message>
@@ -391,6 +406,11 @@
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
+        <source>Suit</source>
+        <translation>Dragt</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
         <source>Notes</source>
         <translation>Noter</translation>
     </message>
@@ -410,21 +430,6 @@
         <translation>Vand temp.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
-        <source>Max. depth</source>
-        <translation>Max dybde</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
-        <source>Avg. depth</source>
-        <translation>Gnm. dybde</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
-        <source>Suit</source>
-        <translation>Dragt</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="44"/>
         <source>O₂</source>
         <translation>O₂</translation>
@@ -538,7 +543,7 @@
         <translation>Kan ikke danne libdivecomputer context</translation>
     </message>
     <message>
-        <location filename="../core/configuredivecomputer.cpp" line="660"/>
+        <location filename="../core/configuredivecomputer.cpp" line="656"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation>Kunne ikke lave en forbindelse til dykker computeren</translation>
     </message>
@@ -558,11 +563,19 @@
         <translation>Device or mount point</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="170"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1520"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1533"/>
-        <source>...</source>
-        <translation>...</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="47"/>
+        <source>Connect via Bluetooth</source>
+        <translation>Forbind via Bluetooth</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="54"/>
+        <source>Connect</source>
+        <translation>Forbind</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="64"/>
+        <source>Disconnect</source>
+        <translation>Afbryd</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="80"/>
@@ -571,12 +584,24 @@
         <translation>Hent detaljer</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="90"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1523"/>
+        <source>Read settings from backup file or from device before writing to the device</source>
+        <translation>Læs indstillingerne fra backup eller fra enheden inden skrivning til enheden</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="93"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1525"/>
         <source>Save changes to device</source>
         <translation>Gem ændringer til enhed</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="116"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1527"/>
+        <source>Read settings from backup file or from device before writing to a backup file</source>
+        <translation>Læs indstillingerne fra backup eller fra enheden inden skrivning til backup</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="119"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1529"/>
         <source>Backup</source>
@@ -595,15 +620,40 @@
         <translation>Opdater firmware</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="163"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1532"/>
+        <source>Save libdivecomputer logfile</source>
+        <translation>Gem libdivecomputer logfil</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="170"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1520"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1533"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="177"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1534"/>
         <source>Cancel</source>
         <translation>Fortryd</translation>
     </message>
     <message>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1539"/>
-        <source>OSTC 3</source>
-        <translation>OSTC 3</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="214"/>
+        <source>OSTC 3,Sport,Cr,2</source>
+        <translation>OSTC 3,Sport,Cr,2</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="223"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1541"/>
+        <source>Suunto Vyper family</source>
+        <translation>Suunto Vyper familie</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="232"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1543"/>
+        <source>OSTC, Mk.2/2N/2C</source>
+        <translation>OSTC, Mk.2/2N/2C</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="253"/>
@@ -616,40 +666,56 @@
         <translation>Basis indstillinger</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="326"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1656"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1943"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1546"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1726"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1766"/>
-        <source>Serial No.</source>
-        <translation>Serie nr.</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="260"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1575"/>
+        <source>Eco</source>
+        <translation>Eco</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="349"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1679"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1980"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1547"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1727"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1767"/>
-        <source>Firmware version</source>
-        <translation>Firmware version</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="265"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1576"/>
+        <source>Medium</source>
+        <translation>Medium</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="538"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1713"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1990"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1548"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1729"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1768"/>
-        <source>Custom text</source>
-        <translation>Valgfri tekst</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="270"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1577"/>
+        <source>High</source>
+        <translation>Høj</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="385"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1549"/>
-        <source>Language</source>
-        <translation>Sprog</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="278"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="826"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="849"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="875"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="927"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="993"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1019"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1101"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1117"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1450"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2278"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2382"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2408"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2434"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2474"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2497"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1586"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1621"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1623"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1625"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1628"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1637"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1638"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1710"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1785"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1789"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1801"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1803"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1806"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1807"/>
+        <source>%</source>
+        <translation>%</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="289"/>
@@ -676,44 +742,36 @@
         <translation>Italiensk</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="579"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1557"/>
-        <source>Dive mode</source>
-        <translation>Dykker tilstand</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="556"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1560"/>
-        <source>OC</source>
-        <translation>OC</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="561"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1561"/>
-        <source>CC</source>
-        <translation>CC</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="313"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1582"/>
+        <source>m/°C</source>
+        <translation>m/°C</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="566"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2336"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1562"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1793"/>
-        <source>Gauge</source>
-        <translation>Gauge</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="318"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1583"/>
+        <source>ft/°F</source>
+        <translation>ft/°F</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="571"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1563"/>
-        <source>Apnea</source>
-        <translation>Apnea</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="326"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1656"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1943"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1546"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1726"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1766"/>
+        <source>Serial No.</source>
+        <translation>Serie nr.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="395"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2063"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1565"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1780"/>
-        <source>Date format</source>
-        <translation>Dato format</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="349"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1679"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1980"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1547"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1727"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1767"/>
+        <source>Firmware version</source>
+        <translation>Firmware version</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="360"/>
@@ -734,110 +792,149 @@
         <translation>ÅÅMMDD</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1042"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2457"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1639"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1805"/>
-        <source>Saturation</source>
-        <translation>Mætning</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="385"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1549"/>
+        <source>Language</source>
+        <translation>Sprog</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="278"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="826"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="849"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="875"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="927"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="993"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1019"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1101"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1117"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1450"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2278"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2382"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2408"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2434"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2474"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2497"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1586"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1621"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1623"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1625"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1628"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1637"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1638"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1710"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1785"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1789"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1801"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1803"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1806"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1807"/>
-        <source>%</source>
-        <translation>%</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="395"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2063"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1565"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1780"/>
+        <source>Date format</source>
+        <translation>Dato format</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="865"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2261"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1624"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1784"/>
-        <source>Desaturation</source>
-        <translation>Afmætning</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="405"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1572"/>
+        <source>Brightness</source>
+        <translation>Lysstyrke</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="983"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2398"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1636"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1800"/>
-        <source>Last deco</source>
-        <translation>Sidste Deko</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="415"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1850"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1579"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1753"/>
+        <source>Units</source>
+        <translation>Enheder</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="711"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="736"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="758"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="904"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2181"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2206"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2228"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2307"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1626"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1786"/>
-        <source> m</source>
-        <translation>m</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="425"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1585"/>
+        <source>Salinity (0-5%)</source>
+        <translation>Saltindhold(0-5%)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="405"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1572"/>
-        <source>Brightness</source>
-        <translation>Lysstyrke</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="438"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1615"/>
+        <source>Reset device to default settings</source>
+        <translation>Sæt enheden til fabriksindstilllinger</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="260"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1575"/>
-        <source>Eco</source>
-        <translation>Eco</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="452"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1590"/>
+        <source>230LSB/Gauss</source>
+        <translation>230LSB/Gauss</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="265"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1576"/>
-        <source>Medium</source>
-        <translation>Medium</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="457"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1591"/>
+        <source>330LSB/Gauss</source>
+        <translation>330LSB/Gauss</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="270"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1577"/>
-        <source>High</source>
-        <translation>Høj</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="462"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1592"/>
+        <source>390LSB/Gauss</source>
+        <translation>390LSB/Gauss</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="603"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2034"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1599"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1779"/>
-        <source>Sampling rate</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="467"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1593"/>
+        <source>440LSB/Gauss</source>
+        <translation>440LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="472"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1594"/>
+        <source>660LSB/Gauss</source>
+        <translation>660LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="477"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1595"/>
+        <source>820LSB/Gauss</source>
+        <translation>820LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="482"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1596"/>
+        <source>1090LSB/Gauss</source>
+        <translation>1090LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="487"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1597"/>
+        <source>1370LSB/Gauss</source>
+        <translation>1370LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="521"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1587"/>
+        <source>Compass gain</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="531"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1799"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1745"/>
+        <source>Computer model</source>
+        <translation>Computer model</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="538"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1713"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1990"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1548"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1729"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1768"/>
+        <source>Custom text</source>
+        <translation>Valgfri tekst</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="556"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1560"/>
+        <source>OC</source>
+        <translation>OC</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="561"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1561"/>
+        <source>CC</source>
+        <translation>CC</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="566"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2336"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1562"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1793"/>
+        <source>Gauge</source>
+        <translation>Gauge</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="571"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1563"/>
+        <source>Apnea</source>
+        <translation>Apnea</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="579"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1557"/>
+        <source>Dive mode</source>
+        <translation>Dykker tilstand</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="590"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1602"/>
         <source>2s</source>
@@ -852,30 +949,12 @@
         <translation>10s</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="415"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1850"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1579"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1753"/>
-        <source>Units</source>
-        <translation>Enheder</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="313"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1582"/>
-        <source>m/°C</source>
-        <translation>m/°C</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="318"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1583"/>
-        <source>ft/°F</source>
-        <translation>ft/°F</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="644"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1605"/>
-        <source>Dive mode color</source>
-        <translation>Dyk mode farve</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="603"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2034"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1599"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1779"/>
+        <source>Sampling rate</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="614"/>
@@ -902,12 +981,6 @@
         <translation>Blå</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="425"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1585"/>
-        <source>Salinity (0-5%)</source>
-        <translation>Saltindhold(0-5%)</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="637"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2092"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1613"/>
@@ -916,90 +989,80 @@
         <translation>Synkroniser dykker computeren med PC</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="521"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1587"/>
-        <source>Compass gain</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="90"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1523"/>
-        <source>Read settings from backup file or from device before writing to the device</source>
-        <translation>Læs indstillingerne fra backup eller fra enheden inden skrivning til enheden</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="116"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1527"/>
-        <source>Read settings from backup file or from device before writing to a backup file</source>
-        <translation>Læs indstillingerne fra backup eller fra enheden inden skrivning til backup</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="232"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1543"/>
-        <source>OSTC, Mk.2/2N/2C</source>
-        <translation>OSTC, Mk.2/2N/2C</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="644"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1605"/>
+        <source>Dive mode color</source>
+        <translation>Dyk mode farve</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="452"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1590"/>
-        <source>230LSB/Gauss</source>
-        <translation>230LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="654"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2020"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1614"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1771"/>
+        <source>Show safety stop</source>
+        <translation>Vis sikkerhedsstop</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="457"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1591"/>
-        <source>330LSB/Gauss</source>
-        <translation>330LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="661"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2145"/>
+        <source>End Depth</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="462"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1592"/>
-        <source>390LSB/Gauss</source>
-        <translation>390LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="671"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2162"/>
+        <source> s</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="467"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1593"/>
-        <source>440LSB/Gauss</source>
-        <translation>440LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="687"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1953"/>
+        <source>Length</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="472"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1594"/>
-        <source>660LSB/Gauss</source>
-        <translation>660LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="694"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2138"/>
+        <source>Start Depth</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="477"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1595"/>
-        <source>820LSB/Gauss</source>
-        <translation>820LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="701"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2152"/>
+        <source>Reset Depth</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="482"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1596"/>
-        <source>1090LSB/Gauss</source>
-        <translation>1090LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="711"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="736"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="758"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="904"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2181"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2206"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2228"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2307"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1626"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1786"/>
+        <source> m</source>
+        <translation>m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="487"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1597"/>
-        <source>1370LSB/Gauss</source>
-        <translation>1370LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="778"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2248"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1643"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1810"/>
+        <source>Advanced settings</source>
+        <translation>Avancerede indstillinger</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="654"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2020"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1614"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1771"/>
-        <source>Show safety stop</source>
-        <translation>Vis sikkerhedsstop</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="784"/>
+        <source>Left button sensitivity</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="438"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1615"/>
-        <source>Reset device to default settings</source>
-        <translation>Sæt enheden til fabriksindstilllinger</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="791"/>
+        <source>Always show ppO2</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="798"/>
@@ -1010,20 +1073,6 @@
         <translation>Alt GF kan vælges under vandet</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="223"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1541"/>
-        <source>Suunto Vyper family</source>
-        <translation>Suunto Vyper familie</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="778"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2248"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1643"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1810"/>
-        <source>Advanced settings</source>
-        <translation>Avancerede indstillinger</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="805"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2271"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1618"/>
@@ -1054,6 +1103,14 @@
         <translation>GFHigh</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="865"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2261"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1624"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1784"/>
+        <source>Desaturation</source>
+        <translation>Afmætning</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="917"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2320"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1627"/>
@@ -1068,14 +1125,6 @@
         <translation>mbar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="973"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2369"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1630"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1788"/>
-        <source> min</source>
-        <translation>min</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="960"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2331"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1633"/>
@@ -1084,63 +1133,28 @@
         <translation>ZH-L16</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="47"/>
-        <source>Connect via Bluetooth</source>
-        <translation>Forbind via Bluetooth</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="163"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1532"/>
-        <source>Save libdivecomputer logfile</source>
-        <translation>Gem libdivecomputer logfil</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="661"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2145"/>
-        <source>End Depth</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="671"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2162"/>
-        <source> s</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="687"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1953"/>
-        <source>Length</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="694"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2138"/>
-        <source>Start Depth</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="701"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2152"/>
-        <source>Reset Depth</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="784"/>
-        <source>Left button sensitivity</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="791"/>
-        <source>Always show ppO2</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="965"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1634"/>
         <source>ZH-L16+GF</source>
         <translation>ZH-L16+GF</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="973"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2369"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1630"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1788"/>
+        <source> min</source>
+        <translation>min</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="983"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2398"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1636"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1800"/>
+        <source>Last deco</source>
+        <translation>Sidste Deko</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1009"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2424"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1640"/>
@@ -1157,6 +1171,14 @@
         <translation>Alt GFHigh</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1042"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2457"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1639"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1805"/>
+        <source>Saturation</source>
+        <translation>Mætning</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1052"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1642"/>
         <source>Flip screen</source>
@@ -1168,12 +1190,22 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1066"/>
+        <source>MOD warning</source>
+        <translation>MOD advarsel</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1073"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2513"/>
         <source>Graphical speed indicator</source>
         <translation>Grafisk hastigheds indikator</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1080"/>
+        <source>Dynamic ascent rate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1087"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2552"/>
         <source>Bottom gas consumption</source>
@@ -1186,6 +1218,14 @@
         <translation>Deko gas forbrug</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1133"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1149"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2520"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2536"/>
+        <source> ℓ/min</source>
+        <translation> ℓ/min</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1165"/>
         <source>Temperature sensor offset</source>
         <translation type="unfinished"/>
@@ -1204,6 +1244,18 @@
         <translation>Gas indstillinger</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1235"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1320"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2610"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2695"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1645"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1668"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1812"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1835"/>
+        <source>%O₂</source>
+        <translation>%O₂</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1240"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1325"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2615"/>
@@ -1322,16 +1374,10 @@
         <translation>Dil 5</translation>
     </message>
     <message>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1691"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1858"/>
-        <source>Set point [cbar]</source>
-        <translation>Set point [cbar]</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1693"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1860"/>
-        <source>Change depth [m]</source>
-        <translation>Skift dybde [m]</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1405"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2770"/>
+        <source>Setpoint</source>
+        <translation>Setpoint</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1415"/>
@@ -1370,6 +1416,12 @@
         <translation>SP 5</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1443"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1709"/>
+        <source>O₂ in calibration gas</source>
+        <translation>O₂ i kalibrerings gas</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1467"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1713"/>
         <source>Fixed setpoint</source>
@@ -1400,101 +1452,6 @@
         <translation>cbar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1748"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1733"/>
-        <source>P1 (medium)</source>
-        <extracomment>Suunto safety level</extracomment>
-        <translation>P1 (medium)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1753"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1734"/>
-        <source>P2 (high)</source>
-        <extracomment>Suunto safety level</extracomment>
-        <translation>P2 (high)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1792"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1744"/>
-        <source>Total dive time</source>
-        <translation>Totel dykker tid</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2109"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1769"/>
-        <source>kg/ℓ</source>
-        <translation>kg/ℓ</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2346"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1795"/>
-        <source>Apnoea</source>
-        <translation>Apnø</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1583"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1722"/>
-        <source>Safety level</source>
-        <translation>Sikkerheds niveau</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="54"/>
-        <source>Connect</source>
-        <translation>Forbind</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="64"/>
-        <source>Disconnect</source>
-        <translation>Afbryd</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="214"/>
-        <source>OSTC 3,Sport,Cr,2</source>
-        <translation>OSTC 3,Sport,Cr,2</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1066"/>
-        <source>MOD warning</source>
-        <translation>MOD advarsel</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1080"/>
-        <source>Dynamic ascent rate</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1133"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1149"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2520"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2536"/>
-        <source> ℓ/min</source>
-        <translation> ℓ/min</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1235"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1320"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2610"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2695"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1645"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1668"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1812"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1835"/>
-        <source>%O₂</source>
-        <translation>%O₂</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1405"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2770"/>
-        <source>Setpoint</source>
-        <translation>Setpoint</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1443"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1709"/>
-        <source>O₂ in calibration gas</source>
-        <translation>O₂ i kalibrerings gas</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1535"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2843"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1719"/>
@@ -1511,6 +1468,12 @@
         <translation>pO₂ min</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1583"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1722"/>
+        <source>Safety level</source>
+        <translation>Sikkerheds niveau</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1609"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1723"/>
         <source>Altitude range</source>
@@ -1544,6 +1507,20 @@
         <translation>P0 (ingen)</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1748"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1733"/>
+        <source>P1 (medium)</source>
+        <extracomment>Suunto safety level</extracomment>
+        <translation>P1 (medium)</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1753"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1734"/>
+        <source>P2 (high)</source>
+        <extracomment>Suunto safety level</extracomment>
+        <translation>P2 (high)</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1761"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1736"/>
         <source>Sample rate</source>
@@ -1568,11 +1545,10 @@
         <translation>60s</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="531"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1799"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1745"/>
-        <source>Computer model</source>
-        <translation>Computer model</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1792"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1744"/>
+        <source>Total dive time</source>
+        <translation>Totel dykker tid</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1816"/>
@@ -1637,12 +1613,6 @@
         <translation>Tids alarm</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2099"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1765"/>
-        <source>Salinity</source>
-        <translation>Saltindhold</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2074"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1774"/>
         <source>MM/DD/YY</source>
@@ -1661,12 +1631,30 @@
         <translation>YY/MM/DD</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2099"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1765"/>
+        <source>Salinity</source>
+        <translation>Saltindhold</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2109"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1769"/>
+        <source>kg/ℓ</source>
+        <translation>kg/ℓ</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2341"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1794"/>
         <source>ZH-L16 CC</source>
         <translation>ZH-L16 CC</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2346"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1795"/>
+        <source>Apnoea</source>
+        <translation>Apnø</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2351"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1796"/>
         <source>L16-GF OC</source>
@@ -1685,87 +1673,112 @@
         <translation>PSCR-GF</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1108"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1129"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1539"/>
+        <source>OSTC 3</source>
+        <translation>OSTC 3</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1691"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1858"/>
+        <source>Set point [cbar]</source>
+        <translation>Set point [cbar]</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1693"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1860"/>
+        <source>Change depth [m]</source>
+        <translation>Skift dybde [m]</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1110"/>
+        <source>Backup dive computer settings</source>
+        <translation>Backup af dykker computer indstillinger</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1111"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1132"/>
         <source>Backup files (*.xml)</source>
         <translation>Backup filer (*.xml)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1113"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1115"/>
+        <source>XML backup error</source>
+        <translation>XML backup fejl</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1116"/>
         <source>An error occurred while saving the backup file.
 %1</source>
         <translation>Det opstod en fejl under skrivning af backup fil:
 %s</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1116"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1119"/>
         <source>Backup succeeded</source>
         <translation>Backup færdig med succes</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1117"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1120"/>
         <source>Your settings have been saved to: %1</source>
         <translation>Dine indstillinger er gemt til: %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1107"/>
-        <source>Backup dive computer settings</source>
-        <translation>Backup af dykker computer indstillinger</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1112"/>
-        <source>XML backup error</source>
-        <translation>XML backup fejl</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1128"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1131"/>
         <source>Restore dive computer settings</source>
         <translation>Gendan dykker computer indstillinger</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1134"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1137"/>
         <source>XML restore error</source>
         <translation>XML gendannelses fejl</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1135"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1138"/>
         <source>An error occurred while restoring the backup file.
 %1</source>
         <translation>En fejl opstod under indlæsning af backup file
 %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1139"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1142"/>
         <source>Restore succeeded</source>
         <translation>Gendannet med succes</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1140"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1143"/>
         <source>Your settings have been restored successfully.</source>
         <translation>Dine indstillinger er blevet gendannet med succes.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1150"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1153"/>
         <source>Select firmware file</source>
         <translation>Vælg firmware fil</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1151"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1154"/>
         <source>All files (*.*)</source>
         <translation>Alle filer(*.*)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1207"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1210"/>
         <source>Choose file for divecomputer download logfile</source>
         <translation>Vælg logfil for computer download</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1208"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1211"/>
         <source>Log files (*.log)</source>
         <translation>Logfiler (*.log)</translation>
     </message>
 </context>
 <context>
+    <name>ContextDrawer</name>
+    <message>
+        <location filename="../mobile-widgets/qml/kirigami/src/controls/ContextDrawer.qml" line="76"/>
+        <source>Actions</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>CylindersModel</name>
     <message>
         <location filename="../qt-models/cylindermodel.cpp" line="16"/>
@@ -1779,11 +1792,6 @@
     </message>
     <message>
         <location filename="../qt-models/cylindermodel.cpp" line="16"/>
-        <source>He%</source>
-        <translation>He%</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="16"/>
         <source>Work press.</source>
         <translation>Arbejdstryk</translation>
     </message>
@@ -1803,9 +1811,24 @@
         <translation>O₂%</translation>
     </message>
     <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="16"/>
+        <source>He%</source>
+        <translation>He%</translation>
+    </message>
+    <message>
         <location filename="../qt-models/cylindermodel.cpp" line="17"/>
-        <source>Switch at</source>
-        <translation>Skift ved</translation>
+        <source>Deco switch at</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
+        <source>Bot. MOD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
+        <source>MND</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-models/cylindermodel.cpp" line="17"/>
@@ -1823,17 +1846,32 @@
         <translation>ℓ</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="161"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="177"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation>Klik her vil fjerne flasken</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="383"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="180"/>
+        <source>Switch depth for deco gas. Calculated using Deco pO₂ preference, unless set manually.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="183"/>
+        <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to &apos;*&apos; for best O₂% for max depth.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="186"/>
+        <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to &apos;*&apos; for best He% for max depth.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="444"/>
         <source>Cylinder cannot be removed</source>
         <translation>Flasken kan ikke fjernes</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="384"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="445"/>
         <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source>
         <translation>Denne gas er i brug. Kun flasker som ikke bruges i dykket, kan fjernes</translation>
     </message>
@@ -1853,42 +1891,24 @@
         <translation>Hvilke komponenter vil du kopiere</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="73"/>
+        <location filename="../build/ui_divecomponentselection.h" line="141"/>
+        <source>Dive site</source>
+        <translation>Dykker lokation</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="80"/>
         <location filename="../build/ui_divecomponentselection.h" line="142"/>
         <source>Suit</source>
         <translation>Dragt</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="122"/>
-        <location filename="../build/ui_divecomponentselection.h" line="148"/>
-        <source>Divemaster</source>
-        <translation>Divemaster</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="129"/>
-        <location filename="../build/ui_divecomponentselection.h" line="149"/>
-        <source>Buddy</source>
-        <translation>Makker</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="136"/>
-        <location filename="../build/ui_divecomponentselection.h" line="150"/>
-        <source>Rating</source>
-        <translation>Bedømmelse</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="87"/>
         <location filename="../build/ui_divecomponentselection.h" line="143"/>
         <source>Visibility</source>
         <translation>Sigtbarhed</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="73"/>
-        <location filename="../build/ui_divecomponentselection.h" line="141"/>
-        <source>Dive site</source>
-        <translation>Dykker lokation</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="94"/>
         <location filename="../build/ui_divecomponentselection.h" line="144"/>
         <source>Notes</source>
@@ -1912,10 +1932,34 @@
         <source>Cylinders</source>
         <translation>Flasker </translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="122"/>
+        <location filename="../build/ui_divecomponentselection.h" line="148"/>
+        <source>Divemaster</source>
+        <translation>Divemaster</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="129"/>
+        <location filename="../build/ui_divecomponentselection.h" line="149"/>
+        <source>Buddy</source>
+        <translation>Makker</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="136"/>
+        <location filename="../build/ui_divecomponentselection.h" line="150"/>
+        <source>Rating</source>
+        <translation>Bedømmelse</translation>
+    </message>
 </context>
 <context>
     <name>DiveComputerManagementDialog</name>
     <message>
+        <location filename="../desktop-widgets/divecomputermanagementdialog.ui" line="17"/>
+        <location filename="../build/ui_divecomputermanagementdialog.h" line="65"/>
+        <source>Edit dive computer nicknames</source>
+        <translation>Ret dykker computer navne</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divecomputermanagementdialog.cpp" line="49"/>
         <source>Remove the selected dive computer?</source>
         <translation>Fjern den valgte computer?</translation>
@@ -1927,12 +1971,6 @@
         <translation>Er du sikker på at du vil
 fjerne den valgte dykkercomputer?</translation>
     </message>
-    <message>
-        <location filename="../desktop-widgets/divecomputermanagementdialog.ui" line="17"/>
-        <location filename="../build/ui_divecomputermanagementdialog.h" line="65"/>
-        <source>Edit dive computer nicknames</source>
-        <translation>Ret dykker computer navne</translation>
-    </message>
 </context>
 <context>
     <name>DiveComputerModel</name>
@@ -1960,17 +1998,17 @@ fjerne den valgte dykkercomputer?</translation>
 <context>
     <name>DiveDetails</name>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="33"/>
+        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="38"/>
         <source>Dive details</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="67"/>
+        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="72"/>
         <source>Delete dive</source>
         <translation>Slet dyk</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="84"/>
+        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="89"/>
         <source>Show on map</source>
         <translation type="unfinished"/>
     </message>
@@ -1978,88 +2016,93 @@ fjerne den valgte dykkercomputer?</translation>
 <context>
     <name>DiveDetailsEdit</name>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="74"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="80"/>
         <source>Dive %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="78"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="84"/>
         <source>Date:</source>
         <translation>Dato:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="86"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="92"/>
         <source>Location:</source>
         <translation>Lokation:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="95"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="101"/>
         <source>Coordinates:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="104"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="110"/>
         <source>Use current
 GPS location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="118"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="124"/>
         <source>Depth:</source>
         <translation>Dybde:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="127"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="133"/>
         <source>Duration:</source>
         <translation>Varighed:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="137"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="143"/>
         <source>Air Temp:</source>
         <translation>Luft temp:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="146"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="152"/>
         <source>Water Temp:</source>
         <translation>Vand temp:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="155"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="161"/>
         <source>Suit:</source>
         <translation>Dragt:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="164"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="176"/>
         <source>Buddy:</source>
         <translation>Makker:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="173"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="191"/>
         <source>Dive Master:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="182"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="206"/>
         <source>Weight:</source>
         <translation>Vægt:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="192"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="216"/>
+        <source>Cylinder:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="231"/>
         <source>Gas mix:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="203"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="241"/>
         <source>Start Pressure:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="213"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="250"/>
         <source>End Pressure:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="224"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="260"/>
         <source>Notes:</source>
         <translation>Noter:</translation>
     </message>
@@ -2097,42 +2140,42 @@ GPS location:</source>
         <translation>Dragt:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="159"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="158"/>
         <source>Air Temp:</source>
         <translation>Luft temp:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="175"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="172"/>
         <source>Cylinder:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="189"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="185"/>
         <source>Water Temp:</source>
         <translation>Vand temp:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="205"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="198"/>
         <source>Dive Master:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="220"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="211"/>
         <source>Weight:</source>
         <translation>Vægt:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="249"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="224"/>
         <source>Buddy:</source>
         <translation>Makker:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="263"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="237"/>
         <source>SAC:</source>
         <translation>SAC:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="280"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="252"/>
         <source>Notes</source>
         <translation>Noter</translation>
     </message>
@@ -2140,18 +2183,18 @@ GPS location:</source>
 <context>
     <name>DiveEventItem</name>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="134"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="165"/>
         <source>Manual switch to OC</source>
         <translation>Manuel skift til OC</translation>
     </message>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="136"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="167"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation>start</translation>
     </message>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="137"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="168"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation>slut</translation>
@@ -2160,27 +2203,27 @@ GPS location:</source>
 <context>
     <name>DiveImportedModel</name>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="646"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="656"/>
         <source>Date/time</source>
         <translation>Dato/tid</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="648"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="658"/>
         <source>Duration</source>
         <translation>Varighed</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="650"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="660"/>
         <source>Depth</source>
         <translation>Dybde</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="672"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="682"/>
         <source>h:</source>
         <translation>h:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="672"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="682"/>
         <source>min</source>
         <translation>min.</translation>
     </message>
@@ -2189,8 +2232,8 @@ GPS location:</source>
     <name>DiveList</name>
     <message>
         <location filename="../mobile-widgets/qml/DiveList.qml" line="12"/>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="226"/>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="232"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="227"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="233"/>
         <source>Dive list</source>
         <translation type="unfinished"/>
     </message>
@@ -2205,110 +2248,115 @@ GPS location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="222"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="223"/>
         <source>Cloud credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="228"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="229"/>
         <source>Please tap the &apos;+&apos; button to add a dive</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="248"/>
+        <source>No dives in dive list</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DiveListView</name>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="846"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="849"/>
         <source>Expand all</source>
         <translation>Udvid alt</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="848"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="851"/>
         <source>Collapse all</source>
         <translation>Skjul alle</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="852"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="855"/>
         <source>Collapse others</source>
         <translation>Saml andre</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="856"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="859"/>
         <source>Remove dive(s) from trip</source>
         <translation>Fjern dyk fra tur</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="857"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="860"/>
         <source>Create new trip above</source>
         <translation>Opret ny tur over</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="871"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="874"/>
         <source>Add dive(s) to trip immediately above</source>
         <translation>Tilføj dyk umiddelbart over</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="873"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="876"/>
         <source>Add dive(s) to trip immediately below</source>
         <translation>Tilføj dyk umiddelbart under</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="877"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="880"/>
         <source>Merge trip with trip above</source>
         <translation>Flet tur med turen over</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="878"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="881"/>
         <source>Merge trip with trip below</source>
         <translation>Flet tur med turen under</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="882"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="885"/>
         <source>Delete dive(s)</source>
         <translation>Slet dyk</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="884"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="887"/>
         <source>Mark dive(s) invalid</source>
         <translation>Marker dyk som ugyldige</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="888"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="891"/>
         <source>Merge selected dives</source>
         <translation>Flet valgte dyk</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="890"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="893"/>
         <source>Renumber dive(s)</source>
         <translation>Gen-Numerer dyk</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="891"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="894"/>
         <source>Shift dive times</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="892"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="895"/>
         <source>Split selected dives</source>
         <translation>Opdel valgte dyk</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="893"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="896"/>
         <source>Load image(s) from file(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="894"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="897"/>
         <source>Load image(s) from web</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="917"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="919"/>
         <source>Open image files</source>
         <translation>Åben billed filer</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="917"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="919"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>Billed filer (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -2329,56 +2377,6 @@ GPS location:</source>
 <context>
     <name>DiveLogExportDialog</name>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="103"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="351"/>
-        <source>Export format</source>
-        <translation>Eksporter format</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="134"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="353"/>
-        <source>UDDF</source>
-        <translation>UDDF</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="187"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="358"/>
-        <source>Worldmap</source>
-        <translation>Verdens kort</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="197"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="359"/>
-        <source>I&amp;mage depths</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="243"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="360"/>
-        <source>Selection</source>
-        <translation>Valg</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="252"/>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="346"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="361"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="372"/>
-        <source>Selected dives</source>
-        <translation>Valgte dyk</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="262"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="362"/>
-        <source>All dives</source>
-        <translation>Alle dyk</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="306"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="396"/>
-        <source>HTML</source>
-        <translation>HTML</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="14"/>
         <location filename="../build/ui_divelogexportdialog.h" line="349"/>
         <source>Export dive log files</source>
@@ -2391,12 +2389,24 @@ GPS location:</source>
         <translation>Generel eksport</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="103"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="351"/>
+        <source>Export format</source>
+        <translation>Eksporter format</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="115"/>
         <location filename="../build/ui_divelogexportdialog.h" line="352"/>
         <source>Subsurface &amp;XML</source>
         <translation>Subsurface &amp;XML</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="134"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="353"/>
+        <source>UDDF</source>
+        <translation>UDDF</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="147"/>
         <location filename="../build/ui_divelogexportdialog.h" line="354"/>
         <source>di&amp;velogs.de</source>
@@ -2421,238 +2431,297 @@ GPS location:</source>
         <translation>CSV dyk detaljer</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="275"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="187"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="358"/>
+        <source>Worldmap</source>
+        <translation>Verdens kort</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="197"/>
+        <source>TeX</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="207"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="359"/>
+        <source>I&amp;mage depths</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="253"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="360"/>
+        <source>Selection</source>
+        <translation>Valg</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="262"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="356"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="361"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="372"/>
+        <source>Selected dives</source>
+        <translation>Valgte dyk</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="272"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="362"/>
+        <source>All dives</source>
+        <translation>Alle dyk</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="285"/>
         <location filename="../build/ui_divelogexportdialog.h" line="363"/>
         <source>CSV units</source>
         <translation>CSV enheder</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="288"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="298"/>
         <location filename="../build/ui_divelogexportdialog.h" line="366"/>
         <source>Metric</source>
         <translation>Metrisk</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="293"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="303"/>
         <location filename="../build/ui_divelogexportdialog.h" line="367"/>
         <source>Imperial</source>
         <translation>Imperial</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="324"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="316"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="396"/>
+        <source>HTML</source>
+        <translation>HTML</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="334"/>
         <location filename="../build/ui_divelogexportdialog.h" line="370"/>
         <source>General settings</source>
         <translation>Generelle indstillinger</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="330"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="340"/>
         <location filename="../build/ui_divelogexportdialog.h" line="371"/>
         <source>Subsurface numbers</source>
         <translation>Subsurface numre</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="359"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="369"/>
         <location filename="../build/ui_divelogexportdialog.h" line="373"/>
         <source>Export yearly statistics</source>
         <translation>Exporter årlig statistik</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="375"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="385"/>
         <location filename="../build/ui_divelogexportdialog.h" line="374"/>
         <source>All di&amp;ves</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="385"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="395"/>
         <location filename="../build/ui_divelogexportdialog.h" line="375"/>
         <source>Export list only</source>
         <translation>Eksporter kun listen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="392"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="402"/>
         <location filename="../build/ui_divelogexportdialog.h" line="376"/>
         <source>Export photos</source>
         <translation>Eksporter foto</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="408"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="418"/>
         <location filename="../build/ui_divelogexportdialog.h" line="377"/>
         <source>Style options</source>
         <translation>Udseende muligheder</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="423"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="433"/>
         <location filename="../build/ui_divelogexportdialog.h" line="378"/>
         <source>Font</source>
         <translation>Font</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="433"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="443"/>
         <location filename="../build/ui_divelogexportdialog.h" line="379"/>
         <source>Font size</source>
         <translation>Font størrelse</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="444"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="454"/>
         <location filename="../build/ui_divelogexportdialog.h" line="382"/>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="449"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="459"/>
         <location filename="../build/ui_divelogexportdialog.h" line="383"/>
         <source>10</source>
         <translation>10</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="454"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="464"/>
         <location filename="../build/ui_divelogexportdialog.h" line="384"/>
         <source>12</source>
         <translation>12</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="459"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="469"/>
         <location filename="../build/ui_divelogexportdialog.h" line="385"/>
         <source>14</source>
         <translation>14</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="464"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="474"/>
         <location filename="../build/ui_divelogexportdialog.h" line="386"/>
         <source>16</source>
         <translation>16</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="469"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="479"/>
         <location filename="../build/ui_divelogexportdialog.h" line="387"/>
         <source>18</source>
         <translation>18</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="474"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="484"/>
         <location filename="../build/ui_divelogexportdialog.h" line="388"/>
         <source>20</source>
         <translation>20</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="482"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="492"/>
         <location filename="../build/ui_divelogexportdialog.h" line="390"/>
         <source>Theme</source>
         <translation>Tema</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="493"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="503"/>
         <location filename="../build/ui_divelogexportdialog.h" line="393"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="95"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="99"/>
         <source>Light</source>
         <translation>Lys</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="498"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="508"/>
         <location filename="../build/ui_divelogexportdialog.h" line="394"/>
         <source>Sand</source>
         <translation>Sand</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="134"/>
-        <source>UDDF files (*.uddf *.UDDF)</source>
-        <translation>UDDF filer (*.uddf *.UDDF)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="142"/>
-        <source>CSV files (*.csv *.CSV)</source>
-        <translation>CSV filer (*.csv *.CSV)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="74"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="76"/>
         <source>Generic format that is used for data exchange between a variety of diving related programs.</source>
         <translation>Basis format bruges til udveksling af data mellem diverse dykker relaterede programmer</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="76"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="78"/>
         <source>Comma separated values describing the dive profile.</source>
         <translation>Komma separerede værdier som beskriver profiler.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="78"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="80"/>
         <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source>
         <translation>Komma separerede værdier over dyk informationen. Disse indeholder de fleste dyk detaljer men ingen profil information.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="80"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="82"/>
         <source>Send the dive data to divelogs.de website.</source>
         <translation>Send data til divelog.de hjemmeside</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="82"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="84"/>
         <source>Send the dive data to dive-share.appspot.com website</source>
         <translation>Send dykker data til dive-share.appspot.com webside</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="84"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="86"/>
         <source>HTML export of the dive locations, visualized on a world map.</source>
         <translation>HTML eksport af dykker lokationer, vist på kortet</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="86"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="88"/>
         <source>Subsurface native XML format.</source>
         <translation>Subsurface originale XML format</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="88"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="90"/>
         <source>Write depths of images to file.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="133"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="92"/>
+        <source>Write dive as TeX macros to file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="137"/>
         <source>Export UDDF file as</source>
         <translation>Eksporter UDDF fil som</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="137"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/>
+        <source>UDDF files (*.uddf *.UDDF)</source>
+        <translation>UDDF filer (*.uddf *.UDDF)</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divelogexportdialog.cpp" line="141"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="145"/>
         <source>Export CSV file as</source>
         <translation>Eksporter CSV fil som</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="148"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="142"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="146"/>
+        <source>CSV files (*.csv *.CSV)</source>
+        <translation>CSV filer (*.csv *.CSV)</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="152"/>
         <source>Export world map</source>
         <translation>Eksporter verdens kort</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="149"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="169"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="153"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="177"/>
         <source>HTML files (*.html)</source>
         <translation>HTML filer (*.html)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="153"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="157"/>
         <source>Export Subsurface XML</source>
         <translation>Eksporter Subsurface XML</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="158"/>
         <source>XML files (*.xml *.ssrf)</source>
         <translation>XML filer (*.xml *.ssrf)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="162"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="166"/>
         <source>Save image depths</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="168"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="170"/>
+        <source>Export to TeX file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="170"/>
+        <source>TeX files (*.tex)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="176"/>
         <source>Export HTML files as</source>
         <translation>Exporter HTML filer som</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="184"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="192"/>
         <source>Please wait, exporting...</source>
         <translation>Vent, eksporterer</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="219"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="227"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="311"/>
         <source>Can&apos;t open file %s</source>
         <translation>Kan ikke åbne filen %s</translation>
     </message>
@@ -2666,25 +2735,6 @@ GPS location:</source>
         <translation>Importer dykkerlog</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="643"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="727"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="856"/>
-        <source>Time</source>
-        <translation>Tid</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.ui" line="127"/>
-        <location filename="../build/ui_divelogimportdialog.h" line="164"/>
-        <source>Metric</source>
-        <translation>Metrisk</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.ui" line="132"/>
-        <location filename="../build/ui_divelogimportdialog.h" line="165"/>
-        <source>Imperial</source>
-        <translation>Imperial</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divelogimportdialog.ui" line="89"/>
         <location filename="../build/ui_divelogimportdialog.h" line="152"/>
         <source>dd.mm.yyyy</source>
@@ -2703,74 +2753,6 @@ GPS location:</source>
         <translation>åååå-mm-dd</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.ui" line="155"/>
-        <location filename="../build/ui_divelogimportdialog.h" line="167"/>
-        <source>Drag the tags above to each corresponding column below</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="641"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="729"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="852"/>
-        <source>Dive #</source>
-        <translation>Dyk #</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="642"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="723"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="854"/>
-        <source>Date</source>
-        <translation>Dato</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="644"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="858"/>
-        <source>Duration</source>
-        <translation>Varighed</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="655"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="862"/>
-        <source>GPS</source>
-        <translation>GPS</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="645"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="864"/>
-        <source>Max. depth</source>
-        <translation>Max dybde</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="646"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="866"/>
-        <source>Avg. depth</source>
-        <translation>Gnm dybde</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="658"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="872"/>
-        <source>Suit</source>
-        <translation>Dragt</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="663"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="878"/>
-        <source>Tags</source>
-        <translation>Tags</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="652"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="894"/>
-        <source>O₂</source>
-        <translation>O₂</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="653"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="896"/>
-        <source>He</source>
-        <translation>He</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divelogimportdialog.ui" line="108"/>
         <location filename="../build/ui_divelogimportdialog.h" line="158"/>
         <source>Seconds</source>
@@ -2789,183 +2771,269 @@ GPS location:</source>
         <translation>Minutter:sekunder</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="654"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="860"/>
-        <source>Location</source>
-        <translation>Lokation</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.ui" line="127"/>
+        <location filename="../build/ui_divelogimportdialog.h" line="164"/>
+        <source>Metric</source>
+        <translation>Metrisk</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.ui" line="132"/>
+        <location filename="../build/ui_divelogimportdialog.h" line="165"/>
+        <source>Imperial</source>
+        <translation>Imperial</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.ui" line="155"/>
+        <location filename="../build/ui_divelogimportdialog.h" line="167"/>
+        <source>Drag the tags above to each corresponding column below</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="354"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="499"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="505"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="355"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="528"/>
         <source>Tab</source>
         <translation>Tab</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="575"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="598"/>
         <source>Some column headers were pre-populated; please drag and drop the headers so they match the column they are in.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="613"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="731"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="782"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="848"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="636"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="761"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="857"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="925"/>
         <source>Sample time</source>
         <translation>Eksempel tid</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="615"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="733"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="784"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="638"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="763"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="859"/>
         <source>Sample depth</source>
         <translation>Eksempel dybde</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="617"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="735"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="786"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="640"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="765"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="861"/>
         <source>Sample temperature</source>
         <translation>Eksempel temperatur</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="621"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="739"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="790"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="642"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="767"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="863"/>
+        <source>Sample pO₂</source>
+        <translation>Eksempel pO₂</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="644"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="769"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="865"/>
         <source>Sample sensor1 pO₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="623"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="741"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="792"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="646"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="771"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="867"/>
         <source>Sample sensor2 pO₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="625"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="743"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="794"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="648"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="773"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="869"/>
         <source>Sample sensor3 pO₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="633"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="751"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="802"/>
-        <source>Sample stopdepth</source>
-        <translation>Eksempel stopdybde</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="637"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="755"/>
-        <source>Sample setpoint</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="619"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="737"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="788"/>
-        <source>Sample pO₂</source>
-        <translation>Eksempel pO₂</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="627"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="745"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="796"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="650"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="775"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="871"/>
         <source>Sample CNS</source>
         <translation>Eksempel CNS</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="629"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="747"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="798"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="652"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="777"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="873"/>
         <source>Sample NDL</source>
         <translation>Eksempel NDL</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="631"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="749"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="800"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="654"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="779"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="875"/>
         <source>Sample TTS</source>
         <translation>Eksempel TTS</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="635"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="753"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="804"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="656"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="781"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="877"/>
+        <source>Sample stopdepth</source>
+        <translation>Eksempel stopdybde</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="658"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="783"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="879"/>
         <source>Sample pressure</source>
         <translation>Eksempel tryk</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="656"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="868"/>
-        <source>Divemaster</source>
-        <translation>Divemaster</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="660"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="785"/>
+        <source>Sample setpoint</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="657"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="870"/>
-        <source>Buddy</source>
-        <translation>Makker</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="664"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="759"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="929"/>
+        <source>Dive #</source>
+        <translation>Dyk #</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="659"/>
-        <source>Rating</source>
-        <translation>Bedømmelse</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="665"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="753"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="931"/>
+        <source>Date</source>
+        <translation>Dato</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="660"/>
-        <source>Visibility</source>
-        <translation>Sigtbarhed</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="666"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="757"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="933"/>
+        <source>Time</source>
+        <translation>Tid</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="661"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="874"/>
-        <source>Notes</source>
-        <translation>Noter</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="667"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="935"/>
+        <source>Duration</source>
+        <translation>Varighed</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="662"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="876"/>
-        <source>Weight</source>
-        <translation>Vægt</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="668"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="941"/>
+        <source>Max. depth</source>
+        <translation>Max dybde</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="669"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="943"/>
+        <source>Avg. depth</source>
+        <translation>Gnm dybde</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="670"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="975"/>
+        <source>Air temp.</source>
+        <translation>Luft temp.</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="671"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="977"/>
+        <source>Water temp.</source>
+        <translation>Vand temp.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="649"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="888"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="672"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="965"/>
         <source>Cyl. size</source>
         <translation>Tank str.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="650"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="890"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="673"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="967"/>
         <source>Start pressure</source>
         <translation>Start tryk</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="651"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="892"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="674"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="969"/>
         <source>End pressure</source>
         <translation>Slut tryk</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="647"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="898"/>
-        <source>Air temp.</source>
-        <translation>Luft temp.</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="675"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="971"/>
+        <source>O₂</source>
+        <translation>O₂</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="648"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="900"/>
-        <source>Water temp.</source>
-        <translation>Vand temp.</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="676"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="973"/>
+        <source>He</source>
+        <translation>He</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="677"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="937"/>
+        <source>Location</source>
+        <translation>Lokation</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="678"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="939"/>
+        <source>GPS</source>
+        <translation>GPS</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="679"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="945"/>
+        <source>Divemaster</source>
+        <translation>Divemaster</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="680"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="947"/>
+        <source>Buddy</source>
+        <translation>Makker</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="681"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="949"/>
+        <source>Suit</source>
+        <translation>Dragt</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="682"/>
+        <source>Rating</source>
+        <translation>Bedømmelse</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="683"/>
+        <source>Visibility</source>
+        <translation>Sigtbarhed</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="684"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="951"/>
+        <source>Notes</source>
+        <translation>Noter</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="685"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="953"/>
+        <source>Weight</source>
+        <translation>Vægt</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="686"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="955"/>
+        <source>Tags</source>
+        <translation>Tags</translation>
     </message>
 </context>
 <context>
     <name>DiveObjectHelper</name>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="287"/>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="323"/>
         <source>%1 dive(s)</source>
         <translation type="unfinished"/>
     </message>
@@ -2973,18 +3041,18 @@ GPS location:</source>
 <context>
     <name>DivePlanner</name>
     <message>
-        <location filename="../desktop-widgets/diveplanner.ui" line="152"/>
-        <location filename="../build/ui_diveplanner.h" line="190"/>
-        <source>Altitude</source>
-        <translation>Høje</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/diveplanner.ui" line="109"/>
         <location filename="../build/ui_diveplanner.h" line="189"/>
         <source>Planned dive time</source>
         <translation>Planlagt dykker tid</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/diveplanner.ui" line="152"/>
+        <location filename="../build/ui_diveplanner.h" line="190"/>
+        <source>Altitude</source>
+        <translation>Høje</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/diveplanner.ui" line="159"/>
         <location filename="../build/ui_diveplanner.h" line="191"/>
         <source>ATM pressure</source>
@@ -3018,32 +3086,32 @@ GPS location:</source>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="134"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="136"/>
         <source>unknown</source>
         <translation>Ukendt</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="312"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="326"/>
         <source>Final depth</source>
         <translation>Slut dybde</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="314"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="328"/>
         <source>Run time</source>
         <translation>Run time</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="316"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="330"/>
         <source>Duration</source>
         <translation>Varighed</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="318"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="332"/>
         <source>Used gas</source>
         <translation>Brugt gas</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="320"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="334"/>
         <source>CC setpoint</source>
         <translation>CC setpoint</translation>
     </message>
@@ -3051,22 +3119,22 @@ GPS location:</source>
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="108"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="112"/>
         <source>Dive planner points</source>
         <translation>Planlægnings punkter</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="112"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="116"/>
         <source>Available gases</source>
         <translation>Gas til rådighed</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="137"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="143"/>
         <source>Add dive data point</source>
         <translation>Tilføj punkt</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="146"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="152"/>
         <source>Save new</source>
         <translation>Gem ny</translation>
     </message>
@@ -3099,11 +3167,36 @@ GPS location:</source>
         <translation>Farve</translation>
     </message>
     <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="124"/>
+        <source>User entered</source>
+        <translation>Bruger tilføjet</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="126"/>
+        <source>Cylinder index</source>
+        <translation>Flaske oversigt</translation>
+    </message>
+    <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="128"/>
         <source>Pressure S</source>
         <translation>Tryk S</translation>
     </message>
     <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="130"/>
+        <source>Pressure I</source>
+        <translation>Tryk I</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="132"/>
+        <source>Ceiling</source>
+        <translation>Loft</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="134"/>
+        <source>SAC</source>
+        <translation>SAC</translation>
+    </message>
+    <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="136"/>
         <source>pN₂</source>
         <translation>pN₂</translation>
@@ -3139,49 +3232,24 @@ GPS location:</source>
         <translation>Sensor 3</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="152"/>
-        <source>Heart rate</source>
-        <translation>Hjerte frekvens</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="156"/>
-        <source>Mean depth @ s</source>
-        <translation>Middel dybde @ s</translation>
-    </message>
-    <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="150"/>
         <source>Ambient pressure</source>
         <translation>Omgivende tryk</translation>
     </message>
     <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="152"/>
+        <source>Heart rate</source>
+        <translation>Hjerte frekvens</translation>
+    </message>
+    <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="154"/>
         <source>Gradient factor</source>
         <translation>Gradient factor</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="130"/>
-        <source>Pressure I</source>
-        <translation>Tryk I</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="124"/>
-        <source>User entered</source>
-        <translation>Bruger tilføjet</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="126"/>
-        <source>Cylinder index</source>
-        <translation>Flaske oversigt</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="132"/>
-        <source>Ceiling</source>
-        <translation>Loft</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="134"/>
-        <source>SAC</source>
-        <translation>SAC</translation>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="156"/>
+        <source>Mean depth @ s</source>
+        <translation>Middel dybde @ s</translation>
     </message>
 </context>
 <context>
@@ -3248,310 +3316,314 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="395"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="441"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="434"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="483"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="398"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="444"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="437"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="486"/>
         <source>Date</source>
         <translation>Dato</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="401"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="447"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="440"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="489"/>
         <source>Rating</source>
         <translation>Bedømmelse</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="404"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="443"/>
         <source>Depth</source>
         <translation>Dybde</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="410"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="446"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="495"/>
+        <source>Duration</source>
+        <translation>Varighed</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="449"/>
         <source>Temp</source>
         <translation>Temp</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="413"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="452"/>
         <source>Weight</source>
         <translation>Vægt</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="425"/>
-        <source>SAC</source>
-        <translation>SAC</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
-        <source>m</source>
-        <translation>m</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
-        <source>ft</source>
-        <translation>fod</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
-        <source>Weight(%1)</source>
-        <translation>Vægt(%1)</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="416"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="462"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="455"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="504"/>
         <source>Suit</source>
         <translation>Dragt</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="419"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="465"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="458"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="507"/>
         <source>Cyl</source>
         <translation>Cyl</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="422"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="468"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="461"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="510"/>
         <source>Gas</source>
         <translation>Gas</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
-        <source>SAC(%1)</source>
-        <translation>SAC(%1)</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="464"/>
+        <source>SAC</source>
+        <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
-        <source>/min</source>
-        <translation>/min</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="467"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="518"/>
+        <source>OTU</source>
+        <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="431"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="479"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="470"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="521"/>
         <source>Max CNS</source>
         <translation>Maks CNS</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="434"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="482"/>
-        <source>Location</source>
-        <translation>Lokation</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
+        <source>Photos</source>
+        <translation>Fotos</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
-        <source>kg</source>
-        <translation>kg</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="476"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="527"/>
+        <source>Location</source>
+        <translation>Lokation</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="492"/>
         <source>Depth(%1)</source>
         <translation>Dybde(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="407"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="453"/>
-        <source>Duration</source>
-        <translation>Varighed</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="492"/>
+        <source>m</source>
+        <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="456"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="492"/>
+        <source>ft</source>
+        <translation>fod</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="498"/>
         <source>Temp(%1%2)</source>
         <translation>Temp(%1%2)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="501"/>
+        <source>Weight(%1)</source>
+        <translation>Vægt(%1)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="501"/>
+        <source>kg</source>
+        <translation>kg</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="501"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="428"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="476"/>
-        <source>OTU</source>
-        <translation>OTU</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="515"/>
+        <source>SAC(%1)</source>
+        <translation>SAC(%1)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="515"/>
+        <source>/min</source>
+        <translation>/min</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="524"/>
+        <source>Photos before/during/after dive</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="164"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="165"/>
         <source>no dives were selected</source>
         <translation>ingen dyk var valgt</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="174"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="175"/>
         <source>stylesheet to export to divelogs.de is not found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="184"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="185"/>
         <source>failed to create zip file for upload: %s</source>
         <translation>Kunne ikke danne zip fil til upload: %s</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="236"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="237"/>
         <source>internal error</source>
         <translation>Intern fejl</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="244"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="245"/>
         <source>Conversion of dive %1 to divelogs.de format failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="272"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="273"/>
         <source>error writing zip file: %s zip error %d system error %d - %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="745"/>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="935"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="936"/>
         <source>Done</source>
         <translation>Færdig</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="778"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="779"/>
         <source>Uploading dive list...</source>
         <translation>Uploader dyk liste...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="810"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="811"/>
         <source>Downloading dive list...</source>
         <translation>Downloader dyk liste...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="851"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="852"/>
         <source>Downloading %1 dives...</source>
         <translation>Downloader %1 dyk...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="885"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="886"/>
         <source>Download finished - %1</source>
         <translation>Download færdig - %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="899"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="900"/>
         <source>Problem with download</source>
         <translation>Problem med download</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="900"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="901"/>
         <source>The archive could not be opened:
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="909"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="910"/>
         <source>Corrupted download</source>
         <translation>Fejl i download</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="910"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="911"/>
         <source>The archive could not be opened:
 %1</source>
         <translation>Arkivet kunne i åbnes:
 %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="937"/>
+        <source>Upload finished</source>
+        <translation>Upload færdig</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="950"/>
         <source>Upload failed</source>
         <translation>Upload fejlede</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="952"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="953"/>
         <source>Upload successful</source>
         <translation>Uploadet med succes</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="955"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="956"/>
         <source>Login failed</source>
         <translation>Login fejlede</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="958"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="959"/>
         <source>Cannot parse response</source>
         <translation>Kan ikke fortolke svar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="970"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="971"/>
         <source>Error: %1</source>
         <translation>Fejl: %1</translation>
     </message>
-    <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="936"/>
-        <source>Upload finished</source>
-        <translation>Upload færdig</translation>
-    </message>
 </context>
 <context>
     <name>DownloadFromDCWidget</name>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="185"/>
-        <source>Error</source>
-        <translation>Fejl</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="436"/>
-        <source>Retry</source>
-        <translation>Prøv igen</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="280"/>
-        <source>Find Uemis dive computer</source>
-        <translation>Find Uemis dykker computer</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="101"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="107"/>
         <source>Download</source>
         <translation>Download</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="104"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="110"/>
         <source>Choose Bluetooth download mode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="382"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="191"/>
+        <source>Error</source>
+        <translation>Fejl</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="286"/>
+        <source>Find Uemis dive computer</source>
+        <translation>Find Uemis dykker computer</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="392"/>
         <source>Choose file for divecomputer download logfile</source>
         <translation>Vælg logfil for computer download</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="383"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="393"/>
         <source>Log files (*.log)</source>
         <translation>Logfiler (*.log)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="398"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="408"/>
         <source>Warning</source>
         <translation>Advarsel</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="399"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="409"/>
         <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="../desktop-widgets/downloadfromdivecomputer.cpp" line="410"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="420"/>
         <source>Choose file for divecomputer binary dump file</source>
         <translation>Vælg fil for dykkercomputerens binære dump fil</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="411"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="421"/>
         <source>Dump files (*.bin)</source>
         <translation>Dump filer (*.bin)</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="446"/>
+        <source>Retry</source>
+        <translation>Prøv igen</translation>
+    </message>
 </context>
 <context>
     <name>DownloadFromDiveComputer</name>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="139"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="275"/>
-        <source>Vendor</source>
-        <translation>Leverandør</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="14"/>
         <location filename="../build/ui_downloadfromdivecomputer.h" line="265"/>
         <source>Download from dive computer</source>
@@ -3564,17 +3636,6 @@ p, li { white-space: pre-wrap; }
         <translation>Device or mount point</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="122"/>
-        <source>Choose Bluetooth download mode</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="149"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="276"/>
-        <source>Dive computer</source>
-        <translation>Dykkercomputer</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="66"/>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="101"/>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="115"/>
@@ -3598,11 +3659,46 @@ p, li { white-space: pre-wrap; }
         <translation>Foretræk altid downloadede dyk</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="87"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="270"/>
+        <source>Download into new trip</source>
+        <translation>Download til ny tur</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="94"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="271"/>
+        <source>Save libdivecomputer logfile</source>
+        <translation>Gem libdivecomputer logfil</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="108"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="273"/>
+        <source>Save libdivecomputer dumpfile</source>
+        <translation>Gem dumpfil fra libdivecomputer</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="122"/>
+        <source>Choose Bluetooth download mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="129"/>
         <source>Select a remote Bluetooth device.</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="139"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="275"/>
+        <source>Vendor</source>
+        <translation>Leverandør</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="149"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="276"/>
+        <source>Dive computer</source>
+        <translation>Dykkercomputer</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/>
         <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="52"/>
         <location filename="../build/ui_downloadfromdivecomputer.h" line="277"/>
@@ -3610,18 +3706,6 @@ p, li { white-space: pre-wrap; }
         <translation>Download</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="284"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="281"/>
-        <source>OK</source>
-        <translation>OK</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="291"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="282"/>
-        <source>Cancel</source>
-        <translation>Fortryd</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="226"/>
         <location filename="../build/ui_downloadfromdivecomputer.h" line="278"/>
         <source>Downloaded dives</source>
@@ -3640,22 +3724,16 @@ p, li { white-space: pre-wrap; }
         <translation>Fra vælg alt</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="94"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="271"/>
-        <source>Save libdivecomputer logfile</source>
-        <translation>Gem libdivecomputer logfil</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="108"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="273"/>
-        <source>Save libdivecomputer dumpfile</source>
-        <translation>Gem dumpfil fra libdivecomputer</translation>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="284"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="281"/>
+        <source>OK</source>
+        <translation>OK</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="87"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="270"/>
-        <source>Download into new trip</source>
-        <translation>Download til ny tur</translation>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="291"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="282"/>
+        <source>Cancel</source>
+        <translation>Fortryd</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="16"/>
@@ -3745,12 +3823,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="297"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="242"/>
         <source>To disconnect Subsurface from your Facebook account, use the button below</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="306"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="251"/>
         <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source>
         <translation type="unfinished"/>
     </message>
@@ -3758,22 +3836,22 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>FacebookManager</name>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="266"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="211"/>
         <source>Photo upload sucessfull</source>
         <translation>Foto uploaded med succes</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="267"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="212"/>
         <source>Your dive profile was updated to Facebook.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="271"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="216"/>
         <source>Photo upload failed</source>
         <translation>Foto upload fejlede</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="272"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="217"/>
         <source>Your dive profile was not updated to Facebook, 
  please send the following to the developer. 
 </source>
@@ -3833,17 +3911,25 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>FirmwareUpdateThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1750"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1739"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Denne facilitet er endnu ikke tilgængelig for den valgte computer</translation>
     </message>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1755"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1744"/>
         <source>Firmware update failed!</source>
         <translation>Firmware update fejlede</translation>
     </message>
 </context>
 <context>
+    <name>GlobalDrawer</name>
+    <message>
+        <location filename="../mobile-widgets/qml/kirigami/src/controls/GlobalDrawer.qml" line="364"/>
+        <source>Back</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>GlobeGPS</name>
     <message>
         <location filename="../desktop-widgets/globe.cpp" line="124"/>
@@ -3859,27 +3945,27 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="40"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="32"/>
         <source>Date: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="50"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="42"/>
         <source>Name: </source>
         <translation>Navn:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="60"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="52"/>
         <source>Latitude: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="69"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="61"/>
         <source>Longitude: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="113"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="105"/>
         <source>List of stored GPS fixes</source>
         <translation type="unfinished"/>
     </message>
@@ -3908,7 +3994,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>LocationFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="648"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="646"/>
         <source>Location: </source>
         <translation>Sted:</translation>
     </message>
@@ -3949,7 +4035,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>LocationFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="299"/>
+        <location filename="../qt-models/filtermodels.cpp" line="304"/>
         <source>No location set</source>
         <translation>Stedet er ikke sat</translation>
     </message>
@@ -4070,20 +4156,55 @@ p, li { white-space: pre-wrap; }
     </message>
 </context>
 <context>
-    <name>MainForm.ui</name>
+    <name>MainTab</name>
     <message>
-        <location filename="../packaging/ios/Subsurface-mobile/MainForm.ui.qml" line="17"/>
-        <source>Press Me 1</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/maintab.ui" line="18"/>
+        <location filename="../desktop-widgets/maintab.ui" line="439"/>
+        <location filename="../build/ui_maintab.h" line="961"/>
+        <location filename="../build/ui_maintab.h" line="963"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="539"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="571"/>
+        <source>Notes</source>
+        <translation>Noter</translation>
     </message>
     <message>
-        <location filename="../packaging/ios/Subsurface-mobile/MainForm.ui.qml" line="22"/>
-        <source>Press Me 2</source>
+        <location filename="../desktop-widgets/maintab.ui" line="21"/>
+        <location filename="../build/ui_maintab.h" line="964"/>
+        <source>General notes about the current selection</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>MainTab</name>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="92"/>
+        <location filename="../desktop-widgets/maintab.ui" line="646"/>
+        <location filename="../build/ui_maintab.h" line="947"/>
+        <location filename="../build/ui_maintab.h" line="967"/>
+        <source>Date</source>
+        <translation>Dato</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="102"/>
+        <location filename="../build/ui_maintab.h" line="948"/>
+        <source>Time</source>
+        <translation>Tid</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="112"/>
+        <location filename="../desktop-widgets/maintab.ui" line="836"/>
+        <location filename="../build/ui_maintab.h" line="949"/>
+        <location filename="../build/ui_maintab.h" line="987"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="306"/>
+        <source>Air temp.</source>
+        <translation>Luft temp.</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="122"/>
+        <location filename="../desktop-widgets/maintab.ui" line="855"/>
+        <location filename="../build/ui_maintab.h" line="950"/>
+        <location filename="../build/ui_maintab.h" line="989"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="307"/>
+        <source>Water temp.</source>
+        <translation>Vand temp.</translation>
+    </message>
     <message>
         <location filename="../desktop-widgets/maintab.ui" line="184"/>
         <location filename="../build/ui_maintab.h" line="951"/>
@@ -4092,6 +4213,17 @@ p, li { white-space: pre-wrap; }
         <translation>Position</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="214"/>
+        <source>Edit dive site</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="217"/>
+        <location filename="../build/ui_maintab.h" line="953"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="252"/>
         <location filename="../build/ui_maintab.h" line="954"/>
         <source>Divemaster</source>
@@ -4104,12 +4236,6 @@ p, li { white-space: pre-wrap; }
         <translation>Makker</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.ui" line="387"/>
-        <location filename="../build/ui_maintab.h" line="959"/>
-        <source>Tags</source>
-        <translation>Tags</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/maintab.ui" line="308"/>
         <location filename="../build/ui_maintab.h" line="956"/>
         <source>Rating</source>
@@ -4128,57 +4254,18 @@ p, li { white-space: pre-wrap; }
         <translation>Dragt</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="387"/>
+        <location filename="../build/ui_maintab.h" line="959"/>
+        <source>Tags</source>
+        <translation>Tags</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="397"/>
         <location filename="../build/ui_maintab.h" line="960"/>
         <source>Dive mode</source>
         <translation>Dykker tilstand</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.ui" line="112"/>
-        <location filename="../desktop-widgets/maintab.ui" line="836"/>
-        <location filename="../build/ui_maintab.h" line="949"/>
-        <location filename="../build/ui_maintab.h" line="987"/>
-        <location filename="../desktop-widgets/maintab.cpp" line="306"/>
-        <source>Air temp.</source>
-        <translation>Luft temp.</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="122"/>
-        <location filename="../desktop-widgets/maintab.ui" line="855"/>
-        <location filename="../build/ui_maintab.h" line="950"/>
-        <location filename="../build/ui_maintab.h" line="989"/>
-        <location filename="../desktop-widgets/maintab.cpp" line="307"/>
-        <source>Water temp.</source>
-        <translation>Vand temp.</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="18"/>
-        <location filename="../desktop-widgets/maintab.ui" line="439"/>
-        <location filename="../build/ui_maintab.h" line="961"/>
-        <location filename="../build/ui_maintab.h" line="963"/>
-        <location filename="../desktop-widgets/maintab.cpp" line="539"/>
-        <location filename="../desktop-widgets/maintab.cpp" line="571"/>
-        <source>Notes</source>
-        <translation>Noter</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="21"/>
-        <location filename="../build/ui_maintab.h" line="964"/>
-        <source>General notes about the current selection</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="214"/>
-        <source>Edit dive site</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="217"/>
-        <location filename="../build/ui_maintab.h" line="953"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/maintab.ui" line="491"/>
         <location filename="../build/ui_maintab.h" line="965"/>
         <source>Equipment</source>
@@ -4203,6 +4290,12 @@ p, li { white-space: pre-wrap; }
         <translation>Dyk information</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="665"/>
+        <location filename="../build/ui_maintab.h" line="969"/>
+        <source>Interval</source>
+        <translation>Interval</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="684"/>
         <location filename="../build/ui_maintab.h" line="971"/>
         <source>Gases used</source>
@@ -4215,18 +4308,38 @@ p, li { white-space: pre-wrap; }
         <translation>Forbrugt gas</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="722"/>
+        <location filename="../desktop-widgets/maintab.ui" line="1094"/>
+        <location filename="../build/ui_maintab.h" line="975"/>
+        <location filename="../build/ui_maintab.h" line="1003"/>
+        <source>SAC</source>
+        <translation>SAC</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="741"/>
         <location filename="../build/ui_maintab.h" line="977"/>
         <source>CNS</source>
         <translation>CNS</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="760"/>
+        <location filename="../build/ui_maintab.h" line="979"/>
+        <source>OTU</source>
+        <translation>OTU</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="779"/>
         <location filename="../build/ui_maintab.h" line="981"/>
         <source>Max. depth</source>
         <translation>Max dybde</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="798"/>
+        <location filename="../build/ui_maintab.h" line="983"/>
+        <source>Avg. depth</source>
+        <translation>Gnm dybde</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="817"/>
         <location filename="../build/ui_maintab.h" line="985"/>
         <source>Air pressure</source>
@@ -4239,82 +4352,6 @@ p, li { white-space: pre-wrap; }
         <translation>Dykker tid</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.ui" line="933"/>
-        <location filename="../build/ui_maintab.h" line="1007"/>
-        <source>Simple statistics about the selection</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1039"/>
-        <location filename="../build/ui_maintab.h" line="999"/>
-        <source>Total time</source>
-        <translation>Total tid</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1106"/>
-        <location filename="../build/ui_maintab.h" line="1004"/>
-        <source>Gas consumption</source>
-        <translation>Gas forbrug</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1151"/>
-        <location filename="../build/ui_maintab.h" line="1009"/>
-        <source>All photos from the current selection</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1177"/>
-        <location filename="../build/ui_maintab.h" line="1010"/>
-        <source>Extra data</source>
-        <translation>Ekstra data</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1180"/>
-        <location filename="../build/ui_maintab.h" line="1011"/>
-        <source>Adittional data from the dive computer</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="92"/>
-        <location filename="../desktop-widgets/maintab.ui" line="646"/>
-        <location filename="../build/ui_maintab.h" line="947"/>
-        <location filename="../build/ui_maintab.h" line="967"/>
-        <source>Date</source>
-        <translation>Dato</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="102"/>
-        <location filename="../build/ui_maintab.h" line="948"/>
-        <source>Time</source>
-        <translation>Tid</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="665"/>
-        <location filename="../build/ui_maintab.h" line="969"/>
-        <source>Interval</source>
-        <translation>Interval</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="722"/>
-        <location filename="../desktop-widgets/maintab.ui" line="1094"/>
-        <location filename="../build/ui_maintab.h" line="975"/>
-        <location filename="../build/ui_maintab.h" line="1003"/>
-        <source>SAC</source>
-        <translation>SAC</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="798"/>
-        <location filename="../build/ui_maintab.h" line="983"/>
-        <source>Avg. depth</source>
-        <translation>Gnm dybde</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="760"/>
-        <location filename="../build/ui_maintab.h" line="979"/>
-        <source>OTU</source>
-        <translation>OTU</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/maintab.ui" line="893"/>
         <location filename="../build/ui_maintab.h" line="993"/>
         <source>Salinity</source>
@@ -4327,22 +4364,34 @@ p, li { white-space: pre-wrap; }
         <translation>Statistik</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="933"/>
+        <location filename="../build/ui_maintab.h" line="1007"/>
+        <source>Simple statistics about the selection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="986"/>
         <location filename="../build/ui_maintab.h" line="996"/>
         <source>Depth</source>
         <translation>Dybde</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="998"/>
+        <location filename="../build/ui_maintab.h" line="997"/>
+        <source>Duration</source>
+        <translation>Varighed</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="1027"/>
         <location filename="../build/ui_maintab.h" line="998"/>
         <source>Temperature</source>
         <translation>Temperatur</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.ui" line="998"/>
-        <location filename="../build/ui_maintab.h" line="997"/>
-        <source>Duration</source>
-        <translation>Varighed</translation>
+        <location filename="../desktop-widgets/maintab.ui" line="1039"/>
+        <location filename="../build/ui_maintab.h" line="999"/>
+        <source>Total time</source>
+        <translation>Total tid</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/maintab.ui" line="1058"/>
@@ -4351,20 +4400,34 @@ p, li { white-space: pre-wrap; }
         <translation>Dyk</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="1106"/>
+        <location filename="../build/ui_maintab.h" line="1004"/>
+        <source>Gas consumption</source>
+        <translation>Gas forbrug</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="1148"/>
         <location filename="../build/ui_maintab.h" line="1008"/>
         <source>Photos</source>
         <translation>Fotos</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.cpp" line="88"/>
-        <source>Cylinders</source>
-        <translation>Flasker </translation>
+        <location filename="../desktop-widgets/maintab.ui" line="1151"/>
+        <location filename="../build/ui_maintab.h" line="1009"/>
+        <source>All photos from the current selection</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.cpp" line="92"/>
-        <source>Weights</source>
-        <translation>Vægt</translation>
+        <location filename="../desktop-widgets/maintab.ui" line="1177"/>
+        <location filename="../build/ui_maintab.h" line="1010"/>
+        <source>Extra data</source>
+        <translation>Ekstra data</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="1180"/>
+        <location filename="../build/ui_maintab.h" line="1011"/>
+        <source>Adittional data from the dive computer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/maintab.cpp" line="63"/>
@@ -4377,11 +4440,21 @@ p, li { white-space: pre-wrap; }
         <translation>Drop ændringer </translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.cpp" line="88"/>
+        <source>Cylinders</source>
+        <translation>Flasker </translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.cpp" line="89"/>
         <source>Add cylinder</source>
         <translation>Tilføj flaske</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.cpp" line="92"/>
+        <source>Weights</source>
+        <translation>Vægt</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.cpp" line="93"/>
         <source>Add weight system</source>
         <translation>Tilføj vægt system</translation>
@@ -4574,659 +4647,685 @@ blandes fra Luft ved brug:
         <translation>&amp;Fil</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="455"/>
-        <location filename="../build/ui_mainwindow.h" line="534"/>
-        <source>Export dive logs</source>
-        <translation>Exporter dykker logs</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="510"/>
-        <location filename="../build/ui_mainwindow.h" line="542"/>
-        <source>Toggle pHe graph</source>
-        <translation>Skift pH2 graf</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="546"/>
-        <location filename="../build/ui_mainwindow.h" line="545"/>
-        <source>Toggle calculating all tissues</source>
-        <translation>Skift beregning af alle væv</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="522"/>
-        <location filename="../build/ui_mainwindow.h" line="543"/>
-        <source>Toggle DC reported ceiling</source>
-        <translation>Skift DC rapporteret loft</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="534"/>
-        <location filename="../build/ui_mainwindow.h" line="544"/>
-        <source>Toggle calculated ceiling</source>
-        <translation>Skift beregnet loft</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="606"/>
-        <location filename="../build/ui_mainwindow.h" line="550"/>
-        <source>Toggle NDL, TTS</source>
-        <translation>Skift NDL, TTS</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="558"/>
-        <location filename="../build/ui_mainwindow.h" line="546"/>
-        <source>Toggle calculated ceiling with 3m increments</source>
-        <translation>Skift beregnet loft med 3m stop</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="463"/>
-        <location filename="../build/ui_mainwindow.h" line="537"/>
-        <source>Configure &amp;dive computer</source>
-        <translation>Konfigurer &amp;Dykker computer</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="570"/>
-        <location filename="../build/ui_mainwindow.h" line="547"/>
-        <source>Toggle heart rate</source>
-        <translation>Skift hjerte frekvens</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="582"/>
-        <location filename="../build/ui_mainwindow.h" line="548"/>
-        <source>Toggle MOD</source>
-        <translation>Skift MOD</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="594"/>
-        <location filename="../build/ui_mainwindow.h" line="549"/>
-        <source>Toggle EAD, END, EADD</source>
-        <translation>Skift EAD,END,EADD</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="618"/>
-        <location filename="../build/ui_mainwindow.h" line="551"/>
-        <source>Toggle SAC rate</source>
-        <translation>Skift SAC rate</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="630"/>
-        <location filename="../build/ui_mainwindow.h" line="552"/>
-        <source>Toggle ruler</source>
-        <translation>Skift måler</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="86"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="87"/>
         <location filename="../build/ui_mainwindow.h" line="569"/>
         <source>&amp;Log</source>
         <translation>&amp;Log</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="105"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="104"/>
         <location filename="../build/ui_mainwindow.h" line="570"/>
         <source>&amp;View</source>
         <translation>&amp;Vis</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="121"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="120"/>
         <location filename="../build/ui_mainwindow.h" line="571"/>
         <source>&amp;Help</source>
         <translation>&amp;Hjælp</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="130"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="129"/>
         <location filename="../build/ui_mainwindow.h" line="572"/>
         <source>&amp;Import</source>
         <translation>&amp;Importer</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="139"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="138"/>
         <location filename="../build/ui_mainwindow.h" line="573"/>
         <source>&amp;Edit</source>
         <translation>&amp;Rediger</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="144"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="143"/>
         <source>Share on</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="158"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="157"/>
         <location filename="../build/ui_mainwindow.h" line="453"/>
         <source>&amp;New logbook</source>
         <translation>&amp;Ny logbog</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="161"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="160"/>
         <location filename="../build/ui_mainwindow.h" line="455"/>
         <source>New</source>
         <translation>Ny</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="164"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="163"/>
         <location filename="../build/ui_mainwindow.h" line="457"/>
         <source>Ctrl+N</source>
         <translation>Crtl-N</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="169"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="168"/>
         <location filename="../build/ui_mainwindow.h" line="458"/>
         <source>&amp;Open logbook</source>
         <translation>&amp;Åben logbog</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="172"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="171"/>
         <location filename="../build/ui_mainwindow.h" line="460"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="508"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="502"/>
         <source>Open</source>
         <translation>Åben</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="175"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="174"/>
         <location filename="../build/ui_mainwindow.h" line="462"/>
         <source>Ctrl+O</source>
         <translation>Crtl-O</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="180"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="179"/>
         <location filename="../build/ui_mainwindow.h" line="463"/>
         <source>&amp;Save</source>
         <translation>&amp;Gem</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="183"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="182"/>
         <location filename="../build/ui_mainwindow.h" line="465"/>
         <source>Save</source>
         <translation>Gem</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="186"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="185"/>
         <location filename="../build/ui_mainwindow.h" line="467"/>
         <source>Ctrl+S</source>
         <translation>Crtl+S</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="191"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="190"/>
         <location filename="../build/ui_mainwindow.h" line="468"/>
         <source>Sa&amp;ve as</source>
         <translation>Ge&amp;m som</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="194"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="193"/>
         <location filename="../build/ui_mainwindow.h" line="470"/>
         <source>Save as</source>
         <translation>Gem som</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="197"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="196"/>
         <location filename="../build/ui_mainwindow.h" line="472"/>
         <source>Ctrl+Shift+S</source>
         <translation>Ctrl+Shift+S</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="202"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="201"/>
         <location filename="../build/ui_mainwindow.h" line="473"/>
         <source>&amp;Close</source>
         <translation>&amp;Luk</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="205"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="204"/>
         <location filename="../build/ui_mainwindow.h" line="475"/>
         <source>Close</source>
         <translation>Luk</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="208"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="207"/>
         <location filename="../build/ui_mainwindow.h" line="477"/>
         <source>Ctrl+W</source>
         <translation>Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="221"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="212"/>
+        <location filename="../build/ui_mainwindow.h" line="478"/>
+        <source>&amp;Print</source>
+        <translation>&amp;Print</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="215"/>
+        <location filename="../build/ui_mainwindow.h" line="479"/>
+        <source>Ctrl+P</source>
+        <translation>Ctrl+P</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="220"/>
         <location filename="../build/ui_mainwindow.h" line="480"/>
         <source>P&amp;references</source>
         <translation>I&amp;ndstillinger</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="251"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="223"/>
+        <location filename="../build/ui_mainwindow.h" line="481"/>
+        <source>Ctrl+,</source>
+        <translation>Ctrl+,</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="231"/>
+        <location filename="../build/ui_mainwindow.h" line="482"/>
+        <source>&amp;Quit</source>
+        <translation>&amp;Afslut</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="234"/>
+        <location filename="../build/ui_mainwindow.h" line="483"/>
+        <source>Ctrl+Q</source>
+        <translation>Ctrl+Q</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="242"/>
+        <location filename="../build/ui_mainwindow.h" line="484"/>
+        <source>Import from &amp;dive computer</source>
+        <translation>Importer fra &amp;dive computer</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="245"/>
+        <location filename="../build/ui_mainwindow.h" line="485"/>
+        <source>Ctrl+D</source>
+        <translation>Ctrl+D</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="250"/>
         <location filename="../build/ui_mainwindow.h" line="486"/>
         <source>Import &amp;GPS data from Subsurface web service</source>
         <translation>Importer &amp;GPS data fra Subsurface webservice</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="259"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="253"/>
+        <location filename="../build/ui_mainwindow.h" line="487"/>
+        <source>Ctrl+G</source>
+        <translation>Ctrl+G</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="258"/>
         <location filename="../build/ui_mainwindow.h" line="488"/>
         <source>Edit device &amp;names</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="272"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="263"/>
+        <location filename="../build/ui_mainwindow.h" line="489"/>
+        <source>&amp;Add dive</source>
+        <translation>&amp;Tilføj dyk</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="266"/>
+        <location filename="../build/ui_mainwindow.h" line="490"/>
+        <source>Ctrl++</source>
+        <translation>Ctrl++</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="271"/>
         <location filename="../build/ui_mainwindow.h" line="491"/>
         <source>&amp;Edit dive</source>
         <translation>&amp;Rediger dyk</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="277"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="276"/>
         <location filename="../build/ui_mainwindow.h" line="492"/>
         <source>&amp;Copy dive components</source>
         <translation>&amp;Kopier dykker komponenter</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="280"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="279"/>
         <location filename="../build/ui_mainwindow.h" line="493"/>
         <source>Ctrl+C</source>
         <translation>Ctrl+C</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="285"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="284"/>
         <location filename="../build/ui_mainwindow.h" line="494"/>
         <source>&amp;Paste dive components</source>
         <translation>&amp;Indsæt dyk komponenter</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="288"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="287"/>
         <location filename="../build/ui_mainwindow.h" line="495"/>
         <source>Ctrl+V</source>
         <translation>Ctrl+V</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="325"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="292"/>
+        <location filename="../build/ui_mainwindow.h" line="496"/>
+        <source>&amp;Renumber</source>
+        <translation>&amp;Re-Nummerer</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="295"/>
+        <location filename="../build/ui_mainwindow.h" line="497"/>
+        <source>Ctrl+R</source>
+        <translation>Ctrl+R</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="303"/>
+        <location filename="../build/ui_mainwindow.h" line="498"/>
+        <source>Auto &amp;group</source>
+        <translation>Auto &amp;grupering</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="308"/>
+        <location filename="../build/ui_mainwindow.h" line="499"/>
+        <source>&amp;Yearly statistics</source>
+        <translation>&amp;Årlig statistik</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="311"/>
+        <location filename="../build/ui_mainwindow.h" line="500"/>
+        <source>Ctrl+Y</source>
+        <translation>Ctrl+Y</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="316"/>
+        <location filename="../build/ui_mainwindow.h" line="501"/>
+        <source>&amp;Dive list</source>
+        <translation>&amp;Dykker liste</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="319"/>
+        <location filename="../build/ui_mainwindow.h" line="502"/>
+        <source>Ctrl+2</source>
+        <translation>Ctrl+2</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="324"/>
         <location filename="../build/ui_mainwindow.h" line="503"/>
         <source>&amp;Profile</source>
         <translation>&amp;Profil</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="333"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="327"/>
+        <location filename="../build/ui_mainwindow.h" line="504"/>
+        <source>Ctrl+3</source>
+        <translation>Ctrl+3</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="332"/>
         <location filename="../build/ui_mainwindow.h" line="505"/>
         <source>&amp;Info</source>
         <translation>&amp;Info</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="341"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="335"/>
+        <location filename="../build/ui_mainwindow.h" line="506"/>
+        <source>Ctrl+4</source>
+        <translation>Ctrl+4</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="340"/>
         <location filename="../build/ui_mainwindow.h" line="507"/>
         <source>&amp;All</source>
         <translation>&amp;Alt</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="357"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="343"/>
+        <location filename="../build/ui_mainwindow.h" line="508"/>
+        <source>Ctrl+1</source>
+        <translation>Ctrl+1</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="348"/>
+        <location filename="../build/ui_mainwindow.h" line="509"/>
+        <source>P&amp;revious DC</source>
+        <translation>Fo&amp;rige DC</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="351"/>
+        <location filename="../build/ui_mainwindow.h" line="510"/>
+        <source>Left</source>
+        <translation>Venstre</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="356"/>
         <location filename="../build/ui_mainwindow.h" line="511"/>
         <source>&amp;Next DC</source>
         <translation>&amp;Næste DC</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="365"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="359"/>
+        <location filename="../build/ui_mainwindow.h" line="512"/>
+        <source>Right</source>
+        <translation>Højre</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="364"/>
         <location filename="../build/ui_mainwindow.h" line="513"/>
         <source>&amp;About Subsurface</source>
         <translation>&amp;Om Subsurface</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="381"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="372"/>
+        <location filename="../build/ui_mainwindow.h" line="514"/>
+        <source>User &amp;manual</source>
+        <translation>&amp;Manual</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="375"/>
+        <location filename="../build/ui_mainwindow.h" line="515"/>
+        <source>F1</source>
+        <translation>F1</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="380"/>
         <location filename="../build/ui_mainwindow.h" line="516"/>
         <source>&amp;Globe</source>
         <translation>&amp;Globus</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="403"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="383"/>
+        <location filename="../build/ui_mainwindow.h" line="517"/>
+        <source>Ctrl+5</source>
+        <translation>Ctrl+5</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="388"/>
+        <location filename="../build/ui_mainwindow.h" line="518"/>
+        <source>P&amp;lan dive</source>
+        <translation>&amp;Planlæg dyk</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="391"/>
+        <location filename="../build/ui_mainwindow.h" line="519"/>
+        <source>Ctrl+L</source>
+        <translation>Ctrl+L</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="396"/>
+        <location filename="../build/ui_mainwindow.h" line="520"/>
+        <source>&amp;Import log files</source>
+        <translation>&amp;Importer logfiler</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="399"/>
+        <location filename="../build/ui_mainwindow.h" line="522"/>
+        <source>Import divelog files from other applications</source>
+        <translation>Importer dykkerlog fra andre programmer</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="402"/>
         <location filename="../build/ui_mainwindow.h" line="524"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+l</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="408"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="407"/>
         <location filename="../build/ui_mainwindow.h" line="525"/>
         <source>Import &amp;from divelogs.de</source>
         <translation>Importer fra divelogs.de</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="416"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="415"/>
         <location filename="../build/ui_mainwindow.h" line="526"/>
         <source>&amp;Full screen</source>
         <translation>&amp;Fuld skærm</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="419"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="418"/>
         <location filename="../build/ui_mainwindow.h" line="528"/>
         <source>Toggle full screen</source>
         <translation>Skift fuld skærm</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="447"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="421"/>
+        <location filename="../build/ui_mainwindow.h" line="530"/>
+        <source>F11</source>
+        <translation>F11</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="446"/>
         <location filename="../build/ui_mainwindow.h" line="531"/>
         <source>&amp;Check for updates</source>
         <translation>&amp;Tjek for opdateringer</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="452"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="451"/>
         <location filename="../build/ui_mainwindow.h" line="532"/>
         <source>&amp;Export</source>
         <translation>&amp;Eksporter</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="458"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="454"/>
+        <location filename="../build/ui_mainwindow.h" line="534"/>
+        <source>Export dive logs</source>
+        <translation>Exporter dykker logs</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="457"/>
         <location filename="../build/ui_mainwindow.h" line="536"/>
         <source>Ctrl+E</source>
         <translation>Ctrl-E</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="466"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="462"/>
+        <location filename="../build/ui_mainwindow.h" line="537"/>
+        <source>Configure &amp;dive computer</source>
+        <translation>Konfigurer &amp;Dykker computer</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="465"/>
         <location filename="../build/ui_mainwindow.h" line="538"/>
         <source>Ctrl+Shift+C</source>
         <translation>Ctrl+Shift+C</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="474"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="473"/>
         <location filename="../build/ui_mainwindow.h" line="539"/>
         <source>Edit &amp;dive in planner</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="486"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="485"/>
         <location filename="../build/ui_mainwindow.h" line="540"/>
         <source>Toggle pO₂ graph</source>
         <translation>pO₂graf fra/til</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="498"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="497"/>
         <location filename="../build/ui_mainwindow.h" line="541"/>
         <source>Toggle pN₂ graph</source>
         <translation>pN₂ graf fra/til</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="642"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="509"/>
+        <location filename="../build/ui_mainwindow.h" line="542"/>
+        <source>Toggle pHe graph</source>
+        <translation>Skift pH2 graf</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="521"/>
+        <location filename="../build/ui_mainwindow.h" line="543"/>
+        <source>Toggle DC reported ceiling</source>
+        <translation>Skift DC rapporteret loft</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="533"/>
+        <location filename="../build/ui_mainwindow.h" line="544"/>
+        <source>Toggle calculated ceiling</source>
+        <translation>Skift beregnet loft</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="545"/>
+        <location filename="../build/ui_mainwindow.h" line="545"/>
+        <source>Toggle calculating all tissues</source>
+        <translation>Skift beregning af alle væv</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="557"/>
+        <location filename="../build/ui_mainwindow.h" line="546"/>
+        <source>Toggle calculated ceiling with 3m increments</source>
+        <translation>Skift beregnet loft med 3m stop</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="569"/>
+        <location filename="../build/ui_mainwindow.h" line="547"/>
+        <source>Toggle heart rate</source>
+        <translation>Skift hjerte frekvens</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="581"/>
+        <location filename="../build/ui_mainwindow.h" line="548"/>
+        <source>Toggle MOD</source>
+        <translation>Skift MOD</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="593"/>
+        <location filename="../build/ui_mainwindow.h" line="549"/>
+        <source>Toggle EAD, END, EADD</source>
+        <translation>Skift EAD,END,EADD</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="605"/>
+        <location filename="../build/ui_mainwindow.h" line="550"/>
+        <source>Toggle NDL, TTS</source>
+        <translation>Skift NDL, TTS</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="617"/>
+        <location filename="../build/ui_mainwindow.h" line="551"/>
+        <source>Toggle SAC rate</source>
+        <translation>Skift SAC rate</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="629"/>
+        <location filename="../build/ui_mainwindow.h" line="552"/>
+        <source>Toggle ruler</source>
+        <translation>Skift måler</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="641"/>
         <location filename="../build/ui_mainwindow.h" line="553"/>
         <source>Scale graph</source>
         <translation>Skaler graf</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="654"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="653"/>
         <location filename="../build/ui_mainwindow.h" line="554"/>
         <source>Toggle pictures</source>
         <translation>Billeder fra/til</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="666"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="665"/>
         <location filename="../build/ui_mainwindow.h" line="555"/>
         <source>Toggle tank bar</source>
         <translation>Tank tryk fra/til</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="674"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="673"/>
         <location filename="../build/ui_mainwindow.h" line="556"/>
         <source>&amp;Filter divelist</source>
         <translation>&amp;Filtrer dykliste</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="689"/>
-        <location filename="../build/ui_mainwindow.h" line="558"/>
-        <source>Toggle tissue graph</source>
-        <translation>Vævs graf fra/til</translation>
+        <location filename="../desktop-widgets/mainwindow.ui" line="676"/>
+        <location filename="../build/ui_mainwindow.h" line="557"/>
+        <source>Ctrl+F</source>
+        <translation>Ctrl+F</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="694"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="688"/>
+        <source>Toggle tissue heat-map</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="693"/>
         <location filename="../build/ui_mainwindow.h" line="559"/>
         <source>User &amp;survey</source>
         <translation>Bruger &amp;undersøgelse</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="699"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="698"/>
         <location filename="../build/ui_mainwindow.h" line="560"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="238"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="231"/>
         <source>&amp;Undo</source>
         <translation>&amp;Fortryd</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="702"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="701"/>
         <location filename="../build/ui_mainwindow.h" line="561"/>
         <source>Ctrl+Z</source>
         <translation>Ctrl+Z</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="707"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="706"/>
         <location filename="../build/ui_mainwindow.h" line="562"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="239"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="232"/>
         <source>&amp;Redo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="710"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="709"/>
         <location filename="../build/ui_mainwindow.h" line="563"/>
         <source>Ctrl+Shift+Z</source>
         <translation>Ctrl+Shift+Z</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="715"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="714"/>
         <location filename="../build/ui_mainwindow.h" line="564"/>
         <source>&amp;Find moved images</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="720"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="719"/>
         <source>Open c&amp;loud storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="725"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="724"/>
         <source>Save to clo&amp;ud storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="730"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="729"/>
         <location filename="../build/ui_mainwindow.h" line="567"/>
         <source>&amp;Manage dive sites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="735"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="734"/>
         <source>Dive Site &amp;Edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="740"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="739"/>
         <source>Facebook</source>
         <translation>Facebook</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="745"/>
-        <source>Add GPS location here</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="744"/>
+        <source>Take cloud storage online</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="677"/>
-        <location filename="../build/ui_mainwindow.h" line="557"/>
-        <source>Ctrl+F</source>
-        <translation>Ctrl+F</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="213"/>
-        <location filename="../build/ui_mainwindow.h" line="478"/>
-        <source>&amp;Print</source>
-        <translation>&amp;Print</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="224"/>
-        <location filename="../build/ui_mainwindow.h" line="481"/>
-        <source>Ctrl+,</source>
-        <translation>Ctrl+,</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="232"/>
-        <location filename="../build/ui_mainwindow.h" line="482"/>
-        <source>&amp;Quit</source>
-        <translation>&amp;Afslut</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="243"/>
-        <location filename="../build/ui_mainwindow.h" line="484"/>
-        <source>Import from &amp;dive computer</source>
-        <translation>Importer fra &amp;dive computer</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="254"/>
-        <location filename="../build/ui_mainwindow.h" line="487"/>
-        <source>Ctrl+G</source>
-        <translation>Ctrl+G</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="267"/>
-        <location filename="../build/ui_mainwindow.h" line="490"/>
-        <source>Ctrl++</source>
-        <translation>Ctrl++</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="293"/>
-        <location filename="../build/ui_mainwindow.h" line="496"/>
-        <source>&amp;Renumber</source>
-        <translation>&amp;Re-Nummerer</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="296"/>
-        <location filename="../build/ui_mainwindow.h" line="497"/>
-        <source>Ctrl+R</source>
-        <translation>Ctrl+R</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="312"/>
-        <location filename="../build/ui_mainwindow.h" line="500"/>
-        <source>Ctrl+Y</source>
-        <translation>Ctrl+Y</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="392"/>
-        <location filename="../build/ui_mainwindow.h" line="519"/>
-        <source>Ctrl+L</source>
-        <translation>Ctrl+L</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="216"/>
-        <location filename="../build/ui_mainwindow.h" line="479"/>
-        <source>Ctrl+P</source>
-        <translation>Ctrl+P</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="235"/>
-        <location filename="../build/ui_mainwindow.h" line="483"/>
-        <source>Ctrl+Q</source>
-        <translation>Ctrl+Q</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="246"/>
-        <location filename="../build/ui_mainwindow.h" line="485"/>
-        <source>Ctrl+D</source>
-        <translation>Ctrl+D</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="264"/>
-        <location filename="../build/ui_mainwindow.h" line="489"/>
-        <source>&amp;Add dive</source>
-        <translation>&amp;Tilføj dyk</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="304"/>
-        <location filename="../build/ui_mainwindow.h" line="498"/>
-        <source>Auto &amp;group</source>
-        <translation>Auto &amp;grupering</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="309"/>
-        <location filename="../build/ui_mainwindow.h" line="499"/>
-        <source>&amp;Yearly statistics</source>
-        <translation>&amp;Årlig statistik</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="317"/>
-        <location filename="../build/ui_mainwindow.h" line="501"/>
-        <source>&amp;Dive list</source>
-        <translation>&amp;Dykker liste</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="320"/>
-        <location filename="../build/ui_mainwindow.h" line="502"/>
-        <source>Ctrl+2</source>
-        <translation>Ctrl+2</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="328"/>
-        <location filename="../build/ui_mainwindow.h" line="504"/>
-        <source>Ctrl+3</source>
-        <translation>Ctrl+3</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="336"/>
-        <location filename="../build/ui_mainwindow.h" line="506"/>
-        <source>Ctrl+4</source>
-        <translation>Ctrl+4</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="344"/>
-        <location filename="../build/ui_mainwindow.h" line="508"/>
-        <source>Ctrl+1</source>
-        <translation>Ctrl+1</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="349"/>
-        <location filename="../build/ui_mainwindow.h" line="509"/>
-        <source>P&amp;revious DC</source>
-        <translation>Fo&amp;rige DC</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="352"/>
-        <location filename="../build/ui_mainwindow.h" line="510"/>
-        <source>Left</source>
-        <translation>Venstre</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="360"/>
-        <location filename="../build/ui_mainwindow.h" line="512"/>
-        <source>Right</source>
-        <translation>Højre</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="373"/>
-        <location filename="../build/ui_mainwindow.h" line="514"/>
-        <source>User &amp;manual</source>
-        <translation>&amp;Manual</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="376"/>
-        <location filename="../build/ui_mainwindow.h" line="515"/>
-        <source>F1</source>
-        <translation>F1</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="384"/>
-        <location filename="../build/ui_mainwindow.h" line="517"/>
-        <source>Ctrl+5</source>
-        <translation>Ctrl+5</translation>
+        <location filename="../build/ui_mainwindow.h" line="558"/>
+        <source>Toggle tissue graph</source>
+        <translation>Vævs graf fra/til</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="389"/>
-        <location filename="../build/ui_mainwindow.h" line="518"/>
-        <source>P&amp;lan dive</source>
-        <translation>&amp;Planlæg dyk</translation>
+        <location filename="../build/ui_mainwindow.h" line="565"/>
+        <source>Open cloud storage</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="397"/>
-        <location filename="../build/ui_mainwindow.h" line="520"/>
-        <source>&amp;Import log files</source>
-        <translation>&amp;Importer logfiler</translation>
+        <location filename="../build/ui_mainwindow.h" line="566"/>
+        <source>Save to cloud storage</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="400"/>
-        <location filename="../build/ui_mainwindow.h" line="522"/>
-        <source>Import divelog files from other applications</source>
-        <translation>Importer dykkerlog fra andre programmer</translation>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="331"/>
+        <source>Connect to</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="422"/>
-        <location filename="../build/ui_mainwindow.h" line="530"/>
-        <source>F11</source>
-        <translation>F11</translation>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="493"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="538"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1545"/>
+        <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="../desktop-widgets/mainwindow.cpp" line="505"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="499"/>
         <source>Open file</source>
         <translation>Åben fil</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="509"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="503"/>
         <location filename="../desktop-widgets/mainwindow.cpp" line="614"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1972"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1978"/>
         <source>Cancel</source>
         <translation>Fortryd</translation>
     </message>
@@ -5246,6 +5345,16 @@ blandes fra Luft ved brug:
         <translation>Skanner billeder...(dette kan tage noget tid)</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="649"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="796"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="977"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="983"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1849"/>
+        <source>Warning</source>
+        <translation>Advarsel</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="674"/>
         <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>
@@ -5261,124 +5370,97 @@ blandes fra Luft ved brug:
         <translation>Print runtime skema</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="982"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
+        <source>Trying to replan a dive that&apos;s not a planned dive.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="977"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1849"/>
+        <source>Please, first finish the current edition before trying to do another.</source>
+        <translation>Færdiggør denne rettelse inden du starter på en ny.</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="983"/>
         <source>Trying to edit a dive that&apos;s not a manually added dive.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1243"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1030"/>
+        <source>Yearly statistics</source>
+        <translation>Årlig statistik</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1244"/>
         <source>Do you want to save the changes that you made in the file %1?</source>
         <translation>Vil du gemme ændringerne du foretog på denne fil %1?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1246"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1247"/>
         <source>Do you want to save the changes that you made in the data file?</source>
         <translation>Vil du gemme ændringerne du foretog på data filen?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1251"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1252"/>
         <source>Save changes?</source>
         <translation>Gem ændringer?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1587"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1253"/>
+        <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="../desktop-widgets/mainwindow.cpp" line="1572"/>
         <source>Save file as</source>
         <translation>Gem fil som</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1682"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1573"/>
+        <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
+        <translation>Subsurface XML filer (*.ssrf *.xml *.XML)</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1670"/>
+        <source>[local cache for] %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1672"/>
         <source>[cloud storage for] %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1782"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1788"/>
         <source>Opening datafile from older version</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1783"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1789"/>
         <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly.
 Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1794"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1800"/>
         <source>Open dive log file</source>
         <translation>Åben log fil</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1795"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1801"/>
         <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1972"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1978"/>
         <source>Contacting cloud service...</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1252"/>
-        <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="../desktop-widgets/mainwindow.cpp" line="649"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="796"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="976"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="982"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/>
-        <source>Warning</source>
-        <translation>Advarsel</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="499"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="544"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1560"/>
-        <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="../desktop-widgets/mainwindow.cpp" line="338"/>
-        <source>Connect to</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
-        <source>Trying to replan a dive that&apos;s not a planned dive.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1029"/>
-        <source>Yearly statistics</source>
-        <translation>Årlig statistik</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1588"/>
-        <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
-        <translation>Subsurface XML filer (*.ssrf *.xml *.XML)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="976"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/>
-        <source>Please, first finish the current edition before trying to do another.</source>
-        <translation>Færdiggør denne rettelse inden du starter på en ny.</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_mainwindow.h" line="565"/>
-        <source>Open cloud storage</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../build/ui_mainwindow.h" line="566"/>
-        <source>Save to cloud storage</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>MultiFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="733"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="731"/>
         <source>Filter shows %1 (of %2) dives</source>
         <translation>Filtrer visning %1(af %2) dyk</translation>
     </message>
@@ -5386,39 +5468,39 @@ Subsurface has already tried to pre-populate the data but it might be worth whil
 <context>
     <name>OstcFirmwareCheck</name>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="269"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="271"/>
         <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source>
         <translation>Du bør opdatere firmwaren i din dykkercomputer: Du har version %1 hvor den nyeste er version %2</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="273"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="275"/>
         <source>
 
 Please start Bluetooth on your OSTC Sport and do the same preparations as for a logbook download before continuing with the update</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="274"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="276"/>
         <source>Not now</source>
         <translation>Ikke nu</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="275"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="277"/>
         <source>Update firmware</source>
         <translation>Opdater firmware</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="277"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="279"/>
         <source>Firmware upgrade notice</source>
         <translation>Firmware opdaterings note</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="295"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="297"/>
         <source>Save the downloaded firmware as</source>
         <translation>Gem den downloadede firmware som</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="296"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="298"/>
         <source>HEX files (*.hex)</source>
         <translation>HEX filer (*.hex)</translation>
     </message>
@@ -5426,79 +5508,89 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PlannerSettingsWidget</name>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="322"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="302"/>
         <source>Open circuit</source>
         <translation>Open circuit</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="322"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="302"/>
         <source>CCR</source>
         <translation>CCR</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="322"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="302"/>
         <source>pSCR</source>
         <translation>pSCR</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="421"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="388"/>
         <source>ft/min</source>
         <translation>f/min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="422"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="389"/>
         <source>Last stop at 20ft</source>
         <translation>Sidste stop på 20f</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="423"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="390"/>
         <source>50% avg. depth to 20ft</source>
         <translation>50% gnm. dybde til 20ft</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="424"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="391"/>
         <source>20ft to surface</source>
         <translation>20ft til overflade</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="426"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="392"/>
+        <source>ft</source>
+        <translation>ft</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="394"/>
         <source>m/min</source>
         <translation>m/min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="427"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="395"/>
         <source>Last stop at 6m</source>
         <translation>Sidste stop på 6 meter</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="428"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="396"/>
         <source>50% avg. depth to 6m</source>
         <translation>50% gnm. dybde til 6m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="429"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="397"/>
         <source>6m to surface</source>
         <translation>6m til overflade</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="432"/>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="433"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="398"/>
+        <source>m</source>
+        <translation>m</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="401"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="402"/>
         <source>cuft/min</source>
         <translation>cuft/min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="441"/>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="442"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="410"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="411"/>
         <source>ℓ/min</source>
         <translation>ℓ/min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="451"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="420"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="456"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="425"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
@@ -5648,6 +5740,11 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PreferencesDialog</name>
     <message>
+        <location filename="../build/ui_preferences.h" line="1283"/>
+        <source>Preferences</source>
+        <translation>Indstillinger</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1288"/>
         <source>Defaults</source>
         <translation>Standard</translation>
@@ -5683,6 +5780,11 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1303"/>
+        <source>Lists and tables</source>
+        <translation>Lister og tabeller</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1304"/>
         <source>Font</source>
         <translation>Font</translation>
@@ -5698,6 +5800,11 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>Dyk</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1307"/>
+        <source>Default dive log file</source>
+        <translation>Standard log fil</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1308"/>
         <source>No default file</source>
         <translation type="unfinished"/>
@@ -5728,6 +5835,21 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>...</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1314"/>
+        <source>Display invalid</source>
+        <translation>Ugyldigt display</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1316"/>
+        <source>Default cylinder</source>
+        <translation>Standard flaske</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1317"/>
+        <source>Use default cylinder</source>
+        <translation>Brug standard flaske</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1318"/>
         <source>Animations</source>
         <translation>Animationer</translation>
@@ -5758,40 +5880,24 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>System</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1401"/>
-        <source>Dive site geo lookup</source>
+        <location filename="../build/ui_preferences.h" line="1324"/>
+        <source>&amp;Metric</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1402"/>
-        <source>Enable geocoding for dive site management</source>
-        <translation type="unfinished"/>
+        <location filename="../build/ui_preferences.h" line="1325"/>
+        <source>Imperial</source>
+        <translation>Imperial</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1403"/>
-        <source>Parse site without GPS data</source>
+        <location filename="../build/ui_preferences.h" line="1326"/>
+        <source>Personali&amp;ze</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1404"/>
-        <source>Same format for existing dives</source>
-        <translation>Samme format som eksisterende dyk</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1405"/>
-        <source>Dive Site Layout</source>
-        <translation>Dykker lokation layout</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1406"/>
-        <location filename="../build/ui_preferences.h" line="1407"/>
-        <source>/</source>
-        <translation>/</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1325"/>
-        <source>Imperial</source>
-        <translation>Imperial</translation>
+        <location filename="../build/ui_preferences.h" line="1327"/>
+        <source>Individual settings</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../build/ui_preferences.h" line="1328"/>
@@ -5809,6 +5915,11 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>fod</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1331"/>
+        <source>Pressure</source>
+        <translation>Tryk</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1332"/>
         <location filename="../build/ui_preferences.h" line="1366"/>
         <source>bar</source>
@@ -5820,11 +5931,26 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>psi</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1334"/>
+        <source>Volume</source>
+        <translation>Volumen</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1335"/>
+        <source>&amp;liter</source>
+        <translation>&amp;liter</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1336"/>
         <source>cu ft</source>
         <translation>cu ft</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1337"/>
+        <source>Temperature</source>
+        <translation>Temperatur</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1338"/>
         <source>celsius</source>
         <translation>celsius</translation>
@@ -5835,11 +5961,121 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>fahrenheit</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1340"/>
+        <source>Weight</source>
+        <translation>Vægt</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1341"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1342"/>
+        <source>lbs</source>
+        <translation>lbs</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1343"/>
+        <source>Time units</source>
+        <translation>Tids enheder</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1344"/>
+        <source>Ascent/descent speed denominator</source>
+        <translation>Op/Nedstignings hastigheds nævner</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1345"/>
+        <source>Minutes</source>
+        <translation>Minutter</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1346"/>
+        <source>Seconds</source>
+        <translation>Sekunder</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1347"/>
+        <source>GPS coordinates</source>
+        <translation>GPS koordinater</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1348"/>
+        <source>Location Display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1349"/>
+        <source>traditional (dms)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1350"/>
+        <source>decimal</source>
+        <translation>decimal</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1351"/>
+        <source>Show</source>
+        <translation>Vis</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1352"/>
+        <source>Threshold when showing pO₂</source>
+        <translation>Tærskel ved visning af pO2</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1353"/>
+        <source>Threshold when showing pN₂</source>
+        <translation>Tærskel ved visning af pN2</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1354"/>
+        <source>Threshold when showing pHe</source>
+        <translation>Tærskel ved visning af pHe</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1355"/>
+        <source>Max pO₂ when showing MOD</source>
+        <translation>Maks pO₂ ved visning af  MOD</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1356"/>
+        <source>Draw dive computer reported ceiling red</source>
+        <translation>Tegn dykker computer rapporteret loft rødt</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1357"/>
+        <source>Show unused cylinders in Equipment tab</source>
+        <translation>Vis ubrugte flasker i Udstyrs fanebladet</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1358"/>
+        <source>Show average depth</source>
+        <translation>Vis gennemsnits dybde</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1359"/>
+        <source>Misc</source>
+        <translation>Blandet</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1360"/>
+        <source>GFLow</source>
+        <translation>GFlow</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1361"/>
+        <source>GFHigh</source>
+        <translation>GFHøj</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1362"/>
+        <source>GFLow at max depth</source>
+        <translation>GFLow på max dybde</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1363"/>
         <source>CCR: show setpoints when viewing pO₂</source>
         <translation type="unfinished"/>
@@ -5885,14 +6121,19 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>System standard</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1374"/>
+        <source>Filter</source>
+        <translation>Filter</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1375"/>
         <source>Proxy</source>
         <translation>Proxy</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1379"/>
-        <source>Proxy type</source>
-        <translation>Proxy type</translation>
+        <location filename="../build/ui_preferences.h" line="1376"/>
+        <source>Port</source>
+        <translation>Port</translation>
     </message>
     <message>
         <location filename="../build/ui_preferences.h" line="1377"/>
@@ -5900,16 +6141,16 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>Host</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1376"/>
-        <source>Port</source>
-        <translation>Port</translation>
-    </message>
-    <message>
         <location filename="../build/ui_preferences.h" line="1378"/>
         <source>Requires authentication</source>
         <translation>Kræver godkendelse</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1379"/>
+        <source>Proxy type</source>
+        <translation>Proxy type</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1380"/>
         <source>Username</source>
         <translation>Brugernavn</translation>
@@ -5921,46 +6162,6 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>Password</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1400"/>
-        <source>Disconnect from Facebook</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1374"/>
-        <source>Filter</source>
-        <translation>Filter</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1331"/>
-        <source>Pressure</source>
-        <translation>Tryk</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1303"/>
-        <source>Lists and tables</source>
-        <translation>Lister og tabeller</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1307"/>
-        <source>Default dive log file</source>
-        <translation>Standard log fil</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1314"/>
-        <source>Display invalid</source>
-        <translation>Ugyldigt display</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1316"/>
-        <source>Default cylinder</source>
-        <translation>Standard flaske</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1317"/>
-        <source>Use default cylinder</source>
-        <translation>Brug standard flaske</translation>
-    </message>
-    <message>
         <location filename="../build/ui_preferences.h" line="1382"/>
         <source>Subsurface cloud storage</source>
         <translation type="unfinished"/>
@@ -6001,149 +6202,40 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>Gem bruger ID lokalt</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1334"/>
-        <source>Volume</source>
-        <translation>Volumen</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1337"/>
-        <source>Temperature</source>
-        <translation>Temperatur</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1340"/>
-        <source>Weight</source>
-        <translation>Vægt</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1342"/>
-        <source>lbs</source>
-        <translation>lbs</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1343"/>
-        <source>Time units</source>
-        <translation>Tids enheder</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1345"/>
-        <source>Minutes</source>
-        <translation>Minutter</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1346"/>
-        <source>Seconds</source>
-        <translation>Sekunder</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1351"/>
-        <source>Show</source>
-        <translation>Vis</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1362"/>
-        <source>GFLow at max depth</source>
-        <translation>GFLow på max dybde</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1359"/>
-        <source>Misc</source>
-        <translation>Blandet</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1283"/>
-        <source>Preferences</source>
-        <translation>Indstillinger</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1324"/>
-        <source>&amp;Metric</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1326"/>
-        <source>Personali&amp;ze</source>
+        <location filename="../build/ui_preferences.h" line="1400"/>
+        <source>Disconnect from Facebook</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1327"/>
-        <source>Individual settings</source>
+        <location filename="../build/ui_preferences.h" line="1401"/>
+        <source>Dive site geo lookup</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1335"/>
-        <source>&amp;liter</source>
-        <translation>&amp;liter</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1344"/>
-        <source>Ascent/descent speed denominator</source>
-        <translation>Op/Nedstignings hastigheds nævner</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1347"/>
-        <source>GPS coordinates</source>
-        <translation>GPS koordinater</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1348"/>
-        <source>Location Display</source>
+        <location filename="../build/ui_preferences.h" line="1402"/>
+        <source>Enable geocoding for dive site management</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1349"/>
-        <source>traditional (dms)</source>
+        <location filename="../build/ui_preferences.h" line="1403"/>
+        <source>Parse site without GPS data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1350"/>
-        <source>decimal</source>
-        <translation>decimal</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1352"/>
-        <source>Threshold when showing pO₂</source>
-        <translation>Tærskel ved visning af pO2</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1353"/>
-        <source>Threshold when showing pN₂</source>
-        <translation>Tærskel ved visning af pN2</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1354"/>
-        <source>Threshold when showing pHe</source>
-        <translation>Tærskel ved visning af pHe</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1355"/>
-        <source>Max pO₂ when showing MOD</source>
-        <translation>Maks pO₂ ved visning af  MOD</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1356"/>
-        <source>Draw dive computer reported ceiling red</source>
-        <translation>Tegn dykker computer rapporteret loft rødt</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1357"/>
-        <source>Show unused cylinders in Equipment tab</source>
-        <translation>Vis ubrugte flasker i Udstyrs fanebladet</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1358"/>
-        <source>Show average depth</source>
-        <translation>Vis gennemsnits dybde</translation>
+        <location filename="../build/ui_preferences.h" line="1404"/>
+        <source>Same format for existing dives</source>
+        <translation>Samme format som eksisterende dyk</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1360"/>
-        <source>GFLow</source>
-        <translation>GFlow</translation>
+        <location filename="../build/ui_preferences.h" line="1405"/>
+        <source>Dive Site Layout</source>
+        <translation>Dykker lokation layout</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1361"/>
-        <source>GFHigh</source>
-        <translation>GFHøj</translation>
+        <location filename="../build/ui_preferences.h" line="1406"/>
+        <location filename="../build/ui_preferences.h" line="1407"/>
+        <source>/</source>
+        <translation>/</translation>
     </message>
 </context>
 <context>
@@ -6199,106 +6291,136 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="20"/>
-        <source>Show</source>
-        <translation>Vis</translation>
+        <source>Gas pressure display setup</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="29"/>
-        <source>Threshold when showing pO₂</source>
-        <translation>Tærskel ved visning af pO2</translation>
+        <source>Threshold for pO₂ (bar)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="49"/>
-        <source>Threshold when showing pN₂</source>
-        <translation>Tærskel ved visning af pN2</translation>
+        <source>Threshold for pN₂ (bar)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="69"/>
-        <source>Threshold when showing pHe</source>
-        <translation>Tærskel ved visning af pHe</translation>
+        <source>Threshold for pHe (bar)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="89"/>
-        <source>Max pO₂ when showing MOD</source>
-        <translation>Maks pO₂ ved visning af  MOD</translation>
+        <source>pO₂ in calculating MOD (bar)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="106"/>
+        <source>CCR options:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="113"/>
+        <source>Dive planner default setpoint (bar)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="133"/>
+        <source>Show setpoints when viewing pO₂</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="109"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="140"/>
+        <source>Show individual O₂ sensor values when viewing pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="150"/>
+        <source>Ceiling display setup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="159"/>
         <source>Draw dive computer reported ceiling red</source>
         <translation>Tegn dykker computer rapporteret loft rødt</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="116"/>
-        <source>Show unused cylinders in Equipment tab</source>
-        <translation>Vis ubrugte flasker i Udstyrs fanebladet</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="169"/>
+        <source>Algorithm for calculated ceiling:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="123"/>
-        <source>Show mean depth</source>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="176"/>
+        <source>VPM-B</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="133"/>
-        <source>Misc</source>
-        <translation>Blandet</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="183"/>
+        <source>VPM-B Conservatism</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="149"/>
-        <source>bar</source>
-        <translation>bar</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="193"/>
+        <source>+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="165"/>
-        <source>Default CCR set-point for dive planning</source>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="206"/>
+        <source>Bühlmann</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="172"/>
-        <source>pSCR O₂ metabolism rate</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="216"/>
+        <source>GFHigh</source>
+        <translation>GFHigh</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="179"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="236"/>
         <source>GFLow</source>
         <translation>GFlow</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="186"/>
-        <source>GFHigh</source>
-        <translation>GFHigh</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="256"/>
+        <source>GFLow at max depth</source>
+        <translation>GFLow på max dybde</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="203"/>
-        <source>ℓ/min</source>
-        <translation>ℓ/min</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="263"/>
+        <source>pSCR options:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="213"/>
-        <source>pSCR ratio</source>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="270"/>
+        <source>Metabolic rate (ℓ O₂/min)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="223"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="287"/>
+        <source>Dilution ratio</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="300"/>
         <source>1:</source>
         <translation>1:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="230"/>
-        <source>CCR: show individual O₂ sensor values when viewing pO₂</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="310"/>
+        <source>Misc</source>
+        <translation>Blandet</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="237"/>
-        <source>CCR: show setpoints when viewing pO₂</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="316"/>
+        <source>Show unused cylinders in Equipment tab</source>
+        <translation>Vis ubrugte flasker i Udstyrs fanebladet</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="244"/>
-        <source>GFLow at max depth</source>
-        <translation>GFLow på max dybde</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="323"/>
+        <source>Show mean depth in Profile</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="10"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="9"/>
         <source>Graph</source>
         <translation>Graf</translation>
     </message>
@@ -6367,15 +6489,29 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>Sprog</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="57"/>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="53"/>
         <source>Restart required</source>
         <translation>Genstart nødvendigt</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="58"/>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="54"/>
         <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="../desktop-widgets/preferences/preferences_language.cpp" line="76"/>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="82"/>
+        <source>Literal characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="77"/>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="83"/>
+        <source>Non-special character(s) in time format.
+These will be used as is. This might not be what you intended.
+See http://doc.qt.io/qt-5/qdatetime.html#toString</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PreferencesNetwork</name>
@@ -6422,7 +6558,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_network.ui" line="156"/>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="148"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="134"/>
         <source>Subsurface cloud storage</source>
         <translation type="unfinished"/>
     </message>
@@ -6467,39 +6603,39 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>Gem bruger ID lokalt?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="11"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="10"/>
         <source>Network</source>
         <translation>Netværk</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="15"/>
         <source>No proxy</source>
         <translation>Ingen proxy</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/>
         <source>System proxy</source>
         <translation>System proxy</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/>
         <source>HTTP proxy</source>
         <translation>HTTP proxy</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="19"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/>
         <source>SOCKS proxy</source>
         <translation>SOCKS proxy</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="75"/>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="97"/>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="110"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="72"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="93"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="106"/>
         <source>Cloud storage email and password can only consist of letters, numbers, and &apos;.&apos;, &apos;-&apos;, &apos;_&apos;, and &apos;+&apos;.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="146"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="132"/>
         <source>Subsurface cloud storage (credentials verified)</source>
         <translation type="unfinished"/>
     </message>
@@ -6657,7 +6793,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>decimal</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="8"/>
+        <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="7"/>
         <source>Units</source>
         <translation>Enheder</translation>
     </message>
@@ -6665,17 +6801,17 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PrintDialog</name>
     <message>
-        <location filename="../desktop-widgets/printdialog.cpp" line="118"/>
-        <source>&amp;Preview</source>
-        <translation>&amp;Vis Udskrift</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/printdialog.cpp" line="115"/>
+        <location filename="../desktop-widgets/printdialog.cpp" line="102"/>
         <source>P&amp;rint</source>
         <translation>U&amp;dskriv</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/printdialog.cpp" line="130"/>
+        <location filename="../desktop-widgets/printdialog.cpp" line="105"/>
+        <source>&amp;Preview</source>
+        <translation>&amp;Vis Udskrift</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/printdialog.cpp" line="117"/>
         <source>Print</source>
         <translation>Udskriv:</translation>
     </message>
@@ -6683,19 +6819,10 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PrintOptions</name>
     <message>
-        <location filename="../build/ui_printoptions.h" line="150"/>
-        <source>&amp;Table print</source>
-        <translation>&amp;Table print</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_printoptions.h" line="158"/>
-        <source>One dive per page</source>
-        <translation>Et dyk pr. side</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_printoptions.h" line="159"/>
-        <source>Two dives per page</source>
-        <translation>To dyk pr. side</translation>
+        <location filename="../desktop-widgets/printoptions.ui" line="29"/>
+        <location filename="../build/ui_printoptions.h" line="148"/>
+        <source>Print type</source>
+        <translation>Print type</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/printoptions.ui" line="41"/>
@@ -6755,10 +6882,19 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>Import</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/printoptions.ui" line="29"/>
-        <location filename="../build/ui_printoptions.h" line="148"/>
-        <source>Print type</source>
-        <translation>Print type</translation>
+        <location filename="../build/ui_printoptions.h" line="150"/>
+        <source>&amp;Table print</source>
+        <translation>&amp;Table print</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_printoptions.h" line="158"/>
+        <source>One dive per page</source>
+        <translation>Et dyk pr. side</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_printoptions.h" line="159"/>
+        <source>Two dives per page</source>
+        <translation>To dyk pr. side</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/printoptions.cpp" line="128"/>
@@ -6800,103 +6936,103 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>Ukendt dykker computer</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="755"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="752"/>
         <source>Show NDL / TTS was disabled because of excessive processing time</source>
         <translation>Vis NDL / TTS blev slået fra, da det tog for lang tid at danne den.</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1344"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1338"/>
         <source>Make first divecomputer</source>
         <translation>Vælg som 1. dykkercomputer</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1346"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1340"/>
         <source>Delete this divecomputer</source>
         <translation>Slet denne dykkercomputer</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1360"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1354"/>
         <source>Add gas change</source>
         <translation>Tilføj gas skift</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1363"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1357"/>
         <source> (Tank %1)</source>
         <translation>(Flaske %1)</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1371"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1365"/>
         <source>Add set-point change</source>
         <translation>Tilføj set-point skift</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1373"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1367"/>
         <source>Add bookmark</source>
         <translation>Tilføj bookmark</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1377"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1371"/>
         <source>Edit the profile</source>
         <translation>Rediger profilen</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1381"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1375"/>
         <source>Remove event</source>
         <translation>Slet hændelse</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1386"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1380"/>
         <source>Hide similar events</source>
         <translation>Skjul tilsvarende hændelser</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1393"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1387"/>
         <source>Edit name</source>
         <translation>Rediger navn</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1422"/>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1429"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1416"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1423"/>
         <source>Adjust pressure of tank %1 (currently interpolated as %2)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1444"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1438"/>
         <source>Unhide all events</source>
         <translation>Vis alle hændelser</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1479"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1473"/>
         <source>Hide events</source>
         <translation>Skjul hændelser</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1479"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1473"/>
         <source>Hide all %1 events?</source>
         <translation>Skjul alle %1 hændelser?</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1514"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1508"/>
         <source>Remove the selected event?</source>
         <translation>Fjern de valgte hændelser?</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1515"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1509"/>
         <source>%1 @ %2:%3</source>
         <translation>%1 @ %2:%3</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1638"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1632"/>
         <source>Edit name of bookmark</source>
         <translation>Rediger bogmærke navn</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1639"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1633"/>
         <source>Custom name:</source>
         <translation>Brugerdefineret navn:</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1644"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1638"/>
         <source>Name is too long!</source>
         <translation>Navn er for langt!</translation>
     </message>
@@ -6904,91 +7040,101 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>QMLManager</name>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="95"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="97"/>
         <source>Starting...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="202"/>
         <source>working in no-cloud mode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="213"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="216"/>
         <source>no cloud credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="214"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="270"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="217"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="269"/>
         <source>Please enter valid cloud credentials.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="285"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="284"/>
         <source>Attempting to open cloud storage with new credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="304"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="306"/>
         <source>Testing cloud credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="331"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="320"/>
+        <source>No response from cloud server to validate the credentials</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="329"/>
+        <source>Cannot connect to cloud storage - cloud account not verified</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="361"/>
         <source>Cloud credentials are invalid</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="344"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="374"/>
         <source>Cannot open cloud storage: Error creating https connection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="357"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="387"/>
         <source>Cannot open cloud storage: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="369"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="399"/>
         <source>Cannot connect to cloud storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="411"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="441"/>
         <source>Cloud storage error: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="501"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="531"/>
         <source>Failed to connect to cloud server, reverting to no cloud status</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="520"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="550"/>
         <source>Cloud storage open successfully. No dives in dive list.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="689"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="690"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="721"/>
         <source>h</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="689"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="690"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="691"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="721"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="722"/>
         <source>min</source>
         <translation>min.</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="689"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/>
         <source>sec</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="1041"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="1102"/>
         <source>Unknown GPS location</source>
         <translation type="unfinished"/>
     </message>
@@ -6996,126 +7142,126 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../core/qthelper.cpp" line="866"/>
-        <location filename="../core/qthelper.cpp" line="1214"/>
-        <source>AIR</source>
-        <translation>LUFT</translation>
+        <location filename="../core/gpslocation.h" line="13"/>
+        <source>Waiting to aquire GPS location</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="1214"/>
-        <source>OXYGEN</source>
-        <translation>ILT</translation>
+        <location filename="../core/qthelper.cpp" line="766"/>
+        <location filename="../core/qthelper.cpp" line="1275"/>
+        <source>m</source>
+        <translation>m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="59"/>
-        <source>Remove this point</source>
-        <translation>Fjern dette punkt</translation>
+        <location filename="../core/qthelper.cpp" line="768"/>
+        <location filename="../core/qthelper.cpp" line="1274"/>
+        <source>ft</source>
+        <translation>ft</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="32"/>
-        <source>Average</source>
-        <translation>Gennemsnit</translation>
+        <location filename="../core/qthelper.cpp" line="794"/>
+        <source>C</source>
+        <translation>C</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="35"/>
-        <source>Minimum</source>
-        <translation>Minimum</translation>
+        <location filename="../core/qthelper.cpp" line="796"/>
+        <source>F</source>
+        <translation>F</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="38"/>
-        <source>Maximum</source>
-        <translation>Maksimal</translation>
+        <location filename="../core/qthelper.cpp" line="821"/>
+        <location filename="../core/qthelper.cpp" line="1250"/>
+        <source>kg</source>
+        <translation>kg</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/globe.cpp" line="327"/>
-        <source>Move the map and double-click to set the dive location</source>
-        <translation>Naviger på kortet og dobbelt klik for at sætte lokationen</translation>
+        <location filename="../core/qthelper.cpp" line="823"/>
+        <location filename="../core/qthelper.cpp" line="1251"/>
+        <source>lbs</source>
+        <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="28"/>
-        <source>unknown</source>
-        <translation>Ukendt</translation>
+        <location filename="../core/qthelper.cpp" line="848"/>
+        <location filename="../core/qthelper.cpp" line="1300"/>
+        <source>bar</source>
+        <translation>bar</translation>
     </message>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="105"/>
-        <source>h:</source>
-        <translation>h:</translation>
+        <location filename="../core/qthelper.cpp" line="850"/>
+        <location filename="../core/qthelper.cpp" line="1299"/>
+        <source>psi</source>
+        <translation>psi</translation>
     </message>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="105"/>
-        <source>min</source>
-        <translation>min.</translation>
+        <location filename="../core/qthelper.cpp" line="871"/>
+        <location filename="../core/qthelper.cpp" line="1235"/>
+        <source>AIR</source>
+        <translation>LUFT</translation>
     </message>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="337"/>
-        <source>Multiple</source>
+        <location filename="../core/qthelper.cpp" line="873"/>
+        <source>EAN</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="../core/qthelper.cpp" line="957"/>
+        <location filename="../core/qthelper.cpp" line="962"/>
         <source>(%n dive(s))</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="816"/>
-        <location filename="../core/qthelper.cpp" line="1228"/>
-        <source>kg</source>
-        <translation>kg</translation>
+        <location filename="../core/qthelper.cpp" line="1235"/>
+        <source>OXYGEN</source>
+        <translation>ILT</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="818"/>
-        <location filename="../core/qthelper.cpp" line="1229"/>
-        <source>lbs</source>
-        <translation>lbs</translation>
+        <location filename="../core/qthelper.cpp" line="1322"/>
+        <source>l</source>
+        <translation>l</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="763"/>
-        <location filename="../core/qthelper.cpp" line="1252"/>
-        <source>ft</source>
-        <translation>ft</translation>
+        <location filename="../core/qthelper.cpp" line="1323"/>
+        <source>cuft</source>
+        <translation>cuft</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="761"/>
-        <location filename="../core/qthelper.cpp" line="1253"/>
-        <source>m</source>
-        <translation>m</translation>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="29"/>
+        <source>unknown</source>
+        <translation>Ukendt</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="789"/>
-        <source>C</source>
-        <translation>C</translation>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="114"/>
+        <source>h:</source>
+        <translation>h:</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="791"/>
-        <source>F</source>
-        <translation>F</translation>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="114"/>
+        <source>min</source>
+        <translation>min.</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="845"/>
-        <location filename="../core/qthelper.cpp" line="1275"/>
-        <source>psi</source>
-        <translation>psi</translation>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="63"/>
+        <source>Remove this point</source>
+        <translation>Fjern dette punkt</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="843"/>
-        <location filename="../core/qthelper.cpp" line="1276"/>
-        <source>bar</source>
-        <translation>bar</translation>
+        <location filename="../desktop-widgets/globe.cpp" line="327"/>
+        <source>Move the map and double-click to set the dive location</source>
+        <translation>Naviger på kortet og dobbelt klik for at sætte lokationen</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="868"/>
-        <source>EAN</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="32"/>
+        <source>Average</source>
+        <translation>Gennemsnit</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="1298"/>
-        <source>l</source>
-        <translation>l</translation>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="35"/>
+        <source>Minimum</source>
+        <translation>Minimum</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="1299"/>
-        <source>cuft</source>
-        <translation>cuft</translation>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="38"/>
+        <source>Maximum</source>
+        <translation>Maksimal</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="625"/>
@@ -7137,17 +7283,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <source>Malformed XML response. Line %1: %2</source>
         <translation>Ugyldig XML svar. Linje %1: %2</translation>
     </message>
-    <message>
-        <location filename="../core/gpslocation.h" line="13"/>
-        <source>Waiting to aquire GPS location</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>ReadSettingsThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1651"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1676"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1640"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1665"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Denne facilitet er endnu ikke tilgængelig for den valgte computer</translation>
     </message>
@@ -7176,7 +7317,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ResetSettingsThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1775"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1764"/>
         <source>Reset settings failed!</source>
         <translation type="unfinished"/>
     </message>
@@ -7214,6 +7355,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ShiftImageTimesDialog</name>
     <message>
+        <location filename="../desktop-widgets/shiftimagetimes.ui" line="23"/>
+        <location filename="../build/ui_shiftimagetimes.h" line="184"/>
+        <source>Shift selected image times</source>
+        <translation>Skift valgte billede tider</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/shiftimagetimes.ui" line="34"/>
         <location filename="../build/ui_shiftimagetimes.h" line="185"/>
         <source>Shift times of image(s) by</source>
@@ -7226,12 +7373,6 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>h:mm</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/shiftimagetimes.ui" line="23"/>
-        <location filename="../build/ui_shiftimagetimes.h" line="184"/>
-        <source>Shift selected image times</source>
-        <translation>Skift valgte billede tider</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/shiftimagetimes.ui" line="105"/>
         <location filename="../build/ui_shiftimagetimes.h" line="187"/>
         <source>Earlier</source>
@@ -7281,12 +7422,12 @@ Not all images have timestamps in the range between
         <translation>Hvilke dato/tid er vist på billedet?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="297"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="296"/>
         <source>Open image file</source>
         <translation>Åben billede til</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="299"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="298"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>Billede filer (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -7444,53 +7585,53 @@ Not all images have timestamps in the range between
 <context>
     <name>SocialNetworkDialog</name>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="339"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="284"/>
         <source>Dive date: %1 
 </source>
         <translation>Dykker dato: %1
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="342"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="287"/>
         <source>Duration: %1 
 </source>
         <translation>Varighed: %1 
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="343"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="288"/>
         <source>h:</source>
         <comment>abbreviation for hours plus separator</comment>
         <translation>h:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="344"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="289"/>
         <source>min</source>
         <comment>abbreviation for minutes</comment>
         <translation>min.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="347"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="292"/>
         <source>Dive location: %1 
 </source>
         <translation>Dykker lokation: %1
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="350"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="295"/>
         <source>Buddy: %1 
 </source>
         <translation>Makker: %1 
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="353"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="298"/>
         <source>Divemaster: %1 
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="356"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="301"/>
         <source>
 %1</source>
         <translation>
@@ -7576,9 +7717,20 @@ Not all images have timestamps in the range between
     <name>StartPage</name>
     <message>
         <location filename="../mobile-widgets/qml/StartPage.qml" line="19"/>
-        <source>To use Subsurface-mobile with Subsurface cloud storage, please enteryour cloud credentials.
+        <source>To use Subsurface-mobile with Subsurface cloud storage, please enter your cloud credentials.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/StartPage.qml" line="20"/>
+        <source>If this is the first time you use Subsurface cloud storage, enter a valid email (all lower case) and a password of your choice (letters and numbers). The server will send a PIN to the email address provided that you will have to enter here.
 
-To use Subsurface-mobile only with local data on this device, tap on the no cloud icon below.</source>
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/StartPage.qml" line="23"/>
+        <source>To use Subsurface-mobile only with local data on this device, tap on the no cloud icon below.</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -7617,7 +7769,12 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>SubsurfaceWebServices</name>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="419"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="395"/>
+        <source>Enter User ID and click Download</source>
+        <translation>Indtast bruger ID og klik Download</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="417"/>
         <source>Webservice</source>
         <translation>Webservice</translation>
     </message>
@@ -7642,30 +7799,25 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
         <translation>Forbindelse fejl:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="557"/>
-        <source>Download successful</source>
-        <translation>Download succes</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="551"/>
         <source>Invalid user identifier!</source>
         <translation>Ugyldig bruger id</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="397"/>
-        <source>Enter User ID and click Download</source>
-        <translation>Indtast bruger ID og klik Download</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="554"/>
         <source>Cannot parse response!</source>
         <translation>Kan ikke fortolke svar!</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="557"/>
+        <source>Download successful</source>
+        <translation>Download succes</translation>
+    </message>
 </context>
 <context>
     <name>SuitFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="674"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="672"/>
         <source>Suits: </source>
         <translation>Dragte:</translation>
     </message>
@@ -7673,7 +7825,7 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>SuitsFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="123"/>
+        <location filename="../qt-models/filtermodels.cpp" line="128"/>
         <source>No suit set</source>
         <translation type="unfinished"/>
     </message>
@@ -7692,7 +7844,7 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>TagFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="595"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="593"/>
         <source>Tags: </source>
         <translation>Tags:</translation>
     </message>
@@ -7700,7 +7852,7 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>TagFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="148"/>
+        <location filename="../qt-models/filtermodels.cpp" line="153"/>
         <source>Empty tags</source>
         <translation type="unfinished"/>
     </message>
@@ -7726,6 +7878,11 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>TemplateEdit</name>
     <message>
+        <location filename="../desktop-widgets/templateedit.ui" line="14"/>
+        <source>Edit template</source>
+        <translation>Rediger skabelon</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/templateedit.ui" line="37"/>
         <source>Preview</source>
         <translation type="unfinished"/>
@@ -7771,11 +7928,6 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
         <translation>Font størrelse</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/templateedit.ui" line="14"/>
-        <source>Edit template</source>
-        <translation>Rediger skabelon</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/templateedit.ui" line="165"/>
         <source>Color palette</source>
         <translation type="unfinished"/>
@@ -7957,85 +8109,12 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>TextHyperlinkEventFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="817"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="815"/>
         <source>%1click to visit %2</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>ThemeTest</name>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="29"/>
-        <source>Theme Information</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="33"/>
-        <source>Screen</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="42"/>
-        <source>Geometry (pixels):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="49"/>
-        <source>Geometry (gridUnits):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="56"/>
-        <source>Units.gridUnit:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="63"/>
-        <source>Units.devicePixelRatio:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="70"/>
-        <source>Font Metrics</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="76"/>
-        <source>FontMetrics pointSize:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="83"/>
-        <source>FontMetrics pixelSize:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="90"/>
-        <source>FontMetrics devicePixelRatio:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="97"/>
-        <source>Text item pixelSize:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="104"/>
-        <source>Text item pointSize:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="111"/>
-        <source>Pixel density:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="118"/>
-        <source>Height of default font:</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
     <name>ToolTipItem</name>
     <message>
         <location filename="../profile-widget/divetooltipitem.cpp" line="136"/>
@@ -8046,102 +8125,107 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>TripItem</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="67"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="68"/>
         <source>(%1 shown)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="194"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="197"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="215"/>
         <source>Date</source>
         <translation>Dato</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="200"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="218"/>
         <source>Rating</source>
         <translation>Bedømmelse</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
         <source>Depth(%1)</source>
         <translation>Dybde(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="206"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="224"/>
         <source>Duration</source>
         <translation>Varighed</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="209"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="227"/>
         <source>Temp(%1%2)</source>
         <translation>Temp(%1%2)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
         <source>Weight(%1)</source>
         <translation>Vægt(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="215"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="233"/>
         <source>Suit</source>
         <translation>Dragt</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="218"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="236"/>
         <source>Cyl</source>
         <translation>Cyl</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="239"/>
         <source>Gas</source>
         <translation>Gas</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="244"/>
         <source>SAC(%1)</source>
         <translation>SAC(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="244"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="229"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="247"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="232"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="250"/>
         <source>Max CNS</source>
         <translation>Maks CNS</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="235"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="253"/>
+        <source>Photos before/during/after dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="256"/>
         <source>Location</source>
         <translation>Placering</translation>
     </message>
@@ -8164,72 +8248,73 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>UpdateManager</name>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="69"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="61"/>
         <source>Check for updates.</source>
         <translation>Tjek for opdateringer</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="70"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="62"/>
         <source>Subsurface was unable to check for updates.</source>
         <translation>Subsurface kunne ikke tjekke for opdateringer</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="75"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="67"/>
         <source>The following error occurred:</source>
         <translation>Følgende fejl opstod:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="76"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="68"/>
         <source>Please check your internet connection.</source>
         <translation>Tjek din internet forbindelse.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="86"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="78"/>
         <source>You are using the latest version of Subsurface.</source>
         <translation>Du anvender den nyeste version af Subsurface.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="89"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="81"/>
         <source>A new version of Subsurface is available.&lt;br/&gt;Click on:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; to download it.</source>
         <translation>En ny version af Subsurface er tilgængelig.&lt;br/&gt;Klik på:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; for at downloade den.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="95"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="87"/>
         <source>A new version of Subsurface is available.</source>
         <translation>En ny version af Subsurface er tilgængelig.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="96"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="88"/>
         <source>Latest version is %1, please check %2 our download page %3 for information in how to update.</source>
         <translation>Seneste version er %1, tjek venligt %2 vores download side %3 for information om hvordan der opdateres.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="106"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="98"/>
         <source>Newest release version is </source>
         <translation>Nyeste udgave er</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="107"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="99"/>
         <source>The server returned the following information:</source>
         <translation>Serveren returnerede følgende information:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="125"/>
-        <source>Subsurface is checking every two weeks if a new version is available. If you don&apos;t want Subsurface to continue checking, please click Decline.</source>
-        <translation>Subsurface tjekker for nye versioner hver 14. dag. Hvis du ikke ønsker dette, klik vedligst Nej tak.</translation>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="117"/>
+        <source>Subsurface is checking every two weeks if a new version is available. 
+ If you don&apos;t want Subsurface to continue checking, please click Decline.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="126"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="119"/>
         <source>Decline</source>
         <translation>Nej Tak</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="127"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="120"/>
         <source>Accept</source>
         <translation>Accept</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="129"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="122"/>
         <source>Automatic check for updates</source>
         <translation>Kontroller automatisk efter opdateringer</translation>
     </message>
@@ -8251,24 +8336,6 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>UserSurvey</name>
     <message>
-        <location filename="../desktop-widgets/usersurvey.ui" line="44"/>
-        <location filename="../build/ui_usersurvey.h" line="151"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;We would love to learn more about our users, their preferences and their usage habits. Please spare a minute to fill out this form and submit it to the Subsurface team.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/usersurvey.ui" line="115"/>
-        <location filename="../build/ui_usersurvey.h" line="156"/>
-        <source>Other software/sources</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/usersurvey.ui" line="128"/>
-        <location filename="../build/ui_usersurvey.h" line="157"/>
-        <source>Manually entering dives</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="14"/>
         <location filename="../build/ui_usersurvey.h" line="149"/>
         <source>User survey</source>
@@ -8281,6 +8348,12 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
         <translation>Subsurface bruger undersøgelse</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/usersurvey.ui" line="44"/>
+        <location filename="../build/ui_usersurvey.h" line="151"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;We would love to learn more about our users, their preferences and their usage habits. Please spare a minute to fill out this form and submit it to the Subsurface team.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="63"/>
         <location filename="../build/ui_usersurvey.h" line="152"/>
         <source>Technical diver</source>
@@ -8305,6 +8378,18 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/usersurvey.ui" line="115"/>
+        <location filename="../build/ui_usersurvey.h" line="156"/>
+        <source>Other software/sources</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/usersurvey.ui" line="128"/>
+        <location filename="../build/ui_usersurvey.h" line="157"/>
+        <source>Manually entering dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="141"/>
         <location filename="../build/ui_usersurvey.h" line="158"/>
         <source>Android/iPhone companion app</source>
@@ -8335,6 +8420,11 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/usersurvey.cpp" line="18"/>
+        <source>Send</source>
+        <translation>Send</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/usersurvey.cpp" line="43"/>
         <source>
 Operating system: %1</source>
@@ -8375,19 +8465,14 @@ Sprog: %1</translation>
         <translation>Spørg senere</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/usersurvey.cpp" line="101"/>
-        <source>Submit user survey.</source>
-        <translation>Gem undersøgelse</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/usersurvey.cpp" line="82"/>
         <source>Ask again?</source>
         <translation>Spørg igen?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/usersurvey.cpp" line="18"/>
-        <source>Send</source>
-        <translation>Send</translation>
+        <location filename="../desktop-widgets/usersurvey.cpp" line="101"/>
+        <source>Submit user survey.</source>
+        <translation>Gem undersøgelse</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/usersurvey.cpp" line="102"/>
@@ -8479,12 +8564,12 @@ Sprog: %1</translation>
         <translation>Upload</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="324"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="325"/>
         <source>Operation timed out</source>
         <translation>Tiden er udløbet</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="345"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="346"/>
         <source>Transferring data...</source>
         <translation>Overfører data...</translation>
     </message>
@@ -8519,18 +8604,18 @@ Sprog: %1</translation>
 <context>
     <name>WriteSettingsThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1702"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1709"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1718"/>
-        <source>Failed!</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1700"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1721"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1689"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1710"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Denne facilitet er endnu ikke tilgængelig for den valgte computer</translation>
     </message>
+    <message>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1691"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1698"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1707"/>
+        <source>Failed!</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>YearlyStatisticsModel</name>
@@ -8655,7 +8740,7 @@ Gennemsnit</translation>
 <context>
     <name>getextFromC</name>
     <message>
-        <location filename="../core/libdivecomputer.c" line="674"/>
+        <location filename="../core/libdivecomputer.c" line="737"/>
         <source>Error parsing the header</source>
         <translation type="unfinished"/>
     </message>
@@ -8663,38 +8748,377 @@ Gennemsnit</translation>
 <context>
     <name>gettextFromC</name>
     <message>
+        <location filename="../core/cochran.c" line="309"/>
+        <location filename="../core/cochran.c" line="315"/>
+        <location filename="../core/cochran.c" line="385"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>deco stop</source>
+        <translation>deco stop</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="336"/>
+        <location filename="../core/cochran.c" line="390"/>
+        <location filename="../core/file.c" line="777"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>ascent</source>
+        <translation>opstigning</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="342"/>
+        <location filename="../core/file.c" line="755"/>
+        <source>battery</source>
+        <translation>batteri</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="348"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
+        <source>OLF</source>
+        <translation>OLF</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="353"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
+        <source>maxdepth</source>
+        <translation>Maks. dybde</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="358"/>
+        <location filename="../core/cochran.c" line="404"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
+        <source>pO₂</source>
+        <translation>pO₂</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="365"/>
+        <location filename="../core/cochran.c" line="414"/>
+        <location filename="../core/cochran.c" line="421"/>
+        <location filename="../core/file.c" line="868"/>
+        <location filename="../core/libdivecomputer.c" line="225"/>
+        <location filename="../core/libdivecomputer.c" line="228"/>
+        <source>gaschange</source>
+        <translation>gasskifte</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="370"/>
+        <location filename="../core/cochran.c" line="409"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>rbt</source>
+        <translation>rbt</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="379"/>
+        <location filename="../core/cochran.c" line="426"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>ceiling</source>
+        <translation>Loft</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="395"/>
+        <location filename="../core/libdivecomputer.c" line="224"/>
+        <source>transmitter</source>
+        <translation>Sender</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="153"/>
+        <source>Error: the file does not appear to be a DATATRAK divelog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="286"/>
+        <source>clear</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="289"/>
+        <source>misty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="292"/>
+        <source>fog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="295"/>
+        <source>rain</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="298"/>
+        <source>storm</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="301"/>
+        <source>snow</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="321"/>
+        <source>No suit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="324"/>
+        <source>Shorty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="327"/>
+        <source>Combi</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="330"/>
+        <source>Wet suit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="333"/>
+        <source>Semidry suit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="336"/>
+        <source>Dry suit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="396"/>
+        <source>no stop</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="398"/>
+        <location filename="../core/dive.c" line="29"/>
+        <source>deco</source>
+        <translation>deco</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="400"/>
+        <source>single ascent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="402"/>
+        <source>multiple ascent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="404"/>
+        <location filename="../core/dive.c" line="27"/>
+        <source>fresh</source>
+        <translation>Fersk</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="406"/>
+        <source>salt water</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="431"/>
+        <source>sight seeing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="433"/>
+        <source>club dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="435"/>
+        <location filename="../core/dive.c" line="28"/>
+        <source>instructor</source>
+        <translation>Instruktør</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="437"/>
+        <source>instruction</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="439"/>
+        <location filename="../core/dive.c" line="27"/>
+        <source>night</source>
+        <translation>nat</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="441"/>
+        <location filename="../core/dive.c" line="25"/>
+        <source>cave</source>
+        <translation>grotte</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="443"/>
+        <location filename="../core/dive.c" line="24"/>
+        <source>ice</source>
+        <translation>is</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="445"/>
+        <source>search</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="455"/>
+        <location filename="../core/dive.c" line="25"/>
+        <source>wreck</source>
+        <translation>vrag</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="457"/>
+        <location filename="../core/dive.c" line="26"/>
+        <source>river</source>
+        <translation>flod</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="459"/>
+        <location filename="../core/dive.c" line="23"/>
+        <source>drift</source>
+        <translation>Strøm</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="461"/>
+        <location filename="../core/dive.c" line="28"/>
+        <source>photo</source>
+        <translation>foto</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="463"/>
+        <source>other</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="474"/>
+        <source>Other activities</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="498"/>
+        <source>Datatrak/Wlog notes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="537"/>
+        <source>Manually entered dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="588"/>
+        <source>Unknown</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="674"/>
+        <source>Error: couldn&apos;t open the file %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="687"/>
+        <source>Error: no dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="23"/>
+        <source>boat</source>
+        <translation>Båd</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="23"/>
+        <source>shore</source>
+        <translation>Kyst</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="24"/>
+        <source>deep</source>
+        <translation>dybde</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="24"/>
+        <source>cavern</source>
+        <translation>hule</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="25"/>
+        <source>altitude</source>
+        <translation>Højde</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="26"/>
+        <source>pool</source>
+        <translation>svømmehal</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="26"/>
+        <source>lake</source>
+        <translation>sø</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="27"/>
+        <source>student</source>
+        <translation>Elev</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="28"/>
+        <source>video</source>
+        <translation>video</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="33"/>
+        <source>OC-gas</source>
+        <translation>OC-gas</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="33"/>
+        <source>diluent</source>
+        <translation>diluent</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="33"/>
+        <location filename="../core/equipment.c" line="88"/>
+        <location filename="../core/planner.c" line="1436"/>
+        <location filename="../core/planner.c" line="1439"/>
+        <source>oxygen</source>
+        <translation>ilt</translation>
+    </message>
+    <message>
         <location filename="../core/dive.c" line="181"/>
         <source>pascal</source>
         <translation>pascal</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="186"/>
-        <location filename="../core/qthelper.cpp" line="669"/>
+        <location filename="../core/qthelper.cpp" line="674"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="190"/>
-        <location filename="../core/qthelper.cpp" line="672"/>
+        <location filename="../core/qthelper.cpp" line="677"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
+        <location filename="../core/dive.c" line="227"/>
+        <source>ℓ</source>
+        <translation>ℓ</translation>
+    </message>
+    <message>
         <location filename="../core/dive.c" line="232"/>
         <source>cuft</source>
         <translation>cuft</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="269"/>
-        <location filename="../core/qthelper.cpp" line="590"/>
-        <location filename="../core/qthelper.cpp" line="605"/>
+        <location filename="../core/qthelper.cpp" line="595"/>
+        <location filename="../core/qthelper.cpp" line="610"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="274"/>
-        <location filename="../core/qthelper.cpp" line="593"/>
-        <location filename="../core/qthelper.cpp" line="607"/>
+        <location filename="../core/qthelper.cpp" line="598"/>
+        <location filename="../core/qthelper.cpp" line="612"/>
         <source>ft</source>
         <translation>fod</translation>
     </message>
@@ -8720,53 +9144,58 @@ Gennemsnit</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="325"/>
-        <location filename="../core/qthelper.cpp" line="616"/>
-        <location filename="../core/qthelper.cpp" line="626"/>
+        <location filename="../core/qthelper.cpp" line="621"/>
+        <location filename="../core/qthelper.cpp" line="631"/>
         <source>lbs</source>
         <translation>pund (lbs)</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="329"/>
-        <location filename="../core/qthelper.cpp" line="614"/>
-        <location filename="../core/qthelper.cpp" line="624"/>
+        <location filename="../core/qthelper.cpp" line="619"/>
+        <location filename="../core/qthelper.cpp" line="629"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="1772"/>
+        <location filename="../core/dive.c" line="1751"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) eller (%s)</translation>
     </message>
     <message>
-        <location filename="../core/divelist.c" line="484"/>
+        <location filename="../core/divelist.c" line="487"/>
         <location filename="../core/equipment.c" line="84"/>
-        <location filename="../core/planner.c" line="1411"/>
-        <location filename="../core/planner.c" line="1414"/>
+        <location filename="../core/planner.c" line="1432"/>
+        <location filename="../core/planner.c" line="1435"/>
         <source>air</source>
         <translation>luft</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="197"/>
+        <location filename="../core/equipment.c" line="86"/>
+        <source>EAN%d</source>
+        <translation>EAN%d</translation>
+    </message>
+    <message>
+        <location filename="../core/equipment.c" line="198"/>
         <source>integrated</source>
         <translation>integreret</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="198"/>
+        <location filename="../core/equipment.c" line="199"/>
         <source>belt</source>
         <translation>bælte</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="199"/>
+        <location filename="../core/equipment.c" line="200"/>
         <source>ankle</source>
         <translation>ankel</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="200"/>
+        <location filename="../core/equipment.c" line="201"/>
         <source>backplate weight</source>
         <translation>bagpladevægt</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="201"/>
+        <location filename="../core/equipment.c" line="202"/>
         <source>clip-on</source>
         <translation>Clip-On</translation>
     </message>
@@ -8779,8 +9208,8 @@ Gennemsnit</translation>
         <location filename="../core/file.c" line="121"/>
         <location filename="../core/file.c" line="512"/>
         <location filename="../core/file.c" line="597"/>
-        <location filename="../core/file.c" line="924"/>
-        <location filename="../core/file.c" line="1056"/>
+        <location filename="../core/file.c" line="909"/>
+        <location filename="../core/file.c" line="1092"/>
         <location filename="../core/ostctools.c" line="80"/>
         <source>Failed to read &apos;%s&apos;</source>
         <translation>Fejl i læsning af &apos;%s&apos;</translation>
@@ -8838,485 +9267,494 @@ Gennemsnit</translation>
         <translation>O₂ kalibrering</translation>
     </message>
     <message>
-        <location filename="../core/file.c" line="887"/>
-        <source>No matching DC found for file &apos;%s&apos;</source>
-        <translation>Ingen DC passer til filen &apos;%s&apos;</translation>
+        <location filename="../core/git-access.c" line="134"/>
+        <source>Local cache directory %s corrupted - can&apos;t sync with Subsurface cloud storage</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>none</source>
-        <translation>Ingen</translation>
+        <location filename="../core/git-access.c" line="157"/>
+        <location filename="../core/git-access.c" line="177"/>
+        <source>Could not update local cache to newer remote data</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="309"/>
-        <location filename="../core/cochran.c" line="315"/>
-        <location filename="../core/cochran.c" line="385"/>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>deco stop</source>
-        <translation>deco stop</translation>
+        <location filename="../core/git-access.c" line="170"/>
+        <source>Subsurface cloud storage corrupted</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="342"/>
-        <location filename="../core/file.c" line="755"/>
-        <source>battery</source>
-        <translation>batteri</translation>
+        <location filename="../core/git-access.c" line="284"/>
+        <source>Could not update Subsurface cloud storage, try again later</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="370"/>
-        <location filename="../core/cochran.c" line="409"/>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>rbt</source>
-        <translation>rbt</translation>
+        <location filename="../core/git-access.c" line="344"/>
+        <source>Remote storage and local data diverged. Error: merge failed (%s)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="336"/>
-        <location filename="../core/cochran.c" line="390"/>
-        <location filename="../core/file.c" line="777"/>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>ascent</source>
-        <translation>opstigning</translation>
+        <location filename="../core/git-access.c" line="374"/>
+        <source>Remote storage and local data diverged. Cannot combine local and remote changes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="379"/>
-        <location filename="../core/cochran.c" line="426"/>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>ceiling</source>
-        <translation>Loft</translation>
+        <location filename="../core/git-access.c" line="408"/>
+        <source>Remote storage and local data diverged</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>workload</source>
-        <translation>Arbejdsbyrde</translation>
+        <location filename="../core/git-access.c" line="411"/>
+        <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="395"/>
-        <location filename="../core/libdivecomputer.c" line="203"/>
-        <source>transmitter</source>
-        <translation>Sender</translation>
+        <location filename="../core/git-access.c" line="420"/>
+        <source>Problems with local cache of Subsurface cloud data</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/git-access.c" line="421"/>
+        <source>Moved cache data to %s. Please try the operation again.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/git-access.c" line="743"/>
+        <source>Error connecting to Subsurface cloud storage</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/git-access.c" line="746"/>
+        <source>git clone of %s failed (%s)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="203"/>
+        <location filename="../core/libdivecomputer.c" line="210"/>
+        <location filename="../core/parse-xml.c" line="3317"/>
+        <location filename="../core/uemis-downloader.c" line="134"/>
+        <source>unknown</source>
+        <translation>Ukendt</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>none</source>
+        <translation>Ingen</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>workload</source>
+        <translation>Arbejdsbyrde</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="224"/>
         <source>violation</source>
         <translation>Overtrædelse</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="203"/>
+        <location filename="../core/libdivecomputer.c" line="224"/>
         <source>bookmark</source>
         <translation>bogmærke</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="203"/>
+        <location filename="../core/libdivecomputer.c" line="224"/>
         <source>surface</source>
         <translation>overflade</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="203"/>
+        <location filename="../core/libdivecomputer.c" line="224"/>
         <source>safety stop</source>
         <translation>sikkerhedsstop</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="365"/>
-        <location filename="../core/cochran.c" line="414"/>
-        <location filename="../core/cochran.c" line="421"/>
-        <location filename="../core/file.c" line="868"/>
-        <location filename="../core/libdivecomputer.c" line="204"/>
-        <location filename="../core/libdivecomputer.c" line="207"/>
-        <source>gaschange</source>
-        <translation>gasskifte</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="204"/>
+        <location filename="../core/libdivecomputer.c" line="225"/>
         <source>safety stop (voluntary)</source>
         <translation>Sikkerhedsstop (frivillig)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="204"/>
+        <location filename="../core/libdivecomputer.c" line="225"/>
         <source>safety stop (mandatory)</source>
         <translation>Sikkerhedsstop (Krævet)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="205"/>
+        <location filename="../core/libdivecomputer.c" line="226"/>
         <source>deepstop</source>
         <translation>dybe stop</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="205"/>
+        <location filename="../core/libdivecomputer.c" line="226"/>
         <source>ceiling (safety stop)</source>
         <translation>Loft (sikkerhedsstop)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="205"/>
-        <source>divetime</source>
-        <translation>dykketid</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="205"/>
+        <location filename="../core/libdivecomputer.c" line="226"/>
         <source>below floor</source>
         <comment>event showing dive is below deco floor and adding deco time</comment>
         <translation>Under gulv</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="353"/>
-        <location filename="../core/libdivecomputer.c" line="206"/>
-        <source>maxdepth</source>
-        <translation>Maks. dybde</translation>
-    </message>
-    <message>
-        <location filename="../core/cochran.c" line="348"/>
-        <location filename="../core/libdivecomputer.c" line="206"/>
-        <source>OLF</source>
-        <translation>OLF</translation>
+        <location filename="../core/libdivecomputer.c" line="226"/>
+        <source>divetime</source>
+        <translation>dykketid</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="206"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
         <source>airtime</source>
         <translation>Lufttid</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="206"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
         <source>rgbm</source>
         <translation>rgbm</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="206"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
         <source>heading</source>
         <translation>Overskrift</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="358"/>
-        <location filename="../core/cochran.c" line="404"/>
-        <location filename="../core/libdivecomputer.c" line="206"/>
-        <source>pO₂</source>
-        <translation>pO₂</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="207"/>
+        <location filename="../core/libdivecomputer.c" line="228"/>
         <source>tissue level warning</source>
         <translation>Vævs advarsel</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="207"/>
+        <location filename="../core/libdivecomputer.c" line="228"/>
         <source>non stop time</source>
         <translation>non stop time</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="224"/>
+        <location filename="../core/libdivecomputer.c" line="237"/>
         <source>invalid event number</source>
         <translation>Ugyldigt hændelses nummer</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="658"/>
-        <source>Unable to create parser for %s %s</source>
-        <translation>Kan ikke oprette parser for %s %s</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="664"/>
-        <source>Error registering the data</source>
-        <translation>Fejl i registrering af data</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="495"/>
+        <location filename="../core/libdivecomputer.c" line="553"/>
         <source>Error parsing the datetime</source>
         <translation>Fejl ved fortolkning af dato/tid</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="513"/>
+        <location filename="../core/libdivecomputer.c" line="571"/>
         <source>Dive %d: %s</source>
         <translation>Dyk %d: %s</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="519"/>
+        <location filename="../core/libdivecomputer.c" line="577"/>
         <source>Error parsing the divetime</source>
         <translation>Fejl i fortolkning af dykkertid</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="529"/>
+        <location filename="../core/libdivecomputer.c" line="587"/>
         <source>Error parsing the maxdepth</source>
         <translation>Fejl i fortolkning af max dybde</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="548"/>
+        <location filename="../core/libdivecomputer.c" line="606"/>
         <source>Error parsing temperature</source>
         <translation>Fejl ved læsning af temperatur</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="568"/>
+        <location filename="../core/libdivecomputer.c" line="626"/>
         <source>Error parsing the gas mix count</source>
         <translation>Fejl i fortolkning af antallet af gasser</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="580"/>
+        <location filename="../core/libdivecomputer.c" line="638"/>
         <source>Error obtaining water salinity</source>
         <translation>Fejl i læsning af saltindhold i vandet</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="589"/>
+        <location filename="../core/libdivecomputer.c" line="647"/>
         <source>Error obtaining surface pressure</source>
         <translation>Fejl ved at opnå overflade tryk</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="614"/>
+        <location filename="../core/libdivecomputer.c" line="672"/>
         <source>Error obtaining divemode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="634"/>
+        <location filename="../core/libdivecomputer.c" line="692"/>
         <source>Error parsing the gas mix</source>
         <translation>Fejl i fortolkning af gas blanding</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="684"/>
+        <location filename="../core/libdivecomputer.c" line="717"/>
+        <source>Unable to create parser for %s %s</source>
+        <translation>Kan ikke oprette parser for %s %s</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="723"/>
+        <source>Error registering the data</source>
+        <translation>Fejl i registrering af data</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="744"/>
         <source>Error parsing the samples</source>
         <translation>Fejl i fortolkning af prøver</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="822"/>
+        <location filename="../core/libdivecomputer.c" line="882"/>
         <source>Event: waiting for user action</source>
         <translation>Event: waiting for user action</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="830"/>
+        <location filename="../core/libdivecomputer.c" line="890"/>
         <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="../core/libdivecomputer.c" line="894"/>
+        <location filename="../core/libdivecomputer.c" line="954"/>
         <source>Error registering the event handler.</source>
         <translation>Fejl: registering the event handler.</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="899"/>
+        <location filename="../core/libdivecomputer.c" line="959"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Fejl: registering the cancellation handler.</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="920"/>
+        <location filename="../core/libdivecomputer.c" line="980"/>
         <source>Dive data import error</source>
         <translation>Import fejl i dykker data</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="959"/>
+        <location filename="../core/libdivecomputer.c" line="1019"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Kan ikke danne libdivecomputer context</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="966"/>
+        <location filename="../core/libdivecomputer.c" line="1026"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Kan ikke åbne %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="992"/>
+        <location filename="../core/libdivecomputer.c" line="1048"/>
         <source>Insufficient privileges to open the device %s %s (%s)</source>
         <translation>Utilstrækkelige privilegier til at åbne enheden %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../core/parse-xml.c" line="517"/>
-        <source>Strange percentage reading %s
+        <location filename="../core/load-git.c" line="194"/>
+        <location filename="../core/parse-xml.c" line="1242"/>
+        <source>multiple GPS locations for this dive site; also %s
 </source>
-        <translation> Mærkelig procent læsning %s
-</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/load-git.c" line="194"/>
-        <location filename="../core/parse-xml.c" line="1238"/>
-        <source>multiple GPS locations for this dive site; also %s
+        <location filename="../core/load-git.c" line="222"/>
+        <location filename="../core/parse-xml.c" line="1304"/>
+        <source>additional name for site: %s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/parse-xml.c" line="2044"/>
+        <location filename="../core/ostctools.c" line="120"/>
+        <location filename="../core/ostctools.c" line="152"/>
+        <source>Unknown DC in dive %d</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/ostctools.c" line="165"/>
+        <source>Error - %s - parsing dive %d</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/parse-xml.c" line="517"/>
+        <source>Strange percentage reading %s
+</source>
+        <translation> Mærkelig procent læsning %s
+</translation>
+    </message>
+    <message>
+        <location filename="../core/parse-xml.c" line="2051"/>
         <source>Failed to parse &apos;%s&apos;</source>
         <translation>Fejl i fortolkning af &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../core/parse-xml.c" line="3741"/>
+        <location filename="../core/parse-xml.c" line="3774"/>
         <source>Can&apos;t open stylesheet %s</source>
         <translation>Kan ikke åbne stylesheet %s</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="86"/>
-        <source>EAN%d</source>
-        <translation>EAN%d</translation>
+        <location filename="../core/planner.c" line="555"/>
+        <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE %s ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="1032"/>
-        <location filename="../core/planner.c" line="1184"/>
-        <source>Can&apos;t find gas %s</source>
-        <translation>Kan ikke finde gas %s</translation>
+        <location filename="../core/planner.c" line="569"/>
+        <source>Decompression calculation aborted due to excessive time</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="368"/>
-        <source>Too many gas mixes</source>
-        <translation>For mange gas blandinger</translation>
+        <location filename="../core/planner.c" line="571"/>
+        <location filename="../core/planner.c" line="829"/>
+        <location filename="../core/planner.c" line="834"/>
+        <location filename="../core/planner.c" line="860"/>
+        <location filename="../core/planner.c" line="870"/>
+        <source>Warning:</source>
+        <translation>Advarsel:</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="568"/>
-        <source>Decompression calculation aborted due to excessive time</source>
+        <location filename="../core/planner.c" line="581"/>
+        <source>based on Bühlmann ZHL-16C with GFlow = %d and GFhigh = %d</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="592"/>
+        <location filename="../core/planner.c" line="586"/>
+        <source>based on VPM-B at nominal conservatism</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="588"/>
+        <source>based on VPM-B at +%d conservatism</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="590"/>
+        <source>, effective GF=%d/%d</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="594"/>
+        <source>recreational mode based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="598"/>
         <source>Subsurface dive plan</source>
         <translation>Subsurface dykker plan</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="596"/>
-        <source>depth</source>
-        <translation>dybde</translation>
+        <location filename="../core/planner.c" line="599"/>
+        <source>&lt;div&gt;Runtime: %dmin&lt;/div&gt;&lt;br&gt;</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="602"/>
-        <source>runtime</source>
-        <translation>runtime</translation>
+        <location filename="../core/planner.c" line="604"/>
+        <source>depth</source>
+        <translation>dybde</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="599"/>
+        <location filename="../core/planner.c" line="607"/>
         <source>duration</source>
         <translation>varighed</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="554"/>
-        <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE %s ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source>
-        <translation type="unfinished"/>
+        <location filename="../core/planner.c" line="610"/>
+        <source>runtime</source>
+        <translation>runtime</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="605"/>
+        <location filename="../core/planner.c" line="613"/>
         <source>gas</source>
         <translation>gas</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="648"/>
+        <location filename="../core/planner.c" line="656"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation>Overgang til %.*f %s i %d:%02d min - runtime %d:%02u på %s (SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="656"/>
+        <location filename="../core/planner.c" line="664"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source>
         <translation>Overgang til %.*f %s i %d:%02d min - runtime %d:%02u på %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="669"/>
+        <location filename="../core/planner.c" line="677"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation>Stop på %.*f %s i %d:%02d min - runtime %d:%02u på %s (SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="676"/>
+        <location filename="../core/planner.c" line="684"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source>
         <translation>Stop på %.*f %s for %d:%02d min - runtime %d:%02u on %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="721"/>
+        <location filename="../core/planner.c" line="729"/>
         <source>%3.0f%s</source>
         <translation>%3.0f%s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="724"/>
-        <location filename="../core/planner.c" line="728"/>
+        <location filename="../core/planner.c" line="732"/>
+        <location filename="../core/planner.c" line="736"/>
         <source>%3dmin</source>
         <translation>%3dmin</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="737"/>
-        <location filename="../core/planner.c" line="749"/>
+        <location filename="../core/planner.c" line="745"/>
+        <location filename="../core/planner.c" line="757"/>
         <source>(SP = %.1fbar)</source>
         <translation>(SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="772"/>
+        <location filename="../core/planner.c" line="780"/>
         <source>Switch gas to %s (SP = %.1fbar)</source>
         <translation>Skift gas til %s (SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="774"/>
+        <location filename="../core/planner.c" line="782"/>
         <source>Switch gas to %s</source>
         <translation>Skift gas til %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="793"/>
+        <location filename="../core/planner.c" line="801"/>
         <source>CNS</source>
         <translation>CNS</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="795"/>
+        <location filename="../core/planner.c" line="803"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="799"/>
+        <location filename="../core/planner.c" line="807"/>
         <source>Gas consumption (CCR legs excluded):</source>
         <translation>Gas forbrug (CCR etaper udeladt)</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="801"/>
+        <location filename="../core/planner.c" line="809"/>
         <source>Gas consumption:</source>
         <translation>Gas forbrug:</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="570"/>
-        <location filename="../core/planner.c" line="821"/>
-        <location filename="../core/planner.c" line="826"/>
-        <location filename="../core/planner.c" line="851"/>
-        <location filename="../core/planner.c" line="861"/>
-        <source>Warning:</source>
-        <translation>Advarsel:</translation>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="580"/>
-        <source>based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="584"/>
-        <source>based on VPM-B at nominal conservatism</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="586"/>
-        <source>based on VPM-B at +%d conservatism</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="588"/>
-        <source>recreational mode based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="822"/>
+        <location filename="../core/planner.c" line="830"/>
         <source>this is more gas than available in the specified cylinder!</source>
         <translation>det er mere gas end der er tilrådighed i flasken!</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="827"/>
+        <location filename="../core/planner.c" line="835"/>
         <source>not enough reserve for gas sharing on ascent!</source>
         <translation>Ikke ekstra gas nok til deling ved opstigning</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="829"/>
+        <location filename="../core/planner.c" line="837"/>
         <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source>
         <translation>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s i planlagt opstigning)</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="831"/>
+        <location filename="../core/planner.c" line="839"/>
         <source>%.0f%s (%.0f%s during planned ascent) of %s</source>
         <translation>%.0f%s (%.0f%s under planlagt opstigning) af %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="848"/>
+        <location filename="../core/planner.c" line="857"/>
         <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
         <translation>høj pO₂ værdi %.2f at %d:%02u med gas %s på dybde %.*f %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="858"/>
+        <location filename="../core/planner.c" line="867"/>
         <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
         <translation>lav pO₂ værdi %.2f på %d:%02u med gas %s på dybde %.*f %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="1419"/>
+        <location filename="../core/planner.c" line="1194"/>
+        <source>Can&apos;t find gas %s</source>
+        <translation>Kan ikke finde gas %s</translation>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="1440"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1280"/>
+        <location filename="../core/profile.c" line="1298"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
@@ -9326,7 +9764,7 @@ D: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1283"/>
+        <location filename="../core/profile.c" line="1301"/>
         <source>P: %d%s
 </source>
         <translation>P: %d%s
@@ -9334,21 +9772,21 @@ D: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1287"/>
+        <location filename="../core/profile.c" line="1305"/>
         <source>T: %.1f%s
 </source>
         <translation>T: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1293"/>
+        <location filename="../core/profile.c" line="1311"/>
         <source>V: %.1f%s
 </source>
         <translation>V: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1296"/>
+        <location filename="../core/profile.c" line="1314"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation>SAC: %.*f%s/min
@@ -9356,42 +9794,42 @@ D: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1298"/>
+        <location filename="../core/profile.c" line="1316"/>
         <source>CNS: %u%%
 </source>
         <translation>CNS: %u%%
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1300"/>
+        <location filename="../core/profile.c" line="1318"/>
         <source>pO%s: %.2fbar
 </source>
         <translation>pO%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1302"/>
+        <location filename="../core/profile.c" line="1320"/>
         <source>pN%s: %.2fbar
 </source>
         <translation>pN%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1304"/>
+        <location filename="../core/profile.c" line="1322"/>
         <source>pHe: %.2fbar
 </source>
         <translation>pHe: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1307"/>
+        <location filename="../core/profile.c" line="1325"/>
         <source>MOD: %d%s
 </source>
         <translation>MOD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1314"/>
+        <location filename="../core/profile.c" line="1332"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
@@ -9400,7 +9838,7 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1318"/>
+        <location filename="../core/profile.c" line="1336"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
@@ -9409,166 +9847,171 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1331"/>
+        <location filename="../core/profile.c" line="1349"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation>Sikkerhedsstop: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1334"/>
+        <location filename="../core/profile.c" line="1352"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation>Sikkerhedsstop: ukendt tid @ %.0f%s</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1339"/>
+        <location filename="../core/profile.c" line="1357"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation>Deko: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1342"/>
+        <location filename="../core/profile.c" line="1360"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation>Deko: unkn time @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1346"/>
+        <location filename="../core/profile.c" line="1364"/>
         <source>In deco
 </source>
         <translation>I deko
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1348"/>
+        <location filename="../core/profile.c" line="1366"/>
         <source>NDL: %umin
 </source>
         <translation>NDL: %umin
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1351"/>
+        <location filename="../core/profile.c" line="1369"/>
         <source>TTS: %umin
 </source>
         <translation>TTS: %umin
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1354"/>
+        <location filename="../core/profile.c" line="1372"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation>Deko: %umin @ %.0f%s (calc)</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1362"/>
+        <location filename="../core/profile.c" line="1380"/>
         <source>In deco (calc)
 </source>
         <translation>In deko (beregn)</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1365"/>
+        <location filename="../core/profile.c" line="1383"/>
         <source>NDL: %umin (calc)
 </source>
         <translation>NDL: %umin (beregn)</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1367"/>
+        <location filename="../core/profile.c" line="1385"/>
         <source>NDL: &gt;2h (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1371"/>
+        <location filename="../core/profile.c" line="1389"/>
         <source>TTS: %umin (calc)
 </source>
         <translation>TTS: %umin (beregn)</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1373"/>
+        <location filename="../core/profile.c" line="1391"/>
         <source>TTS: &gt;2h (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1376"/>
+        <location filename="../core/profile.c" line="1394"/>
         <source>RBT: %umin
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1379"/>
+        <location filename="../core/profile.c" line="1397"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation>Beregnet loft %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1385"/>
+        <location filename="../core/profile.c" line="1403"/>
         <source>Tissue %.0fmin: %.1f%s
 </source>
         <translation>Væv %.0fmin: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1391"/>
+        <location filename="../core/profile.c" line="1409"/>
         <source>heartbeat: %d
 </source>
         <translation>Hjertefrekvens: %d
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1393"/>
+        <location filename="../core/profile.c" line="1411"/>
         <source>bearing: %d
 </source>
         <translation>bærende: %d
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1396"/>
+        <location filename="../core/profile.c" line="1414"/>
         <source>mean depth to here %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1491"/>
+        <location filename="../core/profile.c" line="1515"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1495"/>
-        <location filename="../core/profile.c" line="1499"/>
-        <location filename="../core/profile.c" line="1503"/>
+        <location filename="../core/profile.c" line="1519"/>
+        <location filename="../core/profile.c" line="1523"/>
+        <location filename="../core/profile.c" line="1527"/>
         <source>%s %sD:%.1f%s</source>
         <translation>%s %sD:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1507"/>
+        <location filename="../core/profile.c" line="1531"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sD:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1511"/>
+        <location filename="../core/profile.c" line="1535"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1515"/>
-        <location filename="../core/profile.c" line="1519"/>
+        <location filename="../core/profile.c" line="1539"/>
+        <location filename="../core/profile.c" line="1543"/>
         <source>%s %sV:%.2f%s</source>
         <translation>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1526"/>
+        <location filename="../core/profile.c" line="1550"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s
 </translation>
     </message>
     <message>
+        <location filename="../core/profile.c" line="1575"/>
+        <source>%s SAC:%.*f %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../core/qthelper.cpp" line="67"/>
         <source>%1km</source>
         <translation type="unfinished"/>
@@ -9589,446 +10032,460 @@ EADD: %d%s
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="635"/>
+        <location filename="../core/qthelper.cpp" line="91"/>
+        <location filename="../core/qthelper.cpp" line="226"/>
+        <source>N</source>
+        <translation>N</translation>
+    </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="91"/>
+        <location filename="../core/qthelper.cpp" line="227"/>
+        <source>S</source>
+        <translation>S</translation>
+    </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="92"/>
+        <location filename="../core/qthelper.cpp" line="228"/>
+        <source>E</source>
+        <translation>Ø</translation>
+    </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="92"/>
+        <location filename="../core/qthelper.cpp" line="229"/>
+        <source>W</source>
+        <translation>V</translation>
+    </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="640"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="638"/>
+        <location filename="../core/qthelper.cpp" line="643"/>
         <source>F</source>
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="23"/>
-        <source>boat</source>
-        <translation>Båd</translation>
+        <location filename="../core/save-html.c" line="469"/>
+        <location filename="../core/save-html.c" line="553"/>
+        <location filename="../core/worldmap-save.c" line="111"/>
+        <source>Can&apos;t open file %s</source>
+        <translation>Kan ikke åbne filen %s</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="23"/>
-        <source>shore</source>
-        <translation>Kyst</translation>
+        <location filename="../core/save-html.c" line="488"/>
+        <source>Number</source>
+        <translation>Nummer</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="459"/>
-        <location filename="../core/dive.c" line="23"/>
-        <source>drift</source>
-        <translation>Strøm</translation>
+        <location filename="../core/save-html.c" line="489"/>
+        <source>Date</source>
+        <translation>Dato</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="24"/>
-        <source>deep</source>
-        <translation>dybde</translation>
+        <location filename="../core/save-html.c" line="490"/>
+        <source>Time</source>
+        <translation>Tid</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="24"/>
-        <source>cavern</source>
-        <translation>hule</translation>
+        <location filename="../core/save-html.c" line="491"/>
+        <source>Location</source>
+        <translation>Lokation</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="443"/>
-        <location filename="../core/dive.c" line="24"/>
-        <source>ice</source>
-        <translation>is</translation>
+        <location filename="../core/save-html.c" line="492"/>
+        <source>Air temp.</source>
+        <translation>Luft temp.</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="445"/>
-        <source>search</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="493"/>
+        <source>Water temp.</source>
+        <translation>Vand temp.</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="455"/>
-        <location filename="../core/dive.c" line="25"/>
-        <source>wreck</source>
-        <translation>vrag</translation>
+        <location filename="../core/save-html.c" line="494"/>
+        <source>Dives</source>
+        <translation>Dyk</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="441"/>
-        <location filename="../core/dive.c" line="25"/>
-        <source>cave</source>
-        <translation>grotte</translation>
+        <location filename="../core/save-html.c" line="495"/>
+        <source>Expand all</source>
+        <translation>Udvid alt</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="25"/>
-        <source>altitude</source>
-        <translation>Højde</translation>
+        <location filename="../core/save-html.c" line="496"/>
+        <source>Collapse all</source>
+        <translation>Skjul alle</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="26"/>
-        <source>pool</source>
-        <translation>svømmehal</translation>
+        <location filename="../core/save-html.c" line="497"/>
+        <source>Trips</source>
+        <translation>Ture</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="26"/>
-        <source>lake</source>
-        <translation>sø</translation>
+        <location filename="../core/save-html.c" line="498"/>
+        <source>Statistics</source>
+        <translation>Statistik</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="457"/>
-        <location filename="../core/dive.c" line="26"/>
-        <source>river</source>
-        <translation>flod</translation>
+        <location filename="../core/save-html.c" line="499"/>
+        <source>Advanced search</source>
+        <translation>Avanceret søgning </translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="439"/>
-        <location filename="../core/dive.c" line="27"/>
-        <source>night</source>
-        <translation>nat</translation>
+        <location filename="../core/save-html.c" line="502"/>
+        <source>Rating</source>
+        <translation>Bedømmelse</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="153"/>
-        <source>Error: the file does not appear to be a DATATRAK divelog</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="503"/>
+        <source>Visibility</source>
+        <translation>Sigtbarhed</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="286"/>
-        <source>clear</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="504"/>
+        <source>Duration</source>
+        <translation>Varighed</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="289"/>
-        <source>misty</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="505"/>
+        <source>Divemaster</source>
+        <translation>Divemaster</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="292"/>
-        <source>fog</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="506"/>
+        <source>Buddy</source>
+        <translation>Makker</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="295"/>
-        <source>rain</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="507"/>
+        <source>Suit</source>
+        <translation>Dragt</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="298"/>
-        <source>storm</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="508"/>
+        <source>Tags</source>
+        <translation>Tags</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="301"/>
-        <source>snow</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="509"/>
+        <location filename="../smtk-import/smartrak.c" line="251"/>
+        <location filename="../smtk-import/smartrak.c" line="321"/>
+        <source>Notes</source>
+        <translation>Noter</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="321"/>
-        <source>No suit</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="510"/>
+        <source>Show more details</source>
+        <translation>Vis flere detaljer</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="324"/>
-        <source>Shorty</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="513"/>
+        <source>Yearly statistics</source>
+        <translation>Årlig statistik</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="327"/>
-        <source>Combi</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="514"/>
+        <source>Year</source>
+        <translation>År</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="330"/>
-        <source>Wet suit</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="515"/>
+        <source>Total time</source>
+        <translation>Total tid</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="333"/>
-        <source>Semidry suit</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="516"/>
+        <source>Average time</source>
+        <translation>Gennemsnits tid</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="336"/>
-        <source>Dry suit</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="517"/>
+        <source>Shortest time</source>
+        <translation>Korteste tid</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="396"/>
-        <source>no stop</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="518"/>
+        <source>Longest time</source>
+        <translation>Længste tid</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="400"/>
-        <source>single ascent</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="519"/>
+        <source>Average depth</source>
+        <translation>Gennemsnits dybde</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="402"/>
-        <source>multiple ascent</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="520"/>
+        <source>Min. depth</source>
+        <translation>Min. dybde</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="404"/>
-        <location filename="../core/dive.c" line="27"/>
-        <source>fresh</source>
-        <translation>Fersk</translation>
+        <location filename="../core/save-html.c" line="521"/>
+        <source>Max. depth</source>
+        <translation>Max dybde</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="406"/>
-        <source>salt water</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="522"/>
+        <source>Average SAC</source>
+        <translation>Gennemsnits SAC</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="431"/>
-        <source>sight seeing</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="523"/>
+        <source>Min. SAC</source>
+        <translation>Min. SAC</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="433"/>
-        <source>club dive</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="524"/>
+        <source>Max. SAC</source>
+        <translation>Max SAC.</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="437"/>
-        <source>instruction</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="525"/>
+        <source>Average temp.</source>
+        <translation>Gennemsnits temp.</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="463"/>
-        <source>other</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="526"/>
+        <source>Min. temp.</source>
+        <translation>Min. temp.</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="474"/>
-        <source>Other activities</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="527"/>
+        <source>Max. temp.</source>
+        <translation>Max. temp.</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="498"/>
-        <source>Datatrak/Wlog notes</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="528"/>
+        <source>Back to list</source>
+        <translation>Tilbage til listen</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="537"/>
-        <source>Manually entered dive</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="531"/>
+        <source>Dive No.</source>
+        <translation>Dyk nr.</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="588"/>
-        <source>Unknown</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="532"/>
+        <source>Dive profile</source>
+        <translation>Dykker profil</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="674"/>
-        <source>Error: couldn&apos;t open the file %s</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="533"/>
+        <source>Dive information</source>
+        <translation>Dyk information</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="687"/>
-        <source>Error: no dive</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="534"/>
+        <source>Dive equipment</source>
+        <translation>Udstyr</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="27"/>
-        <source>student</source>
-        <translation>Elev</translation>
+        <location filename="../core/save-html.c" line="535"/>
+        <location filename="../core/save-html.c" line="542"/>
+        <source>Type</source>
+        <translation>Type</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="461"/>
-        <location filename="../core/dive.c" line="28"/>
-        <source>photo</source>
-        <translation>foto</translation>
+        <location filename="../core/save-html.c" line="536"/>
+        <source>Size</source>
+        <translation>Størrelse</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="28"/>
-        <source>video</source>
-        <translation>video</translation>
+        <location filename="../core/save-html.c" line="537"/>
+        <source>Work pressure</source>
+        <translation>Arbejdstryk</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="435"/>
-        <location filename="../core/dive.c" line="28"/>
-        <source>instructor</source>
-        <translation>Instruktør</translation>
+        <location filename="../core/save-html.c" line="538"/>
+        <source>Start pressure</source>
+        <translation>Start tryk</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="398"/>
-        <location filename="../core/dive.c" line="29"/>
-        <source>deco</source>
-        <translation>deco</translation>
+        <location filename="../core/save-html.c" line="539"/>
+        <source>End pressure</source>
+        <translation>Slut tryk</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="33"/>
-        <source>OC-gas</source>
-        <translation>OC-gas</translation>
+        <location filename="../core/save-html.c" line="540"/>
+        <source>Gas</source>
+        <translation>Gas</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="33"/>
-        <source>diluent</source>
-        <translation>diluent</translation>
+        <location filename="../core/save-html.c" line="541"/>
+        <source>Weight</source>
+        <translation>Vægt</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="33"/>
-        <location filename="../core/equipment.c" line="88"/>
-        <location filename="../core/planner.c" line="1415"/>
-        <location filename="../core/planner.c" line="1418"/>
-        <source>oxygen</source>
-        <translation>ilt</translation>
+        <location filename="../core/save-html.c" line="543"/>
+        <source>Events</source>
+        <translation>Hændelser</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="227"/>
-        <source>ℓ</source>
-        <translation>ℓ</translation>
+        <location filename="../core/save-html.c" line="544"/>
+        <source>Name</source>
+        <translation>Navn</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="239"/>
+        <location filename="../core/save-html.c" line="545"/>
+        <source>Value</source>
+        <translation>Værdi</translation>
+    </message>
+    <message>
+        <location filename="../core/save-html.c" line="546"/>
+        <source>Coordinates</source>
+        <translation>Koordinater</translation>
+    </message>
+    <message>
+        <location filename="../core/save-html.c" line="547"/>
+        <source>Dive status</source>
+        <translation>Dykkerstatus</translation>
+    </message>
+    <message>
+        <location filename="../core/statistics.c" line="242"/>
         <source>more than %d days</source>
         <translation>mere end %d dage</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="246"/>
+        <location filename="../core/statistics.c" line="249"/>
         <source>%dd %dh %dmin</source>
         <translation>%dd %dh %dmin</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="249"/>
+        <location filename="../core/statistics.c" line="252"/>
         <source>%dmin %dsecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="251"/>
+        <location filename="../core/statistics.c" line="254"/>
         <source>%dh %dmin</source>
         <translation>%dh %dmin</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="263"/>
+        <location filename="../core/statistics.c" line="266"/>
         <source>for dives #</source>
         <translation>for dyk #</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="269"/>
+        <location filename="../core/statistics.c" line="272"/>
         <source>for selected dives</source>
         <translation>for de valgte dyk</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="304"/>
+        <location filename="../core/statistics.c" line="307"/>
         <source>for dive #%d</source>
         <translation>for dyk #%d</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="306"/>
+        <location filename="../core/statistics.c" line="309"/>
         <source>for selected dive</source>
         <translation>for valgt dyk</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="308"/>
+        <location filename="../core/statistics.c" line="311"/>
         <source>for all dives</source>
         <translation>for alle dyk</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="310"/>
+        <location filename="../core/statistics.c" line="313"/>
         <source>(no dives)</source>
         <translation>(ingen dyk)</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Sun</source>
         <translation>Søn</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Mon</source>
         <translation>Man</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Tue</source>
         <translation>Tir</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Wed</source>
         <translation>Ons</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Thu</source>
         <translation>Tor</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Fri</source>
         <translation>Fre</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Sat</source>
         <translation>Lør</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Jan</source>
         <translation>Jan</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Feb</source>
         <translation>Feb</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Mar</source>
         <translation>Mar</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Apr</source>
         <translation>Apr</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>May</source>
         <translation>Maj</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Jun</source>
         <translation>Jun</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Jul</source>
         <translation>Jul</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Aug</source>
         <translation>Aug</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Sep</source>
         <translation>Sep</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Oct</source>
         <translation>Okt</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Nov</source>
         <translation>Nov</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Dec</source>
         <translation>Dec</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="191"/>
-        <location filename="../core/parse-xml.c" line="3284"/>
-        <location filename="../core/uemis-downloader.c" line="134"/>
-        <source>unknown</source>
-        <translation>Ukendt</translation>
-    </message>
-    <message>
-        <location filename="../core/uemis-downloader.c" line="467"/>
-        <source>data</source>
-        <translation>data</translation>
-    </message>
-    <message>
-        <location filename="../core/uemis-downloader.c" line="447"/>
-        <source>%s %s</source>
-        <translation>%s %s</translation>
-    </message>
-    <message>
         <location filename="../core/uemis-downloader.c" line="27"/>
         <source>Uemis Zurich: the file system is almost full.
 Disconnect/reconnect the dive computer
@@ -10054,6 +10511,16 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../core/uemis-downloader.c" line="447"/>
+        <source>%s %s</source>
+        <translation>%s %s</translation>
+    </message>
+    <message>
+        <location filename="../core/uemis-downloader.c" line="467"/>
+        <source>data</source>
+        <translation>data</translation>
+    </message>
+    <message>
         <location filename="../core/uemis-downloader.c" line="495"/>
         <source>divelog #</source>
         <translation>dykkerlog #</translation>
@@ -10224,281 +10691,6 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation>Advarsel, lav batteri</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="469"/>
-        <location filename="../core/save-html.c" line="553"/>
-        <location filename="../core/worldmap-save.c" line="111"/>
-        <source>Can&apos;t open file %s</source>
-        <translation>Kan ikke åbne filen %s</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="488"/>
-        <source>Number</source>
-        <translation>Nummer</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="489"/>
-        <source>Date</source>
-        <translation>Dato</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="490"/>
-        <source>Time</source>
-        <translation>Tid</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="491"/>
-        <source>Location</source>
-        <translation>Lokation</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="492"/>
-        <source>Air temp.</source>
-        <translation>Luft temp.</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="493"/>
-        <source>Water temp.</source>
-        <translation>Vand temp.</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="498"/>
-        <source>Statistics</source>
-        <translation>Statistik</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="502"/>
-        <source>Rating</source>
-        <translation>Bedømmelse</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="503"/>
-        <source>Visibility</source>
-        <translation>Sigtbarhed</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="504"/>
-        <source>Duration</source>
-        <translation>Varighed</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="494"/>
-        <source>Dives</source>
-        <translation>Dyk</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="495"/>
-        <source>Expand all</source>
-        <translation>Udvid alt</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="496"/>
-        <source>Collapse all</source>
-        <translation>Skjul alle</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="497"/>
-        <source>Trips</source>
-        <translation>Ture</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="499"/>
-        <source>Advanced search</source>
-        <translation>Avanceret søgning </translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="505"/>
-        <source>Divemaster</source>
-        <translation>Divemaster</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="506"/>
-        <source>Buddy</source>
-        <translation>Makker</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="507"/>
-        <source>Suit</source>
-        <translation>Dragt</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="508"/>
-        <source>Tags</source>
-        <translation>Tags</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="509"/>
-        <location filename="../smtk-import/smartrak.c" line="251"/>
-        <location filename="../smtk-import/smartrak.c" line="321"/>
-        <source>Notes</source>
-        <translation>Noter</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="510"/>
-        <source>Show more details</source>
-        <translation>Vis flere detaljer</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="513"/>
-        <source>Yearly statistics</source>
-        <translation>Årlig statistik</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="514"/>
-        <source>Year</source>
-        <translation>År</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="515"/>
-        <source>Total time</source>
-        <translation>Total tid</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="516"/>
-        <source>Average time</source>
-        <translation>Gennemsnits tid</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="517"/>
-        <source>Shortest time</source>
-        <translation>Korteste tid</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="518"/>
-        <source>Longest time</source>
-        <translation>Længste tid</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="519"/>
-        <source>Average depth</source>
-        <translation>Gennemsnits dybde</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="520"/>
-        <source>Min. depth</source>
-        <translation>Min. dybde</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="521"/>
-        <source>Max. depth</source>
-        <translation>Max dybde</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="523"/>
-        <source>Min. SAC</source>
-        <translation>Min. SAC</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="524"/>
-        <source>Max. SAC</source>
-        <translation>Max SAC.</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="525"/>
-        <source>Average temp.</source>
-        <translation>Gennemsnits temp.</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="526"/>
-        <source>Min. temp.</source>
-        <translation>Min. temp.</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="527"/>
-        <source>Max. temp.</source>
-        <translation>Max. temp.</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="528"/>
-        <source>Back to list</source>
-        <translation>Tilbage til listen</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="534"/>
-        <source>Dive equipment</source>
-        <translation>Udstyr</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="537"/>
-        <source>Work pressure</source>
-        <translation>Arbejdstryk</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="538"/>
-        <source>Start pressure</source>
-        <translation>Start tryk</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="539"/>
-        <source>End pressure</source>
-        <translation>Slut tryk</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="547"/>
-        <source>Dive status</source>
-        <translation>Dykkerstatus</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="522"/>
-        <source>Average SAC</source>
-        <translation>Gennemsnits SAC</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="531"/>
-        <source>Dive No.</source>
-        <translation>Dyk nr.</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="532"/>
-        <source>Dive profile</source>
-        <translation>Dykker profil</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="533"/>
-        <source>Dive information</source>
-        <translation>Dyk information</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="535"/>
-        <location filename="../core/save-html.c" line="542"/>
-        <source>Type</source>
-        <translation>Type</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="536"/>
-        <source>Size</source>
-        <translation>Størrelse</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="540"/>
-        <source>Gas</source>
-        <translation>Gas</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="541"/>
-        <source>Weight</source>
-        <translation>Vægt</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="543"/>
-        <source>Events</source>
-        <translation>Hændelser</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="544"/>
-        <source>Name</source>
-        <translation>Navn</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="545"/>
-        <source>Value</source>
-        <translation>Værdi</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="546"/>
-        <source>Coordinates</source>
-        <translation>Koordinater</translation>
-    </message>
-    <message>
         <location filename="../core/worldmap-save.c" line="39"/>
         <source>Date:</source>
         <translation>Dato:</translation>
@@ -10544,109 +10736,6 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation>Noter:</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="91"/>
-        <location filename="../core/qthelper.cpp" line="226"/>
-        <source>N</source>
-        <translation>N</translation>
-    </message>
-    <message>
-        <location filename="../core/qthelper.cpp" line="91"/>
-        <location filename="../core/qthelper.cpp" line="227"/>
-        <source>S</source>
-        <translation>S</translation>
-    </message>
-    <message>
-        <location filename="../core/qthelper.cpp" line="92"/>
-        <location filename="../core/qthelper.cpp" line="228"/>
-        <source>E</source>
-        <translation>Ø</translation>
-    </message>
-    <message>
-        <location filename="../core/qthelper.cpp" line="92"/>
-        <location filename="../core/qthelper.cpp" line="229"/>
-        <source>W</source>
-        <translation>V</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="341"/>
-        <source>Remote storage and local data diverged. Error: merge failed (%s)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="134"/>
-        <source>Local cache directory %s corrupted - can&apos;t sync with Subsurface cloud storage</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="157"/>
-        <location filename="../core/git-access.c" line="177"/>
-        <source>Could not update local cache to newer remote data</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="170"/>
-        <source>Subsurface cloud storage corrupted</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="285"/>
-        <source>Could not update Subsurface cloud storage, try again later</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="371"/>
-        <source>Remote storage and local data diverged. Cannot combine local and remote changes</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="405"/>
-        <source>Remote storage and local data diverged</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="408"/>
-        <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="417"/>
-        <source>Problems with local cache of Subsurface cloud data</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="418"/>
-        <source>Moved cache data to %s. Please try the operation again.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="737"/>
-        <source>Error connecting to Subsurface cloud storage</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="740"/>
-        <source>git clone of %s failed (%s)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/load-git.c" line="222"/>
-        <location filename="../core/parse-xml.c" line="1300"/>
-        <source>additional name for site: %s
-</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/ostctools.c" line="120"/>
-        <location filename="../core/ostctools.c" line="152"/>
-        <source>Unknown DC in dive %d</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/ostctools.c" line="165"/>
-        <source>Error - %s - parsing dive %d</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../smtk-import/smartrak.c" line="247"/>
         <source>Built</source>
         <translation type="unfinished"/>
@@ -10730,155 +10819,120 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="91"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="103"/>
         <source>Subsurface</source>
         <translation>Subsurface</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="97"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="110"/>
         <source>Dive list</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="112"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="125"/>
         <source>Cloud credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="126"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="139"/>
         <source>Manage dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="138"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="141"/>
         <source>Add dive manually</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="146"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="149"/>
         <source>Manual sync with cloud</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="164"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="167"/>
         <source>Offline mode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="164"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="167"/>
         <source>Enable auto cloud sync</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="182"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="187"/>
         <source>GPS</source>
         <translation>GPS</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="185"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="190"/>
         <source>GPS-tag dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="192"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="197"/>
         <source>Upload GPS data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="199"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="204"/>
         <source>Download GPS data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="206"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="211"/>
         <source>Show GPS fixes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="215"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="220"/>
         <source>Clear GPS cache</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="221"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="226"/>
         <source>Preferences</source>
         <translation>Indstillinger</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="230"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="237"/>
         <source>Developer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="232"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="239"/>
         <source>App log</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="239"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="246"/>
         <source>Theme information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="246"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="253"/>
         <source>User manual</source>
         <translation>Bruger manual</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="252"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="259"/>
         <source>About</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="283"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="304"/>
         <source>Run location service</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="283"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="304"/>
         <source>No GPS source available</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="295"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="316"/>
         <source>Actions</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="9"/>
-        <source>Hello World</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="13"/>
-        <source>File</source>
-        <translation>Fil</translation>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="15"/>
-        <source>&amp;Open</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="19"/>
-        <source>Exit</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="27"/>
-        <source>Button 1 pressed</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="28"/>
-        <source>Button 2 pressed</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="33"/>
-        <source>May I have your attention, please?</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>plannerDetails</name>
@@ -10956,6 +11010,24 @@ p, li { white-space: pre-wrap; }
         <translation>m/min</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="121"/>
+        <location filename="../build/ui_plannerSettings.h" line="425"/>
+        <source>75% to 50% avg. depth</source>
+        <translation>75% til 50% gnm. dybde</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="138"/>
+        <location filename="../build/ui_plannerSettings.h" line="427"/>
+        <source>50% avg. depth to 6m</source>
+        <translation>50% gnm. dybde til 6m</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="155"/>
+        <location filename="../build/ui_plannerSettings.h" line="429"/>
+        <source>6m to surface</source>
+        <translation>6m til overflade</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="175"/>
         <location filename="../build/ui_plannerSettings.h" line="431"/>
         <source>Descent</source>
@@ -10979,12 +11051,35 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="268"/>
+        <source>Bühlmann deco</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="278"/>
         <location filename="../build/ui_plannerSettings.h" line="445"/>
         <source>Reserve gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="288"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="549"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="578"/>
+        <location filename="../build/ui_plannerSettings.h" line="446"/>
+        <location filename="../build/ui_plannerSettings.h" line="459"/>
+        <location filename="../build/ui_plannerSettings.h" line="461"/>
+        <source>bar</source>
+        <translation>bar</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="307"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="416"/>
+        <location filename="../build/ui_plannerSettings.h" line="437"/>
+        <location filename="../build/ui_plannerSettings.h" line="440"/>
+        <source>%</source>
+        <translation>%</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="320"/>
         <location filename="../build/ui_plannerSettings.h" line="449"/>
         <source>Postpone gas change if a stop is not required</source>
@@ -11003,12 +11098,10 @@ p, li { white-space: pre-wrap; }
         <translation>GF low</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="307"/>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="416"/>
-        <location filename="../build/ui_plannerSettings.h" line="437"/>
-        <location filename="../build/ui_plannerSettings.h" line="440"/>
-        <source>%</source>
-        <translation>%</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="353"/>
+        <location filename="../build/ui_plannerSettings.h" line="436"/>
+        <source>Plan backgas breaks</source>
+        <translation>Planlæg gasbreaks</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="360"/>
@@ -11017,10 +11110,10 @@ p, li { white-space: pre-wrap; }
         <translation>GF high</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="429"/>
-        <location filename="../build/ui_plannerSettings.h" line="441"/>
-        <source>Drop to first depth</source>
-        <translation>Gå til første dybde</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="370"/>
+        <location filename="../build/ui_plannerSettings.h" line="453"/>
+        <source>min</source>
+        <translation>min.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="389"/>
@@ -11029,163 +11122,139 @@ p, li { white-space: pre-wrap; }
         <translation>Sidste stop på 6 meter</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="353"/>
-        <location filename="../build/ui_plannerSettings.h" line="436"/>
-        <source>Plan backgas breaks</source>
-        <translation>Planlæg gasbreaks</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="396"/>
+        <source>Maximize bottom time allowed by gas and no decompression limits</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="515"/>
-        <location filename="../build/ui_plannerSettings.h" line="455"/>
-        <source>Gas options</source>
-        <translation>Gas muligheder</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="399"/>
+        <location filename="../build/ui_plannerSettings.h" line="443"/>
+        <source>Recreational mode</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="594"/>
-        <location filename="../build/ui_plannerSettings.h" line="456"/>
-        <source>Bottom SAC</source>
-        <translation>Bund SAC</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="429"/>
+        <location filename="../build/ui_plannerSettings.h" line="441"/>
+        <source>Drop to first depth</source>
+        <translation>Gå til første dybde</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="692"/>
-        <location filename="../build/ui_plannerSettings.h" line="457"/>
-        <source>Deco SAC</source>
-        <translation>Deco SAC</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="436"/>
+        <location filename="../build/ui_plannerSettings.h" line="452"/>
+        <source>Min. switch duration</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="601"/>
-        <location filename="../build/ui_plannerSettings.h" line="458"/>
-        <source>Bottom pO₂</source>
-        <translation>Bund pO₂</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="459"/>
+        <location filename="../build/ui_plannerSettings.h" line="444"/>
+        <source>Safety stop</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="685"/>
-        <location filename="../build/ui_plannerSettings.h" line="460"/>
-        <source>Deco pO₂</source>
-        <translation>Deco pO2</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="495"/>
+        <source>Conservatism level</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="515"/>
+        <location filename="../build/ui_plannerSettings.h" line="455"/>
+        <source>Gas options</source>
+        <translation>Gas muligheder</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="565"/>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="672"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="698"/>
         <location filename="../build/ui_plannerSettings.h" line="462"/>
         <location filename="../build/ui_plannerSettings.h" line="463"/>
         <source>ℓ/min</source>
         <translation>ℓ/min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="632"/>
-        <location filename="../build/ui_plannerSettings.h" line="468"/>
-        <source>Display runtime</source>
-        <translation>Vis runtime</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="645"/>
-        <location filename="../build/ui_plannerSettings.h" line="472"/>
-        <source>Display segment duration</source>
-        <translation>Vis etappe varighed</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="655"/>
-        <location filename="../build/ui_plannerSettings.h" line="476"/>
-        <source>Display transitions in deco</source>
-        <translation>Vis overgange i deko</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="662"/>
-        <location filename="../build/ui_plannerSettings.h" line="477"/>
-        <source>Verbatim dive plan</source>
-        <translation>Trin for trin dykkerplan</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="288"/>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="549"/>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="578"/>
-        <location filename="../build/ui_plannerSettings.h" line="446"/>
-        <location filename="../build/ui_plannerSettings.h" line="459"/>
-        <location filename="../build/ui_plannerSettings.h" line="461"/>
-        <source>bar</source>
-        <translation>bar</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="121"/>
-        <location filename="../build/ui_plannerSettings.h" line="425"/>
-        <source>75% to 50% avg. depth</source>
-        <translation>75% til 50% gnm. dybde</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="138"/>
-        <location filename="../build/ui_plannerSettings.h" line="427"/>
-        <source>50% avg. depth to 6m</source>
-        <translation>50% gnm. dybde til 6m</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="155"/>
-        <location filename="../build/ui_plannerSettings.h" line="429"/>
-        <source>6m to surface</source>
-        <translation>6m til overflade</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="268"/>
-        <source>Bühlmann deco</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="370"/>
-        <location filename="../build/ui_plannerSettings.h" line="453"/>
-        <source>min</source>
-        <translation>min.</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="396"/>
-        <source>Maximize bottom time allowed by gas and no decompression limits</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="594"/>
+        <source>m</source>
+        <translation>m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="399"/>
-        <location filename="../build/ui_plannerSettings.h" line="443"/>
-        <source>Recreational mode</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="606"/>
+        <source>Used to calculate best mix. Select best mix depth in &apos;Available gases&apos; table by entering gas depth, followed by &quot;B&quot; (best trimix mix) or &quot;BN&quot; (best nitrox mix)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="436"/>
-        <location filename="../build/ui_plannerSettings.h" line="452"/>
-        <source>Min. switch duration</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="613"/>
+        <location filename="../build/ui_plannerSettings.h" line="456"/>
+        <source>Bottom SAC</source>
+        <translation>Bund SAC</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="459"/>
-        <location filename="../build/ui_plannerSettings.h" line="444"/>
-        <source>Safety stop</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="620"/>
+        <location filename="../build/ui_plannerSettings.h" line="458"/>
+        <source>Bottom pO₂</source>
+        <translation>Bund pO₂</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="495"/>
-        <source>Conservatism level</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="627"/>
+        <source>Best mix END</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="608"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="634"/>
         <location filename="../build/ui_plannerSettings.h" line="464"/>
         <source>Notes</source>
         <translation>Noter</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="629"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="655"/>
         <location filename="../build/ui_plannerSettings.h" line="466"/>
         <source>In dive plan, show runtime (absolute time) of stops</source>
         <translation>I planen, vis runtime (absolut tid) af stops  </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="642"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="658"/>
+        <location filename="../build/ui_plannerSettings.h" line="468"/>
+        <source>Display runtime</source>
+        <translation>Vis runtime</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="668"/>
         <location filename="../build/ui_plannerSettings.h" line="470"/>
         <source>In dive plan, show duration (relative time) of stops</source>
         <translation>I planen, vis varighed (relativ tid) af stops  </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="652"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="671"/>
+        <location filename="../build/ui_plannerSettings.h" line="472"/>
+        <source>Display segment duration</source>
+        <translation>Vis etappe varighed</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="678"/>
         <location filename="../build/ui_plannerSettings.h" line="474"/>
         <source>In diveplan, list transitions or treat them as implicit</source>
         <translation>I planen, vis overgangene og behandl disse implicit</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="681"/>
+        <location filename="../build/ui_plannerSettings.h" line="476"/>
+        <source>Display transitions in deco</source>
+        <translation>Vis overgange i deko</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="688"/>
+        <location filename="../build/ui_plannerSettings.h" line="477"/>
+        <source>Verbatim dive plan</source>
+        <translation>Trin for trin dykkerplan</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="711"/>
+        <location filename="../build/ui_plannerSettings.h" line="460"/>
+        <source>Deco pO₂</source>
+        <translation>Deco pO2</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="718"/>
+        <location filename="../build/ui_plannerSettings.h" line="457"/>
+        <source>Deco SAC</source>
+        <translation>Deco SAC</translation>
+    </message>
 </context>
 </TS>
\ No newline at end of file
diff --git a/translations/subsurface_de_CH.ts b/translations/subsurface_de_CH.ts
index d1010a5f5..f82cae0e6 100644
--- a/translations/subsurface_de_CH.ts
+++ b/translations/subsurface_de_CH.ts
@@ -105,6 +105,11 @@
         <translation>Name:</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="56"/>
+        <source>Could not initialize Winsock version 2.2</source>
+        <translation>Konnte Winsock 2.2 nicht initialisieren</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="134"/>
         <source>Trying to turn on the local Bluetooth device...</source>
         <translation>Versuche das Bluetooth Gerät einzuschalten...</translation>
@@ -115,6 +120,11 @@
         <translation>Versuche das Bluetooth Gerät auszuschalten...</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="167"/>
+        <source>Remote devices list was cleared.</source>
+        <translation>Die externe Geräteliste wurde geleert.</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="183"/>
         <source>Scanning for remote devices...</source>
         <translation>Suche nach externen Geräten...</translation>
@@ -125,6 +135,22 @@
         <translation>Suche erfolgreich beendet.</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="208"/>
+        <source>The local Bluetooth device was %1.</source>
+        <extracomment>%1 will be replaced with &quot;turned on&quot; or &quot;turned off&quot;</extracomment>
+        <translation>Das lokale Bluetooth Gerät war %1.</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
+        <source>turned on</source>
+        <translation>Eingeschaltet</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
+        <source>turned off</source>
+        <translation>Ausgeschaltet</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="225"/>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="339"/>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="359"/>
@@ -172,37 +198,6 @@
         <translation>Verbinden</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="352"/>
-        <source>Device %1 was paired and is authorized.</source>
-        <translation>Gerät %1 wurde verbunden und ist autorisiert.</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="56"/>
-        <source>Could not initialize Winsock version 2.2</source>
-        <translation>Konnte Winsock 2.2 nicht initialisieren</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="167"/>
-        <source>Remote devices list was cleared.</source>
-        <translation>Die externe Geräteliste wurde geleert.</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="208"/>
-        <source>The local Bluetooth device was %1.</source>
-        <extracomment>%1 will be replaced with &quot;turned on&quot; or &quot;turned off&quot;</extracomment>
-        <translation>Das lokale Bluetooth Gerät war %1.</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
-        <source>turned on</source>
-        <translation>Eingeschaltet</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
-        <source>turned off</source>
-        <translation>Ausgeschaltet</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="307"/>
         <source>Remove pairing</source>
         <translation>Verbindung löschen</translation>
@@ -228,6 +223,11 @@
         <translation>Gerät %1 war verbunden.</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="352"/>
+        <source>Device %1 was paired and is authorized.</source>
+        <translation>Gerät %1 wurde verbunden und ist autorisiert.</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="378"/>
         <source>The device %1 can now be used for connection. You can press the Save button.</source>
         <translation>Das Gerät %1 kann nun für eine Verbindung benutzt werden. Sie können jetzt Speichern.</translation>
@@ -286,12 +286,12 @@
 <context>
     <name>BuddyFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="621"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="619"/>
         <source>Person: </source>
         <translation>Person: </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="622"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="620"/>
         <source>Searches for buddies and divemasters</source>
         <translation>Sucht nach Buddies und Divemasters</translation>
     </message>
@@ -299,7 +299,7 @@
 <context>
     <name>BuddyFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="243"/>
+        <location filename="../qt-models/filtermodels.cpp" line="248"/>
         <source>No buddies</source>
         <translation>Keine Buddies</translation>
     </message>
@@ -307,25 +307,30 @@
 <context>
     <name>CloudCredentials</name>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="49"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="50"/>
         <source>Cloud credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="55"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="56"/>
         <source>Email</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="67"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="68"/>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="90"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="92"/>
         <source>Show password</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="97"/>
+        <source>PIN</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>ColumnNameProvider</name>
@@ -381,6 +386,16 @@
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
+        <source>Max. depth</source>
+        <translation>Max. Tiefe</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
+        <source>Avg. depth</source>
+        <translation>Ø Tiefe</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
         <source>Divemaster</source>
         <translation>Divemaster</translation>
     </message>
@@ -391,6 +406,11 @@
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
+        <source>Suit</source>
+        <translation>Anzug</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
         <source>Notes</source>
         <translation>Notizen</translation>
     </message>
@@ -410,21 +430,6 @@
         <translation>Wassertemp.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
-        <source>Max. depth</source>
-        <translation>Max. Tiefe</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
-        <source>Avg. depth</source>
-        <translation>Ø Tiefe</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
-        <source>Suit</source>
-        <translation>Anzug</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="44"/>
         <source>O₂</source>
         <translation>O₂</translation>
@@ -539,7 +544,7 @@
         <translation>Fehler beim Erzeugen des libdivecomputer Contexts</translation>
     </message>
     <message>
-        <location filename="../core/configuredivecomputer.cpp" line="660"/>
+        <location filename="../core/configuredivecomputer.cpp" line="656"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation>Verbindung zum Tauchcomputer konnte nicht hergestellt werden.</translation>
     </message>
@@ -559,11 +564,19 @@
         <translation>Gerät oder Einhängepunkt</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="170"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1520"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1533"/>
-        <source>...</source>
-        <translation>...</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="47"/>
+        <source>Connect via Bluetooth</source>
+        <translation>Verbinde via Bluetooth</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="54"/>
+        <source>Connect</source>
+        <translation>Verbinden</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="64"/>
+        <source>Disconnect</source>
+        <translation>Verbindung trennen</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="80"/>
@@ -572,12 +585,24 @@
         <translation>Verfügbare Details abrufen</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="90"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1523"/>
+        <source>Read settings from backup file or from device before writing to the device</source>
+        <translation>Vor dem Schreiben auf das Gerät die Einstellungen aus einer Sicherungsdatei oder vom Gerät lesen</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="93"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1525"/>
         <source>Save changes to device</source>
         <translation>Änderungen auf Gerät speichern</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="116"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1527"/>
+        <source>Read settings from backup file or from device before writing to a backup file</source>
+        <translation>Vor dem Schreiben in eine Sicherungsdatei die Einstellungen aus einer Sicherungsdatei oder vom Gerät lesen</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="119"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1529"/>
         <source>Backup</source>
@@ -596,15 +621,40 @@
         <translation>Firmware aktualisieren</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="163"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1532"/>
+        <source>Save libdivecomputer logfile</source>
+        <translation>libdivecomputer-Protokolldatei speichern</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="170"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1520"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1533"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="177"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1534"/>
         <source>Cancel</source>
         <translation>Abbrechen</translation>
     </message>
     <message>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1539"/>
-        <source>OSTC 3</source>
-        <translation>OSTC 3</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="214"/>
+        <source>OSTC 3,Sport,Cr,2</source>
+        <translation>OSTC 3, Sport, CR, 2</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="223"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1541"/>
+        <source>Suunto Vyper family</source>
+        <translation>Suunto Vyper-Familie</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="232"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1543"/>
+        <source>OSTC, Mk.2/2N/2C</source>
+        <translation>OSTC, Mk.2/2N/2C</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="253"/>
@@ -617,40 +667,56 @@
         <translation>Grundeinstellungen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="326"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1656"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1943"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1546"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1726"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1766"/>
-        <source>Serial No.</source>
-        <translation>Seriennummer</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="260"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1575"/>
+        <source>Eco</source>
+        <translation>Öko</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="349"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1679"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1980"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1547"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1727"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1767"/>
-        <source>Firmware version</source>
-        <translation>Firmware-Version</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="265"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1576"/>
+        <source>Medium</source>
+        <translation>Mittel</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="538"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1713"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1990"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1548"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1729"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1768"/>
-        <source>Custom text</source>
-        <translation>Benutzerdefinierter Text</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="270"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1577"/>
+        <source>High</source>
+        <translation>Hoch</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="385"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1549"/>
-        <source>Language</source>
-        <translation>Sprache</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="278"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="826"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="849"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="875"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="927"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="993"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1019"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1101"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1117"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1450"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2278"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2382"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2408"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2434"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2474"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2497"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1586"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1621"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1623"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1625"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1628"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1637"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1638"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1710"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1785"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1789"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1801"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1803"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1806"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1807"/>
+        <source>%</source>
+        <translation>%</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="289"/>
@@ -677,44 +743,36 @@
         <translation>Italienisch</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="579"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1557"/>
-        <source>Dive mode</source>
-        <translation>Tauchmodus</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="556"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1560"/>
-        <source>OC</source>
-        <translation>OC</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="561"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1561"/>
-        <source>CC</source>
-        <translation>CC</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="313"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1582"/>
+        <source>m/°C</source>
+        <translation>m/°C</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="566"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2336"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1562"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1793"/>
-        <source>Gauge</source>
-        <translation>Zeit-/Tiefenmesser</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="318"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1583"/>
+        <source>ft/°F</source>
+        <translation>ft/°F</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="571"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1563"/>
-        <source>Apnea</source>
-        <translation>Apnoe</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="326"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1656"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1943"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1546"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1726"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1766"/>
+        <source>Serial No.</source>
+        <translation>Seriennummer</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="395"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2063"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1565"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1780"/>
-        <source>Date format</source>
-        <translation>Datumsformat</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="349"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1679"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1980"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1547"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1727"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1767"/>
+        <source>Firmware version</source>
+        <translation>Firmware-Version</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="360"/>
@@ -735,108 +793,147 @@
         <translation>JJMMTT</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1042"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2457"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1639"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1805"/>
-        <source>Saturation</source>
-        <translation>Sättigung</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="385"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1549"/>
+        <source>Language</source>
+        <translation>Sprache</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="278"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="826"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="849"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="875"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="927"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="993"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1019"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1101"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1117"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1450"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2278"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2382"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2408"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2434"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2474"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2497"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1586"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1621"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1623"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1625"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1628"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1637"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1638"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1710"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1785"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1789"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1801"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1803"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1806"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1807"/>
-        <source>%</source>
-        <translation>%</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="395"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2063"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1565"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1780"/>
+        <source>Date format</source>
+        <translation>Datumsformat</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="865"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2261"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1624"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1784"/>
-        <source>Desaturation</source>
-        <translation>Entsättigung</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="405"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1572"/>
+        <source>Brightness</source>
+        <translation>Helligkeit</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="983"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2398"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1636"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1800"/>
-        <source>Last deco</source>
-        <translation>Letzter Dekostopp</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="415"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1850"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1579"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1753"/>
+        <source>Units</source>
+        <translation>Einheiten</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="711"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="736"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="758"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="904"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2181"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2206"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2228"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2307"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1626"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1786"/>
-        <source> m</source>
-        <translation>m</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="425"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1585"/>
+        <source>Salinity (0-5%)</source>
+        <translation>Salzgehalt (0-5%)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="405"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1572"/>
-        <source>Brightness</source>
-        <translation>Helligkeit</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="438"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1615"/>
+        <source>Reset device to default settings</source>
+        <translation>Gerät auf die Standardeinstellungen zurücksetzen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="260"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1575"/>
-        <source>Eco</source>
-        <translation>Öko</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="452"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1590"/>
+        <source>230LSB/Gauss</source>
+        <translation>230LSB/Gauss</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="265"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1576"/>
-        <source>Medium</source>
-        <translation>Mittel</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="457"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1591"/>
+        <source>330LSB/Gauss</source>
+        <translation>330LSB/Gauss</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="270"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1577"/>
-        <source>High</source>
-        <translation>Hoch</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="462"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1592"/>
+        <source>390LSB/Gauss</source>
+        <translation>390LSB/Gauss</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="603"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2034"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1599"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1779"/>
-        <source>Sampling rate</source>
-        <translation>Abtastrate</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="467"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1593"/>
+        <source>440LSB/Gauss</source>
+        <translation>440LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="472"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1594"/>
+        <source>660LSB/Gauss</source>
+        <translation>660LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="477"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1595"/>
+        <source>820LSB/Gauss</source>
+        <translation>820LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="482"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1596"/>
+        <source>1090LSB/Gauss</source>
+        <translation>1090LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="487"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1597"/>
+        <source>1370LSB/Gauss</source>
+        <translation>1370LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="521"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1587"/>
+        <source>Compass gain</source>
+        <translation>Kompass Empfindlichkeit</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="531"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1799"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1745"/>
+        <source>Computer model</source>
+        <translation>Computermodell</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="538"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1713"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1990"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1548"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1729"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1768"/>
+        <source>Custom text</source>
+        <translation>Benutzerdefinierter Text</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="556"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1560"/>
+        <source>OC</source>
+        <translation>OC</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="561"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1561"/>
+        <source>CC</source>
+        <translation>CC</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="566"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2336"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1562"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1793"/>
+        <source>Gauge</source>
+        <translation>Zeit-/Tiefenmesser</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="571"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1563"/>
+        <source>Apnea</source>
+        <translation>Apnoe</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="579"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1557"/>
+        <source>Dive mode</source>
+        <translation>Tauchmodus</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="590"/>
@@ -853,30 +950,12 @@
         <translation>10s</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="415"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1850"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1579"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1753"/>
-        <source>Units</source>
-        <translation>Einheiten</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="313"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1582"/>
-        <source>m/°C</source>
-        <translation>m/°C</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="318"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1583"/>
-        <source>ft/°F</source>
-        <translation>ft/°F</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="644"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1605"/>
-        <source>Dive mode color</source>
-        <translation>Tauchmodusfarbe</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="603"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2034"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1599"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1779"/>
+        <source>Sampling rate</source>
+        <translation>Abtastrate</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="614"/>
@@ -903,12 +982,6 @@
         <translation>Blau</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="425"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1585"/>
-        <source>Salinity (0-5%)</source>
-        <translation>Salzgehalt (0-5%)</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="637"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2092"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1613"/>
@@ -917,90 +990,80 @@
         <translation>Tauchcomputerzeit mit dem PC synchronisieren</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="521"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1587"/>
-        <source>Compass gain</source>
-        <translation>Kompass Empfindlichkeit</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="90"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1523"/>
-        <source>Read settings from backup file or from device before writing to the device</source>
-        <translation>Vor dem Schreiben auf das Gerät die Einstellungen aus einer Sicherungsdatei oder vom Gerät lesen</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="116"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1527"/>
-        <source>Read settings from backup file or from device before writing to a backup file</source>
-        <translation>Vor dem Schreiben in eine Sicherungsdatei die Einstellungen aus einer Sicherungsdatei oder vom Gerät lesen</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="232"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1543"/>
-        <source>OSTC, Mk.2/2N/2C</source>
-        <translation>OSTC, Mk.2/2N/2C</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="644"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1605"/>
+        <source>Dive mode color</source>
+        <translation>Tauchmodusfarbe</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="452"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1590"/>
-        <source>230LSB/Gauss</source>
-        <translation>230LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="654"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2020"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1614"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1771"/>
+        <source>Show safety stop</source>
+        <translation>Sicherheitsstopp anzeigen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="457"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1591"/>
-        <source>330LSB/Gauss</source>
-        <translation>330LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="661"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2145"/>
+        <source>End Depth</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="462"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1592"/>
-        <source>390LSB/Gauss</source>
-        <translation>390LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="671"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2162"/>
+        <source> s</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="467"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1593"/>
-        <source>440LSB/Gauss</source>
-        <translation>440LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="687"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1953"/>
+        <source>Length</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="472"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1594"/>
-        <source>660LSB/Gauss</source>
-        <translation>660LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="694"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2138"/>
+        <source>Start Depth</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="477"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1595"/>
-        <source>820LSB/Gauss</source>
-        <translation>820LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="701"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2152"/>
+        <source>Reset Depth</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="482"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1596"/>
-        <source>1090LSB/Gauss</source>
-        <translation>1090LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="711"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="736"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="758"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="904"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2181"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2206"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2228"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2307"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1626"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1786"/>
+        <source> m</source>
+        <translation>m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="487"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1597"/>
-        <source>1370LSB/Gauss</source>
-        <translation>1370LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="778"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2248"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1643"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1810"/>
+        <source>Advanced settings</source>
+        <translation>Erweiterte Einstellungen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="654"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2020"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1614"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1771"/>
-        <source>Show safety stop</source>
-        <translation>Sicherheitsstopp anzeigen</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="784"/>
+        <source>Left button sensitivity</source>
+        <translation>Linke Tastenempfindlichkeit</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="438"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1615"/>
-        <source>Reset device to default settings</source>
-        <translation>Gerät auf die Standardeinstellungen zurücksetzen</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="791"/>
+        <source>Always show ppO2</source>
+        <translation>ppO2 immer zeigen</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="798"/>
@@ -1011,20 +1074,6 @@
         <translation>Alternativer GF kann unter Wasser ausgewählt werden</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="223"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1541"/>
-        <source>Suunto Vyper family</source>
-        <translation>Suunto Vyper-Familie</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="778"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2248"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1643"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1810"/>
-        <source>Advanced settings</source>
-        <translation>Erweiterte Einstellungen</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="805"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2271"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1618"/>
@@ -1055,6 +1104,14 @@
         <translation>GF hoch</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="865"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2261"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1624"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1784"/>
+        <source>Desaturation</source>
+        <translation>Entsättigung</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="917"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2320"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1627"/>
@@ -1069,14 +1126,6 @@
         <translation> mbar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="973"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2369"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1630"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1788"/>
-        <source> min</source>
-        <translation> min</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="960"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2331"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1633"/>
@@ -1085,63 +1134,28 @@
         <translation>ZH-L16</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="47"/>
-        <source>Connect via Bluetooth</source>
-        <translation>Verbinde via Bluetooth</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="163"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1532"/>
-        <source>Save libdivecomputer logfile</source>
-        <translation>libdivecomputer-Protokolldatei speichern</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="661"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2145"/>
-        <source>End Depth</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="671"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2162"/>
-        <source> s</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="687"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1953"/>
-        <source>Length</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="694"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2138"/>
-        <source>Start Depth</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="701"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2152"/>
-        <source>Reset Depth</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="784"/>
-        <source>Left button sensitivity</source>
-        <translation>Linke Tastenempfindlichkeit</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="791"/>
-        <source>Always show ppO2</source>
-        <translation>ppO2 immer zeigen</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="965"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1634"/>
         <source>ZH-L16+GF</source>
         <translation>ZH-L16+GF</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="973"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2369"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1630"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1788"/>
+        <source> min</source>
+        <translation> min</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="983"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2398"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1636"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1800"/>
+        <source>Last deco</source>
+        <translation>Letzter Dekostopp</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1009"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2424"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1640"/>
@@ -1158,6 +1172,14 @@
         <translation>Alt GF hoch</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1042"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2457"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1639"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1805"/>
+        <source>Saturation</source>
+        <translation>Sättigung</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1052"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1642"/>
         <source>Flip screen</source>
@@ -1169,12 +1191,22 @@
         <translation>Rechte Tastenempfindlichkeit</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1066"/>
+        <source>MOD warning</source>
+        <translation>MOD Warnung</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1073"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2513"/>
         <source>Graphical speed indicator</source>
         <translation>Grafische Geschwindigkeitsanzeige</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1080"/>
+        <source>Dynamic ascent rate</source>
+        <translation>Dynamische Auftauchgeschwindigkeit</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1087"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2552"/>
         <source>Bottom gas consumption</source>
@@ -1187,6 +1219,14 @@
         <translation>Deko Gasverbauch</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1133"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1149"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2520"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2536"/>
+        <source> ℓ/min</source>
+        <translation>l/m</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1165"/>
         <source>Temperature sensor offset</source>
         <translation type="unfinished"/>
@@ -1205,6 +1245,18 @@
         <translation>Gas-Einstellungen</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1235"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1320"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2610"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2695"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1645"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1668"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1812"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1835"/>
+        <source>%O₂</source>
+        <translation>%O₂</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1240"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1325"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2615"/>
@@ -1323,16 +1375,10 @@
         <translation>Dil 5</translation>
     </message>
     <message>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1691"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1858"/>
-        <source>Set point [cbar]</source>
-        <translation>Punkt festlegen [cbar]</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1693"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1860"/>
-        <source>Change depth [m]</source>
-        <translation>Tiefe ändern [m]</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1405"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2770"/>
+        <source>Setpoint</source>
+        <translation>Einstellwert</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1415"/>
@@ -1371,6 +1417,12 @@
         <translation>SP 5</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1443"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1709"/>
+        <source>O₂ in calibration gas</source>
+        <translation>O₂ im Kalibrierungsgas</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1467"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1713"/>
         <source>Fixed setpoint</source>
@@ -1401,101 +1453,6 @@
         <translation> cbar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1748"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1733"/>
-        <source>P1 (medium)</source>
-        <extracomment>Suunto safety level</extracomment>
-        <translation>P1 (mittel)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1753"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1734"/>
-        <source>P2 (high)</source>
-        <extracomment>Suunto safety level</extracomment>
-        <translation>P2 (hoch)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1792"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1744"/>
-        <source>Total dive time</source>
-        <translation>Gesamtdauer</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2109"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1769"/>
-        <source>kg/ℓ</source>
-        <translation>kg/ℓ</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2346"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1795"/>
-        <source>Apnoea</source>
-        <translation>Apnoe</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1583"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1722"/>
-        <source>Safety level</source>
-        <translation>Sicherheitsstufe</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="54"/>
-        <source>Connect</source>
-        <translation>Verbinden</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="64"/>
-        <source>Disconnect</source>
-        <translation>Verbindung trennen</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="214"/>
-        <source>OSTC 3,Sport,Cr,2</source>
-        <translation>OSTC 3, Sport, CR, 2</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1066"/>
-        <source>MOD warning</source>
-        <translation>MOD Warnung</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1080"/>
-        <source>Dynamic ascent rate</source>
-        <translation>Dynamische Auftauchgeschwindigkeit</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1133"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1149"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2520"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2536"/>
-        <source> ℓ/min</source>
-        <translation>l/m</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1235"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1320"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2610"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2695"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1645"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1668"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1812"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1835"/>
-        <source>%O₂</source>
-        <translation>%O₂</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1405"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2770"/>
-        <source>Setpoint</source>
-        <translation>Einstellwert</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1443"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1709"/>
-        <source>O₂ in calibration gas</source>
-        <translation>O₂ im Kalibrierungsgas</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1535"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2843"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1719"/>
@@ -1512,6 +1469,12 @@
         <translation>pO₂ min</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1583"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1722"/>
+        <source>Safety level</source>
+        <translation>Sicherheitsstufe</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1609"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1723"/>
         <source>Altitude range</source>
@@ -1545,6 +1508,20 @@
         <translation>P0 (keine)</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1748"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1733"/>
+        <source>P1 (medium)</source>
+        <extracomment>Suunto safety level</extracomment>
+        <translation>P1 (mittel)</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1753"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1734"/>
+        <source>P2 (high)</source>
+        <extracomment>Suunto safety level</extracomment>
+        <translation>P2 (hoch)</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1761"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1736"/>
         <source>Sample rate</source>
@@ -1569,11 +1546,10 @@
         <translation>60s</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="531"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1799"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1745"/>
-        <source>Computer model</source>
-        <translation>Computermodell</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1792"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1744"/>
+        <source>Total dive time</source>
+        <translation>Gesamtdauer</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1816"/>
@@ -1638,12 +1614,6 @@
         <translation>Zeitalarm</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2099"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1765"/>
-        <source>Salinity</source>
-        <translation>Salzgehalt</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2074"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1774"/>
         <source>MM/DD/YY</source>
@@ -1662,12 +1632,30 @@
         <translation>JJ/MM/TT</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2099"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1765"/>
+        <source>Salinity</source>
+        <translation>Salzgehalt</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2109"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1769"/>
+        <source>kg/ℓ</source>
+        <translation>kg/ℓ</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2341"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1794"/>
         <source>ZH-L16 CC</source>
         <translation>ZH-L16 CC</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2346"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1795"/>
+        <source>Apnoea</source>
+        <translation>Apnoe</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2351"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1796"/>
         <source>L16-GF OC</source>
@@ -1686,87 +1674,112 @@
         <translation>PSCR-GF</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1108"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1129"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1539"/>
+        <source>OSTC 3</source>
+        <translation>OSTC 3</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1691"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1858"/>
+        <source>Set point [cbar]</source>
+        <translation>Punkt festlegen [cbar]</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1693"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1860"/>
+        <source>Change depth [m]</source>
+        <translation>Tiefe ändern [m]</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1110"/>
+        <source>Backup dive computer settings</source>
+        <translation>Tauchcomputereinstellungen sichern</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1111"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1132"/>
         <source>Backup files (*.xml)</source>
         <translation>Sicherungsdateien (*.xml)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1113"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1115"/>
+        <source>XML backup error</source>
+        <translation>XML-Sicherungsfehler</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1116"/>
         <source>An error occurred while saving the backup file.
 %1</source>
         <translation>Beim Speichern der Datensicherungsdatei ist ein Fehler aufgetreten.
 %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1116"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1119"/>
         <source>Backup succeeded</source>
         <translation>Sicherung abgeschlossen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1117"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1120"/>
         <source>Your settings have been saved to: %1</source>
         <translation>Deine Einstellungen wurden gespeichert nach: %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1107"/>
-        <source>Backup dive computer settings</source>
-        <translation>Tauchcomputereinstellungen sichern</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1112"/>
-        <source>XML backup error</source>
-        <translation>XML-Sicherungsfehler</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1128"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1131"/>
         <source>Restore dive computer settings</source>
         <translation>Tauchcomputereinstellungen wiederherstellen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1134"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1137"/>
         <source>XML restore error</source>
         <translation>XML-Wiederherstellungsfehler</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1135"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1138"/>
         <source>An error occurred while restoring the backup file.
 %1</source>
         <translation>Beim Wiederherstellen der Datensicherungsdatei ist ein Fehler aufgetreten.
 %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1139"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1142"/>
         <source>Restore succeeded</source>
         <translation>Wiederherstellung abgeschlossen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1140"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1143"/>
         <source>Your settings have been restored successfully.</source>
         <translation>Deine Einstellungen wurden erfolgreich wiederhergestellt.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1150"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1153"/>
         <source>Select firmware file</source>
         <translation>Firmwaredatei auswählen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1151"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1154"/>
         <source>All files (*.*)</source>
         <translation>Alle Dateien (*.*)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1207"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1210"/>
         <source>Choose file for divecomputer download logfile</source>
         <translation>Wählen Sie die Datei zum Herunterladen der Tauchcomputer-Protokolldatei aus</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1208"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1211"/>
         <source>Log files (*.log)</source>
         <translation>Protokolldateien (*.log)</translation>
     </message>
 </context>
 <context>
+    <name>ContextDrawer</name>
+    <message>
+        <location filename="../mobile-widgets/qml/kirigami/src/controls/ContextDrawer.qml" line="76"/>
+        <source>Actions</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>CylindersModel</name>
     <message>
         <location filename="../qt-models/cylindermodel.cpp" line="16"/>
@@ -1780,11 +1793,6 @@
     </message>
     <message>
         <location filename="../qt-models/cylindermodel.cpp" line="16"/>
-        <source>He%</source>
-        <translation>He%</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="16"/>
         <source>Work press.</source>
         <translation>Betriebsdruck</translation>
     </message>
@@ -1804,9 +1812,24 @@
         <translation>O₂%</translation>
     </message>
     <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="16"/>
+        <source>He%</source>
+        <translation>He%</translation>
+    </message>
+    <message>
         <location filename="../qt-models/cylindermodel.cpp" line="17"/>
-        <source>Switch at</source>
-        <translation>Wechsel bei</translation>
+        <source>Deco switch at</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
+        <source>Bot. MOD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
+        <source>MND</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-models/cylindermodel.cpp" line="17"/>
@@ -1824,17 +1847,32 @@
         <translation>ℓ</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="161"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="177"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation>Hier klicken entfernt diese Flasche.</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="383"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="180"/>
+        <source>Switch depth for deco gas. Calculated using Deco pO₂ preference, unless set manually.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="183"/>
+        <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to &apos;*&apos; for best O₂% for max depth.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="186"/>
+        <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to &apos;*&apos; for best He% for max depth.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="444"/>
         <source>Cylinder cannot be removed</source>
         <translation>Flasche kann nicht entfernt werden</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="384"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="445"/>
         <source>This gas is 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>
@@ -1854,42 +1892,24 @@
         <translation>Welche Komponenten möchtest Du kopieren</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="73"/>
+        <location filename="../build/ui_divecomponentselection.h" line="141"/>
+        <source>Dive site</source>
+        <translation>Tauchplatz</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="80"/>
         <location filename="../build/ui_divecomponentselection.h" line="142"/>
         <source>Suit</source>
         <translation>Anzug</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="122"/>
-        <location filename="../build/ui_divecomponentselection.h" line="148"/>
-        <source>Divemaster</source>
-        <translation>Tauchgruppenleiter</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="129"/>
-        <location filename="../build/ui_divecomponentselection.h" line="149"/>
-        <source>Buddy</source>
-        <translation>Buddy</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="136"/>
-        <location filename="../build/ui_divecomponentselection.h" line="150"/>
-        <source>Rating</source>
-        <translation>Bewertung</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="87"/>
         <location filename="../build/ui_divecomponentselection.h" line="143"/>
         <source>Visibility</source>
         <translation>Sicht</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="73"/>
-        <location filename="../build/ui_divecomponentselection.h" line="141"/>
-        <source>Dive site</source>
-        <translation>Tauchplatz</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="94"/>
         <location filename="../build/ui_divecomponentselection.h" line="144"/>
         <source>Notes</source>
@@ -1913,10 +1933,34 @@
         <source>Cylinders</source>
         <translation>Flaschen</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="122"/>
+        <location filename="../build/ui_divecomponentselection.h" line="148"/>
+        <source>Divemaster</source>
+        <translation>Tauchgruppenleiter</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="129"/>
+        <location filename="../build/ui_divecomponentselection.h" line="149"/>
+        <source>Buddy</source>
+        <translation>Buddy</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="136"/>
+        <location filename="../build/ui_divecomponentselection.h" line="150"/>
+        <source>Rating</source>
+        <translation>Bewertung</translation>
+    </message>
 </context>
 <context>
     <name>DiveComputerManagementDialog</name>
     <message>
+        <location filename="../desktop-widgets/divecomputermanagementdialog.ui" line="17"/>
+        <location filename="../build/ui_divecomputermanagementdialog.h" line="65"/>
+        <source>Edit dive computer nicknames</source>
+        <translation>Tauchcomputer Bezeichnung bearbeiten</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divecomputermanagementdialog.cpp" line="49"/>
         <source>Remove the selected dive computer?</source>
         <translation>Ausgewählten Tauchcomputer entfernen?</translation>
@@ -1927,12 +1971,6 @@
  remove the selected dive computer?</source>
         <translation>Tauchcomputer wirklich entfernen?</translation>
     </message>
-    <message>
-        <location filename="../desktop-widgets/divecomputermanagementdialog.ui" line="17"/>
-        <location filename="../build/ui_divecomputermanagementdialog.h" line="65"/>
-        <source>Edit dive computer nicknames</source>
-        <translation>Tauchcomputer Bezeichnung bearbeiten</translation>
-    </message>
 </context>
 <context>
     <name>DiveComputerModel</name>
@@ -1960,17 +1998,17 @@
 <context>
     <name>DiveDetails</name>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="33"/>
+        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="38"/>
         <source>Dive details</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="67"/>
+        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="72"/>
         <source>Delete dive</source>
         <translation>Tauchgang löschen</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="84"/>
+        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="89"/>
         <source>Show on map</source>
         <translation type="unfinished"/>
     </message>
@@ -1978,88 +2016,93 @@
 <context>
     <name>DiveDetailsEdit</name>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="74"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="80"/>
         <source>Dive %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="78"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="84"/>
         <source>Date:</source>
         <translation>Datum:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="86"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="92"/>
         <source>Location:</source>
         <translation>Ort:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="95"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="101"/>
         <source>Coordinates:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="104"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="110"/>
         <source>Use current
 GPS location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="118"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="124"/>
         <source>Depth:</source>
         <translation>Tiefe:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="127"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="133"/>
         <source>Duration:</source>
         <translation>Dauer:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="137"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="143"/>
         <source>Air Temp:</source>
         <translation>Lufttemp.:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="146"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="152"/>
         <source>Water Temp:</source>
         <translation>Wassertemp : </translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="155"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="161"/>
         <source>Suit:</source>
         <translation>Anzug:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="164"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="176"/>
         <source>Buddy:</source>
         <translation>Buddy:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="173"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="191"/>
         <source>Dive Master:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="182"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="206"/>
         <source>Weight:</source>
         <translation>Gewicht:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="192"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="216"/>
+        <source>Cylinder:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="231"/>
         <source>Gas mix:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="203"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="241"/>
         <source>Start Pressure:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="213"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="250"/>
         <source>End Pressure:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="224"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="260"/>
         <source>Notes:</source>
         <translation>Notizen:</translation>
     </message>
@@ -2097,42 +2140,42 @@ GPS location:</source>
         <translation>Anzug:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="159"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="158"/>
         <source>Air Temp:</source>
         <translation>Lufttemp.:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="175"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="172"/>
         <source>Cylinder:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="189"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="185"/>
         <source>Water Temp:</source>
         <translation>Wassertemp : </translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="205"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="198"/>
         <source>Dive Master:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="220"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="211"/>
         <source>Weight:</source>
         <translation>Gewicht:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="249"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="224"/>
         <source>Buddy:</source>
         <translation>Buddy:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="263"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="237"/>
         <source>SAC:</source>
         <translation>SAC:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="280"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="252"/>
         <source>Notes</source>
         <translation>Notizen</translation>
     </message>
@@ -2140,18 +2183,18 @@ GPS location:</source>
 <context>
     <name>DiveEventItem</name>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="134"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="165"/>
         <source>Manual switch to OC</source>
         <translation>Manuelles umschalten auf OC</translation>
     </message>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="136"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="167"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation> Anfang</translation>
     </message>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="137"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="168"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation> Ende</translation>
@@ -2160,27 +2203,27 @@ GPS location:</source>
 <context>
     <name>DiveImportedModel</name>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="646"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="656"/>
         <source>Date/time</source>
         <translation>Datum und Zeit</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="648"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="658"/>
         <source>Duration</source>
         <translation>Dauer</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="650"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="660"/>
         <source>Depth</source>
         <translation>Tiefe</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="672"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="682"/>
         <source>h:</source>
         <translation>h:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="672"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="682"/>
         <source>min</source>
         <translation>min</translation>
     </message>
@@ -2189,8 +2232,8 @@ GPS location:</source>
     <name>DiveList</name>
     <message>
         <location filename="../mobile-widgets/qml/DiveList.qml" line="12"/>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="226"/>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="232"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="227"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="233"/>
         <source>Dive list</source>
         <translation type="unfinished"/>
     </message>
@@ -2205,110 +2248,115 @@ GPS location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="222"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="223"/>
         <source>Cloud credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="228"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="229"/>
         <source>Please tap the &apos;+&apos; button to add a dive</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="248"/>
+        <source>No dives in dive list</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DiveListView</name>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="846"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="849"/>
         <source>Expand all</source>
         <translation>Alle ausfalten</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="848"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="851"/>
         <source>Collapse all</source>
         <translation>Alle einfalten</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="852"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="855"/>
         <source>Collapse others</source>
         <translation>Andere einklappen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="856"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="859"/>
         <source>Remove dive(s) from trip</source>
         <translation>Entferne Tauchgäng(e) aus Reise</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="857"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="860"/>
         <source>Create new trip above</source>
         <translation>Neue Reise darüber einfügen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="871"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="874"/>
         <source>Add dive(s) to trip immediately above</source>
         <translation>Tauchgäng(e) zur Reise darüber hinzufügen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="873"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="876"/>
         <source>Add dive(s) to trip immediately below</source>
         <translation>Tauchgäng(e) zur Reise darunter hinzufügen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="877"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="880"/>
         <source>Merge trip with trip above</source>
         <translation>Reise mit der darüber verbinden</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="878"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="881"/>
         <source>Merge trip with trip below</source>
         <translation>Reise mit der darunter verbinden</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="882"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="885"/>
         <source>Delete dive(s)</source>
         <translation>Tauchgäng(e) löschen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="884"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="887"/>
         <source>Mark dive(s) invalid</source>
         <translation>Tauchgäng(e) als ungültig markieren</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="888"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="891"/>
         <source>Merge selected dives</source>
         <translation>Ausgewählte Tauchgänge zusammenführen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="890"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="893"/>
         <source>Renumber dive(s)</source>
         <translation>Tauchgänge neu nummerieren</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="891"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="894"/>
         <source>Shift dive times</source>
         <translation>Tauchzeiten verschieben</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="892"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="895"/>
         <source>Split selected dives</source>
         <translation>Ausgewählte Tauchgänge splitten</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="893"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="896"/>
         <source>Load image(s) from file(s)</source>
         <translation>Bilde(r) von Datei(en) laden</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="894"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="897"/>
         <source>Load image(s) from web</source>
         <translation>Bild(er) aus Internet laden</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="917"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="919"/>
         <source>Open image files</source>
         <translation>Öffne Bilddateien</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="917"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="919"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>Bilddateien (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -2329,56 +2377,6 @@ GPS location:</source>
 <context>
     <name>DiveLogExportDialog</name>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="103"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="351"/>
-        <source>Export format</source>
-        <translation>Export Format</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="134"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="353"/>
-        <source>UDDF</source>
-        <translation>UDDF</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="187"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="358"/>
-        <source>Worldmap</source>
-        <translation>Weltkarte</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="197"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="359"/>
-        <source>I&amp;mage depths</source>
-        <translation>B&amp;ildtiefe</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="243"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="360"/>
-        <source>Selection</source>
-        <translation>Auswahl</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="252"/>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="346"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="361"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="372"/>
-        <source>Selected dives</source>
-        <translation>Ausgewählte Tauchgänge</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="262"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="362"/>
-        <source>All dives</source>
-        <translation>Alle Tauchgänge</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="306"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="396"/>
-        <source>HTML</source>
-        <translation>HTML</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="14"/>
         <location filename="../build/ui_divelogexportdialog.h" line="349"/>
         <source>Export dive log files</source>
@@ -2391,12 +2389,24 @@ GPS location:</source>
         <translation>Allgemeiner Export</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="103"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="351"/>
+        <source>Export format</source>
+        <translation>Export Format</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="115"/>
         <location filename="../build/ui_divelogexportdialog.h" line="352"/>
         <source>Subsurface &amp;XML</source>
         <translation>Subsurface &amp;XML</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="134"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="353"/>
+        <source>UDDF</source>
+        <translation>UDDF</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="147"/>
         <location filename="../build/ui_divelogexportdialog.h" line="354"/>
         <source>di&amp;velogs.de</source>
@@ -2421,238 +2431,297 @@ GPS location:</source>
         <translation>CSV-Tauchdetails</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="275"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="187"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="358"/>
+        <source>Worldmap</source>
+        <translation>Weltkarte</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="197"/>
+        <source>TeX</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="207"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="359"/>
+        <source>I&amp;mage depths</source>
+        <translation>B&amp;ildtiefe</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="253"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="360"/>
+        <source>Selection</source>
+        <translation>Auswahl</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="262"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="356"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="361"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="372"/>
+        <source>Selected dives</source>
+        <translation>Ausgewählte Tauchgänge</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="272"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="362"/>
+        <source>All dives</source>
+        <translation>Alle Tauchgänge</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="285"/>
         <location filename="../build/ui_divelogexportdialog.h" line="363"/>
         <source>CSV units</source>
         <translation>CSV-Einheiten</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="288"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="298"/>
         <location filename="../build/ui_divelogexportdialog.h" line="366"/>
         <source>Metric</source>
         <translation>Metrisch</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="293"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="303"/>
         <location filename="../build/ui_divelogexportdialog.h" line="367"/>
         <source>Imperial</source>
         <translation>Zöllig</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="324"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="316"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="396"/>
+        <source>HTML</source>
+        <translation>HTML</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="334"/>
         <location filename="../build/ui_divelogexportdialog.h" line="370"/>
         <source>General settings</source>
         <translation>Allg. Einstellungen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="330"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="340"/>
         <location filename="../build/ui_divelogexportdialog.h" line="371"/>
         <source>Subsurface numbers</source>
         <translation>Subsurface Nummern</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="359"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="369"/>
         <location filename="../build/ui_divelogexportdialog.h" line="373"/>
         <source>Export yearly statistics</source>
         <translation>Jährliche Statistiken exportieren</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="375"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="385"/>
         <location filename="../build/ui_divelogexportdialog.h" line="374"/>
         <source>All di&amp;ves</source>
         <translation>Alle Tauchgänge</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="385"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="395"/>
         <location filename="../build/ui_divelogexportdialog.h" line="375"/>
         <source>Export list only</source>
         <translation>Nur Liste exportieren</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="392"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="402"/>
         <location filename="../build/ui_divelogexportdialog.h" line="376"/>
         <source>Export photos</source>
         <translation>Photos exportieren</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="408"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="418"/>
         <location filename="../build/ui_divelogexportdialog.h" line="377"/>
         <source>Style options</source>
         <translation>Stiloptionen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="423"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="433"/>
         <location filename="../build/ui_divelogexportdialog.h" line="378"/>
         <source>Font</source>
         <translation>Schriftart</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="433"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="443"/>
         <location filename="../build/ui_divelogexportdialog.h" line="379"/>
         <source>Font size</source>
         <translation>Schriftgrösse</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="444"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="454"/>
         <location filename="../build/ui_divelogexportdialog.h" line="382"/>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="449"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="459"/>
         <location filename="../build/ui_divelogexportdialog.h" line="383"/>
         <source>10</source>
         <translation>10</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="454"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="464"/>
         <location filename="../build/ui_divelogexportdialog.h" line="384"/>
         <source>12</source>
         <translation>12</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="459"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="469"/>
         <location filename="../build/ui_divelogexportdialog.h" line="385"/>
         <source>14</source>
         <translation>14</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="464"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="474"/>
         <location filename="../build/ui_divelogexportdialog.h" line="386"/>
         <source>16</source>
         <translation>16</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="469"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="479"/>
         <location filename="../build/ui_divelogexportdialog.h" line="387"/>
         <source>18</source>
         <translation>18</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="474"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="484"/>
         <location filename="../build/ui_divelogexportdialog.h" line="388"/>
         <source>20</source>
         <translation>20</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="482"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="492"/>
         <location filename="../build/ui_divelogexportdialog.h" line="390"/>
         <source>Theme</source>
         <translation>Motiv</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="493"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="503"/>
         <location filename="../build/ui_divelogexportdialog.h" line="393"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="95"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="99"/>
         <source>Light</source>
         <translation>Licht</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="498"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="508"/>
         <location filename="../build/ui_divelogexportdialog.h" line="394"/>
         <source>Sand</source>
         <translation>Sand</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="134"/>
-        <source>UDDF files (*.uddf *.UDDF)</source>
-        <translation>UDDF Dateien (*.uddf *.UDDF)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="142"/>
-        <source>CSV files (*.csv *.CSV)</source>
-        <translation>CSV Dateien (*.csv *.CSV)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="74"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="76"/>
         <source>Generic format that is used for data exchange between a variety of diving related programs.</source>
         <translation>Generisches Format, welches zum Datenaustausch in diversen Taucherprogrammen verwendet wird.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="76"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="78"/>
         <source>Comma separated values describing the dive profile.</source>
         <translation>Kommagetrennte Werte, die das Tauchprofil beschreiben</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="78"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="80"/>
         <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source>
         <translation>Durch Kommata getrennte Werte (CSV) des Taugang. Beinhaltet die meisten Tauchgangsdetauls aber keine Profilinformation.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="80"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="82"/>
         <source>Send the dive data to divelogs.de website.</source>
         <translation>Tauchdaten an die divelogs.de-Webseite senden.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="82"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="84"/>
         <source>Send the dive data to dive-share.appspot.com website</source>
         <translation>Tauchdaten an die dive-share.appspot.com-Webseite senden</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="84"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="86"/>
         <source>HTML export of the dive locations, visualized on a world map.</source>
         <translation>HTML-Export der Tauchplätze, visualisiert auf einer Weltkarte.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="86"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="88"/>
         <source>Subsurface native XML format.</source>
         <translation>Natives Subsurface XML-Format</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="88"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="90"/>
         <source>Write depths of images to file.</source>
         <translation>Tiefe, in der das Bild aufgenommen wurde, in die Datei schreiben</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="133"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="92"/>
+        <source>Write dive as TeX macros to file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="137"/>
         <source>Export UDDF file as</source>
         <translation>UDDF-Datei exportieren als</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="137"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/>
+        <source>UDDF files (*.uddf *.UDDF)</source>
+        <translation>UDDF Dateien (*.uddf *.UDDF)</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divelogexportdialog.cpp" line="141"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="145"/>
         <source>Export CSV file as</source>
         <translation>CSV-Datei exportieren als</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="148"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="142"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="146"/>
+        <source>CSV files (*.csv *.CSV)</source>
+        <translation>CSV Dateien (*.csv *.CSV)</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="152"/>
         <source>Export world map</source>
         <translation>Weltkarte exportieren</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="149"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="169"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="153"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="177"/>
         <source>HTML files (*.html)</source>
         <translation>HTML Dateien (*.html)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="153"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="157"/>
         <source>Export Subsurface XML</source>
         <translation>Exportiere Subsurface XML</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="158"/>
         <source>XML files (*.xml *.ssrf)</source>
         <translation>XML Dateien (*.xml, *.ssrf)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="162"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="166"/>
         <source>Save image depths</source>
         <translation>Tiefe speichern, in der das Bild aufgenommen wurde</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="168"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="170"/>
+        <source>Export to TeX file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="170"/>
+        <source>TeX files (*.tex)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="176"/>
         <source>Export HTML files as</source>
         <translation>HTML-Datei exportieren als</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="184"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="192"/>
         <source>Please wait, exporting...</source>
         <translation>Bitte warten Sie, exportiere...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="219"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="227"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="311"/>
         <source>Can&apos;t open file %s</source>
         <translation>Kann Datei %s nicht öffnen</translation>
     </message>
@@ -2666,25 +2735,6 @@ GPS location:</source>
         <translation>Tauchprotokolldatei importieren</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="643"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="727"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="856"/>
-        <source>Time</source>
-        <translation>Zeit</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.ui" line="127"/>
-        <location filename="../build/ui_divelogimportdialog.h" line="164"/>
-        <source>Metric</source>
-        <translation>Metrisch</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.ui" line="132"/>
-        <location filename="../build/ui_divelogimportdialog.h" line="165"/>
-        <source>Imperial</source>
-        <translation>Zöllig</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divelogimportdialog.ui" line="89"/>
         <location filename="../build/ui_divelogimportdialog.h" line="152"/>
         <source>dd.mm.yyyy</source>
@@ -2703,74 +2753,6 @@ GPS location:</source>
         <translation>jjjj-mm-tt</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.ui" line="155"/>
-        <location filename="../build/ui_divelogimportdialog.h" line="167"/>
-        <source>Drag the tags above to each corresponding column below</source>
-        <translation>Tags auf die Spalten ziehen</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="641"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="729"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="852"/>
-        <source>Dive #</source>
-        <translation>Tauchgang Nr.</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="642"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="723"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="854"/>
-        <source>Date</source>
-        <translation>Datum</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="644"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="858"/>
-        <source>Duration</source>
-        <translation>Dauer</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="655"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="862"/>
-        <source>GPS</source>
-        <translation>GPS</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="645"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="864"/>
-        <source>Max. depth</source>
-        <translation>Max. Tiefe</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="646"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="866"/>
-        <source>Avg. depth</source>
-        <translation>Ø Tiefe</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="658"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="872"/>
-        <source>Suit</source>
-        <translation>Anzug</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="663"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="878"/>
-        <source>Tags</source>
-        <translation>Stichwörter</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="652"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="894"/>
-        <source>O₂</source>
-        <translation>O₂</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="653"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="896"/>
-        <source>He</source>
-        <translation>He</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divelogimportdialog.ui" line="108"/>
         <location filename="../build/ui_divelogimportdialog.h" line="158"/>
         <source>Seconds</source>
@@ -2789,183 +2771,269 @@ GPS location:</source>
         <translation>Minuten:Sekunden</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="654"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="860"/>
-        <source>Location</source>
-        <translation>Ort</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.ui" line="127"/>
+        <location filename="../build/ui_divelogimportdialog.h" line="164"/>
+        <source>Metric</source>
+        <translation>Metrisch</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.ui" line="132"/>
+        <location filename="../build/ui_divelogimportdialog.h" line="165"/>
+        <source>Imperial</source>
+        <translation>Zöllig</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.ui" line="155"/>
+        <location filename="../build/ui_divelogimportdialog.h" line="167"/>
+        <source>Drag the tags above to each corresponding column below</source>
+        <translation>Tags auf die Spalten ziehen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="354"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="499"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="505"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="355"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="528"/>
         <source>Tab</source>
         <translation>Tab</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="575"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="598"/>
         <source>Some column headers were pre-populated; please drag and drop the headers so they match the column they are in.</source>
         <translation>Einige Spaltenüberschriften wurden automatisch ausgefüllt. Bitte die Überschriften auf die passenden Spalten ziehen, so dass sie zum Inhalt passen.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="613"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="731"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="782"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="848"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="636"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="761"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="857"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="925"/>
         <source>Sample time</source>
         <translation>Segment Dauer</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="615"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="733"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="784"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="638"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="763"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="859"/>
         <source>Sample depth</source>
         <translation>Segment Tiefe</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="617"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="735"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="786"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="640"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="765"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="861"/>
         <source>Sample temperature</source>
         <translation>Segment Temperatur</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="621"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="739"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="790"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="642"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="767"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="863"/>
+        <source>Sample pO₂</source>
+        <translation>Segment pO₂</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="644"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="769"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="865"/>
         <source>Sample sensor1 pO₂</source>
         <translation>Segment Sensor1 pO₂</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="623"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="741"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="792"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="646"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="771"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="867"/>
         <source>Sample sensor2 pO₂</source>
         <translation>Segment Sensor2 pO₂</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="625"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="743"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="794"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="648"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="773"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="869"/>
         <source>Sample sensor3 pO₂</source>
         <translation>Segment Sensor3 pO₂</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="633"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="751"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="802"/>
-        <source>Sample stopdepth</source>
-        <translation>Segment Stopptiefe</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="637"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="755"/>
-        <source>Sample setpoint</source>
-        <translation>Segment Vorgabe</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="619"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="737"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="788"/>
-        <source>Sample pO₂</source>
-        <translation>Segment pO₂</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="627"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="745"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="796"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="650"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="775"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="871"/>
         <source>Sample CNS</source>
         <translation>Segment CNS</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="629"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="747"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="798"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="652"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="777"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="873"/>
         <source>Sample NDL</source>
         <translation>Segment Nullzeit</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="631"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="749"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="800"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="654"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="779"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="875"/>
         <source>Sample TTS</source>
         <translation>Segment Aufstiegszeit</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="635"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="753"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="804"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="656"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="781"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="877"/>
+        <source>Sample stopdepth</source>
+        <translation>Segment Stopptiefe</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="658"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="783"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="879"/>
         <source>Sample pressure</source>
         <translation>Segment Flaschendruck</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="656"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="868"/>
-        <source>Divemaster</source>
-        <translation>Divemaster</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="660"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="785"/>
+        <source>Sample setpoint</source>
+        <translation>Segment Vorgabe</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="657"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="870"/>
-        <source>Buddy</source>
-        <translation>Buddy</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="664"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="759"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="929"/>
+        <source>Dive #</source>
+        <translation>Tauchgang Nr.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="659"/>
-        <source>Rating</source>
-        <translation>Bewertung</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="665"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="753"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="931"/>
+        <source>Date</source>
+        <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="660"/>
-        <source>Visibility</source>
-        <translation>Sicht</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="666"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="757"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="933"/>
+        <source>Time</source>
+        <translation>Zeit</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="661"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="874"/>
-        <source>Notes</source>
-        <translation>Notizen</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="667"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="935"/>
+        <source>Duration</source>
+        <translation>Dauer</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="662"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="876"/>
-        <source>Weight</source>
-        <translation>Gewicht</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="668"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="941"/>
+        <source>Max. depth</source>
+        <translation>Max. Tiefe</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="669"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="943"/>
+        <source>Avg. depth</source>
+        <translation>Ø Tiefe</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="670"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="975"/>
+        <source>Air temp.</source>
+        <translation>Lufttemp.</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="671"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="977"/>
+        <source>Water temp.</source>
+        <translation>Wassertemp.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="649"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="888"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="672"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="965"/>
         <source>Cyl. size</source>
         <translation>Flaschengrösse</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="650"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="890"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="673"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="967"/>
         <source>Start pressure</source>
         <translation>Anfangsdruck</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="651"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="892"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="674"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="969"/>
         <source>End pressure</source>
         <translation>Enddruck</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="647"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="898"/>
-        <source>Air temp.</source>
-        <translation>Lufttemp.</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="675"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="971"/>
+        <source>O₂</source>
+        <translation>O₂</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="648"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="900"/>
-        <source>Water temp.</source>
-        <translation>Wassertemp.</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="676"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="973"/>
+        <source>He</source>
+        <translation>He</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="677"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="937"/>
+        <source>Location</source>
+        <translation>Ort</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="678"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="939"/>
+        <source>GPS</source>
+        <translation>GPS</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="679"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="945"/>
+        <source>Divemaster</source>
+        <translation>Divemaster</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="680"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="947"/>
+        <source>Buddy</source>
+        <translation>Buddy</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="681"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="949"/>
+        <source>Suit</source>
+        <translation>Anzug</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="682"/>
+        <source>Rating</source>
+        <translation>Bewertung</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="683"/>
+        <source>Visibility</source>
+        <translation>Sicht</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="684"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="951"/>
+        <source>Notes</source>
+        <translation>Notizen</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="685"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="953"/>
+        <source>Weight</source>
+        <translation>Gewicht</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="686"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="955"/>
+        <source>Tags</source>
+        <translation>Stichwörter</translation>
     </message>
 </context>
 <context>
     <name>DiveObjectHelper</name>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="287"/>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="323"/>
         <source>%1 dive(s)</source>
         <translation type="unfinished"/>
     </message>
@@ -2973,18 +3041,18 @@ GPS location:</source>
 <context>
     <name>DivePlanner</name>
     <message>
-        <location filename="../desktop-widgets/diveplanner.ui" line="152"/>
-        <location filename="../build/ui_diveplanner.h" line="190"/>
-        <source>Altitude</source>
-        <translation>Meereshöhe</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/diveplanner.ui" line="109"/>
         <location filename="../build/ui_diveplanner.h" line="189"/>
         <source>Planned dive time</source>
         <translation>Geplante Dauer</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/diveplanner.ui" line="152"/>
+        <location filename="../build/ui_diveplanner.h" line="190"/>
+        <source>Altitude</source>
+        <translation>Meereshöhe</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/diveplanner.ui" line="159"/>
         <location filename="../build/ui_diveplanner.h" line="191"/>
         <source>ATM pressure</source>
@@ -3018,32 +3086,32 @@ GPS location:</source>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="134"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="136"/>
         <source>unknown</source>
         <translation>unbekannt</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="312"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="326"/>
         <source>Final depth</source>
         <translation>Endtiefe</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="314"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="328"/>
         <source>Run time</source>
         <translation>Laufzeit</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="316"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="330"/>
         <source>Duration</source>
         <translation>Dauer</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="318"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="332"/>
         <source>Used gas</source>
         <translation>Gasverbrauch</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="320"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="334"/>
         <source>CC setpoint</source>
         <translation>CC Sollwert</translation>
     </message>
@@ -3051,22 +3119,22 @@ GPS location:</source>
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="108"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="112"/>
         <source>Dive planner points</source>
         <translation>Planerpunkte</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="112"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="116"/>
         <source>Available gases</source>
         <translation>Verfügbare Gase</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="137"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="143"/>
         <source>Add dive data point</source>
         <translation>Datenpunkt hinzufügen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="146"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="152"/>
         <source>Save new</source>
         <translation>Neue speichern</translation>
     </message>
@@ -3099,11 +3167,36 @@ GPS location:</source>
         <translation>Farbe</translation>
     </message>
     <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="124"/>
+        <source>User entered</source>
+        <translation>Benutzer Eingabe</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="126"/>
+        <source>Cylinder index</source>
+        <translation>Flaschen Index</translation>
+    </message>
+    <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="128"/>
         <source>Pressure S</source>
         <translation>Druck S</translation>
     </message>
     <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="130"/>
+        <source>Pressure I</source>
+        <translation>Druck I</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="132"/>
+        <source>Ceiling</source>
+        <translation>Tiefster Deko-Stopp</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="134"/>
+        <source>SAC</source>
+        <translation>SAC</translation>
+    </message>
+    <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="136"/>
         <source>pN₂</source>
         <translation>pN₂</translation>
@@ -3139,49 +3232,24 @@ GPS location:</source>
         <translation>Sensor 3</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="152"/>
-        <source>Heart rate</source>
-        <translation>Pulsrate</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="156"/>
-        <source>Mean depth @ s</source>
-        <translation>Mittlere Tiefe @ s</translation>
-    </message>
-    <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="150"/>
         <source>Ambient pressure</source>
         <translation>Umgebungsdruck</translation>
     </message>
     <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="152"/>
+        <source>Heart rate</source>
+        <translation>Pulsrate</translation>
+    </message>
+    <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="154"/>
         <source>Gradient factor</source>
         <translation>Gradientenfaktor</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="130"/>
-        <source>Pressure I</source>
-        <translation>Druck I</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="124"/>
-        <source>User entered</source>
-        <translation>Benutzer Eingabe</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="126"/>
-        <source>Cylinder index</source>
-        <translation>Flaschen Index</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="132"/>
-        <source>Ceiling</source>
-        <translation>Tiefster Deko-Stopp</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="134"/>
-        <source>SAC</source>
-        <translation>SAC</translation>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="156"/>
+        <source>Mean depth @ s</source>
+        <translation>Mittlere Tiefe @ s</translation>
     </message>
 </context>
 <context>
@@ -3252,311 +3320,315 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="395"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="441"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="434"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="483"/>
         <source>#</source>
         <translation>Nr.</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="398"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="444"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="437"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="486"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="401"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="447"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="440"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="489"/>
         <source>Rating</source>
         <translation>Bewertung</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="404"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="443"/>
         <source>Depth</source>
         <translation>Tiefe</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="410"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="446"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="495"/>
+        <source>Duration</source>
+        <translation>Dauer</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="449"/>
         <source>Temp</source>
         <translation>Temperatur</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="413"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="452"/>
         <source>Weight</source>
         <translation>Gewicht</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="425"/>
-        <source>SAC</source>
-        <translation>SAC</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
-        <source>m</source>
-        <translation>m</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
-        <source>ft</source>
-        <translation>ft</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
-        <source>Weight(%1)</source>
-        <translation>Gewicht(%1)</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="416"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="462"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="455"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="504"/>
         <source>Suit</source>
         <translation>Anzug</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="419"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="465"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="458"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="507"/>
         <source>Cyl</source>
         <translation>Flasche</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="422"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="468"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="461"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="510"/>
         <source>Gas</source>
         <translation>Gas</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
-        <source>SAC(%1)</source>
-        <translation>SAC(%1)</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="464"/>
+        <source>SAC</source>
+        <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
-        <source>/min</source>
-        <translation>/min</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="467"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="518"/>
+        <source>OTU</source>
+        <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="431"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="479"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="470"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="521"/>
         <source>Max CNS</source>
         <translation>Max. CNS</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="434"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="482"/>
-        <source>Location</source>
-        <translation>Ort</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
+        <source>Photos</source>
+        <translation>Bilder</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
-        <source>kg</source>
-        <translation>kg</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="476"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="527"/>
+        <source>Location</source>
+        <translation>Ort</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="492"/>
         <source>Depth(%1)</source>
         <translation>Tiefe(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="407"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="453"/>
-        <source>Duration</source>
-        <translation>Dauer</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="492"/>
+        <source>m</source>
+        <translation>m</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="492"/>
+        <source>ft</source>
+        <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="456"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="498"/>
         <source>Temp(%1%2)</source>
         <translation>Temp(%1%2)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="501"/>
+        <source>Weight(%1)</source>
+        <translation>Gewicht(%1)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="501"/>
+        <source>kg</source>
+        <translation>kg</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="501"/>
         <source>lbs</source>
         <translation>US Pfund</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="428"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="476"/>
-        <source>OTU</source>
-        <translation>OTU</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="515"/>
+        <source>SAC(%1)</source>
+        <translation>SAC(%1)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="515"/>
+        <source>/min</source>
+        <translation>/min</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="524"/>
+        <source>Photos before/during/after dive</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="164"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="165"/>
         <source>no dives were selected</source>
         <translation>keine Tauchgänge ausgewählt</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="174"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="175"/>
         <source>stylesheet to export to divelogs.de is not found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="184"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="185"/>
         <source>failed to create zip file for upload: %s</source>
         <translation>konnte keine zip-Datei zum Hochladen erstellen: %s</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="236"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="237"/>
         <source>internal error</source>
         <translation>ein interner Fehler ist aufgetreten</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="244"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="245"/>
         <source>Conversion of dive %1 to divelogs.de format failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="272"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="273"/>
         <source>error writing zip file: %s zip error %d system error %d - %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="745"/>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="935"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="936"/>
         <source>Done</source>
         <translation>Fertig</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="778"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="779"/>
         <source>Uploading dive list...</source>
         <translation>Liste der Tauchgänge wird hochgeladen...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="810"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="811"/>
         <source>Downloading dive list...</source>
         <translation>Liste der Tauchgänge herunterladen...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="851"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="852"/>
         <source>Downloading %1 dives...</source>
         <translation>Lade %1 Tauchgänge vom Server...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="885"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="886"/>
         <source>Download finished - %1</source>
         <translation>Herunterladen beendet - %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="899"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="900"/>
         <source>Problem with download</source>
         <translation>Probleme beim Herunterladen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="900"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="901"/>
         <source>The archive could not be opened:
 </source>
         <translation>Das Archiv konnte nicht geöffnet werden:
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="909"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="910"/>
         <source>Corrupted download</source>
         <translation>Heruntergeladene Daten sind beschädigt.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="910"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="911"/>
         <source>The archive could not be opened:
 %1</source>
         <translation>Das Archiv konnte nicht geöffnet werden
 %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="937"/>
+        <source>Upload finished</source>
+        <translation>Hochladen abgeschlossen</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="950"/>
         <source>Upload failed</source>
         <translation>Hochladen fehlgeschlagen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="952"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="953"/>
         <source>Upload successful</source>
         <translation>Hochladen erfolgreich</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="955"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="956"/>
         <source>Login failed</source>
         <translation>Anmeldung fehlgeschlagen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="958"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="959"/>
         <source>Cannot parse response</source>
         <translation>Verstehe die Antwort nicht</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="970"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="971"/>
         <source>Error: %1</source>
         <translation>Fehler: %1</translation>
     </message>
-    <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="936"/>
-        <source>Upload finished</source>
-        <translation>Hochladen abgeschlossen</translation>
-    </message>
 </context>
 <context>
     <name>DownloadFromDCWidget</name>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="185"/>
-        <source>Error</source>
-        <translation>Fehler</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="436"/>
-        <source>Retry</source>
-        <translation>Wiederholen</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="280"/>
-        <source>Find Uemis dive computer</source>
-        <translation>Finde Uemis Tauchcomputer</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="101"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="107"/>
         <source>Download</source>
         <translation>Herunterladen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="104"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="110"/>
         <source>Choose Bluetooth download mode</source>
         <translation>Wählen Sie den Bluetooth download Modus</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="382"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="191"/>
+        <source>Error</source>
+        <translation>Fehler</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="286"/>
+        <source>Find Uemis dive computer</source>
+        <translation>Finde Uemis Tauchcomputer</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="392"/>
         <source>Choose file for divecomputer download logfile</source>
         <translation>Wählen Sie die Datei zum Herunterladen der Tauchcomputer-Protokolldatei aus</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="383"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="393"/>
         <source>Log files (*.log)</source>
         <translation>Protokolldateien (*.log)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="398"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="408"/>
         <source>Warning</source>
         <translation>Warnung</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="399"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="409"/>
         <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="../desktop-widgets/downloadfromdivecomputer.cpp" line="410"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="420"/>
         <source>Choose file for divecomputer binary dump file</source>
         <translation>Datei auswählen, in die der libdivecomputer Dump gespeichert werden soll</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="411"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="421"/>
         <source>Dump files (*.bin)</source>
         <translation>Dump Dateien (*.bin)</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="446"/>
+        <source>Retry</source>
+        <translation>Wiederholen</translation>
+    </message>
 </context>
 <context>
     <name>DownloadFromDiveComputer</name>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="139"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="275"/>
-        <source>Vendor</source>
-        <translation>Hersteller</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="14"/>
         <location filename="../build/ui_downloadfromdivecomputer.h" line="265"/>
         <source>Download from dive computer</source>
@@ -3569,17 +3641,6 @@ p, li { white-space: pre-wrap; }
         <translation>Gerät oder Einhängepunkt</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="122"/>
-        <source>Choose Bluetooth download mode</source>
-        <translation>Wählen Sie den Bluetooth download Modus</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="149"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="276"/>
-        <source>Dive computer</source>
-        <translation>Tauchcomputer</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="66"/>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="101"/>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="115"/>
@@ -3603,11 +3664,46 @@ p, li { white-space: pre-wrap; }
         <translation>Heruntergeladene Tauchgänge immer bevorzugen</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="87"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="270"/>
+        <source>Download into new trip</source>
+        <translation>Download in neue Reise</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="94"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="271"/>
+        <source>Save libdivecomputer logfile</source>
+        <translation>libdivecomputer-Protokolldatei speichern</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="108"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="273"/>
+        <source>Save libdivecomputer dumpfile</source>
+        <translation>Dump Datei der libdivecomputer Übertragung speichern</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="122"/>
+        <source>Choose Bluetooth download mode</source>
+        <translation>Wählen Sie den Bluetooth download Modus</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="129"/>
         <source>Select a remote Bluetooth device.</source>
         <translation>Wählen Sie ein externes Bluetooth Gerät.</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="139"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="275"/>
+        <source>Vendor</source>
+        <translation>Hersteller</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="149"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="276"/>
+        <source>Dive computer</source>
+        <translation>Tauchcomputer</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/>
         <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="52"/>
         <location filename="../build/ui_downloadfromdivecomputer.h" line="277"/>
@@ -3615,18 +3711,6 @@ p, li { white-space: pre-wrap; }
         <translation>Herunterladen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="284"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="281"/>
-        <source>OK</source>
-        <translation>OK</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="291"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="282"/>
-        <source>Cancel</source>
-        <translation>Abbrechen</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="226"/>
         <location filename="../build/ui_downloadfromdivecomputer.h" line="278"/>
         <source>Downloaded dives</source>
@@ -3645,22 +3729,16 @@ p, li { white-space: pre-wrap; }
         <translation>Alles abwählen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="94"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="271"/>
-        <source>Save libdivecomputer logfile</source>
-        <translation>libdivecomputer-Protokolldatei speichern</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="108"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="273"/>
-        <source>Save libdivecomputer dumpfile</source>
-        <translation>Dump Datei der libdivecomputer Übertragung speichern</translation>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="284"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="281"/>
+        <source>OK</source>
+        <translation>OK</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="87"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="270"/>
-        <source>Download into new trip</source>
-        <translation>Download in neue Reise</translation>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="291"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="282"/>
+        <source>Cancel</source>
+        <translation>Abbrechen</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="16"/>
@@ -3750,12 +3828,12 @@ p, li { white-space: pre-wrap; }
         <translation>Verbinden mit facebook Text Platzhalter</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="297"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="242"/>
         <source>To disconnect Subsurface from your Facebook account, use the button below</source>
         <translation>Um die Verbindung mit Facebook zu unterbrechen, bitte diesen Knopf drücken.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="306"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="251"/>
         <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source>
         <translation>Um Subsurface mit Facebook zu verbinden, bitte einloggen. Damit ist es möglich, Tauchgänge auf Facebook zu posten.</translation>
     </message>
@@ -3763,22 +3841,22 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>FacebookManager</name>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="266"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="211"/>
         <source>Photo upload sucessfull</source>
         <translation>Hochladen des Fotos war erfolgreich</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="267"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="212"/>
         <source>Your dive profile was updated to Facebook.</source>
         <translation>Dein Tauchprofil auf Facebook wurde aktualisiert.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="271"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="216"/>
         <source>Photo upload failed</source>
         <translation>Hochladen des Fotos ist fehlgeschlagen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="272"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="217"/>
         <source>Your dive profile was not updated to Facebook, 
  please send the following to the developer. 
 </source>
@@ -3840,17 +3918,25 @@ bitte sende Folgendes an die Entwickler.
 <context>
     <name>FirmwareUpdateThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1750"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1739"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Diese Funktion ist für den ausgewählten Tauchcomputer noch nicht verfügbar.</translation>
     </message>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1755"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1744"/>
         <source>Firmware update failed!</source>
         <translation>Firmware-Aktualisierung fehlgeschlagen!</translation>
     </message>
 </context>
 <context>
+    <name>GlobalDrawer</name>
+    <message>
+        <location filename="../mobile-widgets/qml/kirigami/src/controls/GlobalDrawer.qml" line="364"/>
+        <source>Back</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>GlobeGPS</name>
     <message>
         <location filename="../desktop-widgets/globe.cpp" line="124"/>
@@ -3866,27 +3952,27 @@ bitte sende Folgendes an die Entwickler.
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="40"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="32"/>
         <source>Date: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="50"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="42"/>
         <source>Name: </source>
         <translation>Name:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="60"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="52"/>
         <source>Latitude: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="69"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="61"/>
         <source>Longitude: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="113"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="105"/>
         <source>List of stored GPS fixes</source>
         <translation type="unfinished"/>
     </message>
@@ -3915,7 +4001,7 @@ bitte sende Folgendes an die Entwickler.
 <context>
     <name>LocationFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="648"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="646"/>
         <source>Location: </source>
         <translation>Ort:</translation>
     </message>
@@ -3956,7 +4042,7 @@ bitte sende Folgendes an die Entwickler.
 <context>
     <name>LocationFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="299"/>
+        <location filename="../qt-models/filtermodels.cpp" line="304"/>
         <source>No location set</source>
         <translation>Kein Ort festgelegt</translation>
     </message>
@@ -4078,20 +4164,55 @@ Möchtest Du fortfahren?</translation>
     </message>
 </context>
 <context>
-    <name>MainForm.ui</name>
+    <name>MainTab</name>
     <message>
-        <location filename="../packaging/ios/Subsurface-mobile/MainForm.ui.qml" line="17"/>
-        <source>Press Me 1</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/maintab.ui" line="18"/>
+        <location filename="../desktop-widgets/maintab.ui" line="439"/>
+        <location filename="../build/ui_maintab.h" line="961"/>
+        <location filename="../build/ui_maintab.h" line="963"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="539"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="571"/>
+        <source>Notes</source>
+        <translation>Notizen</translation>
     </message>
     <message>
-        <location filename="../packaging/ios/Subsurface-mobile/MainForm.ui.qml" line="22"/>
-        <source>Press Me 2</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/maintab.ui" line="21"/>
+        <location filename="../build/ui_maintab.h" line="964"/>
+        <source>General notes about the current selection</source>
+        <translation>Generelle Notizen in der derzeitigen Auswahl</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="92"/>
+        <location filename="../desktop-widgets/maintab.ui" line="646"/>
+        <location filename="../build/ui_maintab.h" line="947"/>
+        <location filename="../build/ui_maintab.h" line="967"/>
+        <source>Date</source>
+        <translation>Datum</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="102"/>
+        <location filename="../build/ui_maintab.h" line="948"/>
+        <source>Time</source>
+        <translation>Zeit</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="112"/>
+        <location filename="../desktop-widgets/maintab.ui" line="836"/>
+        <location filename="../build/ui_maintab.h" line="949"/>
+        <location filename="../build/ui_maintab.h" line="987"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="306"/>
+        <source>Air temp.</source>
+        <translation>Lufttemp.</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="122"/>
+        <location filename="../desktop-widgets/maintab.ui" line="855"/>
+        <location filename="../build/ui_maintab.h" line="950"/>
+        <location filename="../build/ui_maintab.h" line="989"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="307"/>
+        <source>Water temp.</source>
+        <translation>Wassertemp.</translation>
     </message>
-</context>
-<context>
-    <name>MainTab</name>
     <message>
         <location filename="../desktop-widgets/maintab.ui" line="184"/>
         <location filename="../build/ui_maintab.h" line="951"/>
@@ -4100,6 +4221,17 @@ Möchtest Du fortfahren?</translation>
         <translation>Ort</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="214"/>
+        <source>Edit dive site</source>
+        <translation>Tauchplatz bearbeiten</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="217"/>
+        <location filename="../build/ui_maintab.h" line="953"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="252"/>
         <location filename="../build/ui_maintab.h" line="954"/>
         <source>Divemaster</source>
@@ -4112,12 +4244,6 @@ Möchtest Du fortfahren?</translation>
         <translation>Buddy</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.ui" line="387"/>
-        <location filename="../build/ui_maintab.h" line="959"/>
-        <source>Tags</source>
-        <translation>Stichwörter</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/maintab.ui" line="308"/>
         <location filename="../build/ui_maintab.h" line="956"/>
         <source>Rating</source>
@@ -4136,57 +4262,18 @@ Möchtest Du fortfahren?</translation>
         <translation>Anzug</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="387"/>
+        <location filename="../build/ui_maintab.h" line="959"/>
+        <source>Tags</source>
+        <translation>Stichwörter</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="397"/>
         <location filename="../build/ui_maintab.h" line="960"/>
         <source>Dive mode</source>
         <translation>Tauchmodus</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.ui" line="112"/>
-        <location filename="../desktop-widgets/maintab.ui" line="836"/>
-        <location filename="../build/ui_maintab.h" line="949"/>
-        <location filename="../build/ui_maintab.h" line="987"/>
-        <location filename="../desktop-widgets/maintab.cpp" line="306"/>
-        <source>Air temp.</source>
-        <translation>Lufttemp.</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="122"/>
-        <location filename="../desktop-widgets/maintab.ui" line="855"/>
-        <location filename="../build/ui_maintab.h" line="950"/>
-        <location filename="../build/ui_maintab.h" line="989"/>
-        <location filename="../desktop-widgets/maintab.cpp" line="307"/>
-        <source>Water temp.</source>
-        <translation>Wassertemp.</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="18"/>
-        <location filename="../desktop-widgets/maintab.ui" line="439"/>
-        <location filename="../build/ui_maintab.h" line="961"/>
-        <location filename="../build/ui_maintab.h" line="963"/>
-        <location filename="../desktop-widgets/maintab.cpp" line="539"/>
-        <location filename="../desktop-widgets/maintab.cpp" line="571"/>
-        <source>Notes</source>
-        <translation>Notizen</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="21"/>
-        <location filename="../build/ui_maintab.h" line="964"/>
-        <source>General notes about the current selection</source>
-        <translation>Generelle Notizen in der derzeitigen Auswahl</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="214"/>
-        <source>Edit dive site</source>
-        <translation>Tauchplatz bearbeiten</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="217"/>
-        <location filename="../build/ui_maintab.h" line="953"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/maintab.ui" line="491"/>
         <location filename="../build/ui_maintab.h" line="965"/>
         <source>Equipment</source>
@@ -4211,6 +4298,12 @@ Möchtest Du fortfahren?</translation>
         <translation>Tauchinformation</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="665"/>
+        <location filename="../build/ui_maintab.h" line="969"/>
+        <source>Interval</source>
+        <translation>Oberflächenpause</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="684"/>
         <location filename="../build/ui_maintab.h" line="971"/>
         <source>Gases used</source>
@@ -4223,18 +4316,38 @@ Möchtest Du fortfahren?</translation>
         <translation>Gasverbrauch</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="722"/>
+        <location filename="../desktop-widgets/maintab.ui" line="1094"/>
+        <location filename="../build/ui_maintab.h" line="975"/>
+        <location filename="../build/ui_maintab.h" line="1003"/>
+        <source>SAC</source>
+        <translation>SAC</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="741"/>
         <location filename="../build/ui_maintab.h" line="977"/>
         <source>CNS</source>
         <translation>CNS</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="760"/>
+        <location filename="../build/ui_maintab.h" line="979"/>
+        <source>OTU</source>
+        <translation>OTU</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="779"/>
         <location filename="../build/ui_maintab.h" line="981"/>
         <source>Max. depth</source>
         <translation>Max. Tiefe</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="798"/>
+        <location filename="../build/ui_maintab.h" line="983"/>
+        <source>Avg. depth</source>
+        <translation>Ø Tiefe</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="817"/>
         <location filename="../build/ui_maintab.h" line="985"/>
         <source>Air pressure</source>
@@ -4247,82 +4360,6 @@ Möchtest Du fortfahren?</translation>
         <translation>Dauer</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.ui" line="933"/>
-        <location filename="../build/ui_maintab.h" line="1007"/>
-        <source>Simple statistics about the selection</source>
-        <translation>Einfache Statistiken über die Auswahl</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1039"/>
-        <location filename="../build/ui_maintab.h" line="999"/>
-        <source>Total time</source>
-        <translation>Gesamtzeit</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1106"/>
-        <location filename="../build/ui_maintab.h" line="1004"/>
-        <source>Gas consumption</source>
-        <translation>Gasverbrauch</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1151"/>
-        <location filename="../build/ui_maintab.h" line="1009"/>
-        <source>All photos from the current selection</source>
-        <translation>Alle Fotos aus der aktuellen Auswahl</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1177"/>
-        <location filename="../build/ui_maintab.h" line="1010"/>
-        <source>Extra data</source>
-        <translation>Zusatzdaten</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1180"/>
-        <location filename="../build/ui_maintab.h" line="1011"/>
-        <source>Adittional data from the dive computer</source>
-        <translation>Zusatzinformationen des Tauchcomputers</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="92"/>
-        <location filename="../desktop-widgets/maintab.ui" line="646"/>
-        <location filename="../build/ui_maintab.h" line="947"/>
-        <location filename="../build/ui_maintab.h" line="967"/>
-        <source>Date</source>
-        <translation>Datum</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="102"/>
-        <location filename="../build/ui_maintab.h" line="948"/>
-        <source>Time</source>
-        <translation>Zeit</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="665"/>
-        <location filename="../build/ui_maintab.h" line="969"/>
-        <source>Interval</source>
-        <translation>Oberflächenpause</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="722"/>
-        <location filename="../desktop-widgets/maintab.ui" line="1094"/>
-        <location filename="../build/ui_maintab.h" line="975"/>
-        <location filename="../build/ui_maintab.h" line="1003"/>
-        <source>SAC</source>
-        <translation>SAC</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="798"/>
-        <location filename="../build/ui_maintab.h" line="983"/>
-        <source>Avg. depth</source>
-        <translation>Ø Tiefe</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="760"/>
-        <location filename="../build/ui_maintab.h" line="979"/>
-        <source>OTU</source>
-        <translation>OTU</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/maintab.ui" line="893"/>
         <location filename="../build/ui_maintab.h" line="993"/>
         <source>Salinity</source>
@@ -4335,22 +4372,34 @@ Möchtest Du fortfahren?</translation>
         <translation>Statistiken</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="933"/>
+        <location filename="../build/ui_maintab.h" line="1007"/>
+        <source>Simple statistics about the selection</source>
+        <translation>Einfache Statistiken über die Auswahl</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="986"/>
         <location filename="../build/ui_maintab.h" line="996"/>
         <source>Depth</source>
         <translation>Tiefe</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="998"/>
+        <location filename="../build/ui_maintab.h" line="997"/>
+        <source>Duration</source>
+        <translation>Dauer</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="1027"/>
         <location filename="../build/ui_maintab.h" line="998"/>
         <source>Temperature</source>
         <translation>Temperatur</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.ui" line="998"/>
-        <location filename="../build/ui_maintab.h" line="997"/>
-        <source>Duration</source>
-        <translation>Dauer</translation>
+        <location filename="../desktop-widgets/maintab.ui" line="1039"/>
+        <location filename="../build/ui_maintab.h" line="999"/>
+        <source>Total time</source>
+        <translation>Gesamtzeit</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/maintab.ui" line="1058"/>
@@ -4359,20 +4408,34 @@ Möchtest Du fortfahren?</translation>
         <translation>Tauchgänge</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="1106"/>
+        <location filename="../build/ui_maintab.h" line="1004"/>
+        <source>Gas consumption</source>
+        <translation>Gasverbrauch</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="1148"/>
         <location filename="../build/ui_maintab.h" line="1008"/>
         <source>Photos</source>
         <translation>Bilder</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.cpp" line="88"/>
-        <source>Cylinders</source>
-        <translation>Flaschen</translation>
+        <location filename="../desktop-widgets/maintab.ui" line="1151"/>
+        <location filename="../build/ui_maintab.h" line="1009"/>
+        <source>All photos from the current selection</source>
+        <translation>Alle Fotos aus der aktuellen Auswahl</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.cpp" line="92"/>
-        <source>Weights</source>
-        <translation>Blei</translation>
+        <location filename="../desktop-widgets/maintab.ui" line="1177"/>
+        <location filename="../build/ui_maintab.h" line="1010"/>
+        <source>Extra data</source>
+        <translation>Zusatzdaten</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="1180"/>
+        <location filename="../build/ui_maintab.h" line="1011"/>
+        <source>Adittional data from the dive computer</source>
+        <translation>Zusatzinformationen des Tauchcomputers</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/maintab.cpp" line="63"/>
@@ -4385,11 +4448,21 @@ Möchtest Du fortfahren?</translation>
         <translation>Änderungen Verwerfen</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.cpp" line="88"/>
+        <source>Cylinders</source>
+        <translation>Flaschen</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.cpp" line="89"/>
         <source>Add cylinder</source>
         <translation>Flasche hinzufügen</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.cpp" line="92"/>
+        <source>Weights</source>
+        <translation>Blei</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.cpp" line="93"/>
         <source>Add weight system</source>
         <translation>Gewicht hinzufügen</translation>
@@ -4582,659 +4655,685 @@ den folgenden Gasen gemischt werden:
         <translation>&amp;Datei</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="455"/>
-        <location filename="../build/ui_mainwindow.h" line="534"/>
-        <source>Export dive logs</source>
-        <translation>Logbücher exportieren</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="510"/>
-        <location filename="../build/ui_mainwindow.h" line="542"/>
-        <source>Toggle pHe graph</source>
-        <translation>pHe-Kurve ein-/ausschalten</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="546"/>
-        <location filename="../build/ui_mainwindow.h" line="545"/>
-        <source>Toggle calculating all tissues</source>
-        <translation>Berechnung aller Gewebe ein-/ausschalten</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="522"/>
-        <location filename="../build/ui_mainwindow.h" line="543"/>
-        <source>Toggle DC reported ceiling</source>
-        <translation>Auftauchgrenze Tauchcomputer ein-/ausschalten</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="534"/>
-        <location filename="../build/ui_mainwindow.h" line="544"/>
-        <source>Toggle calculated ceiling</source>
-        <translation>Berechnete Auftauchgrenze ein-/ausschalten</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="606"/>
-        <location filename="../build/ui_mainwindow.h" line="550"/>
-        <source>Toggle NDL, TTS</source>
-        <translation>Nullzeit, Gesamtaufstiegszeit ein-/ausschalten</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="558"/>
-        <location filename="../build/ui_mainwindow.h" line="546"/>
-        <source>Toggle calculated ceiling with 3m increments</source>
-        <translation>Berechnete Auftauchgrenze in 3m Schritten ein-/ausschalten</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="463"/>
-        <location filename="../build/ui_mainwindow.h" line="537"/>
-        <source>Configure &amp;dive computer</source>
-        <translation>&amp;Tauchcomputer konfigurieren</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="570"/>
-        <location filename="../build/ui_mainwindow.h" line="547"/>
-        <source>Toggle heart rate</source>
-        <translation>Pulsrate ein-/ausschalten</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="582"/>
-        <location filename="../build/ui_mainwindow.h" line="548"/>
-        <source>Toggle MOD</source>
-        <translation>MOD ein-/ausschalten</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="594"/>
-        <location filename="../build/ui_mainwindow.h" line="549"/>
-        <source>Toggle EAD, END, EADD</source>
-        <translation>EAD, END, EADD ein-/ausschalten</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="618"/>
-        <location filename="../build/ui_mainwindow.h" line="551"/>
-        <source>Toggle SAC rate</source>
-        <translation>SAC Rate ein-/ausschalten</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="630"/>
-        <location filename="../build/ui_mainwindow.h" line="552"/>
-        <source>Toggle ruler</source>
-        <translation>Lineal ein-/ausschalten</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="86"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="87"/>
         <location filename="../build/ui_mainwindow.h" line="569"/>
         <source>&amp;Log</source>
         <translation>&amp;Logbuch</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="105"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="104"/>
         <location filename="../build/ui_mainwindow.h" line="570"/>
         <source>&amp;View</source>
         <translation>&amp;Ansicht</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="121"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="120"/>
         <location filename="../build/ui_mainwindow.h" line="571"/>
         <source>&amp;Help</source>
         <translation>&amp;Hilfe</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="130"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="129"/>
         <location filename="../build/ui_mainwindow.h" line="572"/>
         <source>&amp;Import</source>
         <translation>&amp;Importieren</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="139"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="138"/>
         <location filename="../build/ui_mainwindow.h" line="573"/>
         <source>&amp;Edit</source>
         <translation>B&amp;earbeiten</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="144"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="143"/>
         <source>Share on</source>
         <translation>Teilen auf</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="158"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="157"/>
         <location filename="../build/ui_mainwindow.h" line="453"/>
         <source>&amp;New logbook</source>
         <translation>&amp;Neues Logbuch</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="161"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="160"/>
         <location filename="../build/ui_mainwindow.h" line="455"/>
         <source>New</source>
         <translation>Neu</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="164"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="163"/>
         <location filename="../build/ui_mainwindow.h" line="457"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="169"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="168"/>
         <location filename="../build/ui_mainwindow.h" line="458"/>
         <source>&amp;Open logbook</source>
         <translation>Logbuch &amp;öffnen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="172"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="171"/>
         <location filename="../build/ui_mainwindow.h" line="460"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="508"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="502"/>
         <source>Open</source>
         <translation>Öffnen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="175"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="174"/>
         <location filename="../build/ui_mainwindow.h" line="462"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="180"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="179"/>
         <location filename="../build/ui_mainwindow.h" line="463"/>
         <source>&amp;Save</source>
         <translation>&amp;Speichern</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="183"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="182"/>
         <location filename="../build/ui_mainwindow.h" line="465"/>
         <source>Save</source>
         <translation>Speichern</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="186"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="185"/>
         <location filename="../build/ui_mainwindow.h" line="467"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="191"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="190"/>
         <location filename="../build/ui_mainwindow.h" line="468"/>
         <source>Sa&amp;ve as</source>
         <translation>Speichern als</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="194"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="193"/>
         <location filename="../build/ui_mainwindow.h" line="470"/>
         <source>Save as</source>
         <translation>Speichern unter</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="197"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="196"/>
         <location filename="../build/ui_mainwindow.h" line="472"/>
         <source>Ctrl+Shift+S</source>
         <translation>Ctrl+Shift+S</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="202"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="201"/>
         <location filename="../build/ui_mainwindow.h" line="473"/>
         <source>&amp;Close</source>
         <translation>Schliessen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="205"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="204"/>
         <location filename="../build/ui_mainwindow.h" line="475"/>
         <source>Close</source>
         <translation>Schliessen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="208"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="207"/>
         <location filename="../build/ui_mainwindow.h" line="477"/>
         <source>Ctrl+W</source>
         <translation>Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="221"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="212"/>
+        <location filename="../build/ui_mainwindow.h" line="478"/>
+        <source>&amp;Print</source>
+        <translation>&amp;Drucken</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="215"/>
+        <location filename="../build/ui_mainwindow.h" line="479"/>
+        <source>Ctrl+P</source>
+        <translation>Ctrl+P</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="220"/>
         <location filename="../build/ui_mainwindow.h" line="480"/>
         <source>P&amp;references</source>
         <translation>Einstellungen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="251"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="223"/>
+        <location filename="../build/ui_mainwindow.h" line="481"/>
+        <source>Ctrl+,</source>
+        <translation>Ctrl+,</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="231"/>
+        <location filename="../build/ui_mainwindow.h" line="482"/>
+        <source>&amp;Quit</source>
+        <translation>&amp;Beenden</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="234"/>
+        <location filename="../build/ui_mainwindow.h" line="483"/>
+        <source>Ctrl+Q</source>
+        <translation>Ctrl+Q</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="242"/>
+        <location filename="../build/ui_mainwindow.h" line="484"/>
+        <source>Import from &amp;dive computer</source>
+        <translation>Von &amp;Tauchcomputer importieren</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="245"/>
+        <location filename="../build/ui_mainwindow.h" line="485"/>
+        <source>Ctrl+D</source>
+        <translation>Ctrl+D</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="250"/>
         <location filename="../build/ui_mainwindow.h" line="486"/>
         <source>Import &amp;GPS data from Subsurface web service</source>
         <translation>GPS-Daten vom Subsurface-Webdienst importieren</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="259"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="253"/>
+        <location filename="../build/ui_mainwindow.h" line="487"/>
+        <source>Ctrl+G</source>
+        <translation>Ctrl+G</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="258"/>
         <location filename="../build/ui_mainwindow.h" line="488"/>
         <source>Edit device &amp;names</source>
         <translation>Geräte &amp;Namen bearbeiten</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="272"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="263"/>
+        <location filename="../build/ui_mainwindow.h" line="489"/>
+        <source>&amp;Add dive</source>
+        <translation>Tauchgang hinzufügen</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="266"/>
+        <location filename="../build/ui_mainwindow.h" line="490"/>
+        <source>Ctrl++</source>
+        <translation>Ctrl++</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="271"/>
         <location filename="../build/ui_mainwindow.h" line="491"/>
         <source>&amp;Edit dive</source>
         <translation>Tauchgang b&amp;earbeiten</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="277"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="276"/>
         <location filename="../build/ui_mainwindow.h" line="492"/>
         <source>&amp;Copy dive components</source>
         <translation>Tau&amp;chkomponenten kopieren</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="280"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="279"/>
         <location filename="../build/ui_mainwindow.h" line="493"/>
         <source>Ctrl+C</source>
         <translation>Ctrl+C</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="285"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="284"/>
         <location filename="../build/ui_mainwindow.h" line="494"/>
         <source>&amp;Paste dive components</source>
         <translation>Tauchkom&amp;ponenten einfügen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="288"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="287"/>
         <location filename="../build/ui_mainwindow.h" line="495"/>
         <source>Ctrl+V</source>
         <translation>Ctrl+V</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="325"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="292"/>
+        <location filename="../build/ui_mainwindow.h" line="496"/>
+        <source>&amp;Renumber</source>
+        <translation>&amp;Neu nummerieren</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="295"/>
+        <location filename="../build/ui_mainwindow.h" line="497"/>
+        <source>Ctrl+R</source>
+        <translation>Ctrl+R</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="303"/>
+        <location filename="../build/ui_mainwindow.h" line="498"/>
+        <source>Auto &amp;group</source>
+        <translation>Automatisch &amp;gruppieren</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="308"/>
+        <location filename="../build/ui_mainwindow.h" line="499"/>
+        <source>&amp;Yearly statistics</source>
+        <translation>Jahresstatistiken</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="311"/>
+        <location filename="../build/ui_mainwindow.h" line="500"/>
+        <source>Ctrl+Y</source>
+        <translation>Ctrl+Y</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="316"/>
+        <location filename="../build/ui_mainwindow.h" line="501"/>
+        <source>&amp;Dive list</source>
+        <translation>Tauchgangliste</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="319"/>
+        <location filename="../build/ui_mainwindow.h" line="502"/>
+        <source>Ctrl+2</source>
+        <translation>Ctrl+2</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="324"/>
         <location filename="../build/ui_mainwindow.h" line="503"/>
         <source>&amp;Profile</source>
         <translation>Profil</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="333"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="327"/>
+        <location filename="../build/ui_mainwindow.h" line="504"/>
+        <source>Ctrl+3</source>
+        <translation>Ctrl+3</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="332"/>
         <location filename="../build/ui_mainwindow.h" line="505"/>
         <source>&amp;Info</source>
         <translation>Informationen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="341"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="335"/>
+        <location filename="../build/ui_mainwindow.h" line="506"/>
+        <source>Ctrl+4</source>
+        <translation>Ctrl+4</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="340"/>
         <location filename="../build/ui_mainwindow.h" line="507"/>
         <source>&amp;All</source>
         <translation>Alle</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="357"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="343"/>
+        <location filename="../build/ui_mainwindow.h" line="508"/>
+        <source>Ctrl+1</source>
+        <translation>Ctrl+1</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="348"/>
+        <location filename="../build/ui_mainwindow.h" line="509"/>
+        <source>P&amp;revious DC</source>
+        <translation>Vorh. TC</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="351"/>
+        <location filename="../build/ui_mainwindow.h" line="510"/>
+        <source>Left</source>
+        <translation>Links</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="356"/>
         <location filename="../build/ui_mainwindow.h" line="511"/>
         <source>&amp;Next DC</source>
         <translation>Nächster TC</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="365"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="359"/>
+        <location filename="../build/ui_mainwindow.h" line="512"/>
+        <source>Right</source>
+        <translation>Rechts</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="364"/>
         <location filename="../build/ui_mainwindow.h" line="513"/>
         <source>&amp;About Subsurface</source>
         <translation>Info zu Subsurface</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="381"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="372"/>
+        <location filename="../build/ui_mainwindow.h" line="514"/>
+        <source>User &amp;manual</source>
+        <translation>Benutzerhandbuch</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="375"/>
+        <location filename="../build/ui_mainwindow.h" line="515"/>
+        <source>F1</source>
+        <translation>F1</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="380"/>
         <location filename="../build/ui_mainwindow.h" line="516"/>
         <source>&amp;Globe</source>
         <translation>Globus</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="403"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="383"/>
+        <location filename="../build/ui_mainwindow.h" line="517"/>
+        <source>Ctrl+5</source>
+        <translation>Ctrl+5</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="388"/>
+        <location filename="../build/ui_mainwindow.h" line="518"/>
+        <source>P&amp;lan dive</source>
+        <translation>Tauchgang planen</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="391"/>
+        <location filename="../build/ui_mainwindow.h" line="519"/>
+        <source>Ctrl+L</source>
+        <translation>Ctrl+L</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="396"/>
+        <location filename="../build/ui_mainwindow.h" line="520"/>
+        <source>&amp;Import log files</source>
+        <translation>Protokolldateien &amp;importieren</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="399"/>
+        <location filename="../build/ui_mainwindow.h" line="522"/>
+        <source>Import divelog files from other applications</source>
+        <translation>Tauchprotokolldateien von anderen Anwendungen importieren</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="402"/>
         <location filename="../build/ui_mainwindow.h" line="524"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="408"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="407"/>
         <location filename="../build/ui_mainwindow.h" line="525"/>
         <source>Import &amp;from divelogs.de</source>
         <translation>&amp;Von divelogs.de importieren</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="416"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="415"/>
         <location filename="../build/ui_mainwindow.h" line="526"/>
         <source>&amp;Full screen</source>
         <translation>Vollbild</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="419"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="418"/>
         <location filename="../build/ui_mainwindow.h" line="528"/>
         <source>Toggle full screen</source>
         <translation>Vollbild Umschalten</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="447"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="421"/>
+        <location filename="../build/ui_mainwindow.h" line="530"/>
+        <source>F11</source>
+        <translation>F11</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="446"/>
         <location filename="../build/ui_mainwindow.h" line="531"/>
         <source>&amp;Check for updates</source>
         <translation>Nach neuer Version suchen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="452"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="451"/>
         <location filename="../build/ui_mainwindow.h" line="532"/>
         <source>&amp;Export</source>
         <translation>Exportiere</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="458"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="454"/>
+        <location filename="../build/ui_mainwindow.h" line="534"/>
+        <source>Export dive logs</source>
+        <translation>Logbücher exportieren</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="457"/>
         <location filename="../build/ui_mainwindow.h" line="536"/>
         <source>Ctrl+E</source>
         <translation>Strg+E</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="466"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="462"/>
+        <location filename="../build/ui_mainwindow.h" line="537"/>
+        <source>Configure &amp;dive computer</source>
+        <translation>&amp;Tauchcomputer konfigurieren</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="465"/>
         <location filename="../build/ui_mainwindow.h" line="538"/>
         <source>Ctrl+Shift+C</source>
         <translation>Ctrl+Shift+C</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="474"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="473"/>
         <location filename="../build/ui_mainwindow.h" line="539"/>
         <source>Edit &amp;dive in planner</source>
         <translation>Tauchgang in Tauchgangs Planer b&amp;earbeiten</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="486"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="485"/>
         <location filename="../build/ui_mainwindow.h" line="540"/>
         <source>Toggle pO₂ graph</source>
         <translation>pO₂-Plot umschalten</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="498"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="497"/>
         <location filename="../build/ui_mainwindow.h" line="541"/>
         <source>Toggle pN₂ graph</source>
         <translation>pN₂-Plot umschalten</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="642"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="509"/>
+        <location filename="../build/ui_mainwindow.h" line="542"/>
+        <source>Toggle pHe graph</source>
+        <translation>pHe-Kurve ein-/ausschalten</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="521"/>
+        <location filename="../build/ui_mainwindow.h" line="543"/>
+        <source>Toggle DC reported ceiling</source>
+        <translation>Auftauchgrenze Tauchcomputer ein-/ausschalten</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="533"/>
+        <location filename="../build/ui_mainwindow.h" line="544"/>
+        <source>Toggle calculated ceiling</source>
+        <translation>Berechnete Auftauchgrenze ein-/ausschalten</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="545"/>
+        <location filename="../build/ui_mainwindow.h" line="545"/>
+        <source>Toggle calculating all tissues</source>
+        <translation>Berechnung aller Gewebe ein-/ausschalten</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="557"/>
+        <location filename="../build/ui_mainwindow.h" line="546"/>
+        <source>Toggle calculated ceiling with 3m increments</source>
+        <translation>Berechnete Auftauchgrenze in 3m Schritten ein-/ausschalten</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="569"/>
+        <location filename="../build/ui_mainwindow.h" line="547"/>
+        <source>Toggle heart rate</source>
+        <translation>Pulsrate ein-/ausschalten</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="581"/>
+        <location filename="../build/ui_mainwindow.h" line="548"/>
+        <source>Toggle MOD</source>
+        <translation>MOD ein-/ausschalten</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="593"/>
+        <location filename="../build/ui_mainwindow.h" line="549"/>
+        <source>Toggle EAD, END, EADD</source>
+        <translation>EAD, END, EADD ein-/ausschalten</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="605"/>
+        <location filename="../build/ui_mainwindow.h" line="550"/>
+        <source>Toggle NDL, TTS</source>
+        <translation>Nullzeit, Gesamtaufstiegszeit ein-/ausschalten</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="617"/>
+        <location filename="../build/ui_mainwindow.h" line="551"/>
+        <source>Toggle SAC rate</source>
+        <translation>SAC Rate ein-/ausschalten</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="629"/>
+        <location filename="../build/ui_mainwindow.h" line="552"/>
+        <source>Toggle ruler</source>
+        <translation>Lineal ein-/ausschalten</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="641"/>
         <location filename="../build/ui_mainwindow.h" line="553"/>
         <source>Scale graph</source>
         <translation>Massstabsgraph</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="654"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="653"/>
         <location filename="../build/ui_mainwindow.h" line="554"/>
         <source>Toggle pictures</source>
         <translation>Bilder umschalten</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="666"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="665"/>
         <location filename="../build/ui_mainwindow.h" line="555"/>
         <source>Toggle tank bar</source>
         <translation>Tankleiste umschalten</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="674"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="673"/>
         <location filename="../build/ui_mainwindow.h" line="556"/>
         <source>&amp;Filter divelist</source>
         <translation>Liste der Tauchgänge filtern</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="689"/>
-        <location filename="../build/ui_mainwindow.h" line="558"/>
-        <source>Toggle tissue graph</source>
-        <translation>Gewebe-Sättigungskurve ein-/ausschalten</translation>
+        <location filename="../desktop-widgets/mainwindow.ui" line="676"/>
+        <location filename="../build/ui_mainwindow.h" line="557"/>
+        <source>Ctrl+F</source>
+        <translation>Ctrl+F</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="688"/>
+        <source>Toggle tissue heat-map</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="694"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="693"/>
         <location filename="../build/ui_mainwindow.h" line="559"/>
         <source>User &amp;survey</source>
         <translation>Benutzer&amp;umfrage</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="699"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="698"/>
         <location filename="../build/ui_mainwindow.h" line="560"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="238"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="231"/>
         <source>&amp;Undo</source>
         <translation>R&amp;ueckgängig</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="702"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="701"/>
         <location filename="../build/ui_mainwindow.h" line="561"/>
         <source>Ctrl+Z</source>
         <translation>Ctrl+Z</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="707"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="706"/>
         <location filename="../build/ui_mainwindow.h" line="562"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="239"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="232"/>
         <source>&amp;Redo</source>
         <translation>Wiederholen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="710"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="709"/>
         <location filename="../build/ui_mainwindow.h" line="563"/>
         <source>Ctrl+Shift+Z</source>
         <translation>Ctrl+Shift+Z</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="715"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="714"/>
         <location filename="../build/ui_mainwindow.h" line="564"/>
         <source>&amp;Find moved images</source>
         <translation>Verschobene Bilder &amp;finden</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="720"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="719"/>
         <source>Open c&amp;loud storage</source>
         <translation>Aus C&amp;loud öffnen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="725"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="724"/>
         <source>Save to clo&amp;ud storage</source>
         <translation>In Clo&amp;ud speichern</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="730"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="729"/>
         <location filename="../build/ui_mainwindow.h" line="567"/>
         <source>&amp;Manage dive sites</source>
         <translation>Tauchplätze verwalten</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="735"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="734"/>
         <source>Dive Site &amp;Edit</source>
         <translation>Tauchplatz B&amp;earbeitung</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="740"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="739"/>
         <source>Facebook</source>
         <translation>Facebook</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="745"/>
-        <source>Add GPS location here</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="744"/>
+        <source>Take cloud storage online</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="677"/>
-        <location filename="../build/ui_mainwindow.h" line="557"/>
-        <source>Ctrl+F</source>
-        <translation>Ctrl+F</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="213"/>
-        <location filename="../build/ui_mainwindow.h" line="478"/>
-        <source>&amp;Print</source>
-        <translation>&amp;Drucken</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="224"/>
-        <location filename="../build/ui_mainwindow.h" line="481"/>
-        <source>Ctrl+,</source>
-        <translation>Ctrl+,</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="232"/>
-        <location filename="../build/ui_mainwindow.h" line="482"/>
-        <source>&amp;Quit</source>
-        <translation>&amp;Beenden</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="243"/>
-        <location filename="../build/ui_mainwindow.h" line="484"/>
-        <source>Import from &amp;dive computer</source>
-        <translation>Von &amp;Tauchcomputer importieren</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="254"/>
-        <location filename="../build/ui_mainwindow.h" line="487"/>
-        <source>Ctrl+G</source>
-        <translation>Ctrl+G</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="267"/>
-        <location filename="../build/ui_mainwindow.h" line="490"/>
-        <source>Ctrl++</source>
-        <translation>Ctrl++</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="293"/>
-        <location filename="../build/ui_mainwindow.h" line="496"/>
-        <source>&amp;Renumber</source>
-        <translation>&amp;Neu nummerieren</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="296"/>
-        <location filename="../build/ui_mainwindow.h" line="497"/>
-        <source>Ctrl+R</source>
-        <translation>Ctrl+R</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="312"/>
-        <location filename="../build/ui_mainwindow.h" line="500"/>
-        <source>Ctrl+Y</source>
-        <translation>Ctrl+Y</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="392"/>
-        <location filename="../build/ui_mainwindow.h" line="519"/>
-        <source>Ctrl+L</source>
-        <translation>Ctrl+L</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="216"/>
-        <location filename="../build/ui_mainwindow.h" line="479"/>
-        <source>Ctrl+P</source>
-        <translation>Ctrl+P</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="235"/>
-        <location filename="../build/ui_mainwindow.h" line="483"/>
-        <source>Ctrl+Q</source>
-        <translation>Ctrl+Q</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="246"/>
-        <location filename="../build/ui_mainwindow.h" line="485"/>
-        <source>Ctrl+D</source>
-        <translation>Ctrl+D</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="264"/>
-        <location filename="../build/ui_mainwindow.h" line="489"/>
-        <source>&amp;Add dive</source>
-        <translation>Tauchgang hinzufügen</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="304"/>
-        <location filename="../build/ui_mainwindow.h" line="498"/>
-        <source>Auto &amp;group</source>
-        <translation>Automatisch &amp;gruppieren</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="309"/>
-        <location filename="../build/ui_mainwindow.h" line="499"/>
-        <source>&amp;Yearly statistics</source>
-        <translation>Jahresstatistiken</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="317"/>
-        <location filename="../build/ui_mainwindow.h" line="501"/>
-        <source>&amp;Dive list</source>
-        <translation>Tauchgangliste</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="320"/>
-        <location filename="../build/ui_mainwindow.h" line="502"/>
-        <source>Ctrl+2</source>
-        <translation>Ctrl+2</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="328"/>
-        <location filename="../build/ui_mainwindow.h" line="504"/>
-        <source>Ctrl+3</source>
-        <translation>Ctrl+3</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="336"/>
-        <location filename="../build/ui_mainwindow.h" line="506"/>
-        <source>Ctrl+4</source>
-        <translation>Ctrl+4</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="344"/>
-        <location filename="../build/ui_mainwindow.h" line="508"/>
-        <source>Ctrl+1</source>
-        <translation>Ctrl+1</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="349"/>
-        <location filename="../build/ui_mainwindow.h" line="509"/>
-        <source>P&amp;revious DC</source>
-        <translation>Vorh. TC</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="352"/>
-        <location filename="../build/ui_mainwindow.h" line="510"/>
-        <source>Left</source>
-        <translation>Links</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="360"/>
-        <location filename="../build/ui_mainwindow.h" line="512"/>
-        <source>Right</source>
-        <translation>Rechts</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="373"/>
-        <location filename="../build/ui_mainwindow.h" line="514"/>
-        <source>User &amp;manual</source>
-        <translation>Benutzerhandbuch</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="376"/>
-        <location filename="../build/ui_mainwindow.h" line="515"/>
-        <source>F1</source>
-        <translation>F1</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="384"/>
-        <location filename="../build/ui_mainwindow.h" line="517"/>
-        <source>Ctrl+5</source>
-        <translation>Ctrl+5</translation>
+        <location filename="../build/ui_mainwindow.h" line="558"/>
+        <source>Toggle tissue graph</source>
+        <translation>Gewebe-Sättigungskurve ein-/ausschalten</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="389"/>
-        <location filename="../build/ui_mainwindow.h" line="518"/>
-        <source>P&amp;lan dive</source>
-        <translation>Tauchgang planen</translation>
+        <location filename="../build/ui_mainwindow.h" line="565"/>
+        <source>Open cloud storage</source>
+        <translation>Aus Cloud öffnen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="397"/>
-        <location filename="../build/ui_mainwindow.h" line="520"/>
-        <source>&amp;Import log files</source>
-        <translation>Protokolldateien &amp;importieren</translation>
+        <location filename="../build/ui_mainwindow.h" line="566"/>
+        <source>Save to cloud storage</source>
+        <translation>In Cloud speichern</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="400"/>
-        <location filename="../build/ui_mainwindow.h" line="522"/>
-        <source>Import divelog files from other applications</source>
-        <translation>Tauchprotokolldateien von anderen Anwendungen importieren</translation>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="331"/>
+        <source>Connect to</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="422"/>
-        <location filename="../build/ui_mainwindow.h" line="530"/>
-        <source>F11</source>
-        <translation>F11</translation>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="493"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="538"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1545"/>
+        <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 eine neue Datei geöffnet wird.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="505"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="499"/>
         <source>Open file</source>
         <translation>Datei öffnen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="509"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="503"/>
         <location filename="../desktop-widgets/mainwindow.cpp" line="614"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1972"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1978"/>
         <source>Cancel</source>
         <translation>Abbrechen</translation>
     </message>
@@ -5254,6 +5353,16 @@ den folgenden Gasen gemischt werden:
         <translation>Durchsuche Bilder...(dies kann eine Weile dauern)</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="649"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="796"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="977"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="983"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1849"/>
+        <source>Warning</source>
+        <translation>Warnung</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="674"/>
         <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 die Datei geschlossen wird.</translation>
@@ -5269,125 +5378,98 @@ den folgenden Gasen gemischt werden:
         <translation>Laufzeittabelle anzeigen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="982"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
+        <source>Trying to replan a dive that&apos;s not a planned dive.</source>
+        <translation>Es wird versucht, einen Tauchgang, der ursprünglich nicht im Planer erstellt wurde, im Planer zu öffnen.</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="977"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1849"/>
+        <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>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="983"/>
         <source>Trying to edit a dive that&apos;s not a manually added dive.</source>
         <translation>Versuche einenTauchgang zu bearbeiten der nicht manuell angelegt wurde.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1243"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1030"/>
+        <source>Yearly statistics</source>
+        <translation>Jahresstatistiken</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1244"/>
         <source>Do you want to save the changes that you made in the file %1?</source>
         <translation>Möchtest Du die Änderungen in der Datei %1 speichern?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1246"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1247"/>
         <source>Do you want to save the changes that you made in the data file?</source>
         <translation>Möchtest Du Deine Änderungen in der Datendatei speichern?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1251"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1252"/>
         <source>Save changes?</source>
         <translation>Änderungen speichern?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1587"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1253"/>
+        <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="../desktop-widgets/mainwindow.cpp" line="1572"/>
         <source>Save file as</source>
         <translation>Datei speichern unter</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1682"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1573"/>
+        <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
+        <translation>Subsurface XML Dateien (*.ssrf *.xml *.XML)</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1670"/>
+        <source>[local cache for] %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1672"/>
         <source>[cloud storage for] %1</source>
         <translation>[Cloud Speicher für] %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1782"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1788"/>
         <source>Opening datafile from older version</source>
         <translation>Datendatei von älterer Version wird geöffnet</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1783"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1789"/>
         <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly.
 Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source>
         <translation>Es wurde eine Datei von einer älteren Subsurface-Version geöffnet. Wir empfehlen das Handbuch zu lesen, um die Unterschiede der neuen Version insbesondere in der Tauchplatzverwaltung kennen zu lernen.
 Subsurface hat bereits versucht, Daten einzutragen, aber es empfiehlt sich, die neue Tauchplatzverwaltung anzuschauen und sicher zu stellen, dass alles richtig aussieht. </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1794"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1800"/>
         <source>Open dive log file</source>
         <translation>Tauchprotokolldatei öffnen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1795"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1801"/>
         <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1972"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1978"/>
         <source>Contacting cloud service...</source>
         <translation>Kontaktiere Cloud Service...</translation>
     </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1252"/>
-        <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="../desktop-widgets/mainwindow.cpp" line="649"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="796"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="976"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="982"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/>
-        <source>Warning</source>
-        <translation>Warnung</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="499"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="544"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1560"/>
-        <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 eine neue Datei geöffnet wird.</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="338"/>
-        <source>Connect to</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
-        <source>Trying to replan a dive that&apos;s not a planned dive.</source>
-        <translation>Es wird versucht, einen Tauchgang, der ursprünglich nicht im Planer erstellt wurde, im Planer zu öffnen.</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1029"/>
-        <source>Yearly statistics</source>
-        <translation>Jahresstatistiken</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1588"/>
-        <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
-        <translation>Subsurface XML Dateien (*.ssrf *.xml *.XML)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="976"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/>
-        <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>
-    <message>
-        <location filename="../build/ui_mainwindow.h" line="565"/>
-        <source>Open cloud storage</source>
-        <translation>Aus Cloud öffnen</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_mainwindow.h" line="566"/>
-        <source>Save to cloud storage</source>
-        <translation>In Cloud speichern</translation>
-    </message>
 </context>
 <context>
     <name>MultiFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="733"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="731"/>
         <source>Filter shows %1 (of %2) dives</source>
         <translation>Filter zeigt %1 (von %2) Tauchgängen</translation>
     </message>
@@ -5395,12 +5477,12 @@ Subsurface hat bereits versucht, Daten einzutragen, aber es empfiehlt sich, die
 <context>
     <name>OstcFirmwareCheck</name>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="269"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="271"/>
         <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source>
         <translation>Du solltest die Firmware auf Deinem Tauchcomputer aktualisieren: Du hast Version %1, aber die neueste stabile Version ist %2</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="273"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="275"/>
         <source>
 
 Please start Bluetooth on your OSTC Sport and do the same preparations as for a logbook download before continuing with the update</source>
@@ -5409,27 +5491,27 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 Bitte Bluetooth auf dem OSTC Sport starten und die gleichen Einstellungen wie für ein Logbuchdownload treffen, bevor das Update fortgeführt wird.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="274"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="276"/>
         <source>Not now</source>
         <translation>Nicht jetzt</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="275"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="277"/>
         <source>Update firmware</source>
         <translation>Firmware aktualisieren</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="277"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="279"/>
         <source>Firmware upgrade notice</source>
         <translation>Firmware-Aktualisierungsbenachrichtigung</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="295"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="297"/>
         <source>Save the downloaded firmware as</source>
         <translation>Heruntergeladene Firmware speichern als</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="296"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="298"/>
         <source>HEX files (*.hex)</source>
         <translation>HEX-Dateien (*.hex)</translation>
     </message>
@@ -5437,79 +5519,89 @@ Bitte Bluetooth auf dem OSTC Sport starten und die gleichen Einstellungen wie f�
 <context>
     <name>PlannerSettingsWidget</name>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="322"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="302"/>
         <source>Open circuit</source>
         <translation>Offenes System</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="322"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="302"/>
         <source>CCR</source>
         <translation>CCR</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="322"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="302"/>
         <source>pSCR</source>
         <translation>pSCR</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="421"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="388"/>
         <source>ft/min</source>
         <translation>ft/min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="422"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="389"/>
         <source>Last stop at 20ft</source>
         <translation>Letzter Stopp auf 20 Fuss</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="423"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="390"/>
         <source>50% avg. depth to 20ft</source>
         <translation>50% mitlerer Tiefe bis 20ft</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="424"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="391"/>
         <source>20ft to surface</source>
         <translation>20ft bis Oberfläche</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="426"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="392"/>
+        <source>ft</source>
+        <translation>ft</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="394"/>
         <source>m/min</source>
         <translation>m/min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="427"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="395"/>
         <source>Last stop at 6m</source>
         <translation>Letzter Stopp auf 6m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="428"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="396"/>
         <source>50% avg. depth to 6m</source>
         <translation>50% mitlerer Tiefe bis 6m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="429"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="397"/>
         <source>6m to surface</source>
         <translation>6m bis Oberfläche</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="432"/>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="433"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="398"/>
+        <source>m</source>
+        <translation>m</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="401"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="402"/>
         <source>cuft/min</source>
         <translation>cuft/min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="441"/>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="442"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="410"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="411"/>
         <source>ℓ/min</source>
         <translation>ℓ/min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="451"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="420"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="456"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="425"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
@@ -5659,6 +5751,11 @@ Bitte Bluetooth auf dem OSTC Sport starten und die gleichen Einstellungen wie f�
 <context>
     <name>PreferencesDialog</name>
     <message>
+        <location filename="../build/ui_preferences.h" line="1283"/>
+        <source>Preferences</source>
+        <translation>Einstellungen</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1288"/>
         <source>Defaults</source>
         <translation>Standardeinstellungen</translation>
@@ -5694,6 +5791,11 @@ Bitte Bluetooth auf dem OSTC Sport starten und die gleichen Einstellungen wie f�
         <translation>Georeferenz</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1303"/>
+        <source>Lists and tables</source>
+        <translation>Listen und Tabellen</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1304"/>
         <source>Font</source>
         <translation>Schriftart</translation>
@@ -5709,6 +5811,11 @@ Bitte Bluetooth auf dem OSTC Sport starten und die gleichen Einstellungen wie f�
         <translation>Tauchgänge</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1307"/>
+        <source>Default dive log file</source>
+        <translation>Standard-Tauchprotokolldatei</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1308"/>
         <source>No default file</source>
         <translation>Keine standard Datei</translation>
@@ -5739,6 +5846,21 @@ Bitte Bluetooth auf dem OSTC Sport starten und die gleichen Einstellungen wie f�
         <translation>...</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1314"/>
+        <source>Display invalid</source>
+        <translation>Ungültige anzeigen</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1316"/>
+        <source>Default cylinder</source>
+        <translation>Standardflasche</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1317"/>
+        <source>Use default cylinder</source>
+        <translation>Standardflasche verwenden</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1318"/>
         <source>Animations</source>
         <translation>Animationen</translation>
@@ -5769,40 +5891,24 @@ Bitte Bluetooth auf dem OSTC Sport starten und die gleichen Einstellungen wie f�
         <translation>System</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1401"/>
-        <source>Dive site geo lookup</source>
-        <translation>Tauchplatz Geo-Koordinaten suche</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1402"/>
-        <source>Enable geocoding for dive site management</source>
-        <translation>Geo-Koordinaten für Tauchplatz Verwaltung einschalten</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1403"/>
-        <source>Parse site without GPS data</source>
-        <translation>Platz ohne GPS-Daten lesen</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1404"/>
-        <source>Same format for existing dives</source>
-        <translation>Gleiches Format für vorhandene Tauchgänge</translation>
+        <location filename="../build/ui_preferences.h" line="1324"/>
+        <source>&amp;Metric</source>
+        <translation>&amp;Metrisch</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1405"/>
-        <source>Dive Site Layout</source>
-        <translation>Tauchplatz Vorlage</translation>
+        <location filename="../build/ui_preferences.h" line="1325"/>
+        <source>Imperial</source>
+        <translation>Zöllig</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1406"/>
-        <location filename="../build/ui_preferences.h" line="1407"/>
-        <source>/</source>
-        <translation>/</translation>
+        <location filename="../build/ui_preferences.h" line="1326"/>
+        <source>Personali&amp;ze</source>
+        <translation>Personali&amp;sieren</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1325"/>
-        <source>Imperial</source>
-        <translation>Zöllig</translation>
+        <location filename="../build/ui_preferences.h" line="1327"/>
+        <source>Individual settings</source>
+        <translation>Individuelle Einstellungen</translation>
     </message>
     <message>
         <location filename="../build/ui_preferences.h" line="1328"/>
@@ -5820,6 +5926,11 @@ Bitte Bluetooth auf dem OSTC Sport starten und die gleichen Einstellungen wie f�
         <translation>Fuss</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1331"/>
+        <source>Pressure</source>
+        <translation>Druck</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1332"/>
         <location filename="../build/ui_preferences.h" line="1366"/>
         <source>bar</source>
@@ -5831,11 +5942,26 @@ Bitte Bluetooth auf dem OSTC Sport starten und die gleichen Einstellungen wie f�
         <translation>psi</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1334"/>
+        <source>Volume</source>
+        <translation>Volumen</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1335"/>
+        <source>&amp;liter</source>
+        <translation>&amp;Liter</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1336"/>
         <source>cu ft</source>
         <translation>cu ft</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1337"/>
+        <source>Temperature</source>
+        <translation>Temperatur</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1338"/>
         <source>celsius</source>
         <translation>Celsius</translation>
@@ -5846,11 +5972,121 @@ Bitte Bluetooth auf dem OSTC Sport starten und die gleichen Einstellungen wie f�
         <translation>Fahrenheit</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1340"/>
+        <source>Weight</source>
+        <translation>Gewicht</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1341"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1342"/>
+        <source>lbs</source>
+        <translation>US-Pfund</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1343"/>
+        <source>Time units</source>
+        <translation>Zeiteinheiten</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1344"/>
+        <source>Ascent/descent speed denominator</source>
+        <translation>Zeiteinheit für Geschwindigkeit bei Aufstieg/Abstieg</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1345"/>
+        <source>Minutes</source>
+        <translation>Minuten</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1346"/>
+        <source>Seconds</source>
+        <translation>Sekunden</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1347"/>
+        <source>GPS coordinates</source>
+        <translation>GPS Koordinaten</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1348"/>
+        <source>Location Display</source>
+        <translation>Ortsanzeige</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1349"/>
+        <source>traditional (dms)</source>
+        <translation>traditionall (Grad Minuten Sekunden)</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1350"/>
+        <source>decimal</source>
+        <translation>Dezimal</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1351"/>
+        <source>Show</source>
+        <translation>Anzeigen</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1352"/>
+        <source>Threshold when showing pO₂</source>
+        <translation>Schwellenwert bei pO₂ Anzeige</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1353"/>
+        <source>Threshold when showing pN₂</source>
+        <translation>Schwellenwert bei pN₂ Anzeige</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1354"/>
+        <source>Threshold when showing pHe</source>
+        <translation>Schwellenwert bei pHe Anzeige</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1355"/>
+        <source>Max pO₂ when showing MOD</source>
+        <translation>max pO₂ bei MOD Anzeige</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1356"/>
+        <source>Draw dive computer reported ceiling red</source>
+        <translation>Zeichne Auftauchgrenze des Tauchcomputers in rot</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1357"/>
+        <source>Show unused cylinders in Equipment tab</source>
+        <translation>Nicht benutzte Flaschen unter Ausrüstung anzeigen</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1358"/>
+        <source>Show average depth</source>
+        <translation>Durchschnittstiefe anzeigen</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1359"/>
+        <source>Misc</source>
+        <translation>Sonstiges</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1360"/>
+        <source>GFLow</source>
+        <translation>GF niedrig</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1361"/>
+        <source>GFHigh</source>
+        <translation>GF hoch</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1362"/>
+        <source>GFLow at max depth</source>
+        <translation>GF niedrig bei maximaler Tiefe anwenden</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1363"/>
         <source>CCR: show setpoints when viewing pO₂</source>
         <translation>CCR: Setpoint anzeigen, wenn der pO₂ dargestellt wird</translation>
@@ -5896,14 +6132,19 @@ Bitte Bluetooth auf dem OSTC Sport starten und die gleichen Einstellungen wie f�
         <translation>Standardeinstellungen</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1374"/>
+        <source>Filter</source>
+        <translation>Filter</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1375"/>
         <source>Proxy</source>
         <translation>Proxy</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1379"/>
-        <source>Proxy type</source>
-        <translation>Proxy-Typ</translation>
+        <location filename="../build/ui_preferences.h" line="1376"/>
+        <source>Port</source>
+        <translation>Port</translation>
     </message>
     <message>
         <location filename="../build/ui_preferences.h" line="1377"/>
@@ -5911,16 +6152,16 @@ Bitte Bluetooth auf dem OSTC Sport starten und die gleichen Einstellungen wie f�
         <translation>Host</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1376"/>
-        <source>Port</source>
-        <translation>Port</translation>
-    </message>
-    <message>
         <location filename="../build/ui_preferences.h" line="1378"/>
         <source>Requires authentication</source>
         <translation>Anmeldung erforderlich</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1379"/>
+        <source>Proxy type</source>
+        <translation>Proxy-Typ</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1380"/>
         <source>Username</source>
         <translation>Benutzername</translation>
@@ -5932,46 +6173,6 @@ Bitte Bluetooth auf dem OSTC Sport starten und die gleichen Einstellungen wie f�
         <translation>Passwort</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1400"/>
-        <source>Disconnect from Facebook</source>
-        <translation>Verbindung zu Facebook trennen</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1374"/>
-        <source>Filter</source>
-        <translation>Filter</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1331"/>
-        <source>Pressure</source>
-        <translation>Druck</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1303"/>
-        <source>Lists and tables</source>
-        <translation>Listen und Tabellen</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1307"/>
-        <source>Default dive log file</source>
-        <translation>Standard-Tauchprotokolldatei</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1314"/>
-        <source>Display invalid</source>
-        <translation>Ungültige anzeigen</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1316"/>
-        <source>Default cylinder</source>
-        <translation>Standardflasche</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1317"/>
-        <source>Use default cylinder</source>
-        <translation>Standardflasche verwenden</translation>
-    </message>
-    <message>
         <location filename="../build/ui_preferences.h" line="1382"/>
         <source>Subsurface cloud storage</source>
         <translation>Subsurface Cloud Speicher</translation>
@@ -6012,149 +6213,40 @@ Bitte Bluetooth auf dem OSTC Sport starten und die gleichen Einstellungen wie f�
         <translation>Benutzerkennung lokal speichern?</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1334"/>
-        <source>Volume</source>
-        <translation>Volumen</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1337"/>
-        <source>Temperature</source>
-        <translation>Temperatur</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1340"/>
-        <source>Weight</source>
-        <translation>Gewicht</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1342"/>
-        <source>lbs</source>
-        <translation>US-Pfund</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1343"/>
-        <source>Time units</source>
-        <translation>Zeiteinheiten</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1345"/>
-        <source>Minutes</source>
-        <translation>Minuten</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1346"/>
-        <source>Seconds</source>
-        <translation>Sekunden</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1351"/>
-        <source>Show</source>
-        <translation>Anzeigen</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1362"/>
-        <source>GFLow at max depth</source>
-        <translation>GF niedrig bei maximaler Tiefe anwenden</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1359"/>
-        <source>Misc</source>
-        <translation>Sonstiges</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1283"/>
-        <source>Preferences</source>
-        <translation>Einstellungen</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1324"/>
-        <source>&amp;Metric</source>
-        <translation>&amp;Metrisch</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1326"/>
-        <source>Personali&amp;ze</source>
-        <translation>Personali&amp;sieren</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1327"/>
-        <source>Individual settings</source>
-        <translation>Individuelle Einstellungen</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1335"/>
-        <source>&amp;liter</source>
-        <translation>&amp;Liter</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1344"/>
-        <source>Ascent/descent speed denominator</source>
-        <translation>Zeiteinheit für Geschwindigkeit bei Aufstieg/Abstieg</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1347"/>
-        <source>GPS coordinates</source>
-        <translation>GPS Koordinaten</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1348"/>
-        <source>Location Display</source>
-        <translation>Ortsanzeige</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1349"/>
-        <source>traditional (dms)</source>
-        <translation>traditionall (Grad Minuten Sekunden)</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1350"/>
-        <source>decimal</source>
-        <translation>Dezimal</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1352"/>
-        <source>Threshold when showing pO₂</source>
-        <translation>Schwellenwert bei pO₂ Anzeige</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1353"/>
-        <source>Threshold when showing pN₂</source>
-        <translation>Schwellenwert bei pN₂ Anzeige</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1354"/>
-        <source>Threshold when showing pHe</source>
-        <translation>Schwellenwert bei pHe Anzeige</translation>
+        <location filename="../build/ui_preferences.h" line="1400"/>
+        <source>Disconnect from Facebook</source>
+        <translation>Verbindung zu Facebook trennen</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1355"/>
-        <source>Max pO₂ when showing MOD</source>
-        <translation>max pO₂ bei MOD Anzeige</translation>
+        <location filename="../build/ui_preferences.h" line="1401"/>
+        <source>Dive site geo lookup</source>
+        <translation>Tauchplatz Geo-Koordinaten suche</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1356"/>
-        <source>Draw dive computer reported ceiling red</source>
-        <translation>Zeichne Auftauchgrenze des Tauchcomputers in rot</translation>
+        <location filename="../build/ui_preferences.h" line="1402"/>
+        <source>Enable geocoding for dive site management</source>
+        <translation>Geo-Koordinaten für Tauchplatz Verwaltung einschalten</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1357"/>
-        <source>Show unused cylinders in Equipment tab</source>
-        <translation>Nicht benutzte Flaschen unter Ausrüstung anzeigen</translation>
+        <location filename="../build/ui_preferences.h" line="1403"/>
+        <source>Parse site without GPS data</source>
+        <translation>Platz ohne GPS-Daten lesen</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1358"/>
-        <source>Show average depth</source>
-        <translation>Durchschnittstiefe anzeigen</translation>
+        <location filename="../build/ui_preferences.h" line="1404"/>
+        <source>Same format for existing dives</source>
+        <translation>Gleiches Format für vorhandene Tauchgänge</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1360"/>
-        <source>GFLow</source>
-        <translation>GF niedrig</translation>
+        <location filename="../build/ui_preferences.h" line="1405"/>
+        <source>Dive Site Layout</source>
+        <translation>Tauchplatz Vorlage</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1361"/>
-        <source>GFHigh</source>
-        <translation>GF hoch</translation>
+        <location filename="../build/ui_preferences.h" line="1406"/>
+        <location filename="../build/ui_preferences.h" line="1407"/>
+        <source>/</source>
+        <translation>/</translation>
     </message>
 </context>
 <context>
@@ -6210,106 +6302,136 @@ Bitte Bluetooth auf dem OSTC Sport starten und die gleichen Einstellungen wie f�
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="20"/>
-        <source>Show</source>
-        <translation>Anzeigen</translation>
+        <source>Gas pressure display setup</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="29"/>
-        <source>Threshold when showing pO₂</source>
-        <translation>Schwellenwert bei pO₂ Anzeige</translation>
+        <source>Threshold for pO₂ (bar)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="49"/>
-        <source>Threshold when showing pN₂</source>
-        <translation>Schwellenwert bei pN₂ Anzeige</translation>
+        <source>Threshold for pN₂ (bar)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="69"/>
-        <source>Threshold when showing pHe</source>
-        <translation>Schwellenwert bei pHe Anzeige</translation>
+        <source>Threshold for pHe (bar)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="89"/>
-        <source>Max pO₂ when showing MOD</source>
-        <translation>max pO₂ bei MOD Anzeige</translation>
+        <source>pO₂ in calculating MOD (bar)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="106"/>
+        <source>CCR options:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="113"/>
+        <source>Dive planner default setpoint (bar)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="133"/>
+        <source>Show setpoints when viewing pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="140"/>
+        <source>Show individual O₂ sensor values when viewing pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="150"/>
+        <source>Ceiling display setup</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="109"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="159"/>
         <source>Draw dive computer reported ceiling red</source>
         <translation>Zeichne Auftauchgrenze des Tauchcomputers in rot</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="116"/>
-        <source>Show unused cylinders in Equipment tab</source>
-        <translation>Nicht benutzte Flaschen unter Ausrüstung anzeigen</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="169"/>
+        <source>Algorithm for calculated ceiling:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="123"/>
-        <source>Show mean depth</source>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="176"/>
+        <source>VPM-B</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="133"/>
-        <source>Misc</source>
-        <translation>Sonstiges</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="183"/>
+        <source>VPM-B Conservatism</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="149"/>
-        <source>bar</source>
-        <translation>bar</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="193"/>
+        <source>+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="165"/>
-        <source>Default CCR set-point for dive planning</source>
-        <translation>Voreinstellung CCR-Setpoint für die Tauchgangsplanung</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="206"/>
+        <source>Bühlmann</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="172"/>
-        <source>pSCR O₂ metabolism rate</source>
-        <translation>pSCR O₂-Verbrauch</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="216"/>
+        <source>GFHigh</source>
+        <translation>GF hoch</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="179"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="236"/>
         <source>GFLow</source>
         <translation>GF niedrig</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="186"/>
-        <source>GFHigh</source>
-        <translation>GF hoch</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="256"/>
+        <source>GFLow at max depth</source>
+        <translation>GF niedrig bei maximaler Tiefe anwenden</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="203"/>
-        <source>ℓ/min</source>
-        <translation>ℓ/min</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="263"/>
+        <source>pSCR options:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="213"/>
-        <source>pSCR ratio</source>
-        <translation>pSCR Auswurfverhältnis</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="270"/>
+        <source>Metabolic rate (ℓ O₂/min)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="287"/>
+        <source>Dilution ratio</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="223"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="300"/>
         <source>1:</source>
         <translation>1:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="230"/>
-        <source>CCR: show individual O₂ sensor values when viewing pO₂</source>
-        <translation>CCR: EInzelne O₂-Sensorwerte anzeigen, wenn pO₂ dargestellt wird</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="310"/>
+        <source>Misc</source>
+        <translation>Sonstiges</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="237"/>
-        <source>CCR: show setpoints when viewing pO₂</source>
-        <translation>CCR: Setpoint anzeigen, wenn der pO₂ dargestellt wird</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="316"/>
+        <source>Show unused cylinders in Equipment tab</source>
+        <translation>Nicht benutzte Flaschen unter Ausrüstung anzeigen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="244"/>
-        <source>GFLow at max depth</source>
-        <translation>GF niedrig bei maximaler Tiefe anwenden</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="323"/>
+        <source>Show mean depth in Profile</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="10"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="9"/>
         <source>Graph</source>
         <translation>Diagramm</translation>
     </message>
@@ -6378,15 +6500,29 @@ Bitte Bluetooth auf dem OSTC Sport starten und die gleichen Einstellungen wie f�
         <translation>Sprache</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="57"/>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="53"/>
         <source>Restart required</source>
         <translation>Bitte Programm neu starten</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="58"/>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="54"/>
         <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="../desktop-widgets/preferences/preferences_language.cpp" line="76"/>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="82"/>
+        <source>Literal characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="77"/>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="83"/>
+        <source>Non-special character(s) in time format.
+These will be used as is. This might not be what you intended.
+See http://doc.qt.io/qt-5/qdatetime.html#toString</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PreferencesNetwork</name>
@@ -6433,7 +6569,7 @@ Bitte Bluetooth auf dem OSTC Sport starten und die gleichen Einstellungen wie f�
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_network.ui" line="156"/>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="148"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="134"/>
         <source>Subsurface cloud storage</source>
         <translation>Subsurface Cloud Speicher</translation>
     </message>
@@ -6478,39 +6614,39 @@ Bitte Bluetooth auf dem OSTC Sport starten und die gleichen Einstellungen wie f�
         <translation>Benutzerkennung lokal speichern?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="11"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="10"/>
         <source>Network</source>
         <translation>Netzwerk</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="15"/>
         <source>No proxy</source>
         <translation>Kein Proxy</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/>
         <source>System proxy</source>
         <translation>Systemproxy</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/>
         <source>HTTP proxy</source>
         <translation>HTTP Proxy</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="19"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/>
         <source>SOCKS proxy</source>
         <translation>SOCKS Proxy</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="75"/>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="97"/>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="110"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="72"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="93"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="106"/>
         <source>Cloud storage email and password can only consist of letters, numbers, and &apos;.&apos;, &apos;-&apos;, &apos;_&apos;, and &apos;+&apos;.</source>
         <translation>Cloud Email und Passwörter können nur Buchstaben, Zahlen und folgende Sonderzeichen enthalten  . - _ + </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="146"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="132"/>
         <source>Subsurface cloud storage (credentials verified)</source>
         <translation>Subsurface Cloud Speicher (Zugriffsdaten überprüft)</translation>
     </message>
@@ -6668,7 +6804,7 @@ Bitte Bluetooth auf dem OSTC Sport starten und die gleichen Einstellungen wie f�
         <translation>Dezimal</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="8"/>
+        <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="7"/>
         <source>Units</source>
         <translation>Einheiten</translation>
     </message>
@@ -6676,17 +6812,17 @@ Bitte Bluetooth auf dem OSTC Sport starten und die gleichen Einstellungen wie f�
 <context>
     <name>PrintDialog</name>
     <message>
-        <location filename="../desktop-widgets/printdialog.cpp" line="118"/>
-        <source>&amp;Preview</source>
-        <translation>Vorschau</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/printdialog.cpp" line="115"/>
+        <location filename="../desktop-widgets/printdialog.cpp" line="102"/>
         <source>P&amp;rint</source>
         <translation>Drucken</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/printdialog.cpp" line="130"/>
+        <location filename="../desktop-widgets/printdialog.cpp" line="105"/>
+        <source>&amp;Preview</source>
+        <translation>Vorschau</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/printdialog.cpp" line="117"/>
         <source>Print</source>
         <translation>Drucken</translation>
     </message>
@@ -6694,19 +6830,10 @@ Bitte Bluetooth auf dem OSTC Sport starten und die gleichen Einstellungen wie f�
 <context>
     <name>PrintOptions</name>
     <message>
-        <location filename="../build/ui_printoptions.h" line="150"/>
-        <source>&amp;Table print</source>
-        <translation>&amp;Tabellendruck</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_printoptions.h" line="158"/>
-        <source>One dive per page</source>
-        <translation>Ein Tauchgang pro Seite</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_printoptions.h" line="159"/>
-        <source>Two dives per page</source>
-        <translation>Zwei Tauchgänge pro Seite</translation>
+        <location filename="../desktop-widgets/printoptions.ui" line="29"/>
+        <location filename="../build/ui_printoptions.h" line="148"/>
+        <source>Print type</source>
+        <translation>Art des Ausdrucks</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/printoptions.ui" line="41"/>
@@ -6766,10 +6893,19 @@ Bitte Bluetooth auf dem OSTC Sport starten und die gleichen Einstellungen wie f�
         <translation>Importieren</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/printoptions.ui" line="29"/>
-        <location filename="../build/ui_printoptions.h" line="148"/>
-        <source>Print type</source>
-        <translation>Art des Ausdrucks</translation>
+        <location filename="../build/ui_printoptions.h" line="150"/>
+        <source>&amp;Table print</source>
+        <translation>&amp;Tabellendruck</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_printoptions.h" line="158"/>
+        <source>One dive per page</source>
+        <translation>Ein Tauchgang pro Seite</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_printoptions.h" line="159"/>
+        <source>Two dives per page</source>
+        <translation>Zwei Tauchgänge pro Seite</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/printoptions.cpp" line="128"/>
@@ -6811,103 +6947,103 @@ Bitte Bluetooth auf dem OSTC Sport starten und die gleichen Einstellungen wie f�
         <translation>Unbekannter Tauchcomputer</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="755"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="752"/>
         <source>Show NDL / TTS was disabled because of excessive processing time</source>
         <translation>Null-/Auftauchzeitberechnung wegen Zeitüberschreitung abgebrochen</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1344"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1338"/>
         <source>Make first divecomputer</source>
         <translation>Primärer Tauchcomputer</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1346"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1340"/>
         <source>Delete this divecomputer</source>
         <translation>Lösche diesen Tauchcomputer</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1360"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1354"/>
         <source>Add gas change</source>
         <translation>Gaswechsel setzen</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1363"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1357"/>
         <source> (Tank %1)</source>
         <translation> (Tank %1)</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1371"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1365"/>
         <source>Add set-point change</source>
         <translation>Set-Point-Wechsel hinzufügen</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1373"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1367"/>
         <source>Add bookmark</source>
         <translation>Markierung setzen</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1377"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1371"/>
         <source>Edit the profile</source>
         <translation>Profil bearbeiten</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1381"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1375"/>
         <source>Remove event</source>
         <translation>Entferne Ereignis</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1386"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1380"/>
         <source>Hide similar events</source>
         <translation>Ähnliche Ereignisse ausblenden</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1393"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1387"/>
         <source>Edit name</source>
         <translation>Name bearbeiten</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1422"/>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1429"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1416"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1423"/>
         <source>Adjust pressure of tank %1 (currently interpolated as %2)</source>
         <translation>Druck in Flasche %1 (momentan zu %2 interpoliert)</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1444"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1438"/>
         <source>Unhide all events</source>
         <translation>Alle Ereignisse einblenden</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1479"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1473"/>
         <source>Hide events</source>
         <translation>Ereignisse ausblenden</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1479"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1473"/>
         <source>Hide all %1 events?</source>
         <translation>Alle %1 Ereignisse ausblenden?</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1514"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1508"/>
         <source>Remove the selected event?</source>
         <translation>Ausgewähltes Ereignis entfernen?</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1515"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1509"/>
         <source>%1 @ %2:%3</source>
         <translation>%1 @ %2:%3</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1638"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1632"/>
         <source>Edit name of bookmark</source>
         <translation>Name der Markierung bearbeiten</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1639"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1633"/>
         <source>Custom name:</source>
         <translation>Benutzerdefinierter Name:</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1644"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1638"/>
         <source>Name is too long!</source>
         <translation>Der Name ist zu lang!</translation>
     </message>
@@ -6915,91 +7051,101 @@ Bitte Bluetooth auf dem OSTC Sport starten und die gleichen Einstellungen wie f�
 <context>
     <name>QMLManager</name>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="95"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="97"/>
         <source>Starting...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="202"/>
         <source>working in no-cloud mode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="213"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="216"/>
         <source>no cloud credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="214"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="270"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="217"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="269"/>
         <source>Please enter valid cloud credentials.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="285"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="284"/>
         <source>Attempting to open cloud storage with new credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="304"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="306"/>
         <source>Testing cloud credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="331"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="320"/>
+        <source>No response from cloud server to validate the credentials</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="329"/>
+        <source>Cannot connect to cloud storage - cloud account not verified</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="361"/>
         <source>Cloud credentials are invalid</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="344"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="374"/>
         <source>Cannot open cloud storage: Error creating https connection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="357"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="387"/>
         <source>Cannot open cloud storage: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="369"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="399"/>
         <source>Cannot connect to cloud storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="411"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="441"/>
         <source>Cloud storage error: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="501"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="531"/>
         <source>Failed to connect to cloud server, reverting to no cloud status</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="520"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="550"/>
         <source>Cloud storage open successfully. No dives in dive list.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="689"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="690"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="721"/>
         <source>h</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="689"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="690"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="691"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="721"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="722"/>
         <source>min</source>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="689"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/>
         <source>sec</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="1041"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="1102"/>
         <source>Unknown GPS location</source>
         <translation type="unfinished"/>
     </message>
@@ -7007,126 +7153,126 @@ Bitte Bluetooth auf dem OSTC Sport starten und die gleichen Einstellungen wie f�
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../core/qthelper.cpp" line="866"/>
-        <location filename="../core/qthelper.cpp" line="1214"/>
-        <source>AIR</source>
-        <translation>Luft</translation>
+        <location filename="../core/gpslocation.h" line="13"/>
+        <source>Waiting to aquire GPS location</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="1214"/>
-        <source>OXYGEN</source>
-        <translation>SAUERSTOFF</translation>
+        <location filename="../core/qthelper.cpp" line="766"/>
+        <location filename="../core/qthelper.cpp" line="1275"/>
+        <source>m</source>
+        <translation>m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="59"/>
-        <source>Remove this point</source>
-        <translation>Diesen Punkt entfernen</translation>
+        <location filename="../core/qthelper.cpp" line="768"/>
+        <location filename="../core/qthelper.cpp" line="1274"/>
+        <source>ft</source>
+        <translation>ft</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="32"/>
-        <source>Average</source>
-        <translation>Ø</translation>
+        <location filename="../core/qthelper.cpp" line="794"/>
+        <source>C</source>
+        <translation>C</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="35"/>
-        <source>Minimum</source>
-        <translation>Min.</translation>
+        <location filename="../core/qthelper.cpp" line="796"/>
+        <source>F</source>
+        <translation>F</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="38"/>
-        <source>Maximum</source>
-        <translation>Max.</translation>
+        <location filename="../core/qthelper.cpp" line="821"/>
+        <location filename="../core/qthelper.cpp" line="1250"/>
+        <source>kg</source>
+        <translation>kg</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/globe.cpp" line="327"/>
-        <source>Move the map and double-click to set the dive location</source>
-        <translation>Karte verschieben und mit Doppelklick Tauchplatz markieren</translation>
+        <location filename="../core/qthelper.cpp" line="823"/>
+        <location filename="../core/qthelper.cpp" line="1251"/>
+        <source>lbs</source>
+        <translation>US Pfund</translation>
     </message>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="28"/>
-        <source>unknown</source>
-        <translation>unbekannt</translation>
+        <location filename="../core/qthelper.cpp" line="848"/>
+        <location filename="../core/qthelper.cpp" line="1300"/>
+        <source>bar</source>
+        <translation>bar</translation>
     </message>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="105"/>
-        <source>h:</source>
-        <translation>h:</translation>
+        <location filename="../core/qthelper.cpp" line="850"/>
+        <location filename="../core/qthelper.cpp" line="1299"/>
+        <source>psi</source>
+        <translation>psi</translation>
     </message>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="105"/>
-        <source>min</source>
-        <translation>min</translation>
+        <location filename="../core/qthelper.cpp" line="871"/>
+        <location filename="../core/qthelper.cpp" line="1235"/>
+        <source>AIR</source>
+        <translation>Luft</translation>
     </message>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="337"/>
-        <source>Multiple</source>
+        <location filename="../core/qthelper.cpp" line="873"/>
+        <source>EAN</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="../core/qthelper.cpp" line="957"/>
+        <location filename="../core/qthelper.cpp" line="962"/>
         <source>(%n dive(s))</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="816"/>
-        <location filename="../core/qthelper.cpp" line="1228"/>
-        <source>kg</source>
-        <translation>kg</translation>
+        <location filename="../core/qthelper.cpp" line="1235"/>
+        <source>OXYGEN</source>
+        <translation>SAUERSTOFF</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="818"/>
-        <location filename="../core/qthelper.cpp" line="1229"/>
-        <source>lbs</source>
-        <translation>US Pfund</translation>
+        <location filename="../core/qthelper.cpp" line="1322"/>
+        <source>l</source>
+        <translation>l</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="763"/>
-        <location filename="../core/qthelper.cpp" line="1252"/>
-        <source>ft</source>
-        <translation>ft</translation>
+        <location filename="../core/qthelper.cpp" line="1323"/>
+        <source>cuft</source>
+        <translation>cuft</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="761"/>
-        <location filename="../core/qthelper.cpp" line="1253"/>
-        <source>m</source>
-        <translation>m</translation>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="29"/>
+        <source>unknown</source>
+        <translation>unbekannt</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="789"/>
-        <source>C</source>
-        <translation>C</translation>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="114"/>
+        <source>h:</source>
+        <translation>h:</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="791"/>
-        <source>F</source>
-        <translation>F</translation>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="114"/>
+        <source>min</source>
+        <translation>min</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="845"/>
-        <location filename="../core/qthelper.cpp" line="1275"/>
-        <source>psi</source>
-        <translation>psi</translation>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="63"/>
+        <source>Remove this point</source>
+        <translation>Diesen Punkt entfernen</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="843"/>
-        <location filename="../core/qthelper.cpp" line="1276"/>
-        <source>bar</source>
-        <translation>bar</translation>
+        <location filename="../desktop-widgets/globe.cpp" line="327"/>
+        <source>Move the map and double-click to set the dive location</source>
+        <translation>Karte verschieben und mit Doppelklick Tauchplatz markieren</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="868"/>
-        <source>EAN</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="32"/>
+        <source>Average</source>
+        <translation>Ø</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="1298"/>
-        <source>l</source>
-        <translation>l</translation>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="35"/>
+        <source>Minimum</source>
+        <translation>Min.</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="1299"/>
-        <source>cuft</source>
-        <translation>cuft</translation>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="38"/>
+        <source>Maximum</source>
+        <translation>Max.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="625"/>
@@ -7148,17 +7294,12 @@ Bitte Bluetooth auf dem OSTC Sport starten und die gleichen Einstellungen wie f�
         <source>Malformed XML response. Line %1: %2</source>
         <translation>Ungültige XML Antwort. Zeile %1: %2</translation>
     </message>
-    <message>
-        <location filename="../core/gpslocation.h" line="13"/>
-        <source>Waiting to aquire GPS location</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>ReadSettingsThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1651"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1676"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1640"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1665"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Diese Funktion ist für den ausgewählten Tauchcomputer noch nicht verfügbar.</translation>
     </message>
@@ -7187,7 +7328,7 @@ Bitte Bluetooth auf dem OSTC Sport starten und die gleichen Einstellungen wie f�
 <context>
     <name>ResetSettingsThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1775"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1764"/>
         <source>Reset settings failed!</source>
         <translation>Zurücksetzen der Einstellungen ist fehlgeschlagen!</translation>
     </message>
@@ -7225,6 +7366,12 @@ Bitte Bluetooth auf dem OSTC Sport starten und die gleichen Einstellungen wie f�
 <context>
     <name>ShiftImageTimesDialog</name>
     <message>
+        <location filename="../desktop-widgets/shiftimagetimes.ui" line="23"/>
+        <location filename="../build/ui_shiftimagetimes.h" line="184"/>
+        <source>Shift selected image times</source>
+        <translation>Ausgewählte Bildzeiten verschieben</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/shiftimagetimes.ui" line="34"/>
         <location filename="../build/ui_shiftimagetimes.h" line="185"/>
         <source>Shift times of image(s) by</source>
@@ -7237,12 +7384,6 @@ Bitte Bluetooth auf dem OSTC Sport starten und die gleichen Einstellungen wie f�
         <translation>h:mm</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/shiftimagetimes.ui" line="23"/>
-        <location filename="../build/ui_shiftimagetimes.h" line="184"/>
-        <source>Shift selected image times</source>
-        <translation>Ausgewählte Bildzeiten verschieben</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/shiftimagetimes.ui" line="105"/>
         <location filename="../build/ui_shiftimagetimes.h" line="187"/>
         <source>Earlier</source>
@@ -7293,12 +7434,12 @@ Nicht alle Bilder haben Zeitstempel zwischen 30min vor und 30min nach einem der
         <translation>Welche/s Datum/Zeit werden im Bild angezeigt?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="297"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="296"/>
         <source>Open image file</source>
         <translation>Öffne Bilddatei</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="299"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="298"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>Bilddateien (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -7456,54 +7597,54 @@ Nicht alle Bilder haben Zeitstempel zwischen 30min vor und 30min nach einem der
 <context>
     <name>SocialNetworkDialog</name>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="339"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="284"/>
         <source>Dive date: %1 
 </source>
         <translation>Tauchdatum: %1
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="342"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="287"/>
         <source>Duration: %1 
 </source>
         <translation>Dauer: %1
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="343"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="288"/>
         <source>h:</source>
         <comment>abbreviation for hours plus separator</comment>
         <translation>h:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="344"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="289"/>
         <source>min</source>
         <comment>abbreviation for minutes</comment>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="347"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="292"/>
         <source>Dive location: %1 
 </source>
         <translation>Tauchplatz: %1
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="350"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="295"/>
         <source>Buddy: %1 
 </source>
         <translation>Partner: %1
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="353"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="298"/>
         <source>Divemaster: %1 
 </source>
         <translation>Tauchgruppenleiter: %1
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="356"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="301"/>
         <source>
 %1</source>
         <translation>
@@ -7589,9 +7730,20 @@ Nicht alle Bilder haben Zeitstempel zwischen 30min vor und 30min nach einem der
     <name>StartPage</name>
     <message>
         <location filename="../mobile-widgets/qml/StartPage.qml" line="19"/>
-        <source>To use Subsurface-mobile with Subsurface cloud storage, please enteryour cloud credentials.
+        <source>To use Subsurface-mobile with Subsurface cloud storage, please enter your cloud credentials.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/StartPage.qml" line="20"/>
+        <source>If this is the first time you use Subsurface cloud storage, enter a valid email (all lower case) and a password of your choice (letters and numbers). The server will send a PIN to the email address provided that you will have to enter here.
 
-To use Subsurface-mobile only with local data on this device, tap on the no cloud icon below.</source>
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/StartPage.qml" line="23"/>
+        <source>To use Subsurface-mobile only with local data on this device, tap on the no cloud icon below.</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -7630,7 +7782,12 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>SubsurfaceWebServices</name>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="419"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="395"/>
+        <source>Enter User ID and click Download</source>
+        <translation>Benutzerkennung eingeben und Herunterladen klicken</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="417"/>
         <source>Webservice</source>
         <translation>Webdienst</translation>
     </message>
@@ -7655,30 +7812,25 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
         <translation>Verbindungsfehler: </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="557"/>
-        <source>Download successful</source>
-        <translation>Erfolgreich geladen!</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="551"/>
         <source>Invalid user identifier!</source>
         <translation>Ungültige Benutzerkennung</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="397"/>
-        <source>Enter User ID and click Download</source>
-        <translation>Benutzerkennung eingeben und Herunterladen klicken</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="554"/>
         <source>Cannot parse response!</source>
         <translation>Verstehe die Antwort nicht!</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="557"/>
+        <source>Download successful</source>
+        <translation>Erfolgreich geladen!</translation>
+    </message>
 </context>
 <context>
     <name>SuitFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="674"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="672"/>
         <source>Suits: </source>
         <translation>Anzug:</translation>
     </message>
@@ -7686,7 +7838,7 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>SuitsFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="123"/>
+        <location filename="../qt-models/filtermodels.cpp" line="128"/>
         <source>No suit set</source>
         <translation>Kein Anzug eingetragen</translation>
     </message>
@@ -7705,7 +7857,7 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>TagFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="595"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="593"/>
         <source>Tags: </source>
         <translation>Stichwörter: </translation>
     </message>
@@ -7713,7 +7865,7 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>TagFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="148"/>
+        <location filename="../qt-models/filtermodels.cpp" line="153"/>
         <source>Empty tags</source>
         <translation>Leere Tags</translation>
     </message>
@@ -7739,6 +7891,11 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>TemplateEdit</name>
     <message>
+        <location filename="../desktop-widgets/templateedit.ui" line="14"/>
+        <source>Edit template</source>
+        <translation>Vorlage bearbeiten</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/templateedit.ui" line="37"/>
         <source>Preview</source>
         <translation>Vorschau</translation>
@@ -7784,11 +7941,6 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
         <translation>Schriftgrösse</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/templateedit.ui" line="14"/>
-        <source>Edit template</source>
-        <translation>Vorlage bearbeiten</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/templateedit.ui" line="165"/>
         <source>Color palette</source>
         <translation>Farbpalette</translation>
@@ -7970,85 +8122,12 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>TextHyperlinkEventFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="817"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="815"/>
         <source>%1click to visit %2</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>ThemeTest</name>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="29"/>
-        <source>Theme Information</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="33"/>
-        <source>Screen</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="42"/>
-        <source>Geometry (pixels):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="49"/>
-        <source>Geometry (gridUnits):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="56"/>
-        <source>Units.gridUnit:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="63"/>
-        <source>Units.devicePixelRatio:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="70"/>
-        <source>Font Metrics</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="76"/>
-        <source>FontMetrics pointSize:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="83"/>
-        <source>FontMetrics pixelSize:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="90"/>
-        <source>FontMetrics devicePixelRatio:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="97"/>
-        <source>Text item pixelSize:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="104"/>
-        <source>Text item pointSize:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="111"/>
-        <source>Pixel density:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="118"/>
-        <source>Height of default font:</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
     <name>ToolTipItem</name>
     <message>
         <location filename="../profile-widget/divetooltipitem.cpp" line="136"/>
@@ -8059,102 +8138,107 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>TripItem</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="67"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="68"/>
         <source>(%1 shown)</source>
         <translation> (%1 angezeigt)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="194"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
         <source>#</source>
         <translation>Nr.</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="197"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="215"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="200"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="218"/>
         <source>Rating</source>
         <translation>Bewertung</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
         <source>Depth(%1)</source>
         <translation>Tiefe(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="206"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="224"/>
         <source>Duration</source>
         <translation>Dauer</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="209"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="227"/>
         <source>Temp(%1%2)</source>
         <translation>Temp(%1%2)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
         <source>Weight(%1)</source>
         <translation>Gewicht(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
         <source>lbs</source>
         <translation>US-Pfund</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="215"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="233"/>
         <source>Suit</source>
         <translation>Anzug</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="218"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="236"/>
         <source>Cyl</source>
         <translation>Flasche</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="239"/>
         <source>Gas</source>
         <translation>Gas</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="244"/>
         <source>SAC(%1)</source>
         <translation>SAC(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="244"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="229"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="247"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="232"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="250"/>
         <source>Max CNS</source>
         <translation>Max. CNS</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="235"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="253"/>
+        <source>Photos before/during/after dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="256"/>
         <source>Location</source>
         <translation>Ort</translation>
     </message>
@@ -8177,72 +8261,73 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>UpdateManager</name>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="69"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="61"/>
         <source>Check for updates.</source>
         <translation>Neue Version suchen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="70"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="62"/>
         <source>Subsurface was unable to check for updates.</source>
         <translation>Subsurface konnte nicht nach neuen Versionen suchen.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="75"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="67"/>
         <source>The following error occurred:</source>
         <translation>Fehlermeldung erhalten:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="76"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="68"/>
         <source>Please check your internet connection.</source>
         <translation>Bitte Überprüfen Sie Ihre Internetverbindung.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="86"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="78"/>
         <source>You are using the latest version of Subsurface.</source>
         <translation>Dies ist die neuste Subsurfaceversion.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="89"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="81"/>
         <source>A new version of Subsurface is available.&lt;br/&gt;Click on:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; to download it.</source>
         <translation>Es gibt eine neue Subsurface-Version.&lt;br/&gt;Klick hier:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; zum Download.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="95"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="87"/>
         <source>A new version of Subsurface is available.</source>
         <translation>Es gibt eine neue Version von Subsurface.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="96"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="88"/>
         <source>Latest version is %1, please check %2 our download page %3 for information in how to update.</source>
         <translation>Die aktuellste Version ist %1, bitte auf unserer %2 Programme herunterladen %3 Seite nachlesen, wo diese Version verfügbar ist.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="106"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="98"/>
         <source>Newest release version is </source>
         <translation>Die letzte freigegebene Version ist </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="107"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="99"/>
         <source>The server returned the following information:</source>
         <translation>Der Server hat die folgenden Informationen zurückgegeben:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="125"/>
-        <source>Subsurface is checking every two weeks if a new version is available. If you don&apos;t want Subsurface to continue checking, please click Decline.</source>
-        <translation>Subsurface überprüft alle zwei Wochen, ob eine neue Version zur Verfügung steht. Falls Subsurface dies nicht weiter prüfen soll, bitte &quot;Ablehnen&quot; klicken.</translation>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="117"/>
+        <source>Subsurface is checking every two weeks if a new version is available. 
+ If you don&apos;t want Subsurface to continue checking, please click Decline.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="126"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="119"/>
         <source>Decline</source>
         <translation>Ablehnen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="127"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="120"/>
         <source>Accept</source>
         <translation>Annehmen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="129"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="122"/>
         <source>Automatic check for updates</source>
         <translation>Automatisch nach Aktualisierungen suchen</translation>
     </message>
@@ -8264,24 +8349,6 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>UserSurvey</name>
     <message>
-        <location filename="../desktop-widgets/usersurvey.ui" line="44"/>
-        <location filename="../build/ui_usersurvey.h" line="151"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;We would love to learn more about our users, their preferences and their usage habits. Please spare a minute to fill out this form and submit it to the Subsurface team.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Wir würden gerne mehr über unsere Benutzer, ihre Vorlieben und ihre Art, das Programm zu verwenden, lernen. Bitte gib uns eine Minute, füll das Formular aus und schick es ans Subsurface-Team.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/usersurvey.ui" line="115"/>
-        <location filename="../build/ui_usersurvey.h" line="156"/>
-        <source>Other software/sources</source>
-        <translation>Weitere Software/Quellen</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/usersurvey.ui" line="128"/>
-        <location filename="../build/ui_usersurvey.h" line="157"/>
-        <source>Manually entering dives</source>
-        <translation>Manuelle Tauchgangseingabe</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="14"/>
         <location filename="../build/ui_usersurvey.h" line="149"/>
         <source>User survey</source>
@@ -8294,6 +8361,12 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
         <translation>Subsurface Benutzerumfrage</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/usersurvey.ui" line="44"/>
+        <location filename="../build/ui_usersurvey.h" line="151"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;We would love to learn more about our users, their preferences and their usage habits. Please spare a minute to fill out this form and submit it to the Subsurface team.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Wir würden gerne mehr über unsere Benutzer, ihre Vorlieben und ihre Art, das Programm zu verwenden, lernen. Bitte gib uns eine Minute, füll das Formular aus und schick es ans Subsurface-Team.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="63"/>
         <location filename="../build/ui_usersurvey.h" line="152"/>
         <source>Technical diver</source>
@@ -8318,6 +8391,18 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
         <translation>Unterstützte Tauchcomputer</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/usersurvey.ui" line="115"/>
+        <location filename="../build/ui_usersurvey.h" line="156"/>
+        <source>Other software/sources</source>
+        <translation>Weitere Software/Quellen</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/usersurvey.ui" line="128"/>
+        <location filename="../build/ui_usersurvey.h" line="157"/>
+        <source>Manually entering dives</source>
+        <translation>Manuelle Tauchgangseingabe</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="141"/>
         <location filename="../build/ui_usersurvey.h" line="158"/>
         <source>Android/iPhone companion app</source>
@@ -8348,6 +8433,11 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
         <translation>Von wo importieren Sie Daten?</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/usersurvey.cpp" line="18"/>
+        <source>Send</source>
+        <translation>Senden</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/usersurvey.cpp" line="43"/>
         <source>
 Operating system: %1</source>
@@ -8391,19 +8481,14 @@ Sprache: %1</translation>
         <translation>Später nochmal fragen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/usersurvey.cpp" line="101"/>
-        <source>Submit user survey.</source>
-        <translation>Unfrageergebnis übertragen.</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/usersurvey.cpp" line="82"/>
         <source>Ask again?</source>
         <translation>Fragt noch einmal?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/usersurvey.cpp" line="18"/>
-        <source>Send</source>
-        <translation>Senden</translation>
+        <location filename="../desktop-widgets/usersurvey.cpp" line="101"/>
+        <source>Submit user survey.</source>
+        <translation>Unfrageergebnis übertragen.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/usersurvey.cpp" line="102"/>
@@ -8495,12 +8580,12 @@ Sprache: %1</translation>
         <translation>Hochladen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="324"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="325"/>
         <source>Operation timed out</source>
         <translation>Die Aktion hat zu lange gedauert</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="345"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="346"/>
         <source>Transferring data...</source>
         <translation>Daten werden übertragen...</translation>
     </message>
@@ -8535,18 +8620,18 @@ Sprache: %1</translation>
 <context>
     <name>WriteSettingsThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1702"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1709"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1718"/>
-        <source>Failed!</source>
-        <translation>Fehlgeschlagen!</translation>
-    </message>
-    <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1700"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1721"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1689"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1710"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Diese Funktion ist für den ausgewählten Tauchcomputer noch nicht verfügbar.</translation>
     </message>
+    <message>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1691"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1698"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1707"/>
+        <source>Failed!</source>
+        <translation>Fehlgeschlagen!</translation>
+    </message>
 </context>
 <context>
     <name>YearlyStatisticsModel</name>
@@ -8671,7 +8756,7 @@ Durchschnitt</translation>
 <context>
     <name>getextFromC</name>
     <message>
-        <location filename="../core/libdivecomputer.c" line="674"/>
+        <location filename="../core/libdivecomputer.c" line="737"/>
         <source>Error parsing the header</source>
         <translation>Fehler beim Lesen der Kopfdaten</translation>
     </message>
@@ -8679,38 +8764,377 @@ Durchschnitt</translation>
 <context>
     <name>gettextFromC</name>
     <message>
+        <location filename="../core/cochran.c" line="309"/>
+        <location filename="../core/cochran.c" line="315"/>
+        <location filename="../core/cochran.c" line="385"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>deco stop</source>
+        <translation>Deko-Stopp</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="336"/>
+        <location filename="../core/cochran.c" line="390"/>
+        <location filename="../core/file.c" line="777"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>ascent</source>
+        <translation>Aufstieg</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="342"/>
+        <location filename="../core/file.c" line="755"/>
+        <source>battery</source>
+        <translation>Batterie</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="348"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
+        <source>OLF</source>
+        <translation>OLF</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="353"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
+        <source>maxdepth</source>
+        <translation>Max. Tiefe</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="358"/>
+        <location filename="../core/cochran.c" line="404"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
+        <source>pO₂</source>
+        <translation>pO₂</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="365"/>
+        <location filename="../core/cochran.c" line="414"/>
+        <location filename="../core/cochran.c" line="421"/>
+        <location filename="../core/file.c" line="868"/>
+        <location filename="../core/libdivecomputer.c" line="225"/>
+        <location filename="../core/libdivecomputer.c" line="228"/>
+        <source>gaschange</source>
+        <translation>Gaswechsel</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="370"/>
+        <location filename="../core/cochran.c" line="409"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>rbt</source>
+        <translation>Nullzeit</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="379"/>
+        <location filename="../core/cochran.c" line="426"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>ceiling</source>
+        <translation>Tiefster Deko-Stopp</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="395"/>
+        <location filename="../core/libdivecomputer.c" line="224"/>
+        <source>transmitter</source>
+        <translation>Sender</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="153"/>
+        <source>Error: the file does not appear to be a DATATRAK divelog</source>
+        <translation>Fehler: die Datei scheint kein DATATRAK-Tauchprotokoll zu sein</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="286"/>
+        <source>clear</source>
+        <translation>löschen</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="289"/>
+        <source>misty</source>
+        <translation>diesig</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="292"/>
+        <source>fog</source>
+        <translation>Nebel</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="295"/>
+        <source>rain</source>
+        <translation>Regen</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="298"/>
+        <source>storm</source>
+        <translation>Sturm</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="301"/>
+        <source>snow</source>
+        <translation>Schnee</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="321"/>
+        <source>No suit</source>
+        <translation>Kein Anzug</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="324"/>
+        <source>Shorty</source>
+        <translation>Shorty</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="327"/>
+        <source>Combi</source>
+        <translation>Kombi</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="330"/>
+        <source>Wet suit</source>
+        <translation>Nasstauchanzug</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="333"/>
+        <source>Semidry suit</source>
+        <translation>Halbtrockentauchanzug</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="336"/>
+        <source>Dry suit</source>
+        <translation>Trockentauchanzug</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="396"/>
+        <source>no stop</source>
+        <translation>kein Stopp</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="398"/>
+        <location filename="../core/dive.c" line="29"/>
+        <source>deco</source>
+        <translation>Deko</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="400"/>
+        <source>single ascent</source>
+        <translation>einzelner Aufstieg</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="402"/>
+        <source>multiple ascent</source>
+        <translation>mehrere Aufstiege</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="404"/>
+        <location filename="../core/dive.c" line="27"/>
+        <source>fresh</source>
+        <translation>süss</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="406"/>
+        <source>salt water</source>
+        <translation>Salzwasser</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="431"/>
+        <source>sight seeing</source>
+        <translation>Besichtigung</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="433"/>
+        <source>club dive</source>
+        <translation>Vereinstauchgang</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="435"/>
+        <location filename="../core/dive.c" line="28"/>
+        <source>instructor</source>
+        <translation>Instruktor</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="437"/>
+        <source>instruction</source>
+        <translation>Anweisung</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="439"/>
+        <location filename="../core/dive.c" line="27"/>
+        <source>night</source>
+        <translation>Nacht</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="441"/>
+        <location filename="../core/dive.c" line="25"/>
+        <source>cave</source>
+        <translation>Höhle</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="443"/>
+        <location filename="../core/dive.c" line="24"/>
+        <source>ice</source>
+        <translation>Eis</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="445"/>
+        <source>search</source>
+        <translation>suchen</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="455"/>
+        <location filename="../core/dive.c" line="25"/>
+        <source>wreck</source>
+        <translation>Wrack</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="457"/>
+        <location filename="../core/dive.c" line="26"/>
+        <source>river</source>
+        <translation>Fluss</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="459"/>
+        <location filename="../core/dive.c" line="23"/>
+        <source>drift</source>
+        <translation>Strömung</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="461"/>
+        <location filename="../core/dive.c" line="28"/>
+        <source>photo</source>
+        <translation>Foto</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="463"/>
+        <source>other</source>
+        <translation>sonstige</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="474"/>
+        <source>Other activities</source>
+        <translation>Sonstige Aktivitäten</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="498"/>
+        <source>Datatrak/Wlog notes</source>
+        <translation>Datatrak/Wlog-Hinweise</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="537"/>
+        <source>Manually entered dive</source>
+        <translation>Manuell eingegebener Tauchgang</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="588"/>
+        <source>Unknown</source>
+        <translation>Unbekannt</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="674"/>
+        <source>Error: couldn&apos;t open the file %s</source>
+        <translation>Fehler: Datei %s konnte nicht geöffnet werden</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="687"/>
+        <source>Error: no dive</source>
+        <translation>Fehler: kein Tauchgang</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="23"/>
+        <source>boat</source>
+        <translation>Boot</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="23"/>
+        <source>shore</source>
+        <translation>Ufer</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="24"/>
+        <source>deep</source>
+        <translation>tief</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="24"/>
+        <source>cavern</source>
+        <translation>Kaverne</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="25"/>
+        <source>altitude</source>
+        <translation>Berg</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="26"/>
+        <source>pool</source>
+        <translation>Pool</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="26"/>
+        <source>lake</source>
+        <translation>See</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="27"/>
+        <source>student</source>
+        <translation>Schüler</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="28"/>
+        <source>video</source>
+        <translation>Video</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="33"/>
+        <source>OC-gas</source>
+        <translation>OC-Gas</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="33"/>
+        <source>diluent</source>
+        <translation>Verdünnungsmittel</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="33"/>
+        <location filename="../core/equipment.c" line="88"/>
+        <location filename="../core/planner.c" line="1436"/>
+        <location filename="../core/planner.c" line="1439"/>
+        <source>oxygen</source>
+        <translation>Sauerstoff</translation>
+    </message>
+    <message>
         <location filename="../core/dive.c" line="181"/>
         <source>pascal</source>
         <translation>Pa</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="186"/>
-        <location filename="../core/qthelper.cpp" line="669"/>
+        <location filename="../core/qthelper.cpp" line="674"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="190"/>
-        <location filename="../core/qthelper.cpp" line="672"/>
+        <location filename="../core/qthelper.cpp" line="677"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
+        <location filename="../core/dive.c" line="227"/>
+        <source>ℓ</source>
+        <translation>ℓ</translation>
+    </message>
+    <message>
         <location filename="../core/dive.c" line="232"/>
         <source>cuft</source>
         <translation>cuft</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="269"/>
-        <location filename="../core/qthelper.cpp" line="590"/>
-        <location filename="../core/qthelper.cpp" line="605"/>
+        <location filename="../core/qthelper.cpp" line="595"/>
+        <location filename="../core/qthelper.cpp" line="610"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="274"/>
-        <location filename="../core/qthelper.cpp" line="593"/>
-        <location filename="../core/qthelper.cpp" line="607"/>
+        <location filename="../core/qthelper.cpp" line="598"/>
+        <location filename="../core/qthelper.cpp" line="612"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
@@ -8736,53 +9160,58 @@ Durchschnitt</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="325"/>
-        <location filename="../core/qthelper.cpp" line="616"/>
-        <location filename="../core/qthelper.cpp" line="626"/>
+        <location filename="../core/qthelper.cpp" line="621"/>
+        <location filename="../core/qthelper.cpp" line="631"/>
         <source>lbs</source>
         <translation>US Pfund</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="329"/>
-        <location filename="../core/qthelper.cpp" line="614"/>
-        <location filename="../core/qthelper.cpp" line="624"/>
+        <location filename="../core/qthelper.cpp" line="619"/>
+        <location filename="../core/qthelper.cpp" line="629"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="1772"/>
+        <location filename="../core/dive.c" line="1751"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) oder (%s)</translation>
     </message>
     <message>
-        <location filename="../core/divelist.c" line="484"/>
+        <location filename="../core/divelist.c" line="487"/>
         <location filename="../core/equipment.c" line="84"/>
-        <location filename="../core/planner.c" line="1411"/>
-        <location filename="../core/planner.c" line="1414"/>
+        <location filename="../core/planner.c" line="1432"/>
+        <location filename="../core/planner.c" line="1435"/>
         <source>air</source>
         <translation>Luft</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="197"/>
+        <location filename="../core/equipment.c" line="86"/>
+        <source>EAN%d</source>
+        <translation>EAN%d</translation>
+    </message>
+    <message>
+        <location filename="../core/equipment.c" line="198"/>
         <source>integrated</source>
         <translation>integriert</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="198"/>
+        <location filename="../core/equipment.c" line="199"/>
         <source>belt</source>
         <translation>Gürtel</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="199"/>
+        <location filename="../core/equipment.c" line="200"/>
         <source>ankle</source>
         <translation>Fussblei</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="200"/>
+        <location filename="../core/equipment.c" line="201"/>
         <source>backplate weight</source>
         <translation>Backplate-Gewicht</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="201"/>
+        <location filename="../core/equipment.c" line="202"/>
         <source>clip-on</source>
         <translation>clip-on</translation>
     </message>
@@ -8795,8 +9224,8 @@ Durchschnitt</translation>
         <location filename="../core/file.c" line="121"/>
         <location filename="../core/file.c" line="512"/>
         <location filename="../core/file.c" line="597"/>
-        <location filename="../core/file.c" line="924"/>
-        <location filename="../core/file.c" line="1056"/>
+        <location filename="../core/file.c" line="909"/>
+        <location filename="../core/file.c" line="1092"/>
         <location filename="../core/ostctools.c" line="80"/>
         <source>Failed to read &apos;%s&apos;</source>
         <translation>Fehler beim Lesen von &apos;%s&apos;</translation>
@@ -8854,486 +9283,496 @@ Durchschnitt</translation>
         <translation>O₂-Kalibrierung</translation>
     </message>
     <message>
-        <location filename="../core/file.c" line="887"/>
-        <source>No matching DC found for file &apos;%s&apos;</source>
-        <translation>Kein zugehöriger Tauchcomputer für die Datei &apos;%s&apos; gefunden</translation>
+        <location filename="../core/git-access.c" line="134"/>
+        <source>Local cache directory %s corrupted - can&apos;t sync with Subsurface cloud storage</source>
+        <translation>Der lokale Zwischenspeicher %s ist korrupt, Daten können nicht mit dem Cloud Speicher synchronisiert werden</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>none</source>
-        <translation>keine</translation>
+        <location filename="../core/git-access.c" line="157"/>
+        <location filename="../core/git-access.c" line="177"/>
+        <source>Could not update local cache to newer remote data</source>
+        <translation>Lokaler Cache konnte nicht auf neuere externe Daten aktualisiert werden</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="309"/>
-        <location filename="../core/cochran.c" line="315"/>
-        <location filename="../core/cochran.c" line="385"/>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>deco stop</source>
-        <translation>Deko-Stopp</translation>
+        <location filename="../core/git-access.c" line="170"/>
+        <source>Subsurface cloud storage corrupted</source>
+        <translation>Subsurface Cloud Speicher ist unbrauchbar</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="342"/>
-        <location filename="../core/file.c" line="755"/>
-        <source>battery</source>
-        <translation>Batterie</translation>
+        <location filename="../core/git-access.c" line="284"/>
+        <source>Could not update Subsurface cloud storage, try again later</source>
+        <translation>Der Subsurface Cloud Speicher konnte nicht aktualisiert werden, versuche es später nocheinmal</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="370"/>
-        <location filename="../core/cochran.c" line="409"/>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>rbt</source>
-        <translation>Nullzeit</translation>
+        <location filename="../core/git-access.c" line="344"/>
+        <source>Remote storage and local data diverged. Error: merge failed (%s)</source>
+        <translation>Die lokale Version ist von der Servierversion divergiert. Fehler: Vereinigung fehlgeschlagen (%s)</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="336"/>
-        <location filename="../core/cochran.c" line="390"/>
-        <location filename="../core/file.c" line="777"/>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>ascent</source>
-        <translation>Aufstieg</translation>
+        <location filename="../core/git-access.c" line="374"/>
+        <source>Remote storage and local data diverged. Cannot combine local and remote changes</source>
+        <translation>Die lokale Version weicht von der Serverversion ab. Lokale und entfernte Änderungen können nicht zusammengeführt werden.</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="379"/>
-        <location filename="../core/cochran.c" line="426"/>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>ceiling</source>
-        <translation>Tiefster Deko-Stopp</translation>
+        <location filename="../core/git-access.c" line="408"/>
+        <source>Remote storage and local data diverged</source>
+        <translation>Lokale Version und Serverversion sind verschieden</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>workload</source>
-        <translation>Arbeit</translation>
+        <location filename="../core/git-access.c" line="411"/>
+        <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source>
+        <translation>Die lokale Version weicht von der Servierversion ab. Fehler: Schreiben der Daten fehlgeschlagen (%s)</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="395"/>
-        <location filename="../core/libdivecomputer.c" line="203"/>
-        <source>transmitter</source>
-        <translation>Sender</translation>
+        <location filename="../core/git-access.c" line="420"/>
+        <source>Problems with local cache of Subsurface cloud data</source>
+        <translation>Es gibt Probleme mit dem lokalen Subsurface Cloud Zwischenspeicher</translation>
+    </message>
+    <message>
+        <location filename="../core/git-access.c" line="421"/>
+        <source>Moved cache data to %s. Please try the operation again.</source>
+        <translation>Zwischenspeicher Daten nach %s verschoben. Bitte versuchen Sie es noch einmal.</translation>
+    </message>
+    <message>
+        <location filename="../core/git-access.c" line="743"/>
+        <source>Error connecting to Subsurface cloud storage</source>
+        <translation>Fehler beim Verbinden mit dem Subsurface Cloud Speicher</translation>
+    </message>
+    <message>
+        <location filename="../core/git-access.c" line="746"/>
+        <source>git clone of %s failed (%s)</source>
+        <translation>GIT Clone von %s ist gescheitert (%s)</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="210"/>
+        <location filename="../core/parse-xml.c" line="3317"/>
+        <location filename="../core/uemis-downloader.c" line="134"/>
+        <source>unknown</source>
+        <translation>unbekannt</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>none</source>
+        <translation>keine</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="203"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>workload</source>
+        <translation>Arbeit</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="224"/>
         <source>violation</source>
         <translation>Verletzung</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="203"/>
+        <location filename="../core/libdivecomputer.c" line="224"/>
         <source>bookmark</source>
         <translation>Markierung</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="203"/>
+        <location filename="../core/libdivecomputer.c" line="224"/>
         <source>surface</source>
         <translation>Oberfläche</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="203"/>
+        <location filename="../core/libdivecomputer.c" line="224"/>
         <source>safety stop</source>
         <translation>Sicherheitsstopp</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="365"/>
-        <location filename="../core/cochran.c" line="414"/>
-        <location filename="../core/cochran.c" line="421"/>
-        <location filename="../core/file.c" line="868"/>
-        <location filename="../core/libdivecomputer.c" line="204"/>
-        <location filename="../core/libdivecomputer.c" line="207"/>
-        <source>gaschange</source>
-        <translation>Gaswechsel</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="204"/>
+        <location filename="../core/libdivecomputer.c" line="225"/>
         <source>safety stop (voluntary)</source>
         <translation>Sicherheitsstopp (freiwillig)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="204"/>
+        <location filename="../core/libdivecomputer.c" line="225"/>
         <source>safety stop (mandatory)</source>
         <translation>Sicherheitsstopp (obligatorisch)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="205"/>
+        <location filename="../core/libdivecomputer.c" line="226"/>
         <source>deepstop</source>
         <translation>Tiefen-Stopp</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="205"/>
+        <location filename="../core/libdivecomputer.c" line="226"/>
         <source>ceiling (safety stop)</source>
         <translation>Sicherheits-Stopp</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="205"/>
-        <source>divetime</source>
-        <translation>Tauchgangsdauer</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="205"/>
+        <location filename="../core/libdivecomputer.c" line="226"/>
         <source>below floor</source>
         <comment>event showing dive is below deco floor and adding deco time</comment>
         <translation>unterhalb Dekotiefe</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="353"/>
-        <location filename="../core/libdivecomputer.c" line="206"/>
-        <source>maxdepth</source>
-        <translation>Max. Tiefe</translation>
-    </message>
-    <message>
-        <location filename="../core/cochran.c" line="348"/>
-        <location filename="../core/libdivecomputer.c" line="206"/>
-        <source>OLF</source>
-        <translation>OLF</translation>
+        <location filename="../core/libdivecomputer.c" line="226"/>
+        <source>divetime</source>
+        <translation>Tauchgangsdauer</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="206"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
         <source>airtime</source>
         <translation>verbleibende Atemzeit</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="206"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
         <source>rgbm</source>
         <translation>rgbm</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="206"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
         <source>heading</source>
         <translation>Richtung</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="358"/>
-        <location filename="../core/cochran.c" line="404"/>
-        <location filename="../core/libdivecomputer.c" line="206"/>
-        <source>pO₂</source>
-        <translation>pO₂</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="207"/>
+        <location filename="../core/libdivecomputer.c" line="228"/>
         <source>tissue level warning</source>
         <translation>Gewebewarnung</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="207"/>
+        <location filename="../core/libdivecomputer.c" line="228"/>
         <source>non stop time</source>
         <translation>Nullzeit</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="224"/>
+        <location filename="../core/libdivecomputer.c" line="237"/>
         <source>invalid event number</source>
         <translation>ungültige Ereignisnummer</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="658"/>
-        <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="../core/libdivecomputer.c" line="664"/>
-        <source>Error registering the data</source>
-        <translation>Fehler beim Registrieren der Daten</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="495"/>
+        <location filename="../core/libdivecomputer.c" line="553"/>
         <source>Error parsing the datetime</source>
         <translation>Fehler beim Lesen des Datums</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="513"/>
+        <location filename="../core/libdivecomputer.c" line="571"/>
         <source>Dive %d: %s</source>
         <translation>Tauchgang %d: %s</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="519"/>
+        <location filename="../core/libdivecomputer.c" line="577"/>
         <source>Error parsing the divetime</source>
         <translation>Fehler beim Lesen der Dauer</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="529"/>
+        <location filename="../core/libdivecomputer.c" line="587"/>
         <source>Error parsing the maxdepth</source>
         <translation>Fehler beim Lesen der maximalen Tiefe</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="548"/>
+        <location filename="../core/libdivecomputer.c" line="606"/>
         <source>Error parsing temperature</source>
         <translation>Fehler beim Lesen der Temperatur</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="568"/>
+        <location filename="../core/libdivecomputer.c" line="626"/>
         <source>Error parsing the gas mix count</source>
         <translation>Fehler beim Lesen der Gasgemischszahl</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="580"/>
+        <location filename="../core/libdivecomputer.c" line="638"/>
         <source>Error obtaining water salinity</source>
         <translation>Fehler beim Lesen des Salzgehalts</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="589"/>
+        <location filename="../core/libdivecomputer.c" line="647"/>
         <source>Error obtaining surface pressure</source>
         <translation>Kein Oberflächendruck erhalten</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="614"/>
+        <location filename="../core/libdivecomputer.c" line="672"/>
         <source>Error obtaining divemode</source>
         <translation>Fehler beim Auslesen des Modus des Tauchcomputers</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="634"/>
+        <location filename="../core/libdivecomputer.c" line="692"/>
         <source>Error parsing the gas mix</source>
         <translation>Fehler beim Lesen des Gasgemischs</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="684"/>
+        <location filename="../core/libdivecomputer.c" line="717"/>
+        <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="../core/libdivecomputer.c" line="723"/>
+        <source>Error registering the data</source>
+        <translation>Fehler beim Registrieren der Daten</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="744"/>
         <source>Error parsing the samples</source>
         <translation>Fehler beim Lesen der Samples</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="822"/>
+        <location filename="../core/libdivecomputer.c" line="882"/>
         <source>Event: waiting for user action</source>
         <translation>Ereignis: warte auf Benutzeraktion</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="830"/>
+        <location filename="../core/libdivecomputer.c" line="890"/>
         <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="../core/libdivecomputer.c" line="894"/>
+        <location filename="../core/libdivecomputer.c" line="954"/>
         <source>Error registering the event handler.</source>
         <translation>Fehler beim Registrieren der Ereignisbehandlung</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="899"/>
+        <location filename="../core/libdivecomputer.c" line="959"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Fehler bei der Registrierung der Abbruchbehandlung</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="920"/>
+        <location filename="../core/libdivecomputer.c" line="980"/>
         <source>Dive data import error</source>
         <translation>Fehler beim Importieren der Tauchgangsdaten</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="959"/>
+        <location filename="../core/libdivecomputer.c" line="1019"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Fehler beim Erzeugen des libdivecomputer Contexts</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="966"/>
+        <location filename="../core/libdivecomputer.c" line="1026"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Fehler beim Öffnen von %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="992"/>
+        <location filename="../core/libdivecomputer.c" line="1048"/>
         <source>Insufficient privileges to open the device %s %s (%s)</source>
         <translation>Unzureichende Privilegien zum Öffnen von Gerät %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../core/parse-xml.c" line="517"/>
-        <source>Strange percentage reading %s
+        <location filename="../core/load-git.c" line="194"/>
+        <location filename="../core/parse-xml.c" line="1242"/>
+        <source>multiple GPS locations for this dive site; also %s
 </source>
-        <translation>Unverständliche Prozentangabe %s
+        <translation>mehrere GPS Koordinaten für diesen Tauchplatz; ebenso %s
 </translation>
     </message>
     <message>
-        <location filename="../core/load-git.c" line="194"/>
-        <location filename="../core/parse-xml.c" line="1238"/>
-        <source>multiple GPS locations for this dive site; also %s
+        <location filename="../core/load-git.c" line="222"/>
+        <location filename="../core/parse-xml.c" line="1304"/>
+        <source>additional name for site: %s
 </source>
-        <translation>mehrere GPS Koordinaten für diesen Tauchplatz; ebenso %s
+        <translation>Zusätzlicher Name für Tauchplatz: %s
 </translation>
     </message>
     <message>
-        <location filename="../core/parse-xml.c" line="2044"/>
+        <location filename="../core/ostctools.c" line="120"/>
+        <location filename="../core/ostctools.c" line="152"/>
+        <source>Unknown DC in dive %d</source>
+        <translation>Unbekannter DC in Tauchgang %d</translation>
+    </message>
+    <message>
+        <location filename="../core/ostctools.c" line="165"/>
+        <source>Error - %s - parsing dive %d</source>
+        <translation>Fehler - %s - beim Analysieren von Tauchgang %d</translation>
+    </message>
+    <message>
+        <location filename="../core/parse-xml.c" line="517"/>
+        <source>Strange percentage reading %s
+</source>
+        <translation>Unverständliche Prozentangabe %s
+</translation>
+    </message>
+    <message>
+        <location filename="../core/parse-xml.c" line="2051"/>
         <source>Failed to parse &apos;%s&apos;</source>
         <translation>Fehler beim Lesen von &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../core/parse-xml.c" line="3741"/>
+        <location filename="../core/parse-xml.c" line="3774"/>
         <source>Can&apos;t open stylesheet %s</source>
         <translation>Kann Stylesheet %s nicht öffnen</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="86"/>
-        <source>EAN%d</source>
-        <translation>EAN%d</translation>
+        <location filename="../core/planner.c" line="555"/>
+        <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE %s ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source>
+        <translation>HINWEIS / WARNUNG: DIES IST EINE NEUIMPLEMENTATION DES %s-ALGORITHMUS UND EINE DARAUF BASIERENDE TAUCHGANGSPLANERIMPLEMENTATION, DIE NUR EINER GERINGEN ZAHL VON TESTS UNTERZOGEN WURDE. WIR RATEN DRINGEND, TAUCHGÄNGE NICHT AUSSSCHLIESSLICH AUFGRUND DIESER RESULTATE ZU PLANEN!</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="1032"/>
-        <location filename="../core/planner.c" line="1184"/>
-        <source>Can&apos;t find gas %s</source>
-        <translation>Kann Gas %s nicht finden</translation>
+        <location filename="../core/planner.c" line="569"/>
+        <source>Decompression calculation aborted due to excessive time</source>
+        <translation>Dekompressionsrechnung wegen Zeitüberschreitung abgebrochen</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="368"/>
-        <source>Too many gas mixes</source>
-        <translation>Zu viele Gasgemische</translation>
+        <location filename="../core/planner.c" line="571"/>
+        <location filename="../core/planner.c" line="829"/>
+        <location filename="../core/planner.c" line="834"/>
+        <location filename="../core/planner.c" line="860"/>
+        <location filename="../core/planner.c" line="870"/>
+        <source>Warning:</source>
+        <translation>Warnung:</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="568"/>
-        <source>Decompression calculation aborted due to excessive time</source>
-        <translation>Dekompressionsrechnung wegen Zeitüberschreitung abgebrochen</translation>
+        <location filename="../core/planner.c" line="581"/>
+        <source>based on Bühlmann ZHL-16C with GFlow = %d and GFhigh = %d</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="586"/>
+        <source>based on VPM-B at nominal conservatism</source>
+        <translation>basierend auf VPM-B bei nominalem Sicherheitslevel</translation>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="588"/>
+        <source>based on VPM-B at +%d conservatism</source>
+        <translation>basierend auf VPM-B bei +%d Sicherheitslevel</translation>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="590"/>
+        <source>, effective GF=%d/%d</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="594"/>
+        <source>recreational mode based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source>
+        <translation>Sporttauchmodus basierend auf Bühlmann ZHL-16B mit GFlow = %d und GFhigh = %d</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="592"/>
+        <location filename="../core/planner.c" line="598"/>
         <source>Subsurface dive plan</source>
         <translation>Subsurface Tauchplan</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="596"/>
-        <source>depth</source>
-        <translation>Tiefe</translation>
+        <location filename="../core/planner.c" line="599"/>
+        <source>&lt;div&gt;Runtime: %dmin&lt;/div&gt;&lt;br&gt;</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="602"/>
-        <source>runtime</source>
-        <translation>Laufzeit</translation>
+        <location filename="../core/planner.c" line="604"/>
+        <source>depth</source>
+        <translation>Tiefe</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="599"/>
+        <location filename="../core/planner.c" line="607"/>
         <source>duration</source>
         <translation>Dauer</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="554"/>
-        <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE %s ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source>
-        <translation>HINWEIS / WARNUNG: DIES IST EINE NEUIMPLEMENTATION DES %s-ALGORITHMUS UND EINE DARAUF BASIERENDE TAUCHGANGSPLANERIMPLEMENTATION, DIE NUR EINER GERINGEN ZAHL VON TESTS UNTERZOGEN WURDE. WIR RATEN DRINGEND, TAUCHGÄNGE NICHT AUSSSCHLIESSLICH AUFGRUND DIESER RESULTATE ZU PLANEN!</translation>
+        <location filename="../core/planner.c" line="610"/>
+        <source>runtime</source>
+        <translation>Laufzeit</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="605"/>
+        <location filename="../core/planner.c" line="613"/>
         <source>gas</source>
         <translation>Gas</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="648"/>
+        <location filename="../core/planner.c" line="656"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation>Auf-/Abstieg bis %.*f %s in %d:%02d min - Runtime %d:%02u mit %s (Setpoint = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="656"/>
+        <location filename="../core/planner.c" line="664"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source>
         <translation>Aufstieg auf %.*f %s in %d:%02d min - Laufzeit %d:%02u mit %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="669"/>
+        <location filename="../core/planner.c" line="677"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation>Auf %.*f %s bleiben für %d:%02d min - Runtime %d:%02u mit %s (Setpoint = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="676"/>
+        <location filename="../core/planner.c" line="684"/>
         <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="../core/planner.c" line="721"/>
+        <location filename="../core/planner.c" line="729"/>
         <source>%3.0f%s</source>
         <translation>%3.0f%s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="724"/>
-        <location filename="../core/planner.c" line="728"/>
+        <location filename="../core/planner.c" line="732"/>
+        <location filename="../core/planner.c" line="736"/>
         <source>%3dmin</source>
         <translation>%3dmin</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="737"/>
-        <location filename="../core/planner.c" line="749"/>
+        <location filename="../core/planner.c" line="745"/>
+        <location filename="../core/planner.c" line="757"/>
         <source>(SP = %.1fbar)</source>
         <translation>(SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="772"/>
+        <location filename="../core/planner.c" line="780"/>
         <source>Switch gas to %s (SP = %.1fbar)</source>
         <translation>Wechsle Gas auf %s (SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="774"/>
+        <location filename="../core/planner.c" line="782"/>
         <source>Switch gas to %s</source>
         <translation>Gaswechsel zu %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="793"/>
+        <location filename="../core/planner.c" line="801"/>
         <source>CNS</source>
         <translation>CNS</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="795"/>
+        <location filename="../core/planner.c" line="803"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="799"/>
+        <location filename="../core/planner.c" line="807"/>
         <source>Gas consumption (CCR legs excluded):</source>
         <translation>Gasverbrauch (ohne CCR Segmente):</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="801"/>
+        <location filename="../core/planner.c" line="809"/>
         <source>Gas consumption:</source>
         <translation>Gasverbrauch:</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="570"/>
-        <location filename="../core/planner.c" line="821"/>
-        <location filename="../core/planner.c" line="826"/>
-        <location filename="../core/planner.c" line="851"/>
-        <location filename="../core/planner.c" line="861"/>
-        <source>Warning:</source>
-        <translation>Warnung:</translation>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="580"/>
-        <source>based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source>
-        <translation>basierend auf Bühlmann ZHL-16B mit GFlow = %d und GFhigh = %d</translation>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="584"/>
-        <source>based on VPM-B at nominal conservatism</source>
-        <translation>basierend auf VPM-B bei nominalem Sicherheitslevel</translation>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="586"/>
-        <source>based on VPM-B at +%d conservatism</source>
-        <translation>basierend auf VPM-B bei +%d Sicherheitslevel</translation>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="588"/>
-        <source>recreational mode based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source>
-        <translation>Sporttauchmodus basierend auf Bühlmann ZHL-16B mit GFlow = %d und GFhigh = %d</translation>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="822"/>
+        <location filename="../core/planner.c" line="830"/>
         <source>this is more gas than available in the specified cylinder!</source>
         <translation>Dies ist mehr Gas, als in der Flasche verfügbar ist!</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="827"/>
+        <location filename="../core/planner.c" line="835"/>
         <source>not enough reserve for gas sharing on ascent!</source>
         <translation>Keine ausreichende Reserve für Aufstieg unter Wechselatmung!</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="829"/>
+        <location filename="../core/planner.c" line="837"/>
         <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source>
         <translation>%.0f%s/%.0f%s %s (%.0f%s/%.0f%s im berechneten Aufstieg)</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="831"/>
+        <location filename="../core/planner.c" line="839"/>
         <source>%.0f%s (%.0f%s during planned ascent) of %s</source>
         <translation>%.0f%s (%.0f%s im berechneten Aufstiegs) von %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="848"/>
+        <location filename="../core/planner.c" line="857"/>
         <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
         <translation>hoher pO₂ Wert %.2f auf %d:%02u mit Gas %s in Tiefe %.*f %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="858"/>
+        <location filename="../core/planner.c" line="867"/>
         <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
         <translation>niedriger pO₂ Wert %.2f auf %d:%02u mit Gas %s in Tiefe %.*f %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="1419"/>
+        <location filename="../core/planner.c" line="1194"/>
+        <source>Can&apos;t find gas %s</source>
+        <translation>Kann Gas %s nicht finden</translation>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="1440"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1280"/>
+        <location filename="../core/profile.c" line="1298"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
@@ -9342,70 +9781,70 @@ D: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1283"/>
+        <location filename="../core/profile.c" line="1301"/>
         <source>P: %d%s
 </source>
         <translation>P: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1287"/>
+        <location filename="../core/profile.c" line="1305"/>
         <source>T: %.1f%s
 </source>
         <translation>T: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1293"/>
+        <location filename="../core/profile.c" line="1311"/>
         <source>V: %.1f%s
 </source>
         <translation>V: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1296"/>
+        <location filename="../core/profile.c" line="1314"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation>SAC: %.*f%s/min
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1298"/>
+        <location filename="../core/profile.c" line="1316"/>
         <source>CNS: %u%%
 </source>
         <translation>CNS: %u%%
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1300"/>
+        <location filename="../core/profile.c" line="1318"/>
         <source>pO%s: %.2fbar
 </source>
         <translation>pO%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1302"/>
+        <location filename="../core/profile.c" line="1320"/>
         <source>pN%s: %.2fbar
 </source>
         <translation>pN%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1304"/>
+        <location filename="../core/profile.c" line="1322"/>
         <source>pHe: %.2fbar
 </source>
         <translation>pHe: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1307"/>
+        <location filename="../core/profile.c" line="1325"/>
         <source>MOD: %d%s
 </source>
         <translation>MOD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1314"/>
+        <location filename="../core/profile.c" line="1332"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
@@ -9414,7 +9853,7 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1318"/>
+        <location filename="../core/profile.c" line="1336"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
@@ -9423,174 +9862,179 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1331"/>
+        <location filename="../core/profile.c" line="1349"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation>Sicherheitsstopp: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1334"/>
+        <location filename="../core/profile.c" line="1352"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation>Sicherheitsstopp: unbek. Zeit @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1339"/>
+        <location filename="../core/profile.c" line="1357"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation>Deko: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1342"/>
+        <location filename="../core/profile.c" line="1360"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation>Deko: unbek. Zeit @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1346"/>
+        <location filename="../core/profile.c" line="1364"/>
         <source>In deco
 </source>
         <translation>In Deko
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1348"/>
+        <location filename="../core/profile.c" line="1366"/>
         <source>NDL: %umin
 </source>
         <translation>Nullzeit: %umin
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1351"/>
+        <location filename="../core/profile.c" line="1369"/>
         <source>TTS: %umin
 </source>
         <translation>Gesamtaufstiegszeit: %umin
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1354"/>
+        <location filename="../core/profile.c" line="1372"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation>Deko: %umin @ %.0f%s (berechnet)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1362"/>
+        <location filename="../core/profile.c" line="1380"/>
         <source>In deco (calc)
 </source>
         <translation>Deko (berechnet)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1365"/>
+        <location filename="../core/profile.c" line="1383"/>
         <source>NDL: %umin (calc)
 </source>
         <translation>Nullzeit: %umin (berechnet)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1367"/>
+        <location filename="../core/profile.c" line="1385"/>
         <source>NDL: &gt;2h (calc)
 </source>
         <translation>Nullzeit: &gt; 2h (berechnet)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1371"/>
+        <location filename="../core/profile.c" line="1389"/>
         <source>TTS: %umin (calc)
 </source>
         <translation>Gesamtaufstiegszeit: %umin (berechnet)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1373"/>
+        <location filename="../core/profile.c" line="1391"/>
         <source>TTS: &gt;2h (calc)
 </source>
         <translation>Gesamtaufstiegszeit: &gt;2h (berechnet)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1376"/>
+        <location filename="../core/profile.c" line="1394"/>
         <source>RBT: %umin
 </source>
         <translation>Restgrundzeit: %umin
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1379"/>
+        <location filename="../core/profile.c" line="1397"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation>Berechneter tiefster Deko-Stopp %.0f %s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1385"/>
+        <location filename="../core/profile.c" line="1403"/>
         <source>Tissue %.0fmin: %.1f%s
 </source>
         <translation>Gewebe %.0fmin: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1391"/>
+        <location filename="../core/profile.c" line="1409"/>
         <source>heartbeat: %d
 </source>
         <translation>Herzschlag: %d
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1393"/>
+        <location filename="../core/profile.c" line="1411"/>
         <source>bearing: %d
 </source>
         <translation>Peilung: %d
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1396"/>
+        <location filename="../core/profile.c" line="1414"/>
         <source>mean depth to here %.1f%s
 </source>
         <translation>Durchschnittstiefe bis hier %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1491"/>
+        <location filename="../core/profile.c" line="1515"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1495"/>
-        <location filename="../core/profile.c" line="1499"/>
-        <location filename="../core/profile.c" line="1503"/>
+        <location filename="../core/profile.c" line="1519"/>
+        <location filename="../core/profile.c" line="1523"/>
+        <location filename="../core/profile.c" line="1527"/>
         <source>%s %sD:%.1f%s</source>
         <translation>%s %sTiefe:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1507"/>
+        <location filename="../core/profile.c" line="1531"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sTiefe:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1511"/>
+        <location filename="../core/profile.c" line="1535"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1515"/>
-        <location filename="../core/profile.c" line="1519"/>
+        <location filename="../core/profile.c" line="1539"/>
+        <location filename="../core/profile.c" line="1543"/>
         <source>%s %sV:%.2f%s</source>
         <translation>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1526"/>
+        <location filename="../core/profile.c" line="1550"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sDruck:%d %s</translation>
     </message>
     <message>
+        <location filename="../core/profile.c" line="1575"/>
+        <source>%s SAC:%.*f %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../core/qthelper.cpp" line="67"/>
         <source>%1km</source>
         <translation>%1 km</translation>
@@ -9611,446 +10055,460 @@ EADD: %d%s
         <translation>%1 yd</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="635"/>
+        <location filename="../core/qthelper.cpp" line="91"/>
+        <location filename="../core/qthelper.cpp" line="226"/>
+        <source>N</source>
+        <translation>N</translation>
+    </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="91"/>
+        <location filename="../core/qthelper.cpp" line="227"/>
+        <source>S</source>
+        <translation>S</translation>
+    </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="92"/>
+        <location filename="../core/qthelper.cpp" line="228"/>
+        <source>E</source>
+        <translation>O</translation>
+    </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="92"/>
+        <location filename="../core/qthelper.cpp" line="229"/>
+        <source>W</source>
+        <translation>W</translation>
+    </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="640"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="638"/>
+        <location filename="../core/qthelper.cpp" line="643"/>
         <source>F</source>
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="23"/>
-        <source>boat</source>
-        <translation>Boot</translation>
+        <location filename="../core/save-html.c" line="469"/>
+        <location filename="../core/save-html.c" line="553"/>
+        <location filename="../core/worldmap-save.c" line="111"/>
+        <source>Can&apos;t open file %s</source>
+        <translation>Kann Datei %s nicht öffnen</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="23"/>
-        <source>shore</source>
-        <translation>Ufer</translation>
+        <location filename="../core/save-html.c" line="488"/>
+        <source>Number</source>
+        <translation>Nummer</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="459"/>
-        <location filename="../core/dive.c" line="23"/>
-        <source>drift</source>
-        <translation>Strömung</translation>
+        <location filename="../core/save-html.c" line="489"/>
+        <source>Date</source>
+        <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="24"/>
-        <source>deep</source>
-        <translation>tief</translation>
+        <location filename="../core/save-html.c" line="490"/>
+        <source>Time</source>
+        <translation>Zeit</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="24"/>
-        <source>cavern</source>
-        <translation>Kaverne</translation>
+        <location filename="../core/save-html.c" line="491"/>
+        <source>Location</source>
+        <translation>Ort</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="443"/>
-        <location filename="../core/dive.c" line="24"/>
-        <source>ice</source>
-        <translation>Eis</translation>
+        <location filename="../core/save-html.c" line="492"/>
+        <source>Air temp.</source>
+        <translation>Lufttemp.</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="445"/>
-        <source>search</source>
-        <translation>suchen</translation>
+        <location filename="../core/save-html.c" line="493"/>
+        <source>Water temp.</source>
+        <translation>Wassertemp.</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="455"/>
-        <location filename="../core/dive.c" line="25"/>
-        <source>wreck</source>
-        <translation>Wrack</translation>
+        <location filename="../core/save-html.c" line="494"/>
+        <source>Dives</source>
+        <translation>Tauchgänge</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="441"/>
-        <location filename="../core/dive.c" line="25"/>
-        <source>cave</source>
-        <translation>Höhle</translation>
+        <location filename="../core/save-html.c" line="495"/>
+        <source>Expand all</source>
+        <translation>Alle ausfalten</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="25"/>
-        <source>altitude</source>
-        <translation>Berg</translation>
+        <location filename="../core/save-html.c" line="496"/>
+        <source>Collapse all</source>
+        <translation>Alle einfalten</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="26"/>
-        <source>pool</source>
-        <translation>Pool</translation>
+        <location filename="../core/save-html.c" line="497"/>
+        <source>Trips</source>
+        <translation>Ausflüge</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="26"/>
-        <source>lake</source>
-        <translation>See</translation>
+        <location filename="../core/save-html.c" line="498"/>
+        <source>Statistics</source>
+        <translation>Statistiken</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="457"/>
-        <location filename="../core/dive.c" line="26"/>
-        <source>river</source>
-        <translation>Fluss</translation>
+        <location filename="../core/save-html.c" line="499"/>
+        <source>Advanced search</source>
+        <translation>Erweiterte Suche</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="439"/>
-        <location filename="../core/dive.c" line="27"/>
-        <source>night</source>
-        <translation>Nacht</translation>
+        <location filename="../core/save-html.c" line="502"/>
+        <source>Rating</source>
+        <translation>Bewertung</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="153"/>
-        <source>Error: the file does not appear to be a DATATRAK divelog</source>
-        <translation>Fehler: die Datei scheint kein DATATRAK-Tauchprotokoll zu sein</translation>
+        <location filename="../core/save-html.c" line="503"/>
+        <source>Visibility</source>
+        <translation>Sicht</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="286"/>
-        <source>clear</source>
-        <translation>löschen</translation>
+        <location filename="../core/save-html.c" line="504"/>
+        <source>Duration</source>
+        <translation>Dauer</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="289"/>
-        <source>misty</source>
-        <translation>diesig</translation>
+        <location filename="../core/save-html.c" line="505"/>
+        <source>Divemaster</source>
+        <translation>Divemaster</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="292"/>
-        <source>fog</source>
-        <translation>Nebel</translation>
+        <location filename="../core/save-html.c" line="506"/>
+        <source>Buddy</source>
+        <translation>Buddy</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="295"/>
-        <source>rain</source>
-        <translation>Regen</translation>
+        <location filename="../core/save-html.c" line="507"/>
+        <source>Suit</source>
+        <translation>Anzug</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="298"/>
-        <source>storm</source>
-        <translation>Sturm</translation>
+        <location filename="../core/save-html.c" line="508"/>
+        <source>Tags</source>
+        <translation>Stichwörter</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="301"/>
-        <source>snow</source>
-        <translation>Schnee</translation>
+        <location filename="../core/save-html.c" line="509"/>
+        <location filename="../smtk-import/smartrak.c" line="251"/>
+        <location filename="../smtk-import/smartrak.c" line="321"/>
+        <source>Notes</source>
+        <translation>Notizen</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="321"/>
-        <source>No suit</source>
-        <translation>Kein Anzug</translation>
+        <location filename="../core/save-html.c" line="510"/>
+        <source>Show more details</source>
+        <translation>Mehr Details anzeigen</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="324"/>
-        <source>Shorty</source>
-        <translation>Shorty</translation>
+        <location filename="../core/save-html.c" line="513"/>
+        <source>Yearly statistics</source>
+        <translation>Jahresstatistiken</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="327"/>
-        <source>Combi</source>
-        <translation>Kombi</translation>
+        <location filename="../core/save-html.c" line="514"/>
+        <source>Year</source>
+        <translation>Jahr</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="330"/>
-        <source>Wet suit</source>
-        <translation>Nasstauchanzug</translation>
+        <location filename="../core/save-html.c" line="515"/>
+        <source>Total time</source>
+        <translation>Gesamtzeit</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="333"/>
-        <source>Semidry suit</source>
-        <translation>Halbtrockentauchanzug</translation>
+        <location filename="../core/save-html.c" line="516"/>
+        <source>Average time</source>
+        <translation>Durchschnittszeit</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="336"/>
-        <source>Dry suit</source>
-        <translation>Trockentauchanzug</translation>
+        <location filename="../core/save-html.c" line="517"/>
+        <source>Shortest time</source>
+        <translation>Kürzeste Zeit</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="396"/>
-        <source>no stop</source>
-        <translation>kein Stopp</translation>
+        <location filename="../core/save-html.c" line="518"/>
+        <source>Longest time</source>
+        <translation>Längste Zeit</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="400"/>
-        <source>single ascent</source>
-        <translation>einzelner Aufstieg</translation>
+        <location filename="../core/save-html.c" line="519"/>
+        <source>Average depth</source>
+        <translation>Durchschnittstiefe</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="402"/>
-        <source>multiple ascent</source>
-        <translation>mehrere Aufstiege</translation>
+        <location filename="../core/save-html.c" line="520"/>
+        <source>Min. depth</source>
+        <translation>Min. Tiefe</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="404"/>
-        <location filename="../core/dive.c" line="27"/>
-        <source>fresh</source>
-        <translation>süss</translation>
+        <location filename="../core/save-html.c" line="521"/>
+        <source>Max. depth</source>
+        <translation>Max. Tiefe</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="406"/>
-        <source>salt water</source>
-        <translation>Salzwasser</translation>
+        <location filename="../core/save-html.c" line="522"/>
+        <source>Average SAC</source>
+        <translation>Durchschnittliches SAC</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="431"/>
-        <source>sight seeing</source>
-        <translation>Besichtigung</translation>
+        <location filename="../core/save-html.c" line="523"/>
+        <source>Min. SAC</source>
+        <translation>Min. SAC</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="433"/>
-        <source>club dive</source>
-        <translation>Vereinstauchgang</translation>
+        <location filename="../core/save-html.c" line="524"/>
+        <source>Max. SAC</source>
+        <translation>Max. SAC</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="437"/>
-        <source>instruction</source>
-        <translation>Anweisung</translation>
+        <location filename="../core/save-html.c" line="525"/>
+        <source>Average temp.</source>
+        <translation>Durchschnittstemp.</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="463"/>
-        <source>other</source>
-        <translation>sonstige</translation>
+        <location filename="../core/save-html.c" line="526"/>
+        <source>Min. temp.</source>
+        <translation>Min. Temp.</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="474"/>
-        <source>Other activities</source>
-        <translation>Sonstige Aktivitäten</translation>
+        <location filename="../core/save-html.c" line="527"/>
+        <source>Max. temp.</source>
+        <translation>Max. Temp.</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="498"/>
-        <source>Datatrak/Wlog notes</source>
-        <translation>Datatrak/Wlog-Hinweise</translation>
+        <location filename="../core/save-html.c" line="528"/>
+        <source>Back to list</source>
+        <translation>Zurück zur Liste</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="537"/>
-        <source>Manually entered dive</source>
-        <translation>Manuell eingegebener Tauchgang</translation>
+        <location filename="../core/save-html.c" line="531"/>
+        <source>Dive No.</source>
+        <translation>Tauchgang Nr.</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="588"/>
-        <source>Unknown</source>
-        <translation>Unbekannt</translation>
+        <location filename="../core/save-html.c" line="532"/>
+        <source>Dive profile</source>
+        <translation>Tauchprofil</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="674"/>
-        <source>Error: couldn&apos;t open the file %s</source>
-        <translation>Fehler: Datei %s konnte nicht geöffnet werden</translation>
+        <location filename="../core/save-html.c" line="533"/>
+        <source>Dive information</source>
+        <translation>Tauchinformation</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="687"/>
-        <source>Error: no dive</source>
-        <translation>Fehler: kein Tauchgang</translation>
+        <location filename="../core/save-html.c" line="534"/>
+        <source>Dive equipment</source>
+        <translation>Tauchausrüstung</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="27"/>
-        <source>student</source>
-        <translation>Schüler</translation>
+        <location filename="../core/save-html.c" line="535"/>
+        <location filename="../core/save-html.c" line="542"/>
+        <source>Type</source>
+        <translation>Typ</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="461"/>
-        <location filename="../core/dive.c" line="28"/>
-        <source>photo</source>
-        <translation>Foto</translation>
+        <location filename="../core/save-html.c" line="536"/>
+        <source>Size</source>
+        <translation>Grösse</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="28"/>
-        <source>video</source>
-        <translation>Video</translation>
+        <location filename="../core/save-html.c" line="537"/>
+        <source>Work pressure</source>
+        <translation>Arbeitsdruck</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="435"/>
-        <location filename="../core/dive.c" line="28"/>
-        <source>instructor</source>
-        <translation>Instruktor</translation>
+        <location filename="../core/save-html.c" line="538"/>
+        <source>Start pressure</source>
+        <translation>Anfangsdruck</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="398"/>
-        <location filename="../core/dive.c" line="29"/>
-        <source>deco</source>
-        <translation>Deko</translation>
+        <location filename="../core/save-html.c" line="539"/>
+        <source>End pressure</source>
+        <translation>Enddruck</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="33"/>
-        <source>OC-gas</source>
-        <translation>OC-Gas</translation>
+        <location filename="../core/save-html.c" line="540"/>
+        <source>Gas</source>
+        <translation>Gas</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="33"/>
-        <source>diluent</source>
-        <translation>Verdünnungsmittel</translation>
+        <location filename="../core/save-html.c" line="541"/>
+        <source>Weight</source>
+        <translation>Gewicht</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="33"/>
-        <location filename="../core/equipment.c" line="88"/>
-        <location filename="../core/planner.c" line="1415"/>
-        <location filename="../core/planner.c" line="1418"/>
-        <source>oxygen</source>
-        <translation>Sauerstoff</translation>
+        <location filename="../core/save-html.c" line="543"/>
+        <source>Events</source>
+        <translation>Ereignisse</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="227"/>
-        <source>ℓ</source>
-        <translation>ℓ</translation>
+        <location filename="../core/save-html.c" line="544"/>
+        <source>Name</source>
+        <translation>Name</translation>
+    </message>
+    <message>
+        <location filename="../core/save-html.c" line="545"/>
+        <source>Value</source>
+        <translation>Wert</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="239"/>
+        <location filename="../core/save-html.c" line="546"/>
+        <source>Coordinates</source>
+        <translation>Koordinaten</translation>
+    </message>
+    <message>
+        <location filename="../core/save-html.c" line="547"/>
+        <source>Dive status</source>
+        <translation>Tauchstatus</translation>
+    </message>
+    <message>
+        <location filename="../core/statistics.c" line="242"/>
         <source>more than %d days</source>
         <translation>mehr als %d Tage</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="246"/>
+        <location filename="../core/statistics.c" line="249"/>
         <source>%dd %dh %dmin</source>
         <translation>%dd %dh %dmin</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="249"/>
+        <location filename="../core/statistics.c" line="252"/>
         <source>%dmin %dsecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="251"/>
+        <location filename="../core/statistics.c" line="254"/>
         <source>%dh %dmin</source>
         <translation>%dh %dmin</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="263"/>
+        <location filename="../core/statistics.c" line="266"/>
         <source>for dives #</source>
         <translation>für Tauchgänge Nr.</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="269"/>
+        <location filename="../core/statistics.c" line="272"/>
         <source>for selected dives</source>
         <translation>für die ausgewählten Tauchgänge</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="304"/>
+        <location filename="../core/statistics.c" line="307"/>
         <source>for dive #%d</source>
         <translation>für Tauchgang Nr. %d</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="306"/>
+        <location filename="../core/statistics.c" line="309"/>
         <source>for selected dive</source>
         <translation>für den ausgewählten Tauchgang</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="308"/>
+        <location filename="../core/statistics.c" line="311"/>
         <source>for all dives</source>
         <translation>für alle Tauchgänge</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="310"/>
+        <location filename="../core/statistics.c" line="313"/>
         <source>(no dives)</source>
         <translation>(keine Tauchgänge)</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Sun</source>
         <translation>So</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Mon</source>
         <translation>Mo</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Tue</source>
         <translation>Di</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Wed</source>
         <translation>Mi</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Thu</source>
         <translation>Do</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Fri</source>
         <translation>Fr</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Sat</source>
         <translation>Sa</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Jan</source>
         <translation>Jan</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Feb</source>
         <translation>Feb</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Mar</source>
         <translation>Mär</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Apr</source>
         <translation>Apr</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>May</source>
         <translation>Mai</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Jun</source>
         <translation>Jun</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Jul</source>
         <translation>Jul</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Aug</source>
         <translation>Aug</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Sep</source>
         <translation>Sep</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Oct</source>
         <translation>Okt</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Nov</source>
         <translation>Nov</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Dec</source>
         <translation>Dez</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="191"/>
-        <location filename="../core/parse-xml.c" line="3284"/>
-        <location filename="../core/uemis-downloader.c" line="134"/>
-        <source>unknown</source>
-        <translation>unbekannt</translation>
-    </message>
-    <message>
-        <location filename="../core/uemis-downloader.c" line="467"/>
-        <source>data</source>
-        <translation>Daten</translation>
-    </message>
-    <message>
-        <location filename="../core/uemis-downloader.c" line="447"/>
-        <source>%s %s</source>
-        <translation>%s %s</translation>
-    </message>
-    <message>
         <location filename="../core/uemis-downloader.c" line="27"/>
         <source>Uemis Zurich: the file system is almost full.
 Disconnect/reconnect the dive computer
@@ -10081,6 +10539,16 @@ Ist der Uemis Zürich korrekt verbunden?</translation>
         <translation>Keine Tauchgänge zum Herunterladen vorhanden.</translation>
     </message>
     <message>
+        <location filename="../core/uemis-downloader.c" line="447"/>
+        <source>%s %s</source>
+        <translation>%s %s</translation>
+    </message>
+    <message>
+        <location filename="../core/uemis-downloader.c" line="467"/>
+        <source>data</source>
+        <translation>Daten</translation>
+    </message>
+    <message>
         <location filename="../core/uemis-downloader.c" line="495"/>
         <source>divelog #</source>
         <translation>Tauchprotokoll #</translation>
@@ -10251,281 +10719,6 @@ Ist der Uemis Zürich korrekt verbunden?</translation>
         <translation>Batteriealarm</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="469"/>
-        <location filename="../core/save-html.c" line="553"/>
-        <location filename="../core/worldmap-save.c" line="111"/>
-        <source>Can&apos;t open file %s</source>
-        <translation>Kann Datei %s nicht öffnen</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="488"/>
-        <source>Number</source>
-        <translation>Nummer</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="489"/>
-        <source>Date</source>
-        <translation>Datum</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="490"/>
-        <source>Time</source>
-        <translation>Zeit</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="491"/>
-        <source>Location</source>
-        <translation>Ort</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="492"/>
-        <source>Air temp.</source>
-        <translation>Lufttemp.</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="493"/>
-        <source>Water temp.</source>
-        <translation>Wassertemp.</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="498"/>
-        <source>Statistics</source>
-        <translation>Statistiken</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="502"/>
-        <source>Rating</source>
-        <translation>Bewertung</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="503"/>
-        <source>Visibility</source>
-        <translation>Sicht</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="504"/>
-        <source>Duration</source>
-        <translation>Dauer</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="494"/>
-        <source>Dives</source>
-        <translation>Tauchgänge</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="495"/>
-        <source>Expand all</source>
-        <translation>Alle ausfalten</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="496"/>
-        <source>Collapse all</source>
-        <translation>Alle einfalten</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="497"/>
-        <source>Trips</source>
-        <translation>Ausflüge</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="499"/>
-        <source>Advanced search</source>
-        <translation>Erweiterte Suche</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="505"/>
-        <source>Divemaster</source>
-        <translation>Divemaster</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="506"/>
-        <source>Buddy</source>
-        <translation>Buddy</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="507"/>
-        <source>Suit</source>
-        <translation>Anzug</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="508"/>
-        <source>Tags</source>
-        <translation>Stichwörter</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="509"/>
-        <location filename="../smtk-import/smartrak.c" line="251"/>
-        <location filename="../smtk-import/smartrak.c" line="321"/>
-        <source>Notes</source>
-        <translation>Notizen</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="510"/>
-        <source>Show more details</source>
-        <translation>Mehr Details anzeigen</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="513"/>
-        <source>Yearly statistics</source>
-        <translation>Jahresstatistiken</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="514"/>
-        <source>Year</source>
-        <translation>Jahr</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="515"/>
-        <source>Total time</source>
-        <translation>Gesamtzeit</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="516"/>
-        <source>Average time</source>
-        <translation>Durchschnittszeit</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="517"/>
-        <source>Shortest time</source>
-        <translation>Kürzeste Zeit</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="518"/>
-        <source>Longest time</source>
-        <translation>Längste Zeit</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="519"/>
-        <source>Average depth</source>
-        <translation>Durchschnittstiefe</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="520"/>
-        <source>Min. depth</source>
-        <translation>Min. Tiefe</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="521"/>
-        <source>Max. depth</source>
-        <translation>Max. Tiefe</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="523"/>
-        <source>Min. SAC</source>
-        <translation>Min. SAC</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="524"/>
-        <source>Max. SAC</source>
-        <translation>Max. SAC</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="525"/>
-        <source>Average temp.</source>
-        <translation>Durchschnittstemp.</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="526"/>
-        <source>Min. temp.</source>
-        <translation>Min. Temp.</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="527"/>
-        <source>Max. temp.</source>
-        <translation>Max. Temp.</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="528"/>
-        <source>Back to list</source>
-        <translation>Zurück zur Liste</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="534"/>
-        <source>Dive equipment</source>
-        <translation>Tauchausrüstung</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="537"/>
-        <source>Work pressure</source>
-        <translation>Arbeitsdruck</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="538"/>
-        <source>Start pressure</source>
-        <translation>Anfangsdruck</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="539"/>
-        <source>End pressure</source>
-        <translation>Enddruck</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="547"/>
-        <source>Dive status</source>
-        <translation>Tauchstatus</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="522"/>
-        <source>Average SAC</source>
-        <translation>Durchschnittliches SAC</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="531"/>
-        <source>Dive No.</source>
-        <translation>Tauchgang Nr.</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="532"/>
-        <source>Dive profile</source>
-        <translation>Tauchprofil</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="533"/>
-        <source>Dive information</source>
-        <translation>Tauchinformation</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="535"/>
-        <location filename="../core/save-html.c" line="542"/>
-        <source>Type</source>
-        <translation>Typ</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="536"/>
-        <source>Size</source>
-        <translation>Grösse</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="540"/>
-        <source>Gas</source>
-        <translation>Gas</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="541"/>
-        <source>Weight</source>
-        <translation>Gewicht</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="543"/>
-        <source>Events</source>
-        <translation>Ereignisse</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="544"/>
-        <source>Name</source>
-        <translation>Name</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="545"/>
-        <source>Value</source>
-        <translation>Wert</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="546"/>
-        <source>Coordinates</source>
-        <translation>Koordinaten</translation>
-    </message>
-    <message>
         <location filename="../core/worldmap-save.c" line="39"/>
         <source>Date:</source>
         <translation>Datum:</translation>
@@ -10571,110 +10764,6 @@ Ist der Uemis Zürich korrekt verbunden?</translation>
         <translation>Notizen:</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="91"/>
-        <location filename="../core/qthelper.cpp" line="226"/>
-        <source>N</source>
-        <translation>N</translation>
-    </message>
-    <message>
-        <location filename="../core/qthelper.cpp" line="91"/>
-        <location filename="../core/qthelper.cpp" line="227"/>
-        <source>S</source>
-        <translation>S</translation>
-    </message>
-    <message>
-        <location filename="../core/qthelper.cpp" line="92"/>
-        <location filename="../core/qthelper.cpp" line="228"/>
-        <source>E</source>
-        <translation>O</translation>
-    </message>
-    <message>
-        <location filename="../core/qthelper.cpp" line="92"/>
-        <location filename="../core/qthelper.cpp" line="229"/>
-        <source>W</source>
-        <translation>W</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="341"/>
-        <source>Remote storage and local data diverged. Error: merge failed (%s)</source>
-        <translation>Die lokale Version ist von der Servierversion divergiert. Fehler: Vereinigung fehlgeschlagen (%s)</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="134"/>
-        <source>Local cache directory %s corrupted - can&apos;t sync with Subsurface cloud storage</source>
-        <translation>Der lokale Zwischenspeicher %s ist korrupt, Daten können nicht mit dem Cloud Speicher synchronisiert werden</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="157"/>
-        <location filename="../core/git-access.c" line="177"/>
-        <source>Could not update local cache to newer remote data</source>
-        <translation>Lokaler Cache konnte nicht auf neuere externe Daten aktualisiert werden</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="170"/>
-        <source>Subsurface cloud storage corrupted</source>
-        <translation>Subsurface Cloud Speicher ist unbrauchbar</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="285"/>
-        <source>Could not update Subsurface cloud storage, try again later</source>
-        <translation>Der Subsurface Cloud Speicher konnte nicht aktualisiert werden, versuche es später nocheinmal</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="371"/>
-        <source>Remote storage and local data diverged. Cannot combine local and remote changes</source>
-        <translation>Die lokale Version weicht von der Serverversion ab. Lokale und entfernte Änderungen können nicht zusammengeführt werden.</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="405"/>
-        <source>Remote storage and local data diverged</source>
-        <translation>Lokale Version und Serverversion sind verschieden</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="408"/>
-        <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source>
-        <translation>Die lokale Version weicht von der Servierversion ab. Fehler: Schreiben der Daten fehlgeschlagen (%s)</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="417"/>
-        <source>Problems with local cache of Subsurface cloud data</source>
-        <translation>Es gibt Probleme mit dem lokalen Subsurface Cloud Zwischenspeicher</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="418"/>
-        <source>Moved cache data to %s. Please try the operation again.</source>
-        <translation>Zwischenspeicher Daten nach %s verschoben. Bitte versuchen Sie es noch einmal.</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="737"/>
-        <source>Error connecting to Subsurface cloud storage</source>
-        <translation>Fehler beim Verbinden mit dem Subsurface Cloud Speicher</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="740"/>
-        <source>git clone of %s failed (%s)</source>
-        <translation>GIT Clone von %s ist gescheitert (%s)</translation>
-    </message>
-    <message>
-        <location filename="../core/load-git.c" line="222"/>
-        <location filename="../core/parse-xml.c" line="1300"/>
-        <source>additional name for site: %s
-</source>
-        <translation>Zusätzlicher Name für Tauchplatz: %s
-</translation>
-    </message>
-    <message>
-        <location filename="../core/ostctools.c" line="120"/>
-        <location filename="../core/ostctools.c" line="152"/>
-        <source>Unknown DC in dive %d</source>
-        <translation>Unbekannter DC in Tauchgang %d</translation>
-    </message>
-    <message>
-        <location filename="../core/ostctools.c" line="165"/>
-        <source>Error - %s - parsing dive %d</source>
-        <translation>Fehler - %s - beim Analysieren von Tauchgang %d</translation>
-    </message>
-    <message>
         <location filename="../smtk-import/smartrak.c" line="247"/>
         <source>Built</source>
         <translation type="unfinished"/>
@@ -10758,155 +10847,120 @@ Ist der Uemis Zürich korrekt verbunden?</translation>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="91"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="103"/>
         <source>Subsurface</source>
         <translation>Subsurface</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="97"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="110"/>
         <source>Dive list</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="112"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="125"/>
         <source>Cloud credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="126"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="139"/>
         <source>Manage dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="138"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="141"/>
         <source>Add dive manually</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="146"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="149"/>
         <source>Manual sync with cloud</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="164"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="167"/>
         <source>Offline mode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="164"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="167"/>
         <source>Enable auto cloud sync</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="182"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="187"/>
         <source>GPS</source>
         <translation>GPS</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="185"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="190"/>
         <source>GPS-tag dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="192"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="197"/>
         <source>Upload GPS data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="199"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="204"/>
         <source>Download GPS data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="206"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="211"/>
         <source>Show GPS fixes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="215"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="220"/>
         <source>Clear GPS cache</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="221"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="226"/>
         <source>Preferences</source>
         <translation>Einstellungen</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="230"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="237"/>
         <source>Developer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="232"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="239"/>
         <source>App log</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="239"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="246"/>
         <source>Theme information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="246"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="253"/>
         <source>User manual</source>
         <translation>Benutzerhandbuch</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="252"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="259"/>
         <source>About</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="283"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="304"/>
         <source>Run location service</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="283"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="304"/>
         <source>No GPS source available</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="295"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="316"/>
         <source>Actions</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="9"/>
-        <source>Hello World</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="13"/>
-        <source>File</source>
-        <translation>Datei</translation>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="15"/>
-        <source>&amp;Open</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="19"/>
-        <source>Exit</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="27"/>
-        <source>Button 1 pressed</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="28"/>
-        <source>Button 2 pressed</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="33"/>
-        <source>May I have your attention, please?</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>plannerDetails</name>
@@ -10984,6 +11038,24 @@ p, li { white-space: pre-wrap; }
         <translation>m/min</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="121"/>
+        <location filename="../build/ui_plannerSettings.h" line="425"/>
+        <source>75% to 50% avg. depth</source>
+        <translation>75% bis 50% mittlerer Tiefe</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="138"/>
+        <location filename="../build/ui_plannerSettings.h" line="427"/>
+        <source>50% avg. depth to 6m</source>
+        <translation>50% mitlerer Tiefe bis 6m</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="155"/>
+        <location filename="../build/ui_plannerSettings.h" line="429"/>
+        <source>6m to surface</source>
+        <translation>6m bis Oberfläche</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="175"/>
         <location filename="../build/ui_plannerSettings.h" line="431"/>
         <source>Descent</source>
@@ -11007,12 +11079,35 @@ p, li { white-space: pre-wrap; }
         <translation>VPM-B Deko</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="268"/>
+        <source>Bühlmann deco</source>
+        <translation>Bühlmann Deko</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="278"/>
         <location filename="../build/ui_plannerSettings.h" line="445"/>
         <source>Reserve gas</source>
         <translation>Reserve Gas</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="288"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="549"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="578"/>
+        <location filename="../build/ui_plannerSettings.h" line="446"/>
+        <location filename="../build/ui_plannerSettings.h" line="459"/>
+        <location filename="../build/ui_plannerSettings.h" line="461"/>
+        <source>bar</source>
+        <translation>bar</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="307"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="416"/>
+        <location filename="../build/ui_plannerSettings.h" line="437"/>
+        <location filename="../build/ui_plannerSettings.h" line="440"/>
+        <source>%</source>
+        <translation>%</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="320"/>
         <location filename="../build/ui_plannerSettings.h" line="449"/>
         <source>Postpone gas change if a stop is not required</source>
@@ -11031,12 +11126,10 @@ p, li { white-space: pre-wrap; }
         <translation>GF niedrig</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="307"/>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="416"/>
-        <location filename="../build/ui_plannerSettings.h" line="437"/>
-        <location filename="../build/ui_plannerSettings.h" line="440"/>
-        <source>%</source>
-        <translation>%</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="353"/>
+        <location filename="../build/ui_plannerSettings.h" line="436"/>
+        <source>Plan backgas breaks</source>
+        <translation>Plane backgas Pausen</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="360"/>
@@ -11045,10 +11138,10 @@ p, li { white-space: pre-wrap; }
         <translation>GF hoch</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="429"/>
-        <location filename="../build/ui_plannerSettings.h" line="441"/>
-        <source>Drop to first depth</source>
-        <translation>Direkter Abstieg zur ersten Tiefe</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="370"/>
+        <location filename="../build/ui_plannerSettings.h" line="453"/>
+        <source>min</source>
+        <translation>min</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="389"/>
@@ -11057,163 +11150,139 @@ p, li { white-space: pre-wrap; }
         <translation>Letzter Stopp auf 6m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="353"/>
-        <location filename="../build/ui_plannerSettings.h" line="436"/>
-        <source>Plan backgas breaks</source>
-        <translation>Plane backgas Pausen</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="396"/>
+        <source>Maximize bottom time allowed by gas and no decompression limits</source>
+        <translation>Maximal erlaubte Grundzeit ohne Dekompression Limite</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="515"/>
-        <location filename="../build/ui_plannerSettings.h" line="455"/>
-        <source>Gas options</source>
-        <translation>Gas Optionen</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="399"/>
+        <location filename="../build/ui_plannerSettings.h" line="443"/>
+        <source>Recreational mode</source>
+        <translation>Sporttaucher Modus</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="594"/>
-        <location filename="../build/ui_plannerSettings.h" line="456"/>
-        <source>Bottom SAC</source>
-        <translation>SAC</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="429"/>
+        <location filename="../build/ui_plannerSettings.h" line="441"/>
+        <source>Drop to first depth</source>
+        <translation>Direkter Abstieg zur ersten Tiefe</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="692"/>
-        <location filename="../build/ui_plannerSettings.h" line="457"/>
-        <source>Deco SAC</source>
-        <translation>Deko SAC</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="436"/>
+        <location filename="../build/ui_plannerSettings.h" line="452"/>
+        <source>Min. switch duration</source>
+        <translation>Min. Schaltdauer</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="601"/>
-        <location filename="../build/ui_plannerSettings.h" line="458"/>
-        <source>Bottom pO₂</source>
-        <translation>Grund pO₂</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="459"/>
+        <location filename="../build/ui_plannerSettings.h" line="444"/>
+        <source>Safety stop</source>
+        <translation>Sicherheitsstopp</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="685"/>
-        <location filename="../build/ui_plannerSettings.h" line="460"/>
-        <source>Deco pO₂</source>
-        <translation>Deko pO₂</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="495"/>
+        <source>Conservatism level</source>
+        <translation>Sicherheitslevel</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="515"/>
+        <location filename="../build/ui_plannerSettings.h" line="455"/>
+        <source>Gas options</source>
+        <translation>Gas Optionen</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="565"/>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="672"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="698"/>
         <location filename="../build/ui_plannerSettings.h" line="462"/>
         <location filename="../build/ui_plannerSettings.h" line="463"/>
         <source>ℓ/min</source>
         <translation>ℓ/min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="632"/>
-        <location filename="../build/ui_plannerSettings.h" line="468"/>
-        <source>Display runtime</source>
-        <translation>Zeige runtime</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="645"/>
-        <location filename="../build/ui_plannerSettings.h" line="472"/>
-        <source>Display segment duration</source>
-        <translation>Zeige Segmentdauer</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="655"/>
-        <location filename="../build/ui_plannerSettings.h" line="476"/>
-        <source>Display transitions in deco</source>
-        <translation>Aufstiege in der Deko anzeigen</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="662"/>
-        <location filename="../build/ui_plannerSettings.h" line="477"/>
-        <source>Verbatim dive plan</source>
-        <translation>Ausführlicher Tauchplan</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="288"/>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="549"/>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="578"/>
-        <location filename="../build/ui_plannerSettings.h" line="446"/>
-        <location filename="../build/ui_plannerSettings.h" line="459"/>
-        <location filename="../build/ui_plannerSettings.h" line="461"/>
-        <source>bar</source>
-        <translation>bar</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="121"/>
-        <location filename="../build/ui_plannerSettings.h" line="425"/>
-        <source>75% to 50% avg. depth</source>
-        <translation>75% bis 50% mittlerer Tiefe</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="138"/>
-        <location filename="../build/ui_plannerSettings.h" line="427"/>
-        <source>50% avg. depth to 6m</source>
-        <translation>50% mitlerer Tiefe bis 6m</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="155"/>
-        <location filename="../build/ui_plannerSettings.h" line="429"/>
-        <source>6m to surface</source>
-        <translation>6m bis Oberfläche</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="268"/>
-        <source>Bühlmann deco</source>
-        <translation>Bühlmann Deko</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="370"/>
-        <location filename="../build/ui_plannerSettings.h" line="453"/>
-        <source>min</source>
-        <translation>min</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="396"/>
-        <source>Maximize bottom time allowed by gas and no decompression limits</source>
-        <translation>Maximal erlaubte Grundzeit ohne Dekompression Limite</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="594"/>
+        <source>m</source>
+        <translation>m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="399"/>
-        <location filename="../build/ui_plannerSettings.h" line="443"/>
-        <source>Recreational mode</source>
-        <translation>Sporttaucher Modus</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="606"/>
+        <source>Used to calculate best mix. Select best mix depth in &apos;Available gases&apos; table by entering gas depth, followed by &quot;B&quot; (best trimix mix) or &quot;BN&quot; (best nitrox mix)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="436"/>
-        <location filename="../build/ui_plannerSettings.h" line="452"/>
-        <source>Min. switch duration</source>
-        <translation>Min. Schaltdauer</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="613"/>
+        <location filename="../build/ui_plannerSettings.h" line="456"/>
+        <source>Bottom SAC</source>
+        <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="459"/>
-        <location filename="../build/ui_plannerSettings.h" line="444"/>
-        <source>Safety stop</source>
-        <translation>Sicherheitsstopp</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="620"/>
+        <location filename="../build/ui_plannerSettings.h" line="458"/>
+        <source>Bottom pO₂</source>
+        <translation>Grund pO₂</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="495"/>
-        <source>Conservatism level</source>
-        <translation>Sicherheitslevel</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="627"/>
+        <source>Best mix END</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="608"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="634"/>
         <location filename="../build/ui_plannerSettings.h" line="464"/>
         <source>Notes</source>
         <translation>Notizen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="629"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="655"/>
         <location filename="../build/ui_plannerSettings.h" line="466"/>
         <source>In dive plan, show runtime (absolute time) of stops</source>
         <translation>Zeige runtime (absolute Zeit) der Stopps im Tauchplan</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="642"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="658"/>
+        <location filename="../build/ui_plannerSettings.h" line="468"/>
+        <source>Display runtime</source>
+        <translation>Zeige runtime</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="668"/>
         <location filename="../build/ui_plannerSettings.h" line="470"/>
         <source>In dive plan, show duration (relative time) of stops</source>
         <translation>Zeige Dauer (relative Zeit) der Stopps im Tauchplan.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="652"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="671"/>
+        <location filename="../build/ui_plannerSettings.h" line="472"/>
+        <source>Display segment duration</source>
+        <translation>Zeige Segmentdauer</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="678"/>
         <location filename="../build/ui_plannerSettings.h" line="474"/>
         <source>In diveplan, list transitions or treat them as implicit</source>
         <translation>Zeige Aufstiege im Tauchplen oder behandle sie als implizit</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="681"/>
+        <location filename="../build/ui_plannerSettings.h" line="476"/>
+        <source>Display transitions in deco</source>
+        <translation>Aufstiege in der Deko anzeigen</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="688"/>
+        <location filename="../build/ui_plannerSettings.h" line="477"/>
+        <source>Verbatim dive plan</source>
+        <translation>Ausführlicher Tauchplan</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="711"/>
+        <location filename="../build/ui_plannerSettings.h" line="460"/>
+        <source>Deco pO₂</source>
+        <translation>Deko pO₂</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="718"/>
+        <location filename="../build/ui_plannerSettings.h" line="457"/>
+        <source>Deco SAC</source>
+        <translation>Deko SAC</translation>
+    </message>
 </context>
 </TS>
\ No newline at end of file
diff --git a/translations/subsurface_de_DE.ts b/translations/subsurface_de_DE.ts
index 66289c712..e0dfdc28f 100644
--- a/translations/subsurface_de_DE.ts
+++ b/translations/subsurface_de_DE.ts
@@ -108,6 +108,11 @@
         <translation>Name:</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="56"/>
+        <source>Could not initialize Winsock version 2.2</source>
+        <translation>Winsock-Version 2.2 konnte nicht initialisiert werden</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="134"/>
         <source>Trying to turn on the local Bluetooth device...</source>
         <translation>Es wird versucht, dass lokale Bluetooth-Gerät einzuschalten...</translation>
@@ -118,6 +123,11 @@
         <translation>Es wird versucht, dass lokale Bluetooth-Gerät auszuschalten...</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="167"/>
+        <source>Remote devices list was cleared.</source>
+        <translation>Liste der externen Geräte wurde geleert.</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="183"/>
         <source>Scanning for remote devices...</source>
         <translation>Nach externen Geräten wird gesucht...</translation>
@@ -128,6 +138,22 @@
         <translation>Suchvorgang erfolgreich beendet.</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="208"/>
+        <source>The local Bluetooth device was %1.</source>
+        <extracomment>%1 will be replaced with &quot;turned on&quot; or &quot;turned off&quot;</extracomment>
+        <translation>Das lokale Bluetooth-Gerät war %1.</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
+        <source>turned on</source>
+        <translation>eingeschaltet</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
+        <source>turned off</source>
+        <translation>ausgeschaltet</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="225"/>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="339"/>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="359"/>
@@ -175,37 +201,6 @@
         <translation>Verbindung</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="352"/>
-        <source>Device %1 was paired and is authorized.</source>
-        <translation>Gerät %1 wurde verbunden und ist autorisiert.</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="56"/>
-        <source>Could not initialize Winsock version 2.2</source>
-        <translation>Winsock-Version 2.2 konnte nicht initialisiert werden</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="167"/>
-        <source>Remote devices list was cleared.</source>
-        <translation>Liste der externen Geräte wurde geleert.</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="208"/>
-        <source>The local Bluetooth device was %1.</source>
-        <extracomment>%1 will be replaced with &quot;turned on&quot; or &quot;turned off&quot;</extracomment>
-        <translation>Das lokale Bluetooth-Gerät war %1.</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
-        <source>turned on</source>
-        <translation>eingeschaltet</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
-        <source>turned off</source>
-        <translation>ausgeschaltet</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="307"/>
         <source>Remove pairing</source>
         <translation>Paarung aufheben</translation>
@@ -231,6 +226,11 @@
         <translation>Gerät %1 wurde verbunden.</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="352"/>
+        <source>Device %1 was paired and is authorized.</source>
+        <translation>Gerät %1 wurde verbunden und ist autorisiert.</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="378"/>
         <source>The device %1 can now be used for connection. You can press the Save button.</source>
         <translation>Das Gerät %1 kann jetzt für die Verbindung verwendet werden. Sie können die Schaltfläche Speichern drücken.</translation>
@@ -289,12 +289,12 @@
 <context>
     <name>BuddyFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="621"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="619"/>
         <source>Person: </source>
         <translation>Person: </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="622"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="620"/>
         <source>Searches for buddies and divemasters</source>
         <translation>Sucht nach Tauchgruppenleiter und Tauchpartner</translation>
     </message>
@@ -302,7 +302,7 @@
 <context>
     <name>BuddyFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="243"/>
+        <location filename="../qt-models/filtermodels.cpp" line="248"/>
         <source>No buddies</source>
         <translation>Keine Tauchpartner</translation>
     </message>
@@ -310,25 +310,30 @@
 <context>
     <name>CloudCredentials</name>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="49"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="50"/>
         <source>Cloud credentials</source>
         <translation>Cloud Benutzerdaten</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="55"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="56"/>
         <source>Email</source>
         <translation>EMail</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="67"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="68"/>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="90"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="92"/>
         <source>Show password</source>
         <translation>Passwort anzeigen</translation>
     </message>
+    <message>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="97"/>
+        <source>PIN</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>ColumnNameProvider</name>
@@ -384,6 +389,16 @@
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
+        <source>Max. depth</source>
+        <translation>Max. Tiefe</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
+        <source>Avg. depth</source>
+        <translation>Ø Tiefe</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
         <source>Divemaster</source>
         <translation>Tauchgruppenleiter</translation>
     </message>
@@ -394,6 +409,11 @@
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
+        <source>Suit</source>
+        <translation>Anzug</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
         <source>Notes</source>
         <translation>Notizen</translation>
     </message>
@@ -413,21 +433,6 @@
         <translation>Wassertemp.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
-        <source>Max. depth</source>
-        <translation>Max. Tiefe</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
-        <source>Avg. depth</source>
-        <translation>Ø Tiefe</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
-        <source>Suit</source>
-        <translation>Anzug</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="44"/>
         <source>O₂</source>
         <translation>O₂</translation>
@@ -541,7 +546,7 @@
         <translation>Fehler beim Erzeugen des libdivecomputer Contexts</translation>
     </message>
     <message>
-        <location filename="../core/configuredivecomputer.cpp" line="660"/>
+        <location filename="../core/configuredivecomputer.cpp" line="656"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation>Verbindung zum Tauchcomputer konnte nicht hergestellt werden.</translation>
     </message>
@@ -561,11 +566,19 @@
         <translation>Gerät oder Einhängepunkt</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="170"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1520"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1533"/>
-        <source>...</source>
-        <translation>...</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="47"/>
+        <source>Connect via Bluetooth</source>
+        <translation>Über Bluetooth verbinden</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="54"/>
+        <source>Connect</source>
+        <translation>Verbinden</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="64"/>
+        <source>Disconnect</source>
+        <translation>Verbindung trennen</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="80"/>
@@ -574,12 +587,24 @@
         <translation>Verfügbare Details abrufen</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="90"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1523"/>
+        <source>Read settings from backup file or from device before writing to the device</source>
+        <translation>Vor dem Schreiben auf das Gerät die Einstellungen aus einer Sicherungsdatei oder vom Gerät lesen</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="93"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1525"/>
         <source>Save changes to device</source>
         <translation>Änderungen auf Gerät speichern</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="116"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1527"/>
+        <source>Read settings from backup file or from device before writing to a backup file</source>
+        <translation>Vor dem Schreiben in eine Sicherungsdatei die Einstellungen aus einer Sicherungsdatei oder vom Gerät lesen</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="119"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1529"/>
         <source>Backup</source>
@@ -598,15 +623,40 @@
         <translation>Firmware aktualisieren</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="163"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1532"/>
+        <source>Save libdivecomputer logfile</source>
+        <translation>libdivecomputer-Protokolldatei speichern</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="170"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1520"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1533"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="177"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1534"/>
         <source>Cancel</source>
         <translation>Abbrechen</translation>
     </message>
     <message>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1539"/>
-        <source>OSTC 3</source>
-        <translation>OSTC 3</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="214"/>
+        <source>OSTC 3,Sport,Cr,2</source>
+        <translation>OSTC 3,Sport,Cr,2</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="223"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1541"/>
+        <source>Suunto Vyper family</source>
+        <translation>Suunto Vyper-Familie</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="232"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1543"/>
+        <source>OSTC, Mk.2/2N/2C</source>
+        <translation>OSTC, Mk.2/2N/2C</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="253"/>
@@ -619,40 +669,56 @@
         <translation>Grundeinstellungen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="326"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1656"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1943"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1546"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1726"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1766"/>
-        <source>Serial No.</source>
-        <translation>Seriennummer</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="260"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1575"/>
+        <source>Eco</source>
+        <translation>Öko</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="349"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1679"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1980"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1547"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1727"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1767"/>
-        <source>Firmware version</source>
-        <translation>Firmware-Version</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="265"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1576"/>
+        <source>Medium</source>
+        <translation>Mittel</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="538"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1713"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1990"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1548"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1729"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1768"/>
-        <source>Custom text</source>
-        <translation>Benutzerdefinierter Text</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="270"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1577"/>
+        <source>High</source>
+        <translation>Hoch</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="385"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1549"/>
-        <source>Language</source>
-        <translation>Sprache</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="278"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="826"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="849"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="875"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="927"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="993"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1019"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1101"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1117"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1450"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2278"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2382"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2408"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2434"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2474"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2497"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1586"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1621"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1623"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1625"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1628"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1637"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1638"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1710"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1785"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1789"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1801"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1803"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1806"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1807"/>
+        <source>%</source>
+        <translation>%</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="289"/>
@@ -679,44 +745,36 @@
         <translation>Italienisch</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="579"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1557"/>
-        <source>Dive mode</source>
-        <translation>Tauchmodus</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="556"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1560"/>
-        <source>OC</source>
-        <translation>OC</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="561"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1561"/>
-        <source>CC</source>
-        <translation>CC</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="313"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1582"/>
+        <source>m/°C</source>
+        <translation>m/°C</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="566"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2336"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1562"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1793"/>
-        <source>Gauge</source>
-        <translation>Zeit-/Tiefenmesser</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="318"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1583"/>
+        <source>ft/°F</source>
+        <translation>ft/°F</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="571"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1563"/>
-        <source>Apnea</source>
-        <translation>Apnoe</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="326"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1656"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1943"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1546"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1726"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1766"/>
+        <source>Serial No.</source>
+        <translation>Seriennummer</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="395"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2063"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1565"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1780"/>
-        <source>Date format</source>
-        <translation>Datumsformat</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="349"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1679"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1980"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1547"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1727"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1767"/>
+        <source>Firmware version</source>
+        <translation>Firmware-Version</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="360"/>
@@ -737,108 +795,147 @@
         <translation>JJMMTT</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1042"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2457"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1639"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1805"/>
-        <source>Saturation</source>
-        <translation>Sättigung</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="385"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1549"/>
+        <source>Language</source>
+        <translation>Sprache</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="278"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="826"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="849"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="875"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="927"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="993"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1019"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1101"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1117"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1450"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2278"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2382"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2408"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2434"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2474"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2497"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1586"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1621"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1623"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1625"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1628"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1637"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1638"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1710"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1785"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1789"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1801"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1803"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1806"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1807"/>
-        <source>%</source>
-        <translation>%</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="395"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2063"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1565"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1780"/>
+        <source>Date format</source>
+        <translation>Datumsformat</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="865"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2261"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1624"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1784"/>
-        <source>Desaturation</source>
-        <translation>Entsättigung</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="405"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1572"/>
+        <source>Brightness</source>
+        <translation>Helligkeit</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="983"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2398"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1636"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1800"/>
-        <source>Last deco</source>
-        <translation>Letzter Dekostopp</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="415"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1850"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1579"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1753"/>
+        <source>Units</source>
+        <translation>Einheiten</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="711"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="736"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="758"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="904"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2181"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2206"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2228"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2307"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1626"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1786"/>
-        <source> m</source>
-        <translation>m</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="425"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1585"/>
+        <source>Salinity (0-5%)</source>
+        <translation>Salzgehalt (0-5%)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="405"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1572"/>
-        <source>Brightness</source>
-        <translation>Helligkeit</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="438"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1615"/>
+        <source>Reset device to default settings</source>
+        <translation>Gerät auf die Standardeinstellungen zurücksetzen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="260"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1575"/>
-        <source>Eco</source>
-        <translation>Öko</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="452"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1590"/>
+        <source>230LSB/Gauss</source>
+        <translation>230LSB/Gauss</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="265"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1576"/>
-        <source>Medium</source>
-        <translation>Mittel</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="457"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1591"/>
+        <source>330LSB/Gauss</source>
+        <translation>330LSB/Gauss</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="270"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1577"/>
-        <source>High</source>
-        <translation>Hoch</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="462"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1592"/>
+        <source>390LSB/Gauss</source>
+        <translation>390LSB/Gauss</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="603"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2034"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1599"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1779"/>
-        <source>Sampling rate</source>
-        <translation>Abtastrate</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="467"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1593"/>
+        <source>440LSB/Gauss</source>
+        <translation>440LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="472"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1594"/>
+        <source>660LSB/Gauss</source>
+        <translation>660LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="477"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1595"/>
+        <source>820LSB/Gauss</source>
+        <translation>820LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="482"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1596"/>
+        <source>1090LSB/Gauss</source>
+        <translation>1090LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="487"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1597"/>
+        <source>1370LSB/Gauss</source>
+        <translation>1370LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="521"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1587"/>
+        <source>Compass gain</source>
+        <translation>Kompass Empfindlichkeit</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="531"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1799"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1745"/>
+        <source>Computer model</source>
+        <translation>Computermodell</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="538"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1713"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1990"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1548"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1729"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1768"/>
+        <source>Custom text</source>
+        <translation>Benutzerdefinierter Text</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="556"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1560"/>
+        <source>OC</source>
+        <translation>OC</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="561"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1561"/>
+        <source>CC</source>
+        <translation>CC</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="566"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2336"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1562"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1793"/>
+        <source>Gauge</source>
+        <translation>Zeit-/Tiefenmesser</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="571"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1563"/>
+        <source>Apnea</source>
+        <translation>Apnoe</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="579"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1557"/>
+        <source>Dive mode</source>
+        <translation>Tauchmodus</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="590"/>
@@ -855,30 +952,12 @@
         <translation>10s</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="415"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1850"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1579"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1753"/>
-        <source>Units</source>
-        <translation>Einheiten</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="313"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1582"/>
-        <source>m/°C</source>
-        <translation>m/°C</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="318"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1583"/>
-        <source>ft/°F</source>
-        <translation>ft/°F</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="644"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1605"/>
-        <source>Dive mode color</source>
-        <translation>Tauchmodusfarbe</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="603"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2034"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1599"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1779"/>
+        <source>Sampling rate</source>
+        <translation>Abtastrate</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="614"/>
@@ -905,12 +984,6 @@
         <translation>Blau</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="425"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1585"/>
-        <source>Salinity (0-5%)</source>
-        <translation>Salzgehalt (0-5%)</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="637"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2092"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1613"/>
@@ -919,90 +992,80 @@
         <translation>Tauchcomputerzeit mit dem PC synchronisieren</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="521"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1587"/>
-        <source>Compass gain</source>
-        <translation>Kompass Empfindlichkeit</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="90"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1523"/>
-        <source>Read settings from backup file or from device before writing to the device</source>
-        <translation>Vor dem Schreiben auf das Gerät die Einstellungen aus einer Sicherungsdatei oder vom Gerät lesen</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="116"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1527"/>
-        <source>Read settings from backup file or from device before writing to a backup file</source>
-        <translation>Vor dem Schreiben in eine Sicherungsdatei die Einstellungen aus einer Sicherungsdatei oder vom Gerät lesen</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="232"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1543"/>
-        <source>OSTC, Mk.2/2N/2C</source>
-        <translation>OSTC, Mk.2/2N/2C</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="644"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1605"/>
+        <source>Dive mode color</source>
+        <translation>Tauchmodusfarbe</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="452"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1590"/>
-        <source>230LSB/Gauss</source>
-        <translation>230LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="654"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2020"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1614"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1771"/>
+        <source>Show safety stop</source>
+        <translation>Sicherheitsstopp anzeigen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="457"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1591"/>
-        <source>330LSB/Gauss</source>
-        <translation>330LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="661"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2145"/>
+        <source>End Depth</source>
+        <translation>Tiefe am Ende</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="462"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1592"/>
-        <source>390LSB/Gauss</source>
-        <translation>390LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="671"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2162"/>
+        <source> s</source>
+        <translation> s</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="467"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1593"/>
-        <source>440LSB/Gauss</source>
-        <translation>440LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="687"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1953"/>
+        <source>Length</source>
+        <translation>Länge</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="472"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1594"/>
-        <source>660LSB/Gauss</source>
-        <translation>660LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="694"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2138"/>
+        <source>Start Depth</source>
+        <translation>Starttiefe</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="477"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1595"/>
-        <source>820LSB/Gauss</source>
-        <translation>820LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="701"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2152"/>
+        <source>Reset Depth</source>
+        <translation>Tiefe zurücksetzen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="482"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1596"/>
-        <source>1090LSB/Gauss</source>
-        <translation>1090LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="711"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="736"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="758"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="904"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2181"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2206"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2228"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2307"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1626"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1786"/>
+        <source> m</source>
+        <translation>m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="487"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1597"/>
-        <source>1370LSB/Gauss</source>
-        <translation>1370LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="778"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2248"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1643"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1810"/>
+        <source>Advanced settings</source>
+        <translation>Erweiterte Einstellungen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="654"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2020"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1614"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1771"/>
-        <source>Show safety stop</source>
-        <translation>Sicherheitsstopp anzeigen</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="784"/>
+        <source>Left button sensitivity</source>
+        <translation>Linke Tastenempfindlichkeit</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="438"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1615"/>
-        <source>Reset device to default settings</source>
-        <translation>Gerät auf die Standardeinstellungen zurücksetzen</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="791"/>
+        <source>Always show ppO2</source>
+        <translation>ppO2 immer anzeigen</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="798"/>
@@ -1013,20 +1076,6 @@
         <translation>Alternativer GF kann unter Wasser ausgewählt werden</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="223"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1541"/>
-        <source>Suunto Vyper family</source>
-        <translation>Suunto Vyper-Familie</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="778"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2248"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1643"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1810"/>
-        <source>Advanced settings</source>
-        <translation>Erweiterte Einstellungen</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="805"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2271"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1618"/>
@@ -1057,6 +1106,14 @@
         <translation>GF hoch</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="865"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2261"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1624"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1784"/>
+        <source>Desaturation</source>
+        <translation>Entsättigung</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="917"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2320"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1627"/>
@@ -1071,14 +1128,6 @@
         <translation> mbar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="973"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2369"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1630"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1788"/>
-        <source> min</source>
-        <translation> min</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="960"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2331"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1633"/>
@@ -1087,63 +1136,28 @@
         <translation>ZH-L16</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="47"/>
-        <source>Connect via Bluetooth</source>
-        <translation>Über Bluetooth verbinden</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="163"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1532"/>
-        <source>Save libdivecomputer logfile</source>
-        <translation>libdivecomputer-Protokolldatei speichern</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="661"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2145"/>
-        <source>End Depth</source>
-        <translation>Tiefe am Ende</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="671"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2162"/>
-        <source> s</source>
-        <translation> s</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="687"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1953"/>
-        <source>Length</source>
-        <translation>Länge</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="694"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2138"/>
-        <source>Start Depth</source>
-        <translation>Starttiefe</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="701"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2152"/>
-        <source>Reset Depth</source>
-        <translation>Tiefe zurücksetzen</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="784"/>
-        <source>Left button sensitivity</source>
-        <translation>Linke Tastenempfindlichkeit</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="791"/>
-        <source>Always show ppO2</source>
-        <translation>ppO2 immer anzeigen</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="965"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1634"/>
         <source>ZH-L16+GF</source>
         <translation>ZH-L16+GF</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="973"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2369"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1630"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1788"/>
+        <source> min</source>
+        <translation> min</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="983"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2398"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1636"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1800"/>
+        <source>Last deco</source>
+        <translation>Letzter Dekostopp</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1009"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2424"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1640"/>
@@ -1160,6 +1174,14 @@
         <translation>Alt GF hoch</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1042"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2457"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1639"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1805"/>
+        <source>Saturation</source>
+        <translation>Sättigung</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1052"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1642"/>
         <source>Flip screen</source>
@@ -1171,12 +1193,22 @@
         <translation>Rechte Tastenempfindlichkeit</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1066"/>
+        <source>MOD warning</source>
+        <translation>MOD-Warnung</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1073"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2513"/>
         <source>Graphical speed indicator</source>
         <translation>Grafische Geschwindigkeitsanzeige</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1080"/>
+        <source>Dynamic ascent rate</source>
+        <translation>Dynamische Aufstiegsrate</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1087"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2552"/>
         <source>Bottom gas consumption</source>
@@ -1189,6 +1221,14 @@
         <translation>Dekogasverbrauch</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1133"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1149"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2520"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2536"/>
+        <source> ℓ/min</source>
+        <translation> ℓ/min</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1165"/>
         <source>Temperature sensor offset</source>
         <translation>Temperatursensoroffset</translation>
@@ -1207,6 +1247,18 @@
         <translation>Gas-Einstellungen</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1235"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1320"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2610"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2695"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1645"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1668"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1812"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1835"/>
+        <source>%O₂</source>
+        <translation>%O₂</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1240"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1325"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2615"/>
@@ -1325,16 +1377,10 @@
         <translation>Dil 5</translation>
     </message>
     <message>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1691"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1858"/>
-        <source>Set point [cbar]</source>
-        <translation>Punkt festlegen [cbar]</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1693"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1860"/>
-        <source>Change depth [m]</source>
-        <translation>Tiefe ändern [m]</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1405"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2770"/>
+        <source>Setpoint</source>
+        <translation>Einstellwert</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1415"/>
@@ -1373,6 +1419,12 @@
         <translation>SP 5</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1443"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1709"/>
+        <source>O₂ in calibration gas</source>
+        <translation>O₂ im Kalibrierungsgas</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1467"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1713"/>
         <source>Fixed setpoint</source>
@@ -1403,101 +1455,6 @@
         <translation> cbar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1748"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1733"/>
-        <source>P1 (medium)</source>
-        <extracomment>Suunto safety level</extracomment>
-        <translation>P1 (mittel)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1753"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1734"/>
-        <source>P2 (high)</source>
-        <extracomment>Suunto safety level</extracomment>
-        <translation>P2 (hoch)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1792"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1744"/>
-        <source>Total dive time</source>
-        <translation>Gesamtdauer</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2109"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1769"/>
-        <source>kg/ℓ</source>
-        <translation>kg/ℓ</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2346"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1795"/>
-        <source>Apnoea</source>
-        <translation>Apnoe</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1583"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1722"/>
-        <source>Safety level</source>
-        <translation>Sicherheitsstufe</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="54"/>
-        <source>Connect</source>
-        <translation>Verbinden</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="64"/>
-        <source>Disconnect</source>
-        <translation>Verbindung trennen</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="214"/>
-        <source>OSTC 3,Sport,Cr,2</source>
-        <translation>OSTC 3,Sport,Cr,2</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1066"/>
-        <source>MOD warning</source>
-        <translation>MOD-Warnung</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1080"/>
-        <source>Dynamic ascent rate</source>
-        <translation>Dynamische Aufstiegsrate</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1133"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1149"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2520"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2536"/>
-        <source> ℓ/min</source>
-        <translation> ℓ/min</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1235"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1320"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2610"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2695"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1645"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1668"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1812"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1835"/>
-        <source>%O₂</source>
-        <translation>%O₂</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1405"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2770"/>
-        <source>Setpoint</source>
-        <translation>Einstellwert</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1443"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1709"/>
-        <source>O₂ in calibration gas</source>
-        <translation>O₂ im Kalibrierungsgas</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1535"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2843"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1719"/>
@@ -1514,6 +1471,12 @@
         <translation>pO₂ min</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1583"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1722"/>
+        <source>Safety level</source>
+        <translation>Sicherheitsstufe</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1609"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1723"/>
         <source>Altitude range</source>
@@ -1547,6 +1510,20 @@
         <translation>P0 (keine)</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1748"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1733"/>
+        <source>P1 (medium)</source>
+        <extracomment>Suunto safety level</extracomment>
+        <translation>P1 (mittel)</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1753"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1734"/>
+        <source>P2 (high)</source>
+        <extracomment>Suunto safety level</extracomment>
+        <translation>P2 (hoch)</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1761"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1736"/>
         <source>Sample rate</source>
@@ -1571,11 +1548,10 @@
         <translation>60s</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="531"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1799"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1745"/>
-        <source>Computer model</source>
-        <translation>Computermodell</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1792"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1744"/>
+        <source>Total dive time</source>
+        <translation>Gesamtdauer</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1816"/>
@@ -1640,12 +1616,6 @@
         <translation>Zeitalarm</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2099"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1765"/>
-        <source>Salinity</source>
-        <translation>Salzgehalt</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2074"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1774"/>
         <source>MM/DD/YY</source>
@@ -1664,12 +1634,30 @@
         <translation>JJ/MM/TT</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2099"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1765"/>
+        <source>Salinity</source>
+        <translation>Salzgehalt</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2109"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1769"/>
+        <source>kg/ℓ</source>
+        <translation>kg/ℓ</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2341"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1794"/>
         <source>ZH-L16 CC</source>
         <translation>ZH-L16 CC</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2346"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1795"/>
+        <source>Apnoea</source>
+        <translation>Apnoe</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2351"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1796"/>
         <source>L16-GF OC</source>
@@ -1688,87 +1676,112 @@
         <translation>PSCR-GF</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1108"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1129"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1539"/>
+        <source>OSTC 3</source>
+        <translation>OSTC 3</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1691"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1858"/>
+        <source>Set point [cbar]</source>
+        <translation>Punkt festlegen [cbar]</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1693"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1860"/>
+        <source>Change depth [m]</source>
+        <translation>Tiefe ändern [m]</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1110"/>
+        <source>Backup dive computer settings</source>
+        <translation>Tauchcomputereinstellungen sichern</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1111"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1132"/>
         <source>Backup files (*.xml)</source>
         <translation>Sicherungsdateien (*.xml)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1113"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1115"/>
+        <source>XML backup error</source>
+        <translation>XML-Sicherungsfehler</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1116"/>
         <source>An error occurred while saving the backup file.
 %1</source>
         <translation>Beim Speichern der Datensicherungsdatei ist ein Fehler aufgetreten.
 %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1116"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1119"/>
         <source>Backup succeeded</source>
         <translation>Sicherung abgeschlossen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1117"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1120"/>
         <source>Your settings have been saved to: %1</source>
         <translation>Ihre Einstellungen wurden gespeichert nach: %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1107"/>
-        <source>Backup dive computer settings</source>
-        <translation>Tauchcomputereinstellungen sichern</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1112"/>
-        <source>XML backup error</source>
-        <translation>XML-Sicherungsfehler</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1128"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1131"/>
         <source>Restore dive computer settings</source>
         <translation>Tauchcomputereinstellungen wiederherstellen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1134"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1137"/>
         <source>XML restore error</source>
         <translation>XML-Wiederherstellungsfehler</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1135"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1138"/>
         <source>An error occurred while restoring the backup file.
 %1</source>
         <translation>Beim Wiederherstellen der Datensicherungsdatei ist ein Fehler aufgetreten.
 %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1139"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1142"/>
         <source>Restore succeeded</source>
         <translation>Wiederherstellung abgeschlossen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1140"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1143"/>
         <source>Your settings have been restored successfully.</source>
         <translation>Ihre Einstellungen wurden erfolgreich wiederhergestellt.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1150"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1153"/>
         <source>Select firmware file</source>
         <translation>Firmwaredatei auswählen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1151"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1154"/>
         <source>All files (*.*)</source>
         <translation>Alle Dateien (*.*)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1207"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1210"/>
         <source>Choose file for divecomputer download logfile</source>
         <translation>Wählen Sie die Datei zum Herunterladen der Tauchcomputer-Protokolldatei aus</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1208"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1211"/>
         <source>Log files (*.log)</source>
         <translation>Protokolldateien (*.log)</translation>
     </message>
 </context>
 <context>
+    <name>ContextDrawer</name>
+    <message>
+        <location filename="../mobile-widgets/qml/kirigami/src/controls/ContextDrawer.qml" line="76"/>
+        <source>Actions</source>
+        <translation>Aktionen</translation>
+    </message>
+</context>
+<context>
     <name>CylindersModel</name>
     <message>
         <location filename="../qt-models/cylindermodel.cpp" line="16"/>
@@ -1782,11 +1795,6 @@
     </message>
     <message>
         <location filename="../qt-models/cylindermodel.cpp" line="16"/>
-        <source>He%</source>
-        <translation>He%</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="16"/>
         <source>Work press.</source>
         <translation>Betriebsdruck</translation>
     </message>
@@ -1806,9 +1814,24 @@
         <translation>O₂%</translation>
     </message>
     <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="16"/>
+        <source>He%</source>
+        <translation>He%</translation>
+    </message>
+    <message>
         <location filename="../qt-models/cylindermodel.cpp" line="17"/>
-        <source>Switch at</source>
-        <translation>Wechsel bei</translation>
+        <source>Deco switch at</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
+        <source>Bot. MOD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
+        <source>MND</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-models/cylindermodel.cpp" line="17"/>
@@ -1826,17 +1849,32 @@
         <translation>ℓ</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="161"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="177"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation>Hier klicken entfernt diese Flasche.</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="383"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="180"/>
+        <source>Switch depth for deco gas. Calculated using Deco pO₂ preference, unless set manually.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="183"/>
+        <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to &apos;*&apos; for best O₂% for max depth.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="186"/>
+        <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to &apos;*&apos; for best He% for max depth.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="444"/>
         <source>Cylinder cannot be removed</source>
         <translation>Flasche kann nicht entfernt werden</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="384"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="445"/>
         <source>This gas is 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>
@@ -1856,42 +1894,24 @@
         <translation>Welche Komponenten möchten Sie kopieren</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="73"/>
+        <location filename="../build/ui_divecomponentselection.h" line="141"/>
+        <source>Dive site</source>
+        <translation>Tauchplatz</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="80"/>
         <location filename="../build/ui_divecomponentselection.h" line="142"/>
         <source>Suit</source>
         <translation>Anzug</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="122"/>
-        <location filename="../build/ui_divecomponentselection.h" line="148"/>
-        <source>Divemaster</source>
-        <translation>Tauchgruppenleiter</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="129"/>
-        <location filename="../build/ui_divecomponentselection.h" line="149"/>
-        <source>Buddy</source>
-        <translation>Tauchpartner</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="136"/>
-        <location filename="../build/ui_divecomponentselection.h" line="150"/>
-        <source>Rating</source>
-        <translation>Bewertung</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="87"/>
         <location filename="../build/ui_divecomponentselection.h" line="143"/>
         <source>Visibility</source>
         <translation>Sicht</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="73"/>
-        <location filename="../build/ui_divecomponentselection.h" line="141"/>
-        <source>Dive site</source>
-        <translation>Tauchplatz</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="94"/>
         <location filename="../build/ui_divecomponentselection.h" line="144"/>
         <source>Notes</source>
@@ -1915,10 +1935,34 @@
         <source>Cylinders</source>
         <translation>Flaschen</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="122"/>
+        <location filename="../build/ui_divecomponentselection.h" line="148"/>
+        <source>Divemaster</source>
+        <translation>Tauchgruppenleiter</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="129"/>
+        <location filename="../build/ui_divecomponentselection.h" line="149"/>
+        <source>Buddy</source>
+        <translation>Tauchpartner</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="136"/>
+        <location filename="../build/ui_divecomponentselection.h" line="150"/>
+        <source>Rating</source>
+        <translation>Bewertung</translation>
+    </message>
 </context>
 <context>
     <name>DiveComputerManagementDialog</name>
     <message>
+        <location filename="../desktop-widgets/divecomputermanagementdialog.ui" line="17"/>
+        <location filename="../build/ui_divecomputermanagementdialog.h" line="65"/>
+        <source>Edit dive computer nicknames</source>
+        <translation>Tauchcomputer Bezeichnung bearbeiten</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divecomputermanagementdialog.cpp" line="49"/>
         <source>Remove the selected dive computer?</source>
         <translation>Ausgewählten Tauchcomputer entfernen?</translation>
@@ -1929,12 +1973,6 @@
  remove the selected dive computer?</source>
         <translation>Tauchcomputer wirklich entfernen?</translation>
     </message>
-    <message>
-        <location filename="../desktop-widgets/divecomputermanagementdialog.ui" line="17"/>
-        <location filename="../build/ui_divecomputermanagementdialog.h" line="65"/>
-        <source>Edit dive computer nicknames</source>
-        <translation>Tauchcomputer Bezeichnung bearbeiten</translation>
-    </message>
 </context>
 <context>
     <name>DiveComputerModel</name>
@@ -1962,17 +2000,17 @@
 <context>
     <name>DiveDetails</name>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="33"/>
+        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="38"/>
         <source>Dive details</source>
         <translation>Tauchgangsdetails</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="67"/>
+        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="72"/>
         <source>Delete dive</source>
         <translation>Tauchgang löschen</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="84"/>
+        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="89"/>
         <source>Show on map</source>
         <translation>Kartenansicht</translation>
     </message>
@@ -1980,89 +2018,94 @@
 <context>
     <name>DiveDetailsEdit</name>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="74"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="80"/>
         <source>Dive %1</source>
         <translation>Tauchgang %1</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="78"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="84"/>
         <source>Date:</source>
         <translation>Datum:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="86"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="92"/>
         <source>Location:</source>
         <translation>Ort:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="95"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="101"/>
         <source>Coordinates:</source>
         <translation>Koordinaten:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="104"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="110"/>
         <source>Use current
 GPS location:</source>
         <translation>Momentante GPS-
 Position verwenden</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="118"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="124"/>
         <source>Depth:</source>
         <translation>Tiefe:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="127"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="133"/>
         <source>Duration:</source>
         <translation>Dauer:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="137"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="143"/>
         <source>Air Temp:</source>
         <translation>Lufttemp.:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="146"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="152"/>
         <source>Water Temp:</source>
         <translation>Wassertemp.: </translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="155"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="161"/>
         <source>Suit:</source>
         <translation>Anzug:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="164"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="176"/>
         <source>Buddy:</source>
         <translation>Tauchpartner:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="173"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="191"/>
         <source>Dive Master:</source>
         <translation>TG-Leiter:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="182"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="206"/>
         <source>Weight:</source>
         <translation>Gewicht:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="192"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="216"/>
+        <source>Cylinder:</source>
+        <translation>Flasche:</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="231"/>
         <source>Gas mix:</source>
         <translation>Gemisch:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="203"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="241"/>
         <source>Start Pressure:</source>
         <translation>Anfangsdruck:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="213"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="250"/>
         <source>End Pressure:</source>
         <translation>Enddruck:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="224"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="260"/>
         <source>Notes:</source>
         <translation>Notizen:</translation>
     </message>
@@ -2115,27 +2158,27 @@ Position verwenden</translation>
         <translation>Wassertemp.: </translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="199"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="198"/>
         <source>Dive Master:</source>
         <translation>TG-Leiter:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="213"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="211"/>
         <source>Weight:</source>
         <translation>Gewicht:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="226"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="224"/>
         <source>Buddy:</source>
         <translation>Tauchpartner:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="239"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="237"/>
         <source>SAC:</source>
         <translation>AMV:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="254"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="252"/>
         <source>Notes</source>
         <translation>Notizen</translation>
     </message>
@@ -2143,18 +2186,18 @@ Position verwenden</translation>
 <context>
     <name>DiveEventItem</name>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="134"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="165"/>
         <source>Manual switch to OC</source>
         <translation>Manueller Wechsel auf OC</translation>
     </message>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="136"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="167"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation> Anfang</translation>
     </message>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="137"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="168"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation> Ende</translation>
@@ -2163,27 +2206,27 @@ Position verwenden</translation>
 <context>
     <name>DiveImportedModel</name>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="646"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="656"/>
         <source>Date/time</source>
         <translation>Datum und Zeit</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="648"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="658"/>
         <source>Duration</source>
         <translation>Dauer</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="650"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="660"/>
         <source>Depth</source>
         <translation>Tiefe</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="672"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="682"/>
         <source>h:</source>
         <translation>h:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="672"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="682"/>
         <source>min</source>
         <translation>min</translation>
     </message>
@@ -2192,8 +2235,8 @@ Position verwenden</translation>
     <name>DiveList</name>
     <message>
         <location filename="../mobile-widgets/qml/DiveList.qml" line="12"/>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="226"/>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="232"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="227"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="233"/>
         <source>Dive list</source>
         <translation>Tauchgangliste</translation>
     </message>
@@ -2208,110 +2251,115 @@ Position verwenden</translation>
         <translation>Dauer:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="222"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="223"/>
         <source>Cloud credentials</source>
         <translation>Cloud Benutzerdaten</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="228"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="229"/>
         <source>Please tap the &apos;+&apos; button to add a dive</source>
         <translation>Bitte tippe den &apos;+&apos; Knopf, um einen Tauchgang hinzuzufügen</translation>
     </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="248"/>
+        <source>No dives in dive list</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DiveListView</name>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="846"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="849"/>
         <source>Expand all</source>
         <translation>Alle ausfalten</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="848"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="851"/>
         <source>Collapse all</source>
         <translation>Alle einfalten</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="852"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="855"/>
         <source>Collapse others</source>
         <translation>Andere einklappen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="856"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="859"/>
         <source>Remove dive(s) from trip</source>
         <translation>Tauchgäng(e) aus Reise entfernen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="857"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="860"/>
         <source>Create new trip above</source>
         <translation>Neue Reise darüber einfügen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="871"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="874"/>
         <source>Add dive(s) to trip immediately above</source>
         <translation>Tauchgäng(e) zur Reise darüber hinzufügen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="873"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="876"/>
         <source>Add dive(s) to trip immediately below</source>
         <translation>Tauchgäng(e) zur Reise darunter hinzufügen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="877"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="880"/>
         <source>Merge trip with trip above</source>
         <translation>Reise mit der darüber verbinden</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="878"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="881"/>
         <source>Merge trip with trip below</source>
         <translation>Reise mit der darunter verbinden</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="882"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="885"/>
         <source>Delete dive(s)</source>
         <translation>Tauchgäng(e) löschen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="884"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="887"/>
         <source>Mark dive(s) invalid</source>
         <translation>Tauchgäng(e) als ungültig markieren</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="888"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="891"/>
         <source>Merge selected dives</source>
         <translation>Ausgewählte Tauchgänge zusammenführen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="890"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="893"/>
         <source>Renumber dive(s)</source>
         <translation>Tauchgänge neu nummerieren</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="891"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="894"/>
         <source>Shift dive times</source>
         <translation>Tauchzeiten verschieben</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="892"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="895"/>
         <source>Split selected dives</source>
         <translation>Ausgewählte Tauchgänge aufteilen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="893"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="896"/>
         <source>Load image(s) from file(s)</source>
         <translation>Bild(er) aus Datei(en) laden</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="894"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="897"/>
         <source>Load image(s) from web</source>
         <translation>Bild(er) aus Web laden</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="917"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="919"/>
         <source>Open image files</source>
         <translation>Öffne Bilddateien</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="917"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="919"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>Bilddateien (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -2332,56 +2380,6 @@ Position verwenden</translation>
 <context>
     <name>DiveLogExportDialog</name>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="103"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="351"/>
-        <source>Export format</source>
-        <translation>Export Format</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="134"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="353"/>
-        <source>UDDF</source>
-        <translation>UDDF</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="187"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="358"/>
-        <source>Worldmap</source>
-        <translation>Weltkarte</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="197"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="359"/>
-        <source>I&amp;mage depths</source>
-        <translation>Bild&amp;tiefen</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="243"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="360"/>
-        <source>Selection</source>
-        <translation>Auswahl</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="252"/>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="346"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="361"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="372"/>
-        <source>Selected dives</source>
-        <translation>Ausgewählte Tauchgänge</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="262"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="362"/>
-        <source>All dives</source>
-        <translation>Alle Tauchgänge</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="306"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="396"/>
-        <source>HTML</source>
-        <translation>HTML</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="14"/>
         <location filename="../build/ui_divelogexportdialog.h" line="349"/>
         <source>Export dive log files</source>
@@ -2394,12 +2392,24 @@ Position verwenden</translation>
         <translation>Allgemeiner Export</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="103"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="351"/>
+        <source>Export format</source>
+        <translation>Export Format</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="115"/>
         <location filename="../build/ui_divelogexportdialog.h" line="352"/>
         <source>Subsurface &amp;XML</source>
         <translation>Subsurface &amp;XML</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="134"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="353"/>
+        <source>UDDF</source>
+        <translation>UDDF</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="147"/>
         <location filename="../build/ui_divelogexportdialog.h" line="354"/>
         <source>di&amp;velogs.de</source>
@@ -2424,238 +2434,297 @@ Position verwenden</translation>
         <translation>CSV-Tauchdetails</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="275"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="187"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="358"/>
+        <source>Worldmap</source>
+        <translation>Weltkarte</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="197"/>
+        <source>TeX</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="207"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="359"/>
+        <source>I&amp;mage depths</source>
+        <translation>Bild&amp;tiefen</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="253"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="360"/>
+        <source>Selection</source>
+        <translation>Auswahl</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="262"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="356"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="361"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="372"/>
+        <source>Selected dives</source>
+        <translation>Ausgewählte Tauchgänge</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="272"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="362"/>
+        <source>All dives</source>
+        <translation>Alle Tauchgänge</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="285"/>
         <location filename="../build/ui_divelogexportdialog.h" line="363"/>
         <source>CSV units</source>
         <translation>CSV-Einheiten</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="288"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="298"/>
         <location filename="../build/ui_divelogexportdialog.h" line="366"/>
         <source>Metric</source>
         <translation>Metrisch</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="293"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="303"/>
         <location filename="../build/ui_divelogexportdialog.h" line="367"/>
         <source>Imperial</source>
         <translation>Zöllig</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="324"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="316"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="396"/>
+        <source>HTML</source>
+        <translation>HTML</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="334"/>
         <location filename="../build/ui_divelogexportdialog.h" line="370"/>
         <source>General settings</source>
         <translation>Allg. Einstellungen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="330"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="340"/>
         <location filename="../build/ui_divelogexportdialog.h" line="371"/>
         <source>Subsurface numbers</source>
         <translation>Subsurface Nummern</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="359"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="369"/>
         <location filename="../build/ui_divelogexportdialog.h" line="373"/>
         <source>Export yearly statistics</source>
         <translation>Jährliche Statistiken exportieren</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="375"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="385"/>
         <location filename="../build/ui_divelogexportdialog.h" line="374"/>
         <source>All di&amp;ves</source>
         <translation>Alle Ta&amp;uchgänge</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="385"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="395"/>
         <location filename="../build/ui_divelogexportdialog.h" line="375"/>
         <source>Export list only</source>
         <translation>Nur Liste exportieren</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="392"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="402"/>
         <location filename="../build/ui_divelogexportdialog.h" line="376"/>
         <source>Export photos</source>
         <translation>Fotos exportieren</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="408"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="418"/>
         <location filename="../build/ui_divelogexportdialog.h" line="377"/>
         <source>Style options</source>
         <translation>Stiloptionen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="423"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="433"/>
         <location filename="../build/ui_divelogexportdialog.h" line="378"/>
         <source>Font</source>
         <translation>Schriftart</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="433"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="443"/>
         <location filename="../build/ui_divelogexportdialog.h" line="379"/>
         <source>Font size</source>
         <translation>Schriftgröße</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="444"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="454"/>
         <location filename="../build/ui_divelogexportdialog.h" line="382"/>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="449"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="459"/>
         <location filename="../build/ui_divelogexportdialog.h" line="383"/>
         <source>10</source>
         <translation>10</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="454"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="464"/>
         <location filename="../build/ui_divelogexportdialog.h" line="384"/>
         <source>12</source>
         <translation>12</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="459"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="469"/>
         <location filename="../build/ui_divelogexportdialog.h" line="385"/>
         <source>14</source>
         <translation>14</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="464"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="474"/>
         <location filename="../build/ui_divelogexportdialog.h" line="386"/>
         <source>16</source>
         <translation>16</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="469"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="479"/>
         <location filename="../build/ui_divelogexportdialog.h" line="387"/>
         <source>18</source>
         <translation>18</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="474"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="484"/>
         <location filename="../build/ui_divelogexportdialog.h" line="388"/>
         <source>20</source>
         <translation>20</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="482"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="492"/>
         <location filename="../build/ui_divelogexportdialog.h" line="390"/>
         <source>Theme</source>
         <translation>Motiv</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="493"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="503"/>
         <location filename="../build/ui_divelogexportdialog.h" line="393"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="95"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="99"/>
         <source>Light</source>
         <translation>Licht</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="498"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="508"/>
         <location filename="../build/ui_divelogexportdialog.h" line="394"/>
         <source>Sand</source>
         <translation>Sand</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="134"/>
-        <source>UDDF files (*.uddf *.UDDF)</source>
-        <translation>UDDF Dateien (*.uddf *.UDDF)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="142"/>
-        <source>CSV files (*.csv *.CSV)</source>
-        <translation>CSV Dateien (*.csv *.CSV)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="74"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="76"/>
         <source>Generic format that is used for data exchange between a variety of diving related programs.</source>
         <translation>Generisches Format, welches zum Datenaustausch in diversen Taucherprogrammen verwendet wird.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="76"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="78"/>
         <source>Comma separated values describing the dive profile.</source>
         <translation>Kommagetrennte Werte, die das Tauchprofil beschreiben</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="78"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="80"/>
         <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source>
         <translation>Durch Kommata getrennte Werte (CSV) des Taugang. Beinhaltet die meisten Tauchgangsdetauls aber keine Profilinformation.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="80"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="82"/>
         <source>Send the dive data to divelogs.de website.</source>
         <translation>Tauchdaten an die divelogs.de-Webseite senden.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="82"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="84"/>
         <source>Send the dive data to dive-share.appspot.com website</source>
         <translation>Tauchdaten an die dive-share.appspot.com-Webseite senden</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="84"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="86"/>
         <source>HTML export of the dive locations, visualized on a world map.</source>
         <translation>HTML-Export der Tauchplätze, visualisiert auf einer Weltkarte.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="86"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="88"/>
         <source>Subsurface native XML format.</source>
         <translation>Natives Subsurface-XML-Format</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="88"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="90"/>
         <source>Write depths of images to file.</source>
         <translation>Tiefe, in der das Bild aufgenommen wurde, in die Datei schreiben</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="133"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="92"/>
+        <source>Write dive as TeX macros to file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="137"/>
         <source>Export UDDF file as</source>
         <translation>UDDF-Datei exportieren als</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="137"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/>
+        <source>UDDF files (*.uddf *.UDDF)</source>
+        <translation>UDDF Dateien (*.uddf *.UDDF)</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divelogexportdialog.cpp" line="141"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="145"/>
         <source>Export CSV file as</source>
         <translation>CSV-Datei exportieren als</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="148"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="142"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="146"/>
+        <source>CSV files (*.csv *.CSV)</source>
+        <translation>CSV Dateien (*.csv *.CSV)</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="152"/>
         <source>Export world map</source>
         <translation>Weltkarte exportieren</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="149"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="169"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="153"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="177"/>
         <source>HTML files (*.html)</source>
         <translation>HTML Dateien (*.html)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="153"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="157"/>
         <source>Export Subsurface XML</source>
         <translation>Exportiere Subsurface XML</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="158"/>
         <source>XML files (*.xml *.ssrf)</source>
         <translation>XML Dateien (*.xml, *.ssrf)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="162"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="166"/>
         <source>Save image depths</source>
         <translation>Tiefe speichern, in der das Bild aufgenommen wurde</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="168"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="170"/>
+        <source>Export to TeX file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="170"/>
+        <source>TeX files (*.tex)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="176"/>
         <source>Export HTML files as</source>
         <translation>HTML-Datei exportieren als</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="184"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="192"/>
         <source>Please wait, exporting...</source>
         <translation>Bitte warten, Exportiervorgang...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="219"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="227"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="311"/>
         <source>Can&apos;t open file %s</source>
         <translation>Kann Datei %s nicht öffnen</translation>
     </message>
@@ -2669,25 +2738,6 @@ Position verwenden</translation>
         <translation>Tauchprotokolldatei importieren</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="643"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="727"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="856"/>
-        <source>Time</source>
-        <translation>Zeit</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.ui" line="127"/>
-        <location filename="../build/ui_divelogimportdialog.h" line="164"/>
-        <source>Metric</source>
-        <translation>Metrisch</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.ui" line="132"/>
-        <location filename="../build/ui_divelogimportdialog.h" line="165"/>
-        <source>Imperial</source>
-        <translation>Zöllig</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divelogimportdialog.ui" line="89"/>
         <location filename="../build/ui_divelogimportdialog.h" line="152"/>
         <source>dd.mm.yyyy</source>
@@ -2706,74 +2756,6 @@ Position verwenden</translation>
         <translation>jjjj-mm-tt</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.ui" line="155"/>
-        <location filename="../build/ui_divelogimportdialog.h" line="167"/>
-        <source>Drag the tags above to each corresponding column below</source>
-        <translation>Tags auf die Spalten ziehen</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="641"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="729"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="852"/>
-        <source>Dive #</source>
-        <translation>Tauchgang Nr.</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="642"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="723"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="854"/>
-        <source>Date</source>
-        <translation>Datum</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="644"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="858"/>
-        <source>Duration</source>
-        <translation>Dauer</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="655"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="862"/>
-        <source>GPS</source>
-        <translation>GPS</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="645"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="864"/>
-        <source>Max. depth</source>
-        <translation>Max. Tiefe</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="646"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="866"/>
-        <source>Avg. depth</source>
-        <translation>Ø Tiefe</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="658"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="872"/>
-        <source>Suit</source>
-        <translation>Anzug</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="663"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="878"/>
-        <source>Tags</source>
-        <translation>Stichwörter</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="652"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="894"/>
-        <source>O₂</source>
-        <translation>O₂</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="653"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="896"/>
-        <source>He</source>
-        <translation>He</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divelogimportdialog.ui" line="108"/>
         <location filename="../build/ui_divelogimportdialog.h" line="158"/>
         <source>Seconds</source>
@@ -2792,183 +2774,269 @@ Position verwenden</translation>
         <translation>Minuten:Sekunden</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="654"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="860"/>
-        <source>Location</source>
-        <translation>Ort</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.ui" line="127"/>
+        <location filename="../build/ui_divelogimportdialog.h" line="164"/>
+        <source>Metric</source>
+        <translation>Metrisch</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.ui" line="132"/>
+        <location filename="../build/ui_divelogimportdialog.h" line="165"/>
+        <source>Imperial</source>
+        <translation>Zöllig</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.ui" line="155"/>
+        <location filename="../build/ui_divelogimportdialog.h" line="167"/>
+        <source>Drag the tags above to each corresponding column below</source>
+        <translation>Tags auf die Spalten ziehen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="354"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="499"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="505"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="355"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="528"/>
         <source>Tab</source>
         <translation>Tab</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="575"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="598"/>
         <source>Some column headers were pre-populated; please drag and drop the headers so they match the column they are in.</source>
         <translation>Einige Spaltenüberschriften wurden automatisch ausgefüllt. Bitte die Überschriften auf die passenden Spalten ziehen, so dass sie zum Inhalt passen.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="613"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="731"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="782"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="848"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="636"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="761"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="857"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="925"/>
         <source>Sample time</source>
         <translation>Segment Dauer</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="615"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="733"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="784"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="638"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="763"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="859"/>
         <source>Sample depth</source>
         <translation>Segment Tiefe</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="617"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="735"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="786"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="640"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="765"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="861"/>
         <source>Sample temperature</source>
         <translation>Segment Temperatur</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="621"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="739"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="790"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="642"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="767"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="863"/>
+        <source>Sample pO₂</source>
+        <translation>Segment pO₂</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="644"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="769"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="865"/>
         <source>Sample sensor1 pO₂</source>
         <translation>Beispielsensor1 pO₂</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="623"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="741"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="792"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="646"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="771"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="867"/>
         <source>Sample sensor2 pO₂</source>
         <translation>Beispielsensor2 pO₂</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="625"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="743"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="794"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="648"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="773"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="869"/>
         <source>Sample sensor3 pO₂</source>
         <translation>Beispielsensor3 pO₂</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="633"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="751"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="802"/>
-        <source>Sample stopdepth</source>
-        <translation>Segment Stopptiefe</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="637"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="755"/>
-        <source>Sample setpoint</source>
-        <translation>Einstellwert des Datenpunkts</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="619"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="737"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="788"/>
-        <source>Sample pO₂</source>
-        <translation>Segment pO₂</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="627"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="745"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="796"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="650"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="775"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="871"/>
         <source>Sample CNS</source>
         <translation>Segment CNS</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="629"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="747"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="798"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="652"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="777"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="873"/>
         <source>Sample NDL</source>
         <translation>Segment Nullzeit</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="631"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="749"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="800"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="654"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="779"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="875"/>
         <source>Sample TTS</source>
         <translation>Segment Aufstiegszeit</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="635"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="753"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="804"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="656"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="781"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="877"/>
+        <source>Sample stopdepth</source>
+        <translation>Segment Stopptiefe</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="658"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="783"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="879"/>
         <source>Sample pressure</source>
         <translation>Segment Flaschendruck</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="656"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="868"/>
-        <source>Divemaster</source>
-        <translation>Tauchgruppenleiter</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="660"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="785"/>
+        <source>Sample setpoint</source>
+        <translation>Einstellwert des Datenpunkts</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="657"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="870"/>
-        <source>Buddy</source>
-        <translation>Tauchpartner</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="664"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="759"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="929"/>
+        <source>Dive #</source>
+        <translation>Tauchgang Nr.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="659"/>
-        <source>Rating</source>
-        <translation>Bewertung</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="665"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="753"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="931"/>
+        <source>Date</source>
+        <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="660"/>
-        <source>Visibility</source>
-        <translation>Sicht</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="666"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="757"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="933"/>
+        <source>Time</source>
+        <translation>Zeit</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="661"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="874"/>
-        <source>Notes</source>
-        <translation>Notizen</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="667"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="935"/>
+        <source>Duration</source>
+        <translation>Dauer</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="662"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="876"/>
-        <source>Weight</source>
-        <translation>Gewicht</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="668"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="941"/>
+        <source>Max. depth</source>
+        <translation>Max. Tiefe</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="669"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="943"/>
+        <source>Avg. depth</source>
+        <translation>Ø Tiefe</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="670"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="975"/>
+        <source>Air temp.</source>
+        <translation>Lufttemp.</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="671"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="977"/>
+        <source>Water temp.</source>
+        <translation>Wassertemp.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="649"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="888"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="672"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="965"/>
         <source>Cyl. size</source>
         <translation>Flaschengröße</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="650"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="890"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="673"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="967"/>
         <source>Start pressure</source>
         <translation>Anfangsdruck</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="651"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="892"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="674"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="969"/>
         <source>End pressure</source>
         <translation>Enddruck</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="647"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="898"/>
-        <source>Air temp.</source>
-        <translation>Lufttemp.</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="675"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="971"/>
+        <source>O₂</source>
+        <translation>O₂</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="648"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="900"/>
-        <source>Water temp.</source>
-        <translation>Wassertemp.</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="676"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="973"/>
+        <source>He</source>
+        <translation>He</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="677"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="937"/>
+        <source>Location</source>
+        <translation>Ort</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="678"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="939"/>
+        <source>GPS</source>
+        <translation>GPS</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="679"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="945"/>
+        <source>Divemaster</source>
+        <translation>Tauchgruppenleiter</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="680"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="947"/>
+        <source>Buddy</source>
+        <translation>Tauchpartner</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="681"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="949"/>
+        <source>Suit</source>
+        <translation>Anzug</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="682"/>
+        <source>Rating</source>
+        <translation>Bewertung</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="683"/>
+        <source>Visibility</source>
+        <translation>Sicht</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="684"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="951"/>
+        <source>Notes</source>
+        <translation>Notizen</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="685"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="953"/>
+        <source>Weight</source>
+        <translation>Gewicht</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="686"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="955"/>
+        <source>Tags</source>
+        <translation>Stichwörter</translation>
     </message>
 </context>
 <context>
     <name>DiveObjectHelper</name>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="287"/>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="323"/>
         <source>%1 dive(s)</source>
         <translation>%1 Tauchgänge</translation>
     </message>
@@ -2976,18 +3044,18 @@ Position verwenden</translation>
 <context>
     <name>DivePlanner</name>
     <message>
-        <location filename="../desktop-widgets/diveplanner.ui" line="152"/>
-        <location filename="../build/ui_diveplanner.h" line="190"/>
-        <source>Altitude</source>
-        <translation>Meereshöhe</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/diveplanner.ui" line="109"/>
         <location filename="../build/ui_diveplanner.h" line="189"/>
         <source>Planned dive time</source>
         <translation>Geplante Dauer</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/diveplanner.ui" line="152"/>
+        <location filename="../build/ui_diveplanner.h" line="190"/>
+        <source>Altitude</source>
+        <translation>Meereshöhe</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/diveplanner.ui" line="159"/>
         <location filename="../build/ui_diveplanner.h" line="191"/>
         <source>ATM pressure</source>
@@ -3021,32 +3089,32 @@ Position verwenden</translation>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="134"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="136"/>
         <source>unknown</source>
         <translation>unbekannt</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="312"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="326"/>
         <source>Final depth</source>
         <translation>Endtiefe</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="314"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="328"/>
         <source>Run time</source>
         <translation>Laufzeit</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="316"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="330"/>
         <source>Duration</source>
         <translation>Dauer</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="318"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="332"/>
         <source>Used gas</source>
         <translation>Gasverbrauch</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="320"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="334"/>
         <source>CC setpoint</source>
         <translation>CC SetPoint</translation>
     </message>
@@ -3054,22 +3122,22 @@ Position verwenden</translation>
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="108"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="112"/>
         <source>Dive planner points</source>
         <translation>Planerpunkte</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="112"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="116"/>
         <source>Available gases</source>
         <translation>Verfügbare Gase</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="137"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="143"/>
         <source>Add dive data point</source>
         <translation>Datenpunkt hinzufügen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="146"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="152"/>
         <source>Save new</source>
         <translation>Neue speichern</translation>
     </message>
@@ -3102,11 +3170,36 @@ Position verwenden</translation>
         <translation>Farbe</translation>
     </message>
     <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="124"/>
+        <source>User entered</source>
+        <translation>Benutzer Eingabe</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="126"/>
+        <source>Cylinder index</source>
+        <translation>Flaschen Index</translation>
+    </message>
+    <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="128"/>
         <source>Pressure S</source>
         <translation>Druck S</translation>
     </message>
     <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="130"/>
+        <source>Pressure I</source>
+        <translation>Druck I</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="132"/>
+        <source>Ceiling</source>
+        <translation>Auftauchgrenze</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="134"/>
+        <source>SAC</source>
+        <translation>AMV</translation>
+    </message>
+    <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="136"/>
         <source>pN₂</source>
         <translation>pN₂</translation>
@@ -3142,49 +3235,24 @@ Position verwenden</translation>
         <translation>Sensor 3</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="152"/>
-        <source>Heart rate</source>
-        <translation>Pulsrate</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="156"/>
-        <source>Mean depth @ s</source>
-        <translation>Mittlere Tiefe @ s</translation>
-    </message>
-    <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="150"/>
         <source>Ambient pressure</source>
         <translation>Umgebungsdruck</translation>
     </message>
     <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="152"/>
+        <source>Heart rate</source>
+        <translation>Pulsrate</translation>
+    </message>
+    <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="154"/>
         <source>Gradient factor</source>
         <translation>Gradientenfaktor</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="130"/>
-        <source>Pressure I</source>
-        <translation>Druck I</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="124"/>
-        <source>User entered</source>
-        <translation>Benutzer Eingabe</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="126"/>
-        <source>Cylinder index</source>
-        <translation>Flaschen Index</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="132"/>
-        <source>Ceiling</source>
-        <translation>Auftauchgrenze</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="134"/>
-        <source>SAC</source>
-        <translation>AMV</translation>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="156"/>
+        <source>Mean depth @ s</source>
+        <translation>Mittlere Tiefe @ s</translation>
     </message>
 </context>
 <context>
@@ -3255,311 +3323,315 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="395"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="441"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="434"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="483"/>
         <source>#</source>
         <translation>Nr.</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="398"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="444"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="437"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="486"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="401"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="447"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="440"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="489"/>
         <source>Rating</source>
         <translation>Bewertung</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="404"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="443"/>
         <source>Depth</source>
         <translation>Tiefe</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="410"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="446"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="495"/>
+        <source>Duration</source>
+        <translation>Dauer</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="449"/>
         <source>Temp</source>
         <translation>Temperatur</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="413"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="452"/>
         <source>Weight</source>
         <translation>Gewicht</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="425"/>
-        <source>SAC</source>
-        <translation>AMV</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
-        <source>m</source>
-        <translation>m</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
-        <source>ft</source>
-        <translation>ft</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
-        <source>Weight(%1)</source>
-        <translation>Gewicht(%1)</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="416"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="462"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="455"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="504"/>
         <source>Suit</source>
         <translation>Anzug</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="419"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="465"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="458"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="507"/>
         <source>Cyl</source>
         <translation>Flasche</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="422"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="468"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="461"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="510"/>
         <source>Gas</source>
         <translation>Gas</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
-        <source>SAC(%1)</source>
-        <translation>AMV(%1)</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="464"/>
+        <source>SAC</source>
+        <translation>AMV</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
-        <source>/min</source>
-        <translation>/min</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="467"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="518"/>
+        <source>OTU</source>
+        <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="431"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="479"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="470"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="521"/>
         <source>Max CNS</source>
         <translation>Max. CNS</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="434"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="482"/>
-        <source>Location</source>
-        <translation>Ort</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
+        <source>Photos</source>
+        <translation>Bilder</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
-        <source>kg</source>
-        <translation>kg</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="476"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="527"/>
+        <source>Location</source>
+        <translation>Ort</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="492"/>
         <source>Depth(%1)</source>
         <translation>Tiefe(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="407"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="453"/>
-        <source>Duration</source>
-        <translation>Dauer</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="492"/>
+        <source>m</source>
+        <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="456"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="492"/>
+        <source>ft</source>
+        <translation>ft</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="498"/>
         <source>Temp(%1%2)</source>
         <translation>Temp(%1%2)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="501"/>
+        <source>Weight(%1)</source>
+        <translation>Gewicht(%1)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="501"/>
+        <source>kg</source>
+        <translation>kg</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="501"/>
         <source>lbs</source>
         <translation>US Pfund</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="428"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="476"/>
-        <source>OTU</source>
-        <translation>OTU</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="515"/>
+        <source>SAC(%1)</source>
+        <translation>AMV(%1)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="515"/>
+        <source>/min</source>
+        <translation>/min</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="524"/>
+        <source>Photos before/during/after dive</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="164"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="165"/>
         <source>no dives were selected</source>
         <translation>keine Tauchgänge ausgewählt</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="174"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="175"/>
         <source>stylesheet to export to divelogs.de is not found</source>
         <translation>Formatvorlage zum Exportieren auf divelogs.de nicht gefunden</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="184"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="185"/>
         <source>failed to create zip file for upload: %s</source>
         <translation>konnte keine zip-Datei zum Hochladen erstellen: %s</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="236"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="237"/>
         <source>internal error</source>
         <translation>ein interner Fehler ist aufgetreten</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="244"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="245"/>
         <source>Conversion of dive %1 to divelogs.de format failed</source>
         <translation>Konvertierung von Tauchgang %1 in divelogs.de-Format ist fehlgeschlagen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="272"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="273"/>
         <source>error writing zip file: %s zip error %d system error %d - %s</source>
         <translation>Fehler beim Schreiben der ZIP-Datei: %s ZIP-Fehler %d Systemfehler %d - %s</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="745"/>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="935"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="936"/>
         <source>Done</source>
         <translation>Fertig</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="778"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="779"/>
         <source>Uploading dive list...</source>
         <translation>Liste der Tauchgänge wird hochgeladen...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="810"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="811"/>
         <source>Downloading dive list...</source>
         <translation>Liste der Tauchgänge herunterladen...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="851"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="852"/>
         <source>Downloading %1 dives...</source>
         <translation>Lade %1 Tauchgänge vom Server...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="885"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="886"/>
         <source>Download finished - %1</source>
         <translation>Herunterladen beendet - %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="899"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="900"/>
         <source>Problem with download</source>
         <translation>Problem beim Herunterladen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="900"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="901"/>
         <source>The archive could not be opened:
 </source>
         <translation>Das Archiv konnte nicht geöffnet werden:
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="909"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="910"/>
         <source>Corrupted download</source>
         <translation>Heruntergeladene Daten sind beschädigt.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="910"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="911"/>
         <source>The archive could not be opened:
 %1</source>
         <translation>Das Archiv konnte nicht geöffnet werden
 %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="937"/>
+        <source>Upload finished</source>
+        <translation>Hochladen abgeschlossen</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="950"/>
         <source>Upload failed</source>
         <translation>Hochladen fehlgeschlagen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="952"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="953"/>
         <source>Upload successful</source>
         <translation>Hochladen erfolgreich</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="955"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="956"/>
         <source>Login failed</source>
         <translation>Anmeldung fehlgeschlagen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="958"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="959"/>
         <source>Cannot parse response</source>
         <translation>Verstehe die Antwort nicht</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="970"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="971"/>
         <source>Error: %1</source>
         <translation>Fehler: %1</translation>
     </message>
-    <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="936"/>
-        <source>Upload finished</source>
-        <translation>Hochladen abgeschlossen</translation>
-    </message>
 </context>
 <context>
     <name>DownloadFromDCWidget</name>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="185"/>
-        <source>Error</source>
-        <translation>Fehler</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="436"/>
-        <source>Retry</source>
-        <translation>Wiederholen</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="280"/>
-        <source>Find Uemis dive computer</source>
-        <translation>Finde Uemis Tauchcomputer</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="101"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="107"/>
         <source>Download</source>
         <translation>Herunterladen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="104"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="110"/>
         <source>Choose Bluetooth download mode</source>
         <translation>Bluetooth-Modus auswählen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="382"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="191"/>
+        <source>Error</source>
+        <translation>Fehler</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="286"/>
+        <source>Find Uemis dive computer</source>
+        <translation>Finde Uemis Tauchcomputer</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="392"/>
         <source>Choose file for divecomputer download logfile</source>
         <translation>Wählen Sie die Datei zum Herunterladen der Tauchcomputer-Protokolldatei aus</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="383"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="393"/>
         <source>Log files (*.log)</source>
         <translation>Protokolldateien (*.log)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="398"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="408"/>
         <source>Warning</source>
         <translation>Warnung</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="399"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="409"/>
         <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="../desktop-widgets/downloadfromdivecomputer.cpp" line="410"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="420"/>
         <source>Choose file for divecomputer binary dump file</source>
         <translation>Datei auswählen, in die der libdivecomputer Dump gespeichert werden soll</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="411"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="421"/>
         <source>Dump files (*.bin)</source>
         <translation>Dump Dateien (*.bin)</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="446"/>
+        <source>Retry</source>
+        <translation>Wiederholen</translation>
+    </message>
 </context>
 <context>
     <name>DownloadFromDiveComputer</name>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="139"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="275"/>
-        <source>Vendor</source>
-        <translation>Hersteller</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="14"/>
         <location filename="../build/ui_downloadfromdivecomputer.h" line="265"/>
         <source>Download from dive computer</source>
@@ -3572,17 +3644,6 @@ p, li { white-space: pre-wrap; }
         <translation>Gerät oder Einhängepunkt</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="122"/>
-        <source>Choose Bluetooth download mode</source>
-        <translation>Bluetooth-Modus auswählen</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="149"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="276"/>
-        <source>Dive computer</source>
-        <translation>Tauchcomputer</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="66"/>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="101"/>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="115"/>
@@ -3606,11 +3667,46 @@ p, li { white-space: pre-wrap; }
         <translation>Heruntergeladene Tauchgänge immer bevorzugen</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="87"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="270"/>
+        <source>Download into new trip</source>
+        <translation>In neue Reise herunterladen</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="94"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="271"/>
+        <source>Save libdivecomputer logfile</source>
+        <translation>libdivecomputer-Protokolldatei speichern</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="108"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="273"/>
+        <source>Save libdivecomputer dumpfile</source>
+        <translation>Dump Datei der libdivecomputer Übertragung speichern</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="122"/>
+        <source>Choose Bluetooth download mode</source>
+        <translation>Bluetooth-Modus auswählen</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="129"/>
         <source>Select a remote Bluetooth device.</source>
         <translation>Wählen Sie ein externes Bluetooth-Gerät aus.</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="139"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="275"/>
+        <source>Vendor</source>
+        <translation>Hersteller</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="149"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="276"/>
+        <source>Dive computer</source>
+        <translation>Tauchcomputer</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/>
         <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="52"/>
         <location filename="../build/ui_downloadfromdivecomputer.h" line="277"/>
@@ -3618,18 +3714,6 @@ p, li { white-space: pre-wrap; }
         <translation>Herunterladen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="284"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="281"/>
-        <source>OK</source>
-        <translation>OK</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="291"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="282"/>
-        <source>Cancel</source>
-        <translation>Abbrechen</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="226"/>
         <location filename="../build/ui_downloadfromdivecomputer.h" line="278"/>
         <source>Downloaded dives</source>
@@ -3648,22 +3732,16 @@ p, li { white-space: pre-wrap; }
         <translation>Alles abwählen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="94"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="271"/>
-        <source>Save libdivecomputer logfile</source>
-        <translation>libdivecomputer-Protokolldatei speichern</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="108"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="273"/>
-        <source>Save libdivecomputer dumpfile</source>
-        <translation>Dump Datei der libdivecomputer Übertragung speichern</translation>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="284"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="281"/>
+        <source>OK</source>
+        <translation>OK</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="87"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="270"/>
-        <source>Download into new trip</source>
-        <translation>In neue Reise herunterladen</translation>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="291"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="282"/>
+        <source>Cancel</source>
+        <translation>Abbrechen</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="16"/>
@@ -3753,12 +3831,12 @@ p, li { white-space: pre-wrap; }
         <translation>Verbinden mit facebook Text Platzhalter</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="297"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="242"/>
         <source>To disconnect Subsurface from your Facebook account, use the button below</source>
         <translation>Um die Verbindung mit Facebook zu unterbrechen, bitte diesen Knopf drücken.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="306"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="251"/>
         <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source>
         <translation>Um Subsurface mit Facebook zu verbinden, bitte einloggen. Dadurch ist es möglich, Tauchgänge auf Facebook zu posten.</translation>
     </message>
@@ -3766,22 +3844,22 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>FacebookManager</name>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="266"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="211"/>
         <source>Photo upload sucessfull</source>
         <translation>Hochladen des Fotos war erfolgreich</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="267"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="212"/>
         <source>Your dive profile was updated to Facebook.</source>
         <translation>Ihr Tauchprofil auf Facebook wurde aktualisiert.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="271"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="216"/>
         <source>Photo upload failed</source>
         <translation>Hochladen des Fotos ist fehlgeschlagen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="272"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="217"/>
         <source>Your dive profile was not updated to Facebook, 
  please send the following to the developer. 
 </source>
@@ -3843,17 +3921,25 @@ bitte senden Sie das Folgende an die Entwickler.
 <context>
     <name>FirmwareUpdateThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1750"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1739"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Diese Funktion ist für den ausgewählten Tauchcomputer noch nicht verfügbar.</translation>
     </message>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1755"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1744"/>
         <source>Firmware update failed!</source>
         <translation>Firmware-Aktualisierung fehlgeschlagen!</translation>
     </message>
 </context>
 <context>
+    <name>GlobalDrawer</name>
+    <message>
+        <location filename="../mobile-widgets/qml/kirigami/src/controls/GlobalDrawer.qml" line="364"/>
+        <source>Back</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>GlobeGPS</name>
     <message>
         <location filename="../desktop-widgets/globe.cpp" line="124"/>
@@ -3869,27 +3955,27 @@ bitte senden Sie das Folgende an die Entwickler.
         <translation>GPS Positionen</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="40"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="32"/>
         <source>Date: </source>
         <translation>Datum:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="50"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="42"/>
         <source>Name: </source>
         <translation>Name: </translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="60"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="52"/>
         <source>Latitude: </source>
         <translation>Länge:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="69"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="61"/>
         <source>Longitude: </source>
         <translation>Breite:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="113"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="105"/>
         <source>List of stored GPS fixes</source>
         <translation>Liste der GPS-Positionen</translation>
     </message>
@@ -3918,7 +4004,7 @@ bitte senden Sie das Folgende an die Entwickler.
 <context>
     <name>LocationFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="648"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="646"/>
         <source>Location: </source>
         <translation>Ort:</translation>
     </message>
@@ -3959,7 +4045,7 @@ bitte senden Sie das Folgende an die Entwickler.
 <context>
     <name>LocationFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="299"/>
+        <location filename="../qt-models/filtermodels.cpp" line="304"/>
         <source>No location set</source>
         <translation>Kein Ort festgelegt</translation>
     </message>
@@ -4082,6 +4168,54 @@ bitte senden Sie das Folgende an die Entwickler.
 <context>
     <name>MainTab</name>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="18"/>
+        <location filename="../desktop-widgets/maintab.ui" line="439"/>
+        <location filename="../build/ui_maintab.h" line="961"/>
+        <location filename="../build/ui_maintab.h" line="963"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="539"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="571"/>
+        <source>Notes</source>
+        <translation>Notizen</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="21"/>
+        <location filename="../build/ui_maintab.h" line="964"/>
+        <source>General notes about the current selection</source>
+        <translation>Allgemeine Hinweise über die aktuelle Auswahl</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="92"/>
+        <location filename="../desktop-widgets/maintab.ui" line="646"/>
+        <location filename="../build/ui_maintab.h" line="947"/>
+        <location filename="../build/ui_maintab.h" line="967"/>
+        <source>Date</source>
+        <translation>Datum</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="102"/>
+        <location filename="../build/ui_maintab.h" line="948"/>
+        <source>Time</source>
+        <translation>Zeit</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="112"/>
+        <location filename="../desktop-widgets/maintab.ui" line="836"/>
+        <location filename="../build/ui_maintab.h" line="949"/>
+        <location filename="../build/ui_maintab.h" line="987"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="306"/>
+        <source>Air temp.</source>
+        <translation>Lufttemp.</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="122"/>
+        <location filename="../desktop-widgets/maintab.ui" line="855"/>
+        <location filename="../build/ui_maintab.h" line="950"/>
+        <location filename="../build/ui_maintab.h" line="989"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="307"/>
+        <source>Water temp.</source>
+        <translation>Wassertemp.</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="184"/>
         <location filename="../build/ui_maintab.h" line="951"/>
         <location filename="../desktop-widgets/maintab.cpp" line="570"/>
@@ -4089,6 +4223,17 @@ bitte senden Sie das Folgende an die Entwickler.
         <translation>Ort</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="214"/>
+        <source>Edit dive site</source>
+        <translation>Tauchplatz bearbeiten</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="217"/>
+        <location filename="../build/ui_maintab.h" line="953"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="252"/>
         <location filename="../build/ui_maintab.h" line="954"/>
         <source>Divemaster</source>
@@ -4101,12 +4246,6 @@ bitte senden Sie das Folgende an die Entwickler.
         <translation>Tauchpartner</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.ui" line="387"/>
-        <location filename="../build/ui_maintab.h" line="959"/>
-        <source>Tags</source>
-        <translation>Stichwörter</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/maintab.ui" line="308"/>
         <location filename="../build/ui_maintab.h" line="956"/>
         <source>Rating</source>
@@ -4125,57 +4264,18 @@ bitte senden Sie das Folgende an die Entwickler.
         <translation>Anzug</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="387"/>
+        <location filename="../build/ui_maintab.h" line="959"/>
+        <source>Tags</source>
+        <translation>Stichwörter</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="397"/>
         <location filename="../build/ui_maintab.h" line="960"/>
         <source>Dive mode</source>
         <translation>Tauchmodus</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.ui" line="112"/>
-        <location filename="../desktop-widgets/maintab.ui" line="836"/>
-        <location filename="../build/ui_maintab.h" line="949"/>
-        <location filename="../build/ui_maintab.h" line="987"/>
-        <location filename="../desktop-widgets/maintab.cpp" line="306"/>
-        <source>Air temp.</source>
-        <translation>Lufttemp.</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="122"/>
-        <location filename="../desktop-widgets/maintab.ui" line="855"/>
-        <location filename="../build/ui_maintab.h" line="950"/>
-        <location filename="../build/ui_maintab.h" line="989"/>
-        <location filename="../desktop-widgets/maintab.cpp" line="307"/>
-        <source>Water temp.</source>
-        <translation>Wassertemp.</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="18"/>
-        <location filename="../desktop-widgets/maintab.ui" line="439"/>
-        <location filename="../build/ui_maintab.h" line="961"/>
-        <location filename="../build/ui_maintab.h" line="963"/>
-        <location filename="../desktop-widgets/maintab.cpp" line="539"/>
-        <location filename="../desktop-widgets/maintab.cpp" line="571"/>
-        <source>Notes</source>
-        <translation>Notizen</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="21"/>
-        <location filename="../build/ui_maintab.h" line="964"/>
-        <source>General notes about the current selection</source>
-        <translation>Allgemeine Hinweise über die aktuelle Auswahl</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="214"/>
-        <source>Edit dive site</source>
-        <translation>Tauchplatz bearbeiten</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="217"/>
-        <location filename="../build/ui_maintab.h" line="953"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/maintab.ui" line="491"/>
         <location filename="../build/ui_maintab.h" line="965"/>
         <source>Equipment</source>
@@ -4200,6 +4300,12 @@ bitte senden Sie das Folgende an die Entwickler.
         <translation>Tauchinformation</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="665"/>
+        <location filename="../build/ui_maintab.h" line="969"/>
+        <source>Interval</source>
+        <translation>Oberflächenpause</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="684"/>
         <location filename="../build/ui_maintab.h" line="971"/>
         <source>Gases used</source>
@@ -4212,18 +4318,38 @@ bitte senden Sie das Folgende an die Entwickler.
         <translation>Gasverbrauch</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="722"/>
+        <location filename="../desktop-widgets/maintab.ui" line="1094"/>
+        <location filename="../build/ui_maintab.h" line="975"/>
+        <location filename="../build/ui_maintab.h" line="1003"/>
+        <source>SAC</source>
+        <translation>AMV</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="741"/>
         <location filename="../build/ui_maintab.h" line="977"/>
         <source>CNS</source>
         <translation>CND</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="760"/>
+        <location filename="../build/ui_maintab.h" line="979"/>
+        <source>OTU</source>
+        <translation>OTU</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="779"/>
         <location filename="../build/ui_maintab.h" line="981"/>
         <source>Max. depth</source>
         <translation>Max. Tiefe</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="798"/>
+        <location filename="../build/ui_maintab.h" line="983"/>
+        <source>Avg. depth</source>
+        <translation>Ø Tiefe</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="817"/>
         <location filename="../build/ui_maintab.h" line="985"/>
         <source>Air pressure</source>
@@ -4236,82 +4362,6 @@ bitte senden Sie das Folgende an die Entwickler.
         <translation>Dauer</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.ui" line="933"/>
-        <location filename="../build/ui_maintab.h" line="1007"/>
-        <source>Simple statistics about the selection</source>
-        <translation>Einfache Statistiken über die Auswahl</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1039"/>
-        <location filename="../build/ui_maintab.h" line="999"/>
-        <source>Total time</source>
-        <translation>Gesamtzeit</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1106"/>
-        <location filename="../build/ui_maintab.h" line="1004"/>
-        <source>Gas consumption</source>
-        <translation>Gasverbrauch</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1151"/>
-        <location filename="../build/ui_maintab.h" line="1009"/>
-        <source>All photos from the current selection</source>
-        <translation>Alle Fotos von der aktuellen Auswahl</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1177"/>
-        <location filename="../build/ui_maintab.h" line="1010"/>
-        <source>Extra data</source>
-        <translation>Zusatzdaten</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1180"/>
-        <location filename="../build/ui_maintab.h" line="1011"/>
-        <source>Adittional data from the dive computer</source>
-        <translation>Zusätzliche Daten von dem Tauchcomputer</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="92"/>
-        <location filename="../desktop-widgets/maintab.ui" line="646"/>
-        <location filename="../build/ui_maintab.h" line="947"/>
-        <location filename="../build/ui_maintab.h" line="967"/>
-        <source>Date</source>
-        <translation>Datum</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="102"/>
-        <location filename="../build/ui_maintab.h" line="948"/>
-        <source>Time</source>
-        <translation>Zeit</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="665"/>
-        <location filename="../build/ui_maintab.h" line="969"/>
-        <source>Interval</source>
-        <translation>Oberflächenpause</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="722"/>
-        <location filename="../desktop-widgets/maintab.ui" line="1094"/>
-        <location filename="../build/ui_maintab.h" line="975"/>
-        <location filename="../build/ui_maintab.h" line="1003"/>
-        <source>SAC</source>
-        <translation>AMV</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="798"/>
-        <location filename="../build/ui_maintab.h" line="983"/>
-        <source>Avg. depth</source>
-        <translation>Ø Tiefe</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="760"/>
-        <location filename="../build/ui_maintab.h" line="979"/>
-        <source>OTU</source>
-        <translation>OTU</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/maintab.ui" line="893"/>
         <location filename="../build/ui_maintab.h" line="993"/>
         <source>Salinity</source>
@@ -4324,22 +4374,34 @@ bitte senden Sie das Folgende an die Entwickler.
         <translation>Statistiken</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="933"/>
+        <location filename="../build/ui_maintab.h" line="1007"/>
+        <source>Simple statistics about the selection</source>
+        <translation>Einfache Statistiken über die Auswahl</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="986"/>
         <location filename="../build/ui_maintab.h" line="996"/>
         <source>Depth</source>
         <translation>Tiefe</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="998"/>
+        <location filename="../build/ui_maintab.h" line="997"/>
+        <source>Duration</source>
+        <translation>Dauer</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="1027"/>
         <location filename="../build/ui_maintab.h" line="998"/>
         <source>Temperature</source>
         <translation>Temperatur</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.ui" line="998"/>
-        <location filename="../build/ui_maintab.h" line="997"/>
-        <source>Duration</source>
-        <translation>Dauer</translation>
+        <location filename="../desktop-widgets/maintab.ui" line="1039"/>
+        <location filename="../build/ui_maintab.h" line="999"/>
+        <source>Total time</source>
+        <translation>Gesamtzeit</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/maintab.ui" line="1058"/>
@@ -4348,20 +4410,34 @@ bitte senden Sie das Folgende an die Entwickler.
         <translation>Tauchgänge</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="1106"/>
+        <location filename="../build/ui_maintab.h" line="1004"/>
+        <source>Gas consumption</source>
+        <translation>Gasverbrauch</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="1148"/>
         <location filename="../build/ui_maintab.h" line="1008"/>
         <source>Photos</source>
         <translation>Bilder</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.cpp" line="88"/>
-        <source>Cylinders</source>
-        <translation>Flaschen</translation>
+        <location filename="../desktop-widgets/maintab.ui" line="1151"/>
+        <location filename="../build/ui_maintab.h" line="1009"/>
+        <source>All photos from the current selection</source>
+        <translation>Alle Fotos von der aktuellen Auswahl</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.cpp" line="92"/>
-        <source>Weights</source>
-        <translation>Blei</translation>
+        <location filename="../desktop-widgets/maintab.ui" line="1177"/>
+        <location filename="../build/ui_maintab.h" line="1010"/>
+        <source>Extra data</source>
+        <translation>Zusatzdaten</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="1180"/>
+        <location filename="../build/ui_maintab.h" line="1011"/>
+        <source>Adittional data from the dive computer</source>
+        <translation>Zusätzliche Daten von dem Tauchcomputer</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/maintab.cpp" line="63"/>
@@ -4374,11 +4450,21 @@ bitte senden Sie das Folgende an die Entwickler.
         <translation>Änderungen Verwerfen</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.cpp" line="88"/>
+        <source>Cylinders</source>
+        <translation>Flaschen</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.cpp" line="89"/>
         <source>Add cylinder</source>
         <translation>Flasche hinzufügen</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.cpp" line="92"/>
+        <source>Weights</source>
+        <translation>Blei</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.cpp" line="93"/>
         <source>Add weight system</source>
         <translation>Gewicht hinzufügen</translation>
@@ -4571,659 +4657,685 @@ den folgenden Gasen gemischt werden:
         <translation>&amp;Datei</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="455"/>
-        <location filename="../build/ui_mainwindow.h" line="534"/>
-        <source>Export dive logs</source>
-        <translation>Logbücher exportieren</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="510"/>
-        <location filename="../build/ui_mainwindow.h" line="542"/>
-        <source>Toggle pHe graph</source>
-        <translation>pHe-Kurve umschalten</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="546"/>
-        <location filename="../build/ui_mainwindow.h" line="545"/>
-        <source>Toggle calculating all tissues</source>
-        <translation>Berechnung aller Gewebe umschalten</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="522"/>
-        <location filename="../build/ui_mainwindow.h" line="543"/>
-        <source>Toggle DC reported ceiling</source>
-        <translation>Vom Tauchcomputer berechnete Auftauchgrenze umschalten</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="534"/>
-        <location filename="../build/ui_mainwindow.h" line="544"/>
-        <source>Toggle calculated ceiling</source>
-        <translation>Berechnete Auftauchgrenze umschalten</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="606"/>
-        <location filename="../build/ui_mainwindow.h" line="550"/>
-        <source>Toggle NDL, TTS</source>
-        <translation>Nullzeit, Gesamtaufstiegszeit umschalten</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="558"/>
-        <location filename="../build/ui_mainwindow.h" line="546"/>
-        <source>Toggle calculated ceiling with 3m increments</source>
-        <translation>Berechnete Auftauchgrenze in 3 m Schritten umschalten</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="463"/>
-        <location filename="../build/ui_mainwindow.h" line="537"/>
-        <source>Configure &amp;dive computer</source>
-        <translation>&amp;Tauchcomputer konfigurieren</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="570"/>
-        <location filename="../build/ui_mainwindow.h" line="547"/>
-        <source>Toggle heart rate</source>
-        <translation>Pulsrate umschalten</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="582"/>
-        <location filename="../build/ui_mainwindow.h" line="548"/>
-        <source>Toggle MOD</source>
-        <translation>MOD umschalten</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="594"/>
-        <location filename="../build/ui_mainwindow.h" line="549"/>
-        <source>Toggle EAD, END, EADD</source>
-        <translation>EAD, END, EADD umschalten</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="618"/>
-        <location filename="../build/ui_mainwindow.h" line="551"/>
-        <source>Toggle SAC rate</source>
-        <translation>AMV-Rate umschalten</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="630"/>
-        <location filename="../build/ui_mainwindow.h" line="552"/>
-        <source>Toggle ruler</source>
-        <translation>Lineal umschalten</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="86"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="87"/>
         <location filename="../build/ui_mainwindow.h" line="569"/>
         <source>&amp;Log</source>
         <translation>&amp;Logbuch</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="105"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="104"/>
         <location filename="../build/ui_mainwindow.h" line="570"/>
         <source>&amp;View</source>
         <translation>&amp;Ansicht</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="121"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="120"/>
         <location filename="../build/ui_mainwindow.h" line="571"/>
         <source>&amp;Help</source>
         <translation>&amp;Hilfe</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="130"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="129"/>
         <location filename="../build/ui_mainwindow.h" line="572"/>
         <source>&amp;Import</source>
         <translation>&amp;Importieren</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="139"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="138"/>
         <location filename="../build/ui_mainwindow.h" line="573"/>
         <source>&amp;Edit</source>
         <translation>B&amp;earbeiten</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="144"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="143"/>
         <source>Share on</source>
         <translation>Teilen auf</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="158"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="157"/>
         <location filename="../build/ui_mainwindow.h" line="453"/>
         <source>&amp;New logbook</source>
         <translation>&amp;Neues Logbuch</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="161"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="160"/>
         <location filename="../build/ui_mainwindow.h" line="455"/>
         <source>New</source>
         <translation>Neu</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="164"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="163"/>
         <location filename="../build/ui_mainwindow.h" line="457"/>
         <source>Ctrl+N</source>
         <translation>Strg+N</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="169"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="168"/>
         <location filename="../build/ui_mainwindow.h" line="458"/>
         <source>&amp;Open logbook</source>
         <translation>Logbuch &amp;öffnen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="172"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="171"/>
         <location filename="../build/ui_mainwindow.h" line="460"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="508"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="502"/>
         <source>Open</source>
         <translation>Öffnen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="175"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="174"/>
         <location filename="../build/ui_mainwindow.h" line="462"/>
         <source>Ctrl+O</source>
         <translation>Strg+O</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="180"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="179"/>
         <location filename="../build/ui_mainwindow.h" line="463"/>
         <source>&amp;Save</source>
         <translation>&amp;Speichern</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="183"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="182"/>
         <location filename="../build/ui_mainwindow.h" line="465"/>
         <source>Save</source>
         <translation>Speichern</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="186"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="185"/>
         <location filename="../build/ui_mainwindow.h" line="467"/>
         <source>Ctrl+S</source>
         <translation>Strg+S</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="191"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="190"/>
         <location filename="../build/ui_mainwindow.h" line="468"/>
         <source>Sa&amp;ve as</source>
         <translation>Speichern als</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="194"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="193"/>
         <location filename="../build/ui_mainwindow.h" line="470"/>
         <source>Save as</source>
         <translation>Speichern unter</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="197"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="196"/>
         <location filename="../build/ui_mainwindow.h" line="472"/>
         <source>Ctrl+Shift+S</source>
         <translation>Strg+Shift+S</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="202"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="201"/>
         <location filename="../build/ui_mainwindow.h" line="473"/>
         <source>&amp;Close</source>
         <translation>Schließen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="205"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="204"/>
         <location filename="../build/ui_mainwindow.h" line="475"/>
         <source>Close</source>
         <translation>Schliessen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="208"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="207"/>
         <location filename="../build/ui_mainwindow.h" line="477"/>
         <source>Ctrl+W</source>
         <translation>Strg+W</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="221"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="212"/>
+        <location filename="../build/ui_mainwindow.h" line="478"/>
+        <source>&amp;Print</source>
+        <translation>&amp;Drucken</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="215"/>
+        <location filename="../build/ui_mainwindow.h" line="479"/>
+        <source>Ctrl+P</source>
+        <translation>Strg+P</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="220"/>
         <location filename="../build/ui_mainwindow.h" line="480"/>
         <source>P&amp;references</source>
         <translation>Einstellungen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="251"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="223"/>
+        <location filename="../build/ui_mainwindow.h" line="481"/>
+        <source>Ctrl+,</source>
+        <translation>Strg+,</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="231"/>
+        <location filename="../build/ui_mainwindow.h" line="482"/>
+        <source>&amp;Quit</source>
+        <translation>&amp;Beenden</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="234"/>
+        <location filename="../build/ui_mainwindow.h" line="483"/>
+        <source>Ctrl+Q</source>
+        <translation>Strg+Q</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="242"/>
+        <location filename="../build/ui_mainwindow.h" line="484"/>
+        <source>Import from &amp;dive computer</source>
+        <translation>Von &amp;Tauchcomputer importieren</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="245"/>
+        <location filename="../build/ui_mainwindow.h" line="485"/>
+        <source>Ctrl+D</source>
+        <translation>Strg+D</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="250"/>
         <location filename="../build/ui_mainwindow.h" line="486"/>
         <source>Import &amp;GPS data from Subsurface web service</source>
         <translation>GPS-Daten von Subsurface-Webdienst importieren</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="259"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="253"/>
+        <location filename="../build/ui_mainwindow.h" line="487"/>
+        <source>Ctrl+G</source>
+        <translation>Strg+G</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="258"/>
         <location filename="../build/ui_mainwindow.h" line="488"/>
         <source>Edit device &amp;names</source>
         <translation>Geräte&amp;namen bearbeiten</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="272"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="263"/>
+        <location filename="../build/ui_mainwindow.h" line="489"/>
+        <source>&amp;Add dive</source>
+        <translation>Tauchgang hinzufügen</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="266"/>
+        <location filename="../build/ui_mainwindow.h" line="490"/>
+        <source>Ctrl++</source>
+        <translation>Strg++</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="271"/>
         <location filename="../build/ui_mainwindow.h" line="491"/>
         <source>&amp;Edit dive</source>
         <translation>Tauchgang b&amp;earbeiten</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="277"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="276"/>
         <location filename="../build/ui_mainwindow.h" line="492"/>
         <source>&amp;Copy dive components</source>
         <translation>Tau&amp;chkomponenten kopieren</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="280"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="279"/>
         <location filename="../build/ui_mainwindow.h" line="493"/>
         <source>Ctrl+C</source>
         <translation>Strg+C</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="285"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="284"/>
         <location filename="../build/ui_mainwindow.h" line="494"/>
         <source>&amp;Paste dive components</source>
         <translation>Tauchkom&amp;ponenten einfügen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="288"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="287"/>
         <location filename="../build/ui_mainwindow.h" line="495"/>
         <source>Ctrl+V</source>
         <translation>Strg+V</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="325"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="292"/>
+        <location filename="../build/ui_mainwindow.h" line="496"/>
+        <source>&amp;Renumber</source>
+        <translation>&amp;Neu nummerieren</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="295"/>
+        <location filename="../build/ui_mainwindow.h" line="497"/>
+        <source>Ctrl+R</source>
+        <translation>Strg+R</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="303"/>
+        <location filename="../build/ui_mainwindow.h" line="498"/>
+        <source>Auto &amp;group</source>
+        <translation>Automatisch &amp;gruppieren</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="308"/>
+        <location filename="../build/ui_mainwindow.h" line="499"/>
+        <source>&amp;Yearly statistics</source>
+        <translation>Jahresstatistiken</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="311"/>
+        <location filename="../build/ui_mainwindow.h" line="500"/>
+        <source>Ctrl+Y</source>
+        <translation>Strg+Y</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="316"/>
+        <location filename="../build/ui_mainwindow.h" line="501"/>
+        <source>&amp;Dive list</source>
+        <translation>Tauchgangliste</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="319"/>
+        <location filename="../build/ui_mainwindow.h" line="502"/>
+        <source>Ctrl+2</source>
+        <translation>Strg+2</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="324"/>
         <location filename="../build/ui_mainwindow.h" line="503"/>
         <source>&amp;Profile</source>
         <translation>Profil</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="333"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="327"/>
+        <location filename="../build/ui_mainwindow.h" line="504"/>
+        <source>Ctrl+3</source>
+        <translation>Strg+3</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="332"/>
         <location filename="../build/ui_mainwindow.h" line="505"/>
         <source>&amp;Info</source>
         <translation>Informationen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="341"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="335"/>
+        <location filename="../build/ui_mainwindow.h" line="506"/>
+        <source>Ctrl+4</source>
+        <translation>Strg+4</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="340"/>
         <location filename="../build/ui_mainwindow.h" line="507"/>
         <source>&amp;All</source>
         <translation>Alle</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="357"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="343"/>
+        <location filename="../build/ui_mainwindow.h" line="508"/>
+        <source>Ctrl+1</source>
+        <translation>Strg+1</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="348"/>
+        <location filename="../build/ui_mainwindow.h" line="509"/>
+        <source>P&amp;revious DC</source>
+        <translation>Vo&amp;rheriger TC</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="351"/>
+        <location filename="../build/ui_mainwindow.h" line="510"/>
+        <source>Left</source>
+        <translation>Links</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="356"/>
         <location filename="../build/ui_mainwindow.h" line="511"/>
         <source>&amp;Next DC</source>
         <translation>&amp;Nächster TC</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="365"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="359"/>
+        <location filename="../build/ui_mainwindow.h" line="512"/>
+        <source>Right</source>
+        <translation>Rechts</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="364"/>
         <location filename="../build/ui_mainwindow.h" line="513"/>
         <source>&amp;About Subsurface</source>
         <translation>Info zu Subsurface</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="381"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="372"/>
+        <location filename="../build/ui_mainwindow.h" line="514"/>
+        <source>User &amp;manual</source>
+        <translation>Benutzerhandbuch</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="375"/>
+        <location filename="../build/ui_mainwindow.h" line="515"/>
+        <source>F1</source>
+        <translation>F1</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="380"/>
         <location filename="../build/ui_mainwindow.h" line="516"/>
         <source>&amp;Globe</source>
         <translation>Globus</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="403"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="383"/>
+        <location filename="../build/ui_mainwindow.h" line="517"/>
+        <source>Ctrl+5</source>
+        <translation>Strg+5</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="388"/>
+        <location filename="../build/ui_mainwindow.h" line="518"/>
+        <source>P&amp;lan dive</source>
+        <translation>Tauchgang planen</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="391"/>
+        <location filename="../build/ui_mainwindow.h" line="519"/>
+        <source>Ctrl+L</source>
+        <translation>Strg+L</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="396"/>
+        <location filename="../build/ui_mainwindow.h" line="520"/>
+        <source>&amp;Import log files</source>
+        <translation>Protokolldateien &amp;importieren</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="399"/>
+        <location filename="../build/ui_mainwindow.h" line="522"/>
+        <source>Import divelog files from other applications</source>
+        <translation>Tauchprotokolldateien von anderen Anwendungen importieren</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="402"/>
         <location filename="../build/ui_mainwindow.h" line="524"/>
         <source>Ctrl+I</source>
         <translation>Strg+I</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="408"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="407"/>
         <location filename="../build/ui_mainwindow.h" line="525"/>
         <source>Import &amp;from divelogs.de</source>
         <translation>&amp;Von divelogs.de importieren</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="416"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="415"/>
         <location filename="../build/ui_mainwindow.h" line="526"/>
         <source>&amp;Full screen</source>
         <translation>Vollbild</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="419"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="418"/>
         <location filename="../build/ui_mainwindow.h" line="528"/>
         <source>Toggle full screen</source>
         <translation>Vollbild umschalten</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="447"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="421"/>
+        <location filename="../build/ui_mainwindow.h" line="530"/>
+        <source>F11</source>
+        <translation>F11</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="446"/>
         <location filename="../build/ui_mainwindow.h" line="531"/>
         <source>&amp;Check for updates</source>
         <translation>Nach neuer Version suchen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="452"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="451"/>
         <location filename="../build/ui_mainwindow.h" line="532"/>
         <source>&amp;Export</source>
         <translation>Exportiere</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="458"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="454"/>
+        <location filename="../build/ui_mainwindow.h" line="534"/>
+        <source>Export dive logs</source>
+        <translation>Logbücher exportieren</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="457"/>
         <location filename="../build/ui_mainwindow.h" line="536"/>
         <source>Ctrl+E</source>
         <translation>Strg+E</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="466"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="462"/>
+        <location filename="../build/ui_mainwindow.h" line="537"/>
+        <source>Configure &amp;dive computer</source>
+        <translation>&amp;Tauchcomputer konfigurieren</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="465"/>
         <location filename="../build/ui_mainwindow.h" line="538"/>
         <source>Ctrl+Shift+C</source>
         <translation>Strg+Umschalt+C</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="474"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="473"/>
         <location filename="../build/ui_mainwindow.h" line="539"/>
         <source>Edit &amp;dive in planner</source>
         <translation>&amp;Tauchgang im Planer bearbeiten</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="486"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="485"/>
         <location filename="../build/ui_mainwindow.h" line="540"/>
         <source>Toggle pO₂ graph</source>
         <translation>pO₂-Plot umschalten</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="498"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="497"/>
         <location filename="../build/ui_mainwindow.h" line="541"/>
         <source>Toggle pN₂ graph</source>
         <translation>pN₂-Plot umschalten</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="642"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="509"/>
+        <location filename="../build/ui_mainwindow.h" line="542"/>
+        <source>Toggle pHe graph</source>
+        <translation>pHe-Kurve umschalten</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="521"/>
+        <location filename="../build/ui_mainwindow.h" line="543"/>
+        <source>Toggle DC reported ceiling</source>
+        <translation>Vom Tauchcomputer berechnete Auftauchgrenze umschalten</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="533"/>
+        <location filename="../build/ui_mainwindow.h" line="544"/>
+        <source>Toggle calculated ceiling</source>
+        <translation>Berechnete Auftauchgrenze umschalten</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="545"/>
+        <location filename="../build/ui_mainwindow.h" line="545"/>
+        <source>Toggle calculating all tissues</source>
+        <translation>Berechnung aller Gewebe umschalten</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="557"/>
+        <location filename="../build/ui_mainwindow.h" line="546"/>
+        <source>Toggle calculated ceiling with 3m increments</source>
+        <translation>Berechnete Auftauchgrenze in 3 m Schritten umschalten</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="569"/>
+        <location filename="../build/ui_mainwindow.h" line="547"/>
+        <source>Toggle heart rate</source>
+        <translation>Pulsrate umschalten</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="581"/>
+        <location filename="../build/ui_mainwindow.h" line="548"/>
+        <source>Toggle MOD</source>
+        <translation>MOD umschalten</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="593"/>
+        <location filename="../build/ui_mainwindow.h" line="549"/>
+        <source>Toggle EAD, END, EADD</source>
+        <translation>EAD, END, EADD umschalten</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="605"/>
+        <location filename="../build/ui_mainwindow.h" line="550"/>
+        <source>Toggle NDL, TTS</source>
+        <translation>Nullzeit, Gesamtaufstiegszeit umschalten</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="617"/>
+        <location filename="../build/ui_mainwindow.h" line="551"/>
+        <source>Toggle SAC rate</source>
+        <translation>AMV-Rate umschalten</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="629"/>
+        <location filename="../build/ui_mainwindow.h" line="552"/>
+        <source>Toggle ruler</source>
+        <translation>Lineal umschalten</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="641"/>
         <location filename="../build/ui_mainwindow.h" line="553"/>
         <source>Scale graph</source>
         <translation>Maßstabsgraph</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="654"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="653"/>
         <location filename="../build/ui_mainwindow.h" line="554"/>
         <source>Toggle pictures</source>
         <translation>Bilder umschalten</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="666"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="665"/>
         <location filename="../build/ui_mainwindow.h" line="555"/>
         <source>Toggle tank bar</source>
         <translation>Tankleiste umschalten</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="674"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="673"/>
         <location filename="../build/ui_mainwindow.h" line="556"/>
         <source>&amp;Filter divelist</source>
         <translation>Liste der Tauchgänge filtern</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="689"/>
-        <location filename="../build/ui_mainwindow.h" line="558"/>
-        <source>Toggle tissue graph</source>
-        <translation>Gewebe-Sättigungskurve umschalten</translation>
+        <location filename="../desktop-widgets/mainwindow.ui" line="676"/>
+        <location filename="../build/ui_mainwindow.h" line="557"/>
+        <source>Ctrl+F</source>
+        <translation>Strg+F</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="688"/>
+        <source>Toggle tissue heat-map</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="694"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="693"/>
         <location filename="../build/ui_mainwindow.h" line="559"/>
         <source>User &amp;survey</source>
         <translation>Benutzer&amp;umfrage</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="699"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="698"/>
         <location filename="../build/ui_mainwindow.h" line="560"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="238"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="231"/>
         <source>&amp;Undo</source>
         <translation>&amp;Rückgängig</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="702"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="701"/>
         <location filename="../build/ui_mainwindow.h" line="561"/>
         <source>Ctrl+Z</source>
         <translation>Strg+Z</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="707"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="706"/>
         <location filename="../build/ui_mainwindow.h" line="562"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="239"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="232"/>
         <source>&amp;Redo</source>
         <translation>&amp;Wiederherstellen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="710"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="709"/>
         <location filename="../build/ui_mainwindow.h" line="563"/>
         <source>Ctrl+Shift+Z</source>
         <translation>Strg+Umschalt+Z</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="715"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="714"/>
         <location filename="../build/ui_mainwindow.h" line="564"/>
         <source>&amp;Find moved images</source>
         <translation>&amp;Finde verschobene Bilder</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="720"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="719"/>
         <source>Open c&amp;loud storage</source>
         <translation>C&amp;loudspeicher öffnen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="725"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="724"/>
         <source>Save to clo&amp;ud storage</source>
         <translation>In Clo&amp;udspeicher speichern</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="730"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="729"/>
         <location filename="../build/ui_mainwindow.h" line="567"/>
         <source>&amp;Manage dive sites</source>
         <translation>Tauchplätze ver&amp;walten</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="735"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="734"/>
         <source>Dive Site &amp;Edit</source>
         <translation>Tauchplatzb&amp;earbeitung</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="740"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="739"/>
         <source>Facebook</source>
         <translation>Facebook</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="745"/>
-        <source>Add GPS location here</source>
-        <translation>GPS-Position hier hinzufügen</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="677"/>
-        <location filename="../build/ui_mainwindow.h" line="557"/>
-        <source>Ctrl+F</source>
-        <translation>Strg+F</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="213"/>
-        <location filename="../build/ui_mainwindow.h" line="478"/>
-        <source>&amp;Print</source>
-        <translation>&amp;Drucken</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="224"/>
-        <location filename="../build/ui_mainwindow.h" line="481"/>
-        <source>Ctrl+,</source>
-        <translation>Strg+,</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="232"/>
-        <location filename="../build/ui_mainwindow.h" line="482"/>
-        <source>&amp;Quit</source>
-        <translation>&amp;Beenden</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="243"/>
-        <location filename="../build/ui_mainwindow.h" line="484"/>
-        <source>Import from &amp;dive computer</source>
-        <translation>Von &amp;Tauchcomputer importieren</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="254"/>
-        <location filename="../build/ui_mainwindow.h" line="487"/>
-        <source>Ctrl+G</source>
-        <translation>Strg+G</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="267"/>
-        <location filename="../build/ui_mainwindow.h" line="490"/>
-        <source>Ctrl++</source>
-        <translation>Strg++</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="293"/>
-        <location filename="../build/ui_mainwindow.h" line="496"/>
-        <source>&amp;Renumber</source>
-        <translation>&amp;Neu nummerieren</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="296"/>
-        <location filename="../build/ui_mainwindow.h" line="497"/>
-        <source>Ctrl+R</source>
-        <translation>Strg+R</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="312"/>
-        <location filename="../build/ui_mainwindow.h" line="500"/>
-        <source>Ctrl+Y</source>
-        <translation>Strg+Y</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="392"/>
-        <location filename="../build/ui_mainwindow.h" line="519"/>
-        <source>Ctrl+L</source>
-        <translation>Strg+L</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="216"/>
-        <location filename="../build/ui_mainwindow.h" line="479"/>
-        <source>Ctrl+P</source>
-        <translation>Strg+P</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="235"/>
-        <location filename="../build/ui_mainwindow.h" line="483"/>
-        <source>Ctrl+Q</source>
-        <translation>Strg+Q</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="246"/>
-        <location filename="../build/ui_mainwindow.h" line="485"/>
-        <source>Ctrl+D</source>
-        <translation>Strg+D</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="264"/>
-        <location filename="../build/ui_mainwindow.h" line="489"/>
-        <source>&amp;Add dive</source>
-        <translation>Tauchgang hinzufügen</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="304"/>
-        <location filename="../build/ui_mainwindow.h" line="498"/>
-        <source>Auto &amp;group</source>
-        <translation>Automatisch &amp;gruppieren</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="309"/>
-        <location filename="../build/ui_mainwindow.h" line="499"/>
-        <source>&amp;Yearly statistics</source>
-        <translation>Jahresstatistiken</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="317"/>
-        <location filename="../build/ui_mainwindow.h" line="501"/>
-        <source>&amp;Dive list</source>
-        <translation>Tauchgangliste</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="320"/>
-        <location filename="../build/ui_mainwindow.h" line="502"/>
-        <source>Ctrl+2</source>
-        <translation>Strg+2</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="328"/>
-        <location filename="../build/ui_mainwindow.h" line="504"/>
-        <source>Ctrl+3</source>
-        <translation>Strg+3</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="336"/>
-        <location filename="../build/ui_mainwindow.h" line="506"/>
-        <source>Ctrl+4</source>
-        <translation>Strg+4</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="344"/>
-        <location filename="../build/ui_mainwindow.h" line="508"/>
-        <source>Ctrl+1</source>
-        <translation>Strg+1</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="349"/>
-        <location filename="../build/ui_mainwindow.h" line="509"/>
-        <source>P&amp;revious DC</source>
-        <translation>Vo&amp;rheriger TC</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="352"/>
-        <location filename="../build/ui_mainwindow.h" line="510"/>
-        <source>Left</source>
-        <translation>Links</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="360"/>
-        <location filename="../build/ui_mainwindow.h" line="512"/>
-        <source>Right</source>
-        <translation>Rechts</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="373"/>
-        <location filename="../build/ui_mainwindow.h" line="514"/>
-        <source>User &amp;manual</source>
-        <translation>Benutzerhandbuch</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="376"/>
-        <location filename="../build/ui_mainwindow.h" line="515"/>
-        <source>F1</source>
-        <translation>F1</translation>
+        <location filename="../desktop-widgets/mainwindow.ui" line="744"/>
+        <source>Take cloud storage online</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="384"/>
-        <location filename="../build/ui_mainwindow.h" line="517"/>
-        <source>Ctrl+5</source>
-        <translation>Strg+5</translation>
+        <location filename="../build/ui_mainwindow.h" line="558"/>
+        <source>Toggle tissue graph</source>
+        <translation>Gewebe-Sättigungskurve umschalten</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="389"/>
-        <location filename="../build/ui_mainwindow.h" line="518"/>
-        <source>P&amp;lan dive</source>
-        <translation>Tauchgang planen</translation>
+        <location filename="../build/ui_mainwindow.h" line="565"/>
+        <source>Open cloud storage</source>
+        <translation>Cloudspeicher öffnen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="397"/>
-        <location filename="../build/ui_mainwindow.h" line="520"/>
-        <source>&amp;Import log files</source>
-        <translation>Protokolldateien &amp;importieren</translation>
+        <location filename="../build/ui_mainwindow.h" line="566"/>
+        <source>Save to cloud storage</source>
+        <translation>In Cloudspeicher speichern</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="400"/>
-        <location filename="../build/ui_mainwindow.h" line="522"/>
-        <source>Import divelog files from other applications</source>
-        <translation>Tauchprotokolldateien von anderen Anwendungen importieren</translation>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="331"/>
+        <source>Connect to</source>
+        <translation>Verbinden mit</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="422"/>
-        <location filename="../build/ui_mainwindow.h" line="530"/>
-        <source>F11</source>
-        <translation>F11</translation>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="493"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="538"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1545"/>
+        <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 eine neue Datei geöffnet wird.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="505"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="499"/>
         <source>Open file</source>
         <translation>Datei öffnen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="509"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="503"/>
         <location filename="../desktop-widgets/mainwindow.cpp" line="614"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1972"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1978"/>
         <source>Cancel</source>
         <translation>Abbrechen</translation>
     </message>
@@ -5243,6 +5355,16 @@ den folgenden Gasen gemischt werden:
         <translation>Bilder werden gesucht...(dies kann eine Weile dauern)</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="649"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="796"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="977"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="983"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1849"/>
+        <source>Warning</source>
+        <translation>Warnung</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="674"/>
         <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 die Datei geschlossen wird.</translation>
@@ -5258,125 +5380,98 @@ den folgenden Gasen gemischt werden:
         <translation>Laufzeittabelle anzeigen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="982"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
+        <source>Trying to replan a dive that&apos;s not a planned dive.</source>
+        <translation>Es wird versucht, einen Tauchgang, der ursprünglich nicht im Planer erstellt wurde, im Planer zu öffnen.</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="977"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1849"/>
+        <source>Please, first finish the current edition before trying to do another.</source>
+        <translation>Bitte zuerst die aktuelle Bearbeitung abschließen um eine neue zu beginnen.</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="983"/>
         <source>Trying to edit a dive that&apos;s not a manually added dive.</source>
         <translation>Es wird versucht, einen nicht Tauchgang, der nicht manuell erstellt wurde, zu editieren.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1243"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1030"/>
+        <source>Yearly statistics</source>
+        <translation>Jahresstatistiken</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1244"/>
         <source>Do you want to save the changes that you made in the file %1?</source>
         <translation>Möchtest Du die Änderungen in der Datei %1 speichern?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1246"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1247"/>
         <source>Do you want to save the changes that you made in the data file?</source>
         <translation>Möchtest Sie Ihre Änderungen in der Datendatei speichern?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1251"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1252"/>
         <source>Save changes?</source>
         <translation>Änderungen speichern?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1587"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1253"/>
+        <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="../desktop-widgets/mainwindow.cpp" line="1572"/>
         <source>Save file as</source>
         <translation>Datei speichern unter</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1682"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1573"/>
+        <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
+        <translation>Subsurface XML Dateien (*.ssrf *.xml *.XML)</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1670"/>
+        <source>[local cache for] %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1672"/>
         <source>[cloud storage for] %1</source>
         <translation>[Cloudspeicher für] %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1782"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1788"/>
         <source>Opening datafile from older version</source>
         <translation>Datendatei von älterer Version wird geöffnet</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1783"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1789"/>
         <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly.
 Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source>
         <translation>Es wurde eine Datei von einer älteren Subsurface-Version geöffnet. Wir empfehlen das Handbuch zu lesen, um die Unterschiede der neuen Version insbesondere in der Tauchplatzverwaltung kennen zu lernen.
 Subsurface hat bereits versucht, Daten einzutragen, aber es empfiehlt sich, die neue Tauchplatzverwaltung anzuschauen und sicher zu stellen, dass alles richtig aussieht. </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1794"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1800"/>
         <source>Open dive log file</source>
         <translation>Tauchprotokolldatei öffnen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1795"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1801"/>
         <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;All files (*)</source>
         <translation>Logbuchdateien (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de Dateien (*.dld *.DLD);;JDiveLog Dateien (*.jlb *.JLB);;Liquivision Dateien (*.lvd *.LVD);;MkVI Dateien (*.txt *.TXT);;Suunto Dateien (*.sde *.db *.SDE *.DB);;Divesoft Dateien (*.dlf *.DLF);;UDDF/UDCF Dateien (*.uddf *.udcf *.UDDF *.UDCF);;XML Dateien (*.xml *.XML);;APD log Betrachter (*.apd *.APD);;Datatrak/WLog Dateien (*.log *.LOG);;OSTCtools Dateien (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;Alle Dateien (*)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1972"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1978"/>
         <source>Contacting cloud service...</source>
         <translation>Kontaktaufnahme mit dem Cloud-Dienst...</translation>
     </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1252"/>
-        <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="../desktop-widgets/mainwindow.cpp" line="649"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="796"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="976"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="982"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/>
-        <source>Warning</source>
-        <translation>Warnung</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="499"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="544"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1560"/>
-        <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 eine neue Datei geöffnet wird.</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="338"/>
-        <source>Connect to</source>
-        <translation>Verbinden mit</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
-        <source>Trying to replan a dive that&apos;s not a planned dive.</source>
-        <translation>Es wird versucht, einen Tauchgang, der ursprünglich nicht im Planer erstellt wurde, im Planer zu öffnen.</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1029"/>
-        <source>Yearly statistics</source>
-        <translation>Jahresstatistiken</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1588"/>
-        <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
-        <translation>Subsurface XML Dateien (*.ssrf *.xml *.XML)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="976"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/>
-        <source>Please, first finish the current edition before trying to do another.</source>
-        <translation>Bitte zuerst die aktuelle Bearbeitung abschließen um eine neue zu beginnen.</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_mainwindow.h" line="565"/>
-        <source>Open cloud storage</source>
-        <translation>Cloudspeicher öffnen</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_mainwindow.h" line="566"/>
-        <source>Save to cloud storage</source>
-        <translation>In Cloudspeicher speichern</translation>
-    </message>
 </context>
 <context>
     <name>MultiFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="733"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="731"/>
         <source>Filter shows %1 (of %2) dives</source>
         <translation>Filter zeigt %1 (von %2) Tauchgängen</translation>
     </message>
@@ -5384,12 +5479,12 @@ Subsurface hat bereits versucht, Daten einzutragen, aber es empfiehlt sich, die
 <context>
     <name>OstcFirmwareCheck</name>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="269"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="271"/>
         <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source>
         <translation>Sie sollten die Firmware auf Ihrem Tauchcomputer aktualisieren: Sie haben Version %1, aber die neueste stabile Version ist %2</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="273"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="275"/>
         <source>
 
 Please start Bluetooth on your OSTC Sport and do the same preparations as for a logbook download before continuing with the update</source>
@@ -5398,27 +5493,27 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 Bitte Bluetooth auf dem OSTC Sport starten und die gleichen Einstellungen wie für ein Logbuchdownload treffen, bevor das Update fortgeführt wird.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="274"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="276"/>
         <source>Not now</source>
         <translation>Nicht jetzt</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="275"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="277"/>
         <source>Update firmware</source>
         <translation>Firmware aktualisieren</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="277"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="279"/>
         <source>Firmware upgrade notice</source>
         <translation>Firmware-Aktualisierungsbenachrichtigung</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="295"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="297"/>
         <source>Save the downloaded firmware as</source>
         <translation>Heruntergeladene Firmware speichern als</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="296"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="298"/>
         <source>HEX files (*.hex)</source>
         <translation>HEX-Dateien (*.hex)</translation>
     </message>
@@ -5426,79 +5521,89 @@ Bitte Bluetooth auf dem OSTC Sport starten und die gleichen Einstellungen wie f�
 <context>
     <name>PlannerSettingsWidget</name>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="322"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="302"/>
         <source>Open circuit</source>
         <translation>Offenes System</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="322"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="302"/>
         <source>CCR</source>
         <translation>CCR</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="322"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="302"/>
         <source>pSCR</source>
         <translation>pSCR</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="421"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="388"/>
         <source>ft/min</source>
         <translation>ft/min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="422"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="389"/>
         <source>Last stop at 20ft</source>
         <translation>Letzter Stopp auf 20 Fuß</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="423"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="390"/>
         <source>50% avg. depth to 20ft</source>
         <translation>50% mitlerer Tiefe bis 20ft</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="424"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="391"/>
         <source>20ft to surface</source>
         <translation>20ft bis Oberfläche</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="426"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="392"/>
+        <source>ft</source>
+        <translation>ft</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="394"/>
         <source>m/min</source>
         <translation>m/min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="427"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="395"/>
         <source>Last stop at 6m</source>
         <translation>Letzter Stopp auf 6m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="428"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="396"/>
         <source>50% avg. depth to 6m</source>
         <translation>50% mitlerer Tiefe bis 6m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="429"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="397"/>
         <source>6m to surface</source>
         <translation>6m bis Oberfläche</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="432"/>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="433"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="398"/>
+        <source>m</source>
+        <translation>m</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="401"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="402"/>
         <source>cuft/min</source>
         <translation>cft/min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="441"/>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="442"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="410"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="411"/>
         <source>ℓ/min</source>
         <translation>ℓ/min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="451"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="420"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="456"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="425"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
@@ -5648,6 +5753,11 @@ Bitte Bluetooth auf dem OSTC Sport starten und die gleichen Einstellungen wie f�
 <context>
     <name>PreferencesDialog</name>
     <message>
+        <location filename="../build/ui_preferences.h" line="1283"/>
+        <source>Preferences</source>
+        <translation>Einstellungen</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1288"/>
         <source>Defaults</source>
         <translation>Stdeinstellungen</translation>
@@ -5683,6 +5793,11 @@ Bitte Bluetooth auf dem OSTC Sport starten und die gleichen Einstellungen wie f�
         <translation>Georeferenz</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1303"/>
+        <source>Lists and tables</source>
+        <translation>Listen und Tabellen</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1304"/>
         <source>Font</source>
         <translation>Schriftart</translation>
@@ -5698,6 +5813,11 @@ Bitte Bluetooth auf dem OSTC Sport starten und die gleichen Einstellungen wie f�
         <translation>Tauchgänge</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1307"/>
+        <source>Default dive log file</source>
+        <translation>Standard-Tauchprotokolldatei</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1308"/>
         <source>No default file</source>
         <translation>Keine Standarddatei</translation>
@@ -5728,6 +5848,21 @@ Bitte Bluetooth auf dem OSTC Sport starten und die gleichen Einstellungen wie f�
         <translation>...</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1314"/>
+        <source>Display invalid</source>
+        <translation>Ungültige anzeigen</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1316"/>
+        <source>Default cylinder</source>
+        <translation>Standardflasche</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1317"/>
+        <source>Use default cylinder</source>
+        <translation>Standardflasche verwenden</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1318"/>
         <source>Animations</source>
         <translation>Animationen</translation>
@@ -5758,40 +5893,24 @@ Bitte Bluetooth auf dem OSTC Sport starten und die gleichen Einstellungen wie f�
         <translation>System</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1401"/>
-        <source>Dive site geo lookup</source>
-        <translation>Standortbestimmung </translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1402"/>
-        <source>Enable geocoding for dive site management</source>
-        <translation>Geokodierung für Tauchplatzverwaltung aktivieren</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1403"/>
-        <source>Parse site without GPS data</source>
-        <translation>Platz ohne GPS-Daten lesen</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1404"/>
-        <source>Same format for existing dives</source>
-        <translation>Gleiches Format für vorhandene Tauchgänge</translation>
+        <location filename="../build/ui_preferences.h" line="1324"/>
+        <source>&amp;Metric</source>
+        <translation>&amp;Metrisch</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1405"/>
-        <source>Dive Site Layout</source>
-        <translation>Tauchplatzangangaben</translation>
+        <location filename="../build/ui_preferences.h" line="1325"/>
+        <source>Imperial</source>
+        <translation>Zöllig</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1406"/>
-        <location filename="../build/ui_preferences.h" line="1407"/>
-        <source>/</source>
-        <translation>/</translation>
+        <location filename="../build/ui_preferences.h" line="1326"/>
+        <source>Personali&amp;ze</source>
+        <translation>Personali&amp;sieren</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1325"/>
-        <source>Imperial</source>
-        <translation>Zöllig</translation>
+        <location filename="../build/ui_preferences.h" line="1327"/>
+        <source>Individual settings</source>
+        <translation>Individuelle Einstellungen</translation>
     </message>
     <message>
         <location filename="../build/ui_preferences.h" line="1328"/>
@@ -5809,6 +5928,11 @@ Bitte Bluetooth auf dem OSTC Sport starten und die gleichen Einstellungen wie f�
         <translation>Fuß</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1331"/>
+        <source>Pressure</source>
+        <translation>Druck</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1332"/>
         <location filename="../build/ui_preferences.h" line="1366"/>
         <source>bar</source>
@@ -5820,11 +5944,26 @@ Bitte Bluetooth auf dem OSTC Sport starten und die gleichen Einstellungen wie f�
         <translation>psi</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1334"/>
+        <source>Volume</source>
+        <translation>Volumen</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1335"/>
+        <source>&amp;liter</source>
+        <translation>&amp;Liter</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1336"/>
         <source>cu ft</source>
         <translation>cu ft</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1337"/>
+        <source>Temperature</source>
+        <translation>Temperatur</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1338"/>
         <source>celsius</source>
         <translation>Celsius</translation>
@@ -5835,11 +5974,121 @@ Bitte Bluetooth auf dem OSTC Sport starten und die gleichen Einstellungen wie f�
         <translation>Fahrenheit</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1340"/>
+        <source>Weight</source>
+        <translation>Gewicht</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1341"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1342"/>
+        <source>lbs</source>
+        <translation>US-Pfund</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1343"/>
+        <source>Time units</source>
+        <translation>Zeiteinheiten</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1344"/>
+        <source>Ascent/descent speed denominator</source>
+        <translation>Zeiteinheit für Geschwindigkeit bei Aufstieg/Abstieg</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1345"/>
+        <source>Minutes</source>
+        <translation>Minuten</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1346"/>
+        <source>Seconds</source>
+        <translation>Sekunden</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1347"/>
+        <source>GPS coordinates</source>
+        <translation>GPS Koordinaten</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1348"/>
+        <source>Location Display</source>
+        <translation>Ortsanzeige</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1349"/>
+        <source>traditional (dms)</source>
+        <translation>traditionall (Grad Minuten Sekunden)</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1350"/>
+        <source>decimal</source>
+        <translation>Dezimal</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1351"/>
+        <source>Show</source>
+        <translation>Anzeigen</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1352"/>
+        <source>Threshold when showing pO₂</source>
+        <translation>Schwellenwert bei pO₂ Anzeige</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1353"/>
+        <source>Threshold when showing pN₂</source>
+        <translation>Schwellenwert bei pN₂ Anzeige</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1354"/>
+        <source>Threshold when showing pHe</source>
+        <translation>Schwellenwert bei pHe Anzeige</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1355"/>
+        <source>Max pO₂ when showing MOD</source>
+        <translation>max pO₂ bei MOD Anzeige</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1356"/>
+        <source>Draw dive computer reported ceiling red</source>
+        <translation>Auftauchgrenze des Tauchcomputers in rot zeichnen</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1357"/>
+        <source>Show unused cylinders in Equipment tab</source>
+        <translation>Nicht benutzte Flaschen unter Ausrüstung anzeigen</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1358"/>
+        <source>Show average depth</source>
+        <translation>Durchschnittstiefe anzeigen</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1359"/>
+        <source>Misc</source>
+        <translation>Sonstiges</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1360"/>
+        <source>GFLow</source>
+        <translation>GF niedrig</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1361"/>
+        <source>GFHigh</source>
+        <translation>GF hoch</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1362"/>
+        <source>GFLow at max depth</source>
+        <translation>GF niedrig bei maximaler Tiefe anwenden</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1363"/>
         <source>CCR: show setpoints when viewing pO₂</source>
         <translation>CCR: Setpoint anzeigen, wenn der pO₂ dargestellt wird</translation>
@@ -5885,14 +6134,19 @@ Bitte Bluetooth auf dem OSTC Sport starten und die gleichen Einstellungen wie f�
         <translation>Standardeinstellungen</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1374"/>
+        <source>Filter</source>
+        <translation>Filter</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1375"/>
         <source>Proxy</source>
         <translation>Proxy</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1379"/>
-        <source>Proxy type</source>
-        <translation>Proxy-Typ</translation>
+        <location filename="../build/ui_preferences.h" line="1376"/>
+        <source>Port</source>
+        <translation>Port</translation>
     </message>
     <message>
         <location filename="../build/ui_preferences.h" line="1377"/>
@@ -5900,16 +6154,16 @@ Bitte Bluetooth auf dem OSTC Sport starten und die gleichen Einstellungen wie f�
         <translation>Host</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1376"/>
-        <source>Port</source>
-        <translation>Port</translation>
-    </message>
-    <message>
         <location filename="../build/ui_preferences.h" line="1378"/>
         <source>Requires authentication</source>
         <translation>Anmeldung erforderlich</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1379"/>
+        <source>Proxy type</source>
+        <translation>Proxy-Typ</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1380"/>
         <source>Username</source>
         <translation>Benutzername</translation>
@@ -5921,46 +6175,6 @@ Bitte Bluetooth auf dem OSTC Sport starten und die gleichen Einstellungen wie f�
         <translation>Passwort</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1400"/>
-        <source>Disconnect from Facebook</source>
-        <translation>Verbindung zu Facebook trennen</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1374"/>
-        <source>Filter</source>
-        <translation>Filter</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1331"/>
-        <source>Pressure</source>
-        <translation>Druck</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1303"/>
-        <source>Lists and tables</source>
-        <translation>Listen und Tabellen</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1307"/>
-        <source>Default dive log file</source>
-        <translation>Standard-Tauchprotokolldatei</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1314"/>
-        <source>Display invalid</source>
-        <translation>Ungültige anzeigen</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1316"/>
-        <source>Default cylinder</source>
-        <translation>Standardflasche</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1317"/>
-        <source>Use default cylinder</source>
-        <translation>Standardflasche verwenden</translation>
-    </message>
-    <message>
         <location filename="../build/ui_preferences.h" line="1382"/>
         <source>Subsurface cloud storage</source>
         <translation>Subsurface-Cloudspeicher</translation>
@@ -6001,149 +6215,40 @@ Bitte Bluetooth auf dem OSTC Sport starten und die gleichen Einstellungen wie f�
         <translation>Benutzerkennung lokal speichern?</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1334"/>
-        <source>Volume</source>
-        <translation>Volumen</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1337"/>
-        <source>Temperature</source>
-        <translation>Temperatur</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1340"/>
-        <source>Weight</source>
-        <translation>Gewicht</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1342"/>
-        <source>lbs</source>
-        <translation>US-Pfund</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1343"/>
-        <source>Time units</source>
-        <translation>Zeiteinheiten</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1345"/>
-        <source>Minutes</source>
-        <translation>Minuten</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1346"/>
-        <source>Seconds</source>
-        <translation>Sekunden</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1351"/>
-        <source>Show</source>
-        <translation>Anzeigen</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1362"/>
-        <source>GFLow at max depth</source>
-        <translation>GF niedrig bei maximaler Tiefe anwenden</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1359"/>
-        <source>Misc</source>
-        <translation>Sonstiges</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1283"/>
-        <source>Preferences</source>
-        <translation>Einstellungen</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1324"/>
-        <source>&amp;Metric</source>
-        <translation>&amp;Metrisch</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1326"/>
-        <source>Personali&amp;ze</source>
-        <translation>Personali&amp;sieren</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1327"/>
-        <source>Individual settings</source>
-        <translation>Individuelle Einstellungen</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1335"/>
-        <source>&amp;liter</source>
-        <translation>&amp;Liter</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1344"/>
-        <source>Ascent/descent speed denominator</source>
-        <translation>Zeiteinheit für Geschwindigkeit bei Aufstieg/Abstieg</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1347"/>
-        <source>GPS coordinates</source>
-        <translation>GPS Koordinaten</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1348"/>
-        <source>Location Display</source>
-        <translation>Ortsanzeige</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1349"/>
-        <source>traditional (dms)</source>
-        <translation>traditionall (Grad Minuten Sekunden)</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1350"/>
-        <source>decimal</source>
-        <translation>Dezimal</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1352"/>
-        <source>Threshold when showing pO₂</source>
-        <translation>Schwellenwert bei pO₂ Anzeige</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1353"/>
-        <source>Threshold when showing pN₂</source>
-        <translation>Schwellenwert bei pN₂ Anzeige</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1354"/>
-        <source>Threshold when showing pHe</source>
-        <translation>Schwellenwert bei pHe Anzeige</translation>
+        <location filename="../build/ui_preferences.h" line="1400"/>
+        <source>Disconnect from Facebook</source>
+        <translation>Verbindung zu Facebook trennen</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1355"/>
-        <source>Max pO₂ when showing MOD</source>
-        <translation>max pO₂ bei MOD Anzeige</translation>
+        <location filename="../build/ui_preferences.h" line="1401"/>
+        <source>Dive site geo lookup</source>
+        <translation>Standortbestimmung </translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1356"/>
-        <source>Draw dive computer reported ceiling red</source>
-        <translation>Auftauchgrenze des Tauchcomputers in rot zeichnen</translation>
+        <location filename="../build/ui_preferences.h" line="1402"/>
+        <source>Enable geocoding for dive site management</source>
+        <translation>Geokodierung für Tauchplatzverwaltung aktivieren</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1357"/>
-        <source>Show unused cylinders in Equipment tab</source>
-        <translation>Nicht benutzte Flaschen unter Ausrüstung anzeigen</translation>
+        <location filename="../build/ui_preferences.h" line="1403"/>
+        <source>Parse site without GPS data</source>
+        <translation>Platz ohne GPS-Daten lesen</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1358"/>
-        <source>Show average depth</source>
-        <translation>Durchschnittstiefe anzeigen</translation>
+        <location filename="../build/ui_preferences.h" line="1404"/>
+        <source>Same format for existing dives</source>
+        <translation>Gleiches Format für vorhandene Tauchgänge</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1360"/>
-        <source>GFLow</source>
-        <translation>GF niedrig</translation>
+        <location filename="../build/ui_preferences.h" line="1405"/>
+        <source>Dive Site Layout</source>
+        <translation>Tauchplatzangangaben</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1361"/>
-        <source>GFHigh</source>
-        <translation>GF hoch</translation>
+        <location filename="../build/ui_preferences.h" line="1406"/>
+        <location filename="../build/ui_preferences.h" line="1407"/>
+        <source>/</source>
+        <translation>/</translation>
     </message>
 </context>
 <context>
@@ -6199,106 +6304,136 @@ Bitte Bluetooth auf dem OSTC Sport starten und die gleichen Einstellungen wie f�
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="20"/>
-        <source>Show</source>
-        <translation>Anzeigen</translation>
+        <source>Gas pressure display setup</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="29"/>
-        <source>Threshold when showing pO₂</source>
-        <translation>Schwellenwert bei pO₂ Anzeige</translation>
+        <source>Threshold for pO₂ (bar)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="49"/>
-        <source>Threshold when showing pN₂</source>
-        <translation>Schwellenwert bei pN₂ Anzeige</translation>
+        <source>Threshold for pN₂ (bar)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="69"/>
-        <source>Threshold when showing pHe</source>
-        <translation>Schwellenwert bei pHe Anzeige</translation>
+        <source>Threshold for pHe (bar)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="89"/>
-        <source>Max pO₂ when showing MOD</source>
-        <translation>max pO₂ bei MOD Anzeige</translation>
+        <source>pO₂ in calculating MOD (bar)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="106"/>
+        <source>CCR options:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="113"/>
+        <source>Dive planner default setpoint (bar)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="133"/>
+        <source>Show setpoints when viewing pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="140"/>
+        <source>Show individual O₂ sensor values when viewing pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="150"/>
+        <source>Ceiling display setup</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="109"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="159"/>
         <source>Draw dive computer reported ceiling red</source>
         <translation>Auftauchgrenze des Tauchcomputers in rot zeichnen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="116"/>
-        <source>Show unused cylinders in Equipment tab</source>
-        <translation>Nicht benutzte Flaschen unter Ausrüstung anzeigen</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="169"/>
+        <source>Algorithm for calculated ceiling:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="123"/>
-        <source>Show mean depth</source>
-        <translation>Zeige mittlere Tiefe</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="176"/>
+        <source>VPM-B</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="133"/>
-        <source>Misc</source>
-        <translation>Sonstiges</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="183"/>
+        <source>VPM-B Conservatism</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="149"/>
-        <source>bar</source>
-        <translation>bar</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="193"/>
+        <source>+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="165"/>
-        <source>Default CCR set-point for dive planning</source>
-        <translation>Voreinstellung CCR-Setpoint für die Tauchgangsplanung</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="206"/>
+        <source>Bühlmann</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="172"/>
-        <source>pSCR O₂ metabolism rate</source>
-        <translation>pSCR O₂-Verbrauch</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="216"/>
+        <source>GFHigh</source>
+        <translation>GF hoch</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="179"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="236"/>
         <source>GFLow</source>
         <translation>GF niedrig</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="186"/>
-        <source>GFHigh</source>
-        <translation>GF hoch</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="256"/>
+        <source>GFLow at max depth</source>
+        <translation>GF niedrig bei maximaler Tiefe anwenden</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="203"/>
-        <source>ℓ/min</source>
-        <translation>ℓ/min</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="263"/>
+        <source>pSCR options:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="213"/>
-        <source>pSCR ratio</source>
-        <translation>pSCR Auswurfverhältnis</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="270"/>
+        <source>Metabolic rate (ℓ O₂/min)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="223"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="287"/>
+        <source>Dilution ratio</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="300"/>
         <source>1:</source>
         <translation>1:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="230"/>
-        <source>CCR: show individual O₂ sensor values when viewing pO₂</source>
-        <translation>CCR: EInzelne O₂-Sensorwerte anzeigen, wenn pO₂ dargestellt wird</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="310"/>
+        <source>Misc</source>
+        <translation>Sonstiges</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="237"/>
-        <source>CCR: show setpoints when viewing pO₂</source>
-        <translation>CCR: Setpoint anzeigen, wenn der pO₂ dargestellt wird</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="316"/>
+        <source>Show unused cylinders in Equipment tab</source>
+        <translation>Nicht benutzte Flaschen unter Ausrüstung anzeigen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="244"/>
-        <source>GFLow at max depth</source>
-        <translation>GF niedrig bei maximaler Tiefe anwenden</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="323"/>
+        <source>Show mean depth in Profile</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="10"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="9"/>
         <source>Graph</source>
         <translation>Diagramm</translation>
     </message>
@@ -6367,15 +6502,29 @@ Bitte Bluetooth auf dem OSTC Sport starten und die gleichen Einstellungen wie f�
         <translation>Sprache</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="57"/>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="53"/>
         <source>Restart required</source>
         <translation>Bitte Programm neu starten</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="58"/>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="54"/>
         <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="../desktop-widgets/preferences/preferences_language.cpp" line="76"/>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="82"/>
+        <source>Literal characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="77"/>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="83"/>
+        <source>Non-special character(s) in time format.
+These will be used as is. This might not be what you intended.
+See http://doc.qt.io/qt-5/qdatetime.html#toString</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PreferencesNetwork</name>
@@ -6422,7 +6571,7 @@ Bitte Bluetooth auf dem OSTC Sport starten und die gleichen Einstellungen wie f�
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_network.ui" line="156"/>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="148"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="134"/>
         <source>Subsurface cloud storage</source>
         <translation>Subsurface-Cloudspeicher</translation>
     </message>
@@ -6467,39 +6616,39 @@ Bitte Bluetooth auf dem OSTC Sport starten und die gleichen Einstellungen wie f�
         <translation>Benutzerkennung lokal speichern?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="11"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="10"/>
         <source>Network</source>
         <translation>Netzwerk</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="15"/>
         <source>No proxy</source>
         <translation>Kein Proxy</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/>
         <source>System proxy</source>
         <translation>Systemproxy</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/>
         <source>HTTP proxy</source>
         <translation>HTTP Proxy</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="19"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/>
         <source>SOCKS proxy</source>
         <translation>SOCKS Proxy</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="75"/>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="97"/>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="110"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="72"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="93"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="106"/>
         <source>Cloud storage email and password can only consist of letters, numbers, and &apos;.&apos;, &apos;-&apos;, &apos;_&apos;, and &apos;+&apos;.</source>
         <translation>E-Mail-Adresse und Passwort für den Cloudspeicher können nur aus Buchstaben, Zahlen und &apos;.&apos;, &apos;-&apos;, &apos;_&apos;, sowie &apos;+&apos; bestehen.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="146"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="132"/>
         <source>Subsurface cloud storage (credentials verified)</source>
         <translation>Subsurface-Cloudspeicher (Anmeldedaten bestätigt)</translation>
     </message>
@@ -6657,7 +6806,7 @@ Bitte Bluetooth auf dem OSTC Sport starten und die gleichen Einstellungen wie f�
         <translation>Dezimal</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="8"/>
+        <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="7"/>
         <source>Units</source>
         <translation>Einheiten</translation>
     </message>
@@ -6665,17 +6814,17 @@ Bitte Bluetooth auf dem OSTC Sport starten und die gleichen Einstellungen wie f�
 <context>
     <name>PrintDialog</name>
     <message>
-        <location filename="../desktop-widgets/printdialog.cpp" line="118"/>
-        <source>&amp;Preview</source>
-        <translation>Vorschau</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/printdialog.cpp" line="115"/>
+        <location filename="../desktop-widgets/printdialog.cpp" line="102"/>
         <source>P&amp;rint</source>
         <translation>Drucken</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/printdialog.cpp" line="130"/>
+        <location filename="../desktop-widgets/printdialog.cpp" line="105"/>
+        <source>&amp;Preview</source>
+        <translation>Vorschau</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/printdialog.cpp" line="117"/>
         <source>Print</source>
         <translation>Drucken</translation>
     </message>
@@ -6683,19 +6832,10 @@ Bitte Bluetooth auf dem OSTC Sport starten und die gleichen Einstellungen wie f�
 <context>
     <name>PrintOptions</name>
     <message>
-        <location filename="../build/ui_printoptions.h" line="150"/>
-        <source>&amp;Table print</source>
-        <translation>&amp;Tabellendruck</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_printoptions.h" line="158"/>
-        <source>One dive per page</source>
-        <translation>Ein Tauchgang pro Seite</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_printoptions.h" line="159"/>
-        <source>Two dives per page</source>
-        <translation>Zwei Tauchgänge pro Seite</translation>
+        <location filename="../desktop-widgets/printoptions.ui" line="29"/>
+        <location filename="../build/ui_printoptions.h" line="148"/>
+        <source>Print type</source>
+        <translation>Art des Ausdrucks</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/printoptions.ui" line="41"/>
@@ -6755,10 +6895,19 @@ Bitte Bluetooth auf dem OSTC Sport starten und die gleichen Einstellungen wie f�
         <translation>Importieren</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/printoptions.ui" line="29"/>
-        <location filename="../build/ui_printoptions.h" line="148"/>
-        <source>Print type</source>
-        <translation>Art des Ausdrucks</translation>
+        <location filename="../build/ui_printoptions.h" line="150"/>
+        <source>&amp;Table print</source>
+        <translation>&amp;Tabellendruck</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_printoptions.h" line="158"/>
+        <source>One dive per page</source>
+        <translation>Ein Tauchgang pro Seite</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_printoptions.h" line="159"/>
+        <source>Two dives per page</source>
+        <translation>Zwei Tauchgänge pro Seite</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/printoptions.cpp" line="128"/>
@@ -6800,103 +6949,103 @@ Bitte Bluetooth auf dem OSTC Sport starten und die gleichen Einstellungen wie f�
         <translation>Unbekannter Tauchcomputer</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="755"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="752"/>
         <source>Show NDL / TTS was disabled because of excessive processing time</source>
         <translation>Null-/Auftauchzeitberechnung wegen Zeitüberschreitung abgebrochen</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1344"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1338"/>
         <source>Make first divecomputer</source>
         <translation>Primärer Tauchcomputer</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1346"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1340"/>
         <source>Delete this divecomputer</source>
         <translation>Lösche diesen Tauchcomputer</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1360"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1354"/>
         <source>Add gas change</source>
         <translation>Gaswechsel setzen</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1363"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1357"/>
         <source> (Tank %1)</source>
         <translation> (Tank %1)</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1371"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1365"/>
         <source>Add set-point change</source>
         <translation>Einstellwertwechsel hinzufügen</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1373"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1367"/>
         <source>Add bookmark</source>
         <translation>Markierung setzen</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1377"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1371"/>
         <source>Edit the profile</source>
         <translation>Profil bearbeiten</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1381"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1375"/>
         <source>Remove event</source>
         <translation>Entferne Ereignis</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1386"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1380"/>
         <source>Hide similar events</source>
         <translation>Ähnliche Ereignisse ausblenden</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1393"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1387"/>
         <source>Edit name</source>
         <translation>Name bearbeiten</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1422"/>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1429"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1416"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1423"/>
         <source>Adjust pressure of tank %1 (currently interpolated as %2)</source>
         <translation>Druck in Flasche %1 (momentan zu %2 interpoliert)</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1444"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1438"/>
         <source>Unhide all events</source>
         <translation>Alle Ereignisse einblenden</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1479"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1473"/>
         <source>Hide events</source>
         <translation>Ereignisse ausblenden</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1479"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1473"/>
         <source>Hide all %1 events?</source>
         <translation>Alle %1 Ereignisse ausblenden?</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1514"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1508"/>
         <source>Remove the selected event?</source>
         <translation>Ausgewähltes Ereignis entfernen?</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1515"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1509"/>
         <source>%1 @ %2:%3</source>
         <translation>%1 @ %2:%3</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1638"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1632"/>
         <source>Edit name of bookmark</source>
         <translation>Name der Markierung bearbeiten</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1639"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1633"/>
         <source>Custom name:</source>
         <translation>Benutzerdefinierter Name:</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1644"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1638"/>
         <source>Name is too long!</source>
         <translation>Der Name ist zu lang!</translation>
     </message>
@@ -6904,91 +7053,101 @@ Bitte Bluetooth auf dem OSTC Sport starten und die gleichen Einstellungen wie f�
 <context>
     <name>QMLManager</name>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="95"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="97"/>
         <source>Starting...</source>
         <translation>Starten...</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="202"/>
         <source>working in no-cloud mode</source>
         <translation>ohne Cloud-Anbindung</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="213"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="216"/>
         <source>no cloud credentials</source>
         <translation>Keine Cloud-Benutzerdaten</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="214"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="270"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="217"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="269"/>
         <source>Please enter valid cloud credentials.</source>
         <translation>Bitte gültige Cloud-Benutzerdaten eingeben.</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="285"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="284"/>
         <source>Attempting to open cloud storage with new credentials</source>
         <translation>Versuche Cloud mit neuen Benutzerdaten zu öffnen</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="304"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="306"/>
         <source>Testing cloud credentials</source>
         <translation>Überprüfe Could-Benutzerdaten</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="331"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="320"/>
+        <source>No response from cloud server to validate the credentials</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="329"/>
+        <source>Cannot connect to cloud storage - cloud account not verified</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="361"/>
         <source>Cloud credentials are invalid</source>
         <translation>Cloud-Benutzerdaten ungültig</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="344"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="374"/>
         <source>Cannot open cloud storage: Error creating https connection</source>
         <translation>Kann den Cloud-Speicher nicht öffnen: Fehler beim Erstellen der https-Verbindung</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="357"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="387"/>
         <source>Cannot open cloud storage: %1</source>
         <translation>Kann den Cloud-Speicher nicht öffnen: %1</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="369"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="399"/>
         <source>Cannot connect to cloud storage</source>
         <translation>Kann nicht zum Cloud-Speicher verbinden</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="411"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="441"/>
         <source>Cloud storage error: %1</source>
         <translation>Cloud-Speicher-Fehler: %1</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="501"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="531"/>
         <source>Failed to connect to cloud server, reverting to no cloud status</source>
         <translation>Verbindung zum Cloud-Server fehlgeschlagen, Fortsetzung ohne Cloud-Verbindung</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="520"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="550"/>
         <source>Cloud storage open successfully. No dives in dive list.</source>
         <translation>Cloudspeicher erfolgreich geöffnet. Keine Tauchgänge in der Tauchgangsliste.</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="689"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="690"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="721"/>
         <source>h</source>
         <translation>h</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="689"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="690"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="691"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="721"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="722"/>
         <source>min</source>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="689"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/>
         <source>sec</source>
         <translation>sec</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="1041"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="1102"/>
         <source>Unknown GPS location</source>
         <translation>Unbekannte GPS-Position</translation>
     </message>
@@ -6996,126 +7155,126 @@ Bitte Bluetooth auf dem OSTC Sport starten und die gleichen Einstellungen wie f�
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../core/qthelper.cpp" line="866"/>
-        <location filename="../core/qthelper.cpp" line="1214"/>
-        <source>AIR</source>
-        <translation>Luft</translation>
+        <location filename="../core/gpslocation.h" line="13"/>
+        <source>Waiting to aquire GPS location</source>
+        <translation>Erwarte GPS-Position</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="1214"/>
-        <source>OXYGEN</source>
-        <translation>SAUERSTOFF</translation>
+        <location filename="../core/qthelper.cpp" line="766"/>
+        <location filename="../core/qthelper.cpp" line="1275"/>
+        <source>m</source>
+        <translation>m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="59"/>
-        <source>Remove this point</source>
-        <translation>Diesen Punkt entfernen</translation>
+        <location filename="../core/qthelper.cpp" line="768"/>
+        <location filename="../core/qthelper.cpp" line="1274"/>
+        <source>ft</source>
+        <translation>ft</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="32"/>
-        <source>Average</source>
-        <translation>Ø</translation>
+        <location filename="../core/qthelper.cpp" line="794"/>
+        <source>C</source>
+        <translation>C</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="35"/>
-        <source>Minimum</source>
-        <translation>Min.</translation>
+        <location filename="../core/qthelper.cpp" line="796"/>
+        <source>F</source>
+        <translation>F</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="38"/>
-        <source>Maximum</source>
-        <translation>Max.</translation>
+        <location filename="../core/qthelper.cpp" line="821"/>
+        <location filename="../core/qthelper.cpp" line="1250"/>
+        <source>kg</source>
+        <translation>kg</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/globe.cpp" line="327"/>
-        <source>Move the map and double-click to set the dive location</source>
-        <translation>Karte verschieben und mit Doppelklick Tauchplatz markieren</translation>
+        <location filename="../core/qthelper.cpp" line="823"/>
+        <location filename="../core/qthelper.cpp" line="1251"/>
+        <source>lbs</source>
+        <translation>US Pfund</translation>
     </message>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="28"/>
-        <source>unknown</source>
-        <translation>unbekannt</translation>
+        <location filename="../core/qthelper.cpp" line="848"/>
+        <location filename="../core/qthelper.cpp" line="1300"/>
+        <source>bar</source>
+        <translation>bar</translation>
     </message>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="105"/>
-        <source>h:</source>
-        <translation>h:</translation>
+        <location filename="../core/qthelper.cpp" line="850"/>
+        <location filename="../core/qthelper.cpp" line="1299"/>
+        <source>psi</source>
+        <translation>psi</translation>
     </message>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="105"/>
-        <source>min</source>
-        <translation>min</translation>
+        <location filename="../core/qthelper.cpp" line="871"/>
+        <location filename="../core/qthelper.cpp" line="1235"/>
+        <source>AIR</source>
+        <translation>Luft</translation>
     </message>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="337"/>
-        <source>Multiple</source>
-        <translation>diverse</translation>
+        <location filename="../core/qthelper.cpp" line="873"/>
+        <source>EAN</source>
+        <translation>EAN</translation>
     </message>
     <message numerus="yes">
-        <location filename="../core/qthelper.cpp" line="957"/>
+        <location filename="../core/qthelper.cpp" line="962"/>
         <source>(%n dive(s))</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="816"/>
-        <location filename="../core/qthelper.cpp" line="1228"/>
-        <source>kg</source>
-        <translation>kg</translation>
+        <location filename="../core/qthelper.cpp" line="1235"/>
+        <source>OXYGEN</source>
+        <translation>SAUERSTOFF</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="818"/>
-        <location filename="../core/qthelper.cpp" line="1229"/>
-        <source>lbs</source>
-        <translation>US Pfund</translation>
+        <location filename="../core/qthelper.cpp" line="1322"/>
+        <source>l</source>
+        <translation>l</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="763"/>
-        <location filename="../core/qthelper.cpp" line="1252"/>
-        <source>ft</source>
-        <translation>ft</translation>
+        <location filename="../core/qthelper.cpp" line="1323"/>
+        <source>cuft</source>
+        <translation>cft</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="761"/>
-        <location filename="../core/qthelper.cpp" line="1253"/>
-        <source>m</source>
-        <translation>m</translation>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="29"/>
+        <source>unknown</source>
+        <translation>unbekannt</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="789"/>
-        <source>C</source>
-        <translation>C</translation>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="114"/>
+        <source>h:</source>
+        <translation>h:</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="791"/>
-        <source>F</source>
-        <translation>F</translation>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="114"/>
+        <source>min</source>
+        <translation>min</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="845"/>
-        <location filename="../core/qthelper.cpp" line="1275"/>
-        <source>psi</source>
-        <translation>psi</translation>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="63"/>
+        <source>Remove this point</source>
+        <translation>Diesen Punkt entfernen</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="843"/>
-        <location filename="../core/qthelper.cpp" line="1276"/>
-        <source>bar</source>
-        <translation>bar</translation>
+        <location filename="../desktop-widgets/globe.cpp" line="327"/>
+        <source>Move the map and double-click to set the dive location</source>
+        <translation>Karte verschieben und mit Doppelklick Tauchplatz markieren</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="868"/>
-        <source>EAN</source>
-        <translation>EAN</translation>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="32"/>
+        <source>Average</source>
+        <translation>Ø</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="1298"/>
-        <source>l</source>
-        <translation>l</translation>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="35"/>
+        <source>Minimum</source>
+        <translation>Min.</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="1299"/>
-        <source>cuft</source>
-        <translation>cft</translation>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="38"/>
+        <source>Maximum</source>
+        <translation>Max.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="625"/>
@@ -7137,17 +7296,12 @@ Bitte Bluetooth auf dem OSTC Sport starten und die gleichen Einstellungen wie f�
         <source>Malformed XML response. Line %1: %2</source>
         <translation>Ungültige XML Antwort. Zeile %1: %2</translation>
     </message>
-    <message>
-        <location filename="../core/gpslocation.h" line="13"/>
-        <source>Waiting to aquire GPS location</source>
-        <translation>Erwarte GPS-Position</translation>
-    </message>
 </context>
 <context>
     <name>ReadSettingsThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1651"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1676"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1640"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1665"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Diese Funktion ist für den ausgewählten Tauchcomputer noch nicht verfügbar.</translation>
     </message>
@@ -7176,7 +7330,7 @@ Bitte Bluetooth auf dem OSTC Sport starten und die gleichen Einstellungen wie f�
 <context>
     <name>ResetSettingsThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1775"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1764"/>
         <source>Reset settings failed!</source>
         <translation>Zurücksetzen der Einstellungen ist fehlgeschlagen!</translation>
     </message>
@@ -7214,6 +7368,12 @@ Bitte Bluetooth auf dem OSTC Sport starten und die gleichen Einstellungen wie f�
 <context>
     <name>ShiftImageTimesDialog</name>
     <message>
+        <location filename="../desktop-widgets/shiftimagetimes.ui" line="23"/>
+        <location filename="../build/ui_shiftimagetimes.h" line="184"/>
+        <source>Shift selected image times</source>
+        <translation>Ausgewählte Bildzeiten verschieben</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/shiftimagetimes.ui" line="34"/>
         <location filename="../build/ui_shiftimagetimes.h" line="185"/>
         <source>Shift times of image(s) by</source>
@@ -7226,12 +7386,6 @@ Bitte Bluetooth auf dem OSTC Sport starten und die gleichen Einstellungen wie f�
         <translation>h:mm</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/shiftimagetimes.ui" line="23"/>
-        <location filename="../build/ui_shiftimagetimes.h" line="184"/>
-        <source>Shift selected image times</source>
-        <translation>Ausgewählte Bildzeiten verschieben</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/shiftimagetimes.ui" line="105"/>
         <location filename="../build/ui_shiftimagetimes.h" line="187"/>
         <source>Earlier</source>
@@ -7282,12 +7436,12 @@ Nicht alle Bilder haben Zeitstempel zwischen 30min vor und 30min nach einem der
         <translation>Welche/s Datum/Zeit werden im Bild angezeigt?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="297"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="296"/>
         <source>Open image file</source>
         <translation>Öffne Bilddatei</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="299"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="298"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>Bilddateien (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -7445,54 +7599,54 @@ Nicht alle Bilder haben Zeitstempel zwischen 30min vor und 30min nach einem der
 <context>
     <name>SocialNetworkDialog</name>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="339"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="284"/>
         <source>Dive date: %1 
 </source>
         <translation>Tauchdatum: %1 
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="342"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="287"/>
         <source>Duration: %1 
 </source>
         <translation>Dauer: %1 
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="343"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="288"/>
         <source>h:</source>
         <comment>abbreviation for hours plus separator</comment>
         <translation>h:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="344"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="289"/>
         <source>min</source>
         <comment>abbreviation for minutes</comment>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="347"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="292"/>
         <source>Dive location: %1 
 </source>
         <translation>Tauchplatz: %1 
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="350"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="295"/>
         <source>Buddy: %1 
 </source>
         <translation>Partner: %1 
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="353"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="298"/>
         <source>Divemaster: %1 
 </source>
         <translation>Tauchgruppenleiter: %1 
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="356"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="301"/>
         <source>
 %1</source>
         <translation>
@@ -7578,12 +7732,21 @@ Nicht alle Bilder haben Zeitstempel zwischen 30min vor und 30min nach einem der
     <name>StartPage</name>
     <message>
         <location filename="../mobile-widgets/qml/StartPage.qml" line="19"/>
-        <source>To use Subsurface-mobile with Subsurface cloud storage, please enteryour cloud credentials.
-
-To use Subsurface-mobile only with local data on this device, tap on the no cloud icon below.</source>
-        <translation>Um Subsurface mit dem Subsurface Cloudspeicher zu benutzen, bitte E-Mail und Passwort eingeben
+        <source>To use Subsurface-mobile with Subsurface cloud storage, please enter your cloud credentials.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/StartPage.qml" line="20"/>
+        <source>If this is the first time you use Subsurface cloud storage, enter a valid email (all lower case) and a password of your choice (letters and numbers). The server will send a PIN to the email address provided that you will have to enter here.
 
-Um Subsurface offline zu benutzen (mit allen Tauchgangdaten nur auf diesem Gerät), bitte auf den &apos;No-Cloud&apos; Knopf tippen.</translation>
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/StartPage.qml" line="23"/>
+        <source>To use Subsurface-mobile only with local data on this device, tap on the no cloud icon below.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -7621,7 +7784,12 @@ Um Subsurface offline zu benutzen (mit allen Tauchgangdaten nur auf diesem Gerä
 <context>
     <name>SubsurfaceWebServices</name>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="419"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="395"/>
+        <source>Enter User ID and click Download</source>
+        <translation>Benutzerkennung eingeben und Herunterladen klicken</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="417"/>
         <source>Webservice</source>
         <translation>Webdienst</translation>
     </message>
@@ -7646,30 +7814,25 @@ Um Subsurface offline zu benutzen (mit allen Tauchgangdaten nur auf diesem Gerä
         <translation>Verbindungsfehler: </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="557"/>
-        <source>Download successful</source>
-        <translation>Erfolgreich geladen!</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="551"/>
         <source>Invalid user identifier!</source>
         <translation>Ungültige Benutzerkennung</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="397"/>
-        <source>Enter User ID and click Download</source>
-        <translation>Benutzerkennung eingeben und Herunterladen klicken</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="554"/>
         <source>Cannot parse response!</source>
         <translation>Verstehe die Antwort nicht!</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="557"/>
+        <source>Download successful</source>
+        <translation>Erfolgreich geladen!</translation>
+    </message>
 </context>
 <context>
     <name>SuitFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="674"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="672"/>
         <source>Suits: </source>
         <translation>Anzug:</translation>
     </message>
@@ -7677,7 +7840,7 @@ Um Subsurface offline zu benutzen (mit allen Tauchgangdaten nur auf diesem Gerä
 <context>
     <name>SuitsFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="123"/>
+        <location filename="../qt-models/filtermodels.cpp" line="128"/>
         <source>No suit set</source>
         <translation>Kein Anzug eingetragen</translation>
     </message>
@@ -7696,7 +7859,7 @@ Um Subsurface offline zu benutzen (mit allen Tauchgangdaten nur auf diesem Gerä
 <context>
     <name>TagFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="595"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="593"/>
         <source>Tags: </source>
         <translation>Stichwörter: </translation>
     </message>
@@ -7704,7 +7867,7 @@ Um Subsurface offline zu benutzen (mit allen Tauchgangdaten nur auf diesem Gerä
 <context>
     <name>TagFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="148"/>
+        <location filename="../qt-models/filtermodels.cpp" line="153"/>
         <source>Empty tags</source>
         <translation>Leere Tags</translation>
     </message>
@@ -7730,6 +7893,11 @@ Um Subsurface offline zu benutzen (mit allen Tauchgangdaten nur auf diesem Gerä
 <context>
     <name>TemplateEdit</name>
     <message>
+        <location filename="../desktop-widgets/templateedit.ui" line="14"/>
+        <source>Edit template</source>
+        <translation>Vorlage bearbeiten</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/templateedit.ui" line="37"/>
         <source>Preview</source>
         <translation>Vorschau</translation>
@@ -7775,11 +7943,6 @@ Um Subsurface offline zu benutzen (mit allen Tauchgangdaten nur auf diesem Gerä
         <translation>Schriftgröße</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/templateedit.ui" line="14"/>
-        <source>Edit template</source>
-        <translation>Vorlage bearbeiten</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/templateedit.ui" line="165"/>
         <source>Color palette</source>
         <translation>Farbpalette</translation>
@@ -7961,7 +8124,7 @@ Um Subsurface offline zu benutzen (mit allen Tauchgangdaten nur auf diesem Gerä
 <context>
     <name>TextHyperlinkEventFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="817"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="815"/>
         <source>%1click to visit %2</source>
         <translation>%1 klicken, um zu %2 gehen</translation>
     </message>
@@ -7977,102 +8140,107 @@ Um Subsurface offline zu benutzen (mit allen Tauchgangdaten nur auf diesem Gerä
 <context>
     <name>TripItem</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="67"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="68"/>
         <source>(%1 shown)</source>
         <translation>(%1 angezeigt)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="194"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
         <source>#</source>
         <translation>Nr.</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="197"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="215"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="200"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="218"/>
         <source>Rating</source>
         <translation>Bewertung</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
         <source>Depth(%1)</source>
         <translation>Tiefe(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="206"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="224"/>
         <source>Duration</source>
         <translation>Dauer</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="209"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="227"/>
         <source>Temp(%1%2)</source>
         <translation>Temp(%1%2)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
         <source>Weight(%1)</source>
         <translation>Gewicht(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
         <source>lbs</source>
         <translation>US-Pfund</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="215"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="233"/>
         <source>Suit</source>
         <translation>Anzug</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="218"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="236"/>
         <source>Cyl</source>
         <translation>Flasche</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="239"/>
         <source>Gas</source>
         <translation>Gas</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="244"/>
         <source>SAC(%1)</source>
         <translation>AMV(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="244"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="229"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="247"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="232"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="250"/>
         <source>Max CNS</source>
         <translation>Max. CNS</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="235"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="253"/>
+        <source>Photos before/during/after dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="256"/>
         <source>Location</source>
         <translation>Ort</translation>
     </message>
@@ -8095,72 +8263,73 @@ Um Subsurface offline zu benutzen (mit allen Tauchgangdaten nur auf diesem Gerä
 <context>
     <name>UpdateManager</name>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="69"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="61"/>
         <source>Check for updates.</source>
         <translation>Neue Version suchen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="70"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="62"/>
         <source>Subsurface was unable to check for updates.</source>
         <translation>Subsurface konnte nicht nach neuen Versionen suchen.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="75"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="67"/>
         <source>The following error occurred:</source>
         <translation>Fehlermeldung erhalten:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="76"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="68"/>
         <source>Please check your internet connection.</source>
         <translation>Bitte Überprüfen Sie Ihre Internetverbindung.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="86"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="78"/>
         <source>You are using the latest version of Subsurface.</source>
         <translation>Dies ist die neuste Subsurfaceversion.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="89"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="81"/>
         <source>A new version of Subsurface is available.&lt;br/&gt;Click on:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; to download it.</source>
         <translation>Es gibt eine neue Subsurface-Version.&lt;br/&gt;Klick hier:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; zum Download.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="95"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="87"/>
         <source>A new version of Subsurface is available.</source>
         <translation>Es gibt eine neue Version von Subsurface.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="96"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="88"/>
         <source>Latest version is %1, please check %2 our download page %3 for information in how to update.</source>
         <translation>Die aktuellste Version ist %1, bitte auf unserer %2 Programme herunterladen %3 Seite nachlesen, wo diese Version verfügbar ist.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="106"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="98"/>
         <source>Newest release version is </source>
         <translation>Die letzte freigegebene Version ist </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="107"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="99"/>
         <source>The server returned the following information:</source>
         <translation>Der Server hat die folgenden Informationen zurückgegeben:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="125"/>
-        <source>Subsurface is checking every two weeks if a new version is available. If you don&apos;t want Subsurface to continue checking, please click Decline.</source>
-        <translation>Subsurface überprüft alle zwei Wochen, ob eine neue Version zur Verfügung steht. Falls Subsurface dies nicht weiter prüfen soll, bitte &quot;Ablehnen&quot; klicken.</translation>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="117"/>
+        <source>Subsurface is checking every two weeks if a new version is available. 
+ If you don&apos;t want Subsurface to continue checking, please click Decline.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="126"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="119"/>
         <source>Decline</source>
         <translation>Ablehnen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="127"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="120"/>
         <source>Accept</source>
         <translation>Annehmen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="129"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="122"/>
         <source>Automatic check for updates</source>
         <translation>Automatisch nach Aktualisierungen suchen</translation>
     </message>
@@ -8182,24 +8351,6 @@ Um Subsurface offline zu benutzen (mit allen Tauchgangdaten nur auf diesem Gerä
 <context>
     <name>UserSurvey</name>
     <message>
-        <location filename="../desktop-widgets/usersurvey.ui" line="44"/>
-        <location filename="../build/ui_usersurvey.h" line="151"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;We would love to learn more about our users, their preferences and their usage habits. Please spare a minute to fill out this form and submit it to the Subsurface team.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Wir würden gerne mehr über unsere Benutzer, ihre Vorlieben und ihre Art, das Programm zu verwenden, lernen. Bitte gib uns eine Minute, füll das Formular aus und schick es ans Subsurface-Team.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/usersurvey.ui" line="115"/>
-        <location filename="../build/ui_usersurvey.h" line="156"/>
-        <source>Other software/sources</source>
-        <translation>Weitere Software/Quellen</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/usersurvey.ui" line="128"/>
-        <location filename="../build/ui_usersurvey.h" line="157"/>
-        <source>Manually entering dives</source>
-        <translation>Manuelle Tauchgangseingabe</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="14"/>
         <location filename="../build/ui_usersurvey.h" line="149"/>
         <source>User survey</source>
@@ -8212,6 +8363,12 @@ Um Subsurface offline zu benutzen (mit allen Tauchgangdaten nur auf diesem Gerä
         <translation>Subsurface Benutzerumfrage</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/usersurvey.ui" line="44"/>
+        <location filename="../build/ui_usersurvey.h" line="151"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;We would love to learn more about our users, their preferences and their usage habits. Please spare a minute to fill out this form and submit it to the Subsurface team.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Wir würden gerne mehr über unsere Benutzer, ihre Vorlieben und ihre Art, das Programm zu verwenden, lernen. Bitte gib uns eine Minute, füll das Formular aus und schick es ans Subsurface-Team.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="63"/>
         <location filename="../build/ui_usersurvey.h" line="152"/>
         <source>Technical diver</source>
@@ -8236,6 +8393,18 @@ Um Subsurface offline zu benutzen (mit allen Tauchgangdaten nur auf diesem Gerä
         <translation>Unterstützte Tauchcomputer</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/usersurvey.ui" line="115"/>
+        <location filename="../build/ui_usersurvey.h" line="156"/>
+        <source>Other software/sources</source>
+        <translation>Weitere Software/Quellen</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/usersurvey.ui" line="128"/>
+        <location filename="../build/ui_usersurvey.h" line="157"/>
+        <source>Manually entering dives</source>
+        <translation>Manuelle Tauchgangseingabe</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="141"/>
         <location filename="../build/ui_usersurvey.h" line="158"/>
         <source>Android/iPhone companion app</source>
@@ -8266,6 +8435,11 @@ Um Subsurface offline zu benutzen (mit allen Tauchgangdaten nur auf diesem Gerä
         <translation>Von wo importieren Sie Daten?</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/usersurvey.cpp" line="18"/>
+        <source>Send</source>
+        <translation>Senden</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/usersurvey.cpp" line="43"/>
         <source>
 Operating system: %1</source>
@@ -8309,19 +8483,14 @@ Sprache: %1</translation>
         <translation>Später nochmal fragen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/usersurvey.cpp" line="101"/>
-        <source>Submit user survey.</source>
-        <translation>Unfrageergebnis übertragen.</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/usersurvey.cpp" line="82"/>
         <source>Ask again?</source>
         <translation>Fragt noch einmal?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/usersurvey.cpp" line="18"/>
-        <source>Send</source>
-        <translation>Senden</translation>
+        <location filename="../desktop-widgets/usersurvey.cpp" line="101"/>
+        <source>Submit user survey.</source>
+        <translation>Unfrageergebnis übertragen.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/usersurvey.cpp" line="102"/>
@@ -8413,12 +8582,12 @@ Sprache: %1</translation>
         <translation>Hochladen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="324"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="325"/>
         <source>Operation timed out</source>
         <translation>Die Aktion hat zu lange gedauert</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="345"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="346"/>
         <source>Transferring data...</source>
         <translation>Daten werden übertragen...</translation>
     </message>
@@ -8453,18 +8622,18 @@ Sprache: %1</translation>
 <context>
     <name>WriteSettingsThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1702"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1709"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1718"/>
-        <source>Failed!</source>
-        <translation>Fehlgeschlagen!</translation>
-    </message>
-    <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1700"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1721"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1689"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1710"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Diese Funktion ist für den ausgewählten Tauchcomputer noch nicht verfügbar.</translation>
     </message>
+    <message>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1691"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1698"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1707"/>
+        <source>Failed!</source>
+        <translation>Fehlgeschlagen!</translation>
+    </message>
 </context>
 <context>
     <name>YearlyStatisticsModel</name>
@@ -8589,7 +8758,7 @@ Durchschnitt</translation>
 <context>
     <name>getextFromC</name>
     <message>
-        <location filename="../core/libdivecomputer.c" line="674"/>
+        <location filename="../core/libdivecomputer.c" line="737"/>
         <source>Error parsing the header</source>
         <translation>Fehler beim Lesen der Kopfdaten</translation>
     </message>
@@ -8597,38 +8766,377 @@ Durchschnitt</translation>
 <context>
     <name>gettextFromC</name>
     <message>
+        <location filename="../core/cochran.c" line="309"/>
+        <location filename="../core/cochran.c" line="315"/>
+        <location filename="../core/cochran.c" line="385"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>deco stop</source>
+        <translation>Deko-Stopp</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="336"/>
+        <location filename="../core/cochran.c" line="390"/>
+        <location filename="../core/file.c" line="777"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>ascent</source>
+        <translation>Aufstieg</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="342"/>
+        <location filename="../core/file.c" line="755"/>
+        <source>battery</source>
+        <translation>Batterie</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="348"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
+        <source>OLF</source>
+        <translation>OLF</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="353"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
+        <source>maxdepth</source>
+        <translation>Max. Tiefe</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="358"/>
+        <location filename="../core/cochran.c" line="404"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
+        <source>pO₂</source>
+        <translation>pO₂</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="365"/>
+        <location filename="../core/cochran.c" line="414"/>
+        <location filename="../core/cochran.c" line="421"/>
+        <location filename="../core/file.c" line="868"/>
+        <location filename="../core/libdivecomputer.c" line="225"/>
+        <location filename="../core/libdivecomputer.c" line="228"/>
+        <source>gaschange</source>
+        <translation>Gaswechsel</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="370"/>
+        <location filename="../core/cochran.c" line="409"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>rbt</source>
+        <translation>Nullzeit</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="379"/>
+        <location filename="../core/cochran.c" line="426"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>ceiling</source>
+        <translation>Auftauchgrenze</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="395"/>
+        <location filename="../core/libdivecomputer.c" line="224"/>
+        <source>transmitter</source>
+        <translation>Sender</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="153"/>
+        <source>Error: the file does not appear to be a DATATRAK divelog</source>
+        <translation>Fehler: die Datei scheint kein DATATRAK-Tauchprotokoll zu sein</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="286"/>
+        <source>clear</source>
+        <translation>löschen</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="289"/>
+        <source>misty</source>
+        <translation>diesig</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="292"/>
+        <source>fog</source>
+        <translation>Nebel</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="295"/>
+        <source>rain</source>
+        <translation>Regen</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="298"/>
+        <source>storm</source>
+        <translation>Sturm</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="301"/>
+        <source>snow</source>
+        <translation>Schnee</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="321"/>
+        <source>No suit</source>
+        <translation>Kein Anzug</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="324"/>
+        <source>Shorty</source>
+        <translation>Shorty</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="327"/>
+        <source>Combi</source>
+        <translation>Kombi</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="330"/>
+        <source>Wet suit</source>
+        <translation>Nasstauchanzug</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="333"/>
+        <source>Semidry suit</source>
+        <translation>Halbtrockentauchanzug</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="336"/>
+        <source>Dry suit</source>
+        <translation>Trockentauchanzug</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="396"/>
+        <source>no stop</source>
+        <translation>kein Stopp</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="398"/>
+        <location filename="../core/dive.c" line="29"/>
+        <source>deco</source>
+        <translation>Deko</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="400"/>
+        <source>single ascent</source>
+        <translation>einzelner Aufstieg</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="402"/>
+        <source>multiple ascent</source>
+        <translation>mehrere Aufstiege</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="404"/>
+        <location filename="../core/dive.c" line="27"/>
+        <source>fresh</source>
+        <translation>süss</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="406"/>
+        <source>salt water</source>
+        <translation>Salzwasser</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="431"/>
+        <source>sight seeing</source>
+        <translation>Besichtigung</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="433"/>
+        <source>club dive</source>
+        <translation>Vereinstauchgang</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="435"/>
+        <location filename="../core/dive.c" line="28"/>
+        <source>instructor</source>
+        <translation>Tauchlehrer</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="437"/>
+        <source>instruction</source>
+        <translation>Anweisung</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="439"/>
+        <location filename="../core/dive.c" line="27"/>
+        <source>night</source>
+        <translation>Nacht</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="441"/>
+        <location filename="../core/dive.c" line="25"/>
+        <source>cave</source>
+        <translation>Höhle</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="443"/>
+        <location filename="../core/dive.c" line="24"/>
+        <source>ice</source>
+        <translation>Eis</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="445"/>
+        <source>search</source>
+        <translation>suchen</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="455"/>
+        <location filename="../core/dive.c" line="25"/>
+        <source>wreck</source>
+        <translation>Wrack</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="457"/>
+        <location filename="../core/dive.c" line="26"/>
+        <source>river</source>
+        <translation>Fluss</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="459"/>
+        <location filename="../core/dive.c" line="23"/>
+        <source>drift</source>
+        <translation>Strömung</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="461"/>
+        <location filename="../core/dive.c" line="28"/>
+        <source>photo</source>
+        <translation>Foto</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="463"/>
+        <source>other</source>
+        <translation>sonstige</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="474"/>
+        <source>Other activities</source>
+        <translation>Sonstige Aktivitäten</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="498"/>
+        <source>Datatrak/Wlog notes</source>
+        <translation>Datatrak/Wlog-Hinweise</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="537"/>
+        <source>Manually entered dive</source>
+        <translation>Manuell eingegebener Tauchgang</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="588"/>
+        <source>Unknown</source>
+        <translation>Unbekannt</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="674"/>
+        <source>Error: couldn&apos;t open the file %s</source>
+        <translation>Fehler: Datei %s konnte nicht geöffnet werden</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="687"/>
+        <source>Error: no dive</source>
+        <translation>Fehler: kein Tauchgang</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="23"/>
+        <source>boat</source>
+        <translation>Boot</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="23"/>
+        <source>shore</source>
+        <translation>Ufer</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="24"/>
+        <source>deep</source>
+        <translation>tief</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="24"/>
+        <source>cavern</source>
+        <translation>Kaverne</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="25"/>
+        <source>altitude</source>
+        <translation>Berg</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="26"/>
+        <source>pool</source>
+        <translation>Pool</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="26"/>
+        <source>lake</source>
+        <translation>See</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="27"/>
+        <source>student</source>
+        <translation>Schüler</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="28"/>
+        <source>video</source>
+        <translation>Video</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="33"/>
+        <source>OC-gas</source>
+        <translation>OC-Gas</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="33"/>
+        <source>diluent</source>
+        <translation>Verdünnungsmittel</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="33"/>
+        <location filename="../core/equipment.c" line="88"/>
+        <location filename="../core/planner.c" line="1436"/>
+        <location filename="../core/planner.c" line="1439"/>
+        <source>oxygen</source>
+        <translation>Sauerstoff</translation>
+    </message>
+    <message>
         <location filename="../core/dive.c" line="181"/>
         <source>pascal</source>
         <translation>Pa</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="186"/>
-        <location filename="../core/qthelper.cpp" line="669"/>
+        <location filename="../core/qthelper.cpp" line="674"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="190"/>
-        <location filename="../core/qthelper.cpp" line="672"/>
+        <location filename="../core/qthelper.cpp" line="677"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
+        <location filename="../core/dive.c" line="227"/>
+        <source>ℓ</source>
+        <translation>ℓ</translation>
+    </message>
+    <message>
         <location filename="../core/dive.c" line="232"/>
         <source>cuft</source>
         <translation>cft</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="269"/>
-        <location filename="../core/qthelper.cpp" line="590"/>
-        <location filename="../core/qthelper.cpp" line="605"/>
+        <location filename="../core/qthelper.cpp" line="595"/>
+        <location filename="../core/qthelper.cpp" line="610"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="274"/>
-        <location filename="../core/qthelper.cpp" line="593"/>
-        <location filename="../core/qthelper.cpp" line="607"/>
+        <location filename="../core/qthelper.cpp" line="598"/>
+        <location filename="../core/qthelper.cpp" line="612"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
@@ -8654,53 +9162,58 @@ Durchschnitt</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="325"/>
-        <location filename="../core/qthelper.cpp" line="616"/>
-        <location filename="../core/qthelper.cpp" line="626"/>
+        <location filename="../core/qthelper.cpp" line="621"/>
+        <location filename="../core/qthelper.cpp" line="631"/>
         <source>lbs</source>
         <translation>US Pfund</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="329"/>
-        <location filename="../core/qthelper.cpp" line="614"/>
-        <location filename="../core/qthelper.cpp" line="624"/>
+        <location filename="../core/qthelper.cpp" line="619"/>
+        <location filename="../core/qthelper.cpp" line="629"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="1772"/>
+        <location filename="../core/dive.c" line="1751"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) oder (%s)</translation>
     </message>
     <message>
-        <location filename="../core/divelist.c" line="484"/>
+        <location filename="../core/divelist.c" line="487"/>
         <location filename="../core/equipment.c" line="84"/>
-        <location filename="../core/planner.c" line="1411"/>
-        <location filename="../core/planner.c" line="1414"/>
+        <location filename="../core/planner.c" line="1432"/>
+        <location filename="../core/planner.c" line="1435"/>
         <source>air</source>
         <translation>Luft</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="197"/>
+        <location filename="../core/equipment.c" line="86"/>
+        <source>EAN%d</source>
+        <translation>EAN%d</translation>
+    </message>
+    <message>
+        <location filename="../core/equipment.c" line="198"/>
         <source>integrated</source>
         <translation>integriert</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="198"/>
+        <location filename="../core/equipment.c" line="199"/>
         <source>belt</source>
         <translation>Gürtel</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="199"/>
+        <location filename="../core/equipment.c" line="200"/>
         <source>ankle</source>
         <translation>Fussblei</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="200"/>
+        <location filename="../core/equipment.c" line="201"/>
         <source>backplate weight</source>
         <translation>Backplate-Gewicht</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="201"/>
+        <location filename="../core/equipment.c" line="202"/>
         <source>clip-on</source>
         <translation>clip-on</translation>
     </message>
@@ -8713,8 +9226,8 @@ Durchschnitt</translation>
         <location filename="../core/file.c" line="121"/>
         <location filename="../core/file.c" line="512"/>
         <location filename="../core/file.c" line="597"/>
-        <location filename="../core/file.c" line="924"/>
-        <location filename="../core/file.c" line="1056"/>
+        <location filename="../core/file.c" line="909"/>
+        <location filename="../core/file.c" line="1092"/>
         <location filename="../core/ostctools.c" line="80"/>
         <source>Failed to read &apos;%s&apos;</source>
         <translation>Fehler beim Lesen von &apos;%s&apos;</translation>
@@ -8772,486 +9285,496 @@ Durchschnitt</translation>
         <translation>O₂-Kalibrierung</translation>
     </message>
     <message>
-        <location filename="../core/file.c" line="887"/>
-        <source>No matching DC found for file &apos;%s&apos;</source>
-        <translation>Kein zugehöriger Tauchcomputer für die Datei &apos;%s&apos; gefunden</translation>
+        <location filename="../core/git-access.c" line="134"/>
+        <source>Local cache directory %s corrupted - can&apos;t sync with Subsurface cloud storage</source>
+        <translation>Lokales Cacheverzeichnis %s beschädigt - kann nicht mit dem Subsurface-Cloudspeicher synchronisieren</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>none</source>
-        <translation>keine</translation>
+        <location filename="../core/git-access.c" line="157"/>
+        <location filename="../core/git-access.c" line="177"/>
+        <source>Could not update local cache to newer remote data</source>
+        <translation>Lokaler Cache konnte nicht auf neuere externe Daten aktualisiert werden</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="309"/>
-        <location filename="../core/cochran.c" line="315"/>
-        <location filename="../core/cochran.c" line="385"/>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>deco stop</source>
-        <translation>Deko-Stopp</translation>
+        <location filename="../core/git-access.c" line="170"/>
+        <source>Subsurface cloud storage corrupted</source>
+        <translation>Subsurface-Cloudspeicher beschädigt</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="342"/>
-        <location filename="../core/file.c" line="755"/>
-        <source>battery</source>
-        <translation>Batterie</translation>
+        <location filename="../core/git-access.c" line="284"/>
+        <source>Could not update Subsurface cloud storage, try again later</source>
+        <translation>Subsurface-Cloudspeicher konnte nicht aktualisiert werden, versuchen Sie es später noch einmal</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="370"/>
-        <location filename="../core/cochran.c" line="409"/>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>rbt</source>
-        <translation>Nullzeit</translation>
+        <location filename="../core/git-access.c" line="344"/>
+        <source>Remote storage and local data diverged. Error: merge failed (%s)</source>
+        <translation>Die lokale Version ist von der Servierversion divergiert. Fehler: Vereinigung fehlgeschlagen (%s)</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="336"/>
-        <location filename="../core/cochran.c" line="390"/>
-        <location filename="../core/file.c" line="777"/>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>ascent</source>
-        <translation>Aufstieg</translation>
+        <location filename="../core/git-access.c" line="374"/>
+        <source>Remote storage and local data diverged. Cannot combine local and remote changes</source>
+        <translation>Die lokale Version weicht von der Serverversion ab. Lokale und entfernte Änderungen können nicht zusammengeführt werden.</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="379"/>
-        <location filename="../core/cochran.c" line="426"/>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>ceiling</source>
-        <translation>Auftauchgrenze</translation>
+        <location filename="../core/git-access.c" line="408"/>
+        <source>Remote storage and local data diverged</source>
+        <translation>Lokale Version und Serverversion sind verschieden</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>workload</source>
-        <translation>Arbeit</translation>
+        <location filename="../core/git-access.c" line="411"/>
+        <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source>
+        <translation>Die lokale Version weicht von der Servierversion ab. Fehler: Schreiben der Daten fehlgeschlagen (%s)</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="395"/>
-        <location filename="../core/libdivecomputer.c" line="203"/>
-        <source>transmitter</source>
-        <translation>Sender</translation>
+        <location filename="../core/git-access.c" line="420"/>
+        <source>Problems with local cache of Subsurface cloud data</source>
+        <translation>Probleme mit dem lokalen Cache der Subsurface-Clouddaten</translation>
+    </message>
+    <message>
+        <location filename="../core/git-access.c" line="421"/>
+        <source>Moved cache data to %s. Please try the operation again.</source>
+        <translation>Cachedaten auf %s verschoben. Bitte versuchen Sie es erneut.</translation>
+    </message>
+    <message>
+        <location filename="../core/git-access.c" line="743"/>
+        <source>Error connecting to Subsurface cloud storage</source>
+        <translation>Fehler beim Verbinden mit dem Subsurface-Cloudspeicher</translation>
+    </message>
+    <message>
+        <location filename="../core/git-access.c" line="746"/>
+        <source>git clone of %s failed (%s)</source>
+        <translation>git clone von %s fehlgeschlagen (%s)</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="210"/>
+        <location filename="../core/parse-xml.c" line="3317"/>
+        <location filename="../core/uemis-downloader.c" line="134"/>
+        <source>unknown</source>
+        <translation>unbekannt</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>none</source>
+        <translation>keine</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>workload</source>
+        <translation>Arbeit</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="203"/>
+        <location filename="../core/libdivecomputer.c" line="224"/>
         <source>violation</source>
         <translation>Verletzung</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="203"/>
+        <location filename="../core/libdivecomputer.c" line="224"/>
         <source>bookmark</source>
         <translation>Markierung</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="203"/>
+        <location filename="../core/libdivecomputer.c" line="224"/>
         <source>surface</source>
         <translation>Oberfläche</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="203"/>
+        <location filename="../core/libdivecomputer.c" line="224"/>
         <source>safety stop</source>
         <translation>Sicherheitsstopp</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="365"/>
-        <location filename="../core/cochran.c" line="414"/>
-        <location filename="../core/cochran.c" line="421"/>
-        <location filename="../core/file.c" line="868"/>
-        <location filename="../core/libdivecomputer.c" line="204"/>
-        <location filename="../core/libdivecomputer.c" line="207"/>
-        <source>gaschange</source>
-        <translation>Gaswechsel</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="204"/>
+        <location filename="../core/libdivecomputer.c" line="225"/>
         <source>safety stop (voluntary)</source>
         <translation>Sicherheitsstopp (freiwillig)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="204"/>
+        <location filename="../core/libdivecomputer.c" line="225"/>
         <source>safety stop (mandatory)</source>
         <translation>Sicherheitsstopp (obligatorisch)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="205"/>
+        <location filename="../core/libdivecomputer.c" line="226"/>
         <source>deepstop</source>
         <translation>Tiefen-Stopp</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="205"/>
+        <location filename="../core/libdivecomputer.c" line="226"/>
         <source>ceiling (safety stop)</source>
         <translation>Auftauchgrenze (Sicherheitsstopp)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="205"/>
-        <source>divetime</source>
-        <translation>Tauchgangsdauer</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="205"/>
+        <location filename="../core/libdivecomputer.c" line="226"/>
         <source>below floor</source>
         <comment>event showing dive is below deco floor and adding deco time</comment>
         <translation>unterhalb Dekotiefe</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="353"/>
-        <location filename="../core/libdivecomputer.c" line="206"/>
-        <source>maxdepth</source>
-        <translation>Max. Tiefe</translation>
-    </message>
-    <message>
-        <location filename="../core/cochran.c" line="348"/>
-        <location filename="../core/libdivecomputer.c" line="206"/>
-        <source>OLF</source>
-        <translation>OLF</translation>
+        <location filename="../core/libdivecomputer.c" line="226"/>
+        <source>divetime</source>
+        <translation>Tauchgangsdauer</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="206"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
         <source>airtime</source>
         <translation>verbleibende Atemzeit</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="206"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
         <source>rgbm</source>
         <translation>rgbm</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="206"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
         <source>heading</source>
         <translation>Richtung</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="358"/>
-        <location filename="../core/cochran.c" line="404"/>
-        <location filename="../core/libdivecomputer.c" line="206"/>
-        <source>pO₂</source>
-        <translation>pO₂</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="207"/>
+        <location filename="../core/libdivecomputer.c" line="228"/>
         <source>tissue level warning</source>
         <translation>Gewebewarnung</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="207"/>
+        <location filename="../core/libdivecomputer.c" line="228"/>
         <source>non stop time</source>
         <translation>Nullzeit</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="224"/>
+        <location filename="../core/libdivecomputer.c" line="237"/>
         <source>invalid event number</source>
         <translation>ungültige Ereignisnummer</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="658"/>
-        <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="../core/libdivecomputer.c" line="664"/>
-        <source>Error registering the data</source>
-        <translation>Fehler beim Registrieren der Daten</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="495"/>
+        <location filename="../core/libdivecomputer.c" line="553"/>
         <source>Error parsing the datetime</source>
         <translation>Fehler beim Lesen des Datums</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="513"/>
+        <location filename="../core/libdivecomputer.c" line="571"/>
         <source>Dive %d: %s</source>
         <translation>Tauchgang %d: %s</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="519"/>
+        <location filename="../core/libdivecomputer.c" line="577"/>
         <source>Error parsing the divetime</source>
         <translation>Fehler beim Lesen der Dauer</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="529"/>
+        <location filename="../core/libdivecomputer.c" line="587"/>
         <source>Error parsing the maxdepth</source>
         <translation>Fehler beim Lesen der maximalen Tiefe</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="548"/>
+        <location filename="../core/libdivecomputer.c" line="606"/>
         <source>Error parsing temperature</source>
         <translation>Fehler beim Lesen der Temperatur</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="568"/>
+        <location filename="../core/libdivecomputer.c" line="626"/>
         <source>Error parsing the gas mix count</source>
         <translation>Fehler beim Lesen der Gasgemischszahl</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="580"/>
+        <location filename="../core/libdivecomputer.c" line="638"/>
         <source>Error obtaining water salinity</source>
         <translation>Fehler beim Lesen des Salzgehalts</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="589"/>
+        <location filename="../core/libdivecomputer.c" line="647"/>
         <source>Error obtaining surface pressure</source>
         <translation>Kein Oberflächendruck erhalten</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="614"/>
+        <location filename="../core/libdivecomputer.c" line="672"/>
         <source>Error obtaining divemode</source>
         <translation>Fehler beim Auslesen des Modus des Tauchcomputers</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="634"/>
+        <location filename="../core/libdivecomputer.c" line="692"/>
         <source>Error parsing the gas mix</source>
         <translation>Fehler beim Lesen des Gasgemischs</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="684"/>
+        <location filename="../core/libdivecomputer.c" line="717"/>
+        <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="../core/libdivecomputer.c" line="723"/>
+        <source>Error registering the data</source>
+        <translation>Fehler beim Registrieren der Daten</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="744"/>
         <source>Error parsing the samples</source>
         <translation>Fehler beim Lesen der Samples</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="822"/>
+        <location filename="../core/libdivecomputer.c" line="882"/>
         <source>Event: waiting for user action</source>
         <translation>Ereignis: warte auf Benutzeraktion</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="830"/>
+        <location filename="../core/libdivecomputer.c" line="890"/>
         <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="../core/libdivecomputer.c" line="894"/>
+        <location filename="../core/libdivecomputer.c" line="954"/>
         <source>Error registering the event handler.</source>
         <translation>Fehler beim Registrieren der Ereignisbehandlung</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="899"/>
+        <location filename="../core/libdivecomputer.c" line="959"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Fehler bei der Registrierung der Abbruchbehandlung</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="920"/>
+        <location filename="../core/libdivecomputer.c" line="980"/>
         <source>Dive data import error</source>
         <translation>Fehler beim Importieren der Tauchgangsdaten</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="959"/>
+        <location filename="../core/libdivecomputer.c" line="1019"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Fehler beim Erzeugen des libdivecomputer Contexts</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="966"/>
+        <location filename="../core/libdivecomputer.c" line="1026"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Fehler beim Öffnen von %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="992"/>
+        <location filename="../core/libdivecomputer.c" line="1048"/>
         <source>Insufficient privileges to open the device %s %s (%s)</source>
         <translation>Unzureichende Privilegien zum Öffnen von Gerät %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../core/parse-xml.c" line="517"/>
-        <source>Strange percentage reading %s
+        <location filename="../core/load-git.c" line="194"/>
+        <location filename="../core/parse-xml.c" line="1242"/>
+        <source>multiple GPS locations for this dive site; also %s
 </source>
-        <translation>Unverständliche Prozentangabe %s
+        <translation>mehrere GPS Koordinaten für diesen Tauchplatz; ebenso %s
 </translation>
     </message>
     <message>
-        <location filename="../core/load-git.c" line="194"/>
-        <location filename="../core/parse-xml.c" line="1238"/>
-        <source>multiple GPS locations for this dive site; also %s
+        <location filename="../core/load-git.c" line="222"/>
+        <location filename="../core/parse-xml.c" line="1304"/>
+        <source>additional name for site: %s
 </source>
-        <translation>mehrere GPS Koordinaten für diesen Tauchplatz; ebenso %s
+        <translation>zusätzlicher Name für Platz: %s
+</translation>
+    </message>
+    <message>
+        <location filename="../core/ostctools.c" line="120"/>
+        <location filename="../core/ostctools.c" line="152"/>
+        <source>Unknown DC in dive %d</source>
+        <translation>Unbekannter TC in Tauchgang %d</translation>
+    </message>
+    <message>
+        <location filename="../core/ostctools.c" line="165"/>
+        <source>Error - %s - parsing dive %d</source>
+        <translation>Fehler - %s - Tauchgang %d wird gelesen</translation>
+    </message>
+    <message>
+        <location filename="../core/parse-xml.c" line="517"/>
+        <source>Strange percentage reading %s
+</source>
+        <translation>Unverständliche Prozentangabe %s
 </translation>
     </message>
     <message>
-        <location filename="../core/parse-xml.c" line="2044"/>
+        <location filename="../core/parse-xml.c" line="2051"/>
         <source>Failed to parse &apos;%s&apos;</source>
         <translation>Fehler beim Lesen von &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../core/parse-xml.c" line="3741"/>
+        <location filename="../core/parse-xml.c" line="3774"/>
         <source>Can&apos;t open stylesheet %s</source>
         <translation>Kann Stylesheet %s nicht öffnen</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="86"/>
-        <source>EAN%d</source>
-        <translation>EAN%d</translation>
+        <location filename="../core/planner.c" line="555"/>
+        <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE %s ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source>
+        <translation>HINWEIS / WARNUNG: DIES IST EINE NEUIMPLEMENTATION DES %s-ALGORITHMUS UND EINE DARAUF BASIERENDE TAUCHGANGSPLANERIMPLEMENTATION, DIE NUR EINER GERINGEN ZAHL VON TESTS UNTERZOGEN WURDE. WIR RATEN DRINGEND, TAUCHGÄNGE NICHT AUSSSCHLIESSLICH AUFGRUND DIESER RESULTATE ZU PLANEN!</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="1032"/>
-        <location filename="../core/planner.c" line="1184"/>
-        <source>Can&apos;t find gas %s</source>
-        <translation>Kann Gas %s nicht finden</translation>
+        <location filename="../core/planner.c" line="569"/>
+        <source>Decompression calculation aborted due to excessive time</source>
+        <translation>Dekompressionsrechnung wegen Zeitüberschreitung abgebrochen</translation>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="571"/>
+        <location filename="../core/planner.c" line="829"/>
+        <location filename="../core/planner.c" line="834"/>
+        <location filename="../core/planner.c" line="860"/>
+        <location filename="../core/planner.c" line="870"/>
+        <source>Warning:</source>
+        <translation>Warnung:</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="368"/>
-        <source>Too many gas mixes</source>
-        <translation>Zu viele Gasgemische</translation>
+        <location filename="../core/planner.c" line="581"/>
+        <source>based on Bühlmann ZHL-16C with GFlow = %d and GFhigh = %d</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="568"/>
-        <source>Decompression calculation aborted due to excessive time</source>
-        <translation>Dekompressionsrechnung wegen Zeitüberschreitung abgebrochen</translation>
+        <location filename="../core/planner.c" line="586"/>
+        <source>based on VPM-B at nominal conservatism</source>
+        <translation>basierend auf VPM-B bei nominal Konservatismus</translation>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="588"/>
+        <source>based on VPM-B at +%d conservatism</source>
+        <translation>basierend auf VPM-B bei +%d Konservatismus</translation>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="590"/>
+        <source>, effective GF=%d/%d</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="594"/>
+        <source>recreational mode based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source>
+        <translation>Sporttauchmodus basierend auf Bühlmann ZHL-16B mit GFlow = %d und GFhigh = %d</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="592"/>
+        <location filename="../core/planner.c" line="598"/>
         <source>Subsurface dive plan</source>
         <translation>Subsurface Tauchplan</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="596"/>
-        <source>depth</source>
-        <translation>Tiefe</translation>
+        <location filename="../core/planner.c" line="599"/>
+        <source>&lt;div&gt;Runtime: %dmin&lt;/div&gt;&lt;br&gt;</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="602"/>
-        <source>runtime</source>
-        <translation>Laufzeit</translation>
+        <location filename="../core/planner.c" line="604"/>
+        <source>depth</source>
+        <translation>Tiefe</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="599"/>
+        <location filename="../core/planner.c" line="607"/>
         <source>duration</source>
         <translation>Dauer</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="554"/>
-        <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE %s ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source>
-        <translation>HINWEIS / WARNUNG: DIES IST EINE NEUIMPLEMENTATION DES %s-ALGORITHMUS UND EINE DARAUF BASIERENDE TAUCHGANGSPLANERIMPLEMENTATION, DIE NUR EINER GERINGEN ZAHL VON TESTS UNTERZOGEN WURDE. WIR RATEN DRINGEND, TAUCHGÄNGE NICHT AUSSSCHLIESSLICH AUFGRUND DIESER RESULTATE ZU PLANEN!</translation>
+        <location filename="../core/planner.c" line="610"/>
+        <source>runtime</source>
+        <translation>Laufzeit</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="605"/>
+        <location filename="../core/planner.c" line="613"/>
         <source>gas</source>
         <translation>Gas</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="648"/>
+        <location filename="../core/planner.c" line="656"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation>Auf-/Abstieg bis %.*f %s in %d:%02d min - Runtime %d:%02u mit %s (Setpoint = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="656"/>
+        <location filename="../core/planner.c" line="664"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source>
         <translation>Aufstieg auf %.*f %s in %d:%02d min - Laufzeit %d:%02u mit %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="669"/>
+        <location filename="../core/planner.c" line="677"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation>Auf %.*f %s bleiben für %d:%02d min - Runtime %d:%02u mit %s (Setpoint = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="676"/>
+        <location filename="../core/planner.c" line="684"/>
         <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="../core/planner.c" line="721"/>
+        <location filename="../core/planner.c" line="729"/>
         <source>%3.0f%s</source>
         <translation>%3.0f%s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="724"/>
-        <location filename="../core/planner.c" line="728"/>
+        <location filename="../core/planner.c" line="732"/>
+        <location filename="../core/planner.c" line="736"/>
         <source>%3dmin</source>
         <translation>%3dmin</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="737"/>
-        <location filename="../core/planner.c" line="749"/>
+        <location filename="../core/planner.c" line="745"/>
+        <location filename="../core/planner.c" line="757"/>
         <source>(SP = %.1fbar)</source>
         <translation>(SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="772"/>
+        <location filename="../core/planner.c" line="780"/>
         <source>Switch gas to %s (SP = %.1fbar)</source>
         <translation>Wechsle Gas auf %s (SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="774"/>
+        <location filename="../core/planner.c" line="782"/>
         <source>Switch gas to %s</source>
         <translation>Gaswechsel zu %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="793"/>
+        <location filename="../core/planner.c" line="801"/>
         <source>CNS</source>
         <translation>CND</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="795"/>
+        <location filename="../core/planner.c" line="803"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="799"/>
+        <location filename="../core/planner.c" line="807"/>
         <source>Gas consumption (CCR legs excluded):</source>
         <translation>Gasverbrauch (ohne CCR Segmente):</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="801"/>
+        <location filename="../core/planner.c" line="809"/>
         <source>Gas consumption:</source>
         <translation>Gasverbrauch:</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="570"/>
-        <location filename="../core/planner.c" line="821"/>
-        <location filename="../core/planner.c" line="826"/>
-        <location filename="../core/planner.c" line="851"/>
-        <location filename="../core/planner.c" line="861"/>
-        <source>Warning:</source>
-        <translation>Warnung:</translation>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="580"/>
-        <source>based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source>
-        <translation>basierend auf Bühlmann ZHL-16B mit GFlow = %d und GFhigh = %d</translation>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="584"/>
-        <source>based on VPM-B at nominal conservatism</source>
-        <translation>basierend auf VPM-B bei nominal Konservatismus</translation>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="586"/>
-        <source>based on VPM-B at +%d conservatism</source>
-        <translation>basierend auf VPM-B bei +%d Konservatismus</translation>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="588"/>
-        <source>recreational mode based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source>
-        <translation>Sporttauchmodus basierend auf Bühlmann ZHL-16B mit GFlow = %d und GFhigh = %d</translation>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="822"/>
+        <location filename="../core/planner.c" line="830"/>
         <source>this is more gas than available in the specified cylinder!</source>
         <translation>Dies ist mehr Gas, als in der Flasche verfügbar ist!</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="827"/>
+        <location filename="../core/planner.c" line="835"/>
         <source>not enough reserve for gas sharing on ascent!</source>
         <translation>keine ausreichende Reserve für Aufstieg unter Wechselatmung!</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="829"/>
+        <location filename="../core/planner.c" line="837"/>
         <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source>
         <translation>%.0f%s/%.0f%s %s (%.0f%s/%.0f%s im berechneten Aufstieg)</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="831"/>
+        <location filename="../core/planner.c" line="839"/>
         <source>%.0f%s (%.0f%s during planned ascent) of %s</source>
         <translation>%.0f%s (%.0f%s im berechneten Aufstiegs) von %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="848"/>
+        <location filename="../core/planner.c" line="857"/>
         <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
         <translation>hoher pO₂ Wert %.2f auf %d:%02u mit Gas %s in Tiefe %.*f %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="858"/>
+        <location filename="../core/planner.c" line="867"/>
         <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
         <translation>niedriger pO₂ Wert %.2f auf %d:%02u mit Gas %s in Tiefe %.*f %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="1419"/>
+        <location filename="../core/planner.c" line="1194"/>
+        <source>Can&apos;t find gas %s</source>
+        <translation>Kann Gas %s nicht finden</translation>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="1440"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1280"/>
+        <location filename="../core/profile.c" line="1298"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
@@ -9260,70 +9783,70 @@ D: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1283"/>
+        <location filename="../core/profile.c" line="1301"/>
         <source>P: %d%s
 </source>
         <translation>P: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1287"/>
+        <location filename="../core/profile.c" line="1305"/>
         <source>T: %.1f%s
 </source>
         <translation>T: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1293"/>
+        <location filename="../core/profile.c" line="1311"/>
         <source>V: %.1f%s
 </source>
         <translation>V: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1296"/>
+        <location filename="../core/profile.c" line="1314"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation>AMV: %.*f%s/min
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1298"/>
+        <location filename="../core/profile.c" line="1316"/>
         <source>CNS: %u%%
 </source>
         <translation>CNS: %u%%
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1300"/>
+        <location filename="../core/profile.c" line="1318"/>
         <source>pO%s: %.2fbar
 </source>
         <translation>pO%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1302"/>
+        <location filename="../core/profile.c" line="1320"/>
         <source>pN%s: %.2fbar
 </source>
         <translation>pN%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1304"/>
+        <location filename="../core/profile.c" line="1322"/>
         <source>pHe: %.2fbar
 </source>
         <translation>pHe: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1307"/>
+        <location filename="../core/profile.c" line="1325"/>
         <source>MOD: %d%s
 </source>
         <translation>MOD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1314"/>
+        <location filename="../core/profile.c" line="1332"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
@@ -9332,7 +9855,7 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1318"/>
+        <location filename="../core/profile.c" line="1336"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
@@ -9341,174 +9864,179 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1331"/>
+        <location filename="../core/profile.c" line="1349"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation>Sicherheitsstopp: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1334"/>
+        <location filename="../core/profile.c" line="1352"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation>Sicherheitsstopp: unbek. Zeit @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1339"/>
+        <location filename="../core/profile.c" line="1357"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation>Deko: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1342"/>
+        <location filename="../core/profile.c" line="1360"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation>Deko: unbek. Zeit @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1346"/>
+        <location filename="../core/profile.c" line="1364"/>
         <source>In deco
 </source>
         <translation>In Deko
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1348"/>
+        <location filename="../core/profile.c" line="1366"/>
         <source>NDL: %umin
 </source>
         <translation>Nullzeit: %umin
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1351"/>
+        <location filename="../core/profile.c" line="1369"/>
         <source>TTS: %umin
 </source>
         <translation>Gesamtaufstiegszeit: %umin
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1354"/>
+        <location filename="../core/profile.c" line="1372"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation>Deko: %umin @ %.0f%s (berechnet)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1362"/>
+        <location filename="../core/profile.c" line="1380"/>
         <source>In deco (calc)
 </source>
         <translation>Deko (berechnet)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1365"/>
+        <location filename="../core/profile.c" line="1383"/>
         <source>NDL: %umin (calc)
 </source>
         <translation>Nullzeit: %umin (berechnet)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1367"/>
+        <location filename="../core/profile.c" line="1385"/>
         <source>NDL: &gt;2h (calc)
 </source>
         <translation>Nullzeit: &gt; 2h (berechnet)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1371"/>
+        <location filename="../core/profile.c" line="1389"/>
         <source>TTS: %umin (calc)
 </source>
         <translation>Gesamtaufstiegszeit: %umin (berechnet)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1373"/>
+        <location filename="../core/profile.c" line="1391"/>
         <source>TTS: &gt;2h (calc)
 </source>
         <translation>Gesamtaufstiegszeit: &gt; 2h (berechnet)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1376"/>
+        <location filename="../core/profile.c" line="1394"/>
         <source>RBT: %umin
 </source>
         <translation>Restgrundzeit: %umin
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1379"/>
+        <location filename="../core/profile.c" line="1397"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation>Berechnete Auftauchgrenze %.0f %s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1385"/>
+        <location filename="../core/profile.c" line="1403"/>
         <source>Tissue %.0fmin: %.1f%s
 </source>
         <translation>Gewebe %.0fmin: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1391"/>
+        <location filename="../core/profile.c" line="1409"/>
         <source>heartbeat: %d
 </source>
         <translation>Herzschlag: %d
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1393"/>
+        <location filename="../core/profile.c" line="1411"/>
         <source>bearing: %d
 </source>
         <translation>Peilung: %d
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1396"/>
+        <location filename="../core/profile.c" line="1414"/>
         <source>mean depth to here %.1f%s
 </source>
         <translation>Durchschnittstiefe bis hier %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1491"/>
+        <location filename="../core/profile.c" line="1515"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1495"/>
-        <location filename="../core/profile.c" line="1499"/>
-        <location filename="../core/profile.c" line="1503"/>
+        <location filename="../core/profile.c" line="1519"/>
+        <location filename="../core/profile.c" line="1523"/>
+        <location filename="../core/profile.c" line="1527"/>
         <source>%s %sD:%.1f%s</source>
         <translation>%s %sTiefe:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1507"/>
+        <location filename="../core/profile.c" line="1531"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sTiefe:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1511"/>
+        <location filename="../core/profile.c" line="1535"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1515"/>
-        <location filename="../core/profile.c" line="1519"/>
+        <location filename="../core/profile.c" line="1539"/>
+        <location filename="../core/profile.c" line="1543"/>
         <source>%s %sV:%.2f%s</source>
         <translation>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1526"/>
+        <location filename="../core/profile.c" line="1550"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sDruck:%d %s</translation>
     </message>
     <message>
+        <location filename="../core/profile.c" line="1575"/>
+        <source>%s SAC:%.*f %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../core/qthelper.cpp" line="67"/>
         <source>%1km</source>
         <translation>%1 km</translation>
@@ -9529,446 +10057,460 @@ EADD: %d%s
         <translation>%1 yd</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="635"/>
+        <location filename="../core/qthelper.cpp" line="91"/>
+        <location filename="../core/qthelper.cpp" line="226"/>
+        <source>N</source>
+        <translation>N</translation>
+    </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="91"/>
+        <location filename="../core/qthelper.cpp" line="227"/>
+        <source>S</source>
+        <translation>S</translation>
+    </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="92"/>
+        <location filename="../core/qthelper.cpp" line="228"/>
+        <source>E</source>
+        <translation>O</translation>
+    </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="92"/>
+        <location filename="../core/qthelper.cpp" line="229"/>
+        <source>W</source>
+        <translation>W</translation>
+    </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="640"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="638"/>
+        <location filename="../core/qthelper.cpp" line="643"/>
         <source>F</source>
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="23"/>
-        <source>boat</source>
-        <translation>Boot</translation>
+        <location filename="../core/save-html.c" line="469"/>
+        <location filename="../core/save-html.c" line="553"/>
+        <location filename="../core/worldmap-save.c" line="111"/>
+        <source>Can&apos;t open file %s</source>
+        <translation>Kann Datei %s nicht öffnen</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="23"/>
-        <source>shore</source>
-        <translation>Ufer</translation>
+        <location filename="../core/save-html.c" line="488"/>
+        <source>Number</source>
+        <translation>Nummer</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="459"/>
-        <location filename="../core/dive.c" line="23"/>
-        <source>drift</source>
-        <translation>Strömung</translation>
+        <location filename="../core/save-html.c" line="489"/>
+        <source>Date</source>
+        <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="24"/>
-        <source>deep</source>
-        <translation>tief</translation>
+        <location filename="../core/save-html.c" line="490"/>
+        <source>Time</source>
+        <translation>Zeit</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="24"/>
-        <source>cavern</source>
-        <translation>Kaverne</translation>
+        <location filename="../core/save-html.c" line="491"/>
+        <source>Location</source>
+        <translation>Ort</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="443"/>
-        <location filename="../core/dive.c" line="24"/>
-        <source>ice</source>
-        <translation>Eis</translation>
+        <location filename="../core/save-html.c" line="492"/>
+        <source>Air temp.</source>
+        <translation>Lufttemp.</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="445"/>
-        <source>search</source>
-        <translation>suchen</translation>
+        <location filename="../core/save-html.c" line="493"/>
+        <source>Water temp.</source>
+        <translation>Wassertemp.</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="455"/>
-        <location filename="../core/dive.c" line="25"/>
-        <source>wreck</source>
-        <translation>Wrack</translation>
+        <location filename="../core/save-html.c" line="494"/>
+        <source>Dives</source>
+        <translation>Tauchgänge</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="441"/>
-        <location filename="../core/dive.c" line="25"/>
-        <source>cave</source>
-        <translation>Höhle</translation>
+        <location filename="../core/save-html.c" line="495"/>
+        <source>Expand all</source>
+        <translation>Alle ausfalten</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="25"/>
-        <source>altitude</source>
-        <translation>Berg</translation>
+        <location filename="../core/save-html.c" line="496"/>
+        <source>Collapse all</source>
+        <translation>Alle einfalten</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="26"/>
-        <source>pool</source>
-        <translation>Pool</translation>
+        <location filename="../core/save-html.c" line="497"/>
+        <source>Trips</source>
+        <translation>Reisen</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="26"/>
-        <source>lake</source>
-        <translation>See</translation>
+        <location filename="../core/save-html.c" line="498"/>
+        <source>Statistics</source>
+        <translation>Statistiken</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="457"/>
-        <location filename="../core/dive.c" line="26"/>
-        <source>river</source>
-        <translation>Fluss</translation>
+        <location filename="../core/save-html.c" line="499"/>
+        <source>Advanced search</source>
+        <translation>Erweiterte Suche</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="439"/>
-        <location filename="../core/dive.c" line="27"/>
-        <source>night</source>
-        <translation>Nacht</translation>
+        <location filename="../core/save-html.c" line="502"/>
+        <source>Rating</source>
+        <translation>Bewertung</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="153"/>
-        <source>Error: the file does not appear to be a DATATRAK divelog</source>
-        <translation>Fehler: die Datei scheint kein DATATRAK-Tauchprotokoll zu sein</translation>
+        <location filename="../core/save-html.c" line="503"/>
+        <source>Visibility</source>
+        <translation>Sicht</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="286"/>
-        <source>clear</source>
-        <translation>löschen</translation>
+        <location filename="../core/save-html.c" line="504"/>
+        <source>Duration</source>
+        <translation>Dauer</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="289"/>
-        <source>misty</source>
-        <translation>diesig</translation>
+        <location filename="../core/save-html.c" line="505"/>
+        <source>Divemaster</source>
+        <translation>Tauchgruppenleiter</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="292"/>
-        <source>fog</source>
-        <translation>Nebel</translation>
+        <location filename="../core/save-html.c" line="506"/>
+        <source>Buddy</source>
+        <translation>Tauchpartner</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="295"/>
-        <source>rain</source>
-        <translation>Regen</translation>
+        <location filename="../core/save-html.c" line="507"/>
+        <source>Suit</source>
+        <translation>Anzug</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="298"/>
-        <source>storm</source>
-        <translation>Sturm</translation>
+        <location filename="../core/save-html.c" line="508"/>
+        <source>Tags</source>
+        <translation>Stichwörter</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="301"/>
-        <source>snow</source>
-        <translation>Schnee</translation>
+        <location filename="../core/save-html.c" line="509"/>
+        <location filename="../smtk-import/smartrak.c" line="251"/>
+        <location filename="../smtk-import/smartrak.c" line="321"/>
+        <source>Notes</source>
+        <translation>Notizen</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="321"/>
-        <source>No suit</source>
-        <translation>Kein Anzug</translation>
+        <location filename="../core/save-html.c" line="510"/>
+        <source>Show more details</source>
+        <translation>Mehr Details anzeigen</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="324"/>
-        <source>Shorty</source>
-        <translation>Shorty</translation>
+        <location filename="../core/save-html.c" line="513"/>
+        <source>Yearly statistics</source>
+        <translation>Jahresstatistiken</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="327"/>
-        <source>Combi</source>
-        <translation>Kombi</translation>
+        <location filename="../core/save-html.c" line="514"/>
+        <source>Year</source>
+        <translation>Jahr</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="330"/>
-        <source>Wet suit</source>
-        <translation>Nasstauchanzug</translation>
+        <location filename="../core/save-html.c" line="515"/>
+        <source>Total time</source>
+        <translation>Gesamtzeit</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="333"/>
-        <source>Semidry suit</source>
-        <translation>Halbtrockentauchanzug</translation>
+        <location filename="../core/save-html.c" line="516"/>
+        <source>Average time</source>
+        <translation>Durchschnittszeit</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="336"/>
-        <source>Dry suit</source>
-        <translation>Trockentauchanzug</translation>
+        <location filename="../core/save-html.c" line="517"/>
+        <source>Shortest time</source>
+        <translation>Kürzeste Zeit</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="396"/>
-        <source>no stop</source>
-        <translation>kein Stopp</translation>
+        <location filename="../core/save-html.c" line="518"/>
+        <source>Longest time</source>
+        <translation>Längste Zeit</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="400"/>
-        <source>single ascent</source>
-        <translation>einzelner Aufstieg</translation>
+        <location filename="../core/save-html.c" line="519"/>
+        <source>Average depth</source>
+        <translation>Durchschnittstiefe</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="402"/>
-        <source>multiple ascent</source>
-        <translation>mehrere Aufstiege</translation>
+        <location filename="../core/save-html.c" line="520"/>
+        <source>Min. depth</source>
+        <translation>Min. Tiefe</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="404"/>
-        <location filename="../core/dive.c" line="27"/>
-        <source>fresh</source>
-        <translation>süss</translation>
+        <location filename="../core/save-html.c" line="521"/>
+        <source>Max. depth</source>
+        <translation>Max. Tiefe</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="406"/>
-        <source>salt water</source>
-        <translation>Salzwasser</translation>
+        <location filename="../core/save-html.c" line="522"/>
+        <source>Average SAC</source>
+        <translation>Durchschnittliches AMV</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="431"/>
-        <source>sight seeing</source>
-        <translation>Besichtigung</translation>
+        <location filename="../core/save-html.c" line="523"/>
+        <source>Min. SAC</source>
+        <translation>Min. AMV</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="433"/>
-        <source>club dive</source>
-        <translation>Vereinstauchgang</translation>
+        <location filename="../core/save-html.c" line="524"/>
+        <source>Max. SAC</source>
+        <translation>Max. AMV</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="437"/>
-        <source>instruction</source>
-        <translation>Anweisung</translation>
+        <location filename="../core/save-html.c" line="525"/>
+        <source>Average temp.</source>
+        <translation>Durchschnittstemp.</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="463"/>
-        <source>other</source>
-        <translation>sonstige</translation>
+        <location filename="../core/save-html.c" line="526"/>
+        <source>Min. temp.</source>
+        <translation>Min. Temp.</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="474"/>
-        <source>Other activities</source>
-        <translation>Sonstige Aktivitäten</translation>
+        <location filename="../core/save-html.c" line="527"/>
+        <source>Max. temp.</source>
+        <translation>Max. Temp.</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="498"/>
-        <source>Datatrak/Wlog notes</source>
-        <translation>Datatrak/Wlog-Hinweise</translation>
+        <location filename="../core/save-html.c" line="528"/>
+        <source>Back to list</source>
+        <translation>Zurück zur Liste</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="537"/>
-        <source>Manually entered dive</source>
-        <translation>Manuell eingegebener Tauchgang</translation>
+        <location filename="../core/save-html.c" line="531"/>
+        <source>Dive No.</source>
+        <translation>Tauchgang Nr.</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="588"/>
-        <source>Unknown</source>
-        <translation>Unbekannt</translation>
+        <location filename="../core/save-html.c" line="532"/>
+        <source>Dive profile</source>
+        <translation>Tauchprofil</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="674"/>
-        <source>Error: couldn&apos;t open the file %s</source>
-        <translation>Fehler: Datei %s konnte nicht geöffnet werden</translation>
+        <location filename="../core/save-html.c" line="533"/>
+        <source>Dive information</source>
+        <translation>Tauchinformation</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="687"/>
-        <source>Error: no dive</source>
-        <translation>Fehler: kein Tauchgang</translation>
+        <location filename="../core/save-html.c" line="534"/>
+        <source>Dive equipment</source>
+        <translation>Tauchausrüstung</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="27"/>
-        <source>student</source>
-        <translation>Schüler</translation>
+        <location filename="../core/save-html.c" line="535"/>
+        <location filename="../core/save-html.c" line="542"/>
+        <source>Type</source>
+        <translation>Typ</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="461"/>
-        <location filename="../core/dive.c" line="28"/>
-        <source>photo</source>
-        <translation>Foto</translation>
+        <location filename="../core/save-html.c" line="536"/>
+        <source>Size</source>
+        <translation>Größe</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="28"/>
-        <source>video</source>
-        <translation>Video</translation>
+        <location filename="../core/save-html.c" line="537"/>
+        <source>Work pressure</source>
+        <translation>Arbeitsdruck</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="435"/>
-        <location filename="../core/dive.c" line="28"/>
-        <source>instructor</source>
-        <translation>Tauchlehrer</translation>
+        <location filename="../core/save-html.c" line="538"/>
+        <source>Start pressure</source>
+        <translation>Anfangsdruck</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="398"/>
-        <location filename="../core/dive.c" line="29"/>
-        <source>deco</source>
-        <translation>Deko</translation>
+        <location filename="../core/save-html.c" line="539"/>
+        <source>End pressure</source>
+        <translation>Enddruck</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="33"/>
-        <source>OC-gas</source>
-        <translation>OC-Gas</translation>
+        <location filename="../core/save-html.c" line="540"/>
+        <source>Gas</source>
+        <translation>Gas</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="33"/>
-        <source>diluent</source>
-        <translation>Verdünnungsmittel</translation>
+        <location filename="../core/save-html.c" line="541"/>
+        <source>Weight</source>
+        <translation>Gewicht</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="33"/>
-        <location filename="../core/equipment.c" line="88"/>
-        <location filename="../core/planner.c" line="1415"/>
-        <location filename="../core/planner.c" line="1418"/>
-        <source>oxygen</source>
-        <translation>Sauerstoff</translation>
+        <location filename="../core/save-html.c" line="543"/>
+        <source>Events</source>
+        <translation>Ereignisse</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="227"/>
-        <source>ℓ</source>
-        <translation>ℓ</translation>
+        <location filename="../core/save-html.c" line="544"/>
+        <source>Name</source>
+        <translation>Name</translation>
+    </message>
+    <message>
+        <location filename="../core/save-html.c" line="545"/>
+        <source>Value</source>
+        <translation>Wert</translation>
+    </message>
+    <message>
+        <location filename="../core/save-html.c" line="546"/>
+        <source>Coordinates</source>
+        <translation>Koordinaten</translation>
+    </message>
+    <message>
+        <location filename="../core/save-html.c" line="547"/>
+        <source>Dive status</source>
+        <translation>Tauchstatus</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="239"/>
+        <location filename="../core/statistics.c" line="242"/>
         <source>more than %d days</source>
         <translation>mehr als %d Tage</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="246"/>
+        <location filename="../core/statistics.c" line="249"/>
         <source>%dd %dh %dmin</source>
         <translation>%dd %dh %dmin</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="249"/>
+        <location filename="../core/statistics.c" line="252"/>
         <source>%dmin %dsecs</source>
         <translation>%dmin %dsek</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="251"/>
+        <location filename="../core/statistics.c" line="254"/>
         <source>%dh %dmin</source>
         <translation>%dh %dmin</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="263"/>
+        <location filename="../core/statistics.c" line="266"/>
         <source>for dives #</source>
         <translation>für Tauchgänge Nr.</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="269"/>
+        <location filename="../core/statistics.c" line="272"/>
         <source>for selected dives</source>
         <translation>für die ausgewählten Tauchgänge</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="304"/>
+        <location filename="../core/statistics.c" line="307"/>
         <source>for dive #%d</source>
         <translation>für Tauchgang Nr. %d</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="306"/>
+        <location filename="../core/statistics.c" line="309"/>
         <source>for selected dive</source>
         <translation>für den ausgewählten Tauchgang</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="308"/>
+        <location filename="../core/statistics.c" line="311"/>
         <source>for all dives</source>
         <translation>für alle Tauchgänge</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="310"/>
+        <location filename="../core/statistics.c" line="313"/>
         <source>(no dives)</source>
         <translation>(keine Tauchgänge)</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Sun</source>
         <translation>So</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Mon</source>
         <translation>Mo</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Tue</source>
         <translation>Di</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Wed</source>
         <translation>Mi</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Thu</source>
         <translation>Do</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Fri</source>
         <translation>Fr</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Sat</source>
         <translation>Sa</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Jan</source>
         <translation>Jan</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Feb</source>
         <translation>Feb</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Mar</source>
         <translation>Mär</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Apr</source>
         <translation>Apr</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>May</source>
         <translation>Mai</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Jun</source>
         <translation>Jun</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Jul</source>
         <translation>Jul</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Aug</source>
         <translation>Aug</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Sep</source>
         <translation>Sep</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Oct</source>
         <translation>Okt</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Nov</source>
         <translation>Nov</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Dec</source>
         <translation>Dez</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="191"/>
-        <location filename="../core/parse-xml.c" line="3284"/>
-        <location filename="../core/uemis-downloader.c" line="134"/>
-        <source>unknown</source>
-        <translation>unbekannt</translation>
-    </message>
-    <message>
-        <location filename="../core/uemis-downloader.c" line="467"/>
-        <source>data</source>
-        <translation>Daten</translation>
-    </message>
-    <message>
-        <location filename="../core/uemis-downloader.c" line="447"/>
-        <source>%s %s</source>
-        <translation>%s %s</translation>
-    </message>
-    <message>
         <location filename="../core/uemis-downloader.c" line="27"/>
         <source>Uemis Zurich: the file system is almost full.
 Disconnect/reconnect the dive computer
@@ -9999,6 +10541,16 @@ Ist der Uemis Zürich korrekt verbunden?</translation>
         <translation>Keine Tauchgänge zum Herunterladen.</translation>
     </message>
     <message>
+        <location filename="../core/uemis-downloader.c" line="447"/>
+        <source>%s %s</source>
+        <translation>%s %s</translation>
+    </message>
+    <message>
+        <location filename="../core/uemis-downloader.c" line="467"/>
+        <source>data</source>
+        <translation>Daten</translation>
+    </message>
+    <message>
         <location filename="../core/uemis-downloader.c" line="495"/>
         <source>divelog #</source>
         <translation>Tauchprotokoll #</translation>
@@ -10169,281 +10721,6 @@ Ist der Uemis Zürich korrekt verbunden?</translation>
         <translation>Batteriealarm</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="469"/>
-        <location filename="../core/save-html.c" line="553"/>
-        <location filename="../core/worldmap-save.c" line="111"/>
-        <source>Can&apos;t open file %s</source>
-        <translation>Kann Datei %s nicht öffnen</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="488"/>
-        <source>Number</source>
-        <translation>Nummer</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="489"/>
-        <source>Date</source>
-        <translation>Datum</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="490"/>
-        <source>Time</source>
-        <translation>Zeit</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="491"/>
-        <source>Location</source>
-        <translation>Ort</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="492"/>
-        <source>Air temp.</source>
-        <translation>Lufttemp.</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="493"/>
-        <source>Water temp.</source>
-        <translation>Wassertemp.</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="498"/>
-        <source>Statistics</source>
-        <translation>Statistiken</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="502"/>
-        <source>Rating</source>
-        <translation>Bewertung</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="503"/>
-        <source>Visibility</source>
-        <translation>Sicht</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="504"/>
-        <source>Duration</source>
-        <translation>Dauer</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="494"/>
-        <source>Dives</source>
-        <translation>Tauchgänge</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="495"/>
-        <source>Expand all</source>
-        <translation>Alle ausfalten</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="496"/>
-        <source>Collapse all</source>
-        <translation>Alle einfalten</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="497"/>
-        <source>Trips</source>
-        <translation>Reisen</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="499"/>
-        <source>Advanced search</source>
-        <translation>Erweiterte Suche</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="505"/>
-        <source>Divemaster</source>
-        <translation>Tauchgruppenleiter</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="506"/>
-        <source>Buddy</source>
-        <translation>Tauchpartner</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="507"/>
-        <source>Suit</source>
-        <translation>Anzug</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="508"/>
-        <source>Tags</source>
-        <translation>Stichwörter</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="509"/>
-        <location filename="../smtk-import/smartrak.c" line="251"/>
-        <location filename="../smtk-import/smartrak.c" line="321"/>
-        <source>Notes</source>
-        <translation>Notizen</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="510"/>
-        <source>Show more details</source>
-        <translation>Mehr Details anzeigen</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="513"/>
-        <source>Yearly statistics</source>
-        <translation>Jahresstatistiken</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="514"/>
-        <source>Year</source>
-        <translation>Jahr</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="515"/>
-        <source>Total time</source>
-        <translation>Gesamtzeit</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="516"/>
-        <source>Average time</source>
-        <translation>Durchschnittszeit</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="517"/>
-        <source>Shortest time</source>
-        <translation>Kürzeste Zeit</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="518"/>
-        <source>Longest time</source>
-        <translation>Längste Zeit</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="519"/>
-        <source>Average depth</source>
-        <translation>Durchschnittstiefe</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="520"/>
-        <source>Min. depth</source>
-        <translation>Min. Tiefe</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="521"/>
-        <source>Max. depth</source>
-        <translation>Max. Tiefe</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="523"/>
-        <source>Min. SAC</source>
-        <translation>Min. AMV</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="524"/>
-        <source>Max. SAC</source>
-        <translation>Max. AMV</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="525"/>
-        <source>Average temp.</source>
-        <translation>Durchschnittstemp.</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="526"/>
-        <source>Min. temp.</source>
-        <translation>Min. Temp.</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="527"/>
-        <source>Max. temp.</source>
-        <translation>Max. Temp.</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="528"/>
-        <source>Back to list</source>
-        <translation>Zurück zur Liste</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="534"/>
-        <source>Dive equipment</source>
-        <translation>Tauchausrüstung</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="537"/>
-        <source>Work pressure</source>
-        <translation>Arbeitsdruck</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="538"/>
-        <source>Start pressure</source>
-        <translation>Anfangsdruck</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="539"/>
-        <source>End pressure</source>
-        <translation>Enddruck</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="547"/>
-        <source>Dive status</source>
-        <translation>Tauchstatus</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="522"/>
-        <source>Average SAC</source>
-        <translation>Durchschnittliches AMV</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="531"/>
-        <source>Dive No.</source>
-        <translation>Tauchgang Nr.</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="532"/>
-        <source>Dive profile</source>
-        <translation>Tauchprofil</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="533"/>
-        <source>Dive information</source>
-        <translation>Tauchinformation</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="535"/>
-        <location filename="../core/save-html.c" line="542"/>
-        <source>Type</source>
-        <translation>Typ</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="536"/>
-        <source>Size</source>
-        <translation>Größe</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="540"/>
-        <source>Gas</source>
-        <translation>Gas</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="541"/>
-        <source>Weight</source>
-        <translation>Gewicht</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="543"/>
-        <source>Events</source>
-        <translation>Ereignisse</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="544"/>
-        <source>Name</source>
-        <translation>Name</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="545"/>
-        <source>Value</source>
-        <translation>Wert</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="546"/>
-        <source>Coordinates</source>
-        <translation>Koordinaten</translation>
-    </message>
-    <message>
         <location filename="../core/worldmap-save.c" line="39"/>
         <source>Date:</source>
         <translation>Datum:</translation>
@@ -10489,110 +10766,6 @@ Ist der Uemis Zürich korrekt verbunden?</translation>
         <translation>Notizen:</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="91"/>
-        <location filename="../core/qthelper.cpp" line="226"/>
-        <source>N</source>
-        <translation>N</translation>
-    </message>
-    <message>
-        <location filename="../core/qthelper.cpp" line="91"/>
-        <location filename="../core/qthelper.cpp" line="227"/>
-        <source>S</source>
-        <translation>S</translation>
-    </message>
-    <message>
-        <location filename="../core/qthelper.cpp" line="92"/>
-        <location filename="../core/qthelper.cpp" line="228"/>
-        <source>E</source>
-        <translation>O</translation>
-    </message>
-    <message>
-        <location filename="../core/qthelper.cpp" line="92"/>
-        <location filename="../core/qthelper.cpp" line="229"/>
-        <source>W</source>
-        <translation>W</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="341"/>
-        <source>Remote storage and local data diverged. Error: merge failed (%s)</source>
-        <translation>Die lokale Version ist von der Servierversion divergiert. Fehler: Vereinigung fehlgeschlagen (%s)</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="134"/>
-        <source>Local cache directory %s corrupted - can&apos;t sync with Subsurface cloud storage</source>
-        <translation>Lokales Cacheverzeichnis %s beschädigt - kann nicht mit dem Subsurface-Cloudspeicher synchronisieren</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="157"/>
-        <location filename="../core/git-access.c" line="177"/>
-        <source>Could not update local cache to newer remote data</source>
-        <translation>Lokaler Cache konnte nicht auf neuere externe Daten aktualisiert werden</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="170"/>
-        <source>Subsurface cloud storage corrupted</source>
-        <translation>Subsurface-Cloudspeicher beschädigt</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="285"/>
-        <source>Could not update Subsurface cloud storage, try again later</source>
-        <translation>Subsurface-Cloudspeicher konnte nicht aktualisiert werden, versuchen Sie es später noch einmal</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="371"/>
-        <source>Remote storage and local data diverged. Cannot combine local and remote changes</source>
-        <translation>Die lokale Version weicht von der Serverversion ab. Lokale und entfernte Änderungen können nicht zusammengeführt werden.</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="405"/>
-        <source>Remote storage and local data diverged</source>
-        <translation>Lokale Version und Serverversion sind verschieden</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="408"/>
-        <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source>
-        <translation>Die lokale Version weicht von der Servierversion ab. Fehler: Schreiben der Daten fehlgeschlagen (%s)</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="417"/>
-        <source>Problems with local cache of Subsurface cloud data</source>
-        <translation>Probleme mit dem lokalen Cache der Subsurface-Clouddaten</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="418"/>
-        <source>Moved cache data to %s. Please try the operation again.</source>
-        <translation>Cachedaten auf %s verschoben. Bitte versuchen Sie es erneut.</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="737"/>
-        <source>Error connecting to Subsurface cloud storage</source>
-        <translation>Fehler beim Verbinden mit dem Subsurface-Cloudspeicher</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="740"/>
-        <source>git clone of %s failed (%s)</source>
-        <translation>git clone von %s fehlgeschlagen (%s)</translation>
-    </message>
-    <message>
-        <location filename="../core/load-git.c" line="222"/>
-        <location filename="../core/parse-xml.c" line="1300"/>
-        <source>additional name for site: %s
-</source>
-        <translation>zusätzlicher Name für Platz: %s
-</translation>
-    </message>
-    <message>
-        <location filename="../core/ostctools.c" line="120"/>
-        <location filename="../core/ostctools.c" line="152"/>
-        <source>Unknown DC in dive %d</source>
-        <translation>Unbekannter TC in Tauchgang %d</translation>
-    </message>
-    <message>
-        <location filename="../core/ostctools.c" line="165"/>
-        <source>Error - %s - parsing dive %d</source>
-        <translation>Fehler - %s - Tauchgang %d wird gelesen</translation>
-    </message>
-    <message>
         <location filename="../smtk-import/smartrak.c" line="247"/>
         <source>Built</source>
         <translation>Built</translation>
@@ -10676,117 +10849,117 @@ Ist der Uemis Zürich korrekt verbunden?</translation>
         <translation>Subsurface-mobile</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="91"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="103"/>
         <source>Subsurface</source>
         <translation>Subsurface</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="97"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="110"/>
         <source>Dive list</source>
         <translation>Tauchgangliste</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="112"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="125"/>
         <source>Cloud credentials</source>
         <translation>Cloud Benutzerdaten</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="126"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="139"/>
         <source>Manage dives</source>
         <translation>Tauchgänge verwalten</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="138"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="141"/>
         <source>Add dive manually</source>
         <translation>Tauchgang hinzufügen</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="146"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="149"/>
         <source>Manual sync with cloud</source>
         <translation>Manuelle Cloud-Synchronisation</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="164"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="167"/>
         <source>Offline mode</source>
         <translation>Offline-Modus</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="164"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="167"/>
         <source>Enable auto cloud sync</source>
         <translation>Automatische Synchronisation</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="182"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="187"/>
         <source>GPS</source>
         <translation>GPS</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="185"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="190"/>
         <source>GPS-tag dives</source>
         <translation>Tauchgänge mit GPS-Daten versehen</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="192"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="197"/>
         <source>Upload GPS data</source>
         <translation>GPS-Daten hochladen</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="199"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="204"/>
         <source>Download GPS data</source>
         <translation>GPS-Daten herunterladen</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="206"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="211"/>
         <source>Show GPS fixes</source>
         <translation>GPS-Positionen anzeigen</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="215"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="220"/>
         <source>Clear GPS cache</source>
         <translation>GPS-Speicher löschen</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="221"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="226"/>
         <source>Preferences</source>
         <translation>Einstellungen</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="230"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="237"/>
         <source>Developer</source>
         <translation>Entwickler</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="232"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="239"/>
         <source>App log</source>
         <translation>App-Protokoll</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="239"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="246"/>
         <source>Theme information</source>
         <translation>Theme-Information</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="246"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="253"/>
         <source>User manual</source>
         <translation>Benutzerhandbuch</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="252"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="259"/>
         <source>About</source>
         <translation>Über</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="283"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="304"/>
         <source>Run location service</source>
         <translation>Ortungsdienst starten</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="283"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="304"/>
         <source>No GPS source available</source>
         <translation>Keine GPS-Quelle gefunden</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="295"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="316"/>
         <source>Actions</source>
         <translation>Aktionen</translation>
     </message>
@@ -10867,6 +11040,24 @@ p, li { white-space: pre-wrap; }
         <translation>m/min</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="121"/>
+        <location filename="../build/ui_plannerSettings.h" line="425"/>
+        <source>75% to 50% avg. depth</source>
+        <translation>75% bis 50% mittlerer Tiefe</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="138"/>
+        <location filename="../build/ui_plannerSettings.h" line="427"/>
+        <source>50% avg. depth to 6m</source>
+        <translation>50% mitlerer Tiefe bis 6m</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="155"/>
+        <location filename="../build/ui_plannerSettings.h" line="429"/>
+        <source>6m to surface</source>
+        <translation>6m bis Oberfläche</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="175"/>
         <location filename="../build/ui_plannerSettings.h" line="431"/>
         <source>Descent</source>
@@ -10890,12 +11081,35 @@ p, li { white-space: pre-wrap; }
         <translation>VPM-B Deko</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="268"/>
+        <source>Bühlmann deco</source>
+        <translation>Bühlmann Deko</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="278"/>
         <location filename="../build/ui_plannerSettings.h" line="445"/>
         <source>Reserve gas</source>
         <translation>Reservegas</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="288"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="549"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="578"/>
+        <location filename="../build/ui_plannerSettings.h" line="446"/>
+        <location filename="../build/ui_plannerSettings.h" line="459"/>
+        <location filename="../build/ui_plannerSettings.h" line="461"/>
+        <source>bar</source>
+        <translation>bar</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="307"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="416"/>
+        <location filename="../build/ui_plannerSettings.h" line="437"/>
+        <location filename="../build/ui_plannerSettings.h" line="440"/>
+        <source>%</source>
+        <translation>%</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="320"/>
         <location filename="../build/ui_plannerSettings.h" line="449"/>
         <source>Postpone gas change if a stop is not required</source>
@@ -10914,12 +11128,10 @@ p, li { white-space: pre-wrap; }
         <translation>GF niedrig</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="307"/>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="416"/>
-        <location filename="../build/ui_plannerSettings.h" line="437"/>
-        <location filename="../build/ui_plannerSettings.h" line="440"/>
-        <source>%</source>
-        <translation>%</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="353"/>
+        <location filename="../build/ui_plannerSettings.h" line="436"/>
+        <source>Plan backgas breaks</source>
+        <translation>Plane backgas Pausen</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="360"/>
@@ -10928,10 +11140,10 @@ p, li { white-space: pre-wrap; }
         <translation>GF hoch</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="429"/>
-        <location filename="../build/ui_plannerSettings.h" line="441"/>
-        <source>Drop to first depth</source>
-        <translation>Direkter Abstieg zur ersten Tiefe</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="370"/>
+        <location filename="../build/ui_plannerSettings.h" line="453"/>
+        <source>min</source>
+        <translation>min</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="389"/>
@@ -10940,163 +11152,139 @@ p, li { white-space: pre-wrap; }
         <translation>Letzter Stopp auf 6m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="353"/>
-        <location filename="../build/ui_plannerSettings.h" line="436"/>
-        <source>Plan backgas breaks</source>
-        <translation>Plane backgas Pausen</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="396"/>
+        <source>Maximize bottom time allowed by gas and no decompression limits</source>
+        <translation>Maximale Grundzeit ohne Dekostopps und bei Beachtung der Gasreserve</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="515"/>
-        <location filename="../build/ui_plannerSettings.h" line="455"/>
-        <source>Gas options</source>
-        <translation>Gas Optionen</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="399"/>
+        <location filename="../build/ui_plannerSettings.h" line="443"/>
+        <source>Recreational mode</source>
+        <translation>Freizeitmodus</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="594"/>
-        <location filename="../build/ui_plannerSettings.h" line="456"/>
-        <source>Bottom SAC</source>
-        <translation>SAC</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="429"/>
+        <location filename="../build/ui_plannerSettings.h" line="441"/>
+        <source>Drop to first depth</source>
+        <translation>Direkter Abstieg zur ersten Tiefe</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="692"/>
-        <location filename="../build/ui_plannerSettings.h" line="457"/>
-        <source>Deco SAC</source>
-        <translation>Deko AMV</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="436"/>
+        <location filename="../build/ui_plannerSettings.h" line="452"/>
+        <source>Min. switch duration</source>
+        <translation>Min. Schaltdauer</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="601"/>
-        <location filename="../build/ui_plannerSettings.h" line="458"/>
-        <source>Bottom pO₂</source>
-        <translation>Grund pO₂</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="459"/>
+        <location filename="../build/ui_plannerSettings.h" line="444"/>
+        <source>Safety stop</source>
+        <translation>Sicherheitsstopp</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="685"/>
-        <location filename="../build/ui_plannerSettings.h" line="460"/>
-        <source>Deco pO₂</source>
-        <translation>Deko pO₂</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="495"/>
+        <source>Conservatism level</source>
+        <translation>Konservativismus</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="515"/>
+        <location filename="../build/ui_plannerSettings.h" line="455"/>
+        <source>Gas options</source>
+        <translation>Gas Optionen</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="565"/>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="672"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="698"/>
         <location filename="../build/ui_plannerSettings.h" line="462"/>
         <location filename="../build/ui_plannerSettings.h" line="463"/>
         <source>ℓ/min</source>
         <translation>ℓ/min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="632"/>
-        <location filename="../build/ui_plannerSettings.h" line="468"/>
-        <source>Display runtime</source>
-        <translation>Zeige runtime</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="645"/>
-        <location filename="../build/ui_plannerSettings.h" line="472"/>
-        <source>Display segment duration</source>
-        <translation>Zeige Segmentdauer</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="655"/>
-        <location filename="../build/ui_plannerSettings.h" line="476"/>
-        <source>Display transitions in deco</source>
-        <translation>Aufstiege in der Deko anzeigen</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="662"/>
-        <location filename="../build/ui_plannerSettings.h" line="477"/>
-        <source>Verbatim dive plan</source>
-        <translation>Ausführlicher Tauchplan</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="288"/>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="549"/>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="578"/>
-        <location filename="../build/ui_plannerSettings.h" line="446"/>
-        <location filename="../build/ui_plannerSettings.h" line="459"/>
-        <location filename="../build/ui_plannerSettings.h" line="461"/>
-        <source>bar</source>
-        <translation>bar</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="121"/>
-        <location filename="../build/ui_plannerSettings.h" line="425"/>
-        <source>75% to 50% avg. depth</source>
-        <translation>75% bis 50% mittlerer Tiefe</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="138"/>
-        <location filename="../build/ui_plannerSettings.h" line="427"/>
-        <source>50% avg. depth to 6m</source>
-        <translation>50% mitlerer Tiefe bis 6m</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="155"/>
-        <location filename="../build/ui_plannerSettings.h" line="429"/>
-        <source>6m to surface</source>
-        <translation>6m bis Oberfläche</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="268"/>
-        <source>Bühlmann deco</source>
-        <translation>Bühlmann Deko</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="370"/>
-        <location filename="../build/ui_plannerSettings.h" line="453"/>
-        <source>min</source>
-        <translation>min</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="396"/>
-        <source>Maximize bottom time allowed by gas and no decompression limits</source>
-        <translation>Maximale Grundzeit ohne Dekostopps und bei Beachtung der Gasreserve</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="594"/>
+        <source>m</source>
+        <translation>m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="399"/>
-        <location filename="../build/ui_plannerSettings.h" line="443"/>
-        <source>Recreational mode</source>
-        <translation>Freizeitmodus</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="606"/>
+        <source>Used to calculate best mix. Select best mix depth in &apos;Available gases&apos; table by entering gas depth, followed by &quot;B&quot; (best trimix mix) or &quot;BN&quot; (best nitrox mix)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="436"/>
-        <location filename="../build/ui_plannerSettings.h" line="452"/>
-        <source>Min. switch duration</source>
-        <translation>Min. Schaltdauer</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="613"/>
+        <location filename="../build/ui_plannerSettings.h" line="456"/>
+        <source>Bottom SAC</source>
+        <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="459"/>
-        <location filename="../build/ui_plannerSettings.h" line="444"/>
-        <source>Safety stop</source>
-        <translation>Sicherheitsstopp</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="620"/>
+        <location filename="../build/ui_plannerSettings.h" line="458"/>
+        <source>Bottom pO₂</source>
+        <translation>Grund pO₂</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="495"/>
-        <source>Conservatism level</source>
-        <translation>Konservativismus</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="627"/>
+        <source>Best mix END</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="608"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="634"/>
         <location filename="../build/ui_plannerSettings.h" line="464"/>
         <source>Notes</source>
         <translation>Notizen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="629"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="655"/>
         <location filename="../build/ui_plannerSettings.h" line="466"/>
         <source>In dive plan, show runtime (absolute time) of stops</source>
         <translation>Zeige runtime (absolute Zeit) der Stopps im Tauchplan</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="642"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="658"/>
+        <location filename="../build/ui_plannerSettings.h" line="468"/>
+        <source>Display runtime</source>
+        <translation>Zeige runtime</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="668"/>
         <location filename="../build/ui_plannerSettings.h" line="470"/>
         <source>In dive plan, show duration (relative time) of stops</source>
         <translation>Zeige Dauer (relative Zeit) der Stopps im Tauchplan.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="652"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="671"/>
+        <location filename="../build/ui_plannerSettings.h" line="472"/>
+        <source>Display segment duration</source>
+        <translation>Zeige Segmentdauer</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="678"/>
         <location filename="../build/ui_plannerSettings.h" line="474"/>
         <source>In diveplan, list transitions or treat them as implicit</source>
         <translation>Zeige Aufstiege im Tauchplen oder behandle sie als implizit</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="681"/>
+        <location filename="../build/ui_plannerSettings.h" line="476"/>
+        <source>Display transitions in deco</source>
+        <translation>Aufstiege in der Deko anzeigen</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="688"/>
+        <location filename="../build/ui_plannerSettings.h" line="477"/>
+        <source>Verbatim dive plan</source>
+        <translation>Ausführlicher Tauchplan</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="711"/>
+        <location filename="../build/ui_plannerSettings.h" line="460"/>
+        <source>Deco pO₂</source>
+        <translation>Deko pO₂</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="718"/>
+        <location filename="../build/ui_plannerSettings.h" line="457"/>
+        <source>Deco SAC</source>
+        <translation>Deko AMV</translation>
+    </message>
 </context>
 </TS>
\ No newline at end of file
diff --git a/translations/subsurface_el_GR.ts b/translations/subsurface_el_GR.ts
index 5acb85fc0..40565b99b 100644
--- a/translations/subsurface_el_GR.ts
+++ b/translations/subsurface_el_GR.ts
@@ -105,6 +105,11 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="56"/>
+        <source>Could not initialize Winsock version 2.2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="134"/>
         <source>Trying to turn on the local Bluetooth device...</source>
         <translation type="unfinished"/>
@@ -115,6 +120,11 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="167"/>
+        <source>Remote devices list was cleared.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="183"/>
         <source>Scanning for remote devices...</source>
         <translation type="unfinished"/>
@@ -125,6 +135,22 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="208"/>
+        <source>The local Bluetooth device was %1.</source>
+        <extracomment>%1 will be replaced with &quot;turned on&quot; or &quot;turned off&quot;</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
+        <source>turned on</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
+        <source>turned off</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="225"/>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="339"/>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="359"/>
@@ -172,37 +198,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="352"/>
-        <source>Device %1 was paired and is authorized.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="56"/>
-        <source>Could not initialize Winsock version 2.2</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="167"/>
-        <source>Remote devices list was cleared.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="208"/>
-        <source>The local Bluetooth device was %1.</source>
-        <extracomment>%1 will be replaced with &quot;turned on&quot; or &quot;turned off&quot;</extracomment>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
-        <source>turned on</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
-        <source>turned off</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="307"/>
         <source>Remove pairing</source>
         <translation type="unfinished"/>
@@ -228,6 +223,11 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="352"/>
+        <source>Device %1 was paired and is authorized.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="378"/>
         <source>The device %1 can now be used for connection. You can press the Save button.</source>
         <translation type="unfinished"/>
@@ -286,12 +286,12 @@
 <context>
     <name>BuddyFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="621"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="619"/>
         <source>Person: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="622"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="620"/>
         <source>Searches for buddies and divemasters</source>
         <translation type="unfinished"/>
     </message>
@@ -299,7 +299,7 @@
 <context>
     <name>BuddyFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="243"/>
+        <location filename="../qt-models/filtermodels.cpp" line="248"/>
         <source>No buddies</source>
         <translation type="unfinished"/>
     </message>
@@ -307,25 +307,30 @@
 <context>
     <name>CloudCredentials</name>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="49"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="50"/>
         <source>Cloud credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="55"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="56"/>
         <source>Email</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="67"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="68"/>
         <source>Password</source>
         <translation>Κωδικός</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="90"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="92"/>
         <source>Show password</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="97"/>
+        <source>PIN</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>ColumnNameProvider</name>
@@ -381,6 +386,16 @@
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
+        <source>Max. depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
+        <source>Avg. depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
         <source>Divemaster</source>
         <translation>Divemaster</translation>
     </message>
@@ -391,6 +406,11 @@
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
+        <source>Suit</source>
+        <translation>Στολή</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
         <source>Notes</source>
         <translation>Σημειώσεις</translation>
     </message>
@@ -410,21 +430,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
-        <source>Max. depth</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
-        <source>Avg. depth</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
-        <source>Suit</source>
-        <translation>Στολή</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="44"/>
         <source>O₂</source>
         <translation type="unfinished"/>
@@ -538,7 +543,7 @@
         <translation>Unable to create libdivecomputer context</translation>
     </message>
     <message>
-        <location filename="../core/configuredivecomputer.cpp" line="660"/>
+        <location filename="../core/configuredivecomputer.cpp" line="656"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation type="unfinished"/>
     </message>
@@ -558,11 +563,19 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="170"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1520"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1533"/>
-        <source>...</source>
-        <translation>...</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="47"/>
+        <source>Connect via Bluetooth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="54"/>
+        <source>Connect</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="64"/>
+        <source>Disconnect</source>
+        <translation>Αποσύνδεση</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="80"/>
@@ -571,12 +584,24 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="90"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1523"/>
+        <source>Read settings from backup file or from device before writing to the device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="93"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1525"/>
         <source>Save changes to device</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="116"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1527"/>
+        <source>Read settings from backup file or from device before writing to a backup file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="119"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1529"/>
         <source>Backup</source>
@@ -595,14 +620,39 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="163"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1532"/>
+        <source>Save libdivecomputer logfile</source>
+        <translation>Save libdivecomputer logfile</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="170"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1520"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1533"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="177"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1534"/>
         <source>Cancel</source>
         <translation>Ακύρωση</translation>
     </message>
     <message>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1539"/>
-        <source>OSTC 3</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="214"/>
+        <source>OSTC 3,Sport,Cr,2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="223"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1541"/>
+        <source>Suunto Vyper family</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="232"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1543"/>
+        <source>OSTC, Mk.2/2N/2C</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -616,40 +666,56 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="326"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1656"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1943"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1546"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1726"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1766"/>
-        <source>Serial No.</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="260"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1575"/>
+        <source>Eco</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="349"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1679"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1980"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1547"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1727"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1767"/>
-        <source>Firmware version</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="265"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1576"/>
+        <source>Medium</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="538"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1713"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1990"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1548"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1729"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1768"/>
-        <source>Custom text</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="270"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1577"/>
+        <source>High</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="385"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1549"/>
-        <source>Language</source>
-        <translation>Γλώσσα</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="278"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="826"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="849"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="875"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="927"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="993"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1019"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1101"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1117"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1450"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2278"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2382"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2408"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2434"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2474"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2497"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1586"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1621"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1623"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1625"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1628"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1637"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1638"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1710"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1785"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1789"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1801"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1803"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1806"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1807"/>
+        <source>%</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="289"/>
@@ -676,38 +742,62 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="579"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1557"/>
-        <source>Dive mode</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="313"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1582"/>
+        <source>m/°C</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="556"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1560"/>
-        <source>OC</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="318"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1583"/>
+        <source>ft/°F</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="561"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1561"/>
-        <source>CC</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="326"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1656"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1943"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1546"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1726"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1766"/>
+        <source>Serial No.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="566"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2336"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1562"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1793"/>
-        <source>Gauge</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="349"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1679"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1980"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1547"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1727"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1767"/>
+        <source>Firmware version</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="571"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1563"/>
-        <source>Apnea</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="360"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1568"/>
+        <source>MMDDYY</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="365"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1569"/>
+        <source>DDMMYY</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="370"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1570"/>
+        <source>YYMMDD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="385"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1549"/>
+        <source>Language</source>
+        <translation>Γλώσσα</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="395"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2063"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1565"/>
@@ -716,165 +806,154 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="360"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1568"/>
-        <source>MMDDYY</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="405"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1572"/>
+        <source>Brightness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="365"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1569"/>
-        <source>DDMMYY</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="415"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1850"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1579"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1753"/>
+        <source>Units</source>
+        <translation>Μονάδες Μέτρησης</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="425"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1585"/>
+        <source>Salinity (0-5%)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="370"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1570"/>
-        <source>YYMMDD</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="438"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1615"/>
+        <source>Reset device to default settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1042"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2457"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1639"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1805"/>
-        <source>Saturation</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="452"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1590"/>
+        <source>230LSB/Gauss</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="278"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="826"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="849"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="875"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="927"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="993"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1019"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1101"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1117"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1450"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2278"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2382"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2408"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2434"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2474"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2497"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1586"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1621"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1623"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1625"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1628"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1637"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1638"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1710"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1785"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1789"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1801"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1803"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1806"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1807"/>
-        <source>%</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="457"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1591"/>
+        <source>330LSB/Gauss</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="865"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2261"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1624"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1784"/>
-        <source>Desaturation</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="462"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1592"/>
+        <source>390LSB/Gauss</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="983"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2398"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1636"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1800"/>
-        <source>Last deco</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="467"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1593"/>
+        <source>440LSB/Gauss</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="711"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="736"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="758"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="904"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2181"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2206"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2228"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2307"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1626"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1786"/>
-        <source> m</source>
-        <translation>m</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="472"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1594"/>
+        <source>660LSB/Gauss</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="405"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1572"/>
-        <source>Brightness</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="477"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1595"/>
+        <source>820LSB/Gauss</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="260"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1575"/>
-        <source>Eco</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="482"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1596"/>
+        <source>1090LSB/Gauss</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="265"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1576"/>
-        <source>Medium</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="487"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1597"/>
+        <source>1370LSB/Gauss</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="270"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1577"/>
-        <source>High</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="521"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1587"/>
+        <source>Compass gain</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="603"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2034"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1599"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1779"/>
-        <source>Sampling rate</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="531"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1799"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1745"/>
+        <source>Computer model</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="590"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1602"/>
-        <source>2s</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="538"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1713"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1990"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1548"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1729"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1768"/>
+        <source>Custom text</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="595"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1769"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1603"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1739"/>
-        <source>10s</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="556"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1560"/>
+        <source>OC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="415"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1850"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1579"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1753"/>
-        <source>Units</source>
-        <translation>Μονάδες Μέτρησης</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="561"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1561"/>
+        <source>CC</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="313"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1582"/>
-        <source>m/°C</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="566"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2336"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1562"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1793"/>
+        <source>Gauge</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="318"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1583"/>
-        <source>ft/°F</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="571"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1563"/>
+        <source>Apnea</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="644"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1605"/>
-        <source>Dive mode color</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="579"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1557"/>
+        <source>Dive mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="590"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1602"/>
+        <source>2s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="595"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1769"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1603"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1739"/>
+        <source>10s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="603"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2034"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1599"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1779"/>
+        <source>Sampling rate</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -902,12 +981,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="425"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1585"/>
-        <source>Salinity (0-5%)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="637"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2092"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1613"/>
@@ -916,89 +989,79 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="521"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1587"/>
-        <source>Compass gain</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="90"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1523"/>
-        <source>Read settings from backup file or from device before writing to the device</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="116"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1527"/>
-        <source>Read settings from backup file or from device before writing to a backup file</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="232"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1543"/>
-        <source>OSTC, Mk.2/2N/2C</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="644"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1605"/>
+        <source>Dive mode color</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="452"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1590"/>
-        <source>230LSB/Gauss</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="654"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2020"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1614"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1771"/>
+        <source>Show safety stop</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="457"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1591"/>
-        <source>330LSB/Gauss</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="661"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2145"/>
+        <source>End Depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="462"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1592"/>
-        <source>390LSB/Gauss</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="671"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2162"/>
+        <source> s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="467"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1593"/>
-        <source>440LSB/Gauss</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="687"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1953"/>
+        <source>Length</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="472"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1594"/>
-        <source>660LSB/Gauss</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="694"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2138"/>
+        <source>Start Depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="477"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1595"/>
-        <source>820LSB/Gauss</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="701"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2152"/>
+        <source>Reset Depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="482"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1596"/>
-        <source>1090LSB/Gauss</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="711"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="736"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="758"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="904"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2181"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2206"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2228"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2307"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1626"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1786"/>
+        <source> m</source>
+        <translation>m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="487"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1597"/>
-        <source>1370LSB/Gauss</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="778"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2248"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1643"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1810"/>
+        <source>Advanced settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="654"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2020"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1614"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1771"/>
-        <source>Show safety stop</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="784"/>
+        <source>Left button sensitivity</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="438"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1615"/>
-        <source>Reset device to default settings</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="791"/>
+        <source>Always show ppO2</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1010,20 +1073,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="223"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1541"/>
-        <source>Suunto Vyper family</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="778"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2248"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1643"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1810"/>
-        <source>Advanced settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="805"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2271"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1618"/>
@@ -1054,6 +1103,14 @@
         <translation>GFHigh</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="865"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2261"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1624"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1784"/>
+        <source>Desaturation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="917"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2320"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1627"/>
@@ -1068,14 +1125,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="973"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2369"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1630"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1788"/>
-        <source> min</source>
-        <translation>min</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="960"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2331"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1633"/>
@@ -1084,60 +1133,25 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="47"/>
-        <source>Connect via Bluetooth</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="163"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1532"/>
-        <source>Save libdivecomputer logfile</source>
-        <translation>Save libdivecomputer logfile</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="661"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2145"/>
-        <source>End Depth</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="671"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2162"/>
-        <source> s</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="687"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1953"/>
-        <source>Length</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="694"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2138"/>
-        <source>Start Depth</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="701"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2152"/>
-        <source>Reset Depth</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="784"/>
-        <source>Left button sensitivity</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="965"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1634"/>
+        <source>ZH-L16+GF</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="791"/>
-        <source>Always show ppO2</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="973"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2369"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1630"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1788"/>
+        <source> min</source>
+        <translation>min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="965"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1634"/>
-        <source>ZH-L16+GF</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="983"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2398"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1636"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1800"/>
+        <source>Last deco</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1157,6 +1171,14 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1042"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2457"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1639"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1805"/>
+        <source>Saturation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1052"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1642"/>
         <source>Flip screen</source>
@@ -1168,12 +1190,22 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1066"/>
+        <source>MOD warning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1073"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2513"/>
         <source>Graphical speed indicator</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1080"/>
+        <source>Dynamic ascent rate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1087"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2552"/>
         <source>Bottom gas consumption</source>
@@ -1186,6 +1218,14 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1133"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1149"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2520"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2536"/>
+        <source> ℓ/min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1165"/>
         <source>Temperature sensor offset</source>
         <translation type="unfinished"/>
@@ -1204,6 +1244,18 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1235"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1320"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2610"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2695"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1645"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1668"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1812"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1835"/>
+        <source>%O₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1240"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1325"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2615"/>
@@ -1322,15 +1374,9 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1691"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1858"/>
-        <source>Set point [cbar]</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1693"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1860"/>
-        <source>Change depth [m]</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1405"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2770"/>
+        <source>Setpoint</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1370,6 +1416,12 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1443"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1709"/>
+        <source>O₂ in calibration gas</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1467"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1713"/>
         <source>Fixed setpoint</source>
@@ -1400,101 +1452,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1748"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1733"/>
-        <source>P1 (medium)</source>
-        <extracomment>Suunto safety level</extracomment>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1753"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1734"/>
-        <source>P2 (high)</source>
-        <extracomment>Suunto safety level</extracomment>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1792"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1744"/>
-        <source>Total dive time</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2109"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1769"/>
-        <source>kg/ℓ</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2346"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1795"/>
-        <source>Apnoea</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1583"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1722"/>
-        <source>Safety level</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="54"/>
-        <source>Connect</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="64"/>
-        <source>Disconnect</source>
-        <translation>Αποσύνδεση</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="214"/>
-        <source>OSTC 3,Sport,Cr,2</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1066"/>
-        <source>MOD warning</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1080"/>
-        <source>Dynamic ascent rate</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1133"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1149"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2520"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2536"/>
-        <source> ℓ/min</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1235"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1320"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2610"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2695"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1645"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1668"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1812"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1835"/>
-        <source>%O₂</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1405"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2770"/>
-        <source>Setpoint</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1443"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1709"/>
-        <source>O₂ in calibration gas</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1535"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2843"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1719"/>
@@ -1511,6 +1468,12 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1583"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1722"/>
+        <source>Safety level</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1609"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1723"/>
         <source>Altitude range</source>
@@ -1544,6 +1507,20 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1748"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1733"/>
+        <source>P1 (medium)</source>
+        <extracomment>Suunto safety level</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1753"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1734"/>
+        <source>P2 (high)</source>
+        <extracomment>Suunto safety level</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1761"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1736"/>
         <source>Sample rate</source>
@@ -1568,10 +1545,9 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="531"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1799"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1745"/>
-        <source>Computer model</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1792"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1744"/>
+        <source>Total dive time</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1637,12 +1613,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2099"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1765"/>
-        <source>Salinity</source>
-        <translation>Αλμυρότητα</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2074"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1774"/>
         <source>MM/DD/YY</source>
@@ -1661,12 +1631,30 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2099"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1765"/>
+        <source>Salinity</source>
+        <translation>Αλμυρότητα</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2109"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1769"/>
+        <source>kg/ℓ</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2341"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1794"/>
         <source>ZH-L16 CC</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2346"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1795"/>
+        <source>Apnoea</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2351"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1796"/>
         <source>L16-GF OC</source>
@@ -1685,85 +1673,110 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1108"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1129"/>
-        <source>Backup files (*.xml)</source>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1539"/>
+        <source>OSTC 3</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1113"/>
-        <source>An error occurred while saving the backup file.
-%1</source>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1691"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1858"/>
+        <source>Set point [cbar]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1116"/>
-        <source>Backup succeeded</source>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1693"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1860"/>
+        <source>Change depth [m]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1117"/>
-        <source>Your settings have been saved to: %1</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1110"/>
+        <source>Backup dive computer settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1107"/>
-        <source>Backup dive computer settings</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1111"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1132"/>
+        <source>Backup files (*.xml)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1112"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1115"/>
         <source>XML backup error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1128"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1116"/>
+        <source>An error occurred while saving the backup file.
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1119"/>
+        <source>Backup succeeded</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1120"/>
+        <source>Your settings have been saved to: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1131"/>
         <source>Restore dive computer settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1134"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1137"/>
         <source>XML restore error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1135"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1138"/>
         <source>An error occurred while restoring the backup file.
 %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1139"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1142"/>
         <source>Restore succeeded</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1140"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1143"/>
         <source>Your settings have been restored successfully.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1150"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1153"/>
         <source>Select firmware file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1151"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1154"/>
         <source>All files (*.*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1207"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1210"/>
         <source>Choose file for divecomputer download logfile</source>
         <translation>Επιλέξτε το αρχείο για το logfile της λήψης από τον υπολογιστή κατάδυσης</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1208"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1211"/>
         <source>Log files (*.log)</source>
         <translation>Log files (*.log)</translation>
     </message>
 </context>
 <context>
+    <name>ContextDrawer</name>
+    <message>
+        <location filename="../mobile-widgets/qml/kirigami/src/controls/ContextDrawer.qml" line="76"/>
+        <source>Actions</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>CylindersModel</name>
     <message>
         <location filename="../qt-models/cylindermodel.cpp" line="16"/>
@@ -1777,11 +1790,6 @@
     </message>
     <message>
         <location filename="../qt-models/cylindermodel.cpp" line="16"/>
-        <source>He%</source>
-        <translation>He%</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="16"/>
         <source>Work press.</source>
         <translation type="unfinished"/>
     </message>
@@ -1801,9 +1809,24 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="16"/>
+        <source>He%</source>
+        <translation>He%</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
+        <source>Deco switch at</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
+        <source>Bot. MOD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../qt-models/cylindermodel.cpp" line="17"/>
-        <source>Switch at</source>
-        <translation>Αλλαγή στα</translation>
+        <source>MND</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-models/cylindermodel.cpp" line="17"/>
@@ -1821,17 +1844,32 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="161"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="177"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation>Πατώντας εδώ θα διαγραφή αυτή η φιάλη.</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="383"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="180"/>
+        <source>Switch depth for deco gas. Calculated using Deco pO₂ preference, unless set manually.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="183"/>
+        <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to &apos;*&apos; for best O₂% for max depth.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="186"/>
+        <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to &apos;*&apos; for best He% for max depth.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="444"/>
         <source>Cylinder cannot be removed</source>
         <translation>Η φιάλη δεν μπορεί να διαγραφεί</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="384"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="445"/>
         <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source>
         <translation type="unfinished"/>
     </message>
@@ -1851,42 +1889,24 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="73"/>
+        <location filename="../build/ui_divecomponentselection.h" line="141"/>
+        <source>Dive site</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="80"/>
         <location filename="../build/ui_divecomponentselection.h" line="142"/>
         <source>Suit</source>
         <translation>Στολή</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="122"/>
-        <location filename="../build/ui_divecomponentselection.h" line="148"/>
-        <source>Divemaster</source>
-        <translation>Divemaster</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="129"/>
-        <location filename="../build/ui_divecomponentselection.h" line="149"/>
-        <source>Buddy</source>
-        <translation>Ζευγάρι</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="136"/>
-        <location filename="../build/ui_divecomponentselection.h" line="150"/>
-        <source>Rating</source>
-        <translation>Βαθμός</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="87"/>
         <location filename="../build/ui_divecomponentselection.h" line="143"/>
         <source>Visibility</source>
         <translation>Ορατότητα</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="73"/>
-        <location filename="../build/ui_divecomponentselection.h" line="141"/>
-        <source>Dive site</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="94"/>
         <location filename="../build/ui_divecomponentselection.h" line="144"/>
         <source>Notes</source>
@@ -1910,10 +1930,34 @@
         <source>Cylinders</source>
         <translation>Φιάλες</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="122"/>
+        <location filename="../build/ui_divecomponentselection.h" line="148"/>
+        <source>Divemaster</source>
+        <translation>Divemaster</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="129"/>
+        <location filename="../build/ui_divecomponentselection.h" line="149"/>
+        <source>Buddy</source>
+        <translation>Ζευγάρι</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="136"/>
+        <location filename="../build/ui_divecomponentselection.h" line="150"/>
+        <source>Rating</source>
+        <translation>Βαθμός</translation>
+    </message>
 </context>
 <context>
     <name>DiveComputerManagementDialog</name>
     <message>
+        <location filename="../desktop-widgets/divecomputermanagementdialog.ui" line="17"/>
+        <location filename="../build/ui_divecomputermanagementdialog.h" line="65"/>
+        <source>Edit dive computer nicknames</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divecomputermanagementdialog.cpp" line="49"/>
         <source>Remove the selected dive computer?</source>
         <translation type="unfinished"/>
@@ -1925,12 +1969,6 @@
         <translation>Ο Υπολογιστής Κατάδυσης θα αφαιρεθεί.
 Είστε σίγουροι;</translation>
     </message>
-    <message>
-        <location filename="../desktop-widgets/divecomputermanagementdialog.ui" line="17"/>
-        <location filename="../build/ui_divecomputermanagementdialog.h" line="65"/>
-        <source>Edit dive computer nicknames</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>DiveComputerModel</name>
@@ -1958,17 +1996,17 @@
 <context>
     <name>DiveDetails</name>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="33"/>
+        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="38"/>
         <source>Dive details</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="67"/>
+        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="72"/>
         <source>Delete dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="84"/>
+        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="89"/>
         <source>Show on map</source>
         <translation type="unfinished"/>
     </message>
@@ -1976,88 +2014,93 @@
 <context>
     <name>DiveDetailsEdit</name>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="74"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="80"/>
         <source>Dive %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="78"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="84"/>
         <source>Date:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="86"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="92"/>
         <source>Location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="95"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="101"/>
         <source>Coordinates:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="104"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="110"/>
         <source>Use current
 GPS location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="118"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="124"/>
         <source>Depth:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="127"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="133"/>
         <source>Duration:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="137"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="143"/>
         <source>Air Temp:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="146"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="152"/>
         <source>Water Temp:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="155"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="161"/>
         <source>Suit:</source>
         <translation>Στολή:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="164"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="176"/>
         <source>Buddy:</source>
         <translation>Ζευγάρι:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="173"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="191"/>
         <source>Dive Master:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="182"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="206"/>
         <source>Weight:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="192"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="216"/>
+        <source>Cylinder:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="231"/>
         <source>Gas mix:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="203"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="241"/>
         <source>Start Pressure:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="213"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="250"/>
         <source>End Pressure:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="224"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="260"/>
         <source>Notes:</source>
         <translation>Σημειώσεις:</translation>
     </message>
@@ -2095,42 +2138,42 @@ GPS location:</source>
         <translation>Στολή:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="159"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="158"/>
         <source>Air Temp:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="175"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="172"/>
         <source>Cylinder:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="189"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="185"/>
         <source>Water Temp:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="205"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="198"/>
         <source>Dive Master:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="220"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="211"/>
         <source>Weight:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="249"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="224"/>
         <source>Buddy:</source>
         <translation>Ζευγάρι:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="263"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="237"/>
         <source>SAC:</source>
         <translation>SAC:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="280"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="252"/>
         <source>Notes</source>
         <translation>Σημειώσεις</translation>
     </message>
@@ -2138,18 +2181,18 @@ GPS location:</source>
 <context>
     <name>DiveEventItem</name>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="134"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="165"/>
         <source>Manual switch to OC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="136"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="167"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation>έναρξη</translation>
     </message>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="137"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="168"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation>λήξη</translation>
@@ -2158,27 +2201,27 @@ GPS location:</source>
 <context>
     <name>DiveImportedModel</name>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="646"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="656"/>
         <source>Date/time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="648"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="658"/>
         <source>Duration</source>
         <translation>Διάρκεια</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="650"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="660"/>
         <source>Depth</source>
         <translation>Βάθος</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="672"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="682"/>
         <source>h:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="672"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="682"/>
         <source>min</source>
         <translation>min</translation>
     </message>
@@ -2187,8 +2230,8 @@ GPS location:</source>
     <name>DiveList</name>
     <message>
         <location filename="../mobile-widgets/qml/DiveList.qml" line="12"/>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="226"/>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="232"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="227"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="233"/>
         <source>Dive list</source>
         <translation type="unfinished"/>
     </message>
@@ -2203,110 +2246,115 @@ GPS location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="222"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="223"/>
         <source>Cloud credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="228"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="229"/>
         <source>Please tap the &apos;+&apos; button to add a dive</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="248"/>
+        <source>No dives in dive list</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DiveListView</name>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="846"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="849"/>
         <source>Expand all</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="848"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="851"/>
         <source>Collapse all</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="852"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="855"/>
         <source>Collapse others</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="856"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="859"/>
         <source>Remove dive(s) from trip</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="857"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="860"/>
         <source>Create new trip above</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="871"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="874"/>
         <source>Add dive(s) to trip immediately above</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="873"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="876"/>
         <source>Add dive(s) to trip immediately below</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="877"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="880"/>
         <source>Merge trip with trip above</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="878"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="881"/>
         <source>Merge trip with trip below</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="882"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="885"/>
         <source>Delete dive(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="884"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="887"/>
         <source>Mark dive(s) invalid</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="888"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="891"/>
         <source>Merge selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="890"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="893"/>
         <source>Renumber dive(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="891"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="894"/>
         <source>Shift dive times</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="892"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="895"/>
         <source>Split selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="893"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="896"/>
         <source>Load image(s) from file(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="894"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="897"/>
         <source>Load image(s) from web</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="917"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="919"/>
         <source>Open image files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="917"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="919"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation type="unfinished"/>
     </message>
@@ -2327,330 +2375,351 @@ GPS location:</source>
 <context>
     <name>DiveLogExportDialog</name>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="103"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="351"/>
-        <source>Export format</source>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="14"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="349"/>
+        <source>Export dive log files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="134"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="353"/>
-        <source>UDDF</source>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="44"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="369"/>
+        <source>General export</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="187"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="358"/>
-        <source>Worldmap</source>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="103"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="351"/>
+        <source>Export format</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="197"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="359"/>
-        <source>I&amp;mage depths</source>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="115"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="352"/>
+        <source>Subsurface &amp;XML</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="243"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="360"/>
-        <source>Selection</source>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="134"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="353"/>
+        <source>UDDF</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="252"/>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="346"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="361"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="372"/>
-        <source>Selected dives</source>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="147"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="354"/>
+        <source>di&amp;velogs.de</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="262"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="362"/>
-        <source>All dives</source>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="157"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="355"/>
+        <source>DiveShare</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="306"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="396"/>
-        <source>HTML</source>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="167"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="356"/>
+        <source>CSV dive profile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="14"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="349"/>
-        <source>Export dive log files</source>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="177"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="357"/>
+        <source>CSV dive details</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="44"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="369"/>
-        <source>General export</source>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="187"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="358"/>
+        <source>Worldmap</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="115"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="352"/>
-        <source>Subsurface &amp;XML</source>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="197"/>
+        <source>TeX</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="147"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="354"/>
-        <source>di&amp;velogs.de</source>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="207"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="359"/>
+        <source>I&amp;mage depths</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="157"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="355"/>
-        <source>DiveShare</source>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="253"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="360"/>
+        <source>Selection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="167"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="356"/>
-        <source>CSV dive profile</source>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="262"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="356"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="361"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="372"/>
+        <source>Selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="177"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="357"/>
-        <source>CSV dive details</source>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="272"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="362"/>
+        <source>All dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="275"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="285"/>
         <location filename="../build/ui_divelogexportdialog.h" line="363"/>
         <source>CSV units</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="288"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="298"/>
         <location filename="../build/ui_divelogexportdialog.h" line="366"/>
         <source>Metric</source>
         <translation>Μετρικό</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="293"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="303"/>
         <location filename="../build/ui_divelogexportdialog.h" line="367"/>
         <source>Imperial</source>
         <translation>Imperial</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="324"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="316"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="396"/>
+        <source>HTML</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="334"/>
         <location filename="../build/ui_divelogexportdialog.h" line="370"/>
         <source>General settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="330"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="340"/>
         <location filename="../build/ui_divelogexportdialog.h" line="371"/>
         <source>Subsurface numbers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="359"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="369"/>
         <location filename="../build/ui_divelogexportdialog.h" line="373"/>
         <source>Export yearly statistics</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="375"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="385"/>
         <location filename="../build/ui_divelogexportdialog.h" line="374"/>
         <source>All di&amp;ves</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="385"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="395"/>
         <location filename="../build/ui_divelogexportdialog.h" line="375"/>
         <source>Export list only</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="392"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="402"/>
         <location filename="../build/ui_divelogexportdialog.h" line="376"/>
         <source>Export photos</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="408"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="418"/>
         <location filename="../build/ui_divelogexportdialog.h" line="377"/>
         <source>Style options</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="423"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="433"/>
         <location filename="../build/ui_divelogexportdialog.h" line="378"/>
         <source>Font</source>
         <translation>Γραμματοσειρά</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="433"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="443"/>
         <location filename="../build/ui_divelogexportdialog.h" line="379"/>
         <source>Font size</source>
         <translation>Μέγεθος Γραμματοσειράς</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="444"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="454"/>
         <location filename="../build/ui_divelogexportdialog.h" line="382"/>
         <source>8</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="449"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="459"/>
         <location filename="../build/ui_divelogexportdialog.h" line="383"/>
         <source>10</source>
         <translation>10</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="454"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="464"/>
         <location filename="../build/ui_divelogexportdialog.h" line="384"/>
         <source>12</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="459"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="469"/>
         <location filename="../build/ui_divelogexportdialog.h" line="385"/>
         <source>14</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="464"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="474"/>
         <location filename="../build/ui_divelogexportdialog.h" line="386"/>
         <source>16</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="469"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="479"/>
         <location filename="../build/ui_divelogexportdialog.h" line="387"/>
         <source>18</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="474"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="484"/>
         <location filename="../build/ui_divelogexportdialog.h" line="388"/>
         <source>20</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="482"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="492"/>
         <location filename="../build/ui_divelogexportdialog.h" line="390"/>
         <source>Theme</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="493"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="503"/>
         <location filename="../build/ui_divelogexportdialog.h" line="393"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="95"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="99"/>
         <source>Light</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="498"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="508"/>
         <location filename="../build/ui_divelogexportdialog.h" line="394"/>
         <source>Sand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="134"/>
-        <source>UDDF files (*.uddf *.UDDF)</source>
-        <translation>UDDF αρχεία (*.uddf *.UDDF)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="142"/>
-        <source>CSV files (*.csv *.CSV)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="74"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="76"/>
         <source>Generic format that is used for data exchange between a variety of diving related programs.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="76"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="78"/>
         <source>Comma separated values describing the dive profile.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="78"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="80"/>
         <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="80"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="82"/>
         <source>Send the dive data to divelogs.de website.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="82"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="84"/>
         <source>Send the dive data to dive-share.appspot.com website</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="84"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="86"/>
         <source>HTML export of the dive locations, visualized on a world map.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="86"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="88"/>
         <source>Subsurface native XML format.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="88"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="90"/>
         <source>Write depths of images to file.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="133"/>
-        <source>Export UDDF file as</source>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="92"/>
+        <source>Write dive as TeX macros to file.</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.cpp" line="137"/>
+        <source>Export UDDF file as</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/>
+        <source>UDDF files (*.uddf *.UDDF)</source>
+        <translation>UDDF αρχεία (*.uddf *.UDDF)</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divelogexportdialog.cpp" line="141"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="145"/>
         <source>Export CSV file as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="148"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="142"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="146"/>
+        <source>CSV files (*.csv *.CSV)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="152"/>
         <source>Export world map</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="149"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="169"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="153"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="177"/>
         <source>HTML files (*.html)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="153"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="157"/>
         <source>Export Subsurface XML</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="158"/>
         <source>XML files (*.xml *.ssrf)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="162"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="166"/>
         <source>Save image depths</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="168"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="170"/>
+        <source>Export to TeX file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="170"/>
+        <source>TeX files (*.tex)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="176"/>
         <source>Export HTML files as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="184"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="192"/>
         <source>Please wait, exporting...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="219"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="227"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="311"/>
         <source>Can&apos;t open file %s</source>
         <translation type="unfinished"/>
     </message>
@@ -2664,25 +2733,6 @@ GPS location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="643"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="727"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="856"/>
-        <source>Time</source>
-        <translation>Ώρα</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.ui" line="127"/>
-        <location filename="../build/ui_divelogimportdialog.h" line="164"/>
-        <source>Metric</source>
-        <translation>Μετρικό</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.ui" line="132"/>
-        <location filename="../build/ui_divelogimportdialog.h" line="165"/>
-        <source>Imperial</source>
-        <translation>Imperial</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divelogimportdialog.ui" line="89"/>
         <location filename="../build/ui_divelogimportdialog.h" line="152"/>
         <source>dd.mm.yyyy</source>
@@ -2701,269 +2751,287 @@ GPS location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/divelogimportdialog.ui" line="108"/>
+        <location filename="../build/ui_divelogimportdialog.h" line="158"/>
+        <source>Seconds</source>
+        <translation>Δευτερόλεπτα (sec)</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.ui" line="113"/>
+        <location filename="../build/ui_divelogimportdialog.h" line="159"/>
+        <source>Minutes</source>
+        <translation>Λεπτά (min)</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.ui" line="118"/>
+        <location filename="../build/ui_divelogimportdialog.h" line="160"/>
+        <source>Minutes:seconds</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.ui" line="127"/>
+        <location filename="../build/ui_divelogimportdialog.h" line="164"/>
+        <source>Metric</source>
+        <translation>Μετρικό</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.ui" line="132"/>
+        <location filename="../build/ui_divelogimportdialog.h" line="165"/>
+        <source>Imperial</source>
+        <translation>Imperial</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divelogimportdialog.ui" line="155"/>
         <location filename="../build/ui_divelogimportdialog.h" line="167"/>
         <source>Drag the tags above to each corresponding column below</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="641"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="729"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="852"/>
-        <source>Dive #</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="355"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="528"/>
+        <source>Tab</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="642"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="723"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="854"/>
-        <source>Date</source>
-        <translation>Ημερομηνία</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="598"/>
+        <source>Some column headers were pre-populated; please drag and drop the headers so they match the column they are in.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="644"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="858"/>
-        <source>Duration</source>
-        <translation>Διάρκεια</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="636"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="761"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="857"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="925"/>
+        <source>Sample time</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="655"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="862"/>
-        <source>GPS</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="638"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="763"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="859"/>
+        <source>Sample depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="645"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="864"/>
-        <source>Max. depth</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="640"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="765"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="861"/>
+        <source>Sample temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="646"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="866"/>
-        <source>Avg. depth</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="642"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="767"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="863"/>
+        <source>Sample pO₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="658"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="872"/>
-        <source>Suit</source>
-        <translation>Στολή</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="644"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="769"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="865"/>
+        <source>Sample sensor1 pO₂</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="663"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="878"/>
-        <source>Tags</source>
-        <translation>Ετικέτες</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="646"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="771"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="867"/>
+        <source>Sample sensor2 pO₂</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="652"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="894"/>
-        <source>O₂</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="648"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="773"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="869"/>
+        <source>Sample sensor3 pO₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="653"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="896"/>
-        <source>He</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="650"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="775"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="871"/>
+        <source>Sample CNS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.ui" line="108"/>
-        <location filename="../build/ui_divelogimportdialog.h" line="158"/>
-        <source>Seconds</source>
-        <translation>Δευτερόλεπτα (sec)</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="652"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="777"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="873"/>
+        <source>Sample NDL</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.ui" line="113"/>
-        <location filename="../build/ui_divelogimportdialog.h" line="159"/>
-        <source>Minutes</source>
-        <translation>Λεπτά (min)</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="654"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="779"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="875"/>
+        <source>Sample TTS</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.ui" line="118"/>
-        <location filename="../build/ui_divelogimportdialog.h" line="160"/>
-        <source>Minutes:seconds</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="656"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="781"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="877"/>
+        <source>Sample stopdepth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="654"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="860"/>
-        <source>Location</source>
-        <translation>Τοποθεσία</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="658"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="783"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="879"/>
+        <source>Sample pressure</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="354"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="499"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="505"/>
-        <source>Tab</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="660"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="785"/>
+        <source>Sample setpoint</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="575"/>
-        <source>Some column headers were pre-populated; please drag and drop the headers so they match the column they are in.</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="664"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="759"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="929"/>
+        <source>Dive #</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="613"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="731"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="782"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="848"/>
-        <source>Sample time</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="665"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="753"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="931"/>
+        <source>Date</source>
+        <translation>Ημερομηνία</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="615"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="733"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="784"/>
-        <source>Sample depth</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="666"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="757"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="933"/>
+        <source>Time</source>
+        <translation>Ώρα</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="617"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="735"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="786"/>
-        <source>Sample temperature</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="667"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="935"/>
+        <source>Duration</source>
+        <translation>Διάρκεια</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="621"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="739"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="790"/>
-        <source>Sample sensor1 pO₂</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="668"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="941"/>
+        <source>Max. depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="623"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="741"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="792"/>
-        <source>Sample sensor2 pO₂</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="669"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="943"/>
+        <source>Avg. depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="625"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="743"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="794"/>
-        <source>Sample sensor3 pO₂</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="670"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="975"/>
+        <source>Air temp.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="633"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="751"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="802"/>
-        <source>Sample stopdepth</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="671"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="977"/>
+        <source>Water temp.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="637"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="755"/>
-        <source>Sample setpoint</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="672"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="965"/>
+        <source>Cyl. size</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="619"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="737"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="788"/>
-        <source>Sample pO₂</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="673"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="967"/>
+        <source>Start pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="627"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="745"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="796"/>
-        <source>Sample CNS</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="674"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="969"/>
+        <source>End pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="629"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="747"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="798"/>
-        <source>Sample NDL</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="675"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="971"/>
+        <source>O₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="631"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="749"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="800"/>
-        <source>Sample TTS</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="676"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="973"/>
+        <source>He</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="635"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="753"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="804"/>
-        <source>Sample pressure</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="677"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="937"/>
+        <source>Location</source>
+        <translation>Τοποθεσία</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="678"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="939"/>
+        <source>GPS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="656"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="868"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="679"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="945"/>
         <source>Divemaster</source>
         <translation>Divemaster</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="657"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="870"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="680"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="947"/>
         <source>Buddy</source>
         <translation>Ζευγάρι</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="659"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="681"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="949"/>
+        <source>Suit</source>
+        <translation>Στολή</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="682"/>
         <source>Rating</source>
         <translation>Βαθμός</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="660"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="683"/>
         <source>Visibility</source>
         <translation>Ορατότητα</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="661"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="874"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="684"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="951"/>
         <source>Notes</source>
         <translation>Σημειώσεις</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="662"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="876"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="685"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="953"/>
         <source>Weight</source>
         <translation>Βάρος</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="649"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="888"/>
-        <source>Cyl. size</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="650"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="890"/>
-        <source>Start pressure</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="651"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="892"/>
-        <source>End pressure</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="647"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="898"/>
-        <source>Air temp.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="648"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="900"/>
-        <source>Water temp.</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="686"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="955"/>
+        <source>Tags</source>
+        <translation>Ετικέτες</translation>
     </message>
 </context>
 <context>
     <name>DiveObjectHelper</name>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="287"/>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="323"/>
         <source>%1 dive(s)</source>
         <translation type="unfinished"/>
     </message>
@@ -2971,18 +3039,18 @@ GPS location:</source>
 <context>
     <name>DivePlanner</name>
     <message>
-        <location filename="../desktop-widgets/diveplanner.ui" line="152"/>
-        <location filename="../build/ui_diveplanner.h" line="190"/>
-        <source>Altitude</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/diveplanner.ui" line="109"/>
         <location filename="../build/ui_diveplanner.h" line="189"/>
         <source>Planned dive time</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/diveplanner.ui" line="152"/>
+        <location filename="../build/ui_diveplanner.h" line="190"/>
+        <source>Altitude</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/diveplanner.ui" line="159"/>
         <location filename="../build/ui_diveplanner.h" line="191"/>
         <source>ATM pressure</source>
@@ -3016,32 +3084,32 @@ GPS location:</source>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="134"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="136"/>
         <source>unknown</source>
         <translation>άγνωστο</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="312"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="326"/>
         <source>Final depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="314"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="328"/>
         <source>Run time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="316"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="330"/>
         <source>Duration</source>
         <translation>Διάρκεια</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="318"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="332"/>
         <source>Used gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="320"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="334"/>
         <source>CC setpoint</source>
         <translation type="unfinished"/>
     </message>
@@ -3049,22 +3117,22 @@ GPS location:</source>
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="108"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="112"/>
         <source>Dive planner points</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="112"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="116"/>
         <source>Available gases</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="137"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="143"/>
         <source>Add dive data point</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="146"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="152"/>
         <source>Save new</source>
         <translation type="unfinished"/>
     </message>
@@ -3097,11 +3165,36 @@ GPS location:</source>
         <translation>Χρώμα</translation>
     </message>
     <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="124"/>
+        <source>User entered</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="126"/>
+        <source>Cylinder index</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="128"/>
         <source>Pressure S</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="130"/>
+        <source>Pressure I</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="132"/>
+        <source>Ceiling</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="134"/>
+        <source>SAC</source>
+        <translation>SAC</translation>
+    </message>
+    <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="136"/>
         <source>pN₂</source>
         <translation>pN₂</translation>
@@ -3137,50 +3230,25 @@ GPS location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="152"/>
-        <source>Heart rate</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="156"/>
-        <source>Mean depth @ s</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="150"/>
         <source>Ambient pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="154"/>
-        <source>Gradient factor</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="130"/>
-        <source>Pressure I</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="124"/>
-        <source>User entered</source>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="152"/>
+        <source>Heart rate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="126"/>
-        <source>Cylinder index</source>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="154"/>
+        <source>Gradient factor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="132"/>
-        <source>Ceiling</source>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="156"/>
+        <source>Mean depth @ s</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="134"/>
-        <source>SAC</source>
-        <translation>SAC</translation>
-    </message>
 </context>
 <context>
     <name>DiveShareExportDialog</name>
@@ -3246,310 +3314,314 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="395"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="441"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="434"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="483"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="398"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="444"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="437"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="486"/>
         <source>Date</source>
         <translation>Ημερομηνία</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="401"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="447"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="440"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="489"/>
         <source>Rating</source>
         <translation>Βαθμός</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="404"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="443"/>
         <source>Depth</source>
         <translation>Βάθος</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="410"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="446"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="495"/>
+        <source>Duration</source>
+        <translation>Διάρκεια</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="449"/>
         <source>Temp</source>
         <translation>Θερμοκρασία</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="413"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="452"/>
         <source>Weight</source>
         <translation>Βάρος</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="425"/>
-        <source>SAC</source>
-        <translation>SAC</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
-        <source>m</source>
-        <translation>m</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
-        <source>ft</source>
-        <translation>ft</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
-        <source>Weight(%1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="416"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="462"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="455"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="504"/>
         <source>Suit</source>
         <translation>Στολή</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="419"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="465"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="458"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="507"/>
         <source>Cyl</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="422"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="468"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="461"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="510"/>
         <source>Gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
-        <source>SAC(%1)</source>
-        <translation type="unfinished"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="464"/>
+        <source>SAC</source>
+        <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
-        <source>/min</source>
-        <translation>/min</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="467"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="518"/>
+        <source>OTU</source>
+        <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="431"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="479"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="470"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="521"/>
         <source>Max CNS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="434"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="482"/>
-        <source>Location</source>
-        <translation>Τοποθεσία</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
+        <source>Photos</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
-        <source>kg</source>
-        <translation>kg</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="476"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="527"/>
+        <source>Location</source>
+        <translation>Τοποθεσία</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="492"/>
         <source>Depth(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="407"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="453"/>
-        <source>Duration</source>
-        <translation>Διάρκεια</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="492"/>
+        <source>m</source>
+        <translation>m</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="492"/>
+        <source>ft</source>
+        <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="456"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="498"/>
         <source>Temp(%1%2)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="501"/>
+        <source>Weight(%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="501"/>
+        <source>kg</source>
+        <translation>kg</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="501"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="428"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="476"/>
-        <source>OTU</source>
-        <translation>OTU</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="515"/>
+        <source>SAC(%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="515"/>
+        <source>/min</source>
+        <translation>/min</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="524"/>
+        <source>Photos before/during/after dive</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="164"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="165"/>
         <source>no dives were selected</source>
         <translation>καμία κατάδυση δεν έχει επιλεγεί</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="174"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="175"/>
         <source>stylesheet to export to divelogs.de is not found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="184"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="185"/>
         <source>failed to create zip file for upload: %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="236"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="237"/>
         <source>internal error</source>
         <translation>εσωτερικό σφάλμα</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="244"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="245"/>
         <source>Conversion of dive %1 to divelogs.de format failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="272"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="273"/>
         <source>error writing zip file: %s zip error %d system error %d - %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="745"/>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="935"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="936"/>
         <source>Done</source>
         <translation>Done</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="778"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="779"/>
         <source>Uploading dive list...</source>
         <translation>Μεταφόρτωση λίστας καταδύσεων...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="810"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="811"/>
         <source>Downloading dive list...</source>
         <translation>Λήψη λίστας καταδύσεων...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="851"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="852"/>
         <source>Downloading %1 dives...</source>
         <translation>Λήψη %1 καταδύσων...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="885"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="886"/>
         <source>Download finished - %1</source>
         <translation>Η λήψη τελείωσε - %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="899"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="900"/>
         <source>Problem with download</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="900"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="901"/>
         <source>The archive could not be opened:
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="909"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="910"/>
         <source>Corrupted download</source>
         <translation>Κατεστραμμένη λήψη</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="910"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="911"/>
         <source>The archive could not be opened:
 %1</source>
         <translation>Το αρχείο αυτό δεν μπορούσε να ανοιχθεί:
 %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="937"/>
+        <source>Upload finished</source>
+        <translation>Η μεταφόρτωση τελείωσε</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="950"/>
         <source>Upload failed</source>
         <translation>Η μεταφόρτωση απέτυχε</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="952"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="953"/>
         <source>Upload successful</source>
         <translation>Η μεταφόρτωση πέτυχε</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="955"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="956"/>
         <source>Login failed</source>
         <translation>Login failed</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="958"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="959"/>
         <source>Cannot parse response</source>
         <translation>Cannot parse response</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="970"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="971"/>
         <source>Error: %1</source>
         <translation>Σφάλμα: %1</translation>
     </message>
-    <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="936"/>
-        <source>Upload finished</source>
-        <translation>Η μεταφόρτωση τελείωσε</translation>
-    </message>
 </context>
 <context>
     <name>DownloadFromDCWidget</name>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="185"/>
-        <source>Error</source>
-        <translation>Σφάλμα</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="436"/>
-        <source>Retry</source>
-        <translation>Επανάληψη</translation>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="107"/>
+        <source>Download</source>
+        <translation>Λήψη</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="280"/>
-        <source>Find Uemis dive computer</source>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="110"/>
+        <source>Choose Bluetooth download mode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="101"/>
-        <source>Download</source>
-        <translation>Λήψη</translation>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="191"/>
+        <source>Error</source>
+        <translation>Σφάλμα</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="104"/>
-        <source>Choose Bluetooth download mode</source>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="286"/>
+        <source>Find Uemis dive computer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="382"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="392"/>
         <source>Choose file for divecomputer download logfile</source>
         <translation>Επιλέξτε το αρχείο για το logfile της λήψης από τον υπολογιστή κατάδυσης</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="383"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="393"/>
         <source>Log files (*.log)</source>
         <translation>Log files (*.log)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="398"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="408"/>
         <source>Warning</source>
         <translation>Προειδοποίηση</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="399"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="409"/>
         <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="../desktop-widgets/downloadfromdivecomputer.cpp" line="410"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="420"/>
         <source>Choose file for divecomputer binary dump file</source>
         <translation>Επιλέξτε αρχείο για το binary dump file του υπολογιστή κατάδυσης</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="411"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="421"/>
         <source>Dump files (*.bin)</source>
         <translation>Dump files (*.bin)</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="446"/>
+        <source>Retry</source>
+        <translation>Επανάληψη</translation>
+    </message>
 </context>
 <context>
     <name>DownloadFromDiveComputer</name>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="139"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="275"/>
-        <source>Vendor</source>
-        <translation>Κατασκευαστής</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="14"/>
         <location filename="../build/ui_downloadfromdivecomputer.h" line="265"/>
         <source>Download from dive computer</source>
@@ -3562,17 +3634,6 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="122"/>
-        <source>Choose Bluetooth download mode</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="149"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="276"/>
-        <source>Dive computer</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="66"/>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="101"/>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="115"/>
@@ -3596,11 +3657,46 @@ p, li { white-space: pre-wrap; }
         <translation>Προτίμηση των ληφθέντων καταδύσεων</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="87"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="270"/>
+        <source>Download into new trip</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="94"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="271"/>
+        <source>Save libdivecomputer logfile</source>
+        <translation>Save libdivecomputer logfile</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="108"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="273"/>
+        <source>Save libdivecomputer dumpfile</source>
+        <translation>Save libdivecomputer dumpfile</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="122"/>
+        <source>Choose Bluetooth download mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="129"/>
         <source>Select a remote Bluetooth device.</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="139"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="275"/>
+        <source>Vendor</source>
+        <translation>Κατασκευαστής</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="149"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="276"/>
+        <source>Dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/>
         <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="52"/>
         <location filename="../build/ui_downloadfromdivecomputer.h" line="277"/>
@@ -3608,18 +3704,6 @@ p, li { white-space: pre-wrap; }
         <translation>Λήψη</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="284"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="281"/>
-        <source>OK</source>
-        <translation>ΟΚ</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="291"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="282"/>
-        <source>Cancel</source>
-        <translation>Ακύρωση</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="226"/>
         <location filename="../build/ui_downloadfromdivecomputer.h" line="278"/>
         <source>Downloaded dives</source>
@@ -3638,22 +3722,16 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="94"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="271"/>
-        <source>Save libdivecomputer logfile</source>
-        <translation>Save libdivecomputer logfile</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="108"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="273"/>
-        <source>Save libdivecomputer dumpfile</source>
-        <translation>Save libdivecomputer dumpfile</translation>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="284"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="281"/>
+        <source>OK</source>
+        <translation>ΟΚ</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="87"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="270"/>
-        <source>Download into new trip</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="291"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="282"/>
+        <source>Cancel</source>
+        <translation>Ακύρωση</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="16"/>
@@ -3743,12 +3821,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="297"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="242"/>
         <source>To disconnect Subsurface from your Facebook account, use the button below</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="306"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="251"/>
         <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source>
         <translation type="unfinished"/>
     </message>
@@ -3756,22 +3834,22 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>FacebookManager</name>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="266"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="211"/>
         <source>Photo upload sucessfull</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="267"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="212"/>
         <source>Your dive profile was updated to Facebook.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="271"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="216"/>
         <source>Photo upload failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="272"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="217"/>
         <source>Your dive profile was not updated to Facebook, 
  please send the following to the developer. 
 </source>
@@ -3831,17 +3909,25 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>FirmwareUpdateThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1750"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1739"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1755"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1744"/>
         <source>Firmware update failed!</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
+    <name>GlobalDrawer</name>
+    <message>
+        <location filename="../mobile-widgets/qml/kirigami/src/controls/GlobalDrawer.qml" line="364"/>
+        <source>Back</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>GlobeGPS</name>
     <message>
         <location filename="../desktop-widgets/globe.cpp" line="124"/>
@@ -3857,27 +3943,27 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="40"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="32"/>
         <source>Date: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="50"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="42"/>
         <source>Name: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="60"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="52"/>
         <source>Latitude: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="69"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="61"/>
         <source>Longitude: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="113"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="105"/>
         <source>List of stored GPS fixes</source>
         <translation type="unfinished"/>
     </message>
@@ -3906,7 +3992,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>LocationFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="648"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="646"/>
         <source>Location: </source>
         <translation type="unfinished"/>
     </message>
@@ -3947,7 +4033,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>LocationFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="299"/>
+        <location filename="../qt-models/filtermodels.cpp" line="304"/>
         <source>No location set</source>
         <translation type="unfinished"/>
     </message>
@@ -4068,20 +4154,55 @@ p, li { white-space: pre-wrap; }
     </message>
 </context>
 <context>
-    <name>MainForm.ui</name>
+    <name>MainTab</name>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="18"/>
+        <location filename="../desktop-widgets/maintab.ui" line="439"/>
+        <location filename="../build/ui_maintab.h" line="961"/>
+        <location filename="../build/ui_maintab.h" line="963"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="539"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="571"/>
+        <source>Notes</source>
+        <translation>Σημειώσεις</translation>
+    </message>
     <message>
-        <location filename="../packaging/ios/Subsurface-mobile/MainForm.ui.qml" line="17"/>
-        <source>Press Me 1</source>
+        <location filename="../desktop-widgets/maintab.ui" line="21"/>
+        <location filename="../build/ui_maintab.h" line="964"/>
+        <source>General notes about the current selection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../packaging/ios/Subsurface-mobile/MainForm.ui.qml" line="22"/>
-        <source>Press Me 2</source>
+        <location filename="../desktop-widgets/maintab.ui" line="92"/>
+        <location filename="../desktop-widgets/maintab.ui" line="646"/>
+        <location filename="../build/ui_maintab.h" line="947"/>
+        <location filename="../build/ui_maintab.h" line="967"/>
+        <source>Date</source>
+        <translation>Ημερομηνία</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="102"/>
+        <location filename="../build/ui_maintab.h" line="948"/>
+        <source>Time</source>
+        <translation>Ώρα</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="112"/>
+        <location filename="../desktop-widgets/maintab.ui" line="836"/>
+        <location filename="../build/ui_maintab.h" line="949"/>
+        <location filename="../build/ui_maintab.h" line="987"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="306"/>
+        <source>Air temp.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="122"/>
+        <location filename="../desktop-widgets/maintab.ui" line="855"/>
+        <location filename="../build/ui_maintab.h" line="950"/>
+        <location filename="../build/ui_maintab.h" line="989"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="307"/>
+        <source>Water temp.</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>MainTab</name>
     <message>
         <location filename="../desktop-widgets/maintab.ui" line="184"/>
         <location filename="../build/ui_maintab.h" line="951"/>
@@ -4090,6 +4211,17 @@ p, li { white-space: pre-wrap; }
         <translation>Τοποθεσία</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="214"/>
+        <source>Edit dive site</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="217"/>
+        <location filename="../build/ui_maintab.h" line="953"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="252"/>
         <location filename="../build/ui_maintab.h" line="954"/>
         <source>Divemaster</source>
@@ -4102,12 +4234,6 @@ p, li { white-space: pre-wrap; }
         <translation>Ζευγάρι</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.ui" line="387"/>
-        <location filename="../build/ui_maintab.h" line="959"/>
-        <source>Tags</source>
-        <translation>Ετικέτες</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/maintab.ui" line="308"/>
         <location filename="../build/ui_maintab.h" line="956"/>
         <source>Rating</source>
@@ -4126,57 +4252,18 @@ p, li { white-space: pre-wrap; }
         <translation>Στολή</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="387"/>
+        <location filename="../build/ui_maintab.h" line="959"/>
+        <source>Tags</source>
+        <translation>Ετικέτες</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="397"/>
         <location filename="../build/ui_maintab.h" line="960"/>
         <source>Dive mode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.ui" line="112"/>
-        <location filename="../desktop-widgets/maintab.ui" line="836"/>
-        <location filename="../build/ui_maintab.h" line="949"/>
-        <location filename="../build/ui_maintab.h" line="987"/>
-        <location filename="../desktop-widgets/maintab.cpp" line="306"/>
-        <source>Air temp.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="122"/>
-        <location filename="../desktop-widgets/maintab.ui" line="855"/>
-        <location filename="../build/ui_maintab.h" line="950"/>
-        <location filename="../build/ui_maintab.h" line="989"/>
-        <location filename="../desktop-widgets/maintab.cpp" line="307"/>
-        <source>Water temp.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="18"/>
-        <location filename="../desktop-widgets/maintab.ui" line="439"/>
-        <location filename="../build/ui_maintab.h" line="961"/>
-        <location filename="../build/ui_maintab.h" line="963"/>
-        <location filename="../desktop-widgets/maintab.cpp" line="539"/>
-        <location filename="../desktop-widgets/maintab.cpp" line="571"/>
-        <source>Notes</source>
-        <translation>Σημειώσεις</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="21"/>
-        <location filename="../build/ui_maintab.h" line="964"/>
-        <source>General notes about the current selection</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="214"/>
-        <source>Edit dive site</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="217"/>
-        <location filename="../build/ui_maintab.h" line="953"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/maintab.ui" line="491"/>
         <location filename="../build/ui_maintab.h" line="965"/>
         <source>Equipment</source>
@@ -4201,6 +4288,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="665"/>
+        <location filename="../build/ui_maintab.h" line="969"/>
+        <source>Interval</source>
+        <translation>Διάλειμμα</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="684"/>
         <location filename="../build/ui_maintab.h" line="971"/>
         <source>Gases used</source>
@@ -4213,18 +4306,38 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="722"/>
+        <location filename="../desktop-widgets/maintab.ui" line="1094"/>
+        <location filename="../build/ui_maintab.h" line="975"/>
+        <location filename="../build/ui_maintab.h" line="1003"/>
+        <source>SAC</source>
+        <translation>SAC</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="741"/>
         <location filename="../build/ui_maintab.h" line="977"/>
         <source>CNS</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="760"/>
+        <location filename="../build/ui_maintab.h" line="979"/>
+        <source>OTU</source>
+        <translation>OTU</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="779"/>
         <location filename="../build/ui_maintab.h" line="981"/>
         <source>Max. depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="798"/>
+        <location filename="../build/ui_maintab.h" line="983"/>
+        <source>Avg. depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="817"/>
         <location filename="../build/ui_maintab.h" line="985"/>
         <source>Air pressure</source>
@@ -4237,82 +4350,6 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.ui" line="933"/>
-        <location filename="../build/ui_maintab.h" line="1007"/>
-        <source>Simple statistics about the selection</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1039"/>
-        <location filename="../build/ui_maintab.h" line="999"/>
-        <source>Total time</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1106"/>
-        <location filename="../build/ui_maintab.h" line="1004"/>
-        <source>Gas consumption</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1151"/>
-        <location filename="../build/ui_maintab.h" line="1009"/>
-        <source>All photos from the current selection</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1177"/>
-        <location filename="../build/ui_maintab.h" line="1010"/>
-        <source>Extra data</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1180"/>
-        <location filename="../build/ui_maintab.h" line="1011"/>
-        <source>Adittional data from the dive computer</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="92"/>
-        <location filename="../desktop-widgets/maintab.ui" line="646"/>
-        <location filename="../build/ui_maintab.h" line="947"/>
-        <location filename="../build/ui_maintab.h" line="967"/>
-        <source>Date</source>
-        <translation>Ημερομηνία</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="102"/>
-        <location filename="../build/ui_maintab.h" line="948"/>
-        <source>Time</source>
-        <translation>Ώρα</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="665"/>
-        <location filename="../build/ui_maintab.h" line="969"/>
-        <source>Interval</source>
-        <translation>Διάλειμμα</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="722"/>
-        <location filename="../desktop-widgets/maintab.ui" line="1094"/>
-        <location filename="../build/ui_maintab.h" line="975"/>
-        <location filename="../build/ui_maintab.h" line="1003"/>
-        <source>SAC</source>
-        <translation>SAC</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="798"/>
-        <location filename="../build/ui_maintab.h" line="983"/>
-        <source>Avg. depth</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="760"/>
-        <location filename="../build/ui_maintab.h" line="979"/>
-        <source>OTU</source>
-        <translation>OTU</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/maintab.ui" line="893"/>
         <location filename="../build/ui_maintab.h" line="993"/>
         <source>Salinity</source>
@@ -4325,22 +4362,34 @@ p, li { white-space: pre-wrap; }
         <translation>Στατιστικά</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="933"/>
+        <location filename="../build/ui_maintab.h" line="1007"/>
+        <source>Simple statistics about the selection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="986"/>
         <location filename="../build/ui_maintab.h" line="996"/>
         <source>Depth</source>
         <translation>Βάθος</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="998"/>
+        <location filename="../build/ui_maintab.h" line="997"/>
+        <source>Duration</source>
+        <translation>Διάρκεια</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="1027"/>
         <location filename="../build/ui_maintab.h" line="998"/>
         <source>Temperature</source>
         <translation>Θερμοκρασία</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.ui" line="998"/>
-        <location filename="../build/ui_maintab.h" line="997"/>
-        <source>Duration</source>
-        <translation>Διάρκεια</translation>
+        <location filename="../desktop-widgets/maintab.ui" line="1039"/>
+        <location filename="../build/ui_maintab.h" line="999"/>
+        <source>Total time</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/maintab.ui" line="1058"/>
@@ -4349,20 +4398,34 @@ p, li { white-space: pre-wrap; }
         <translation>Καταδύσεις</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="1106"/>
+        <location filename="../build/ui_maintab.h" line="1004"/>
+        <source>Gas consumption</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="1148"/>
         <location filename="../build/ui_maintab.h" line="1008"/>
         <source>Photos</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.cpp" line="88"/>
-        <source>Cylinders</source>
-        <translation>Φιάλες</translation>
+        <location filename="../desktop-widgets/maintab.ui" line="1151"/>
+        <location filename="../build/ui_maintab.h" line="1009"/>
+        <source>All photos from the current selection</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.cpp" line="92"/>
-        <source>Weights</source>
-        <translation>Βάρη</translation>
+        <location filename="../desktop-widgets/maintab.ui" line="1177"/>
+        <location filename="../build/ui_maintab.h" line="1010"/>
+        <source>Extra data</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="1180"/>
+        <location filename="../build/ui_maintab.h" line="1011"/>
+        <source>Adittional data from the dive computer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/maintab.cpp" line="63"/>
@@ -4375,11 +4438,21 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.cpp" line="88"/>
+        <source>Cylinders</source>
+        <translation>Φιάλες</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.cpp" line="89"/>
         <source>Add cylinder</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.cpp" line="92"/>
+        <source>Weights</source>
+        <translation>Βάρη</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.cpp" line="93"/>
         <source>Add weight system</source>
         <translation type="unfinished"/>
@@ -4570,659 +4643,685 @@ mixed from Air and using:
         <translation>&amp;File</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="455"/>
-        <location filename="../build/ui_mainwindow.h" line="534"/>
-        <source>Export dive logs</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="510"/>
-        <location filename="../build/ui_mainwindow.h" line="542"/>
-        <source>Toggle pHe graph</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="546"/>
-        <location filename="../build/ui_mainwindow.h" line="545"/>
-        <source>Toggle calculating all tissues</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="522"/>
-        <location filename="../build/ui_mainwindow.h" line="543"/>
-        <source>Toggle DC reported ceiling</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="534"/>
-        <location filename="../build/ui_mainwindow.h" line="544"/>
-        <source>Toggle calculated ceiling</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="606"/>
-        <location filename="../build/ui_mainwindow.h" line="550"/>
-        <source>Toggle NDL, TTS</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="558"/>
-        <location filename="../build/ui_mainwindow.h" line="546"/>
-        <source>Toggle calculated ceiling with 3m increments</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="463"/>
-        <location filename="../build/ui_mainwindow.h" line="537"/>
-        <source>Configure &amp;dive computer</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="570"/>
-        <location filename="../build/ui_mainwindow.h" line="547"/>
-        <source>Toggle heart rate</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="582"/>
-        <location filename="../build/ui_mainwindow.h" line="548"/>
-        <source>Toggle MOD</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="594"/>
-        <location filename="../build/ui_mainwindow.h" line="549"/>
-        <source>Toggle EAD, END, EADD</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="618"/>
-        <location filename="../build/ui_mainwindow.h" line="551"/>
-        <source>Toggle SAC rate</source>
-        <translation>SAC</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="630"/>
-        <location filename="../build/ui_mainwindow.h" line="552"/>
-        <source>Toggle ruler</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="86"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="87"/>
         <location filename="../build/ui_mainwindow.h" line="569"/>
         <source>&amp;Log</source>
         <translation>&amp;Log</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="105"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="104"/>
         <location filename="../build/ui_mainwindow.h" line="570"/>
         <source>&amp;View</source>
         <translation>&amp;View</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="121"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="120"/>
         <location filename="../build/ui_mainwindow.h" line="571"/>
         <source>&amp;Help</source>
         <translation>&amp;Help</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="130"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="129"/>
         <location filename="../build/ui_mainwindow.h" line="572"/>
         <source>&amp;Import</source>
         <translation>&amp;Import</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="139"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="138"/>
         <location filename="../build/ui_mainwindow.h" line="573"/>
         <source>&amp;Edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="144"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="143"/>
         <source>Share on</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="158"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="157"/>
         <location filename="../build/ui_mainwindow.h" line="453"/>
         <source>&amp;New logbook</source>
         <translation>&amp;New logbook</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="161"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="160"/>
         <location filename="../build/ui_mainwindow.h" line="455"/>
         <source>New</source>
         <translation>Νέο</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="164"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="163"/>
         <location filename="../build/ui_mainwindow.h" line="457"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="169"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="168"/>
         <location filename="../build/ui_mainwindow.h" line="458"/>
         <source>&amp;Open logbook</source>
         <translation>&amp;Open logbook</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="172"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="171"/>
         <location filename="../build/ui_mainwindow.h" line="460"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="508"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="502"/>
         <source>Open</source>
         <translation>Άνοιγμα</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="175"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="174"/>
         <location filename="../build/ui_mainwindow.h" line="462"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="180"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="179"/>
         <location filename="../build/ui_mainwindow.h" line="463"/>
         <source>&amp;Save</source>
         <translation>&amp;Save</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="183"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="182"/>
         <location filename="../build/ui_mainwindow.h" line="465"/>
         <source>Save</source>
         <translation>Αποθήκευση</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="186"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="185"/>
         <location filename="../build/ui_mainwindow.h" line="467"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="191"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="190"/>
         <location filename="../build/ui_mainwindow.h" line="468"/>
         <source>Sa&amp;ve as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="194"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="193"/>
         <location filename="../build/ui_mainwindow.h" line="470"/>
         <source>Save as</source>
         <translation>Αποθήκευση ως...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="197"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="196"/>
         <location filename="../build/ui_mainwindow.h" line="472"/>
         <source>Ctrl+Shift+S</source>
         <translation>Ctrl+Shift+S</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="202"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="201"/>
         <location filename="../build/ui_mainwindow.h" line="473"/>
         <source>&amp;Close</source>
         <translation>Έ&amp;ξοδος</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="205"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="204"/>
         <location filename="../build/ui_mainwindow.h" line="475"/>
         <source>Close</source>
         <translation>Κλείσιμο</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="208"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="207"/>
         <location filename="../build/ui_mainwindow.h" line="477"/>
         <source>Ctrl+W</source>
         <translation>Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="221"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="212"/>
+        <location filename="../build/ui_mainwindow.h" line="478"/>
+        <source>&amp;Print</source>
+        <translation>Εκτύ&amp;πωση</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="215"/>
+        <location filename="../build/ui_mainwindow.h" line="479"/>
+        <source>Ctrl+P</source>
+        <translation>Ctrl+P</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="220"/>
         <location filename="../build/ui_mainwindow.h" line="480"/>
         <source>P&amp;references</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="251"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="223"/>
+        <location filename="../build/ui_mainwindow.h" line="481"/>
+        <source>Ctrl+,</source>
+        <translation>Ctrl+,</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="231"/>
+        <location filename="../build/ui_mainwindow.h" line="482"/>
+        <source>&amp;Quit</source>
+        <translation>Έ&amp;ξοδος</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="234"/>
+        <location filename="../build/ui_mainwindow.h" line="483"/>
+        <source>Ctrl+Q</source>
+        <translation>Ctrl+Q</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="242"/>
+        <location filename="../build/ui_mainwindow.h" line="484"/>
+        <source>Import from &amp;dive computer</source>
+        <translation>Εισαγωγή από &amp;υπολογιστή κατάδυσης</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="245"/>
+        <location filename="../build/ui_mainwindow.h" line="485"/>
+        <source>Ctrl+D</source>
+        <translation>Ctrl+D</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="250"/>
         <location filename="../build/ui_mainwindow.h" line="486"/>
         <source>Import &amp;GPS data from Subsurface web service</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="259"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="253"/>
+        <location filename="../build/ui_mainwindow.h" line="487"/>
+        <source>Ctrl+G</source>
+        <translation>Ctrl+G</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="258"/>
         <location filename="../build/ui_mainwindow.h" line="488"/>
         <source>Edit device &amp;names</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="272"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="263"/>
+        <location filename="../build/ui_mainwindow.h" line="489"/>
+        <source>&amp;Add dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="266"/>
+        <location filename="../build/ui_mainwindow.h" line="490"/>
+        <source>Ctrl++</source>
+        <translation>Ctrl++</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="271"/>
         <location filename="../build/ui_mainwindow.h" line="491"/>
         <source>&amp;Edit dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="277"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="276"/>
         <location filename="../build/ui_mainwindow.h" line="492"/>
         <source>&amp;Copy dive components</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="280"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="279"/>
         <location filename="../build/ui_mainwindow.h" line="493"/>
         <source>Ctrl+C</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="285"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="284"/>
         <location filename="../build/ui_mainwindow.h" line="494"/>
         <source>&amp;Paste dive components</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="288"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="287"/>
         <location filename="../build/ui_mainwindow.h" line="495"/>
         <source>Ctrl+V</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="325"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="292"/>
+        <location filename="../build/ui_mainwindow.h" line="496"/>
+        <source>&amp;Renumber</source>
+        <translation>Επ&amp;αναρίθμηση</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="295"/>
+        <location filename="../build/ui_mainwindow.h" line="497"/>
+        <source>Ctrl+R</source>
+        <translation>Ctrl+R</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="303"/>
+        <location filename="../build/ui_mainwindow.h" line="498"/>
+        <source>Auto &amp;group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="308"/>
+        <location filename="../build/ui_mainwindow.h" line="499"/>
+        <source>&amp;Yearly statistics</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="311"/>
+        <location filename="../build/ui_mainwindow.h" line="500"/>
+        <source>Ctrl+Y</source>
+        <translation>Ctrl+Y</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="316"/>
+        <location filename="../build/ui_mainwindow.h" line="501"/>
+        <source>&amp;Dive list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="319"/>
+        <location filename="../build/ui_mainwindow.h" line="502"/>
+        <source>Ctrl+2</source>
+        <translation>Ctrl+2</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="324"/>
         <location filename="../build/ui_mainwindow.h" line="503"/>
         <source>&amp;Profile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="333"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="327"/>
+        <location filename="../build/ui_mainwindow.h" line="504"/>
+        <source>Ctrl+3</source>
+        <translation>Ctrl+3</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="332"/>
         <location filename="../build/ui_mainwindow.h" line="505"/>
         <source>&amp;Info</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="341"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="335"/>
+        <location filename="../build/ui_mainwindow.h" line="506"/>
+        <source>Ctrl+4</source>
+        <translation>Ctrl+4</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="340"/>
         <location filename="../build/ui_mainwindow.h" line="507"/>
         <source>&amp;All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="357"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="343"/>
+        <location filename="../build/ui_mainwindow.h" line="508"/>
+        <source>Ctrl+1</source>
+        <translation>Ctrl+1</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="348"/>
+        <location filename="../build/ui_mainwindow.h" line="509"/>
+        <source>P&amp;revious DC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="351"/>
+        <location filename="../build/ui_mainwindow.h" line="510"/>
+        <source>Left</source>
+        <translation>Αριστερά</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="356"/>
         <location filename="../build/ui_mainwindow.h" line="511"/>
         <source>&amp;Next DC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="365"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="359"/>
+        <location filename="../build/ui_mainwindow.h" line="512"/>
+        <source>Right</source>
+        <translation>Δεξιά</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="364"/>
         <location filename="../build/ui_mainwindow.h" line="513"/>
         <source>&amp;About Subsurface</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="381"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="372"/>
+        <location filename="../build/ui_mainwindow.h" line="514"/>
+        <source>User &amp;manual</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="375"/>
+        <location filename="../build/ui_mainwindow.h" line="515"/>
+        <source>F1</source>
+        <translation>F1</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="380"/>
         <location filename="../build/ui_mainwindow.h" line="516"/>
         <source>&amp;Globe</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="403"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="383"/>
+        <location filename="../build/ui_mainwindow.h" line="517"/>
+        <source>Ctrl+5</source>
+        <translation>Ctrl+5</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="388"/>
+        <location filename="../build/ui_mainwindow.h" line="518"/>
+        <source>P&amp;lan dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="391"/>
+        <location filename="../build/ui_mainwindow.h" line="519"/>
+        <source>Ctrl+L</source>
+        <translation>Ctrl+L</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="396"/>
+        <location filename="../build/ui_mainwindow.h" line="520"/>
+        <source>&amp;Import log files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="399"/>
+        <location filename="../build/ui_mainwindow.h" line="522"/>
+        <source>Import divelog files from other applications</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="402"/>
         <location filename="../build/ui_mainwindow.h" line="524"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="408"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="407"/>
         <location filename="../build/ui_mainwindow.h" line="525"/>
         <source>Import &amp;from divelogs.de</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="416"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="415"/>
         <location filename="../build/ui_mainwindow.h" line="526"/>
         <source>&amp;Full screen</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="419"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="418"/>
         <location filename="../build/ui_mainwindow.h" line="528"/>
         <source>Toggle full screen</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="447"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="421"/>
+        <location filename="../build/ui_mainwindow.h" line="530"/>
+        <source>F11</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="446"/>
         <location filename="../build/ui_mainwindow.h" line="531"/>
         <source>&amp;Check for updates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="452"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="451"/>
         <location filename="../build/ui_mainwindow.h" line="532"/>
         <source>&amp;Export</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="458"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="454"/>
+        <location filename="../build/ui_mainwindow.h" line="534"/>
+        <source>Export dive logs</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="457"/>
         <location filename="../build/ui_mainwindow.h" line="536"/>
         <source>Ctrl+E</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="466"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="462"/>
+        <location filename="../build/ui_mainwindow.h" line="537"/>
+        <source>Configure &amp;dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="465"/>
         <location filename="../build/ui_mainwindow.h" line="538"/>
         <source>Ctrl+Shift+C</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="474"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="473"/>
         <location filename="../build/ui_mainwindow.h" line="539"/>
         <source>Edit &amp;dive in planner</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="486"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="485"/>
         <location filename="../build/ui_mainwindow.h" line="540"/>
         <source>Toggle pO₂ graph</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="498"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="497"/>
         <location filename="../build/ui_mainwindow.h" line="541"/>
         <source>Toggle pN₂ graph</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="642"/>
-        <location filename="../build/ui_mainwindow.h" line="553"/>
-        <source>Scale graph</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="654"/>
-        <location filename="../build/ui_mainwindow.h" line="554"/>
-        <source>Toggle pictures</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="666"/>
-        <location filename="../build/ui_mainwindow.h" line="555"/>
-        <source>Toggle tank bar</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="509"/>
+        <location filename="../build/ui_mainwindow.h" line="542"/>
+        <source>Toggle pHe graph</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="674"/>
-        <location filename="../build/ui_mainwindow.h" line="556"/>
-        <source>&amp;Filter divelist</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="521"/>
+        <location filename="../build/ui_mainwindow.h" line="543"/>
+        <source>Toggle DC reported ceiling</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="689"/>
-        <location filename="../build/ui_mainwindow.h" line="558"/>
-        <source>Toggle tissue graph</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="533"/>
+        <location filename="../build/ui_mainwindow.h" line="544"/>
+        <source>Toggle calculated ceiling</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="694"/>
-        <location filename="../build/ui_mainwindow.h" line="559"/>
-        <source>User &amp;survey</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="545"/>
+        <location filename="../build/ui_mainwindow.h" line="545"/>
+        <source>Toggle calculating all tissues</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="699"/>
-        <location filename="../build/ui_mainwindow.h" line="560"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="238"/>
-        <source>&amp;Undo</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="557"/>
+        <location filename="../build/ui_mainwindow.h" line="546"/>
+        <source>Toggle calculated ceiling with 3m increments</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="702"/>
-        <location filename="../build/ui_mainwindow.h" line="561"/>
-        <source>Ctrl+Z</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="569"/>
+        <location filename="../build/ui_mainwindow.h" line="547"/>
+        <source>Toggle heart rate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="707"/>
-        <location filename="../build/ui_mainwindow.h" line="562"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="239"/>
-        <source>&amp;Redo</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="581"/>
+        <location filename="../build/ui_mainwindow.h" line="548"/>
+        <source>Toggle MOD</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="710"/>
-        <location filename="../build/ui_mainwindow.h" line="563"/>
-        <source>Ctrl+Shift+Z</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="593"/>
+        <location filename="../build/ui_mainwindow.h" line="549"/>
+        <source>Toggle EAD, END, EADD</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="715"/>
-        <location filename="../build/ui_mainwindow.h" line="564"/>
-        <source>&amp;Find moved images</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="605"/>
+        <location filename="../build/ui_mainwindow.h" line="550"/>
+        <source>Toggle NDL, TTS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="720"/>
-        <source>Open c&amp;loud storage</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="617"/>
+        <location filename="../build/ui_mainwindow.h" line="551"/>
+        <source>Toggle SAC rate</source>
+        <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="725"/>
-        <source>Save to clo&amp;ud storage</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="629"/>
+        <location filename="../build/ui_mainwindow.h" line="552"/>
+        <source>Toggle ruler</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="730"/>
-        <location filename="../build/ui_mainwindow.h" line="567"/>
-        <source>&amp;Manage dive sites</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="641"/>
+        <location filename="../build/ui_mainwindow.h" line="553"/>
+        <source>Scale graph</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="735"/>
-        <source>Dive Site &amp;Edit</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="653"/>
+        <location filename="../build/ui_mainwindow.h" line="554"/>
+        <source>Toggle pictures</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="740"/>
-        <source>Facebook</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="665"/>
+        <location filename="../build/ui_mainwindow.h" line="555"/>
+        <source>Toggle tank bar</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="745"/>
-        <source>Add GPS location here</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="673"/>
+        <location filename="../build/ui_mainwindow.h" line="556"/>
+        <source>&amp;Filter divelist</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="677"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="676"/>
         <location filename="../build/ui_mainwindow.h" line="557"/>
         <source>Ctrl+F</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="213"/>
-        <location filename="../build/ui_mainwindow.h" line="478"/>
-        <source>&amp;Print</source>
-        <translation>Εκτύ&amp;πωση</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="224"/>
-        <location filename="../build/ui_mainwindow.h" line="481"/>
-        <source>Ctrl+,</source>
-        <translation>Ctrl+,</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="232"/>
-        <location filename="../build/ui_mainwindow.h" line="482"/>
-        <source>&amp;Quit</source>
-        <translation>Έ&amp;ξοδος</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="243"/>
-        <location filename="../build/ui_mainwindow.h" line="484"/>
-        <source>Import from &amp;dive computer</source>
-        <translation>Εισαγωγή από &amp;υπολογιστή κατάδυσης</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="254"/>
-        <location filename="../build/ui_mainwindow.h" line="487"/>
-        <source>Ctrl+G</source>
-        <translation>Ctrl+G</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="267"/>
-        <location filename="../build/ui_mainwindow.h" line="490"/>
-        <source>Ctrl++</source>
-        <translation>Ctrl++</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="293"/>
-        <location filename="../build/ui_mainwindow.h" line="496"/>
-        <source>&amp;Renumber</source>
-        <translation>Επ&amp;αναρίθμηση</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="296"/>
-        <location filename="../build/ui_mainwindow.h" line="497"/>
-        <source>Ctrl+R</source>
-        <translation>Ctrl+R</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="312"/>
-        <location filename="../build/ui_mainwindow.h" line="500"/>
-        <source>Ctrl+Y</source>
-        <translation>Ctrl+Y</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="392"/>
-        <location filename="../build/ui_mainwindow.h" line="519"/>
-        <source>Ctrl+L</source>
-        <translation>Ctrl+L</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="216"/>
-        <location filename="../build/ui_mainwindow.h" line="479"/>
-        <source>Ctrl+P</source>
-        <translation>Ctrl+P</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="235"/>
-        <location filename="../build/ui_mainwindow.h" line="483"/>
-        <source>Ctrl+Q</source>
-        <translation>Ctrl+Q</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="246"/>
-        <location filename="../build/ui_mainwindow.h" line="485"/>
-        <source>Ctrl+D</source>
-        <translation>Ctrl+D</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="264"/>
-        <location filename="../build/ui_mainwindow.h" line="489"/>
-        <source>&amp;Add dive</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="688"/>
+        <source>Toggle tissue heat-map</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="304"/>
-        <location filename="../build/ui_mainwindow.h" line="498"/>
-        <source>Auto &amp;group</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="693"/>
+        <location filename="../build/ui_mainwindow.h" line="559"/>
+        <source>User &amp;survey</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="309"/>
-        <location filename="../build/ui_mainwindow.h" line="499"/>
-        <source>&amp;Yearly statistics</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="698"/>
+        <location filename="../build/ui_mainwindow.h" line="560"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="231"/>
+        <source>&amp;Undo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="317"/>
-        <location filename="../build/ui_mainwindow.h" line="501"/>
-        <source>&amp;Dive list</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="701"/>
+        <location filename="../build/ui_mainwindow.h" line="561"/>
+        <source>Ctrl+Z</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="320"/>
-        <location filename="../build/ui_mainwindow.h" line="502"/>
-        <source>Ctrl+2</source>
-        <translation>Ctrl+2</translation>
+        <location filename="../desktop-widgets/mainwindow.ui" line="706"/>
+        <location filename="../build/ui_mainwindow.h" line="562"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="232"/>
+        <source>&amp;Redo</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="328"/>
-        <location filename="../build/ui_mainwindow.h" line="504"/>
-        <source>Ctrl+3</source>
-        <translation>Ctrl+3</translation>
+        <location filename="../desktop-widgets/mainwindow.ui" line="709"/>
+        <location filename="../build/ui_mainwindow.h" line="563"/>
+        <source>Ctrl+Shift+Z</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="336"/>
-        <location filename="../build/ui_mainwindow.h" line="506"/>
-        <source>Ctrl+4</source>
-        <translation>Ctrl+4</translation>
+        <location filename="../desktop-widgets/mainwindow.ui" line="714"/>
+        <location filename="../build/ui_mainwindow.h" line="564"/>
+        <source>&amp;Find moved images</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="344"/>
-        <location filename="../build/ui_mainwindow.h" line="508"/>
-        <source>Ctrl+1</source>
-        <translation>Ctrl+1</translation>
+        <location filename="../desktop-widgets/mainwindow.ui" line="719"/>
+        <source>Open c&amp;loud storage</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="349"/>
-        <location filename="../build/ui_mainwindow.h" line="509"/>
-        <source>P&amp;revious DC</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="724"/>
+        <source>Save to clo&amp;ud storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="352"/>
-        <location filename="../build/ui_mainwindow.h" line="510"/>
-        <source>Left</source>
-        <translation>Αριστερά</translation>
+        <location filename="../desktop-widgets/mainwindow.ui" line="729"/>
+        <location filename="../build/ui_mainwindow.h" line="567"/>
+        <source>&amp;Manage dive sites</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="360"/>
-        <location filename="../build/ui_mainwindow.h" line="512"/>
-        <source>Right</source>
-        <translation>Δεξιά</translation>
+        <location filename="../desktop-widgets/mainwindow.ui" line="734"/>
+        <source>Dive Site &amp;Edit</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="373"/>
-        <location filename="../build/ui_mainwindow.h" line="514"/>
-        <source>User &amp;manual</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="739"/>
+        <source>Facebook</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="376"/>
-        <location filename="../build/ui_mainwindow.h" line="515"/>
-        <source>F1</source>
-        <translation>F1</translation>
+        <location filename="../desktop-widgets/mainwindow.ui" line="744"/>
+        <source>Take cloud storage online</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="384"/>
-        <location filename="../build/ui_mainwindow.h" line="517"/>
-        <source>Ctrl+5</source>
-        <translation>Ctrl+5</translation>
+        <location filename="../build/ui_mainwindow.h" line="558"/>
+        <source>Toggle tissue graph</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="389"/>
-        <location filename="../build/ui_mainwindow.h" line="518"/>
-        <source>P&amp;lan dive</source>
+        <location filename="../build/ui_mainwindow.h" line="565"/>
+        <source>Open cloud storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="397"/>
-        <location filename="../build/ui_mainwindow.h" line="520"/>
-        <source>&amp;Import log files</source>
+        <location filename="../build/ui_mainwindow.h" line="566"/>
+        <source>Save to cloud storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="400"/>
-        <location filename="../build/ui_mainwindow.h" line="522"/>
-        <source>Import divelog files from other applications</source>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="331"/>
+        <source>Connect to</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="422"/>
-        <location filename="../build/ui_mainwindow.h" line="530"/>
-        <source>F11</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="493"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="538"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1545"/>
+        <source>Please save or cancel the current dive edit before opening a new file.</source>
+        <translation>Παρακάλω αποθηκεύστε ή ακυρώστε την επεξεργασία της κατάδυσης πριν ανοίξετε ένα νέο αρχείο.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="505"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="499"/>
         <source>Open file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="509"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="503"/>
         <location filename="../desktop-widgets/mainwindow.cpp" line="614"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1972"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1978"/>
         <source>Cancel</source>
         <translation>Ακύρωση</translation>
     </message>
@@ -5242,6 +5341,16 @@ mixed from Air and using:
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="649"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="796"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="977"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="983"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1849"/>
+        <source>Warning</source>
+        <translation>Προειδοποίηση</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="674"/>
         <source>Please save or cancel the current dive edit before closing the file.</source>
         <translation>Παρακάλω αποθηκεύστε ή ακυρώστε την επεξεργασία της κατάδυσης πριν κλέισετε το αρχείο.</translation>
@@ -5257,124 +5366,97 @@ mixed from Air and using:
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="982"/>
-        <source>Trying to edit a dive that&apos;s not a manually added dive.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1243"/>
-        <source>Do you want to save the changes that you made in the file %1?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1246"/>
-        <source>Do you want to save the changes that you made in the data file?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1251"/>
-        <source>Save changes?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1587"/>
-        <source>Save file as</source>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
+        <source>Trying to replan a dive that&apos;s not a planned dive.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1682"/>
-        <source>[cloud storage for] %1</source>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="977"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1849"/>
+        <source>Please, first finish the current edition before trying to do another.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1782"/>
-        <source>Opening datafile from older version</source>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="983"/>
+        <source>Trying to edit a dive that&apos;s not a manually added dive.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1783"/>
-        <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly.
-Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1030"/>
+        <source>Yearly statistics</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1794"/>
-        <source>Open dive log file</source>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1244"/>
+        <source>Do you want to save the changes that you made in the file %1?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1795"/>
-        <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;All files (*)</source>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1247"/>
+        <source>Do you want to save the changes that you made in the data file?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1972"/>
-        <source>Contacting cloud service...</source>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1252"/>
+        <source>Save changes?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1252"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1253"/>
         <source>Changes will be lost if you don&apos;t save them.</source>
         <translation>Οι αλλαγές θα χαθούν αν δεν τις αποθηκεύσετε.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="649"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="796"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="976"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="982"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/>
-        <source>Warning</source>
-        <translation>Προειδοποίηση</translation>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1572"/>
+        <source>Save file as</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="499"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="544"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1560"/>
-        <source>Please save or cancel the current dive edit before opening a new file.</source>
-        <translation>Παρακάλω αποθηκεύστε ή ακυρώστε την επεξεργασία της κατάδυσης πριν ανοίξετε ένα νέο αρχείο.</translation>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1573"/>
+        <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
+        <translation>Subsurface XML files (*.ssrf *.xml *.XML)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="338"/>
-        <source>Connect to</source>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1670"/>
+        <source>[local cache for] %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
-        <source>Trying to replan a dive that&apos;s not a planned dive.</source>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1672"/>
+        <source>[cloud storage for] %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1029"/>
-        <source>Yearly statistics</source>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1788"/>
+        <source>Opening datafile from older version</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1588"/>
-        <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
-        <translation>Subsurface XML files (*.ssrf *.xml *.XML)</translation>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1789"/>
+        <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly.
+Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="976"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/>
-        <source>Please, first finish the current edition before trying to do another.</source>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1800"/>
+        <source>Open dive log file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_mainwindow.h" line="565"/>
-        <source>Open cloud storage</source>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1801"/>
+        <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_mainwindow.h" line="566"/>
-        <source>Save to cloud storage</source>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1978"/>
+        <source>Contacting cloud service...</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>MultiFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="733"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="731"/>
         <source>Filter shows %1 (of %2) dives</source>
         <translation type="unfinished"/>
     </message>
@@ -5382,39 +5464,39 @@ Subsurface has already tried to pre-populate the data but it might be worth whil
 <context>
     <name>OstcFirmwareCheck</name>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="269"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="271"/>
         <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="273"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="275"/>
         <source>
 
 Please start Bluetooth on your OSTC Sport and do the same preparations as for a logbook download before continuing with the update</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="274"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="276"/>
         <source>Not now</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="275"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="277"/>
         <source>Update firmware</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="277"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="279"/>
         <source>Firmware upgrade notice</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="295"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="297"/>
         <source>Save the downloaded firmware as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="296"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="298"/>
         <source>HEX files (*.hex)</source>
         <translation type="unfinished"/>
     </message>
@@ -5422,79 +5504,89 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PlannerSettingsWidget</name>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="322"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="302"/>
         <source>Open circuit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="322"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="302"/>
         <source>CCR</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="322"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="302"/>
         <source>pSCR</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="421"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="388"/>
         <source>ft/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="422"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="389"/>
         <source>Last stop at 20ft</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="423"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="390"/>
         <source>50% avg. depth to 20ft</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="424"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="391"/>
         <source>20ft to surface</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="426"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="392"/>
+        <source>ft</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="394"/>
         <source>m/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="427"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="395"/>
         <source>Last stop at 6m</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="428"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="396"/>
         <source>50% avg. depth to 6m</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="429"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="397"/>
         <source>6m to surface</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="432"/>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="433"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="398"/>
+        <source>m</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="401"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="402"/>
         <source>cuft/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="441"/>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="442"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="410"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="411"/>
         <source>ℓ/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="451"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="420"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="456"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="425"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
@@ -5644,6 +5736,11 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PreferencesDialog</name>
     <message>
+        <location filename="../build/ui_preferences.h" line="1283"/>
+        <source>Preferences</source>
+        <translation>Προτιμήσεις</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1288"/>
         <source>Defaults</source>
         <translation>Προεπιλογές</translation>
@@ -5679,6 +5776,11 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1303"/>
+        <source>Lists and tables</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1304"/>
         <source>Font</source>
         <translation>Γραμματοσειρά</translation>
@@ -5694,6 +5796,11 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>Καταδύσεις</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1307"/>
+        <source>Default dive log file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1308"/>
         <source>No default file</source>
         <translation type="unfinished"/>
@@ -5724,6 +5831,21 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>...</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1314"/>
+        <source>Display invalid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1316"/>
+        <source>Default cylinder</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1317"/>
+        <source>Use default cylinder</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1318"/>
         <source>Animations</source>
         <translation type="unfinished"/>
@@ -5754,42 +5876,26 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>Σύστημα</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1401"/>
-        <source>Dive site geo lookup</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1402"/>
-        <source>Enable geocoding for dive site management</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1403"/>
-        <source>Parse site without GPS data</source>
+        <location filename="../build/ui_preferences.h" line="1324"/>
+        <source>&amp;Metric</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1404"/>
-        <source>Same format for existing dives</source>
-        <translation type="unfinished"/>
+        <location filename="../build/ui_preferences.h" line="1325"/>
+        <source>Imperial</source>
+        <translation>Imperial</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1405"/>
-        <source>Dive Site Layout</source>
+        <location filename="../build/ui_preferences.h" line="1326"/>
+        <source>Personali&amp;ze</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1406"/>
-        <location filename="../build/ui_preferences.h" line="1407"/>
-        <source>/</source>
+        <location filename="../build/ui_preferences.h" line="1327"/>
+        <source>Individual settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1325"/>
-        <source>Imperial</source>
-        <translation>Imperial</translation>
-    </message>
-    <message>
         <location filename="../build/ui_preferences.h" line="1328"/>
         <source>Depth</source>
         <translation>Βάθος</translation>
@@ -5805,6 +5911,11 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>πόδια</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1331"/>
+        <source>Pressure</source>
+        <translation>Πίεση</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1332"/>
         <location filename="../build/ui_preferences.h" line="1366"/>
         <source>bar</source>
@@ -5816,11 +5927,26 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>psi</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1334"/>
+        <source>Volume</source>
+        <translation>Όγκος</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1335"/>
+        <source>&amp;liter</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1336"/>
         <source>cu ft</source>
         <translation>cu ft</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1337"/>
+        <source>Temperature</source>
+        <translation>Θερμοκρασία</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1338"/>
         <source>celsius</source>
         <translation>celsius</translation>
@@ -5831,315 +5957,281 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>fahrenheit</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1340"/>
+        <source>Weight</source>
+        <translation>Βάρος</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1341"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1363"/>
-        <source>CCR: show setpoints when viewing pO₂</source>
-        <translation type="unfinished"/>
+        <location filename="../build/ui_preferences.h" line="1342"/>
+        <source>lbs</source>
+        <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1364"/>
-        <source>CCR: show individual O₂ sensor values when viewing pO₂</source>
-        <translation type="unfinished"/>
+        <location filename="../build/ui_preferences.h" line="1343"/>
+        <source>Time units</source>
+        <translation>Μονάδες Μέτρησης Χρόνου</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1365"/>
-        <source>Default CCR set-point for dive planning</source>
+        <location filename="../build/ui_preferences.h" line="1344"/>
+        <source>Ascent/descent speed denominator</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1367"/>
-        <source>pSCR O₂ metabolism rate</source>
-        <translation type="unfinished"/>
+        <location filename="../build/ui_preferences.h" line="1345"/>
+        <source>Minutes</source>
+        <translation>Λεπτά (min)</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1368"/>
-        <source>pSCR ratio</source>
-        <translation type="unfinished"/>
+        <location filename="../build/ui_preferences.h" line="1346"/>
+        <source>Seconds</source>
+        <translation>Δευτερόλεπτα (sec)</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1369"/>
-        <source>ℓ/min</source>
+        <location filename="../build/ui_preferences.h" line="1347"/>
+        <source>GPS coordinates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1371"/>
-        <source>1:</source>
+        <location filename="../build/ui_preferences.h" line="1348"/>
+        <source>Location Display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1372"/>
-        <source>UI language</source>
+        <location filename="../build/ui_preferences.h" line="1349"/>
+        <source>traditional (dms)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1373"/>
-        <source>System default</source>
+        <location filename="../build/ui_preferences.h" line="1350"/>
+        <source>decimal</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1375"/>
-        <source>Proxy</source>
-        <translation type="unfinished"/>
+        <location filename="../build/ui_preferences.h" line="1351"/>
+        <source>Show</source>
+        <translation>Εμφάνιση</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1379"/>
-        <source>Proxy type</source>
+        <location filename="../build/ui_preferences.h" line="1352"/>
+        <source>Threshold when showing pO₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1377"/>
-        <source>Host</source>
+        <location filename="../build/ui_preferences.h" line="1353"/>
+        <source>Threshold when showing pN₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1376"/>
-        <source>Port</source>
+        <location filename="../build/ui_preferences.h" line="1354"/>
+        <source>Threshold when showing pHe</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1378"/>
-        <source>Requires authentication</source>
+        <location filename="../build/ui_preferences.h" line="1355"/>
+        <source>Max pO₂ when showing MOD</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1380"/>
-        <source>Username</source>
+        <location filename="../build/ui_preferences.h" line="1356"/>
+        <source>Draw dive computer reported ceiling red</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1381"/>
-        <location filename="../build/ui_preferences.h" line="1387"/>
-        <source>Password</source>
-        <translation>Κωδικός</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1400"/>
-        <source>Disconnect from Facebook</source>
+        <location filename="../build/ui_preferences.h" line="1357"/>
+        <source>Show unused cylinders in Equipment tab</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1374"/>
-        <source>Filter</source>
-        <translation>Φίλτρο</translation>
+        <location filename="../build/ui_preferences.h" line="1358"/>
+        <source>Show average depth</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1331"/>
-        <source>Pressure</source>
-        <translation>Πίεση</translation>
+        <location filename="../build/ui_preferences.h" line="1359"/>
+        <source>Misc</source>
+        <translation>Διάφορα</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1303"/>
-        <source>Lists and tables</source>
-        <translation type="unfinished"/>
+        <location filename="../build/ui_preferences.h" line="1360"/>
+        <source>GFLow</source>
+        <translation>GFLow</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1307"/>
-        <source>Default dive log file</source>
-        <translation type="unfinished"/>
+        <location filename="../build/ui_preferences.h" line="1361"/>
+        <source>GFHigh</source>
+        <translation>GFHigh</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1314"/>
-        <source>Display invalid</source>
-        <translation type="unfinished"/>
+        <location filename="../build/ui_preferences.h" line="1362"/>
+        <source>GFLow at max depth</source>
+        <translation>GFlow στο μέγιστο βάθος</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1316"/>
-        <source>Default cylinder</source>
+        <location filename="../build/ui_preferences.h" line="1363"/>
+        <source>CCR: show setpoints when viewing pO₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1317"/>
-        <source>Use default cylinder</source>
+        <location filename="../build/ui_preferences.h" line="1364"/>
+        <source>CCR: show individual O₂ sensor values when viewing pO₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1382"/>
-        <source>Subsurface cloud storage</source>
+        <location filename="../build/ui_preferences.h" line="1365"/>
+        <source>Default CCR set-point for dive planning</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1386"/>
-        <source>Email address</source>
-        <translation>Email address</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1388"/>
-        <source>Verification PIN</source>
+        <location filename="../build/ui_preferences.h" line="1367"/>
+        <source>pSCR O₂ metabolism rate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1395"/>
-        <source>Sync to cloud in the background?</source>
+        <location filename="../build/ui_preferences.h" line="1368"/>
+        <source>pSCR ratio</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1396"/>
-        <source>Save Password locally?</source>
+        <location filename="../build/ui_preferences.h" line="1369"/>
+        <source>ℓ/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1397"/>
-        <source>Subsurface web service</source>
+        <location filename="../build/ui_preferences.h" line="1371"/>
+        <source>1:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1398"/>
-        <source>Default user ID</source>
+        <location filename="../build/ui_preferences.h" line="1372"/>
+        <source>UI language</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1399"/>
-        <source>Save user ID locally?</source>
+        <location filename="../build/ui_preferences.h" line="1373"/>
+        <source>System default</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1334"/>
-        <source>Volume</source>
-        <translation>Όγκος</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1337"/>
-        <source>Temperature</source>
-        <translation>Θερμοκρασία</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1340"/>
-        <source>Weight</source>
-        <translation>Βάρος</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1342"/>
-        <source>lbs</source>
-        <translation>lbs</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1343"/>
-        <source>Time units</source>
-        <translation>Μονάδες Μέτρησης Χρόνου</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1345"/>
-        <source>Minutes</source>
-        <translation>Λεπτά (min)</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1346"/>
-        <source>Seconds</source>
-        <translation>Δευτερόλεπτα (sec)</translation>
+        <location filename="../build/ui_preferences.h" line="1374"/>
+        <source>Filter</source>
+        <translation>Φίλτρο</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1351"/>
-        <source>Show</source>
-        <translation>Εμφάνιση</translation>
+        <location filename="../build/ui_preferences.h" line="1375"/>
+        <source>Proxy</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1362"/>
-        <source>GFLow at max depth</source>
-        <translation>GFlow στο μέγιστο βάθος</translation>
+        <location filename="../build/ui_preferences.h" line="1376"/>
+        <source>Port</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1359"/>
-        <source>Misc</source>
-        <translation>Διάφορα</translation>
+        <location filename="../build/ui_preferences.h" line="1377"/>
+        <source>Host</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1283"/>
-        <source>Preferences</source>
-        <translation>Προτιμήσεις</translation>
+        <location filename="../build/ui_preferences.h" line="1378"/>
+        <source>Requires authentication</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1324"/>
-        <source>&amp;Metric</source>
+        <location filename="../build/ui_preferences.h" line="1379"/>
+        <source>Proxy type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1326"/>
-        <source>Personali&amp;ze</source>
+        <location filename="../build/ui_preferences.h" line="1380"/>
+        <source>Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1327"/>
-        <source>Individual settings</source>
-        <translation type="unfinished"/>
+        <location filename="../build/ui_preferences.h" line="1381"/>
+        <location filename="../build/ui_preferences.h" line="1387"/>
+        <source>Password</source>
+        <translation>Κωδικός</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1335"/>
-        <source>&amp;liter</source>
+        <location filename="../build/ui_preferences.h" line="1382"/>
+        <source>Subsurface cloud storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1344"/>
-        <source>Ascent/descent speed denominator</source>
-        <translation type="unfinished"/>
+        <location filename="../build/ui_preferences.h" line="1386"/>
+        <source>Email address</source>
+        <translation>Email address</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1347"/>
-        <source>GPS coordinates</source>
+        <location filename="../build/ui_preferences.h" line="1388"/>
+        <source>Verification PIN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1348"/>
-        <source>Location Display</source>
+        <location filename="../build/ui_preferences.h" line="1395"/>
+        <source>Sync to cloud in the background?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1349"/>
-        <source>traditional (dms)</source>
+        <location filename="../build/ui_preferences.h" line="1396"/>
+        <source>Save Password locally?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1350"/>
-        <source>decimal</source>
+        <location filename="../build/ui_preferences.h" line="1397"/>
+        <source>Subsurface web service</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1352"/>
-        <source>Threshold when showing pO₂</source>
+        <location filename="../build/ui_preferences.h" line="1398"/>
+        <source>Default user ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1353"/>
-        <source>Threshold when showing pN₂</source>
+        <location filename="../build/ui_preferences.h" line="1399"/>
+        <source>Save user ID locally?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1354"/>
-        <source>Threshold when showing pHe</source>
+        <location filename="../build/ui_preferences.h" line="1400"/>
+        <source>Disconnect from Facebook</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1355"/>
-        <source>Max pO₂ when showing MOD</source>
+        <location filename="../build/ui_preferences.h" line="1401"/>
+        <source>Dive site geo lookup</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1356"/>
-        <source>Draw dive computer reported ceiling red</source>
+        <location filename="../build/ui_preferences.h" line="1402"/>
+        <source>Enable geocoding for dive site management</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1357"/>
-        <source>Show unused cylinders in Equipment tab</source>
+        <location filename="../build/ui_preferences.h" line="1403"/>
+        <source>Parse site without GPS data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1358"/>
-        <source>Show average depth</source>
+        <location filename="../build/ui_preferences.h" line="1404"/>
+        <source>Same format for existing dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1360"/>
-        <source>GFLow</source>
-        <translation>GFLow</translation>
+        <location filename="../build/ui_preferences.h" line="1405"/>
+        <source>Dive Site Layout</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1361"/>
-        <source>GFHigh</source>
-        <translation>GFHigh</translation>
+        <location filename="../build/ui_preferences.h" line="1406"/>
+        <location filename="../build/ui_preferences.h" line="1407"/>
+        <source>/</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6195,106 +6287,136 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="20"/>
-        <source>Show</source>
-        <translation>Εμφάνιση</translation>
+        <source>Gas pressure display setup</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="29"/>
-        <source>Threshold when showing pO₂</source>
+        <source>Threshold for pO₂ (bar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="49"/>
-        <source>Threshold when showing pN₂</source>
+        <source>Threshold for pN₂ (bar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="69"/>
-        <source>Threshold when showing pHe</source>
+        <source>Threshold for pHe (bar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="89"/>
-        <source>Max pO₂ when showing MOD</source>
+        <source>pO₂ in calculating MOD (bar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="109"/>
-        <source>Draw dive computer reported ceiling red</source>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="106"/>
+        <source>CCR options:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="116"/>
-        <source>Show unused cylinders in Equipment tab</source>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="113"/>
+        <source>Dive planner default setpoint (bar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="123"/>
-        <source>Show mean depth</source>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="133"/>
+        <source>Show setpoints when viewing pO₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="133"/>
-        <source>Misc</source>
-        <translation>Διάφορα</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="140"/>
+        <source>Show individual O₂ sensor values when viewing pO₂</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="149"/>
-        <source>bar</source>
-        <translation>bar</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="150"/>
+        <source>Ceiling display setup</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="165"/>
-        <source>Default CCR set-point for dive planning</source>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="159"/>
+        <source>Draw dive computer reported ceiling red</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="172"/>
-        <source>pSCR O₂ metabolism rate</source>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="169"/>
+        <source>Algorithm for calculated ceiling:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="179"/>
-        <source>GFLow</source>
-        <translation>GFLow</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="176"/>
+        <source>VPM-B</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="183"/>
+        <source>VPM-B Conservatism</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="193"/>
+        <source>+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="186"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="206"/>
+        <source>Bühlmann</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="216"/>
         <source>GFHigh</source>
         <translation>GFHigh</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="203"/>
-        <source>ℓ/min</source>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="236"/>
+        <source>GFLow</source>
+        <translation>GFLow</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="256"/>
+        <source>GFLow at max depth</source>
+        <translation>GFlow στο μέγιστο βάθος</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="263"/>
+        <source>pSCR options:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="213"/>
-        <source>pSCR ratio</source>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="270"/>
+        <source>Metabolic rate (ℓ O₂/min)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="223"/>
-        <source>1:</source>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="287"/>
+        <source>Dilution ratio</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="230"/>
-        <source>CCR: show individual O₂ sensor values when viewing pO₂</source>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="300"/>
+        <source>1:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="237"/>
-        <source>CCR: show setpoints when viewing pO₂</source>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="310"/>
+        <source>Misc</source>
+        <translation>Διάφορα</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="316"/>
+        <source>Show unused cylinders in Equipment tab</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="244"/>
-        <source>GFLow at max depth</source>
-        <translation>GFlow στο μέγιστο βάθος</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="323"/>
+        <source>Show mean depth in Profile</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="10"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="9"/>
         <source>Graph</source>
         <translation>Γράφημα</translation>
     </message>
@@ -6363,15 +6485,29 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>Γλώσσα</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="57"/>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="53"/>
         <source>Restart required</source>
         <translation>Απαιτείται επανεκκίνηση</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="58"/>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="54"/>
         <source>To correctly load a new language you must restart Subsurface.</source>
         <translation>Για να φορτώσε σωστά μια γλώσσα πρέπει να επανεκκινήσεσε το Subsurface</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="76"/>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="82"/>
+        <source>Literal characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="77"/>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="83"/>
+        <source>Non-special character(s) in time format.
+These will be used as is. This might not be what you intended.
+See http://doc.qt.io/qt-5/qdatetime.html#toString</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PreferencesNetwork</name>
@@ -6418,7 +6554,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_network.ui" line="156"/>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="148"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="134"/>
         <source>Subsurface cloud storage</source>
         <translation type="unfinished"/>
     </message>
@@ -6463,39 +6599,39 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="11"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="10"/>
         <source>Network</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="15"/>
         <source>No proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/>
         <source>System proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/>
         <source>HTTP proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="19"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/>
         <source>SOCKS proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="75"/>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="97"/>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="110"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="72"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="93"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="106"/>
         <source>Cloud storage email and password can only consist of letters, numbers, and &apos;.&apos;, &apos;-&apos;, &apos;_&apos;, and &apos;+&apos;.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="146"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="132"/>
         <source>Subsurface cloud storage (credentials verified)</source>
         <translation type="unfinished"/>
     </message>
@@ -6653,7 +6789,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="8"/>
+        <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="7"/>
         <source>Units</source>
         <translation>Μονάδες Μέτρησης</translation>
     </message>
@@ -6661,17 +6797,17 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PrintDialog</name>
     <message>
-        <location filename="../desktop-widgets/printdialog.cpp" line="118"/>
-        <source>&amp;Preview</source>
-        <translation>&amp;Προεπισκόπηση</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/printdialog.cpp" line="115"/>
+        <location filename="../desktop-widgets/printdialog.cpp" line="102"/>
         <source>P&amp;rint</source>
         <translation>Εκτύ&amp;πωση</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/printdialog.cpp" line="130"/>
+        <location filename="../desktop-widgets/printdialog.cpp" line="105"/>
+        <source>&amp;Preview</source>
+        <translation>&amp;Προεπισκόπηση</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/printdialog.cpp" line="117"/>
         <source>Print</source>
         <translation>Εκτύπωση</translation>
     </message>
@@ -6679,19 +6815,10 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PrintOptions</name>
     <message>
-        <location filename="../build/ui_printoptions.h" line="150"/>
-        <source>&amp;Table print</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../build/ui_printoptions.h" line="158"/>
-        <source>One dive per page</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../build/ui_printoptions.h" line="159"/>
-        <source>Two dives per page</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/printoptions.ui" line="29"/>
+        <location filename="../build/ui_printoptions.h" line="148"/>
+        <source>Print type</source>
+        <translation>Τύπος Εκτύπωσης</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/printoptions.ui" line="41"/>
@@ -6751,10 +6878,19 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/printoptions.ui" line="29"/>
-        <location filename="../build/ui_printoptions.h" line="148"/>
-        <source>Print type</source>
-        <translation>Τύπος Εκτύπωσης</translation>
+        <location filename="../build/ui_printoptions.h" line="150"/>
+        <source>&amp;Table print</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../build/ui_printoptions.h" line="158"/>
+        <source>One dive per page</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../build/ui_printoptions.h" line="159"/>
+        <source>Two dives per page</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/printoptions.cpp" line="128"/>
@@ -6796,103 +6932,103 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="755"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="752"/>
         <source>Show NDL / TTS was disabled because of excessive processing time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1344"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1338"/>
         <source>Make first divecomputer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1346"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1340"/>
         <source>Delete this divecomputer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1360"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1354"/>
         <source>Add gas change</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1363"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1357"/>
         <source> (Tank %1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1371"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1365"/>
         <source>Add set-point change</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1373"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1367"/>
         <source>Add bookmark</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1377"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1371"/>
         <source>Edit the profile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1381"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1375"/>
         <source>Remove event</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1386"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1380"/>
         <source>Hide similar events</source>
         <translation>Απόκρυψη παρόμοιων συμβάντων</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1393"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1387"/>
         <source>Edit name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1422"/>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1429"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1416"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1423"/>
         <source>Adjust pressure of tank %1 (currently interpolated as %2)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1444"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1438"/>
         <source>Unhide all events</source>
         <translation>Απόκρυψη όλων των συμβάντων</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1479"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1473"/>
         <source>Hide events</source>
         <translation>Απόκρυψη όλων των συμβάντων</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1479"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1473"/>
         <source>Hide all %1 events?</source>
         <translation>Απόκρυψη όλων των %1 συμβάντων;</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1514"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1508"/>
         <source>Remove the selected event?</source>
         <translation>Διαγραφή του επιλεγμένου συμβάντος;</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1515"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1509"/>
         <source>%1 @ %2:%3</source>
         <translation>%1 @ %2:%3</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1638"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1632"/>
         <source>Edit name of bookmark</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1639"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1633"/>
         <source>Custom name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1644"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1638"/>
         <source>Name is too long!</source>
         <translation type="unfinished"/>
     </message>
@@ -6900,91 +7036,101 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>QMLManager</name>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="95"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="97"/>
         <source>Starting...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="202"/>
         <source>working in no-cloud mode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="213"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="216"/>
         <source>no cloud credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="214"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="270"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="217"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="269"/>
         <source>Please enter valid cloud credentials.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="285"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="284"/>
         <source>Attempting to open cloud storage with new credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="304"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="306"/>
         <source>Testing cloud credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="331"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="320"/>
+        <source>No response from cloud server to validate the credentials</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="329"/>
+        <source>Cannot connect to cloud storage - cloud account not verified</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="361"/>
         <source>Cloud credentials are invalid</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="344"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="374"/>
         <source>Cannot open cloud storage: Error creating https connection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="357"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="387"/>
         <source>Cannot open cloud storage: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="369"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="399"/>
         <source>Cannot connect to cloud storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="411"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="441"/>
         <source>Cloud storage error: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="501"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="531"/>
         <source>Failed to connect to cloud server, reverting to no cloud status</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="520"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="550"/>
         <source>Cloud storage open successfully. No dives in dive list.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="689"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="690"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="721"/>
         <source>h</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="689"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="690"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="691"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="721"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="722"/>
         <source>min</source>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="689"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/>
         <source>sec</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="1041"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="1102"/>
         <source>Unknown GPS location</source>
         <translation type="unfinished"/>
     </message>
@@ -6992,126 +7138,126 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../core/qthelper.cpp" line="866"/>
-        <location filename="../core/qthelper.cpp" line="1214"/>
-        <source>AIR</source>
-        <translation>ΑΕΡΑΣ</translation>
+        <location filename="../core/gpslocation.h" line="13"/>
+        <source>Waiting to aquire GPS location</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="1214"/>
-        <source>OXYGEN</source>
-        <translation type="unfinished"/>
+        <location filename="../core/qthelper.cpp" line="766"/>
+        <location filename="../core/qthelper.cpp" line="1275"/>
+        <source>m</source>
+        <translation>m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="59"/>
-        <source>Remove this point</source>
-        <translation type="unfinished"/>
+        <location filename="../core/qthelper.cpp" line="768"/>
+        <location filename="../core/qthelper.cpp" line="1274"/>
+        <source>ft</source>
+        <translation>ft</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="32"/>
-        <source>Average</source>
-        <translation>Μέσος όρος</translation>
+        <location filename="../core/qthelper.cpp" line="794"/>
+        <source>C</source>
+        <translation>C</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="35"/>
-        <source>Minimum</source>
-        <translation>Ελάχιστο</translation>
+        <location filename="../core/qthelper.cpp" line="796"/>
+        <source>F</source>
+        <translation>F</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="38"/>
-        <source>Maximum</source>
-        <translation>Μέγιστο</translation>
+        <location filename="../core/qthelper.cpp" line="821"/>
+        <location filename="../core/qthelper.cpp" line="1250"/>
+        <source>kg</source>
+        <translation>kg</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/globe.cpp" line="327"/>
-        <source>Move the map and double-click to set the dive location</source>
-        <translation>Μετακινήστε τον χάρτη και με διπλό κλικ ορίστε την τοποθεσία κατάδυσης</translation>
+        <location filename="../core/qthelper.cpp" line="823"/>
+        <location filename="../core/qthelper.cpp" line="1251"/>
+        <source>lbs</source>
+        <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="28"/>
-        <source>unknown</source>
-        <translation>άγνωστο</translation>
+        <location filename="../core/qthelper.cpp" line="848"/>
+        <location filename="../core/qthelper.cpp" line="1300"/>
+        <source>bar</source>
+        <translation>bar</translation>
     </message>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="105"/>
-        <source>h:</source>
-        <translation type="unfinished"/>
+        <location filename="../core/qthelper.cpp" line="850"/>
+        <location filename="../core/qthelper.cpp" line="1299"/>
+        <source>psi</source>
+        <translation>psi</translation>
     </message>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="105"/>
-        <source>min</source>
-        <translation>min</translation>
+        <location filename="../core/qthelper.cpp" line="871"/>
+        <location filename="../core/qthelper.cpp" line="1235"/>
+        <source>AIR</source>
+        <translation>ΑΕΡΑΣ</translation>
     </message>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="337"/>
-        <source>Multiple</source>
+        <location filename="../core/qthelper.cpp" line="873"/>
+        <source>EAN</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="../core/qthelper.cpp" line="957"/>
+        <location filename="../core/qthelper.cpp" line="962"/>
         <source>(%n dive(s))</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="816"/>
-        <location filename="../core/qthelper.cpp" line="1228"/>
-        <source>kg</source>
-        <translation>kg</translation>
+        <location filename="../core/qthelper.cpp" line="1235"/>
+        <source>OXYGEN</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="818"/>
-        <location filename="../core/qthelper.cpp" line="1229"/>
-        <source>lbs</source>
-        <translation>lbs</translation>
+        <location filename="../core/qthelper.cpp" line="1322"/>
+        <source>l</source>
+        <translation>l</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="763"/>
-        <location filename="../core/qthelper.cpp" line="1252"/>
-        <source>ft</source>
-        <translation>ft</translation>
+        <location filename="../core/qthelper.cpp" line="1323"/>
+        <source>cuft</source>
+        <translation>cuft</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="761"/>
-        <location filename="../core/qthelper.cpp" line="1253"/>
-        <source>m</source>
-        <translation>m</translation>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="29"/>
+        <source>unknown</source>
+        <translation>άγνωστο</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="789"/>
-        <source>C</source>
-        <translation>C</translation>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="114"/>
+        <source>h:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="791"/>
-        <source>F</source>
-        <translation>F</translation>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="114"/>
+        <source>min</source>
+        <translation>min</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="845"/>
-        <location filename="../core/qthelper.cpp" line="1275"/>
-        <source>psi</source>
-        <translation>psi</translation>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="63"/>
+        <source>Remove this point</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="843"/>
-        <location filename="../core/qthelper.cpp" line="1276"/>
-        <source>bar</source>
-        <translation>bar</translation>
+        <location filename="../desktop-widgets/globe.cpp" line="327"/>
+        <source>Move the map and double-click to set the dive location</source>
+        <translation>Μετακινήστε τον χάρτη και με διπλό κλικ ορίστε την τοποθεσία κατάδυσης</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="868"/>
-        <source>EAN</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="32"/>
+        <source>Average</source>
+        <translation>Μέσος όρος</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="1298"/>
-        <source>l</source>
-        <translation>l</translation>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="35"/>
+        <source>Minimum</source>
+        <translation>Ελάχιστο</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="1299"/>
-        <source>cuft</source>
-        <translation>cuft</translation>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="38"/>
+        <source>Maximum</source>
+        <translation>Μέγιστο</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="625"/>
@@ -7133,17 +7279,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <source>Malformed XML response. Line %1: %2</source>
         <translation>Malformed XML response. Line %1: %2</translation>
     </message>
-    <message>
-        <location filename="../core/gpslocation.h" line="13"/>
-        <source>Waiting to aquire GPS location</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>ReadSettingsThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1651"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1676"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1640"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1665"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation type="unfinished"/>
     </message>
@@ -7172,7 +7313,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ResetSettingsThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1775"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1764"/>
         <source>Reset settings failed!</source>
         <translation type="unfinished"/>
     </message>
@@ -7210,6 +7351,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ShiftImageTimesDialog</name>
     <message>
+        <location filename="../desktop-widgets/shiftimagetimes.ui" line="23"/>
+        <location filename="../build/ui_shiftimagetimes.h" line="184"/>
+        <source>Shift selected image times</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/shiftimagetimes.ui" line="34"/>
         <location filename="../build/ui_shiftimagetimes.h" line="185"/>
         <source>Shift times of image(s) by</source>
@@ -7222,12 +7369,6 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>h:mm</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/shiftimagetimes.ui" line="23"/>
-        <location filename="../build/ui_shiftimagetimes.h" line="184"/>
-        <source>Shift selected image times</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/shiftimagetimes.ui" line="105"/>
         <location filename="../build/ui_shiftimagetimes.h" line="187"/>
         <source>Earlier</source>
@@ -7277,12 +7418,12 @@ Not all images have timestamps in the range between
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="297"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="296"/>
         <source>Open image file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="299"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="298"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation type="unfinished"/>
     </message>
@@ -7440,49 +7581,49 @@ Not all images have timestamps in the range between
 <context>
     <name>SocialNetworkDialog</name>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="339"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="284"/>
         <source>Dive date: %1 
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="342"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="287"/>
         <source>Duration: %1 
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="343"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="288"/>
         <source>h:</source>
         <comment>abbreviation for hours plus separator</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="344"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="289"/>
         <source>min</source>
         <comment>abbreviation for minutes</comment>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="347"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="292"/>
         <source>Dive location: %1 
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="350"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="295"/>
         <source>Buddy: %1 
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="353"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="298"/>
         <source>Divemaster: %1 
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="356"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="301"/>
         <source>
 %1</source>
         <translation type="unfinished"/>
@@ -7567,9 +7708,20 @@ Not all images have timestamps in the range between
     <name>StartPage</name>
     <message>
         <location filename="../mobile-widgets/qml/StartPage.qml" line="19"/>
-        <source>To use Subsurface-mobile with Subsurface cloud storage, please enteryour cloud credentials.
+        <source>To use Subsurface-mobile with Subsurface cloud storage, please enter your cloud credentials.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/StartPage.qml" line="20"/>
+        <source>If this is the first time you use Subsurface cloud storage, enter a valid email (all lower case) and a password of your choice (letters and numbers). The server will send a PIN to the email address provided that you will have to enter here.
 
-To use Subsurface-mobile only with local data on this device, tap on the no cloud icon below.</source>
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/StartPage.qml" line="23"/>
+        <source>To use Subsurface-mobile only with local data on this device, tap on the no cloud icon below.</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -7608,7 +7760,12 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>SubsurfaceWebServices</name>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="419"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="395"/>
+        <source>Enter User ID and click Download</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="417"/>
         <source>Webservice</source>
         <translation>Webservice</translation>
     </message>
@@ -7633,30 +7790,25 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="557"/>
-        <source>Download successful</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="551"/>
         <source>Invalid user identifier!</source>
         <translation>Άκυρος έλεγχος χρήστη!</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="397"/>
-        <source>Enter User ID and click Download</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="554"/>
         <source>Cannot parse response!</source>
         <translation>Cannot parse response!</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="557"/>
+        <source>Download successful</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>SuitFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="674"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="672"/>
         <source>Suits: </source>
         <translation type="unfinished"/>
     </message>
@@ -7664,7 +7816,7 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>SuitsFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="123"/>
+        <location filename="../qt-models/filtermodels.cpp" line="128"/>
         <source>No suit set</source>
         <translation type="unfinished"/>
     </message>
@@ -7683,7 +7835,7 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>TagFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="595"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="593"/>
         <source>Tags: </source>
         <translation type="unfinished"/>
     </message>
@@ -7691,7 +7843,7 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>TagFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="148"/>
+        <location filename="../qt-models/filtermodels.cpp" line="153"/>
         <source>Empty tags</source>
         <translation type="unfinished"/>
     </message>
@@ -7717,6 +7869,11 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>TemplateEdit</name>
     <message>
+        <location filename="../desktop-widgets/templateedit.ui" line="14"/>
+        <source>Edit template</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/templateedit.ui" line="37"/>
         <source>Preview</source>
         <translation type="unfinished"/>
@@ -7762,11 +7919,6 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
         <translation>Μέγεθος Γραμματοσειράς</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/templateedit.ui" line="14"/>
-        <source>Edit template</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/templateedit.ui" line="165"/>
         <source>Color palette</source>
         <translation type="unfinished"/>
@@ -7948,85 +8100,12 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>TextHyperlinkEventFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="817"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="815"/>
         <source>%1click to visit %2</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>ThemeTest</name>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="29"/>
-        <source>Theme Information</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="33"/>
-        <source>Screen</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="42"/>
-        <source>Geometry (pixels):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="49"/>
-        <source>Geometry (gridUnits):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="56"/>
-        <source>Units.gridUnit:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="63"/>
-        <source>Units.devicePixelRatio:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="70"/>
-        <source>Font Metrics</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="76"/>
-        <source>FontMetrics pointSize:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="83"/>
-        <source>FontMetrics pixelSize:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="90"/>
-        <source>FontMetrics devicePixelRatio:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="97"/>
-        <source>Text item pixelSize:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="104"/>
-        <source>Text item pointSize:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="111"/>
-        <source>Pixel density:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="118"/>
-        <source>Height of default font:</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
     <name>ToolTipItem</name>
     <message>
         <location filename="../profile-widget/divetooltipitem.cpp" line="136"/>
@@ -8037,102 +8116,107 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>TripItem</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="67"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="68"/>
         <source>(%1 shown)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="194"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="197"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="215"/>
         <source>Date</source>
         <translation>Ημερομηνία</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="200"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="218"/>
         <source>Rating</source>
         <translation>Βαθμός</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
         <source>Depth(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="206"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="224"/>
         <source>Duration</source>
         <translation>Διάρκεια</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="209"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="227"/>
         <source>Temp(%1%2)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
         <source>Weight(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="215"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="233"/>
         <source>Suit</source>
         <translation>Στολή</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="218"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="236"/>
         <source>Cyl</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="239"/>
         <source>Gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="244"/>
         <source>SAC(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="244"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="229"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="247"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="232"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="250"/>
         <source>Max CNS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="235"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="253"/>
+        <source>Photos before/during/after dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="256"/>
         <source>Location</source>
         <translation>Τοποθεσία</translation>
     </message>
@@ -8155,72 +8239,73 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>UpdateManager</name>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="69"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="61"/>
         <source>Check for updates.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="70"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="62"/>
         <source>Subsurface was unable to check for updates.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="75"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="67"/>
         <source>The following error occurred:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="76"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="68"/>
         <source>Please check your internet connection.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="86"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="78"/>
         <source>You are using the latest version of Subsurface.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="89"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="81"/>
         <source>A new version of Subsurface is available.&lt;br/&gt;Click on:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; to download it.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="95"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="87"/>
         <source>A new version of Subsurface is available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="96"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="88"/>
         <source>Latest version is %1, please check %2 our download page %3 for information in how to update.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="106"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="98"/>
         <source>Newest release version is </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="107"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="99"/>
         <source>The server returned the following information:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="125"/>
-        <source>Subsurface is checking every two weeks if a new version is available. If you don&apos;t want Subsurface to continue checking, please click Decline.</source>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="117"/>
+        <source>Subsurface is checking every two weeks if a new version is available. 
+ If you don&apos;t want Subsurface to continue checking, please click Decline.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="126"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="119"/>
         <source>Decline</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="127"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="120"/>
         <source>Accept</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="129"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="122"/>
         <source>Automatic check for updates</source>
         <translation type="unfinished"/>
     </message>
@@ -8242,24 +8327,6 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>UserSurvey</name>
     <message>
-        <location filename="../desktop-widgets/usersurvey.ui" line="44"/>
-        <location filename="../build/ui_usersurvey.h" line="151"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;We would love to learn more about our users, their preferences and their usage habits. Please spare a minute to fill out this form and submit it to the Subsurface team.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/usersurvey.ui" line="115"/>
-        <location filename="../build/ui_usersurvey.h" line="156"/>
-        <source>Other software/sources</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/usersurvey.ui" line="128"/>
-        <location filename="../build/ui_usersurvey.h" line="157"/>
-        <source>Manually entering dives</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="14"/>
         <location filename="../build/ui_usersurvey.h" line="149"/>
         <source>User survey</source>
@@ -8272,6 +8339,12 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/usersurvey.ui" line="44"/>
+        <location filename="../build/ui_usersurvey.h" line="151"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;We would love to learn more about our users, their preferences and their usage habits. Please spare a minute to fill out this form and submit it to the Subsurface team.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="63"/>
         <location filename="../build/ui_usersurvey.h" line="152"/>
         <source>Technical diver</source>
@@ -8296,6 +8369,18 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/usersurvey.ui" line="115"/>
+        <location filename="../build/ui_usersurvey.h" line="156"/>
+        <source>Other software/sources</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/usersurvey.ui" line="128"/>
+        <location filename="../build/ui_usersurvey.h" line="157"/>
+        <source>Manually entering dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="141"/>
         <location filename="../build/ui_usersurvey.h" line="158"/>
         <source>Android/iPhone companion app</source>
@@ -8326,6 +8411,11 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/usersurvey.cpp" line="18"/>
+        <source>Send</source>
+        <translation>Αποστολή</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/usersurvey.cpp" line="43"/>
         <source>
 Operating system: %1</source>
@@ -8365,19 +8455,14 @@ Language: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/usersurvey.cpp" line="101"/>
-        <source>Submit user survey.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/usersurvey.cpp" line="82"/>
         <source>Ask again?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/usersurvey.cpp" line="18"/>
-        <source>Send</source>
-        <translation>Αποστολή</translation>
+        <location filename="../desktop-widgets/usersurvey.cpp" line="101"/>
+        <source>Submit user survey.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/usersurvey.cpp" line="102"/>
@@ -8469,12 +8554,12 @@ Language: %1</source>
         <translation>Μεταφόρτωση</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="324"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="325"/>
         <source>Operation timed out</source>
         <translation>Operation timed out</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="345"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="346"/>
         <source>Transferring data...</source>
         <translation type="unfinished"/>
     </message>
@@ -8509,16 +8594,16 @@ Language: %1</source>
 <context>
     <name>WriteSettingsThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1702"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1709"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1718"/>
-        <source>Failed!</source>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1689"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1710"/>
+        <source>This feature is not yet available for the selected dive computer.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1700"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1721"/>
-        <source>This feature is not yet available for the selected dive computer.</source>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1691"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1698"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1707"/>
+        <source>Failed!</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -8645,7 +8730,7 @@ SAC (%1)</translation>
 <context>
     <name>getextFromC</name>
     <message>
-        <location filename="../core/libdivecomputer.c" line="674"/>
+        <location filename="../core/libdivecomputer.c" line="737"/>
         <source>Error parsing the header</source>
         <translation type="unfinished"/>
     </message>
@@ -8653,38 +8738,377 @@ SAC (%1)</translation>
 <context>
     <name>gettextFromC</name>
     <message>
+        <location filename="../core/cochran.c" line="309"/>
+        <location filename="../core/cochran.c" line="315"/>
+        <location filename="../core/cochran.c" line="385"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>deco stop</source>
+        <translation>στάση αποσυμπίεσης</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="336"/>
+        <location filename="../core/cochran.c" line="390"/>
+        <location filename="../core/file.c" line="777"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>ascent</source>
+        <translation>άνοδος</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="342"/>
+        <location filename="../core/file.c" line="755"/>
+        <source>battery</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="348"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
+        <source>OLF</source>
+        <translation>OLF</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="353"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
+        <source>maxdepth</source>
+        <translation>μέγιστο βάθος</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="358"/>
+        <location filename="../core/cochran.c" line="404"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
+        <source>pO₂</source>
+        <translation>pO₂</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="365"/>
+        <location filename="../core/cochran.c" line="414"/>
+        <location filename="../core/cochran.c" line="421"/>
+        <location filename="../core/file.c" line="868"/>
+        <location filename="../core/libdivecomputer.c" line="225"/>
+        <location filename="../core/libdivecomputer.c" line="228"/>
+        <source>gaschange</source>
+        <translation>αλλαγή αερίου</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="370"/>
+        <location filename="../core/cochran.c" line="409"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>rbt</source>
+        <translation>rbt</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="379"/>
+        <location filename="../core/cochran.c" line="426"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>ceiling</source>
+        <translation>ταβάνι</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="395"/>
+        <location filename="../core/libdivecomputer.c" line="224"/>
+        <source>transmitter</source>
+        <translation>πομπός</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="153"/>
+        <source>Error: the file does not appear to be a DATATRAK divelog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="286"/>
+        <source>clear</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="289"/>
+        <source>misty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="292"/>
+        <source>fog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="295"/>
+        <source>rain</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="298"/>
+        <source>storm</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="301"/>
+        <source>snow</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="321"/>
+        <source>No suit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="324"/>
+        <source>Shorty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="327"/>
+        <source>Combi</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="330"/>
+        <source>Wet suit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="333"/>
+        <source>Semidry suit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="336"/>
+        <source>Dry suit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="396"/>
+        <source>no stop</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="398"/>
+        <location filename="../core/dive.c" line="29"/>
+        <source>deco</source>
+        <translation>αποσυμπίεση</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="400"/>
+        <source>single ascent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="402"/>
+        <source>multiple ascent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="404"/>
+        <location filename="../core/dive.c" line="27"/>
+        <source>fresh</source>
+        <translation>fresh</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="406"/>
+        <source>salt water</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="431"/>
+        <source>sight seeing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="433"/>
+        <source>club dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="435"/>
+        <location filename="../core/dive.c" line="28"/>
+        <source>instructor</source>
+        <translation>εκπαιδευτής</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="437"/>
+        <source>instruction</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="439"/>
+        <location filename="../core/dive.c" line="27"/>
+        <source>night</source>
+        <translation>νύχτα</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="441"/>
+        <location filename="../core/dive.c" line="25"/>
+        <source>cave</source>
+        <translation>σπήλαιο</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="443"/>
+        <location filename="../core/dive.c" line="24"/>
+        <source>ice</source>
+        <translation>πάγος</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="445"/>
+        <source>search</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="455"/>
+        <location filename="../core/dive.c" line="25"/>
+        <source>wreck</source>
+        <translation>ναυάγιο</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="457"/>
+        <location filename="../core/dive.c" line="26"/>
+        <source>river</source>
+        <translation>ποτάμι</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="459"/>
+        <location filename="../core/dive.c" line="23"/>
+        <source>drift</source>
+        <translation>ρεύμα</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="461"/>
+        <location filename="../core/dive.c" line="28"/>
+        <source>photo</source>
+        <translation>φωτογραφία</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="463"/>
+        <source>other</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="474"/>
+        <source>Other activities</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="498"/>
+        <source>Datatrak/Wlog notes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="537"/>
+        <source>Manually entered dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="588"/>
+        <source>Unknown</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="674"/>
+        <source>Error: couldn&apos;t open the file %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="687"/>
+        <source>Error: no dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="23"/>
+        <source>boat</source>
+        <translation>σκάφος</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="23"/>
+        <source>shore</source>
+        <translation>ακτή</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="24"/>
+        <source>deep</source>
+        <translation>βαθιά</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="24"/>
+        <source>cavern</source>
+        <translation>ανοικτό σπήλαιο</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="25"/>
+        <source>altitude</source>
+        <translation>υψόμετρο</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="26"/>
+        <source>pool</source>
+        <translation>πισίνα</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="26"/>
+        <source>lake</source>
+        <translation>λίμνη</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="27"/>
+        <source>student</source>
+        <translation>μαθητής</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="28"/>
+        <source>video</source>
+        <translation>βίντεο</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="33"/>
+        <source>OC-gas</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="33"/>
+        <source>diluent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="33"/>
+        <location filename="../core/equipment.c" line="88"/>
+        <location filename="../core/planner.c" line="1436"/>
+        <location filename="../core/planner.c" line="1439"/>
+        <source>oxygen</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../core/dive.c" line="181"/>
         <source>pascal</source>
         <translation>pascal</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="186"/>
-        <location filename="../core/qthelper.cpp" line="669"/>
+        <location filename="../core/qthelper.cpp" line="674"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="190"/>
-        <location filename="../core/qthelper.cpp" line="672"/>
+        <location filename="../core/qthelper.cpp" line="677"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
+        <location filename="../core/dive.c" line="227"/>
+        <source>ℓ</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../core/dive.c" line="232"/>
         <source>cuft</source>
         <translation>cuft</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="269"/>
-        <location filename="../core/qthelper.cpp" line="590"/>
-        <location filename="../core/qthelper.cpp" line="605"/>
+        <location filename="../core/qthelper.cpp" line="595"/>
+        <location filename="../core/qthelper.cpp" line="610"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="274"/>
-        <location filename="../core/qthelper.cpp" line="593"/>
-        <location filename="../core/qthelper.cpp" line="607"/>
+        <location filename="../core/qthelper.cpp" line="598"/>
+        <location filename="../core/qthelper.cpp" line="612"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
@@ -8710,53 +9134,58 @@ SAC (%1)</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="325"/>
-        <location filename="../core/qthelper.cpp" line="616"/>
-        <location filename="../core/qthelper.cpp" line="626"/>
+        <location filename="../core/qthelper.cpp" line="621"/>
+        <location filename="../core/qthelper.cpp" line="631"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="329"/>
-        <location filename="../core/qthelper.cpp" line="614"/>
-        <location filename="../core/qthelper.cpp" line="624"/>
+        <location filename="../core/qthelper.cpp" line="619"/>
+        <location filename="../core/qthelper.cpp" line="629"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="1772"/>
+        <location filename="../core/dive.c" line="1751"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) ή (%s)</translation>
     </message>
     <message>
-        <location filename="../core/divelist.c" line="484"/>
+        <location filename="../core/divelist.c" line="487"/>
         <location filename="../core/equipment.c" line="84"/>
-        <location filename="../core/planner.c" line="1411"/>
-        <location filename="../core/planner.c" line="1414"/>
+        <location filename="../core/planner.c" line="1432"/>
+        <location filename="../core/planner.c" line="1435"/>
         <source>air</source>
         <translation>αέρας</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="197"/>
+        <location filename="../core/equipment.c" line="86"/>
+        <source>EAN%d</source>
+        <translation>EAN%d</translation>
+    </message>
+    <message>
+        <location filename="../core/equipment.c" line="198"/>
         <source>integrated</source>
         <translation>ενσωματωμένα</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="198"/>
+        <location filename="../core/equipment.c" line="199"/>
         <source>belt</source>
         <translation>ζώνη</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="199"/>
+        <location filename="../core/equipment.c" line="200"/>
         <source>ankle</source>
         <translation>αστραγάλου</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="200"/>
+        <location filename="../core/equipment.c" line="201"/>
         <source>backplate weight</source>
         <translation>βάρος backplate</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="201"/>
+        <location filename="../core/equipment.c" line="202"/>
         <source>clip-on</source>
         <translation>clip-on</translation>
     </message>
@@ -8769,8 +9198,8 @@ SAC (%1)</translation>
         <location filename="../core/file.c" line="121"/>
         <location filename="../core/file.c" line="512"/>
         <location filename="../core/file.c" line="597"/>
-        <location filename="../core/file.c" line="924"/>
-        <location filename="../core/file.c" line="1056"/>
+        <location filename="../core/file.c" line="909"/>
+        <location filename="../core/file.c" line="1092"/>
         <location filename="../core/ostctools.c" line="80"/>
         <source>Failed to read &apos;%s&apos;</source>
         <translation>Αποτυχία ανάγνωσης &apos;%s&apos;</translation>
@@ -8828,708 +9257,722 @@ SAC (%1)</translation>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/file.c" line="887"/>
-        <source>No matching DC found for file &apos;%s&apos;</source>
+        <location filename="../core/git-access.c" line="134"/>
+        <source>Local cache directory %s corrupted - can&apos;t sync with Subsurface cloud storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>none</source>
-        <translation>κανένα</translation>
+        <location filename="../core/git-access.c" line="157"/>
+        <location filename="../core/git-access.c" line="177"/>
+        <source>Could not update local cache to newer remote data</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="309"/>
-        <location filename="../core/cochran.c" line="315"/>
-        <location filename="../core/cochran.c" line="385"/>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>deco stop</source>
-        <translation>στάση αποσυμπίεσης</translation>
+        <location filename="../core/git-access.c" line="170"/>
+        <source>Subsurface cloud storage corrupted</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="342"/>
-        <location filename="../core/file.c" line="755"/>
-        <source>battery</source>
+        <location filename="../core/git-access.c" line="284"/>
+        <source>Could not update Subsurface cloud storage, try again later</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="370"/>
-        <location filename="../core/cochran.c" line="409"/>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>rbt</source>
-        <translation>rbt</translation>
+        <location filename="../core/git-access.c" line="344"/>
+        <source>Remote storage and local data diverged. Error: merge failed (%s)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="336"/>
-        <location filename="../core/cochran.c" line="390"/>
-        <location filename="../core/file.c" line="777"/>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>ascent</source>
-        <translation>άνοδος</translation>
+        <location filename="../core/git-access.c" line="374"/>
+        <source>Remote storage and local data diverged. Cannot combine local and remote changes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="379"/>
-        <location filename="../core/cochran.c" line="426"/>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>ceiling</source>
-        <translation>ταβάνι</translation>
+        <location filename="../core/git-access.c" line="408"/>
+        <source>Remote storage and local data diverged</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>workload</source>
-        <translation>φόρτο εργασίας</translation>
+        <location filename="../core/git-access.c" line="411"/>
+        <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="395"/>
-        <location filename="../core/libdivecomputer.c" line="203"/>
-        <source>transmitter</source>
-        <translation>πομπός</translation>
+        <location filename="../core/git-access.c" line="420"/>
+        <source>Problems with local cache of Subsurface cloud data</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/git-access.c" line="421"/>
+        <source>Moved cache data to %s. Please try the operation again.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/git-access.c" line="743"/>
+        <source>Error connecting to Subsurface cloud storage</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="203"/>
+        <location filename="../core/git-access.c" line="746"/>
+        <source>git clone of %s failed (%s)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="210"/>
+        <location filename="../core/parse-xml.c" line="3317"/>
+        <location filename="../core/uemis-downloader.c" line="134"/>
+        <source>unknown</source>
+        <translation>άγνωστο</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>none</source>
+        <translation>κανένα</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>workload</source>
+        <translation>φόρτο εργασίας</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="224"/>
         <source>violation</source>
         <translation>παράβαση</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="203"/>
+        <location filename="../core/libdivecomputer.c" line="224"/>
         <source>bookmark</source>
         <translation>σελιδοδείκτης</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="203"/>
+        <location filename="../core/libdivecomputer.c" line="224"/>
         <source>surface</source>
         <translation>επιφάνεια</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="203"/>
+        <location filename="../core/libdivecomputer.c" line="224"/>
         <source>safety stop</source>
         <translation>στάση ασφαλείας</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="365"/>
-        <location filename="../core/cochran.c" line="414"/>
-        <location filename="../core/cochran.c" line="421"/>
-        <location filename="../core/file.c" line="868"/>
-        <location filename="../core/libdivecomputer.c" line="204"/>
-        <location filename="../core/libdivecomputer.c" line="207"/>
-        <source>gaschange</source>
-        <translation>αλλαγή αερίου</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="204"/>
+        <location filename="../core/libdivecomputer.c" line="225"/>
         <source>safety stop (voluntary)</source>
         <translation>στάση ασφαλείας (προληπτική)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="204"/>
+        <location filename="../core/libdivecomputer.c" line="225"/>
         <source>safety stop (mandatory)</source>
         <translation>στάση ασφαλείας (υποχρεωτική)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="205"/>
+        <location filename="../core/libdivecomputer.c" line="226"/>
         <source>deepstop</source>
         <translation>βαθιά στάση</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="205"/>
+        <location filename="../core/libdivecomputer.c" line="226"/>
         <source>ceiling (safety stop)</source>
         <translation>ταβάνι (στάση ασφαλείας)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="205"/>
-        <source>divetime</source>
-        <translation>διάρκεια</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="205"/>
+        <location filename="../core/libdivecomputer.c" line="226"/>
         <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="../core/cochran.c" line="353"/>
-        <location filename="../core/libdivecomputer.c" line="206"/>
-        <source>maxdepth</source>
-        <translation>μέγιστο βάθος</translation>
-    </message>
-    <message>
-        <location filename="../core/cochran.c" line="348"/>
-        <location filename="../core/libdivecomputer.c" line="206"/>
-        <source>OLF</source>
-        <translation>OLF</translation>
+        <location filename="../core/libdivecomputer.c" line="226"/>
+        <source>divetime</source>
+        <translation>διάρκεια</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="206"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
         <source>airtime</source>
         <translation>airtime</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="206"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
         <source>rgbm</source>
         <translation>rgbm</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="206"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
         <source>heading</source>
         <translation>heading</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="358"/>
-        <location filename="../core/cochran.c" line="404"/>
-        <location filename="../core/libdivecomputer.c" line="206"/>
-        <source>pO₂</source>
-        <translation>pO₂</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="207"/>
+        <location filename="../core/libdivecomputer.c" line="228"/>
         <source>tissue level warning</source>
         <translation>προειδοποίηση επιπέδου ιστών</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="207"/>
+        <location filename="../core/libdivecomputer.c" line="228"/>
         <source>non stop time</source>
         <translation>non stop time</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="224"/>
+        <location filename="../core/libdivecomputer.c" line="237"/>
         <source>invalid event number</source>
         <translation>άκυρος αριθμός συμβάντος</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="658"/>
-        <source>Unable to create parser for %s %s</source>
-        <translation>Αδύνατον να αναλυθεί το %s %s</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="664"/>
-        <source>Error registering the data</source>
-        <translation>Σφάλμα στην καταχώρηση των δεδομένων</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="495"/>
+        <location filename="../core/libdivecomputer.c" line="553"/>
         <source>Error parsing the datetime</source>
         <translation>Σφάλμα στην ημερομηνία</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="513"/>
+        <location filename="../core/libdivecomputer.c" line="571"/>
         <source>Dive %d: %s</source>
         <translation>Κατάδυση %d: %s</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="519"/>
+        <location filename="../core/libdivecomputer.c" line="577"/>
         <source>Error parsing the divetime</source>
         <translation>Σφάλμα στην διάρκεια της κατάδυσης</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="529"/>
+        <location filename="../core/libdivecomputer.c" line="587"/>
         <source>Error parsing the maxdepth</source>
         <translation>Σφάλμα στο μέγιστο βάθος</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="548"/>
+        <location filename="../core/libdivecomputer.c" line="606"/>
         <source>Error parsing temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="568"/>
+        <location filename="../core/libdivecomputer.c" line="626"/>
         <source>Error parsing the gas mix count</source>
         <translation>Σφάλμα στον αριθμό των αερίων</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="580"/>
+        <location filename="../core/libdivecomputer.c" line="638"/>
         <source>Error obtaining water salinity</source>
         <translation>Σφάλμα στην απόκτηση της αλμυρότητας</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="589"/>
+        <location filename="../core/libdivecomputer.c" line="647"/>
         <source>Error obtaining surface pressure</source>
         <translation>Σφάλμα στην απόκτηση της ατμοσφαιρικής πίεσης</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="614"/>
+        <location filename="../core/libdivecomputer.c" line="672"/>
         <source>Error obtaining divemode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="634"/>
+        <location filename="../core/libdivecomputer.c" line="692"/>
         <source>Error parsing the gas mix</source>
         <translation>Σφάλμα στο μίγμα αερίων</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="684"/>
+        <location filename="../core/libdivecomputer.c" line="717"/>
+        <source>Unable to create parser for %s %s</source>
+        <translation>Αδύνατον να αναλυθεί το %s %s</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="723"/>
+        <source>Error registering the data</source>
+        <translation>Σφάλμα στην καταχώρηση των δεδομένων</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="744"/>
         <source>Error parsing the samples</source>
         <translation>Σφάλμα στα δείγματα</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="822"/>
+        <location filename="../core/libdivecomputer.c" line="882"/>
         <source>Event: waiting for user action</source>
         <translation>Συμβάν: Περιμένοντας για ενέργεια από τον χρήστη</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="830"/>
+        <location filename="../core/libdivecomputer.c" line="890"/>
         <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="../core/libdivecomputer.c" line="894"/>
+        <location filename="../core/libdivecomputer.c" line="954"/>
         <source>Error registering the event handler.</source>
         <translation>Σφάλμα στην καταχώρηση του συμβάντος</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="899"/>
+        <location filename="../core/libdivecomputer.c" line="959"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Σφάλμα στην καταχώρηση της ακύρωσης</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="920"/>
+        <location filename="../core/libdivecomputer.c" line="980"/>
         <source>Dive data import error</source>
         <translation>Σφάλμα στην εισαγωγή δεδομένων</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="959"/>
+        <location filename="../core/libdivecomputer.c" line="1019"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Unable to create libdivecomputer context</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="966"/>
+        <location filename="../core/libdivecomputer.c" line="1026"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Αδύνατον να ανοιχθεί το %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="992"/>
+        <location filename="../core/libdivecomputer.c" line="1048"/>
         <source>Insufficient privileges to open the device %s %s (%s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/parse-xml.c" line="517"/>
-        <source>Strange percentage reading %s
+        <location filename="../core/load-git.c" line="194"/>
+        <location filename="../core/parse-xml.c" line="1242"/>
+        <source>multiple GPS locations for this dive site; also %s
 </source>
-        <translation>Περίεργο νούμερο ποσοστού %s
-</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/load-git.c" line="194"/>
-        <location filename="../core/parse-xml.c" line="1238"/>
-        <source>multiple GPS locations for this dive site; also %s
+        <location filename="../core/load-git.c" line="222"/>
+        <location filename="../core/parse-xml.c" line="1304"/>
+        <source>additional name for site: %s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/parse-xml.c" line="2044"/>
+        <location filename="../core/ostctools.c" line="120"/>
+        <location filename="../core/ostctools.c" line="152"/>
+        <source>Unknown DC in dive %d</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/ostctools.c" line="165"/>
+        <source>Error - %s - parsing dive %d</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/parse-xml.c" line="517"/>
+        <source>Strange percentage reading %s
+</source>
+        <translation>Περίεργο νούμερο ποσοστού %s
+</translation>
+    </message>
+    <message>
+        <location filename="../core/parse-xml.c" line="2051"/>
         <source>Failed to parse &apos;%s&apos;</source>
         <translation>Σφάλμα στην ανάλυση του &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../core/parse-xml.c" line="3741"/>
+        <location filename="../core/parse-xml.c" line="3774"/>
         <source>Can&apos;t open stylesheet %s</source>
         <translation>Αδύνατο το άνοιγμα του stylesheet %s</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="86"/>
-        <source>EAN%d</source>
-        <translation>EAN%d</translation>
+        <location filename="../core/planner.c" line="555"/>
+        <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE %s ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="1032"/>
-        <location filename="../core/planner.c" line="1184"/>
-        <source>Can&apos;t find gas %s</source>
+        <location filename="../core/planner.c" line="569"/>
+        <source>Decompression calculation aborted due to excessive time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="368"/>
-        <source>Too many gas mixes</source>
-        <translation>Πάρα πολλά μείγματα αερίων</translation>
+        <location filename="../core/planner.c" line="571"/>
+        <location filename="../core/planner.c" line="829"/>
+        <location filename="../core/planner.c" line="834"/>
+        <location filename="../core/planner.c" line="860"/>
+        <location filename="../core/planner.c" line="870"/>
+        <source>Warning:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="568"/>
-        <source>Decompression calculation aborted due to excessive time</source>
+        <location filename="../core/planner.c" line="581"/>
+        <source>based on Bühlmann ZHL-16C with GFlow = %d and GFhigh = %d</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="592"/>
-        <source>Subsurface dive plan</source>
+        <location filename="../core/planner.c" line="586"/>
+        <source>based on VPM-B at nominal conservatism</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="596"/>
-        <source>depth</source>
+        <location filename="../core/planner.c" line="588"/>
+        <source>based on VPM-B at +%d conservatism</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="602"/>
-        <source>runtime</source>
+        <location filename="../core/planner.c" line="590"/>
+        <source>, effective GF=%d/%d</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="594"/>
+        <source>recreational mode based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="598"/>
+        <source>Subsurface dive plan</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../core/planner.c" line="599"/>
+        <source>&lt;div&gt;Runtime: %dmin&lt;/div&gt;&lt;br&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="604"/>
+        <source>depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="607"/>
         <source>duration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="554"/>
-        <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE %s ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source>
+        <location filename="../core/planner.c" line="610"/>
+        <source>runtime</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="605"/>
+        <location filename="../core/planner.c" line="613"/>
         <source>gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="648"/>
+        <location filename="../core/planner.c" line="656"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="656"/>
+        <location filename="../core/planner.c" line="664"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="669"/>
+        <location filename="../core/planner.c" line="677"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="676"/>
+        <location filename="../core/planner.c" line="684"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="721"/>
+        <location filename="../core/planner.c" line="729"/>
         <source>%3.0f%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="724"/>
-        <location filename="../core/planner.c" line="728"/>
+        <location filename="../core/planner.c" line="732"/>
+        <location filename="../core/planner.c" line="736"/>
         <source>%3dmin</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="737"/>
-        <location filename="../core/planner.c" line="749"/>
+        <location filename="../core/planner.c" line="745"/>
+        <location filename="../core/planner.c" line="757"/>
         <source>(SP = %.1fbar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="772"/>
+        <location filename="../core/planner.c" line="780"/>
         <source>Switch gas to %s (SP = %.1fbar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="774"/>
+        <location filename="../core/planner.c" line="782"/>
         <source>Switch gas to %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="793"/>
+        <location filename="../core/planner.c" line="801"/>
         <source>CNS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="795"/>
+        <location filename="../core/planner.c" line="803"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="799"/>
+        <location filename="../core/planner.c" line="807"/>
         <source>Gas consumption (CCR legs excluded):</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="801"/>
+        <location filename="../core/planner.c" line="809"/>
         <source>Gas consumption:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="570"/>
-        <location filename="../core/planner.c" line="821"/>
-        <location filename="../core/planner.c" line="826"/>
-        <location filename="../core/planner.c" line="851"/>
-        <location filename="../core/planner.c" line="861"/>
-        <source>Warning:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="580"/>
-        <source>based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="584"/>
-        <source>based on VPM-B at nominal conservatism</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="586"/>
-        <source>based on VPM-B at +%d conservatism</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="588"/>
-        <source>recreational mode based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="822"/>
+        <location filename="../core/planner.c" line="830"/>
         <source>this is more gas than available in the specified cylinder!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="827"/>
+        <location filename="../core/planner.c" line="835"/>
         <source>not enough reserve for gas sharing on ascent!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="829"/>
+        <location filename="../core/planner.c" line="837"/>
         <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="831"/>
+        <location filename="../core/planner.c" line="839"/>
         <source>%.0f%s (%.0f%s during planned ascent) of %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="848"/>
+        <location filename="../core/planner.c" line="857"/>
         <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="858"/>
+        <location filename="../core/planner.c" line="867"/>
         <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="1419"/>
+        <location filename="../core/planner.c" line="1194"/>
+        <source>Can&apos;t find gas %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="1440"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1280"/>
+        <location filename="../core/profile.c" line="1298"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1283"/>
+        <location filename="../core/profile.c" line="1301"/>
         <source>P: %d%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1287"/>
+        <location filename="../core/profile.c" line="1305"/>
         <source>T: %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1293"/>
+        <location filename="../core/profile.c" line="1311"/>
         <source>V: %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1296"/>
+        <location filename="../core/profile.c" line="1314"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1298"/>
+        <location filename="../core/profile.c" line="1316"/>
         <source>CNS: %u%%
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1300"/>
+        <location filename="../core/profile.c" line="1318"/>
         <source>pO%s: %.2fbar
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1302"/>
+        <location filename="../core/profile.c" line="1320"/>
         <source>pN%s: %.2fbar
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1304"/>
+        <location filename="../core/profile.c" line="1322"/>
         <source>pHe: %.2fbar
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1307"/>
+        <location filename="../core/profile.c" line="1325"/>
         <source>MOD: %d%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1314"/>
+        <location filename="../core/profile.c" line="1332"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1318"/>
+        <location filename="../core/profile.c" line="1336"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1331"/>
+        <location filename="../core/profile.c" line="1349"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1334"/>
+        <location filename="../core/profile.c" line="1352"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1339"/>
+        <location filename="../core/profile.c" line="1357"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1342"/>
+        <location filename="../core/profile.c" line="1360"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1346"/>
+        <location filename="../core/profile.c" line="1364"/>
         <source>In deco
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1348"/>
+        <location filename="../core/profile.c" line="1366"/>
         <source>NDL: %umin
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1351"/>
+        <location filename="../core/profile.c" line="1369"/>
         <source>TTS: %umin
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1354"/>
+        <location filename="../core/profile.c" line="1372"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1362"/>
+        <location filename="../core/profile.c" line="1380"/>
         <source>In deco (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1365"/>
+        <location filename="../core/profile.c" line="1383"/>
         <source>NDL: %umin (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1367"/>
+        <location filename="../core/profile.c" line="1385"/>
         <source>NDL: &gt;2h (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1371"/>
+        <location filename="../core/profile.c" line="1389"/>
         <source>TTS: %umin (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1373"/>
+        <location filename="../core/profile.c" line="1391"/>
         <source>TTS: &gt;2h (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1376"/>
+        <location filename="../core/profile.c" line="1394"/>
         <source>RBT: %umin
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1379"/>
+        <location filename="../core/profile.c" line="1397"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1385"/>
+        <location filename="../core/profile.c" line="1403"/>
         <source>Tissue %.0fmin: %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1391"/>
+        <location filename="../core/profile.c" line="1409"/>
         <source>heartbeat: %d
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1393"/>
+        <location filename="../core/profile.c" line="1411"/>
         <source>bearing: %d
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1396"/>
+        <location filename="../core/profile.c" line="1414"/>
         <source>mean depth to here %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1491"/>
+        <location filename="../core/profile.c" line="1515"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1495"/>
-        <location filename="../core/profile.c" line="1499"/>
-        <location filename="../core/profile.c" line="1503"/>
+        <location filename="../core/profile.c" line="1519"/>
+        <location filename="../core/profile.c" line="1523"/>
+        <location filename="../core/profile.c" line="1527"/>
         <source>%s %sD:%.1f%s</source>
         <translation>%s %sD:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1507"/>
+        <location filename="../core/profile.c" line="1531"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sD:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1511"/>
+        <location filename="../core/profile.c" line="1535"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1515"/>
-        <location filename="../core/profile.c" line="1519"/>
+        <location filename="../core/profile.c" line="1539"/>
+        <location filename="../core/profile.c" line="1543"/>
         <source>%s %sV:%.2f%s</source>
         <translation>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1526"/>
+        <location filename="../core/profile.c" line="1550"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s</translation>
     </message>
     <message>
+        <location filename="../core/profile.c" line="1575"/>
+        <source>%s SAC:%.*f %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../core/qthelper.cpp" line="67"/>
         <source>%1km</source>
         <translation type="unfinished"/>
@@ -9550,446 +9993,460 @@ EADD: %d%s
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="635"/>
+        <location filename="../core/qthelper.cpp" line="91"/>
+        <location filename="../core/qthelper.cpp" line="226"/>
+        <source>N</source>
+        <translation>N</translation>
+    </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="91"/>
+        <location filename="../core/qthelper.cpp" line="227"/>
+        <source>S</source>
+        <translation>S</translation>
+    </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="92"/>
+        <location filename="../core/qthelper.cpp" line="228"/>
+        <source>E</source>
+        <translation>E</translation>
+    </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="92"/>
+        <location filename="../core/qthelper.cpp" line="229"/>
+        <source>W</source>
+        <translation>W</translation>
+    </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="640"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="638"/>
+        <location filename="../core/qthelper.cpp" line="643"/>
         <source>F</source>
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="23"/>
-        <source>boat</source>
-        <translation>σκάφος</translation>
+        <location filename="../core/save-html.c" line="469"/>
+        <location filename="../core/save-html.c" line="553"/>
+        <location filename="../core/worldmap-save.c" line="111"/>
+        <source>Can&apos;t open file %s</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/dive.c" line="23"/>
-        <source>shore</source>
-        <translation>ακτή</translation>
+        <location filename="../core/save-html.c" line="488"/>
+        <source>Number</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="459"/>
-        <location filename="../core/dive.c" line="23"/>
-        <source>drift</source>
-        <translation>ρεύμα</translation>
+        <location filename="../core/save-html.c" line="489"/>
+        <source>Date</source>
+        <translation>Ημερομηνία</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="24"/>
-        <source>deep</source>
-        <translation>βαθιά</translation>
+        <location filename="../core/save-html.c" line="490"/>
+        <source>Time</source>
+        <translation>Ώρα</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="24"/>
-        <source>cavern</source>
-        <translation>ανοικτό σπήλαιο</translation>
+        <location filename="../core/save-html.c" line="491"/>
+        <source>Location</source>
+        <translation>Τοποθεσία</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="443"/>
-        <location filename="../core/dive.c" line="24"/>
-        <source>ice</source>
-        <translation>πάγος</translation>
+        <location filename="../core/save-html.c" line="492"/>
+        <source>Air temp.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="445"/>
-        <source>search</source>
+        <location filename="../core/save-html.c" line="493"/>
+        <source>Water temp.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="455"/>
-        <location filename="../core/dive.c" line="25"/>
-        <source>wreck</source>
-        <translation>ναυάγιο</translation>
+        <location filename="../core/save-html.c" line="494"/>
+        <source>Dives</source>
+        <translation>Καταδύσεις</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="441"/>
-        <location filename="../core/dive.c" line="25"/>
-        <source>cave</source>
-        <translation>σπήλαιο</translation>
+        <location filename="../core/save-html.c" line="495"/>
+        <source>Expand all</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/dive.c" line="25"/>
-        <source>altitude</source>
-        <translation>υψόμετρο</translation>
+        <location filename="../core/save-html.c" line="496"/>
+        <source>Collapse all</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/dive.c" line="26"/>
-        <source>pool</source>
-        <translation>πισίνα</translation>
+        <location filename="../core/save-html.c" line="497"/>
+        <source>Trips</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/dive.c" line="26"/>
-        <source>lake</source>
-        <translation>λίμνη</translation>
+        <location filename="../core/save-html.c" line="498"/>
+        <source>Statistics</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="457"/>
-        <location filename="../core/dive.c" line="26"/>
-        <source>river</source>
-        <translation>ποτάμι</translation>
+        <location filename="../core/save-html.c" line="499"/>
+        <source>Advanced search</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="439"/>
-        <location filename="../core/dive.c" line="27"/>
-        <source>night</source>
-        <translation>νύχτα</translation>
+        <location filename="../core/save-html.c" line="502"/>
+        <source>Rating</source>
+        <translation>Βαθμός</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="153"/>
-        <source>Error: the file does not appear to be a DATATRAK divelog</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="503"/>
+        <source>Visibility</source>
+        <translation>Ορατότητα</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="286"/>
-        <source>clear</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="504"/>
+        <source>Duration</source>
+        <translation>Διάρκεια</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="289"/>
-        <source>misty</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="505"/>
+        <source>Divemaster</source>
+        <translation>Divemaster</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="292"/>
-        <source>fog</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="506"/>
+        <source>Buddy</source>
+        <translation>Ζευγάρι</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="295"/>
-        <source>rain</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="507"/>
+        <source>Suit</source>
+        <translation>Στολή</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="298"/>
-        <source>storm</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="508"/>
+        <source>Tags</source>
+        <translation>Ετικέτες</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="301"/>
-        <source>snow</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="509"/>
+        <location filename="../smtk-import/smartrak.c" line="251"/>
+        <location filename="../smtk-import/smartrak.c" line="321"/>
+        <source>Notes</source>
+        <translation>Σημειώσεις</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="321"/>
-        <source>No suit</source>
+        <location filename="../core/save-html.c" line="510"/>
+        <source>Show more details</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="324"/>
-        <source>Shorty</source>
+        <location filename="../core/save-html.c" line="513"/>
+        <source>Yearly statistics</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="327"/>
-        <source>Combi</source>
+        <location filename="../core/save-html.c" line="514"/>
+        <source>Year</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="330"/>
-        <source>Wet suit</source>
+        <location filename="../core/save-html.c" line="515"/>
+        <source>Total time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="333"/>
-        <source>Semidry suit</source>
+        <location filename="../core/save-html.c" line="516"/>
+        <source>Average time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="336"/>
-        <source>Dry suit</source>
+        <location filename="../core/save-html.c" line="517"/>
+        <source>Shortest time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="396"/>
-        <source>no stop</source>
+        <location filename="../core/save-html.c" line="518"/>
+        <source>Longest time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="400"/>
-        <source>single ascent</source>
+        <location filename="../core/save-html.c" line="519"/>
+        <source>Average depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="402"/>
-        <source>multiple ascent</source>
+        <location filename="../core/save-html.c" line="520"/>
+        <source>Min. depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="404"/>
-        <location filename="../core/dive.c" line="27"/>
-        <source>fresh</source>
-        <translation>fresh</translation>
+        <location filename="../core/save-html.c" line="521"/>
+        <source>Max. depth</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="406"/>
-        <source>salt water</source>
+        <location filename="../core/save-html.c" line="522"/>
+        <source>Average SAC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="431"/>
-        <source>sight seeing</source>
+        <location filename="../core/save-html.c" line="523"/>
+        <source>Min. SAC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="433"/>
-        <source>club dive</source>
+        <location filename="../core/save-html.c" line="524"/>
+        <source>Max. SAC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="437"/>
-        <source>instruction</source>
+        <location filename="../core/save-html.c" line="525"/>
+        <source>Average temp.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="463"/>
-        <source>other</source>
+        <location filename="../core/save-html.c" line="526"/>
+        <source>Min. temp.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="474"/>
-        <source>Other activities</source>
+        <location filename="../core/save-html.c" line="527"/>
+        <source>Max. temp.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="498"/>
-        <source>Datatrak/Wlog notes</source>
+        <location filename="../core/save-html.c" line="528"/>
+        <source>Back to list</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="537"/>
-        <source>Manually entered dive</source>
+        <location filename="../core/save-html.c" line="531"/>
+        <source>Dive No.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="588"/>
-        <source>Unknown</source>
+        <location filename="../core/save-html.c" line="532"/>
+        <source>Dive profile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="674"/>
-        <source>Error: couldn&apos;t open the file %s</source>
+        <location filename="../core/save-html.c" line="533"/>
+        <source>Dive information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="687"/>
-        <source>Error: no dive</source>
+        <location filename="../core/save-html.c" line="534"/>
+        <source>Dive equipment</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/dive.c" line="27"/>
-        <source>student</source>
-        <translation>μαθητής</translation>
+        <location filename="../core/save-html.c" line="535"/>
+        <location filename="../core/save-html.c" line="542"/>
+        <source>Type</source>
+        <translation>Τύπος</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="461"/>
-        <location filename="../core/dive.c" line="28"/>
-        <source>photo</source>
-        <translation>φωτογραφία</translation>
+        <location filename="../core/save-html.c" line="536"/>
+        <source>Size</source>
+        <translation>Μέγεθος</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="28"/>
-        <source>video</source>
-        <translation>βίντεο</translation>
+        <location filename="../core/save-html.c" line="537"/>
+        <source>Work pressure</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="435"/>
-        <location filename="../core/dive.c" line="28"/>
-        <source>instructor</source>
-        <translation>εκπαιδευτής</translation>
+        <location filename="../core/save-html.c" line="538"/>
+        <source>Start pressure</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="398"/>
-        <location filename="../core/dive.c" line="29"/>
-        <source>deco</source>
-        <translation>αποσυμπίεση</translation>
+        <location filename="../core/save-html.c" line="539"/>
+        <source>End pressure</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/dive.c" line="33"/>
-        <source>OC-gas</source>
+        <location filename="../core/save-html.c" line="540"/>
+        <source>Gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/dive.c" line="33"/>
-        <source>diluent</source>
+        <location filename="../core/save-html.c" line="541"/>
+        <source>Weight</source>
+        <translation>Βάρος</translation>
+    </message>
+    <message>
+        <location filename="../core/save-html.c" line="543"/>
+        <source>Events</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/dive.c" line="33"/>
-        <location filename="../core/equipment.c" line="88"/>
-        <location filename="../core/planner.c" line="1415"/>
-        <location filename="../core/planner.c" line="1418"/>
-        <source>oxygen</source>
+        <location filename="../core/save-html.c" line="544"/>
+        <source>Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/dive.c" line="227"/>
-        <source>ℓ</source>
+        <location filename="../core/save-html.c" line="545"/>
+        <source>Value</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="239"/>
+        <location filename="../core/save-html.c" line="546"/>
+        <source>Coordinates</source>
+        <translation>Συντεταγμένες</translation>
+    </message>
+    <message>
+        <location filename="../core/save-html.c" line="547"/>
+        <source>Dive status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/statistics.c" line="242"/>
         <source>more than %d days</source>
         <translation>περισσότερο από %d ημέρες</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="246"/>
+        <location filename="../core/statistics.c" line="249"/>
         <source>%dd %dh %dmin</source>
         <translation>%dd %dh %dmin</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="249"/>
+        <location filename="../core/statistics.c" line="252"/>
         <source>%dmin %dsecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="251"/>
+        <location filename="../core/statistics.c" line="254"/>
         <source>%dh %dmin</source>
         <translation>%dh %dmin</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="263"/>
+        <location filename="../core/statistics.c" line="266"/>
         <source>for dives #</source>
         <translation>για καταδύσεις #</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="269"/>
+        <location filename="../core/statistics.c" line="272"/>
         <source>for selected dives</source>
         <translation>για επιλεγμένες καταδύσεις</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="304"/>
+        <location filename="../core/statistics.c" line="307"/>
         <source>for dive #%d</source>
         <translation>για κατάδυση #%d</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="306"/>
+        <location filename="../core/statistics.c" line="309"/>
         <source>for selected dive</source>
         <translation>για επιλεγμένη κατάδυση</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="308"/>
+        <location filename="../core/statistics.c" line="311"/>
         <source>for all dives</source>
         <translation>για όλες τις καταδύσεις</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="310"/>
+        <location filename="../core/statistics.c" line="313"/>
         <source>(no dives)</source>
         <translation>(καμία κατάδυση)</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Sun</source>
         <translation>Κυρ</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Mon</source>
         <translation>Δευ</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Tue</source>
         <translation>Τρι</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Wed</source>
         <translation>Τετ</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Thu</source>
         <translation>Πεμ</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Fri</source>
         <translation>Παρ</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Sat</source>
         <translation>Σαβ</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Jan</source>
         <translation>Ιαν</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Feb</source>
         <translation>Φεβ</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Mar</source>
         <translation>Μαρ</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Apr</source>
         <translation>Απρ</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>May</source>
         <translation>Μαι</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Jun</source>
         <translation>Ιουν</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Jul</source>
         <translation>Ιουλ</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Aug</source>
         <translation>Αυγ</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Sep</source>
         <translation>Σεπ</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Oct</source>
         <translation>Οκτ</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Nov</source>
         <translation>Νοε</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Dec</source>
         <translation>Δεκ</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="191"/>
-        <location filename="../core/parse-xml.c" line="3284"/>
-        <location filename="../core/uemis-downloader.c" line="134"/>
-        <source>unknown</source>
-        <translation>άγνωστο</translation>
-    </message>
-    <message>
-        <location filename="../core/uemis-downloader.c" line="467"/>
-        <source>data</source>
-        <translation>δεδομένα</translation>
-    </message>
-    <message>
-        <location filename="../core/uemis-downloader.c" line="447"/>
-        <source>%s %s</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../core/uemis-downloader.c" line="27"/>
         <source>Uemis Zurich: the file system is almost full.
 Disconnect/reconnect the dive computer
@@ -10015,6 +10472,16 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../core/uemis-downloader.c" line="447"/>
+        <source>%s %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/uemis-downloader.c" line="467"/>
+        <source>data</source>
+        <translation>δεδομένα</translation>
+    </message>
+    <message>
         <location filename="../core/uemis-downloader.c" line="495"/>
         <source>divelog #</source>
         <translation type="unfinished"/>
@@ -10185,281 +10652,6 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="469"/>
-        <location filename="../core/save-html.c" line="553"/>
-        <location filename="../core/worldmap-save.c" line="111"/>
-        <source>Can&apos;t open file %s</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="488"/>
-        <source>Number</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="489"/>
-        <source>Date</source>
-        <translation>Ημερομηνία</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="490"/>
-        <source>Time</source>
-        <translation>Ώρα</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="491"/>
-        <source>Location</source>
-        <translation>Τοποθεσία</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="492"/>
-        <source>Air temp.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="493"/>
-        <source>Water temp.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="498"/>
-        <source>Statistics</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="502"/>
-        <source>Rating</source>
-        <translation>Βαθμός</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="503"/>
-        <source>Visibility</source>
-        <translation>Ορατότητα</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="504"/>
-        <source>Duration</source>
-        <translation>Διάρκεια</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="494"/>
-        <source>Dives</source>
-        <translation>Καταδύσεις</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="495"/>
-        <source>Expand all</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="496"/>
-        <source>Collapse all</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="497"/>
-        <source>Trips</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="499"/>
-        <source>Advanced search</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="505"/>
-        <source>Divemaster</source>
-        <translation>Divemaster</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="506"/>
-        <source>Buddy</source>
-        <translation>Ζευγάρι</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="507"/>
-        <source>Suit</source>
-        <translation>Στολή</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="508"/>
-        <source>Tags</source>
-        <translation>Ετικέτες</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="509"/>
-        <location filename="../smtk-import/smartrak.c" line="251"/>
-        <location filename="../smtk-import/smartrak.c" line="321"/>
-        <source>Notes</source>
-        <translation>Σημειώσεις</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="510"/>
-        <source>Show more details</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="513"/>
-        <source>Yearly statistics</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="514"/>
-        <source>Year</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="515"/>
-        <source>Total time</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="516"/>
-        <source>Average time</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="517"/>
-        <source>Shortest time</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="518"/>
-        <source>Longest time</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="519"/>
-        <source>Average depth</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="520"/>
-        <source>Min. depth</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="521"/>
-        <source>Max. depth</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="523"/>
-        <source>Min. SAC</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="524"/>
-        <source>Max. SAC</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="525"/>
-        <source>Average temp.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="526"/>
-        <source>Min. temp.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="527"/>
-        <source>Max. temp.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="528"/>
-        <source>Back to list</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="534"/>
-        <source>Dive equipment</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="537"/>
-        <source>Work pressure</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="538"/>
-        <source>Start pressure</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="539"/>
-        <source>End pressure</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="547"/>
-        <source>Dive status</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="522"/>
-        <source>Average SAC</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="531"/>
-        <source>Dive No.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="532"/>
-        <source>Dive profile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="533"/>
-        <source>Dive information</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="535"/>
-        <location filename="../core/save-html.c" line="542"/>
-        <source>Type</source>
-        <translation>Τύπος</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="536"/>
-        <source>Size</source>
-        <translation>Μέγεθος</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="540"/>
-        <source>Gas</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="541"/>
-        <source>Weight</source>
-        <translation>Βάρος</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="543"/>
-        <source>Events</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="544"/>
-        <source>Name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="545"/>
-        <source>Value</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="546"/>
-        <source>Coordinates</source>
-        <translation>Συντεταγμένες</translation>
-    </message>
-    <message>
         <location filename="../core/worldmap-save.c" line="39"/>
         <source>Date:</source>
         <translation type="unfinished"/>
@@ -10505,109 +10697,6 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation>Σημειώσεις:</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="91"/>
-        <location filename="../core/qthelper.cpp" line="226"/>
-        <source>N</source>
-        <translation>N</translation>
-    </message>
-    <message>
-        <location filename="../core/qthelper.cpp" line="91"/>
-        <location filename="../core/qthelper.cpp" line="227"/>
-        <source>S</source>
-        <translation>S</translation>
-    </message>
-    <message>
-        <location filename="../core/qthelper.cpp" line="92"/>
-        <location filename="../core/qthelper.cpp" line="228"/>
-        <source>E</source>
-        <translation>E</translation>
-    </message>
-    <message>
-        <location filename="../core/qthelper.cpp" line="92"/>
-        <location filename="../core/qthelper.cpp" line="229"/>
-        <source>W</source>
-        <translation>W</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="341"/>
-        <source>Remote storage and local data diverged. Error: merge failed (%s)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="134"/>
-        <source>Local cache directory %s corrupted - can&apos;t sync with Subsurface cloud storage</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="157"/>
-        <location filename="../core/git-access.c" line="177"/>
-        <source>Could not update local cache to newer remote data</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="170"/>
-        <source>Subsurface cloud storage corrupted</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="285"/>
-        <source>Could not update Subsurface cloud storage, try again later</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="371"/>
-        <source>Remote storage and local data diverged. Cannot combine local and remote changes</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="405"/>
-        <source>Remote storage and local data diverged</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="408"/>
-        <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="417"/>
-        <source>Problems with local cache of Subsurface cloud data</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="418"/>
-        <source>Moved cache data to %s. Please try the operation again.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="737"/>
-        <source>Error connecting to Subsurface cloud storage</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="740"/>
-        <source>git clone of %s failed (%s)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/load-git.c" line="222"/>
-        <location filename="../core/parse-xml.c" line="1300"/>
-        <source>additional name for site: %s
-</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/ostctools.c" line="120"/>
-        <location filename="../core/ostctools.c" line="152"/>
-        <source>Unknown DC in dive %d</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/ostctools.c" line="165"/>
-        <source>Error - %s - parsing dive %d</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../smtk-import/smartrak.c" line="247"/>
         <source>Built</source>
         <translation type="unfinished"/>
@@ -10691,155 +10780,120 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="91"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="103"/>
         <source>Subsurface</source>
         <translation>Subsurface</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="97"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="110"/>
         <source>Dive list</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="112"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="125"/>
         <source>Cloud credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="126"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="139"/>
         <source>Manage dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="138"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="141"/>
         <source>Add dive manually</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="146"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="149"/>
         <source>Manual sync with cloud</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="164"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="167"/>
         <source>Offline mode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="164"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="167"/>
         <source>Enable auto cloud sync</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="182"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="187"/>
         <source>GPS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="185"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="190"/>
         <source>GPS-tag dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="192"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="197"/>
         <source>Upload GPS data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="199"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="204"/>
         <source>Download GPS data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="206"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="211"/>
         <source>Show GPS fixes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="215"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="220"/>
         <source>Clear GPS cache</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="221"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="226"/>
         <source>Preferences</source>
         <translation>Προτιμήσεις</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="230"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="237"/>
         <source>Developer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="232"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="239"/>
         <source>App log</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="239"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="246"/>
         <source>Theme information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="246"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="253"/>
         <source>User manual</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="252"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="259"/>
         <source>About</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="283"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="304"/>
         <source>Run location service</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="283"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="304"/>
         <source>No GPS source available</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="295"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="316"/>
         <source>Actions</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="9"/>
-        <source>Hello World</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="13"/>
-        <source>File</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="15"/>
-        <source>&amp;Open</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="19"/>
-        <source>Exit</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="27"/>
-        <source>Button 1 pressed</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="28"/>
-        <source>Button 2 pressed</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="33"/>
-        <source>May I have your attention, please?</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>plannerDetails</name>
@@ -10913,6 +10967,24 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="121"/>
+        <location filename="../build/ui_plannerSettings.h" line="425"/>
+        <source>75% to 50% avg. depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="138"/>
+        <location filename="../build/ui_plannerSettings.h" line="427"/>
+        <source>50% avg. depth to 6m</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="155"/>
+        <location filename="../build/ui_plannerSettings.h" line="429"/>
+        <source>6m to surface</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="175"/>
         <location filename="../build/ui_plannerSettings.h" line="431"/>
         <source>Descent</source>
@@ -10936,12 +11008,35 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="268"/>
+        <source>Bühlmann deco</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="278"/>
         <location filename="../build/ui_plannerSettings.h" line="445"/>
         <source>Reserve gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="288"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="549"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="578"/>
+        <location filename="../build/ui_plannerSettings.h" line="446"/>
+        <location filename="../build/ui_plannerSettings.h" line="459"/>
+        <location filename="../build/ui_plannerSettings.h" line="461"/>
+        <source>bar</source>
+        <translation>bar</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="307"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="416"/>
+        <location filename="../build/ui_plannerSettings.h" line="437"/>
+        <location filename="../build/ui_plannerSettings.h" line="440"/>
+        <source>%</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="320"/>
         <location filename="../build/ui_plannerSettings.h" line="449"/>
         <source>Postpone gas change if a stop is not required</source>
@@ -10960,11 +11055,9 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="307"/>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="416"/>
-        <location filename="../build/ui_plannerSettings.h" line="437"/>
-        <location filename="../build/ui_plannerSettings.h" line="440"/>
-        <source>%</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="353"/>
+        <location filename="../build/ui_plannerSettings.h" line="436"/>
+        <source>Plan backgas breaks</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -10974,10 +11067,10 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="429"/>
-        <location filename="../build/ui_plannerSettings.h" line="441"/>
-        <source>Drop to first depth</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="370"/>
+        <location filename="../build/ui_plannerSettings.h" line="453"/>
+        <source>min</source>
+        <translation>min</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="389"/>
@@ -10986,162 +11079,138 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="353"/>
-        <location filename="../build/ui_plannerSettings.h" line="436"/>
-        <source>Plan backgas breaks</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="396"/>
+        <source>Maximize bottom time allowed by gas and no decompression limits</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="515"/>
-        <location filename="../build/ui_plannerSettings.h" line="455"/>
-        <source>Gas options</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="399"/>
+        <location filename="../build/ui_plannerSettings.h" line="443"/>
+        <source>Recreational mode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="594"/>
-        <location filename="../build/ui_plannerSettings.h" line="456"/>
-        <source>Bottom SAC</source>
-        <translation>SAC Βυθού</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="692"/>
-        <location filename="../build/ui_plannerSettings.h" line="457"/>
-        <source>Deco SAC</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="429"/>
+        <location filename="../build/ui_plannerSettings.h" line="441"/>
+        <source>Drop to first depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="601"/>
-        <location filename="../build/ui_plannerSettings.h" line="458"/>
-        <source>Bottom pO₂</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="436"/>
+        <location filename="../build/ui_plannerSettings.h" line="452"/>
+        <source>Min. switch duration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="685"/>
-        <location filename="../build/ui_plannerSettings.h" line="460"/>
-        <source>Deco pO₂</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="459"/>
+        <location filename="../build/ui_plannerSettings.h" line="444"/>
+        <source>Safety stop</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="565"/>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="672"/>
-        <location filename="../build/ui_plannerSettings.h" line="462"/>
-        <location filename="../build/ui_plannerSettings.h" line="463"/>
-        <source>ℓ/min</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="495"/>
+        <source>Conservatism level</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="632"/>
-        <location filename="../build/ui_plannerSettings.h" line="468"/>
-        <source>Display runtime</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="515"/>
+        <location filename="../build/ui_plannerSettings.h" line="455"/>
+        <source>Gas options</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="645"/>
-        <location filename="../build/ui_plannerSettings.h" line="472"/>
-        <source>Display segment duration</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="565"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="698"/>
+        <location filename="../build/ui_plannerSettings.h" line="462"/>
+        <location filename="../build/ui_plannerSettings.h" line="463"/>
+        <source>ℓ/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="655"/>
-        <location filename="../build/ui_plannerSettings.h" line="476"/>
-        <source>Display transitions in deco</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="594"/>
+        <source>m</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="662"/>
-        <location filename="../build/ui_plannerSettings.h" line="477"/>
-        <source>Verbatim dive plan</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="606"/>
+        <source>Used to calculate best mix. Select best mix depth in &apos;Available gases&apos; table by entering gas depth, followed by &quot;B&quot; (best trimix mix) or &quot;BN&quot; (best nitrox mix)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="288"/>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="549"/>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="578"/>
-        <location filename="../build/ui_plannerSettings.h" line="446"/>
-        <location filename="../build/ui_plannerSettings.h" line="459"/>
-        <location filename="../build/ui_plannerSettings.h" line="461"/>
-        <source>bar</source>
-        <translation>bar</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="613"/>
+        <location filename="../build/ui_plannerSettings.h" line="456"/>
+        <source>Bottom SAC</source>
+        <translation>SAC Βυθού</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="121"/>
-        <location filename="../build/ui_plannerSettings.h" line="425"/>
-        <source>75% to 50% avg. depth</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="620"/>
+        <location filename="../build/ui_plannerSettings.h" line="458"/>
+        <source>Bottom pO₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="138"/>
-        <location filename="../build/ui_plannerSettings.h" line="427"/>
-        <source>50% avg. depth to 6m</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="627"/>
+        <source>Best mix END</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="155"/>
-        <location filename="../build/ui_plannerSettings.h" line="429"/>
-        <source>6m to surface</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="634"/>
+        <location filename="../build/ui_plannerSettings.h" line="464"/>
+        <source>Notes</source>
+        <translation>Σημειώσεις</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="268"/>
-        <source>Bühlmann deco</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="655"/>
+        <location filename="../build/ui_plannerSettings.h" line="466"/>
+        <source>In dive plan, show runtime (absolute time) of stops</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="370"/>
-        <location filename="../build/ui_plannerSettings.h" line="453"/>
-        <source>min</source>
-        <translation>min</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="396"/>
-        <source>Maximize bottom time allowed by gas and no decompression limits</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="658"/>
+        <location filename="../build/ui_plannerSettings.h" line="468"/>
+        <source>Display runtime</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="399"/>
-        <location filename="../build/ui_plannerSettings.h" line="443"/>
-        <source>Recreational mode</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="668"/>
+        <location filename="../build/ui_plannerSettings.h" line="470"/>
+        <source>In dive plan, show duration (relative time) of stops</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="436"/>
-        <location filename="../build/ui_plannerSettings.h" line="452"/>
-        <source>Min. switch duration</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="671"/>
+        <location filename="../build/ui_plannerSettings.h" line="472"/>
+        <source>Display segment duration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="459"/>
-        <location filename="../build/ui_plannerSettings.h" line="444"/>
-        <source>Safety stop</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="678"/>
+        <location filename="../build/ui_plannerSettings.h" line="474"/>
+        <source>In diveplan, list transitions or treat them as implicit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="495"/>
-        <source>Conservatism level</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="681"/>
+        <location filename="../build/ui_plannerSettings.h" line="476"/>
+        <source>Display transitions in deco</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="608"/>
-        <location filename="../build/ui_plannerSettings.h" line="464"/>
-        <source>Notes</source>
-        <translation>Σημειώσεις</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="629"/>
-        <location filename="../build/ui_plannerSettings.h" line="466"/>
-        <source>In dive plan, show runtime (absolute time) of stops</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="688"/>
+        <location filename="../build/ui_plannerSettings.h" line="477"/>
+        <source>Verbatim dive plan</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="642"/>
-        <location filename="../build/ui_plannerSettings.h" line="470"/>
-        <source>In dive plan, show duration (relative time) of stops</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="711"/>
+        <location filename="../build/ui_plannerSettings.h" line="460"/>
+        <source>Deco pO₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="652"/>
-        <location filename="../build/ui_plannerSettings.h" line="474"/>
-        <source>In diveplan, list transitions or treat them as implicit</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="718"/>
+        <location filename="../build/ui_plannerSettings.h" line="457"/>
+        <source>Deco SAC</source>
         <translation type="unfinished"/>
     </message>
 </context>
diff --git a/translations/subsurface_en_GB.ts b/translations/subsurface_en_GB.ts
index 76d59e4fd..e77c81ccf 100644
--- a/translations/subsurface_en_GB.ts
+++ b/translations/subsurface_en_GB.ts
@@ -109,6 +109,11 @@
         <translation>Name:</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="56"/>
+        <source>Could not initialize Winsock version 2.2</source>
+        <translation>Could not initialize Winsock version 2.2</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="134"/>
         <source>Trying to turn on the local Bluetooth device...</source>
         <translation>Trying to turn on the local Bluetooth device...</translation>
@@ -119,6 +124,11 @@
         <translation>Trying to turn off the local Bluetooth device...</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="167"/>
+        <source>Remote devices list was cleared.</source>
+        <translation>Remote devices list was cleared.</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="183"/>
         <source>Scanning for remote devices...</source>
         <translation>Scanning for remote devices...</translation>
@@ -129,6 +139,22 @@
         <translation>Scanning finished successfully.</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="208"/>
+        <source>The local Bluetooth device was %1.</source>
+        <extracomment>%1 will be replaced with &quot;turned on&quot; or &quot;turned off&quot;</extracomment>
+        <translation>The local Bluetooth device was %1.</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
+        <source>turned on</source>
+        <translation>turned on</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
+        <source>turned off</source>
+        <translation>turned off</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="225"/>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="339"/>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="359"/>
@@ -176,37 +202,6 @@
         <translation>Pair</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="352"/>
-        <source>Device %1 was paired and is authorized.</source>
-        <translation>Device %1 was paired and is authorised.</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="56"/>
-        <source>Could not initialize Winsock version 2.2</source>
-        <translation>Could not initialize Winsock version 2.2</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="167"/>
-        <source>Remote devices list was cleared.</source>
-        <translation>Remote devices list was cleared.</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="208"/>
-        <source>The local Bluetooth device was %1.</source>
-        <extracomment>%1 will be replaced with &quot;turned on&quot; or &quot;turned off&quot;</extracomment>
-        <translation>The local Bluetooth device was %1.</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
-        <source>turned on</source>
-        <translation>turned on</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
-        <source>turned off</source>
-        <translation>turned off</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="307"/>
         <source>Remove pairing</source>
         <translation>Remove pairing</translation>
@@ -232,6 +227,11 @@
         <translation>Device %1 was paired.</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="352"/>
+        <source>Device %1 was paired and is authorized.</source>
+        <translation>Device %1 was paired and is authorised.</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="378"/>
         <source>The device %1 can now be used for connection. You can press the Save button.</source>
         <translation>The device %1 can now be used for connection. You can press the Save button.</translation>
@@ -290,12 +290,12 @@
 <context>
     <name>BuddyFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="621"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="619"/>
         <source>Person: </source>
         <translation>Person: </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="622"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="620"/>
         <source>Searches for buddies and divemasters</source>
         <translation>Searches for buddies and divemasters</translation>
     </message>
@@ -303,7 +303,7 @@
 <context>
     <name>BuddyFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="243"/>
+        <location filename="../qt-models/filtermodels.cpp" line="248"/>
         <source>No buddies</source>
         <translation>No buddies</translation>
     </message>
@@ -311,25 +311,30 @@
 <context>
     <name>CloudCredentials</name>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="49"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="50"/>
         <source>Cloud credentials</source>
         <translation>Cloud credentials</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="55"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="56"/>
         <source>Email</source>
         <translation>Email</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="67"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="68"/>
         <source>Password</source>
         <translation>Password</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="90"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="92"/>
         <source>Show password</source>
         <translation>Show password</translation>
     </message>
+    <message>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="97"/>
+        <source>PIN</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>ColumnNameProvider</name>
@@ -385,6 +390,16 @@
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
+        <source>Max. depth</source>
+        <translation>Max. depth</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
+        <source>Avg. depth</source>
+        <translation>Avg. depth</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
         <source>Divemaster</source>
         <translation>Divemaster</translation>
     </message>
@@ -395,6 +410,11 @@
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
+        <source>Suit</source>
+        <translation>Suit</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
         <source>Notes</source>
         <translation>Notes</translation>
     </message>
@@ -414,21 +434,6 @@
         <translation>Water temp.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
-        <source>Max. depth</source>
-        <translation>Max. depth</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
-        <source>Avg. depth</source>
-        <translation>Avg. depth</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
-        <source>Suit</source>
-        <translation>Suit</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="44"/>
         <source>O₂</source>
         <translation>O₂</translation>
@@ -542,7 +547,7 @@
         <translation>Unable to create libdivecomputer context</translation>
     </message>
     <message>
-        <location filename="../core/configuredivecomputer.cpp" line="660"/>
+        <location filename="../core/configuredivecomputer.cpp" line="656"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation>Could not a establish connection to the dive computer.</translation>
     </message>
@@ -562,11 +567,19 @@
         <translation>Device or mount point</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="170"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1520"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1533"/>
-        <source>...</source>
-        <translation>...</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="47"/>
+        <source>Connect via Bluetooth</source>
+        <translation>Connect via Bluetooth</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="54"/>
+        <source>Connect</source>
+        <translation>Connect</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="64"/>
+        <source>Disconnect</source>
+        <translation>Disconnect</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="80"/>
@@ -575,12 +588,24 @@
         <translation>Retrieve available details</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="90"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1523"/>
+        <source>Read settings from backup file or from device before writing to the device</source>
+        <translation>Read settings from backup file or from device before writing to the device</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="93"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1525"/>
         <source>Save changes to device</source>
         <translation>Save changes to device</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="116"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1527"/>
+        <source>Read settings from backup file or from device before writing to a backup file</source>
+        <translation>Read settings from backup file or from device before writing to a backup file</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="119"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1529"/>
         <source>Backup</source>
@@ -599,15 +624,40 @@
         <translation>Update firmware</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="163"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1532"/>
+        <source>Save libdivecomputer logfile</source>
+        <translation>Save libdivecomputer logfile</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="170"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1520"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1533"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="177"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1534"/>
         <source>Cancel</source>
         <translation>Cancel</translation>
     </message>
     <message>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1539"/>
-        <source>OSTC 3</source>
-        <translation>OSTC 3</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="214"/>
+        <source>OSTC 3,Sport,Cr,2</source>
+        <translation>OSTC 3,Sport,Cr,2</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="223"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1541"/>
+        <source>Suunto Vyper family</source>
+        <translation>Suunto Vyper family</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="232"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1543"/>
+        <source>OSTC, Mk.2/2N/2C</source>
+        <translation>OSTC, Mk.2/2N/2C</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="253"/>
@@ -620,40 +670,56 @@
         <translation>Basic settings</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="326"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1656"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1943"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1546"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1726"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1766"/>
-        <source>Serial No.</source>
-        <translation>Serial No.</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="260"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1575"/>
+        <source>Eco</source>
+        <translation>Eco</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="349"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1679"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1980"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1547"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1727"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1767"/>
-        <source>Firmware version</source>
-        <translation>Firmware version</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="265"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1576"/>
+        <source>Medium</source>
+        <translation>Medium</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="538"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1713"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1990"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1548"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1729"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1768"/>
-        <source>Custom text</source>
-        <translation>Custom text</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="270"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1577"/>
+        <source>High</source>
+        <translation>High</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="385"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1549"/>
-        <source>Language</source>
-        <translation>Language</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="278"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="826"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="849"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="875"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="927"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="993"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1019"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1101"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1117"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1450"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2278"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2382"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2408"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2434"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2474"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2497"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1586"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1621"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1623"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1625"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1628"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1637"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1638"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1710"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1785"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1789"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1801"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1803"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1806"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1807"/>
+        <source>%</source>
+        <translation>%</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="289"/>
@@ -680,44 +746,36 @@
         <translation>Italian</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="579"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1557"/>
-        <source>Dive mode</source>
-        <translation>Dive mode</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="556"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1560"/>
-        <source>OC</source>
-        <translation>OC</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="561"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1561"/>
-        <source>CC</source>
-        <translation>CC</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="313"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1582"/>
+        <source>m/°C</source>
+        <translation>m/°C</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="566"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2336"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1562"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1793"/>
-        <source>Gauge</source>
-        <translation>Gauge</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="318"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1583"/>
+        <source>ft/°F</source>
+        <translation>ft/°F</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="571"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1563"/>
-        <source>Apnea</source>
-        <translation>Apnea</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="326"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1656"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1943"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1546"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1726"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1766"/>
+        <source>Serial No.</source>
+        <translation>Serial No.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="395"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2063"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1565"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1780"/>
-        <source>Date format</source>
-        <translation>Date format</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="349"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1679"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1980"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1547"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1727"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1767"/>
+        <source>Firmware version</source>
+        <translation>Firmware version</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="360"/>
@@ -738,108 +796,147 @@
         <translation>YYMMDD</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1042"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2457"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1639"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1805"/>
-        <source>Saturation</source>
-        <translation>Saturation</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="385"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1549"/>
+        <source>Language</source>
+        <translation>Language</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="278"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="826"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="849"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="875"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="927"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="993"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1019"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1101"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1117"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1450"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2278"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2382"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2408"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2434"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2474"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2497"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1586"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1621"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1623"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1625"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1628"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1637"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1638"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1710"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1785"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1789"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1801"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1803"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1806"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1807"/>
-        <source>%</source>
-        <translation>%</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="395"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2063"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1565"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1780"/>
+        <source>Date format</source>
+        <translation>Date format</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="865"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2261"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1624"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1784"/>
-        <source>Desaturation</source>
-        <translation>Desaturation</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="405"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1572"/>
+        <source>Brightness</source>
+        <translation>Brightness</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="983"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2398"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1636"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1800"/>
-        <source>Last deco</source>
-        <translation>Last deco</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="415"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1850"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1579"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1753"/>
+        <source>Units</source>
+        <translation>Units</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="711"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="736"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="758"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="904"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2181"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2206"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2228"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2307"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1626"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1786"/>
-        <source> m</source>
-        <translation> m</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="425"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1585"/>
+        <source>Salinity (0-5%)</source>
+        <translation>Salinity (0-5%)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="405"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1572"/>
-        <source>Brightness</source>
-        <translation>Brightness</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="438"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1615"/>
+        <source>Reset device to default settings</source>
+        <translation>Reset device to default settings</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="260"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1575"/>
-        <source>Eco</source>
-        <translation>Eco</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="452"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1590"/>
+        <source>230LSB/Gauss</source>
+        <translation>230LSB/Gauss</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="265"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1576"/>
-        <source>Medium</source>
-        <translation>Medium</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="457"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1591"/>
+        <source>330LSB/Gauss</source>
+        <translation>330LSB/Gauss</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="270"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1577"/>
-        <source>High</source>
-        <translation>High</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="462"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1592"/>
+        <source>390LSB/Gauss</source>
+        <translation>390LSB/Gauss</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="603"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2034"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1599"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1779"/>
-        <source>Sampling rate</source>
-        <translation>Sampling rate</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="467"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1593"/>
+        <source>440LSB/Gauss</source>
+        <translation>440LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="472"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1594"/>
+        <source>660LSB/Gauss</source>
+        <translation>660LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="477"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1595"/>
+        <source>820LSB/Gauss</source>
+        <translation>820LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="482"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1596"/>
+        <source>1090LSB/Gauss</source>
+        <translation>1090LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="487"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1597"/>
+        <source>1370LSB/Gauss</source>
+        <translation>1370LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="521"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1587"/>
+        <source>Compass gain</source>
+        <translation>Compass gain</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="531"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1799"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1745"/>
+        <source>Computer model</source>
+        <translation>Computer model</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="538"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1713"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1990"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1548"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1729"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1768"/>
+        <source>Custom text</source>
+        <translation>Custom text</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="556"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1560"/>
+        <source>OC</source>
+        <translation>OC</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="561"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1561"/>
+        <source>CC</source>
+        <translation>CC</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="566"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2336"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1562"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1793"/>
+        <source>Gauge</source>
+        <translation>Gauge</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="571"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1563"/>
+        <source>Apnea</source>
+        <translation>Apnea</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="579"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1557"/>
+        <source>Dive mode</source>
+        <translation>Dive mode</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="590"/>
@@ -856,30 +953,12 @@
         <translation>10s</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="415"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1850"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1579"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1753"/>
-        <source>Units</source>
-        <translation>Units</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="313"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1582"/>
-        <source>m/°C</source>
-        <translation>m/°C</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="318"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1583"/>
-        <source>ft/°F</source>
-        <translation>ft/°F</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="644"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1605"/>
-        <source>Dive mode color</source>
-        <translation>Dive mode colour</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="603"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2034"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1599"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1779"/>
+        <source>Sampling rate</source>
+        <translation>Sampling rate</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="614"/>
@@ -906,12 +985,6 @@
         <translation>Blue</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="425"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1585"/>
-        <source>Salinity (0-5%)</source>
-        <translation>Salinity (0-5%)</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="637"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2092"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1613"/>
@@ -920,90 +993,80 @@
         <translation>Sync dive computer time with PC</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="521"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1587"/>
-        <source>Compass gain</source>
-        <translation>Compass gain</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="90"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1523"/>
-        <source>Read settings from backup file or from device before writing to the device</source>
-        <translation>Read settings from backup file or from device before writing to the device</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="116"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1527"/>
-        <source>Read settings from backup file or from device before writing to a backup file</source>
-        <translation>Read settings from backup file or from device before writing to a backup file</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="232"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1543"/>
-        <source>OSTC, Mk.2/2N/2C</source>
-        <translation>OSTC, Mk.2/2N/2C</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="644"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1605"/>
+        <source>Dive mode color</source>
+        <translation>Dive mode colour</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="452"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1590"/>
-        <source>230LSB/Gauss</source>
-        <translation>230LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="654"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2020"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1614"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1771"/>
+        <source>Show safety stop</source>
+        <translation>Show safety stop</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="457"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1591"/>
-        <source>330LSB/Gauss</source>
-        <translation>330LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="661"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2145"/>
+        <source>End Depth</source>
+        <translation>End Depth</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="462"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1592"/>
-        <source>390LSB/Gauss</source>
-        <translation>390LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="671"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2162"/>
+        <source> s</source>
+        <translation> s</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="467"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1593"/>
-        <source>440LSB/Gauss</source>
-        <translation>440LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="687"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1953"/>
+        <source>Length</source>
+        <translation>Length</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="472"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1594"/>
-        <source>660LSB/Gauss</source>
-        <translation>660LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="694"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2138"/>
+        <source>Start Depth</source>
+        <translation>Start Depth</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="477"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1595"/>
-        <source>820LSB/Gauss</source>
-        <translation>820LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="701"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2152"/>
+        <source>Reset Depth</source>
+        <translation>Reset Depth</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="482"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1596"/>
-        <source>1090LSB/Gauss</source>
-        <translation>1090LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="711"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="736"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="758"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="904"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2181"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2206"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2228"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2307"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1626"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1786"/>
+        <source> m</source>
+        <translation> m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="487"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1597"/>
-        <source>1370LSB/Gauss</source>
-        <translation>1370LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="778"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2248"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1643"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1810"/>
+        <source>Advanced settings</source>
+        <translation>Advanced settings</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="654"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2020"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1614"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1771"/>
-        <source>Show safety stop</source>
-        <translation>Show safety stop</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="784"/>
+        <source>Left button sensitivity</source>
+        <translation>Left button sensitivity</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="438"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1615"/>
-        <source>Reset device to default settings</source>
-        <translation>Reset device to default settings</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="791"/>
+        <source>Always show ppO2</source>
+        <translation>Always show pO₂</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="798"/>
@@ -1014,20 +1077,6 @@
         <translation>Alt GF can be selected underwater</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="223"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1541"/>
-        <source>Suunto Vyper family</source>
-        <translation>Suunto Vyper family</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="778"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2248"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1643"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1810"/>
-        <source>Advanced settings</source>
-        <translation>Advanced settings</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="805"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2271"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1618"/>
@@ -1058,6 +1107,14 @@
         <translation>GFHigh</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="865"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2261"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1624"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1784"/>
+        <source>Desaturation</source>
+        <translation>Desaturation</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="917"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2320"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1627"/>
@@ -1072,14 +1129,6 @@
         <translation> mbar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="973"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2369"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1630"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1788"/>
-        <source> min</source>
-        <translation> min</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="960"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2331"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1633"/>
@@ -1088,63 +1137,28 @@
         <translation>ZH-L16</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="47"/>
-        <source>Connect via Bluetooth</source>
-        <translation>Connect via Bluetooth</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="163"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1532"/>
-        <source>Save libdivecomputer logfile</source>
-        <translation>Save libdivecomputer logfile</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="661"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2145"/>
-        <source>End Depth</source>
-        <translation>End Depth</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="671"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2162"/>
-        <source> s</source>
-        <translation> s</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="687"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1953"/>
-        <source>Length</source>
-        <translation>Length</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="694"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2138"/>
-        <source>Start Depth</source>
-        <translation>Start Depth</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="701"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2152"/>
-        <source>Reset Depth</source>
-        <translation>Reset Depth</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="784"/>
-        <source>Left button sensitivity</source>
-        <translation>Left button sensitivity</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="791"/>
-        <source>Always show ppO2</source>
-        <translation>Always show pO₂</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="965"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1634"/>
         <source>ZH-L16+GF</source>
         <translation>ZH-L16+GF</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="973"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2369"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1630"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1788"/>
+        <source> min</source>
+        <translation> min</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="983"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2398"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1636"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1800"/>
+        <source>Last deco</source>
+        <translation>Last deco</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1009"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2424"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1640"/>
@@ -1161,6 +1175,14 @@
         <translation>Alt GFHigh</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1042"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2457"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1639"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1805"/>
+        <source>Saturation</source>
+        <translation>Saturation</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1052"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1642"/>
         <source>Flip screen</source>
@@ -1172,12 +1194,22 @@
         <translation>Right button sensitivity</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1066"/>
+        <source>MOD warning</source>
+        <translation>MOD warning</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1073"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2513"/>
         <source>Graphical speed indicator</source>
         <translation>Graphical speed indicator</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1080"/>
+        <source>Dynamic ascent rate</source>
+        <translation>Dynamic ascent rate</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1087"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2552"/>
         <source>Bottom gas consumption</source>
@@ -1190,6 +1222,14 @@
         <translation>Deco gas consumption</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1133"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1149"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2520"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2536"/>
+        <source> ℓ/min</source>
+        <translation> ℓ/min</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1165"/>
         <source>Temperature sensor offset</source>
         <translation>Temperature sensor offset</translation>
@@ -1208,6 +1248,18 @@
         <translation>Gas settings</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1235"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1320"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2610"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2695"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1645"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1668"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1812"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1835"/>
+        <source>%O₂</source>
+        <translation>%O₂</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1240"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1325"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2615"/>
@@ -1326,16 +1378,10 @@
         <translation>Dil 5</translation>
     </message>
     <message>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1691"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1858"/>
-        <source>Set point [cbar]</source>
-        <translation>Set point [cbar]</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1693"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1860"/>
-        <source>Change depth [m]</source>
-        <translation>Change depth [m]</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1405"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2770"/>
+        <source>Setpoint</source>
+        <translation>Setpoint</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1415"/>
@@ -1374,6 +1420,12 @@
         <translation>SP 5</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1443"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1709"/>
+        <source>O₂ in calibration gas</source>
+        <translation>O₂ in calibration gas</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1467"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1713"/>
         <source>Fixed setpoint</source>
@@ -1404,101 +1456,6 @@
         <translation> cbar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1748"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1733"/>
-        <source>P1 (medium)</source>
-        <extracomment>Suunto safety level</extracomment>
-        <translation>P1 (medium)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1753"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1734"/>
-        <source>P2 (high)</source>
-        <extracomment>Suunto safety level</extracomment>
-        <translation>P2 (high)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1792"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1744"/>
-        <source>Total dive time</source>
-        <translation>Total dive time</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2109"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1769"/>
-        <source>kg/ℓ</source>
-        <translation>kg/ℓ</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2346"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1795"/>
-        <source>Apnoea</source>
-        <translation>Apnoea</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1583"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1722"/>
-        <source>Safety level</source>
-        <translation>Safety level</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="54"/>
-        <source>Connect</source>
-        <translation>Connect</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="64"/>
-        <source>Disconnect</source>
-        <translation>Disconnect</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="214"/>
-        <source>OSTC 3,Sport,Cr,2</source>
-        <translation>OSTC 3,Sport,Cr,2</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1066"/>
-        <source>MOD warning</source>
-        <translation>MOD warning</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1080"/>
-        <source>Dynamic ascent rate</source>
-        <translation>Dynamic ascent rate</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1133"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1149"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2520"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2536"/>
-        <source> ℓ/min</source>
-        <translation> ℓ/min</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1235"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1320"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2610"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2695"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1645"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1668"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1812"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1835"/>
-        <source>%O₂</source>
-        <translation>%O₂</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1405"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2770"/>
-        <source>Setpoint</source>
-        <translation>Setpoint</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1443"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1709"/>
-        <source>O₂ in calibration gas</source>
-        <translation>O₂ in calibration gas</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1535"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2843"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1719"/>
@@ -1515,6 +1472,12 @@
         <translation>pO₂ min</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1583"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1722"/>
+        <source>Safety level</source>
+        <translation>Safety level</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1609"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1723"/>
         <source>Altitude range</source>
@@ -1548,6 +1511,20 @@
         <translation>P0 (none)</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1748"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1733"/>
+        <source>P1 (medium)</source>
+        <extracomment>Suunto safety level</extracomment>
+        <translation>P1 (medium)</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1753"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1734"/>
+        <source>P2 (high)</source>
+        <extracomment>Suunto safety level</extracomment>
+        <translation>P2 (high)</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1761"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1736"/>
         <source>Sample rate</source>
@@ -1572,11 +1549,10 @@
         <translation>60s</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="531"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1799"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1745"/>
-        <source>Computer model</source>
-        <translation>Computer model</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1792"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1744"/>
+        <source>Total dive time</source>
+        <translation>Total dive time</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1816"/>
@@ -1641,12 +1617,6 @@
         <translation>Time alarm</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2099"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1765"/>
-        <source>Salinity</source>
-        <translation>Salinity</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2074"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1774"/>
         <source>MM/DD/YY</source>
@@ -1665,12 +1635,30 @@
         <translation>YY/MM/DD</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2099"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1765"/>
+        <source>Salinity</source>
+        <translation>Salinity</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2109"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1769"/>
+        <source>kg/ℓ</source>
+        <translation>kg/ℓ</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2341"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1794"/>
         <source>ZH-L16 CC</source>
         <translation>ZH-L16 CC</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2346"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1795"/>
+        <source>Apnoea</source>
+        <translation>Apnoea</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2351"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1796"/>
         <source>L16-GF OC</source>
@@ -1689,87 +1677,112 @@
         <translation>PSCR-GF</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1108"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1129"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1539"/>
+        <source>OSTC 3</source>
+        <translation>OSTC 3</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1691"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1858"/>
+        <source>Set point [cbar]</source>
+        <translation>Set point [cbar]</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1693"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1860"/>
+        <source>Change depth [m]</source>
+        <translation>Change depth [m]</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1110"/>
+        <source>Backup dive computer settings</source>
+        <translation>Backup dive computer settings</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1111"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1132"/>
         <source>Backup files (*.xml)</source>
         <translation>Backup files (*.xml)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1113"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1115"/>
+        <source>XML backup error</source>
+        <translation>XML backup error</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1116"/>
         <source>An error occurred while saving the backup file.
 %1</source>
         <translation>An error occurred while saving the backup file.
 %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1116"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1119"/>
         <source>Backup succeeded</source>
         <translation>Backup succeeded</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1117"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1120"/>
         <source>Your settings have been saved to: %1</source>
         <translation>Your settings have been saved to: %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1107"/>
-        <source>Backup dive computer settings</source>
-        <translation>Backup dive computer settings</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1112"/>
-        <source>XML backup error</source>
-        <translation>XML backup error</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1128"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1131"/>
         <source>Restore dive computer settings</source>
         <translation>Restore dive computer settings</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1134"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1137"/>
         <source>XML restore error</source>
         <translation>XML restore error</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1135"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1138"/>
         <source>An error occurred while restoring the backup file.
 %1</source>
         <translation>An error occurred while restoring the backup file.
 %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1139"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1142"/>
         <source>Restore succeeded</source>
         <translation>Restore succeeded</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1140"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1143"/>
         <source>Your settings have been restored successfully.</source>
         <translation>Your settings have been restored successfully.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1150"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1153"/>
         <source>Select firmware file</source>
         <translation>Select firmware file</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1151"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1154"/>
         <source>All files (*.*)</source>
         <translation>All files (*.*)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1207"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1210"/>
         <source>Choose file for divecomputer download logfile</source>
         <translation>Choose file for divecomputer download logfile</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1208"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1211"/>
         <source>Log files (*.log)</source>
         <translation>Log files (*.log)</translation>
     </message>
 </context>
 <context>
+    <name>ContextDrawer</name>
+    <message>
+        <location filename="../mobile-widgets/qml/kirigami/src/controls/ContextDrawer.qml" line="76"/>
+        <source>Actions</source>
+        <translation>Actions</translation>
+    </message>
+</context>
+<context>
     <name>CylindersModel</name>
     <message>
         <location filename="../qt-models/cylindermodel.cpp" line="16"/>
@@ -1783,11 +1796,6 @@
     </message>
     <message>
         <location filename="../qt-models/cylindermodel.cpp" line="16"/>
-        <source>He%</source>
-        <translation>He%</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="16"/>
         <source>Work press.</source>
         <translation>Work press.</translation>
     </message>
@@ -1807,9 +1815,24 @@
         <translation>O₂%</translation>
     </message>
     <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="16"/>
+        <source>He%</source>
+        <translation>He%</translation>
+    </message>
+    <message>
         <location filename="../qt-models/cylindermodel.cpp" line="17"/>
-        <source>Switch at</source>
-        <translation>Switch at</translation>
+        <source>Deco switch at</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
+        <source>Bot. MOD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
+        <source>MND</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-models/cylindermodel.cpp" line="17"/>
@@ -1827,17 +1850,32 @@
         <translation>ℓ</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="161"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="177"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation>Clicking here will remove this cylinder.</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="383"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="180"/>
+        <source>Switch depth for deco gas. Calculated using Deco pO₂ preference, unless set manually.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="183"/>
+        <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to &apos;*&apos; for best O₂% for max depth.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="186"/>
+        <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to &apos;*&apos; for best He% for max depth.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="444"/>
         <source>Cylinder cannot be removed</source>
         <translation>Cylinder cannot be removed</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="384"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="445"/>
         <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source>
         <translation>This gas is in use. Only cylinders that are not used in the dive can be removed.</translation>
     </message>
@@ -1857,42 +1895,24 @@
         <translation>Which components would you like to copy</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="73"/>
+        <location filename="../build/ui_divecomponentselection.h" line="141"/>
+        <source>Dive site</source>
+        <translation>Dive site</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="80"/>
         <location filename="../build/ui_divecomponentselection.h" line="142"/>
         <source>Suit</source>
         <translation>Suit</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="122"/>
-        <location filename="../build/ui_divecomponentselection.h" line="148"/>
-        <source>Divemaster</source>
-        <translation>Divemaster</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="129"/>
-        <location filename="../build/ui_divecomponentselection.h" line="149"/>
-        <source>Buddy</source>
-        <translation>Buddy</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="136"/>
-        <location filename="../build/ui_divecomponentselection.h" line="150"/>
-        <source>Rating</source>
-        <translation>Rating</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="87"/>
         <location filename="../build/ui_divecomponentselection.h" line="143"/>
         <source>Visibility</source>
         <translation>Visibility</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="73"/>
-        <location filename="../build/ui_divecomponentselection.h" line="141"/>
-        <source>Dive site</source>
-        <translation>Dive site</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="94"/>
         <location filename="../build/ui_divecomponentselection.h" line="144"/>
         <source>Notes</source>
@@ -1916,10 +1936,34 @@
         <source>Cylinders</source>
         <translation>Cylinders</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="122"/>
+        <location filename="../build/ui_divecomponentselection.h" line="148"/>
+        <source>Divemaster</source>
+        <translation>Divemaster</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="129"/>
+        <location filename="../build/ui_divecomponentselection.h" line="149"/>
+        <source>Buddy</source>
+        <translation>Buddy</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="136"/>
+        <location filename="../build/ui_divecomponentselection.h" line="150"/>
+        <source>Rating</source>
+        <translation>Rating</translation>
+    </message>
 </context>
 <context>
     <name>DiveComputerManagementDialog</name>
     <message>
+        <location filename="../desktop-widgets/divecomputermanagementdialog.ui" line="17"/>
+        <location filename="../build/ui_divecomputermanagementdialog.h" line="65"/>
+        <source>Edit dive computer nicknames</source>
+        <translation>Edit dive computer nicknames</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divecomputermanagementdialog.cpp" line="49"/>
         <source>Remove the selected dive computer?</source>
         <translation>Remove the selected dive computer?</translation>
@@ -1931,12 +1975,6 @@
         <translation>Are you sure that you want to 
  remove the selected dive computer?</translation>
     </message>
-    <message>
-        <location filename="../desktop-widgets/divecomputermanagementdialog.ui" line="17"/>
-        <location filename="../build/ui_divecomputermanagementdialog.h" line="65"/>
-        <source>Edit dive computer nicknames</source>
-        <translation>Edit dive computer nicknames</translation>
-    </message>
 </context>
 <context>
     <name>DiveComputerModel</name>
@@ -1964,17 +2002,17 @@
 <context>
     <name>DiveDetails</name>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="33"/>
+        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="38"/>
         <source>Dive details</source>
         <translation>Dive details</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="67"/>
+        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="72"/>
         <source>Delete dive</source>
         <translation>Delete dive</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="84"/>
+        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="89"/>
         <source>Show on map</source>
         <translation>Show on map</translation>
     </message>
@@ -1982,89 +2020,94 @@
 <context>
     <name>DiveDetailsEdit</name>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="74"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="80"/>
         <source>Dive %1</source>
         <translation>Dive %1</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="78"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="84"/>
         <source>Date:</source>
         <translation>Date:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="86"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="92"/>
         <source>Location:</source>
         <translation>Location:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="95"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="101"/>
         <source>Coordinates:</source>
         <translation>Coordinates:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="104"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="110"/>
         <source>Use current
 GPS location:</source>
         <translation>Use current
 GPS location:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="118"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="124"/>
         <source>Depth:</source>
         <translation>Depth:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="127"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="133"/>
         <source>Duration:</source>
         <translation>Duration:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="137"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="143"/>
         <source>Air Temp:</source>
         <translation>Air Temp:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="146"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="152"/>
         <source>Water Temp:</source>
         <translation>Water Temp:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="155"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="161"/>
         <source>Suit:</source>
         <translation>Suit:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="164"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="176"/>
         <source>Buddy:</source>
         <translation>Buddy:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="173"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="191"/>
         <source>Dive Master:</source>
         <translation>Dive Master:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="182"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="206"/>
         <source>Weight:</source>
         <translation>Weight:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="192"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="216"/>
+        <source>Cylinder:</source>
+        <translation>Cylinder:</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="231"/>
         <source>Gas mix:</source>
         <translation>Gas mix:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="203"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="241"/>
         <source>Start Pressure:</source>
         <translation>Start Pressure:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="213"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="250"/>
         <source>End Pressure:</source>
         <translation>End Pressure:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="224"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="260"/>
         <source>Notes:</source>
         <translation>Notes:</translation>
     </message>
@@ -2102,42 +2145,42 @@ GPS location:</translation>
         <translation>Suit:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="159"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="158"/>
         <source>Air Temp:</source>
         <translation>Air Temp:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="175"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="172"/>
         <source>Cylinder:</source>
         <translation>Cylinder:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="189"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="185"/>
         <source>Water Temp:</source>
         <translation>Water Temp:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="205"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="198"/>
         <source>Dive Master:</source>
         <translation>Dive Master:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="220"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="211"/>
         <source>Weight:</source>
         <translation>Weight:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="249"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="224"/>
         <source>Buddy:</source>
         <translation>Buddy:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="263"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="237"/>
         <source>SAC:</source>
         <translation>SAC:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="280"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="252"/>
         <source>Notes</source>
         <translation>Notes</translation>
     </message>
@@ -2145,18 +2188,18 @@ GPS location:</translation>
 <context>
     <name>DiveEventItem</name>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="134"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="165"/>
         <source>Manual switch to OC</source>
         <translation>Manual switch to OC</translation>
     </message>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="136"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="167"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation> begin</translation>
     </message>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="137"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="168"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation> end</translation>
@@ -2165,27 +2208,27 @@ GPS location:</translation>
 <context>
     <name>DiveImportedModel</name>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="646"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="656"/>
         <source>Date/time</source>
         <translation>Date/time</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="648"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="658"/>
         <source>Duration</source>
         <translation>Duration</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="650"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="660"/>
         <source>Depth</source>
         <translation>Depth</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="672"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="682"/>
         <source>h:</source>
         <translation>h:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="672"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="682"/>
         <source>min</source>
         <translation>min</translation>
     </message>
@@ -2194,8 +2237,8 @@ GPS location:</translation>
     <name>DiveList</name>
     <message>
         <location filename="../mobile-widgets/qml/DiveList.qml" line="12"/>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="226"/>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="232"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="227"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="233"/>
         <source>Dive list</source>
         <translation>Dive list</translation>
     </message>
@@ -2210,110 +2253,115 @@ GPS location:</translation>
         <translation>Duration: </translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="222"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="223"/>
         <source>Cloud credentials</source>
         <translation>Cloud credentials</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="228"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="229"/>
         <source>Please tap the &apos;+&apos; button to add a dive</source>
         <translation>Please tap the &apos;+&apos; button to add a dive</translation>
     </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="248"/>
+        <source>No dives in dive list</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DiveListView</name>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="846"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="849"/>
         <source>Expand all</source>
         <translation>Expand all</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="848"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="851"/>
         <source>Collapse all</source>
         <translation>Collapse all</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="852"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="855"/>
         <source>Collapse others</source>
         <translation>Collapse others</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="856"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="859"/>
         <source>Remove dive(s) from trip</source>
         <translation>Remove dive(s) from trip</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="857"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="860"/>
         <source>Create new trip above</source>
         <translation>Create new trip above</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="871"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="874"/>
         <source>Add dive(s) to trip immediately above</source>
         <translation>Add dive(s) to trip immediately above</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="873"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="876"/>
         <source>Add dive(s) to trip immediately below</source>
         <translation>Add dive(s) to trip immediately below</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="877"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="880"/>
         <source>Merge trip with trip above</source>
         <translation>Merge trip with trip above</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="878"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="881"/>
         <source>Merge trip with trip below</source>
         <translation>Merge trip with trip below</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="882"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="885"/>
         <source>Delete dive(s)</source>
         <translation>Delete dive(s)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="884"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="887"/>
         <source>Mark dive(s) invalid</source>
         <translation>Mark dive(s) invalid</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="888"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="891"/>
         <source>Merge selected dives</source>
         <translation>Merge selected dives</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="890"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="893"/>
         <source>Renumber dive(s)</source>
         <translation>Renumber dive(s)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="891"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="894"/>
         <source>Shift dive times</source>
         <translation>Shift dive times</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="892"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="895"/>
         <source>Split selected dives</source>
         <translation>Split selected dives</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="893"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="896"/>
         <source>Load image(s) from file(s)</source>
         <translation>Load image(s) from file(s)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="894"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="897"/>
         <source>Load image(s) from web</source>
         <translation>Load image(s) from web</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="917"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="919"/>
         <source>Open image files</source>
         <translation>Open image files</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="917"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="919"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -2334,56 +2382,6 @@ GPS location:</translation>
 <context>
     <name>DiveLogExportDialog</name>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="103"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="351"/>
-        <source>Export format</source>
-        <translation>Export format</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="134"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="353"/>
-        <source>UDDF</source>
-        <translation>UDDF</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="187"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="358"/>
-        <source>Worldmap</source>
-        <translation>Worldmap</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="197"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="359"/>
-        <source>I&amp;mage depths</source>
-        <translation>I&amp;mage depths</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="243"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="360"/>
-        <source>Selection</source>
-        <translation>Selection</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="252"/>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="346"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="361"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="372"/>
-        <source>Selected dives</source>
-        <translation>Selected dives</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="262"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="362"/>
-        <source>All dives</source>
-        <translation>All dives</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="306"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="396"/>
-        <source>HTML</source>
-        <translation>HTML</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="14"/>
         <location filename="../build/ui_divelogexportdialog.h" line="349"/>
         <source>Export dive log files</source>
@@ -2396,12 +2394,24 @@ GPS location:</translation>
         <translation>General export</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="103"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="351"/>
+        <source>Export format</source>
+        <translation>Export format</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="115"/>
         <location filename="../build/ui_divelogexportdialog.h" line="352"/>
         <source>Subsurface &amp;XML</source>
         <translation>Subsurface &amp;XML</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="134"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="353"/>
+        <source>UDDF</source>
+        <translation>UDDF</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="147"/>
         <location filename="../build/ui_divelogexportdialog.h" line="354"/>
         <source>di&amp;velogs.de</source>
@@ -2426,238 +2436,297 @@ GPS location:</translation>
         <translation>CSV dive details</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="275"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="187"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="358"/>
+        <source>Worldmap</source>
+        <translation>Worldmap</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="197"/>
+        <source>TeX</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="207"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="359"/>
+        <source>I&amp;mage depths</source>
+        <translation>I&amp;mage depths</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="253"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="360"/>
+        <source>Selection</source>
+        <translation>Selection</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="262"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="356"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="361"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="372"/>
+        <source>Selected dives</source>
+        <translation>Selected dives</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="272"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="362"/>
+        <source>All dives</source>
+        <translation>All dives</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="285"/>
         <location filename="../build/ui_divelogexportdialog.h" line="363"/>
         <source>CSV units</source>
         <translation>CSV units</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="288"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="298"/>
         <location filename="../build/ui_divelogexportdialog.h" line="366"/>
         <source>Metric</source>
         <translation>Metric</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="293"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="303"/>
         <location filename="../build/ui_divelogexportdialog.h" line="367"/>
         <source>Imperial</source>
         <translation>Imperial</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="324"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="316"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="396"/>
+        <source>HTML</source>
+        <translation>HTML</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="334"/>
         <location filename="../build/ui_divelogexportdialog.h" line="370"/>
         <source>General settings</source>
         <translation>General settings</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="330"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="340"/>
         <location filename="../build/ui_divelogexportdialog.h" line="371"/>
         <source>Subsurface numbers</source>
         <translation>Subsurface numbers</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="359"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="369"/>
         <location filename="../build/ui_divelogexportdialog.h" line="373"/>
         <source>Export yearly statistics</source>
         <translation>Export yearly statistics</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="375"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="385"/>
         <location filename="../build/ui_divelogexportdialog.h" line="374"/>
         <source>All di&amp;ves</source>
         <translation>All di&amp;ves</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="385"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="395"/>
         <location filename="../build/ui_divelogexportdialog.h" line="375"/>
         <source>Export list only</source>
         <translation>Export list only</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="392"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="402"/>
         <location filename="../build/ui_divelogexportdialog.h" line="376"/>
         <source>Export photos</source>
         <translation>Export photos</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="408"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="418"/>
         <location filename="../build/ui_divelogexportdialog.h" line="377"/>
         <source>Style options</source>
         <translation>Style options</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="423"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="433"/>
         <location filename="../build/ui_divelogexportdialog.h" line="378"/>
         <source>Font</source>
         <translation>Font</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="433"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="443"/>
         <location filename="../build/ui_divelogexportdialog.h" line="379"/>
         <source>Font size</source>
         <translation>Font size</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="444"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="454"/>
         <location filename="../build/ui_divelogexportdialog.h" line="382"/>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="449"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="459"/>
         <location filename="../build/ui_divelogexportdialog.h" line="383"/>
         <source>10</source>
         <translation>10</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="454"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="464"/>
         <location filename="../build/ui_divelogexportdialog.h" line="384"/>
         <source>12</source>
         <translation>12</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="459"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="469"/>
         <location filename="../build/ui_divelogexportdialog.h" line="385"/>
         <source>14</source>
         <translation>14</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="464"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="474"/>
         <location filename="../build/ui_divelogexportdialog.h" line="386"/>
         <source>16</source>
         <translation>16</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="469"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="479"/>
         <location filename="../build/ui_divelogexportdialog.h" line="387"/>
         <source>18</source>
         <translation>18</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="474"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="484"/>
         <location filename="../build/ui_divelogexportdialog.h" line="388"/>
         <source>20</source>
         <translation>20</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="482"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="492"/>
         <location filename="../build/ui_divelogexportdialog.h" line="390"/>
         <source>Theme</source>
         <translation>Theme</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="493"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="503"/>
         <location filename="../build/ui_divelogexportdialog.h" line="393"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="95"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="99"/>
         <source>Light</source>
         <translation>Light</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="498"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="508"/>
         <location filename="../build/ui_divelogexportdialog.h" line="394"/>
         <source>Sand</source>
         <translation>Sand</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="134"/>
-        <source>UDDF files (*.uddf *.UDDF)</source>
-        <translation>UDDF files (*.uddf *.UDDF)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="142"/>
-        <source>CSV files (*.csv *.CSV)</source>
-        <translation>CSV files (*.csv *.CSV)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="74"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="76"/>
         <source>Generic format that is used for data exchange between a variety of diving related programs.</source>
         <translation>Generic format that is used for data exchange between a variety of diving related programs.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="76"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="78"/>
         <source>Comma separated values describing the dive profile.</source>
         <translation>Comma separated values describing the dive profile.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="78"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="80"/>
         <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source>
         <translation>Comma separated values of the dive information. This includes most of the dive details but no profile information.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="80"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="82"/>
         <source>Send the dive data to divelogs.de website.</source>
         <translation>Send the dive data to divelogs.de website.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="82"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="84"/>
         <source>Send the dive data to dive-share.appspot.com website</source>
         <translation>Send the dive data to dive-share.appspot.com website</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="84"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="86"/>
         <source>HTML export of the dive locations, visualized on a world map.</source>
         <translation>HTML export of the dive locations, visualised on a world map.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="86"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="88"/>
         <source>Subsurface native XML format.</source>
         <translation>Subsurface native XML format.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="88"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="90"/>
         <source>Write depths of images to file.</source>
         <translation>Write depths of images to file.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="133"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="92"/>
+        <source>Write dive as TeX macros to file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="137"/>
         <source>Export UDDF file as</source>
         <translation>Export UDDF file as</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="137"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/>
+        <source>UDDF files (*.uddf *.UDDF)</source>
+        <translation>UDDF files (*.uddf *.UDDF)</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divelogexportdialog.cpp" line="141"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="145"/>
         <source>Export CSV file as</source>
         <translation>Export CSV file as</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="148"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="142"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="146"/>
+        <source>CSV files (*.csv *.CSV)</source>
+        <translation>CSV files (*.csv *.CSV)</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="152"/>
         <source>Export world map</source>
         <translation>Export world map</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="149"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="169"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="153"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="177"/>
         <source>HTML files (*.html)</source>
         <translation>HTML files (*.html)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="153"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="157"/>
         <source>Export Subsurface XML</source>
         <translation>Export Subsurface XML</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="158"/>
         <source>XML files (*.xml *.ssrf)</source>
         <translation>XML files (*.xml *.ssrf)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="162"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="166"/>
         <source>Save image depths</source>
         <translation>Save image depths</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="168"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="170"/>
+        <source>Export to TeX file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="170"/>
+        <source>TeX files (*.tex)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="176"/>
         <source>Export HTML files as</source>
         <translation>Export HTML files as</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="184"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="192"/>
         <source>Please wait, exporting...</source>
         <translation>Please wait, exporting...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="219"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="227"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="311"/>
         <source>Can&apos;t open file %s</source>
         <translation>Can&apos;t open file %s</translation>
     </message>
@@ -2671,25 +2740,6 @@ GPS location:</translation>
         <translation>Import dive log file</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="643"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="727"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="856"/>
-        <source>Time</source>
-        <translation>Time</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.ui" line="127"/>
-        <location filename="../build/ui_divelogimportdialog.h" line="164"/>
-        <source>Metric</source>
-        <translation>Metric</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.ui" line="132"/>
-        <location filename="../build/ui_divelogimportdialog.h" line="165"/>
-        <source>Imperial</source>
-        <translation>Imperial</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divelogimportdialog.ui" line="89"/>
         <location filename="../build/ui_divelogimportdialog.h" line="152"/>
         <source>dd.mm.yyyy</source>
@@ -2708,74 +2758,6 @@ GPS location:</translation>
         <translation>yyyy-mm-dd</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.ui" line="155"/>
-        <location filename="../build/ui_divelogimportdialog.h" line="167"/>
-        <source>Drag the tags above to each corresponding column below</source>
-        <translation>Drag the tags above to each corresponding column below</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="641"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="729"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="852"/>
-        <source>Dive #</source>
-        <translation>Dive No.</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="642"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="723"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="854"/>
-        <source>Date</source>
-        <translation>Date</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="644"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="858"/>
-        <source>Duration</source>
-        <translation>Duration</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="655"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="862"/>
-        <source>GPS</source>
-        <translation>GPS</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="645"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="864"/>
-        <source>Max. depth</source>
-        <translation>Max. depth</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="646"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="866"/>
-        <source>Avg. depth</source>
-        <translation>Avg. depth</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="658"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="872"/>
-        <source>Suit</source>
-        <translation>Suit</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="663"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="878"/>
-        <source>Tags</source>
-        <translation>Tags</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="652"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="894"/>
-        <source>O₂</source>
-        <translation>O₂</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="653"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="896"/>
-        <source>He</source>
-        <translation>He</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divelogimportdialog.ui" line="108"/>
         <location filename="../build/ui_divelogimportdialog.h" line="158"/>
         <source>Seconds</source>
@@ -2794,183 +2776,269 @@ GPS location:</translation>
         <translation>Minutes:seconds</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="654"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="860"/>
-        <source>Location</source>
-        <translation>Location</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.ui" line="127"/>
+        <location filename="../build/ui_divelogimportdialog.h" line="164"/>
+        <source>Metric</source>
+        <translation>Metric</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.ui" line="132"/>
+        <location filename="../build/ui_divelogimportdialog.h" line="165"/>
+        <source>Imperial</source>
+        <translation>Imperial</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.ui" line="155"/>
+        <location filename="../build/ui_divelogimportdialog.h" line="167"/>
+        <source>Drag the tags above to each corresponding column below</source>
+        <translation>Drag the tags above to each corresponding column below</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="354"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="499"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="505"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="355"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="528"/>
         <source>Tab</source>
         <translation>Tab</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="575"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="598"/>
         <source>Some column headers were pre-populated; please drag and drop the headers so they match the column they are in.</source>
         <translation>Some column headers were pre-populated; please drag and drop the headers so they match the column they are in.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="613"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="731"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="782"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="848"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="636"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="761"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="857"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="925"/>
         <source>Sample time</source>
         <translation>Sample time</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="615"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="733"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="784"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="638"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="763"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="859"/>
         <source>Sample depth</source>
         <translation>Sample depth</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="617"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="735"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="786"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="640"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="765"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="861"/>
         <source>Sample temperature</source>
         <translation>Sample temperature</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="621"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="739"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="790"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="642"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="767"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="863"/>
+        <source>Sample pO₂</source>
+        <translation>Sample pO₂</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="644"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="769"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="865"/>
         <source>Sample sensor1 pO₂</source>
         <translation>Sample sensor1 pO₂</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="623"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="741"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="792"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="646"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="771"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="867"/>
         <source>Sample sensor2 pO₂</source>
         <translation>Sample sensor2 pO₂</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="625"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="743"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="794"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="648"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="773"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="869"/>
         <source>Sample sensor3 pO₂</source>
         <translation>Sample sensor3 pO₂</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="633"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="751"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="802"/>
-        <source>Sample stopdepth</source>
-        <translation>Sample stopdepth</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="637"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="755"/>
-        <source>Sample setpoint</source>
-        <translation>Sample setpoint</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="619"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="737"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="788"/>
-        <source>Sample pO₂</source>
-        <translation>Sample pO₂</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="627"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="745"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="796"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="650"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="775"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="871"/>
         <source>Sample CNS</source>
         <translation>Sample CNS</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="629"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="747"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="798"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="652"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="777"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="873"/>
         <source>Sample NDL</source>
         <translation>Sample NDL</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="631"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="749"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="800"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="654"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="779"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="875"/>
         <source>Sample TTS</source>
         <translation>Sample TTS</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="635"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="753"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="804"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="656"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="781"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="877"/>
+        <source>Sample stopdepth</source>
+        <translation>Sample stopdepth</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="658"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="783"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="879"/>
         <source>Sample pressure</source>
         <translation>Sample pressure</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="656"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="868"/>
-        <source>Divemaster</source>
-        <translation>Divemaster</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="660"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="785"/>
+        <source>Sample setpoint</source>
+        <translation>Sample setpoint</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="657"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="870"/>
-        <source>Buddy</source>
-        <translation>Buddy</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="664"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="759"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="929"/>
+        <source>Dive #</source>
+        <translation>Dive No.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="659"/>
-        <source>Rating</source>
-        <translation>Rating</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="665"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="753"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="931"/>
+        <source>Date</source>
+        <translation>Date</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="660"/>
-        <source>Visibility</source>
-        <translation>Visibility</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="666"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="757"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="933"/>
+        <source>Time</source>
+        <translation>Time</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="661"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="874"/>
-        <source>Notes</source>
-        <translation>Notes</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="667"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="935"/>
+        <source>Duration</source>
+        <translation>Duration</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="662"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="876"/>
-        <source>Weight</source>
-        <translation>Weight</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="668"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="941"/>
+        <source>Max. depth</source>
+        <translation>Max. depth</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="669"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="943"/>
+        <source>Avg. depth</source>
+        <translation>Avg. depth</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="649"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="888"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="670"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="975"/>
+        <source>Air temp.</source>
+        <translation>Air temp.</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="671"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="977"/>
+        <source>Water temp.</source>
+        <translation>Water temp.</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="672"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="965"/>
         <source>Cyl. size</source>
         <translation>Cyl. size</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="650"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="890"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="673"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="967"/>
         <source>Start pressure</source>
         <translation>Start pressure</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="651"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="892"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="674"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="969"/>
         <source>End pressure</source>
         <translation>End pressure</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="647"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="898"/>
-        <source>Air temp.</source>
-        <translation>Air temp.</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="675"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="971"/>
+        <source>O₂</source>
+        <translation>O₂</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="648"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="900"/>
-        <source>Water temp.</source>
-        <translation>Water temp.</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="676"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="973"/>
+        <source>He</source>
+        <translation>He</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="677"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="937"/>
+        <source>Location</source>
+        <translation>Location</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="678"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="939"/>
+        <source>GPS</source>
+        <translation>GPS</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="679"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="945"/>
+        <source>Divemaster</source>
+        <translation>Divemaster</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="680"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="947"/>
+        <source>Buddy</source>
+        <translation>Buddy</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="681"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="949"/>
+        <source>Suit</source>
+        <translation>Suit</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="682"/>
+        <source>Rating</source>
+        <translation>Rating</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="683"/>
+        <source>Visibility</source>
+        <translation>Visibility</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="684"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="951"/>
+        <source>Notes</source>
+        <translation>Notes</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="685"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="953"/>
+        <source>Weight</source>
+        <translation>Weight</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="686"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="955"/>
+        <source>Tags</source>
+        <translation>Tags</translation>
     </message>
 </context>
 <context>
     <name>DiveObjectHelper</name>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="287"/>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="323"/>
         <source>%1 dive(s)</source>
         <translation>%1 dive(s)</translation>
     </message>
@@ -2978,18 +3046,18 @@ GPS location:</translation>
 <context>
     <name>DivePlanner</name>
     <message>
-        <location filename="../desktop-widgets/diveplanner.ui" line="152"/>
-        <location filename="../build/ui_diveplanner.h" line="190"/>
-        <source>Altitude</source>
-        <translation>Altitude</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/diveplanner.ui" line="109"/>
         <location filename="../build/ui_diveplanner.h" line="189"/>
         <source>Planned dive time</source>
         <translation>Planned dive time</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/diveplanner.ui" line="152"/>
+        <location filename="../build/ui_diveplanner.h" line="190"/>
+        <source>Altitude</source>
+        <translation>Altitude</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/diveplanner.ui" line="159"/>
         <location filename="../build/ui_diveplanner.h" line="191"/>
         <source>ATM pressure</source>
@@ -3023,32 +3091,32 @@ GPS location:</translation>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="134"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="136"/>
         <source>unknown</source>
         <translation>unknown</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="312"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="326"/>
         <source>Final depth</source>
         <translation>Final depth</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="314"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="328"/>
         <source>Run time</source>
         <translation>Run time</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="316"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="330"/>
         <source>Duration</source>
         <translation>Duration</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="318"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="332"/>
         <source>Used gas</source>
         <translation>Used gas</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="320"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="334"/>
         <source>CC setpoint</source>
         <translation>CC setpoint</translation>
     </message>
@@ -3056,22 +3124,22 @@ GPS location:</translation>
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="108"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="112"/>
         <source>Dive planner points</source>
         <translation>Dive planner points</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="112"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="116"/>
         <source>Available gases</source>
         <translation>Available gases</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="137"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="143"/>
         <source>Add dive data point</source>
         <translation>Add dive data point</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="146"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="152"/>
         <source>Save new</source>
         <translation>Save new</translation>
     </message>
@@ -3104,11 +3172,36 @@ GPS location:</translation>
         <translation>Colour</translation>
     </message>
     <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="124"/>
+        <source>User entered</source>
+        <translation>User entered</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="126"/>
+        <source>Cylinder index</source>
+        <translation>Cylinder index</translation>
+    </message>
+    <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="128"/>
         <source>Pressure S</source>
         <translation>Pressure S</translation>
     </message>
     <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="130"/>
+        <source>Pressure I</source>
+        <translation>Pressure I</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="132"/>
+        <source>Ceiling</source>
+        <translation>Ceiling</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="134"/>
+        <source>SAC</source>
+        <translation>SAC</translation>
+    </message>
+    <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="136"/>
         <source>pN₂</source>
         <translation>pN₂</translation>
@@ -3144,49 +3237,24 @@ GPS location:</translation>
         <translation>Sensor 3</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="152"/>
-        <source>Heart rate</source>
-        <translation>Heart rate</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="156"/>
-        <source>Mean depth @ s</source>
-        <translation>Mean depth @ s</translation>
-    </message>
-    <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="150"/>
         <source>Ambient pressure</source>
         <translation>Ambient pressure</translation>
     </message>
     <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="152"/>
+        <source>Heart rate</source>
+        <translation>Heart rate</translation>
+    </message>
+    <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="154"/>
         <source>Gradient factor</source>
         <translation>Gradient factor</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="130"/>
-        <source>Pressure I</source>
-        <translation>Pressure I</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="124"/>
-        <source>User entered</source>
-        <translation>User entered</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="126"/>
-        <source>Cylinder index</source>
-        <translation>Cylinder index</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="132"/>
-        <source>Ceiling</source>
-        <translation>Ceiling</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="134"/>
-        <source>SAC</source>
-        <translation>SAC</translation>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="156"/>
+        <source>Mean depth @ s</source>
+        <translation>Mean depth @ s</translation>
     </message>
 </context>
 <context>
@@ -3257,311 +3325,315 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="395"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="441"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="434"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="483"/>
         <source>#</source>
         <translation>No.</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="398"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="444"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="437"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="486"/>
         <source>Date</source>
         <translation>Date</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="401"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="447"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="440"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="489"/>
         <source>Rating</source>
         <translation>Rating</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="404"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="443"/>
         <source>Depth</source>
         <translation>Depth</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="410"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="446"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="495"/>
+        <source>Duration</source>
+        <translation>Duration</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="449"/>
         <source>Temp</source>
         <translation>Temp</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="413"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="452"/>
         <source>Weight</source>
         <translation>Weight</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="425"/>
-        <source>SAC</source>
-        <translation>SAC</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
-        <source>m</source>
-        <translation>m</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
-        <source>ft</source>
-        <translation>ft</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
-        <source>Weight(%1)</source>
-        <translation>Weight(%1)</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="416"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="462"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="455"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="504"/>
         <source>Suit</source>
         <translation>Suit</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="419"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="465"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="458"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="507"/>
         <source>Cyl</source>
         <translation>Cyl</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="422"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="468"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="461"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="510"/>
         <source>Gas</source>
         <translation>Gas</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
-        <source>SAC(%1)</source>
-        <translation>SAC(%1)</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="464"/>
+        <source>SAC</source>
+        <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
-        <source>/min</source>
-        <translation>/min</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="467"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="518"/>
+        <source>OTU</source>
+        <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="431"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="479"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="470"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="521"/>
         <source>Max CNS</source>
         <translation>Max CNS</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="434"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="482"/>
-        <source>Location</source>
-        <translation>Location</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
+        <source>Photos</source>
+        <translation>Photos</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
-        <source>kg</source>
-        <translation>kg</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="476"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="527"/>
+        <source>Location</source>
+        <translation>Location</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="492"/>
         <source>Depth(%1)</source>
         <translation>Depth(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="407"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="453"/>
-        <source>Duration</source>
-        <translation>Duration</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="492"/>
+        <source>m</source>
+        <translation>m</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="492"/>
+        <source>ft</source>
+        <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="456"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="498"/>
         <source>Temp(%1%2)</source>
         <translation>Temp(%1%2)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="501"/>
+        <source>Weight(%1)</source>
+        <translation>Weight(%1)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="501"/>
+        <source>kg</source>
+        <translation>kg</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="501"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="428"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="476"/>
-        <source>OTU</source>
-        <translation>OTU</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="515"/>
+        <source>SAC(%1)</source>
+        <translation>SAC(%1)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="515"/>
+        <source>/min</source>
+        <translation>/min</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="524"/>
+        <source>Photos before/during/after dive</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="164"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="165"/>
         <source>no dives were selected</source>
         <translation>no dives were selected</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="174"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="175"/>
         <source>stylesheet to export to divelogs.de is not found</source>
         <translation>stylesheet to export to divelogs.de is not found</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="184"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="185"/>
         <source>failed to create zip file for upload: %s</source>
         <translation>failed to create zip file for upload: %s</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="236"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="237"/>
         <source>internal error</source>
         <translation>internal error</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="244"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="245"/>
         <source>Conversion of dive %1 to divelogs.de format failed</source>
         <translation>Conversion of dive %1 to divelogs.de format failed</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="272"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="273"/>
         <source>error writing zip file: %s zip error %d system error %d - %s</source>
         <translation>error writing zip file: %s zip error %d system error %d - %s</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="745"/>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="935"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="936"/>
         <source>Done</source>
         <translation>Done</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="778"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="779"/>
         <source>Uploading dive list...</source>
         <translation>Uploading dive list...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="810"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="811"/>
         <source>Downloading dive list...</source>
         <translation>Downloading dive list...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="851"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="852"/>
         <source>Downloading %1 dives...</source>
         <translation>Downloading %1 dives...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="885"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="886"/>
         <source>Download finished - %1</source>
         <translation>Download finished - %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="899"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="900"/>
         <source>Problem with download</source>
         <translation>Problem with download</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="900"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="901"/>
         <source>The archive could not be opened:
 </source>
         <translation>The archive could not be opened:
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="909"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="910"/>
         <source>Corrupted download</source>
         <translation>Corrupted download</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="910"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="911"/>
         <source>The archive could not be opened:
 %1</source>
         <translation>The archive could not be opened:
 %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="937"/>
+        <source>Upload finished</source>
+        <translation>Upload finished</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="950"/>
         <source>Upload failed</source>
         <translation>Upload failed</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="952"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="953"/>
         <source>Upload successful</source>
         <translation>Upload successful</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="955"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="956"/>
         <source>Login failed</source>
         <translation>Login failed</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="958"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="959"/>
         <source>Cannot parse response</source>
         <translation>Cannot parse response</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="970"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="971"/>
         <source>Error: %1</source>
         <translation>Error: %1</translation>
     </message>
-    <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="936"/>
-        <source>Upload finished</source>
-        <translation>Upload finished</translation>
-    </message>
 </context>
 <context>
     <name>DownloadFromDCWidget</name>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="185"/>
-        <source>Error</source>
-        <translation>Error</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="436"/>
-        <source>Retry</source>
-        <translation>Retry</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="280"/>
-        <source>Find Uemis dive computer</source>
-        <translation>Find Uemis dive computer</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="101"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="107"/>
         <source>Download</source>
         <translation>Download</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="104"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="110"/>
         <source>Choose Bluetooth download mode</source>
         <translation>Choose Bluetooth download mode</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="382"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="191"/>
+        <source>Error</source>
+        <translation>Error</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="286"/>
+        <source>Find Uemis dive computer</source>
+        <translation>Find Uemis dive computer</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="392"/>
         <source>Choose file for divecomputer download logfile</source>
         <translation>Choose file for divecomputer download logfile</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="383"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="393"/>
         <source>Log files (*.log)</source>
         <translation>Log files (*.log)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="398"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="408"/>
         <source>Warning</source>
         <translation>Warning</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="399"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="409"/>
         <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="../desktop-widgets/downloadfromdivecomputer.cpp" line="410"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="420"/>
         <source>Choose file for divecomputer binary dump file</source>
         <translation>Choose file for divecomputer binary dump file</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="411"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="421"/>
         <source>Dump files (*.bin)</source>
         <translation>Dump files (*.bin)</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="446"/>
+        <source>Retry</source>
+        <translation>Retry</translation>
+    </message>
 </context>
 <context>
     <name>DownloadFromDiveComputer</name>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="139"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="275"/>
-        <source>Vendor</source>
-        <translation>Vendor</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="14"/>
         <location filename="../build/ui_downloadfromdivecomputer.h" line="265"/>
         <source>Download from dive computer</source>
@@ -3574,17 +3646,6 @@ p, li { white-space: pre-wrap; }
         <translation>Device or mount point</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="122"/>
-        <source>Choose Bluetooth download mode</source>
-        <translation>Choose Bluetooth download mode</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="149"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="276"/>
-        <source>Dive computer</source>
-        <translation>Dive computer</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="66"/>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="101"/>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="115"/>
@@ -3608,11 +3669,46 @@ p, li { white-space: pre-wrap; }
         <translation>Always prefer downloaded dives</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="87"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="270"/>
+        <source>Download into new trip</source>
+        <translation>Download into new trip</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="94"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="271"/>
+        <source>Save libdivecomputer logfile</source>
+        <translation>Save libdivecomputer logfile</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="108"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="273"/>
+        <source>Save libdivecomputer dumpfile</source>
+        <translation>Save libdivecomputer dumpfile</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="122"/>
+        <source>Choose Bluetooth download mode</source>
+        <translation>Choose Bluetooth download mode</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="129"/>
         <source>Select a remote Bluetooth device.</source>
         <translation>Select a remote Bluetooth device.</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="139"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="275"/>
+        <source>Vendor</source>
+        <translation>Vendor</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="149"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="276"/>
+        <source>Dive computer</source>
+        <translation>Dive computer</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/>
         <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="52"/>
         <location filename="../build/ui_downloadfromdivecomputer.h" line="277"/>
@@ -3620,18 +3716,6 @@ p, li { white-space: pre-wrap; }
         <translation>Download</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="284"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="281"/>
-        <source>OK</source>
-        <translation>OK</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="291"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="282"/>
-        <source>Cancel</source>
-        <translation>Cancel</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="226"/>
         <location filename="../build/ui_downloadfromdivecomputer.h" line="278"/>
         <source>Downloaded dives</source>
@@ -3650,22 +3734,16 @@ p, li { white-space: pre-wrap; }
         <translation>Deselect all</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="94"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="271"/>
-        <source>Save libdivecomputer logfile</source>
-        <translation>Save libdivecomputer logfile</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="108"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="273"/>
-        <source>Save libdivecomputer dumpfile</source>
-        <translation>Save libdivecomputer dumpfile</translation>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="284"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="281"/>
+        <source>OK</source>
+        <translation>OK</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="87"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="270"/>
-        <source>Download into new trip</source>
-        <translation>Download into new trip</translation>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="291"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="282"/>
+        <source>Cancel</source>
+        <translation>Cancel</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="16"/>
@@ -3755,12 +3833,12 @@ p, li { white-space: pre-wrap; }
         <translation>Connect to Facebook text placeholder</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="297"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="242"/>
         <source>To disconnect Subsurface from your Facebook account, use the button below</source>
         <translation>To disconnect Subsurface from your Facebook account, use the button below</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="306"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="251"/>
         <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source>
         <translation>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</translation>
     </message>
@@ -3768,22 +3846,22 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>FacebookManager</name>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="266"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="211"/>
         <source>Photo upload sucessfull</source>
         <translation>Photo upload sucessfull</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="267"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="212"/>
         <source>Your dive profile was updated to Facebook.</source>
         <translation>Your dive profile was updated to Facebook.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="271"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="216"/>
         <source>Photo upload failed</source>
         <translation>Photo upload failed</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="272"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="217"/>
         <source>Your dive profile was not updated to Facebook, 
  please send the following to the developer. 
 </source>
@@ -3845,17 +3923,25 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>FirmwareUpdateThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1750"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1739"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>This feature is not yet available for the selected dive computer.</translation>
     </message>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1755"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1744"/>
         <source>Firmware update failed!</source>
         <translation>Firmware update failed.</translation>
     </message>
 </context>
 <context>
+    <name>GlobalDrawer</name>
+    <message>
+        <location filename="../mobile-widgets/qml/kirigami/src/controls/GlobalDrawer.qml" line="364"/>
+        <source>Back</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>GlobeGPS</name>
     <message>
         <location filename="../desktop-widgets/globe.cpp" line="124"/>
@@ -3871,27 +3957,27 @@ p, li { white-space: pre-wrap; }
         <translation>GPS Fixes</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="40"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="32"/>
         <source>Date: </source>
         <translation>Date: </translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="50"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="42"/>
         <source>Name: </source>
         <translation>Name: </translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="60"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="52"/>
         <source>Latitude: </source>
         <translation>Latitude: </translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="69"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="61"/>
         <source>Longitude: </source>
         <translation>Longitude: </translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="113"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="105"/>
         <source>List of stored GPS fixes</source>
         <translation>List of stored GPS fixes</translation>
     </message>
@@ -3920,7 +4006,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>LocationFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="648"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="646"/>
         <source>Location: </source>
         <translation>Location: </translation>
     </message>
@@ -3961,7 +4047,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>LocationFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="299"/>
+        <location filename="../qt-models/filtermodels.cpp" line="304"/>
         <source>No location set</source>
         <translation>No location set</translation>
     </message>
@@ -4083,20 +4169,55 @@ p, li { white-space: pre-wrap; }
     </message>
 </context>
 <context>
-    <name>MainForm.ui</name>
+    <name>MainTab</name>
     <message>
-        <location filename="../packaging/ios/Subsurface-mobile/MainForm.ui.qml" line="17"/>
-        <source>Press Me 1</source>
-        <translation>Press Me 1</translation>
+        <location filename="../desktop-widgets/maintab.ui" line="18"/>
+        <location filename="../desktop-widgets/maintab.ui" line="439"/>
+        <location filename="../build/ui_maintab.h" line="961"/>
+        <location filename="../build/ui_maintab.h" line="963"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="539"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="571"/>
+        <source>Notes</source>
+        <translation>Notes</translation>
     </message>
     <message>
-        <location filename="../packaging/ios/Subsurface-mobile/MainForm.ui.qml" line="22"/>
-        <source>Press Me 2</source>
-        <translation>Press Me 2</translation>
+        <location filename="../desktop-widgets/maintab.ui" line="21"/>
+        <location filename="../build/ui_maintab.h" line="964"/>
+        <source>General notes about the current selection</source>
+        <translation>General notes about the current selection</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="92"/>
+        <location filename="../desktop-widgets/maintab.ui" line="646"/>
+        <location filename="../build/ui_maintab.h" line="947"/>
+        <location filename="../build/ui_maintab.h" line="967"/>
+        <source>Date</source>
+        <translation>Date</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="102"/>
+        <location filename="../build/ui_maintab.h" line="948"/>
+        <source>Time</source>
+        <translation>Time</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="112"/>
+        <location filename="../desktop-widgets/maintab.ui" line="836"/>
+        <location filename="../build/ui_maintab.h" line="949"/>
+        <location filename="../build/ui_maintab.h" line="987"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="306"/>
+        <source>Air temp.</source>
+        <translation>Air temp.</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="122"/>
+        <location filename="../desktop-widgets/maintab.ui" line="855"/>
+        <location filename="../build/ui_maintab.h" line="950"/>
+        <location filename="../build/ui_maintab.h" line="989"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="307"/>
+        <source>Water temp.</source>
+        <translation>Water temp.</translation>
     </message>
-</context>
-<context>
-    <name>MainTab</name>
     <message>
         <location filename="../desktop-widgets/maintab.ui" line="184"/>
         <location filename="../build/ui_maintab.h" line="951"/>
@@ -4105,6 +4226,17 @@ p, li { white-space: pre-wrap; }
         <translation>Location</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="214"/>
+        <source>Edit dive site</source>
+        <translation>Edit dive site</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="217"/>
+        <location filename="../build/ui_maintab.h" line="953"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="252"/>
         <location filename="../build/ui_maintab.h" line="954"/>
         <source>Divemaster</source>
@@ -4117,12 +4249,6 @@ p, li { white-space: pre-wrap; }
         <translation>Buddy</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.ui" line="387"/>
-        <location filename="../build/ui_maintab.h" line="959"/>
-        <source>Tags</source>
-        <translation>Tags</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/maintab.ui" line="308"/>
         <location filename="../build/ui_maintab.h" line="956"/>
         <source>Rating</source>
@@ -4141,57 +4267,18 @@ p, li { white-space: pre-wrap; }
         <translation>Suit</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="387"/>
+        <location filename="../build/ui_maintab.h" line="959"/>
+        <source>Tags</source>
+        <translation>Tags</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="397"/>
         <location filename="../build/ui_maintab.h" line="960"/>
         <source>Dive mode</source>
         <translation>Dive mode</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.ui" line="112"/>
-        <location filename="../desktop-widgets/maintab.ui" line="836"/>
-        <location filename="../build/ui_maintab.h" line="949"/>
-        <location filename="../build/ui_maintab.h" line="987"/>
-        <location filename="../desktop-widgets/maintab.cpp" line="306"/>
-        <source>Air temp.</source>
-        <translation>Air temp.</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="122"/>
-        <location filename="../desktop-widgets/maintab.ui" line="855"/>
-        <location filename="../build/ui_maintab.h" line="950"/>
-        <location filename="../build/ui_maintab.h" line="989"/>
-        <location filename="../desktop-widgets/maintab.cpp" line="307"/>
-        <source>Water temp.</source>
-        <translation>Water temp.</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="18"/>
-        <location filename="../desktop-widgets/maintab.ui" line="439"/>
-        <location filename="../build/ui_maintab.h" line="961"/>
-        <location filename="../build/ui_maintab.h" line="963"/>
-        <location filename="../desktop-widgets/maintab.cpp" line="539"/>
-        <location filename="../desktop-widgets/maintab.cpp" line="571"/>
-        <source>Notes</source>
-        <translation>Notes</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="21"/>
-        <location filename="../build/ui_maintab.h" line="964"/>
-        <source>General notes about the current selection</source>
-        <translation>General notes about the current selection</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="214"/>
-        <source>Edit dive site</source>
-        <translation>Edit dive site</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="217"/>
-        <location filename="../build/ui_maintab.h" line="953"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/maintab.ui" line="491"/>
         <location filename="../build/ui_maintab.h" line="965"/>
         <source>Equipment</source>
@@ -4216,6 +4303,12 @@ p, li { white-space: pre-wrap; }
         <translation>Dive information</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="665"/>
+        <location filename="../build/ui_maintab.h" line="969"/>
+        <source>Interval</source>
+        <translation>Interval</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="684"/>
         <location filename="../build/ui_maintab.h" line="971"/>
         <source>Gases used</source>
@@ -4228,18 +4321,38 @@ p, li { white-space: pre-wrap; }
         <translation>Gas consumed</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="722"/>
+        <location filename="../desktop-widgets/maintab.ui" line="1094"/>
+        <location filename="../build/ui_maintab.h" line="975"/>
+        <location filename="../build/ui_maintab.h" line="1003"/>
+        <source>SAC</source>
+        <translation>SAC</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="741"/>
         <location filename="../build/ui_maintab.h" line="977"/>
         <source>CNS</source>
         <translation>CNS</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="760"/>
+        <location filename="../build/ui_maintab.h" line="979"/>
+        <source>OTU</source>
+        <translation>OTU</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="779"/>
         <location filename="../build/ui_maintab.h" line="981"/>
         <source>Max. depth</source>
         <translation>Max. depth</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="798"/>
+        <location filename="../build/ui_maintab.h" line="983"/>
+        <source>Avg. depth</source>
+        <translation>Avg. depth</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="817"/>
         <location filename="../build/ui_maintab.h" line="985"/>
         <source>Air pressure</source>
@@ -4252,82 +4365,6 @@ p, li { white-space: pre-wrap; }
         <translation>Dive time</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.ui" line="933"/>
-        <location filename="../build/ui_maintab.h" line="1007"/>
-        <source>Simple statistics about the selection</source>
-        <translation>Simple statistics about the selection</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1039"/>
-        <location filename="../build/ui_maintab.h" line="999"/>
-        <source>Total time</source>
-        <translation>Total time</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1106"/>
-        <location filename="../build/ui_maintab.h" line="1004"/>
-        <source>Gas consumption</source>
-        <translation>Gas consumption</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1151"/>
-        <location filename="../build/ui_maintab.h" line="1009"/>
-        <source>All photos from the current selection</source>
-        <translation>All photos from the current selection</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1177"/>
-        <location filename="../build/ui_maintab.h" line="1010"/>
-        <source>Extra data</source>
-        <translation>Extra data</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1180"/>
-        <location filename="../build/ui_maintab.h" line="1011"/>
-        <source>Adittional data from the dive computer</source>
-        <translation>Adittional data from the dive computer</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="92"/>
-        <location filename="../desktop-widgets/maintab.ui" line="646"/>
-        <location filename="../build/ui_maintab.h" line="947"/>
-        <location filename="../build/ui_maintab.h" line="967"/>
-        <source>Date</source>
-        <translation>Date</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="102"/>
-        <location filename="../build/ui_maintab.h" line="948"/>
-        <source>Time</source>
-        <translation>Time</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="665"/>
-        <location filename="../build/ui_maintab.h" line="969"/>
-        <source>Interval</source>
-        <translation>Interval</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="722"/>
-        <location filename="../desktop-widgets/maintab.ui" line="1094"/>
-        <location filename="../build/ui_maintab.h" line="975"/>
-        <location filename="../build/ui_maintab.h" line="1003"/>
-        <source>SAC</source>
-        <translation>SAC</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="798"/>
-        <location filename="../build/ui_maintab.h" line="983"/>
-        <source>Avg. depth</source>
-        <translation>Avg. depth</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="760"/>
-        <location filename="../build/ui_maintab.h" line="979"/>
-        <source>OTU</source>
-        <translation>OTU</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/maintab.ui" line="893"/>
         <location filename="../build/ui_maintab.h" line="993"/>
         <source>Salinity</source>
@@ -4340,22 +4377,34 @@ p, li { white-space: pre-wrap; }
         <translation>Stats</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="933"/>
+        <location filename="../build/ui_maintab.h" line="1007"/>
+        <source>Simple statistics about the selection</source>
+        <translation>Simple statistics about the selection</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="986"/>
         <location filename="../build/ui_maintab.h" line="996"/>
         <source>Depth</source>
         <translation>Depth</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="998"/>
+        <location filename="../build/ui_maintab.h" line="997"/>
+        <source>Duration</source>
+        <translation>Duration</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="1027"/>
         <location filename="../build/ui_maintab.h" line="998"/>
         <source>Temperature</source>
         <translation>Temperature</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.ui" line="998"/>
-        <location filename="../build/ui_maintab.h" line="997"/>
-        <source>Duration</source>
-        <translation>Duration</translation>
+        <location filename="../desktop-widgets/maintab.ui" line="1039"/>
+        <location filename="../build/ui_maintab.h" line="999"/>
+        <source>Total time</source>
+        <translation>Total time</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/maintab.ui" line="1058"/>
@@ -4364,20 +4413,34 @@ p, li { white-space: pre-wrap; }
         <translation>Dives</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="1106"/>
+        <location filename="../build/ui_maintab.h" line="1004"/>
+        <source>Gas consumption</source>
+        <translation>Gas consumption</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="1148"/>
         <location filename="../build/ui_maintab.h" line="1008"/>
         <source>Photos</source>
         <translation>Photos</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.cpp" line="88"/>
-        <source>Cylinders</source>
-        <translation>Cylinders</translation>
+        <location filename="../desktop-widgets/maintab.ui" line="1151"/>
+        <location filename="../build/ui_maintab.h" line="1009"/>
+        <source>All photos from the current selection</source>
+        <translation>All photos from the current selection</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.cpp" line="92"/>
-        <source>Weights</source>
-        <translation>Weights</translation>
+        <location filename="../desktop-widgets/maintab.ui" line="1177"/>
+        <location filename="../build/ui_maintab.h" line="1010"/>
+        <source>Extra data</source>
+        <translation>Extra data</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="1180"/>
+        <location filename="../build/ui_maintab.h" line="1011"/>
+        <source>Adittional data from the dive computer</source>
+        <translation>Adittional data from the dive computer</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/maintab.cpp" line="63"/>
@@ -4390,11 +4453,21 @@ p, li { white-space: pre-wrap; }
         <translation>Discard changes</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.cpp" line="88"/>
+        <source>Cylinders</source>
+        <translation>Cylinders</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.cpp" line="89"/>
         <source>Add cylinder</source>
         <translation>Add cylinder</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.cpp" line="92"/>
+        <source>Weights</source>
+        <translation>Weights</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.cpp" line="93"/>
         <source>Add weight system</source>
         <translation>Add weight system</translation>
@@ -4587,659 +4660,685 @@ mixed from Air and using:
         <translation>&amp;File</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="455"/>
-        <location filename="../build/ui_mainwindow.h" line="534"/>
-        <source>Export dive logs</source>
-        <translation>Export dive logs</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="510"/>
-        <location filename="../build/ui_mainwindow.h" line="542"/>
-        <source>Toggle pHe graph</source>
-        <translation>Toggle pHe graph</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="546"/>
-        <location filename="../build/ui_mainwindow.h" line="545"/>
-        <source>Toggle calculating all tissues</source>
-        <translation>Toggle calculating all tissues</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="522"/>
-        <location filename="../build/ui_mainwindow.h" line="543"/>
-        <source>Toggle DC reported ceiling</source>
-        <translation>Toggle DC reported ceiling</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="534"/>
-        <location filename="../build/ui_mainwindow.h" line="544"/>
-        <source>Toggle calculated ceiling</source>
-        <translation>Toggle calculated ceiling</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="606"/>
-        <location filename="../build/ui_mainwindow.h" line="550"/>
-        <source>Toggle NDL, TTS</source>
-        <translation>Toggle NDL, TTS</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="558"/>
-        <location filename="../build/ui_mainwindow.h" line="546"/>
-        <source>Toggle calculated ceiling with 3m increments</source>
-        <translation>Toggle calculated ceiling with 3m increments</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="463"/>
-        <location filename="../build/ui_mainwindow.h" line="537"/>
-        <source>Configure &amp;dive computer</source>
-        <translation>Configure &amp;dive computer</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="570"/>
-        <location filename="../build/ui_mainwindow.h" line="547"/>
-        <source>Toggle heart rate</source>
-        <translation>Toggle heart rate</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="582"/>
-        <location filename="../build/ui_mainwindow.h" line="548"/>
-        <source>Toggle MOD</source>
-        <translation>Toggle MOD</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="594"/>
-        <location filename="../build/ui_mainwindow.h" line="549"/>
-        <source>Toggle EAD, END, EADD</source>
-        <translation>Toggle EAD, END, EADD</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="618"/>
-        <location filename="../build/ui_mainwindow.h" line="551"/>
-        <source>Toggle SAC rate</source>
-        <translation>Toggle SAC rate</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="630"/>
-        <location filename="../build/ui_mainwindow.h" line="552"/>
-        <source>Toggle ruler</source>
-        <translation>Toggle ruler</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="86"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="87"/>
         <location filename="../build/ui_mainwindow.h" line="569"/>
         <source>&amp;Log</source>
         <translation>&amp;Log</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="105"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="104"/>
         <location filename="../build/ui_mainwindow.h" line="570"/>
         <source>&amp;View</source>
         <translation>&amp;View</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="121"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="120"/>
         <location filename="../build/ui_mainwindow.h" line="571"/>
         <source>&amp;Help</source>
         <translation>&amp;Help</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="130"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="129"/>
         <location filename="../build/ui_mainwindow.h" line="572"/>
         <source>&amp;Import</source>
         <translation>&amp;Import</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="139"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="138"/>
         <location filename="../build/ui_mainwindow.h" line="573"/>
         <source>&amp;Edit</source>
         <translation>&amp;Edit</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="144"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="143"/>
         <source>Share on</source>
         <translation>Share on</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="158"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="157"/>
         <location filename="../build/ui_mainwindow.h" line="453"/>
         <source>&amp;New logbook</source>
         <translation>&amp;New logbook</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="161"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="160"/>
         <location filename="../build/ui_mainwindow.h" line="455"/>
         <source>New</source>
         <translation>New</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="164"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="163"/>
         <location filename="../build/ui_mainwindow.h" line="457"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="169"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="168"/>
         <location filename="../build/ui_mainwindow.h" line="458"/>
         <source>&amp;Open logbook</source>
         <translation>&amp;Open logbook</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="172"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="171"/>
         <location filename="../build/ui_mainwindow.h" line="460"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="508"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="502"/>
         <source>Open</source>
         <translation>Open</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="175"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="174"/>
         <location filename="../build/ui_mainwindow.h" line="462"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="180"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="179"/>
         <location filename="../build/ui_mainwindow.h" line="463"/>
         <source>&amp;Save</source>
         <translation>&amp;Save</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="183"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="182"/>
         <location filename="../build/ui_mainwindow.h" line="465"/>
         <source>Save</source>
         <translation>Save</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="186"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="185"/>
         <location filename="../build/ui_mainwindow.h" line="467"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="191"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="190"/>
         <location filename="../build/ui_mainwindow.h" line="468"/>
         <source>Sa&amp;ve as</source>
         <translation>Sa&amp;ve as</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="194"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="193"/>
         <location filename="../build/ui_mainwindow.h" line="470"/>
         <source>Save as</source>
         <translation>Save as</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="197"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="196"/>
         <location filename="../build/ui_mainwindow.h" line="472"/>
         <source>Ctrl+Shift+S</source>
         <translation>Ctrl+Shift+S</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="202"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="201"/>
         <location filename="../build/ui_mainwindow.h" line="473"/>
         <source>&amp;Close</source>
         <translation>&amp;Close</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="205"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="204"/>
         <location filename="../build/ui_mainwindow.h" line="475"/>
         <source>Close</source>
         <translation>Close</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="208"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="207"/>
         <location filename="../build/ui_mainwindow.h" line="477"/>
         <source>Ctrl+W</source>
         <translation>Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="221"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="212"/>
+        <location filename="../build/ui_mainwindow.h" line="478"/>
+        <source>&amp;Print</source>
+        <translation>&amp;Print</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="215"/>
+        <location filename="../build/ui_mainwindow.h" line="479"/>
+        <source>Ctrl+P</source>
+        <translation>Ctrl+P</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="220"/>
         <location filename="../build/ui_mainwindow.h" line="480"/>
         <source>P&amp;references</source>
         <translation>P&amp;references</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="251"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="223"/>
+        <location filename="../build/ui_mainwindow.h" line="481"/>
+        <source>Ctrl+,</source>
+        <translation>Ctrl+,</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="231"/>
+        <location filename="../build/ui_mainwindow.h" line="482"/>
+        <source>&amp;Quit</source>
+        <translation>&amp;Quit</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="234"/>
+        <location filename="../build/ui_mainwindow.h" line="483"/>
+        <source>Ctrl+Q</source>
+        <translation>Ctrl+Q</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="242"/>
+        <location filename="../build/ui_mainwindow.h" line="484"/>
+        <source>Import from &amp;dive computer</source>
+        <translation>Import from &amp;dive computer</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="245"/>
+        <location filename="../build/ui_mainwindow.h" line="485"/>
+        <source>Ctrl+D</source>
+        <translation>Ctrl+D</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="250"/>
         <location filename="../build/ui_mainwindow.h" line="486"/>
         <source>Import &amp;GPS data from Subsurface web service</source>
         <translation>Import &amp;GPS data from Subsurface web service</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="259"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="253"/>
+        <location filename="../build/ui_mainwindow.h" line="487"/>
+        <source>Ctrl+G</source>
+        <translation>Ctrl+G</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="258"/>
         <location filename="../build/ui_mainwindow.h" line="488"/>
         <source>Edit device &amp;names</source>
         <translation>Edit device &amp;names</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="272"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="263"/>
+        <location filename="../build/ui_mainwindow.h" line="489"/>
+        <source>&amp;Add dive</source>
+        <translation>&amp;Add dive</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="266"/>
+        <location filename="../build/ui_mainwindow.h" line="490"/>
+        <source>Ctrl++</source>
+        <translation>Ctrl++</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="271"/>
         <location filename="../build/ui_mainwindow.h" line="491"/>
         <source>&amp;Edit dive</source>
         <translation>&amp;Edit dive</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="277"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="276"/>
         <location filename="../build/ui_mainwindow.h" line="492"/>
         <source>&amp;Copy dive components</source>
         <translation>&amp;Copy dive components</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="280"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="279"/>
         <location filename="../build/ui_mainwindow.h" line="493"/>
         <source>Ctrl+C</source>
         <translation>Ctrl+C</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="285"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="284"/>
         <location filename="../build/ui_mainwindow.h" line="494"/>
         <source>&amp;Paste dive components</source>
         <translation>&amp;Paste dive components</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="288"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="287"/>
         <location filename="../build/ui_mainwindow.h" line="495"/>
         <source>Ctrl+V</source>
         <translation>Ctrl+V</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="325"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="292"/>
+        <location filename="../build/ui_mainwindow.h" line="496"/>
+        <source>&amp;Renumber</source>
+        <translation>&amp;Renumber</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="295"/>
+        <location filename="../build/ui_mainwindow.h" line="497"/>
+        <source>Ctrl+R</source>
+        <translation>Ctrl+R</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="303"/>
+        <location filename="../build/ui_mainwindow.h" line="498"/>
+        <source>Auto &amp;group</source>
+        <translation>Auto &amp;group</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="308"/>
+        <location filename="../build/ui_mainwindow.h" line="499"/>
+        <source>&amp;Yearly statistics</source>
+        <translation>&amp;Yearly statistics</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="311"/>
+        <location filename="../build/ui_mainwindow.h" line="500"/>
+        <source>Ctrl+Y</source>
+        <translation>Ctrl+Y</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="316"/>
+        <location filename="../build/ui_mainwindow.h" line="501"/>
+        <source>&amp;Dive list</source>
+        <translation>&amp;Dive list</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="319"/>
+        <location filename="../build/ui_mainwindow.h" line="502"/>
+        <source>Ctrl+2</source>
+        <translation>Ctrl+2</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="324"/>
         <location filename="../build/ui_mainwindow.h" line="503"/>
         <source>&amp;Profile</source>
         <translation>&amp;Profile</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="333"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="327"/>
+        <location filename="../build/ui_mainwindow.h" line="504"/>
+        <source>Ctrl+3</source>
+        <translation>Ctrl+3</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="332"/>
         <location filename="../build/ui_mainwindow.h" line="505"/>
         <source>&amp;Info</source>
         <translation>&amp;Info</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="341"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="335"/>
+        <location filename="../build/ui_mainwindow.h" line="506"/>
+        <source>Ctrl+4</source>
+        <translation>Ctrl+4</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="340"/>
         <location filename="../build/ui_mainwindow.h" line="507"/>
         <source>&amp;All</source>
         <translation>&amp;All</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="357"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="343"/>
+        <location filename="../build/ui_mainwindow.h" line="508"/>
+        <source>Ctrl+1</source>
+        <translation>Ctrl+1</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="348"/>
+        <location filename="../build/ui_mainwindow.h" line="509"/>
+        <source>P&amp;revious DC</source>
+        <translation>P&amp;revious DC</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="351"/>
+        <location filename="../build/ui_mainwindow.h" line="510"/>
+        <source>Left</source>
+        <translation>Left</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="356"/>
         <location filename="../build/ui_mainwindow.h" line="511"/>
         <source>&amp;Next DC</source>
         <translation>&amp;Next DC</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="365"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="359"/>
+        <location filename="../build/ui_mainwindow.h" line="512"/>
+        <source>Right</source>
+        <translation>Right</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="364"/>
         <location filename="../build/ui_mainwindow.h" line="513"/>
         <source>&amp;About Subsurface</source>
         <translation>&amp;About Subsurface</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="381"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="372"/>
+        <location filename="../build/ui_mainwindow.h" line="514"/>
+        <source>User &amp;manual</source>
+        <translation>User &amp;manual</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="375"/>
+        <location filename="../build/ui_mainwindow.h" line="515"/>
+        <source>F1</source>
+        <translation>F1</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="380"/>
         <location filename="../build/ui_mainwindow.h" line="516"/>
         <source>&amp;Globe</source>
         <translation>&amp;Globe</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="403"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="383"/>
+        <location filename="../build/ui_mainwindow.h" line="517"/>
+        <source>Ctrl+5</source>
+        <translation>Ctrl+5</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="388"/>
+        <location filename="../build/ui_mainwindow.h" line="518"/>
+        <source>P&amp;lan dive</source>
+        <translation>P&amp;lan dive</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="391"/>
+        <location filename="../build/ui_mainwindow.h" line="519"/>
+        <source>Ctrl+L</source>
+        <translation>Ctrl+L</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="396"/>
+        <location filename="../build/ui_mainwindow.h" line="520"/>
+        <source>&amp;Import log files</source>
+        <translation>&amp;Import log files</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="399"/>
+        <location filename="../build/ui_mainwindow.h" line="522"/>
+        <source>Import divelog files from other applications</source>
+        <translation>Import divelog files from other applications</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="402"/>
         <location filename="../build/ui_mainwindow.h" line="524"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="408"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="407"/>
         <location filename="../build/ui_mainwindow.h" line="525"/>
         <source>Import &amp;from divelogs.de</source>
         <translation>Import &amp;from divelogs.de</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="416"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="415"/>
         <location filename="../build/ui_mainwindow.h" line="526"/>
         <source>&amp;Full screen</source>
         <translation>&amp;Full screen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="419"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="418"/>
         <location filename="../build/ui_mainwindow.h" line="528"/>
         <source>Toggle full screen</source>
         <translation>Toggle full screen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="447"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="421"/>
+        <location filename="../build/ui_mainwindow.h" line="530"/>
+        <source>F11</source>
+        <translation>F11</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="446"/>
         <location filename="../build/ui_mainwindow.h" line="531"/>
         <source>&amp;Check for updates</source>
         <translation>&amp;Check for updates</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="452"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="451"/>
         <location filename="../build/ui_mainwindow.h" line="532"/>
         <source>&amp;Export</source>
         <translation>&amp;Export</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="458"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="454"/>
+        <location filename="../build/ui_mainwindow.h" line="534"/>
+        <source>Export dive logs</source>
+        <translation>Export dive logs</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="457"/>
         <location filename="../build/ui_mainwindow.h" line="536"/>
         <source>Ctrl+E</source>
         <translation>Ctrl+E</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="466"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="462"/>
+        <location filename="../build/ui_mainwindow.h" line="537"/>
+        <source>Configure &amp;dive computer</source>
+        <translation>Configure &amp;dive computer</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="465"/>
         <location filename="../build/ui_mainwindow.h" line="538"/>
         <source>Ctrl+Shift+C</source>
         <translation>Ctrl+Shift+C</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="474"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="473"/>
         <location filename="../build/ui_mainwindow.h" line="539"/>
         <source>Edit &amp;dive in planner</source>
         <translation>Edit &amp;dive in planner</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="486"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="485"/>
         <location filename="../build/ui_mainwindow.h" line="540"/>
         <source>Toggle pO₂ graph</source>
         <translation>Toggle pO₂ graph</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="498"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="497"/>
         <location filename="../build/ui_mainwindow.h" line="541"/>
         <source>Toggle pN₂ graph</source>
         <translation>Toggle pN₂ graph</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="642"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="509"/>
+        <location filename="../build/ui_mainwindow.h" line="542"/>
+        <source>Toggle pHe graph</source>
+        <translation>Toggle pHe graph</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="521"/>
+        <location filename="../build/ui_mainwindow.h" line="543"/>
+        <source>Toggle DC reported ceiling</source>
+        <translation>Toggle DC reported ceiling</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="533"/>
+        <location filename="../build/ui_mainwindow.h" line="544"/>
+        <source>Toggle calculated ceiling</source>
+        <translation>Toggle calculated ceiling</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="545"/>
+        <location filename="../build/ui_mainwindow.h" line="545"/>
+        <source>Toggle calculating all tissues</source>
+        <translation>Toggle calculating all tissues</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="557"/>
+        <location filename="../build/ui_mainwindow.h" line="546"/>
+        <source>Toggle calculated ceiling with 3m increments</source>
+        <translation>Toggle calculated ceiling with 3m increments</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="569"/>
+        <location filename="../build/ui_mainwindow.h" line="547"/>
+        <source>Toggle heart rate</source>
+        <translation>Toggle heart rate</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="581"/>
+        <location filename="../build/ui_mainwindow.h" line="548"/>
+        <source>Toggle MOD</source>
+        <translation>Toggle MOD</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="593"/>
+        <location filename="../build/ui_mainwindow.h" line="549"/>
+        <source>Toggle EAD, END, EADD</source>
+        <translation>Toggle EAD, END, EADD</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="605"/>
+        <location filename="../build/ui_mainwindow.h" line="550"/>
+        <source>Toggle NDL, TTS</source>
+        <translation>Toggle NDL, TTS</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="617"/>
+        <location filename="../build/ui_mainwindow.h" line="551"/>
+        <source>Toggle SAC rate</source>
+        <translation>Toggle SAC rate</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="629"/>
+        <location filename="../build/ui_mainwindow.h" line="552"/>
+        <source>Toggle ruler</source>
+        <translation>Toggle ruler</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="641"/>
         <location filename="../build/ui_mainwindow.h" line="553"/>
         <source>Scale graph</source>
         <translation>Scale graph</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="654"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="653"/>
         <location filename="../build/ui_mainwindow.h" line="554"/>
         <source>Toggle pictures</source>
         <translation>Toggle pictures</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="666"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="665"/>
         <location filename="../build/ui_mainwindow.h" line="555"/>
         <source>Toggle tank bar</source>
         <translation>Toggle tank bar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="674"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="673"/>
         <location filename="../build/ui_mainwindow.h" line="556"/>
         <source>&amp;Filter divelist</source>
         <translation>&amp;Filter divelist</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="689"/>
-        <location filename="../build/ui_mainwindow.h" line="558"/>
-        <source>Toggle tissue graph</source>
-        <translation>Toggle tissue graph</translation>
+        <location filename="../desktop-widgets/mainwindow.ui" line="676"/>
+        <location filename="../build/ui_mainwindow.h" line="557"/>
+        <source>Ctrl+F</source>
+        <translation>Ctrl+F</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="688"/>
+        <source>Toggle tissue heat-map</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="694"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="693"/>
         <location filename="../build/ui_mainwindow.h" line="559"/>
         <source>User &amp;survey</source>
         <translation>User &amp;survey</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="699"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="698"/>
         <location filename="../build/ui_mainwindow.h" line="560"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="238"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="231"/>
         <source>&amp;Undo</source>
         <translation>&amp;Undo</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="702"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="701"/>
         <location filename="../build/ui_mainwindow.h" line="561"/>
         <source>Ctrl+Z</source>
         <translation>Ctrl+Z</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="707"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="706"/>
         <location filename="../build/ui_mainwindow.h" line="562"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="239"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="232"/>
         <source>&amp;Redo</source>
         <translation>&amp;Redo</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="710"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="709"/>
         <location filename="../build/ui_mainwindow.h" line="563"/>
         <source>Ctrl+Shift+Z</source>
         <translation>Ctrl+Shift+Z</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="715"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="714"/>
         <location filename="../build/ui_mainwindow.h" line="564"/>
         <source>&amp;Find moved images</source>
         <translation>&amp;Find moved images</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="720"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="719"/>
         <source>Open c&amp;loud storage</source>
         <translation>Open c&amp;loud storage</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="725"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="724"/>
         <source>Save to clo&amp;ud storage</source>
         <translation>Save to clo&amp;ud storage</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="730"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="729"/>
         <location filename="../build/ui_mainwindow.h" line="567"/>
         <source>&amp;Manage dive sites</source>
         <translation>&amp;Manage dive sites</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="735"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="734"/>
         <source>Dive Site &amp;Edit</source>
         <translation>Dive site &amp;edit</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="740"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="739"/>
         <source>Facebook</source>
         <translation>Facebook</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="745"/>
-        <source>Add GPS location here</source>
-        <translation>Add GPS location here</translation>
+        <location filename="../desktop-widgets/mainwindow.ui" line="744"/>
+        <source>Take cloud storage online</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="677"/>
-        <location filename="../build/ui_mainwindow.h" line="557"/>
-        <source>Ctrl+F</source>
-        <translation>Ctrl+F</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="213"/>
-        <location filename="../build/ui_mainwindow.h" line="478"/>
-        <source>&amp;Print</source>
-        <translation>&amp;Print</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="224"/>
-        <location filename="../build/ui_mainwindow.h" line="481"/>
-        <source>Ctrl+,</source>
-        <translation>Ctrl+,</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="232"/>
-        <location filename="../build/ui_mainwindow.h" line="482"/>
-        <source>&amp;Quit</source>
-        <translation>&amp;Quit</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="243"/>
-        <location filename="../build/ui_mainwindow.h" line="484"/>
-        <source>Import from &amp;dive computer</source>
-        <translation>Import from &amp;dive computer</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="254"/>
-        <location filename="../build/ui_mainwindow.h" line="487"/>
-        <source>Ctrl+G</source>
-        <translation>Ctrl+G</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="267"/>
-        <location filename="../build/ui_mainwindow.h" line="490"/>
-        <source>Ctrl++</source>
-        <translation>Ctrl++</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="293"/>
-        <location filename="../build/ui_mainwindow.h" line="496"/>
-        <source>&amp;Renumber</source>
-        <translation>&amp;Renumber</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="296"/>
-        <location filename="../build/ui_mainwindow.h" line="497"/>
-        <source>Ctrl+R</source>
-        <translation>Ctrl+R</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="312"/>
-        <location filename="../build/ui_mainwindow.h" line="500"/>
-        <source>Ctrl+Y</source>
-        <translation>Ctrl+Y</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="392"/>
-        <location filename="../build/ui_mainwindow.h" line="519"/>
-        <source>Ctrl+L</source>
-        <translation>Ctrl+L</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="216"/>
-        <location filename="../build/ui_mainwindow.h" line="479"/>
-        <source>Ctrl+P</source>
-        <translation>Ctrl+P</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="235"/>
-        <location filename="../build/ui_mainwindow.h" line="483"/>
-        <source>Ctrl+Q</source>
-        <translation>Ctrl+Q</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="246"/>
-        <location filename="../build/ui_mainwindow.h" line="485"/>
-        <source>Ctrl+D</source>
-        <translation>Ctrl+D</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="264"/>
-        <location filename="../build/ui_mainwindow.h" line="489"/>
-        <source>&amp;Add dive</source>
-        <translation>&amp;Add dive</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="304"/>
-        <location filename="../build/ui_mainwindow.h" line="498"/>
-        <source>Auto &amp;group</source>
-        <translation>Auto &amp;group</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="309"/>
-        <location filename="../build/ui_mainwindow.h" line="499"/>
-        <source>&amp;Yearly statistics</source>
-        <translation>&amp;Yearly statistics</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="317"/>
-        <location filename="../build/ui_mainwindow.h" line="501"/>
-        <source>&amp;Dive list</source>
-        <translation>&amp;Dive list</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="320"/>
-        <location filename="../build/ui_mainwindow.h" line="502"/>
-        <source>Ctrl+2</source>
-        <translation>Ctrl+2</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="328"/>
-        <location filename="../build/ui_mainwindow.h" line="504"/>
-        <source>Ctrl+3</source>
-        <translation>Ctrl+3</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="336"/>
-        <location filename="../build/ui_mainwindow.h" line="506"/>
-        <source>Ctrl+4</source>
-        <translation>Ctrl+4</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="344"/>
-        <location filename="../build/ui_mainwindow.h" line="508"/>
-        <source>Ctrl+1</source>
-        <translation>Ctrl+1</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="349"/>
-        <location filename="../build/ui_mainwindow.h" line="509"/>
-        <source>P&amp;revious DC</source>
-        <translation>P&amp;revious DC</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="352"/>
-        <location filename="../build/ui_mainwindow.h" line="510"/>
-        <source>Left</source>
-        <translation>Left</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="360"/>
-        <location filename="../build/ui_mainwindow.h" line="512"/>
-        <source>Right</source>
-        <translation>Right</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="373"/>
-        <location filename="../build/ui_mainwindow.h" line="514"/>
-        <source>User &amp;manual</source>
-        <translation>User &amp;manual</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="376"/>
-        <location filename="../build/ui_mainwindow.h" line="515"/>
-        <source>F1</source>
-        <translation>F1</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="384"/>
-        <location filename="../build/ui_mainwindow.h" line="517"/>
-        <source>Ctrl+5</source>
-        <translation>Ctrl+5</translation>
+        <location filename="../build/ui_mainwindow.h" line="558"/>
+        <source>Toggle tissue graph</source>
+        <translation>Toggle tissue graph</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="389"/>
-        <location filename="../build/ui_mainwindow.h" line="518"/>
-        <source>P&amp;lan dive</source>
-        <translation>P&amp;lan dive</translation>
+        <location filename="../build/ui_mainwindow.h" line="565"/>
+        <source>Open cloud storage</source>
+        <translation>Open cloud storage</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="397"/>
-        <location filename="../build/ui_mainwindow.h" line="520"/>
-        <source>&amp;Import log files</source>
-        <translation>&amp;Import log files</translation>
+        <location filename="../build/ui_mainwindow.h" line="566"/>
+        <source>Save to cloud storage</source>
+        <translation>Save to cloud storage</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="400"/>
-        <location filename="../build/ui_mainwindow.h" line="522"/>
-        <source>Import divelog files from other applications</source>
-        <translation>Import divelog files from other applications</translation>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="331"/>
+        <source>Connect to</source>
+        <translation>Connect to</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="422"/>
-        <location filename="../build/ui_mainwindow.h" line="530"/>
-        <source>F11</source>
-        <translation>F11</translation>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="493"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="538"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1545"/>
+        <source>Please save or cancel the current dive edit before opening a new file.</source>
+        <translation>Please save or cancel the current dive edit before opening a new file.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="505"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="499"/>
         <source>Open file</source>
         <translation>Open file</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="509"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="503"/>
         <location filename="../desktop-widgets/mainwindow.cpp" line="614"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1972"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1978"/>
         <source>Cancel</source>
         <translation>Cancel</translation>
     </message>
@@ -5259,6 +5358,16 @@ mixed from Air and using:
         <translation>Scanning images...(this can take a while)</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="649"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="796"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="977"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="983"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1849"/>
+        <source>Warning</source>
+        <translation>Warning</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="674"/>
         <source>Please save or cancel the current dive edit before closing the file.</source>
         <translation>Please save or cancel the current dive edit before closing the file.</translation>
@@ -5274,125 +5383,98 @@ mixed from Air and using:
         <translation>Print runtime table</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="982"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
+        <source>Trying to replan a dive that&apos;s not a planned dive.</source>
+        <translation>Trying to replan a dive that&apos;s not a planned dive.</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="977"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1849"/>
+        <source>Please, first finish the current edition before trying to do another.</source>
+        <translation>Please, first finish the current edition before trying to do another.</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="983"/>
         <source>Trying to edit a dive that&apos;s not a manually added dive.</source>
         <translation>Trying to edit a dive that&apos;s not a manually added dive.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1243"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1030"/>
+        <source>Yearly statistics</source>
+        <translation>Yearly statistics</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1244"/>
         <source>Do you want to save the changes that you made in the file %1?</source>
         <translation>Do you want to save the changes that you made in the file %1?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1246"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1247"/>
         <source>Do you want to save the changes that you made in the data file?</source>
         <translation>Do you want to save the changes that you made in the data file?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1251"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1252"/>
         <source>Save changes?</source>
         <translation>Save changes?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1587"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1253"/>
+        <source>Changes will be lost if you don&apos;t save them.</source>
+        <translation>Changes will be lost if you don&apos;t save them.</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1572"/>
         <source>Save file as</source>
         <translation>Save file as</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1682"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1573"/>
+        <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
+        <translation>Subsurface XML files (*.ssrf *.xml *.XML)</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1670"/>
+        <source>[local cache for] %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1672"/>
         <source>[cloud storage for] %1</source>
         <translation>[cloud storage for] %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1782"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1788"/>
         <source>Opening datafile from older version</source>
         <translation>Opening datafile from older version</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1783"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1789"/>
         <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly.
 Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source>
         <translation>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly.
 Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1794"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1800"/>
         <source>Open dive log file</source>
         <translation>Open dive log file</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1795"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1801"/>
         <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;All files (*)</source>
         <translation>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;All files (*)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1972"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1978"/>
         <source>Contacting cloud service...</source>
         <translation>Contacting cloud service...</translation>
     </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1252"/>
-        <source>Changes will be lost if you don&apos;t save them.</source>
-        <translation>Changes will be lost if you don&apos;t save them.</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="649"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="796"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="976"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="982"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/>
-        <source>Warning</source>
-        <translation>Warning</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="499"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="544"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1560"/>
-        <source>Please save or cancel the current dive edit before opening a new file.</source>
-        <translation>Please save or cancel the current dive edit before opening a new file.</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="338"/>
-        <source>Connect to</source>
-        <translation>Connect to</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
-        <source>Trying to replan a dive that&apos;s not a planned dive.</source>
-        <translation>Trying to replan a dive that&apos;s not a planned dive.</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1029"/>
-        <source>Yearly statistics</source>
-        <translation>Yearly statistics</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1588"/>
-        <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
-        <translation>Subsurface XML files (*.ssrf *.xml *.XML)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="976"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/>
-        <source>Please, first finish the current edition before trying to do another.</source>
-        <translation>Please, first finish the current edition before trying to do another.</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_mainwindow.h" line="565"/>
-        <source>Open cloud storage</source>
-        <translation>Open cloud storage</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_mainwindow.h" line="566"/>
-        <source>Save to cloud storage</source>
-        <translation>Save to cloud storage</translation>
-    </message>
 </context>
 <context>
     <name>MultiFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="733"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="731"/>
         <source>Filter shows %1 (of %2) dives</source>
         <translation>Filter shows %1 (of %2) dives</translation>
     </message>
@@ -5400,12 +5482,12 @@ Subsurface has already tried to pre-populate the data but it might be worth whil
 <context>
     <name>OstcFirmwareCheck</name>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="269"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="271"/>
         <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source>
         <translation>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="273"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="275"/>
         <source>
 
 Please start Bluetooth on your OSTC Sport and do the same preparations as for a logbook download before continuing with the update</source>
@@ -5414,27 +5496,27 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 Please start Bluetooth on your OSTC Sport and do the same preparations as for a logbook download before continuing with the update</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="274"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="276"/>
         <source>Not now</source>
         <translation>Not now</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="275"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="277"/>
         <source>Update firmware</source>
         <translation>Update firmware</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="277"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="279"/>
         <source>Firmware upgrade notice</source>
         <translation>Firmware upgrade notice</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="295"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="297"/>
         <source>Save the downloaded firmware as</source>
         <translation>Save the downloaded firmware as</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="296"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="298"/>
         <source>HEX files (*.hex)</source>
         <translation>HEX files (*.hex)</translation>
     </message>
@@ -5442,79 +5524,89 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PlannerSettingsWidget</name>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="322"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="302"/>
         <source>Open circuit</source>
         <translation>Open circuit</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="322"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="302"/>
         <source>CCR</source>
         <translation>CCR</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="322"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="302"/>
         <source>pSCR</source>
         <translation>pSCR</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="421"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="388"/>
         <source>ft/min</source>
         <translation>ft/min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="422"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="389"/>
         <source>Last stop at 20ft</source>
         <translation>Last stop at 20ft</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="423"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="390"/>
         <source>50% avg. depth to 20ft</source>
         <translation>50% avg. depth to 20ft</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="424"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="391"/>
         <source>20ft to surface</source>
         <translation>20ft to surface</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="426"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="392"/>
+        <source>ft</source>
+        <translation>ft</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="394"/>
         <source>m/min</source>
         <translation>m/min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="427"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="395"/>
         <source>Last stop at 6m</source>
         <translation>Last stop at 6m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="428"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="396"/>
         <source>50% avg. depth to 6m</source>
         <translation>50% avg. depth to 6m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="429"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="397"/>
         <source>6m to surface</source>
         <translation>6m to surface</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="432"/>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="433"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="398"/>
+        <source>m</source>
+        <translation>m</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="401"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="402"/>
         <source>cuft/min</source>
         <translation>cuft/min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="441"/>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="442"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="410"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="411"/>
         <source>ℓ/min</source>
         <translation>ℓ/min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="451"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="420"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="456"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="425"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
@@ -5664,6 +5756,11 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PreferencesDialog</name>
     <message>
+        <location filename="../build/ui_preferences.h" line="1283"/>
+        <source>Preferences</source>
+        <translation>Preferences</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1288"/>
         <source>Defaults</source>
         <translation>Defaults</translation>
@@ -5699,6 +5796,11 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>Georeference</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1303"/>
+        <source>Lists and tables</source>
+        <translation>Lists and tables</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1304"/>
         <source>Font</source>
         <translation>Font</translation>
@@ -5714,6 +5816,11 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>Dives</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1307"/>
+        <source>Default dive log file</source>
+        <translation>Default dive log file</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1308"/>
         <source>No default file</source>
         <translation>No default file</translation>
@@ -5744,6 +5851,21 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>...</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1314"/>
+        <source>Display invalid</source>
+        <translation>Display invalid</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1316"/>
+        <source>Default cylinder</source>
+        <translation>Default cylinder</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1317"/>
+        <source>Use default cylinder</source>
+        <translation>Use default cylinder</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1318"/>
         <source>Animations</source>
         <translation>Animations</translation>
@@ -5774,40 +5896,24 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>System</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1401"/>
-        <source>Dive site geo lookup</source>
-        <translation>Dive site geo lookup</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1402"/>
-        <source>Enable geocoding for dive site management</source>
-        <translation>Enable geocoding for dive site management</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1403"/>
-        <source>Parse site without GPS data</source>
-        <translation>Parse site without GPS data</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1404"/>
-        <source>Same format for existing dives</source>
-        <translation>Same format for existing dives</translation>
+        <location filename="../build/ui_preferences.h" line="1324"/>
+        <source>&amp;Metric</source>
+        <translation>&amp;Metric</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1405"/>
-        <source>Dive Site Layout</source>
-        <translation>Dive site layout</translation>
+        <location filename="../build/ui_preferences.h" line="1325"/>
+        <source>Imperial</source>
+        <translation>Imperial</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1406"/>
-        <location filename="../build/ui_preferences.h" line="1407"/>
-        <source>/</source>
-        <translation>/</translation>
+        <location filename="../build/ui_preferences.h" line="1326"/>
+        <source>Personali&amp;ze</source>
+        <translation>Personali&amp;se</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1325"/>
-        <source>Imperial</source>
-        <translation>Imperial</translation>
+        <location filename="../build/ui_preferences.h" line="1327"/>
+        <source>Individual settings</source>
+        <translation>Individual settings</translation>
     </message>
     <message>
         <location filename="../build/ui_preferences.h" line="1328"/>
@@ -5825,6 +5931,11 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>feet</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1331"/>
+        <source>Pressure</source>
+        <translation>Pressure</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1332"/>
         <location filename="../build/ui_preferences.h" line="1366"/>
         <source>bar</source>
@@ -5836,11 +5947,26 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>psi</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1334"/>
+        <source>Volume</source>
+        <translation>Volume</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1335"/>
+        <source>&amp;liter</source>
+        <translation>&amp;litre</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1336"/>
         <source>cu ft</source>
         <translation>cu ft</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1337"/>
+        <source>Temperature</source>
+        <translation>Temperature</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1338"/>
         <source>celsius</source>
         <translation>celsius</translation>
@@ -5851,11 +5977,121 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>fahrenheit</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1340"/>
+        <source>Weight</source>
+        <translation>Weight</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1341"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1342"/>
+        <source>lbs</source>
+        <translation>lbs</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1343"/>
+        <source>Time units</source>
+        <translation>Time units</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1344"/>
+        <source>Ascent/descent speed denominator</source>
+        <translation>Ascent/descent speed denominator</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1345"/>
+        <source>Minutes</source>
+        <translation>Minutes</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1346"/>
+        <source>Seconds</source>
+        <translation>Seconds</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1347"/>
+        <source>GPS coordinates</source>
+        <translation>GPS coordinates</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1348"/>
+        <source>Location Display</source>
+        <translation>Location display</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1349"/>
+        <source>traditional (dms)</source>
+        <translation>deg/min/sec</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1350"/>
+        <source>decimal</source>
+        <translation>decimal</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1351"/>
+        <source>Show</source>
+        <translation>Show</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1352"/>
+        <source>Threshold when showing pO₂</source>
+        <translation>Threshold when showing pO₂</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1353"/>
+        <source>Threshold when showing pN₂</source>
+        <translation>Threshold when showing pN₂</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1354"/>
+        <source>Threshold when showing pHe</source>
+        <translation>Threshold when showing pHe</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1355"/>
+        <source>Max pO₂ when showing MOD</source>
+        <translation>Max pO₂ when showing MOD</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1356"/>
+        <source>Draw dive computer reported ceiling red</source>
+        <translation>Draw dive computer reported ceiling red</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1357"/>
+        <source>Show unused cylinders in Equipment tab</source>
+        <translation>Show unused cylinders in Equipment tab</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1358"/>
+        <source>Show average depth</source>
+        <translation>Show average depth</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1359"/>
+        <source>Misc</source>
+        <translation>Misc</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1360"/>
+        <source>GFLow</source>
+        <translation>GFLow</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1361"/>
+        <source>GFHigh</source>
+        <translation>GFHigh</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1362"/>
+        <source>GFLow at max depth</source>
+        <translation>GFLow at max depth</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1363"/>
         <source>CCR: show setpoints when viewing pO₂</source>
         <translation>CCR: show setpoints when viewing pO₂</translation>
@@ -5901,14 +6137,19 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>System default</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1374"/>
+        <source>Filter</source>
+        <translation>Filter</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1375"/>
         <source>Proxy</source>
         <translation>Proxy</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1379"/>
-        <source>Proxy type</source>
-        <translation>Proxy type</translation>
+        <location filename="../build/ui_preferences.h" line="1376"/>
+        <source>Port</source>
+        <translation>Port</translation>
     </message>
     <message>
         <location filename="../build/ui_preferences.h" line="1377"/>
@@ -5916,16 +6157,16 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>Hostname</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1376"/>
-        <source>Port</source>
-        <translation>Port</translation>
-    </message>
-    <message>
         <location filename="../build/ui_preferences.h" line="1378"/>
         <source>Requires authentication</source>
         <translation>Requires authentication</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1379"/>
+        <source>Proxy type</source>
+        <translation>Proxy type</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1380"/>
         <source>Username</source>
         <translation>Username</translation>
@@ -5937,46 +6178,6 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>Password</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1400"/>
-        <source>Disconnect from Facebook</source>
-        <translation>Disconnect from Facebook</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1374"/>
-        <source>Filter</source>
-        <translation>Filter</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1331"/>
-        <source>Pressure</source>
-        <translation>Pressure</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1303"/>
-        <source>Lists and tables</source>
-        <translation>Lists and tables</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1307"/>
-        <source>Default dive log file</source>
-        <translation>Default dive log file</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1314"/>
-        <source>Display invalid</source>
-        <translation>Display invalid</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1316"/>
-        <source>Default cylinder</source>
-        <translation>Default cylinder</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1317"/>
-        <source>Use default cylinder</source>
-        <translation>Use default cylinder</translation>
-    </message>
-    <message>
         <location filename="../build/ui_preferences.h" line="1382"/>
         <source>Subsurface cloud storage</source>
         <translation>Subsurface cloud storage</translation>
@@ -6017,149 +6218,40 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>Save user ID locally?</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1334"/>
-        <source>Volume</source>
-        <translation>Volume</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1337"/>
-        <source>Temperature</source>
-        <translation>Temperature</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1340"/>
-        <source>Weight</source>
-        <translation>Weight</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1342"/>
-        <source>lbs</source>
-        <translation>lbs</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1343"/>
-        <source>Time units</source>
-        <translation>Time units</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1345"/>
-        <source>Minutes</source>
-        <translation>Minutes</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1346"/>
-        <source>Seconds</source>
-        <translation>Seconds</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1351"/>
-        <source>Show</source>
-        <translation>Show</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1362"/>
-        <source>GFLow at max depth</source>
-        <translation>GFLow at max depth</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1359"/>
-        <source>Misc</source>
-        <translation>Misc</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1283"/>
-        <source>Preferences</source>
-        <translation>Preferences</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1324"/>
-        <source>&amp;Metric</source>
-        <translation>&amp;Metric</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1326"/>
-        <source>Personali&amp;ze</source>
-        <translation>Personali&amp;se</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1327"/>
-        <source>Individual settings</source>
-        <translation>Individual settings</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1335"/>
-        <source>&amp;liter</source>
-        <translation>&amp;litre</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1344"/>
-        <source>Ascent/descent speed denominator</source>
-        <translation>Ascent/descent speed denominator</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1347"/>
-        <source>GPS coordinates</source>
-        <translation>GPS coordinates</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1348"/>
-        <source>Location Display</source>
-        <translation>Location display</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1349"/>
-        <source>traditional (dms)</source>
-        <translation>deg/min/sec</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1350"/>
-        <source>decimal</source>
-        <translation>decimal</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1352"/>
-        <source>Threshold when showing pO₂</source>
-        <translation>Threshold when showing pO₂</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1353"/>
-        <source>Threshold when showing pN₂</source>
-        <translation>Threshold when showing pN₂</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1354"/>
-        <source>Threshold when showing pHe</source>
-        <translation>Threshold when showing pHe</translation>
+        <location filename="../build/ui_preferences.h" line="1400"/>
+        <source>Disconnect from Facebook</source>
+        <translation>Disconnect from Facebook</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1355"/>
-        <source>Max pO₂ when showing MOD</source>
-        <translation>Max pO₂ when showing MOD</translation>
+        <location filename="../build/ui_preferences.h" line="1401"/>
+        <source>Dive site geo lookup</source>
+        <translation>Dive site geo lookup</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1356"/>
-        <source>Draw dive computer reported ceiling red</source>
-        <translation>Draw dive computer reported ceiling red</translation>
+        <location filename="../build/ui_preferences.h" line="1402"/>
+        <source>Enable geocoding for dive site management</source>
+        <translation>Enable geocoding for dive site management</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1357"/>
-        <source>Show unused cylinders in Equipment tab</source>
-        <translation>Show unused cylinders in Equipment tab</translation>
+        <location filename="../build/ui_preferences.h" line="1403"/>
+        <source>Parse site without GPS data</source>
+        <translation>Parse site without GPS data</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1358"/>
-        <source>Show average depth</source>
-        <translation>Show average depth</translation>
+        <location filename="../build/ui_preferences.h" line="1404"/>
+        <source>Same format for existing dives</source>
+        <translation>Same format for existing dives</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1360"/>
-        <source>GFLow</source>
-        <translation>GFLow</translation>
+        <location filename="../build/ui_preferences.h" line="1405"/>
+        <source>Dive Site Layout</source>
+        <translation>Dive site layout</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1361"/>
-        <source>GFHigh</source>
-        <translation>GFHigh</translation>
+        <location filename="../build/ui_preferences.h" line="1406"/>
+        <location filename="../build/ui_preferences.h" line="1407"/>
+        <source>/</source>
+        <translation>/</translation>
     </message>
 </context>
 <context>
@@ -6215,106 +6307,136 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="20"/>
-        <source>Show</source>
-        <translation>Show</translation>
+        <source>Gas pressure display setup</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="29"/>
-        <source>Threshold when showing pO₂</source>
-        <translation>Threshold when showing pO₂</translation>
+        <source>Threshold for pO₂ (bar)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="49"/>
-        <source>Threshold when showing pN₂</source>
-        <translation>Threshold when showing pN₂</translation>
+        <source>Threshold for pN₂ (bar)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="69"/>
-        <source>Threshold when showing pHe</source>
-        <translation>Threshold when showing pHe</translation>
+        <source>Threshold for pHe (bar)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="89"/>
-        <source>Max pO₂ when showing MOD</source>
-        <translation>Max pO₂ when showing MOD</translation>
+        <source>pO₂ in calculating MOD (bar)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="109"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="106"/>
+        <source>CCR options:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="113"/>
+        <source>Dive planner default setpoint (bar)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="133"/>
+        <source>Show setpoints when viewing pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="140"/>
+        <source>Show individual O₂ sensor values when viewing pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="150"/>
+        <source>Ceiling display setup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="159"/>
         <source>Draw dive computer reported ceiling red</source>
         <translation>Draw dive computer reported ceiling red</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="116"/>
-        <source>Show unused cylinders in Equipment tab</source>
-        <translation>Show unused cylinders in Equipment tab</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="169"/>
+        <source>Algorithm for calculated ceiling:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="123"/>
-        <source>Show mean depth</source>
-        <translation>Show mean depth</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="176"/>
+        <source>VPM-B</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="133"/>
-        <source>Misc</source>
-        <translation>Misc</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="183"/>
+        <source>VPM-B Conservatism</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="149"/>
-        <source>bar</source>
-        <translation>bar</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="193"/>
+        <source>+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="165"/>
-        <source>Default CCR set-point for dive planning</source>
-        <translation>Default CCR set-point for dive planning</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="206"/>
+        <source>Bühlmann</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="172"/>
-        <source>pSCR O₂ metabolism rate</source>
-        <translation>pSCR O₂ metabolism rate</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="216"/>
+        <source>GFHigh</source>
+        <translation>GFHigh</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="179"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="236"/>
         <source>GFLow</source>
         <translation>GFLow</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="186"/>
-        <source>GFHigh</source>
-        <translation>GFHigh</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="256"/>
+        <source>GFLow at max depth</source>
+        <translation>GFLow at max depth</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="203"/>
-        <source>ℓ/min</source>
-        <translation>ℓ/min</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="263"/>
+        <source>pSCR options:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="213"/>
-        <source>pSCR ratio</source>
-        <translation>pSCR ratio</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="270"/>
+        <source>Metabolic rate (ℓ O₂/min)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="287"/>
+        <source>Dilution ratio</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="223"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="300"/>
         <source>1:</source>
         <translation>1:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="230"/>
-        <source>CCR: show individual O₂ sensor values when viewing pO₂</source>
-        <translation>CCR: show individual O₂ sensor values when viewing pO₂</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="310"/>
+        <source>Misc</source>
+        <translation>Misc</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="237"/>
-        <source>CCR: show setpoints when viewing pO₂</source>
-        <translation>CCR: show setpoints when viewing pO₂</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="316"/>
+        <source>Show unused cylinders in Equipment tab</source>
+        <translation>Show unused cylinders in Equipment tab</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="244"/>
-        <source>GFLow at max depth</source>
-        <translation>GFLow at max depth</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="323"/>
+        <source>Show mean depth in Profile</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="10"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="9"/>
         <source>Graph</source>
         <translation>Graph</translation>
     </message>
@@ -6383,15 +6505,29 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>Language</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="57"/>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="53"/>
         <source>Restart required</source>
         <translation>Restart required</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="58"/>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="54"/>
         <source>To correctly load a new language you must restart Subsurface.</source>
         <translation>To correctly load a new language you must restart Subsurface.</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="76"/>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="82"/>
+        <source>Literal characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="77"/>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="83"/>
+        <source>Non-special character(s) in time format.
+These will be used as is. This might not be what you intended.
+See http://doc.qt.io/qt-5/qdatetime.html#toString</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PreferencesNetwork</name>
@@ -6438,7 +6574,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_network.ui" line="156"/>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="148"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="134"/>
         <source>Subsurface cloud storage</source>
         <translation>Subsurface cloud storage</translation>
     </message>
@@ -6483,39 +6619,39 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>Save user ID locally?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="11"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="10"/>
         <source>Network</source>
         <translation>Network</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="15"/>
         <source>No proxy</source>
         <translation>No proxy</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/>
         <source>System proxy</source>
         <translation>System proxy</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/>
         <source>HTTP proxy</source>
         <translation>HTTP proxy</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="19"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/>
         <source>SOCKS proxy</source>
         <translation>SOCKS proxy</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="75"/>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="97"/>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="110"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="72"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="93"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="106"/>
         <source>Cloud storage email and password can only consist of letters, numbers, and &apos;.&apos;, &apos;-&apos;, &apos;_&apos;, and &apos;+&apos;.</source>
         <translation>Cloud storage email and password can only consist of letters, numbers, and &apos;.&apos;, &apos;-&apos;, &apos;_&apos;, and &apos;+&apos;.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="146"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="132"/>
         <source>Subsurface cloud storage (credentials verified)</source>
         <translation>Subsurface cloud storage (credentials verified)</translation>
     </message>
@@ -6673,7 +6809,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>decimal</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="8"/>
+        <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="7"/>
         <source>Units</source>
         <translation>Units</translation>
     </message>
@@ -6681,17 +6817,17 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PrintDialog</name>
     <message>
-        <location filename="../desktop-widgets/printdialog.cpp" line="118"/>
-        <source>&amp;Preview</source>
-        <translation>&amp;Preview</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/printdialog.cpp" line="115"/>
+        <location filename="../desktop-widgets/printdialog.cpp" line="102"/>
         <source>P&amp;rint</source>
         <translation>P&amp;rint</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/printdialog.cpp" line="130"/>
+        <location filename="../desktop-widgets/printdialog.cpp" line="105"/>
+        <source>&amp;Preview</source>
+        <translation>&amp;Preview</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/printdialog.cpp" line="117"/>
         <source>Print</source>
         <translation>Print</translation>
     </message>
@@ -6699,19 +6835,10 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PrintOptions</name>
     <message>
-        <location filename="../build/ui_printoptions.h" line="150"/>
-        <source>&amp;Table print</source>
-        <translation>&amp;Table print</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_printoptions.h" line="158"/>
-        <source>One dive per page</source>
-        <translation>One dive per page</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_printoptions.h" line="159"/>
-        <source>Two dives per page</source>
-        <translation>Two dives per page</translation>
+        <location filename="../desktop-widgets/printoptions.ui" line="29"/>
+        <location filename="../build/ui_printoptions.h" line="148"/>
+        <source>Print type</source>
+        <translation>Print type</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/printoptions.ui" line="41"/>
@@ -6771,10 +6898,19 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>Import</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/printoptions.ui" line="29"/>
-        <location filename="../build/ui_printoptions.h" line="148"/>
-        <source>Print type</source>
-        <translation>Print type</translation>
+        <location filename="../build/ui_printoptions.h" line="150"/>
+        <source>&amp;Table print</source>
+        <translation>&amp;Table print</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_printoptions.h" line="158"/>
+        <source>One dive per page</source>
+        <translation>One dive per page</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_printoptions.h" line="159"/>
+        <source>Two dives per page</source>
+        <translation>Two dives per page</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/printoptions.cpp" line="128"/>
@@ -6816,103 +6952,103 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>Unknown dive computer</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="755"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="752"/>
         <source>Show NDL / TTS was disabled because of excessive processing time</source>
         <translation>Show NDL / TTS was disabled because of excessive processing time</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1344"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1338"/>
         <source>Make first divecomputer</source>
         <translation>Make first dive computer</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1346"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1340"/>
         <source>Delete this divecomputer</source>
         <translation>Delete this dive computer</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1360"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1354"/>
         <source>Add gas change</source>
         <translation>Add gas change</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1363"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1357"/>
         <source> (Tank %1)</source>
         <translation> (Tank %1)</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1371"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1365"/>
         <source>Add set-point change</source>
         <translation>Add set-point change</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1373"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1367"/>
         <source>Add bookmark</source>
         <translation>Add bookmark</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1377"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1371"/>
         <source>Edit the profile</source>
         <translation>Edit the profile</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1381"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1375"/>
         <source>Remove event</source>
         <translation>Remove event</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1386"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1380"/>
         <source>Hide similar events</source>
         <translation>Hide similar events</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1393"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1387"/>
         <source>Edit name</source>
         <translation>Edit name</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1422"/>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1429"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1416"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1423"/>
         <source>Adjust pressure of tank %1 (currently interpolated as %2)</source>
         <translation>Adjust pressure of tank %1 (currently interpolated as %2)</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1444"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1438"/>
         <source>Unhide all events</source>
         <translation>Unhide all events</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1479"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1473"/>
         <source>Hide events</source>
         <translation>Hide events</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1479"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1473"/>
         <source>Hide all %1 events?</source>
         <translation>Hide all %1 events?</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1514"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1508"/>
         <source>Remove the selected event?</source>
         <translation>Remove the selected event?</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1515"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1509"/>
         <source>%1 @ %2:%3</source>
         <translation>%1 @ %2:%3</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1638"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1632"/>
         <source>Edit name of bookmark</source>
         <translation>Edit name of bookmark</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1639"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1633"/>
         <source>Custom name:</source>
         <translation>Custom name:</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1644"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1638"/>
         <source>Name is too long!</source>
         <translation>Name is too long.</translation>
     </message>
@@ -6920,91 +7056,101 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>QMLManager</name>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="95"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="97"/>
         <source>Starting...</source>
         <translation>Starting...</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="202"/>
         <source>working in no-cloud mode</source>
         <translation>working in no-cloud mode</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="213"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="216"/>
         <source>no cloud credentials</source>
         <translation>no cloud credentials</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="214"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="270"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="217"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="269"/>
         <source>Please enter valid cloud credentials.</source>
         <translation>Please enter valid cloud credentials.</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="285"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="284"/>
         <source>Attempting to open cloud storage with new credentials</source>
         <translation>Attempting to open cloud storage with new credentials</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="304"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="306"/>
         <source>Testing cloud credentials</source>
         <translation>Testing cloud credentials</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="331"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="320"/>
+        <source>No response from cloud server to validate the credentials</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="329"/>
+        <source>Cannot connect to cloud storage - cloud account not verified</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="361"/>
         <source>Cloud credentials are invalid</source>
         <translation>Cloud credentials are invalid</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="344"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="374"/>
         <source>Cannot open cloud storage: Error creating https connection</source>
         <translation>Cannot open cloud storage: Error creating https connection</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="357"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="387"/>
         <source>Cannot open cloud storage: %1</source>
         <translation>Cannot open cloud storage: %1</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="369"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="399"/>
         <source>Cannot connect to cloud storage</source>
         <translation>Cannot connect to cloud storage</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="411"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="441"/>
         <source>Cloud storage error: %1</source>
         <translation>Cloud storage error: %1</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="501"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="531"/>
         <source>Failed to connect to cloud server, reverting to no cloud status</source>
         <translation>Failed to connect to cloud server, reverting to no-cloud mode</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="520"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="550"/>
         <source>Cloud storage open successfully. No dives in dive list.</source>
         <translation>Cloud storage open successfully. No dives in dive list.</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="689"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="690"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="721"/>
         <source>h</source>
         <translation>h</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="689"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="690"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="691"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="721"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="722"/>
         <source>min</source>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="689"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/>
         <source>sec</source>
         <translation>sec</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="1041"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="1102"/>
         <source>Unknown GPS location</source>
         <translation>Unknown GPS location</translation>
     </message>
@@ -7012,126 +7158,126 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../core/qthelper.cpp" line="866"/>
-        <location filename="../core/qthelper.cpp" line="1214"/>
-        <source>AIR</source>
-        <translation>AIR</translation>
+        <location filename="../core/gpslocation.h" line="13"/>
+        <source>Waiting to aquire GPS location</source>
+        <translation>Waiting to aquire GPS location</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="1214"/>
-        <source>OXYGEN</source>
-        <translation>OXYGEN</translation>
+        <location filename="../core/qthelper.cpp" line="766"/>
+        <location filename="../core/qthelper.cpp" line="1275"/>
+        <source>m</source>
+        <translation>m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="59"/>
-        <source>Remove this point</source>
-        <translation>Remove this point</translation>
+        <location filename="../core/qthelper.cpp" line="768"/>
+        <location filename="../core/qthelper.cpp" line="1274"/>
+        <source>ft</source>
+        <translation>ft</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="32"/>
-        <source>Average</source>
-        <translation>Average</translation>
+        <location filename="../core/qthelper.cpp" line="794"/>
+        <source>C</source>
+        <translation>C</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="35"/>
-        <source>Minimum</source>
-        <translation>Minimum</translation>
+        <location filename="../core/qthelper.cpp" line="796"/>
+        <source>F</source>
+        <translation>F</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="38"/>
-        <source>Maximum</source>
-        <translation>Maximum</translation>
+        <location filename="../core/qthelper.cpp" line="821"/>
+        <location filename="../core/qthelper.cpp" line="1250"/>
+        <source>kg</source>
+        <translation>kg</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/globe.cpp" line="327"/>
-        <source>Move the map and double-click to set the dive location</source>
-        <translation>Move the map and double-click to set the dive location</translation>
+        <location filename="../core/qthelper.cpp" line="823"/>
+        <location filename="../core/qthelper.cpp" line="1251"/>
+        <source>lbs</source>
+        <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="28"/>
-        <source>unknown</source>
-        <translation>unknown</translation>
+        <location filename="../core/qthelper.cpp" line="848"/>
+        <location filename="../core/qthelper.cpp" line="1300"/>
+        <source>bar</source>
+        <translation>bar</translation>
     </message>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="105"/>
-        <source>h:</source>
-        <translation>h:</translation>
+        <location filename="../core/qthelper.cpp" line="850"/>
+        <location filename="../core/qthelper.cpp" line="1299"/>
+        <source>psi</source>
+        <translation>psi</translation>
     </message>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="105"/>
-        <source>min</source>
-        <translation>min</translation>
+        <location filename="../core/qthelper.cpp" line="871"/>
+        <location filename="../core/qthelper.cpp" line="1235"/>
+        <source>AIR</source>
+        <translation>AIR</translation>
     </message>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="337"/>
-        <source>Multiple</source>
-        <translation>Multiple</translation>
+        <location filename="../core/qthelper.cpp" line="873"/>
+        <source>EAN</source>
+        <translation>EAN</translation>
     </message>
     <message numerus="yes">
-        <location filename="../core/qthelper.cpp" line="957"/>
+        <location filename="../core/qthelper.cpp" line="962"/>
         <source>(%n dive(s))</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="816"/>
-        <location filename="../core/qthelper.cpp" line="1228"/>
-        <source>kg</source>
-        <translation>kg</translation>
+        <location filename="../core/qthelper.cpp" line="1235"/>
+        <source>OXYGEN</source>
+        <translation>OXYGEN</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="818"/>
-        <location filename="../core/qthelper.cpp" line="1229"/>
-        <source>lbs</source>
-        <translation>lbs</translation>
+        <location filename="../core/qthelper.cpp" line="1322"/>
+        <source>l</source>
+        <translation>l</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="763"/>
-        <location filename="../core/qthelper.cpp" line="1252"/>
-        <source>ft</source>
-        <translation>ft</translation>
+        <location filename="../core/qthelper.cpp" line="1323"/>
+        <source>cuft</source>
+        <translation>cuft</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="761"/>
-        <location filename="../core/qthelper.cpp" line="1253"/>
-        <source>m</source>
-        <translation>m</translation>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="29"/>
+        <source>unknown</source>
+        <translation>unknown</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="789"/>
-        <source>C</source>
-        <translation>C</translation>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="114"/>
+        <source>h:</source>
+        <translation>h:</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="791"/>
-        <source>F</source>
-        <translation>F</translation>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="114"/>
+        <source>min</source>
+        <translation>min</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="845"/>
-        <location filename="../core/qthelper.cpp" line="1275"/>
-        <source>psi</source>
-        <translation>psi</translation>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="63"/>
+        <source>Remove this point</source>
+        <translation>Remove this point</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="843"/>
-        <location filename="../core/qthelper.cpp" line="1276"/>
-        <source>bar</source>
-        <translation>bar</translation>
+        <location filename="../desktop-widgets/globe.cpp" line="327"/>
+        <source>Move the map and double-click to set the dive location</source>
+        <translation>Move the map and double-click to set the dive location</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="868"/>
-        <source>EAN</source>
-        <translation>EAN</translation>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="32"/>
+        <source>Average</source>
+        <translation>Average</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="1298"/>
-        <source>l</source>
-        <translation>l</translation>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="35"/>
+        <source>Minimum</source>
+        <translation>Minimum</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="1299"/>
-        <source>cuft</source>
-        <translation>cuft</translation>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="38"/>
+        <source>Maximum</source>
+        <translation>Maximum</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="625"/>
@@ -7153,17 +7299,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <source>Malformed XML response. Line %1: %2</source>
         <translation>Malformed XML response. Line %1: %2</translation>
     </message>
-    <message>
-        <location filename="../core/gpslocation.h" line="13"/>
-        <source>Waiting to aquire GPS location</source>
-        <translation>Waiting to aquire GPS location</translation>
-    </message>
 </context>
 <context>
     <name>ReadSettingsThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1651"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1676"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1640"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1665"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>This feature is not yet available for the selected dive computer.</translation>
     </message>
@@ -7192,7 +7333,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ResetSettingsThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1775"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1764"/>
         <source>Reset settings failed!</source>
         <translation>Reset settings failed</translation>
     </message>
@@ -7230,6 +7371,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ShiftImageTimesDialog</name>
     <message>
+        <location filename="../desktop-widgets/shiftimagetimes.ui" line="23"/>
+        <location filename="../build/ui_shiftimagetimes.h" line="184"/>
+        <source>Shift selected image times</source>
+        <translation>Shift selected image times</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/shiftimagetimes.ui" line="34"/>
         <location filename="../build/ui_shiftimagetimes.h" line="185"/>
         <source>Shift times of image(s) by</source>
@@ -7242,12 +7389,6 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>h:mm</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/shiftimagetimes.ui" line="23"/>
-        <location filename="../build/ui_shiftimagetimes.h" line="184"/>
-        <source>Shift selected image times</source>
-        <translation>Shift selected image times</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/shiftimagetimes.ui" line="105"/>
         <location filename="../build/ui_shiftimagetimes.h" line="187"/>
         <source>Earlier</source>
@@ -7299,12 +7440,12 @@ Not all images have timestamps in the range between
         <translation>Which date and time are displayed on the image?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="297"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="296"/>
         <source>Open image file</source>
         <translation>Open image file</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="299"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="298"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -7462,54 +7603,54 @@ Not all images have timestamps in the range between
 <context>
     <name>SocialNetworkDialog</name>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="339"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="284"/>
         <source>Dive date: %1 
 </source>
         <translation>Dive date: %1 
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="342"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="287"/>
         <source>Duration: %1 
 </source>
         <translation>Duration: %1 
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="343"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="288"/>
         <source>h:</source>
         <comment>abbreviation for hours plus separator</comment>
         <translation>h:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="344"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="289"/>
         <source>min</source>
         <comment>abbreviation for minutes</comment>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="347"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="292"/>
         <source>Dive location: %1 
 </source>
         <translation>Dive location: %1 
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="350"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="295"/>
         <source>Buddy: %1 
 </source>
         <translation>Buddy: %1 
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="353"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="298"/>
         <source>Divemaster: %1 
 </source>
         <translation>Divemaster: %1 
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="356"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="301"/>
         <source>
 %1</source>
         <translation>
@@ -7595,12 +7736,21 @@ Not all images have timestamps in the range between
     <name>StartPage</name>
     <message>
         <location filename="../mobile-widgets/qml/StartPage.qml" line="19"/>
-        <source>To use Subsurface-mobile with Subsurface cloud storage, please enteryour cloud credentials.
-
-To use Subsurface-mobile only with local data on this device, tap on the no cloud icon below.</source>
-        <translation>To use Subsurface-mobile with Subsurface cloud storage, please enteryour cloud credentials.
+        <source>To use Subsurface-mobile with Subsurface cloud storage, please enter your cloud credentials.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/StartPage.qml" line="20"/>
+        <source>If this is the first time you use Subsurface cloud storage, enter a valid email (all lower case) and a password of your choice (letters and numbers). The server will send a PIN to the email address provided that you will have to enter here.
 
-To use Subsurface-mobile only with local data on this device, tap on the no cloud icon below.</translation>
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/StartPage.qml" line="23"/>
+        <source>To use Subsurface-mobile only with local data on this device, tap on the no cloud icon below.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -7638,7 +7788,12 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>SubsurfaceWebServices</name>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="419"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="395"/>
+        <source>Enter User ID and click Download</source>
+        <translation>Enter User ID and click download</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="417"/>
         <source>Webservice</source>
         <translation>Webservice</translation>
     </message>
@@ -7663,30 +7818,25 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
         <translation>Connection error: </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="557"/>
-        <source>Download successful</source>
-        <translation>Download successful</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="551"/>
         <source>Invalid user identifier!</source>
         <translation>Invalid user identifier.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="397"/>
-        <source>Enter User ID and click Download</source>
-        <translation>Enter User ID and click download</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="554"/>
         <source>Cannot parse response!</source>
         <translation>Cannot parse response.</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="557"/>
+        <source>Download successful</source>
+        <translation>Download successful</translation>
+    </message>
 </context>
 <context>
     <name>SuitFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="674"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="672"/>
         <source>Suits: </source>
         <translation>Suits: </translation>
     </message>
@@ -7694,7 +7844,7 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>SuitsFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="123"/>
+        <location filename="../qt-models/filtermodels.cpp" line="128"/>
         <source>No suit set</source>
         <translation>No suit set</translation>
     </message>
@@ -7713,7 +7863,7 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>TagFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="595"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="593"/>
         <source>Tags: </source>
         <translation>Tags: </translation>
     </message>
@@ -7721,7 +7871,7 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>TagFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="148"/>
+        <location filename="../qt-models/filtermodels.cpp" line="153"/>
         <source>Empty tags</source>
         <translation>Empty tags</translation>
     </message>
@@ -7747,6 +7897,11 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>TemplateEdit</name>
     <message>
+        <location filename="../desktop-widgets/templateedit.ui" line="14"/>
+        <source>Edit template</source>
+        <translation>Edit template</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/templateedit.ui" line="37"/>
         <source>Preview</source>
         <translation>Preview</translation>
@@ -7792,11 +7947,6 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
         <translation>Font size</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/templateedit.ui" line="14"/>
-        <source>Edit template</source>
-        <translation>Edit template</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/templateedit.ui" line="165"/>
         <source>Color palette</source>
         <translation>Color palette</translation>
@@ -7978,85 +8128,12 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>TextHyperlinkEventFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="817"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="815"/>
         <source>%1click to visit %2</source>
         <translation>%1click to visit %2</translation>
     </message>
 </context>
 <context>
-    <name>ThemeTest</name>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="29"/>
-        <source>Theme Information</source>
-        <translation>Theme Information</translation>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="33"/>
-        <source>Screen</source>
-        <translation>Screen</translation>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="42"/>
-        <source>Geometry (pixels):</source>
-        <translation>Geometry (pixels):</translation>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="49"/>
-        <source>Geometry (gridUnits):</source>
-        <translation>Geometry (gridUnits):</translation>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="56"/>
-        <source>Units.gridUnit:</source>
-        <translation>Units.gridUnit:</translation>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="63"/>
-        <source>Units.devicePixelRatio:</source>
-        <translation>Units.devicePixelRatio:</translation>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="70"/>
-        <source>Font Metrics</source>
-        <translation>Font Metrics</translation>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="76"/>
-        <source>FontMetrics pointSize:</source>
-        <translation>FontMetrics pointSize:</translation>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="83"/>
-        <source>FontMetrics pixelSize:</source>
-        <translation>FontMetrics pixelSize:</translation>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="90"/>
-        <source>FontMetrics devicePixelRatio:</source>
-        <translation>FontMetrics devicePixelRatio:</translation>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="97"/>
-        <source>Text item pixelSize:</source>
-        <translation>Text item pixelSize:</translation>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="104"/>
-        <source>Text item pointSize:</source>
-        <translation>Text item pointSize:</translation>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="111"/>
-        <source>Pixel density:</source>
-        <translation>Pixel density:</translation>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="118"/>
-        <source>Height of default font:</source>
-        <translation>Height of default font:</translation>
-    </message>
-</context>
-<context>
     <name>ToolTipItem</name>
     <message>
         <location filename="../profile-widget/divetooltipitem.cpp" line="136"/>
@@ -8067,102 +8144,107 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>TripItem</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="67"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="68"/>
         <source>(%1 shown)</source>
         <translation>(%1 shown)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="194"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
         <source>#</source>
         <translation>No.</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="197"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="215"/>
         <source>Date</source>
         <translation>Date</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="200"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="218"/>
         <source>Rating</source>
         <translation>Rating</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
         <source>Depth(%1)</source>
         <translation>Depth(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="206"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="224"/>
         <source>Duration</source>
         <translation>Duration</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="209"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="227"/>
         <source>Temp(%1%2)</source>
         <translation>Temp(%1%2)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
         <source>Weight(%1)</source>
         <translation>Weight(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="215"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="233"/>
         <source>Suit</source>
         <translation>Suit</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="218"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="236"/>
         <source>Cyl</source>
         <translation>Cyl</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="239"/>
         <source>Gas</source>
         <translation>Gas</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="244"/>
         <source>SAC(%1)</source>
         <translation>SAC(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="244"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="229"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="247"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="232"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="250"/>
         <source>Max CNS</source>
         <translation>Max CNS</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="235"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="253"/>
+        <source>Photos before/during/after dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="256"/>
         <source>Location</source>
         <translation>Location</translation>
     </message>
@@ -8185,72 +8267,73 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>UpdateManager</name>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="69"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="61"/>
         <source>Check for updates.</source>
         <translation>Check for updates.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="70"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="62"/>
         <source>Subsurface was unable to check for updates.</source>
         <translation>Subsurface was unable to check for updates.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="75"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="67"/>
         <source>The following error occurred:</source>
         <translation>The following error occurred:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="76"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="68"/>
         <source>Please check your internet connection.</source>
         <translation>Please check your internet connection.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="86"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="78"/>
         <source>You are using the latest version of Subsurface.</source>
         <translation>You are using the latest version of Subsurface.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="89"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="81"/>
         <source>A new version of Subsurface is available.&lt;br/&gt;Click on:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; to download it.</source>
         <translation>A new version of Subsurface is available.&lt;br/&gt;Click on:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; to download it.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="95"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="87"/>
         <source>A new version of Subsurface is available.</source>
         <translation>A new version of Subsurface is available.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="96"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="88"/>
         <source>Latest version is %1, please check %2 our download page %3 for information in how to update.</source>
         <translation>Latest version is %1, please check %2 our download page %3 for information in how to update.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="106"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="98"/>
         <source>Newest release version is </source>
         <translation>Newest release version is </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="107"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="99"/>
         <source>The server returned the following information:</source>
         <translation>The server returned the following information:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="125"/>
-        <source>Subsurface is checking every two weeks if a new version is available. If you don&apos;t want Subsurface to continue checking, please click Decline.</source>
-        <translation>Subsurface is checking every two weeks if a new version is available. If you don&apos;t want Subsurface to continue checking, please click Decline.</translation>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="117"/>
+        <source>Subsurface is checking every two weeks if a new version is available. 
+ If you don&apos;t want Subsurface to continue checking, please click Decline.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="126"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="119"/>
         <source>Decline</source>
         <translation>Decline</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="127"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="120"/>
         <source>Accept</source>
         <translation>Accept</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="129"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="122"/>
         <source>Automatic check for updates</source>
         <translation>Automatic check for updates</translation>
     </message>
@@ -8272,24 +8355,6 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>UserSurvey</name>
     <message>
-        <location filename="../desktop-widgets/usersurvey.ui" line="44"/>
-        <location filename="../build/ui_usersurvey.h" line="151"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;We would love to learn more about our users, their preferences and their usage habits. Please spare a minute to fill out this form and submit it to the Subsurface team.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;We would love to learn more about our users, their preferences and their usage habits. Please spare a minute to fill out this form and submit it to the Subsurface team.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/usersurvey.ui" line="115"/>
-        <location filename="../build/ui_usersurvey.h" line="156"/>
-        <source>Other software/sources</source>
-        <translation>Other software/sources</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/usersurvey.ui" line="128"/>
-        <location filename="../build/ui_usersurvey.h" line="157"/>
-        <source>Manually entering dives</source>
-        <translation>Manually entering dives</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="14"/>
         <location filename="../build/ui_usersurvey.h" line="149"/>
         <source>User survey</source>
@@ -8302,6 +8367,12 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
         <translation>Subsurface user survey</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/usersurvey.ui" line="44"/>
+        <location filename="../build/ui_usersurvey.h" line="151"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;We would love to learn more about our users, their preferences and their usage habits. Please spare a minute to fill out this form and submit it to the Subsurface team.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;We would love to learn more about our users, their preferences and their usage habits. Please spare a minute to fill out this form and submit it to the Subsurface team.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="63"/>
         <location filename="../build/ui_usersurvey.h" line="152"/>
         <source>Technical diver</source>
@@ -8326,6 +8397,18 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
         <translation>Supported dive computer</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/usersurvey.ui" line="115"/>
+        <location filename="../build/ui_usersurvey.h" line="156"/>
+        <source>Other software/sources</source>
+        <translation>Other software/sources</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/usersurvey.ui" line="128"/>
+        <location filename="../build/ui_usersurvey.h" line="157"/>
+        <source>Manually entering dives</source>
+        <translation>Manually entering dives</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="141"/>
         <location filename="../build/ui_usersurvey.h" line="158"/>
         <source>Android/iPhone companion app</source>
@@ -8356,6 +8439,11 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
         <translation>Where are you importing data from?</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/usersurvey.cpp" line="18"/>
+        <source>Send</source>
+        <translation>Send</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/usersurvey.cpp" line="43"/>
         <source>
 Operating system: %1</source>
@@ -8399,19 +8487,14 @@ Language: %1</translation>
         <translation>Ask later</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/usersurvey.cpp" line="101"/>
-        <source>Submit user survey.</source>
-        <translation>Submit user survey.</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/usersurvey.cpp" line="82"/>
         <source>Ask again?</source>
         <translation>Ask again?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/usersurvey.cpp" line="18"/>
-        <source>Send</source>
-        <translation>Send</translation>
+        <location filename="../desktop-widgets/usersurvey.cpp" line="101"/>
+        <source>Submit user survey.</source>
+        <translation>Submit user survey.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/usersurvey.cpp" line="102"/>
@@ -8503,12 +8586,12 @@ Language: %1</translation>
         <translation>Upload</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="324"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="325"/>
         <source>Operation timed out</source>
         <translation>Operation timed out</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="345"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="346"/>
         <source>Transferring data...</source>
         <translation>Transferring data...</translation>
     </message>
@@ -8543,18 +8626,18 @@ Language: %1</translation>
 <context>
     <name>WriteSettingsThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1702"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1709"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1718"/>
-        <source>Failed!</source>
-        <translation>Failed!</translation>
-    </message>
-    <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1700"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1721"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1689"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1710"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>This feature is not yet available for the selected dive computer.</translation>
     </message>
+    <message>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1691"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1698"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1707"/>
+        <source>Failed!</source>
+        <translation>Failed!</translation>
+    </message>
 </context>
 <context>
     <name>YearlyStatisticsModel</name>
@@ -8679,7 +8762,7 @@ Maximum</translation>
 <context>
     <name>getextFromC</name>
     <message>
-        <location filename="../core/libdivecomputer.c" line="674"/>
+        <location filename="../core/libdivecomputer.c" line="737"/>
         <source>Error parsing the header</source>
         <translation>Error parsing the header</translation>
     </message>
@@ -8687,38 +8770,377 @@ Maximum</translation>
 <context>
     <name>gettextFromC</name>
     <message>
+        <location filename="../core/cochran.c" line="309"/>
+        <location filename="../core/cochran.c" line="315"/>
+        <location filename="../core/cochran.c" line="385"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>deco stop</source>
+        <translation>deco stop</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="336"/>
+        <location filename="../core/cochran.c" line="390"/>
+        <location filename="../core/file.c" line="777"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>ascent</source>
+        <translation>ascent</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="342"/>
+        <location filename="../core/file.c" line="755"/>
+        <source>battery</source>
+        <translation>battery</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="348"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
+        <source>OLF</source>
+        <translation>OLF</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="353"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
+        <source>maxdepth</source>
+        <translation>maxdepth</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="358"/>
+        <location filename="../core/cochran.c" line="404"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
+        <source>pO₂</source>
+        <translation>pO₂</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="365"/>
+        <location filename="../core/cochran.c" line="414"/>
+        <location filename="../core/cochran.c" line="421"/>
+        <location filename="../core/file.c" line="868"/>
+        <location filename="../core/libdivecomputer.c" line="225"/>
+        <location filename="../core/libdivecomputer.c" line="228"/>
+        <source>gaschange</source>
+        <translation>gas change</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="370"/>
+        <location filename="../core/cochran.c" line="409"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>rbt</source>
+        <translation>rbt</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="379"/>
+        <location filename="../core/cochran.c" line="426"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>ceiling</source>
+        <translation>ceiling</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="395"/>
+        <location filename="../core/libdivecomputer.c" line="224"/>
+        <source>transmitter</source>
+        <translation>transmitter</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="153"/>
+        <source>Error: the file does not appear to be a DATATRAK divelog</source>
+        <translation>Error: the file does not appear to be a DATATRAK divelog</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="286"/>
+        <source>clear</source>
+        <translation>clear</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="289"/>
+        <source>misty</source>
+        <translation>misty</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="292"/>
+        <source>fog</source>
+        <translation>fog</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="295"/>
+        <source>rain</source>
+        <translation>rain</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="298"/>
+        <source>storm</source>
+        <translation>storm</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="301"/>
+        <source>snow</source>
+        <translation>snow</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="321"/>
+        <source>No suit</source>
+        <translation>No suit</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="324"/>
+        <source>Shorty</source>
+        <translation>Shorty</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="327"/>
+        <source>Combi</source>
+        <translation>Combi</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="330"/>
+        <source>Wet suit</source>
+        <translation>Wet suit</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="333"/>
+        <source>Semidry suit</source>
+        <translation>Semi-dry suit</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="336"/>
+        <source>Dry suit</source>
+        <translation>Dry suit</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="396"/>
+        <source>no stop</source>
+        <translation>no stop</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="398"/>
+        <location filename="../core/dive.c" line="29"/>
+        <source>deco</source>
+        <translation>deco</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="400"/>
+        <source>single ascent</source>
+        <translation>single ascent</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="402"/>
+        <source>multiple ascent</source>
+        <translation>multiple ascent</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="404"/>
+        <location filename="../core/dive.c" line="27"/>
+        <source>fresh</source>
+        <translation>fresh</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="406"/>
+        <source>salt water</source>
+        <translation>salt water</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="431"/>
+        <source>sight seeing</source>
+        <translation>sight seeing</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="433"/>
+        <source>club dive</source>
+        <translation>club dive</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="435"/>
+        <location filename="../core/dive.c" line="28"/>
+        <source>instructor</source>
+        <translation>instructor</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="437"/>
+        <source>instruction</source>
+        <translation>instruction</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="439"/>
+        <location filename="../core/dive.c" line="27"/>
+        <source>night</source>
+        <translation>night</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="441"/>
+        <location filename="../core/dive.c" line="25"/>
+        <source>cave</source>
+        <translation>cave</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="443"/>
+        <location filename="../core/dive.c" line="24"/>
+        <source>ice</source>
+        <translation>ice</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="445"/>
+        <source>search</source>
+        <translation>search</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="455"/>
+        <location filename="../core/dive.c" line="25"/>
+        <source>wreck</source>
+        <translation>wreck</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="457"/>
+        <location filename="../core/dive.c" line="26"/>
+        <source>river</source>
+        <translation>river</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="459"/>
+        <location filename="../core/dive.c" line="23"/>
+        <source>drift</source>
+        <translation>drift</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="461"/>
+        <location filename="../core/dive.c" line="28"/>
+        <source>photo</source>
+        <translation>photo</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="463"/>
+        <source>other</source>
+        <translation>other</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="474"/>
+        <source>Other activities</source>
+        <translation>Other activities</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="498"/>
+        <source>Datatrak/Wlog notes</source>
+        <translation>Datatrak/Wlog notes</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="537"/>
+        <source>Manually entered dive</source>
+        <translation>Manually entered dive</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="588"/>
+        <source>Unknown</source>
+        <translation>Unknown</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="674"/>
+        <source>Error: couldn&apos;t open the file %s</source>
+        <translation>Error: couldn&apos;t open the file %s</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="687"/>
+        <source>Error: no dive</source>
+        <translation>Error: no dive</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="23"/>
+        <source>boat</source>
+        <translation>boat</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="23"/>
+        <source>shore</source>
+        <translation>shore</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="24"/>
+        <source>deep</source>
+        <translation>deep</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="24"/>
+        <source>cavern</source>
+        <translation>cavern</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="25"/>
+        <source>altitude</source>
+        <translation>altitude</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="26"/>
+        <source>pool</source>
+        <translation>pool</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="26"/>
+        <source>lake</source>
+        <translation>lake</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="27"/>
+        <source>student</source>
+        <translation>student</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="28"/>
+        <source>video</source>
+        <translation>video</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="33"/>
+        <source>OC-gas</source>
+        <translation>OC-gas</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="33"/>
+        <source>diluent</source>
+        <translation>diluent</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="33"/>
+        <location filename="../core/equipment.c" line="88"/>
+        <location filename="../core/planner.c" line="1436"/>
+        <location filename="../core/planner.c" line="1439"/>
+        <source>oxygen</source>
+        <translation>oxygen</translation>
+    </message>
+    <message>
         <location filename="../core/dive.c" line="181"/>
         <source>pascal</source>
         <translation>pascal</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="186"/>
-        <location filename="../core/qthelper.cpp" line="669"/>
+        <location filename="../core/qthelper.cpp" line="674"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="190"/>
-        <location filename="../core/qthelper.cpp" line="672"/>
+        <location filename="../core/qthelper.cpp" line="677"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
+        <location filename="../core/dive.c" line="227"/>
+        <source>ℓ</source>
+        <translation>ℓ</translation>
+    </message>
+    <message>
         <location filename="../core/dive.c" line="232"/>
         <source>cuft</source>
         <translation>cuft</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="269"/>
-        <location filename="../core/qthelper.cpp" line="590"/>
-        <location filename="../core/qthelper.cpp" line="605"/>
+        <location filename="../core/qthelper.cpp" line="595"/>
+        <location filename="../core/qthelper.cpp" line="610"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="274"/>
-        <location filename="../core/qthelper.cpp" line="593"/>
-        <location filename="../core/qthelper.cpp" line="607"/>
+        <location filename="../core/qthelper.cpp" line="598"/>
+        <location filename="../core/qthelper.cpp" line="612"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
@@ -8744,53 +9166,58 @@ Maximum</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="325"/>
-        <location filename="../core/qthelper.cpp" line="616"/>
-        <location filename="../core/qthelper.cpp" line="626"/>
+        <location filename="../core/qthelper.cpp" line="621"/>
+        <location filename="../core/qthelper.cpp" line="631"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="329"/>
-        <location filename="../core/qthelper.cpp" line="614"/>
-        <location filename="../core/qthelper.cpp" line="624"/>
+        <location filename="../core/qthelper.cpp" line="619"/>
+        <location filename="../core/qthelper.cpp" line="629"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="1772"/>
+        <location filename="../core/dive.c" line="1751"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) or (%s)</translation>
     </message>
     <message>
-        <location filename="../core/divelist.c" line="484"/>
+        <location filename="../core/divelist.c" line="487"/>
         <location filename="../core/equipment.c" line="84"/>
-        <location filename="../core/planner.c" line="1411"/>
-        <location filename="../core/planner.c" line="1414"/>
+        <location filename="../core/planner.c" line="1432"/>
+        <location filename="../core/planner.c" line="1435"/>
         <source>air</source>
         <translation>air</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="197"/>
+        <location filename="../core/equipment.c" line="86"/>
+        <source>EAN%d</source>
+        <translation>EAN%d</translation>
+    </message>
+    <message>
+        <location filename="../core/equipment.c" line="198"/>
         <source>integrated</source>
         <translation>integrated</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="198"/>
+        <location filename="../core/equipment.c" line="199"/>
         <source>belt</source>
         <translation>belt</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="199"/>
+        <location filename="../core/equipment.c" line="200"/>
         <source>ankle</source>
         <translation>ankle</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="200"/>
+        <location filename="../core/equipment.c" line="201"/>
         <source>backplate weight</source>
         <translation>backplate weight</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="201"/>
+        <location filename="../core/equipment.c" line="202"/>
         <source>clip-on</source>
         <translation>clip-on</translation>
     </message>
@@ -8803,8 +9230,8 @@ Maximum</translation>
         <location filename="../core/file.c" line="121"/>
         <location filename="../core/file.c" line="512"/>
         <location filename="../core/file.c" line="597"/>
-        <location filename="../core/file.c" line="924"/>
-        <location filename="../core/file.c" line="1056"/>
+        <location filename="../core/file.c" line="909"/>
+        <location filename="../core/file.c" line="1092"/>
         <location filename="../core/ostctools.c" line="80"/>
         <source>Failed to read &apos;%s&apos;</source>
         <translation>Failed to read &apos;%s&apos;</translation>
@@ -8862,486 +9289,496 @@ Maximum</translation>
         <translation>O₂ calibration</translation>
     </message>
     <message>
-        <location filename="../core/file.c" line="887"/>
-        <source>No matching DC found for file &apos;%s&apos;</source>
-        <translation>No matching DC found for file &apos;%s&apos;</translation>
+        <location filename="../core/git-access.c" line="134"/>
+        <source>Local cache directory %s corrupted - can&apos;t sync with Subsurface cloud storage</source>
+        <translation>Local cache directory %s corrupted - can&apos;t sync with Subsurface cloud storage</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>none</source>
-        <translation>none</translation>
+        <location filename="../core/git-access.c" line="157"/>
+        <location filename="../core/git-access.c" line="177"/>
+        <source>Could not update local cache to newer remote data</source>
+        <translation>Could not update local cache to newer remote data</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="309"/>
-        <location filename="../core/cochran.c" line="315"/>
-        <location filename="../core/cochran.c" line="385"/>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>deco stop</source>
-        <translation>deco stop</translation>
+        <location filename="../core/git-access.c" line="170"/>
+        <source>Subsurface cloud storage corrupted</source>
+        <translation>Subsurface cloud storage corrupted</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="342"/>
-        <location filename="../core/file.c" line="755"/>
-        <source>battery</source>
-        <translation>battery</translation>
+        <location filename="../core/git-access.c" line="284"/>
+        <source>Could not update Subsurface cloud storage, try again later</source>
+        <translation>Could not update Subsurface cloud storage, try again later</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="370"/>
-        <location filename="../core/cochran.c" line="409"/>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>rbt</source>
-        <translation>rbt</translation>
+        <location filename="../core/git-access.c" line="344"/>
+        <source>Remote storage and local data diverged. Error: merge failed (%s)</source>
+        <translation>Remote storage and local data diverged. Error: merge failed (%s)</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="336"/>
-        <location filename="../core/cochran.c" line="390"/>
-        <location filename="../core/file.c" line="777"/>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>ascent</source>
-        <translation>ascent</translation>
+        <location filename="../core/git-access.c" line="374"/>
+        <source>Remote storage and local data diverged. Cannot combine local and remote changes</source>
+        <translation>Remote storage and local data diverged. Cannot combine local and remote changes</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="379"/>
-        <location filename="../core/cochran.c" line="426"/>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>ceiling</source>
-        <translation>ceiling</translation>
+        <location filename="../core/git-access.c" line="408"/>
+        <source>Remote storage and local data diverged</source>
+        <translation>Remote storage and local data diverged</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>workload</source>
-        <translation>workload</translation>
+        <location filename="../core/git-access.c" line="411"/>
+        <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source>
+        <translation>Remote storage and local data diverged. Error: writing the data failed (%s)</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="395"/>
-        <location filename="../core/libdivecomputer.c" line="203"/>
-        <source>transmitter</source>
-        <translation>transmitter</translation>
+        <location filename="../core/git-access.c" line="420"/>
+        <source>Problems with local cache of Subsurface cloud data</source>
+        <translation>Problems with local cache of Subsurface cloud data</translation>
+    </message>
+    <message>
+        <location filename="../core/git-access.c" line="421"/>
+        <source>Moved cache data to %s. Please try the operation again.</source>
+        <translation>Moved cache data to %s. Please try the operation again.</translation>
+    </message>
+    <message>
+        <location filename="../core/git-access.c" line="743"/>
+        <source>Error connecting to Subsurface cloud storage</source>
+        <translation>Error connecting to Subsurface cloud storage</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="203"/>
+        <location filename="../core/git-access.c" line="746"/>
+        <source>git clone of %s failed (%s)</source>
+        <translation>git clone of %s failed (%s)</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="210"/>
+        <location filename="../core/parse-xml.c" line="3317"/>
+        <location filename="../core/uemis-downloader.c" line="134"/>
+        <source>unknown</source>
+        <translation>unknown</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>none</source>
+        <translation>none</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>workload</source>
+        <translation>workload</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="224"/>
         <source>violation</source>
         <translation>violation</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="203"/>
+        <location filename="../core/libdivecomputer.c" line="224"/>
         <source>bookmark</source>
         <translation>bookmark</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="203"/>
+        <location filename="../core/libdivecomputer.c" line="224"/>
         <source>surface</source>
         <translation>surface</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="203"/>
+        <location filename="../core/libdivecomputer.c" line="224"/>
         <source>safety stop</source>
         <translation>safety stop</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="365"/>
-        <location filename="../core/cochran.c" line="414"/>
-        <location filename="../core/cochran.c" line="421"/>
-        <location filename="../core/file.c" line="868"/>
-        <location filename="../core/libdivecomputer.c" line="204"/>
-        <location filename="../core/libdivecomputer.c" line="207"/>
-        <source>gaschange</source>
-        <translation>gas change</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="204"/>
+        <location filename="../core/libdivecomputer.c" line="225"/>
         <source>safety stop (voluntary)</source>
         <translation>safety stop (recommended)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="204"/>
+        <location filename="../core/libdivecomputer.c" line="225"/>
         <source>safety stop (mandatory)</source>
         <translation>safety stop (mandatory)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="205"/>
+        <location filename="../core/libdivecomputer.c" line="226"/>
         <source>deepstop</source>
         <translation>deep stop</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="205"/>
+        <location filename="../core/libdivecomputer.c" line="226"/>
         <source>ceiling (safety stop)</source>
         <translation>ceiling (safety stop)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="205"/>
-        <source>divetime</source>
-        <translation>divetime</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="205"/>
+        <location filename="../core/libdivecomputer.c" line="226"/>
         <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="../core/cochran.c" line="353"/>
-        <location filename="../core/libdivecomputer.c" line="206"/>
-        <source>maxdepth</source>
-        <translation>maxdepth</translation>
-    </message>
-    <message>
-        <location filename="../core/cochran.c" line="348"/>
-        <location filename="../core/libdivecomputer.c" line="206"/>
-        <source>OLF</source>
-        <translation>OLF</translation>
+        <location filename="../core/libdivecomputer.c" line="226"/>
+        <source>divetime</source>
+        <translation>divetime</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="206"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
         <source>airtime</source>
         <translation>airtime</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="206"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
         <source>rgbm</source>
         <translation>rgbm</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="206"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
         <source>heading</source>
         <translation>heading</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="358"/>
-        <location filename="../core/cochran.c" line="404"/>
-        <location filename="../core/libdivecomputer.c" line="206"/>
-        <source>pO₂</source>
-        <translation>pO₂</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="207"/>
+        <location filename="../core/libdivecomputer.c" line="228"/>
         <source>tissue level warning</source>
         <translation>tissue level warning</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="207"/>
+        <location filename="../core/libdivecomputer.c" line="228"/>
         <source>non stop time</source>
         <translation>no-stop time</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="224"/>
+        <location filename="../core/libdivecomputer.c" line="237"/>
         <source>invalid event number</source>
         <translation>invalid event number</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="658"/>
-        <source>Unable to create parser for %s %s</source>
-        <translation>Unable to create parser for %s %s</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="664"/>
-        <source>Error registering the data</source>
-        <translation>Error registering data</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="495"/>
+        <location filename="../core/libdivecomputer.c" line="553"/>
         <source>Error parsing the datetime</source>
         <translation>Error parsing the date/time</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="513"/>
+        <location filename="../core/libdivecomputer.c" line="571"/>
         <source>Dive %d: %s</source>
         <translation>Dive %d: %s</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="519"/>
+        <location filename="../core/libdivecomputer.c" line="577"/>
         <source>Error parsing the divetime</source>
         <translation>Error parsing the divetime</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="529"/>
+        <location filename="../core/libdivecomputer.c" line="587"/>
         <source>Error parsing the maxdepth</source>
         <translation>Error parsing the maxdepth</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="548"/>
+        <location filename="../core/libdivecomputer.c" line="606"/>
         <source>Error parsing temperature</source>
         <translation>Error parsing temperature</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="568"/>
+        <location filename="../core/libdivecomputer.c" line="626"/>
         <source>Error parsing the gas mix count</source>
         <translation>Error parsing the gas mix count</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="580"/>
+        <location filename="../core/libdivecomputer.c" line="638"/>
         <source>Error obtaining water salinity</source>
         <translation>Error obtaining water salinity</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="589"/>
+        <location filename="../core/libdivecomputer.c" line="647"/>
         <source>Error obtaining surface pressure</source>
         <translation>Error obtaining surface pressure</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="614"/>
+        <location filename="../core/libdivecomputer.c" line="672"/>
         <source>Error obtaining divemode</source>
         <translation>Error obtaining divemode</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="634"/>
+        <location filename="../core/libdivecomputer.c" line="692"/>
         <source>Error parsing the gas mix</source>
         <translation>Error parsing the gas mix</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="684"/>
+        <location filename="../core/libdivecomputer.c" line="717"/>
+        <source>Unable to create parser for %s %s</source>
+        <translation>Unable to create parser for %s %s</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="723"/>
+        <source>Error registering the data</source>
+        <translation>Error registering data</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="744"/>
         <source>Error parsing the samples</source>
         <translation>Error parsing the samples</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="822"/>
+        <location filename="../core/libdivecomputer.c" line="882"/>
         <source>Event: waiting for user action</source>
         <translation>Event: waiting for user action</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="830"/>
+        <location filename="../core/libdivecomputer.c" line="890"/>
         <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="../core/libdivecomputer.c" line="894"/>
+        <location filename="../core/libdivecomputer.c" line="954"/>
         <source>Error registering the event handler.</source>
         <translation>Error registering the event handler.</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="899"/>
+        <location filename="../core/libdivecomputer.c" line="959"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Error registering the cancellation handler.</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="920"/>
+        <location filename="../core/libdivecomputer.c" line="980"/>
         <source>Dive data import error</source>
         <translation>Dive data import error</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="959"/>
+        <location filename="../core/libdivecomputer.c" line="1019"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Unable to create libdivecomputer context</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="966"/>
+        <location filename="../core/libdivecomputer.c" line="1026"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Unable to open %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="992"/>
+        <location filename="../core/libdivecomputer.c" line="1048"/>
         <source>Insufficient privileges to open the device %s %s (%s)</source>
         <translation>Insufficient privileges to open the device %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../core/parse-xml.c" line="517"/>
-        <source>Strange percentage reading %s
+        <location filename="../core/load-git.c" line="194"/>
+        <location filename="../core/parse-xml.c" line="1242"/>
+        <source>multiple GPS locations for this dive site; also %s
 </source>
-        <translation>Strange percentage reading %s
+        <translation>multiple GPS locations for this dive site; also %s
 </translation>
     </message>
     <message>
-        <location filename="../core/load-git.c" line="194"/>
-        <location filename="../core/parse-xml.c" line="1238"/>
-        <source>multiple GPS locations for this dive site; also %s
+        <location filename="../core/load-git.c" line="222"/>
+        <location filename="../core/parse-xml.c" line="1304"/>
+        <source>additional name for site: %s
 </source>
-        <translation>multiple GPS locations for this dive site; also %s
+        <translation>additional name for site: %s
+</translation>
+    </message>
+    <message>
+        <location filename="../core/ostctools.c" line="120"/>
+        <location filename="../core/ostctools.c" line="152"/>
+        <source>Unknown DC in dive %d</source>
+        <translation>Unknown DC in dive %d</translation>
+    </message>
+    <message>
+        <location filename="../core/ostctools.c" line="165"/>
+        <source>Error - %s - parsing dive %d</source>
+        <translation>Error - %s - parsing dive %d</translation>
+    </message>
+    <message>
+        <location filename="../core/parse-xml.c" line="517"/>
+        <source>Strange percentage reading %s
+</source>
+        <translation>Strange percentage reading %s
 </translation>
     </message>
     <message>
-        <location filename="../core/parse-xml.c" line="2044"/>
+        <location filename="../core/parse-xml.c" line="2051"/>
         <source>Failed to parse &apos;%s&apos;</source>
         <translation>Failed to parse &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../core/parse-xml.c" line="3741"/>
+        <location filename="../core/parse-xml.c" line="3774"/>
         <source>Can&apos;t open stylesheet %s</source>
         <translation>Can&apos;t open stylesheet %s</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="86"/>
-        <source>EAN%d</source>
-        <translation>EAN%d</translation>
+        <location filename="../core/planner.c" line="555"/>
+        <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE %s ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source>
+        <translation>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE %s ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="1032"/>
-        <location filename="../core/planner.c" line="1184"/>
-        <source>Can&apos;t find gas %s</source>
-        <translation>Can&apos;t find gas %s</translation>
+        <location filename="../core/planner.c" line="569"/>
+        <source>Decompression calculation aborted due to excessive time</source>
+        <translation>Decompression calculation aborted due to excessive time</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="368"/>
-        <source>Too many gas mixes</source>
-        <translation>Too many gas mixes</translation>
+        <location filename="../core/planner.c" line="571"/>
+        <location filename="../core/planner.c" line="829"/>
+        <location filename="../core/planner.c" line="834"/>
+        <location filename="../core/planner.c" line="860"/>
+        <location filename="../core/planner.c" line="870"/>
+        <source>Warning:</source>
+        <translation>Warning:</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="568"/>
-        <source>Decompression calculation aborted due to excessive time</source>
-        <translation>Decompression calculation aborted due to excessive time</translation>
+        <location filename="../core/planner.c" line="581"/>
+        <source>based on Bühlmann ZHL-16C with GFlow = %d and GFhigh = %d</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="592"/>
+        <location filename="../core/planner.c" line="586"/>
+        <source>based on VPM-B at nominal conservatism</source>
+        <translation>based on VPM-B at nominal conservatism</translation>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="588"/>
+        <source>based on VPM-B at +%d conservatism</source>
+        <translation>based on VPM-B at +%d conservatism</translation>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="590"/>
+        <source>, effective GF=%d/%d</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="594"/>
+        <source>recreational mode based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source>
+        <translation>recreational mode based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</translation>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="598"/>
         <source>Subsurface dive plan</source>
         <translation>Subsurface dive plan</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="596"/>
-        <source>depth</source>
-        <translation>depth</translation>
+        <location filename="../core/planner.c" line="599"/>
+        <source>&lt;div&gt;Runtime: %dmin&lt;/div&gt;&lt;br&gt;</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="602"/>
-        <source>runtime</source>
-        <translation>runtime</translation>
+        <location filename="../core/planner.c" line="604"/>
+        <source>depth</source>
+        <translation>depth</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="599"/>
+        <location filename="../core/planner.c" line="607"/>
         <source>duration</source>
         <translation>duration</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="554"/>
-        <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE %s ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source>
-        <translation>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE %s ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</translation>
+        <location filename="../core/planner.c" line="610"/>
+        <source>runtime</source>
+        <translation>runtime</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="605"/>
+        <location filename="../core/planner.c" line="613"/>
         <source>gas</source>
         <translation>gas</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="648"/>
+        <location filename="../core/planner.c" line="656"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="656"/>
+        <location filename="../core/planner.c" line="664"/>
         <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="../core/planner.c" line="669"/>
+        <location filename="../core/planner.c" line="677"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="676"/>
+        <location filename="../core/planner.c" line="684"/>
         <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="../core/planner.c" line="721"/>
+        <location filename="../core/planner.c" line="729"/>
         <source>%3.0f%s</source>
         <translation>%3.0f%s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="724"/>
-        <location filename="../core/planner.c" line="728"/>
+        <location filename="../core/planner.c" line="732"/>
+        <location filename="../core/planner.c" line="736"/>
         <source>%3dmin</source>
         <translation>%3dmin</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="737"/>
-        <location filename="../core/planner.c" line="749"/>
+        <location filename="../core/planner.c" line="745"/>
+        <location filename="../core/planner.c" line="757"/>
         <source>(SP = %.1fbar)</source>
         <translation>(SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="772"/>
+        <location filename="../core/planner.c" line="780"/>
         <source>Switch gas to %s (SP = %.1fbar)</source>
         <translation>Switch gas to %s (SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="774"/>
+        <location filename="../core/planner.c" line="782"/>
         <source>Switch gas to %s</source>
         <translation>Switch gas to %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="793"/>
+        <location filename="../core/planner.c" line="801"/>
         <source>CNS</source>
         <translation>CNS</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="795"/>
+        <location filename="../core/planner.c" line="803"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="799"/>
+        <location filename="../core/planner.c" line="807"/>
         <source>Gas consumption (CCR legs excluded):</source>
         <translation>Gas consumption (CCR legs excluded):</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="801"/>
+        <location filename="../core/planner.c" line="809"/>
         <source>Gas consumption:</source>
         <translation>Gas consumption:</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="570"/>
-        <location filename="../core/planner.c" line="821"/>
-        <location filename="../core/planner.c" line="826"/>
-        <location filename="../core/planner.c" line="851"/>
-        <location filename="../core/planner.c" line="861"/>
-        <source>Warning:</source>
-        <translation>Warning:</translation>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="580"/>
-        <source>based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source>
-        <translation>based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</translation>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="584"/>
-        <source>based on VPM-B at nominal conservatism</source>
-        <translation>based on VPM-B at nominal conservatism</translation>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="586"/>
-        <source>based on VPM-B at +%d conservatism</source>
-        <translation>based on VPM-B at +%d conservatism</translation>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="588"/>
-        <source>recreational mode based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source>
-        <translation>recreational mode based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</translation>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="822"/>
+        <location filename="../core/planner.c" line="830"/>
         <source>this is more gas than available in the specified cylinder!</source>
         <translation>this is more gas than available in the specified cylinder!</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="827"/>
+        <location filename="../core/planner.c" line="835"/>
         <source>not enough reserve for gas sharing on ascent!</source>
         <translation>not enough reserve for gas sharing on ascent!</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="829"/>
+        <location filename="../core/planner.c" line="837"/>
         <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source>
         <translation>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="831"/>
+        <location filename="../core/planner.c" line="839"/>
         <source>%.0f%s (%.0f%s during planned ascent) of %s</source>
         <translation>%.0f%s (%.0f%s during planned ascent) of %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="848"/>
+        <location filename="../core/planner.c" line="857"/>
         <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
         <translation>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="858"/>
+        <location filename="../core/planner.c" line="867"/>
         <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
         <translation>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="1419"/>
+        <location filename="../core/planner.c" line="1194"/>
+        <source>Can&apos;t find gas %s</source>
+        <translation>Can&apos;t find gas %s</translation>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="1440"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1280"/>
+        <location filename="../core/profile.c" line="1298"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
@@ -9350,70 +9787,70 @@ D: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1283"/>
+        <location filename="../core/profile.c" line="1301"/>
         <source>P: %d%s
 </source>
         <translation>P: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1287"/>
+        <location filename="../core/profile.c" line="1305"/>
         <source>T: %.1f%s
 </source>
         <translation>T: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1293"/>
+        <location filename="../core/profile.c" line="1311"/>
         <source>V: %.1f%s
 </source>
         <translation>V: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1296"/>
+        <location filename="../core/profile.c" line="1314"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation>SAC: %.*f%s/min
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1298"/>
+        <location filename="../core/profile.c" line="1316"/>
         <source>CNS: %u%%
 </source>
         <translation>CNS: %u%%
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1300"/>
+        <location filename="../core/profile.c" line="1318"/>
         <source>pO%s: %.2fbar
 </source>
         <translation>pO%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1302"/>
+        <location filename="../core/profile.c" line="1320"/>
         <source>pN%s: %.2fbar
 </source>
         <translation>pN%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1304"/>
+        <location filename="../core/profile.c" line="1322"/>
         <source>pHe: %.2fbar
 </source>
         <translation>pHe: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1307"/>
+        <location filename="../core/profile.c" line="1325"/>
         <source>MOD: %d%s
 </source>
         <translation>MOD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1314"/>
+        <location filename="../core/profile.c" line="1332"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
@@ -9422,7 +9859,7 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1318"/>
+        <location filename="../core/profile.c" line="1336"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
@@ -9431,174 +9868,179 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1331"/>
+        <location filename="../core/profile.c" line="1349"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation>Safety Stop: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1334"/>
+        <location filename="../core/profile.c" line="1352"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation>Safety Stop: unkn time @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1339"/>
+        <location filename="../core/profile.c" line="1357"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation>Deco: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1342"/>
+        <location filename="../core/profile.c" line="1360"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation>Deco: unkn time @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1346"/>
+        <location filename="../core/profile.c" line="1364"/>
         <source>In deco
 </source>
         <translation>In deco
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1348"/>
+        <location filename="../core/profile.c" line="1366"/>
         <source>NDL: %umin
 </source>
         <translation>NDL: %umin
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1351"/>
+        <location filename="../core/profile.c" line="1369"/>
         <source>TTS: %umin
 </source>
         <translation>TTS: %umin
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1354"/>
+        <location filename="../core/profile.c" line="1372"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation>Deco: %umin @ %.0f%s (calc)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1362"/>
+        <location filename="../core/profile.c" line="1380"/>
         <source>In deco (calc)
 </source>
         <translation>In deco (calc)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1365"/>
+        <location filename="../core/profile.c" line="1383"/>
         <source>NDL: %umin (calc)
 </source>
         <translation>NDL: %umin (calc)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1367"/>
+        <location filename="../core/profile.c" line="1385"/>
         <source>NDL: &gt;2h (calc)
 </source>
         <translation>NDL: &gt;2h (calc)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1371"/>
+        <location filename="../core/profile.c" line="1389"/>
         <source>TTS: %umin (calc)
 </source>
         <translation>TTS: %umin (calc)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1373"/>
+        <location filename="../core/profile.c" line="1391"/>
         <source>TTS: &gt;2h (calc)
 </source>
         <translation>TTS: &gt;2h (calc)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1376"/>
+        <location filename="../core/profile.c" line="1394"/>
         <source>RBT: %umin
 </source>
         <translation>RBT: %umin
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1379"/>
+        <location filename="../core/profile.c" line="1397"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation>Calculated ceiling %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1385"/>
+        <location filename="../core/profile.c" line="1403"/>
         <source>Tissue %.0fmin: %.1f%s
 </source>
         <translation>Tissue %.0fmin: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1391"/>
+        <location filename="../core/profile.c" line="1409"/>
         <source>heartbeat: %d
 </source>
         <translation>heartbeat: %d
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1393"/>
+        <location filename="../core/profile.c" line="1411"/>
         <source>bearing: %d
 </source>
         <translation>bearing: %d
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1396"/>
+        <location filename="../core/profile.c" line="1414"/>
         <source>mean depth to here %.1f%s
 </source>
         <translation>mean depth to here %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1491"/>
+        <location filename="../core/profile.c" line="1515"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1495"/>
-        <location filename="../core/profile.c" line="1499"/>
-        <location filename="../core/profile.c" line="1503"/>
+        <location filename="../core/profile.c" line="1519"/>
+        <location filename="../core/profile.c" line="1523"/>
+        <location filename="../core/profile.c" line="1527"/>
         <source>%s %sD:%.1f%s</source>
         <translation>%s %sD:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1507"/>
+        <location filename="../core/profile.c" line="1531"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sD:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1511"/>
+        <location filename="../core/profile.c" line="1535"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1515"/>
-        <location filename="../core/profile.c" line="1519"/>
+        <location filename="../core/profile.c" line="1539"/>
+        <location filename="../core/profile.c" line="1543"/>
         <source>%s %sV:%.2f%s</source>
         <translation>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1526"/>
+        <location filename="../core/profile.c" line="1550"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s</translation>
     </message>
     <message>
+        <location filename="../core/profile.c" line="1575"/>
+        <source>%s SAC:%.*f %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../core/qthelper.cpp" line="67"/>
         <source>%1km</source>
         <translation>%1km</translation>
@@ -9619,446 +10061,460 @@ EADD: %d%s
         <translation>%1yd</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="635"/>
+        <location filename="../core/qthelper.cpp" line="91"/>
+        <location filename="../core/qthelper.cpp" line="226"/>
+        <source>N</source>
+        <translation>N</translation>
+    </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="91"/>
+        <location filename="../core/qthelper.cpp" line="227"/>
+        <source>S</source>
+        <translation>S</translation>
+    </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="92"/>
+        <location filename="../core/qthelper.cpp" line="228"/>
+        <source>E</source>
+        <translation>E</translation>
+    </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="92"/>
+        <location filename="../core/qthelper.cpp" line="229"/>
+        <source>W</source>
+        <translation>W</translation>
+    </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="640"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="638"/>
+        <location filename="../core/qthelper.cpp" line="643"/>
         <source>F</source>
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="23"/>
-        <source>boat</source>
-        <translation>boat</translation>
+        <location filename="../core/save-html.c" line="469"/>
+        <location filename="../core/save-html.c" line="553"/>
+        <location filename="../core/worldmap-save.c" line="111"/>
+        <source>Can&apos;t open file %s</source>
+        <translation>Can&apos;t open file %s</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="23"/>
-        <source>shore</source>
-        <translation>shore</translation>
+        <location filename="../core/save-html.c" line="488"/>
+        <source>Number</source>
+        <translation>Number</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="459"/>
-        <location filename="../core/dive.c" line="23"/>
-        <source>drift</source>
-        <translation>drift</translation>
+        <location filename="../core/save-html.c" line="489"/>
+        <source>Date</source>
+        <translation>Date</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="24"/>
-        <source>deep</source>
-        <translation>deep</translation>
+        <location filename="../core/save-html.c" line="490"/>
+        <source>Time</source>
+        <translation>Time</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="24"/>
-        <source>cavern</source>
-        <translation>cavern</translation>
+        <location filename="../core/save-html.c" line="491"/>
+        <source>Location</source>
+        <translation>Location</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="443"/>
-        <location filename="../core/dive.c" line="24"/>
-        <source>ice</source>
-        <translation>ice</translation>
+        <location filename="../core/save-html.c" line="492"/>
+        <source>Air temp.</source>
+        <translation>Air temp.</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="445"/>
-        <source>search</source>
-        <translation>search</translation>
+        <location filename="../core/save-html.c" line="493"/>
+        <source>Water temp.</source>
+        <translation>Water temp.</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="455"/>
-        <location filename="../core/dive.c" line="25"/>
-        <source>wreck</source>
-        <translation>wreck</translation>
+        <location filename="../core/save-html.c" line="494"/>
+        <source>Dives</source>
+        <translation>Dives</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="441"/>
-        <location filename="../core/dive.c" line="25"/>
-        <source>cave</source>
-        <translation>cave</translation>
+        <location filename="../core/save-html.c" line="495"/>
+        <source>Expand all</source>
+        <translation>Expand all</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="25"/>
-        <source>altitude</source>
-        <translation>altitude</translation>
+        <location filename="../core/save-html.c" line="496"/>
+        <source>Collapse all</source>
+        <translation>Collapse all</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="26"/>
-        <source>pool</source>
-        <translation>pool</translation>
+        <location filename="../core/save-html.c" line="497"/>
+        <source>Trips</source>
+        <translation>Trips</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="26"/>
-        <source>lake</source>
-        <translation>lake</translation>
+        <location filename="../core/save-html.c" line="498"/>
+        <source>Statistics</source>
+        <translation>Statistics</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="457"/>
-        <location filename="../core/dive.c" line="26"/>
-        <source>river</source>
-        <translation>river</translation>
+        <location filename="../core/save-html.c" line="499"/>
+        <source>Advanced search</source>
+        <translation>Advanced search</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="439"/>
-        <location filename="../core/dive.c" line="27"/>
-        <source>night</source>
-        <translation>night</translation>
+        <location filename="../core/save-html.c" line="502"/>
+        <source>Rating</source>
+        <translation>Rating</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="153"/>
-        <source>Error: the file does not appear to be a DATATRAK divelog</source>
-        <translation>Error: the file does not appear to be a DATATRAK divelog</translation>
+        <location filename="../core/save-html.c" line="503"/>
+        <source>Visibility</source>
+        <translation>Visibility</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="286"/>
-        <source>clear</source>
-        <translation>clear</translation>
+        <location filename="../core/save-html.c" line="504"/>
+        <source>Duration</source>
+        <translation>Duration</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="289"/>
-        <source>misty</source>
-        <translation>misty</translation>
+        <location filename="../core/save-html.c" line="505"/>
+        <source>Divemaster</source>
+        <translation>Divemaster</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="292"/>
-        <source>fog</source>
-        <translation>fog</translation>
+        <location filename="../core/save-html.c" line="506"/>
+        <source>Buddy</source>
+        <translation>Buddy</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="295"/>
-        <source>rain</source>
-        <translation>rain</translation>
+        <location filename="../core/save-html.c" line="507"/>
+        <source>Suit</source>
+        <translation>Suit</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="298"/>
-        <source>storm</source>
-        <translation>storm</translation>
+        <location filename="../core/save-html.c" line="508"/>
+        <source>Tags</source>
+        <translation>Tags</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="301"/>
-        <source>snow</source>
-        <translation>snow</translation>
+        <location filename="../core/save-html.c" line="509"/>
+        <location filename="../smtk-import/smartrak.c" line="251"/>
+        <location filename="../smtk-import/smartrak.c" line="321"/>
+        <source>Notes</source>
+        <translation>Notes</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="321"/>
-        <source>No suit</source>
-        <translation>No suit</translation>
+        <location filename="../core/save-html.c" line="510"/>
+        <source>Show more details</source>
+        <translation>Show more details</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="324"/>
-        <source>Shorty</source>
-        <translation>Shorty</translation>
+        <location filename="../core/save-html.c" line="513"/>
+        <source>Yearly statistics</source>
+        <translation>Yearly statistics</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="327"/>
-        <source>Combi</source>
-        <translation>Combi</translation>
+        <location filename="../core/save-html.c" line="514"/>
+        <source>Year</source>
+        <translation>Year</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="330"/>
-        <source>Wet suit</source>
-        <translation>Wet suit</translation>
+        <location filename="../core/save-html.c" line="515"/>
+        <source>Total time</source>
+        <translation>Total time</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="333"/>
-        <source>Semidry suit</source>
-        <translation>Semi-dry suit</translation>
+        <location filename="../core/save-html.c" line="516"/>
+        <source>Average time</source>
+        <translation>Average time</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="336"/>
-        <source>Dry suit</source>
-        <translation>Dry suit</translation>
+        <location filename="../core/save-html.c" line="517"/>
+        <source>Shortest time</source>
+        <translation>Shortest time</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="396"/>
-        <source>no stop</source>
-        <translation>no stop</translation>
+        <location filename="../core/save-html.c" line="518"/>
+        <source>Longest time</source>
+        <translation>Longest time</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="400"/>
-        <source>single ascent</source>
-        <translation>single ascent</translation>
+        <location filename="../core/save-html.c" line="519"/>
+        <source>Average depth</source>
+        <translation>Average depth</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="402"/>
-        <source>multiple ascent</source>
-        <translation>multiple ascent</translation>
+        <location filename="../core/save-html.c" line="520"/>
+        <source>Min. depth</source>
+        <translation>Min. depth</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="404"/>
-        <location filename="../core/dive.c" line="27"/>
-        <source>fresh</source>
-        <translation>fresh</translation>
+        <location filename="../core/save-html.c" line="521"/>
+        <source>Max. depth</source>
+        <translation>Max. depth</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="406"/>
-        <source>salt water</source>
-        <translation>salt water</translation>
+        <location filename="../core/save-html.c" line="522"/>
+        <source>Average SAC</source>
+        <translation>Average SAC</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="431"/>
-        <source>sight seeing</source>
-        <translation>sight seeing</translation>
+        <location filename="../core/save-html.c" line="523"/>
+        <source>Min. SAC</source>
+        <translation>Min. SAC</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="433"/>
-        <source>club dive</source>
-        <translation>club dive</translation>
+        <location filename="../core/save-html.c" line="524"/>
+        <source>Max. SAC</source>
+        <translation>Max. SAC</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="437"/>
-        <source>instruction</source>
-        <translation>instruction</translation>
+        <location filename="../core/save-html.c" line="525"/>
+        <source>Average temp.</source>
+        <translation>Average temp.</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="463"/>
-        <source>other</source>
-        <translation>other</translation>
+        <location filename="../core/save-html.c" line="526"/>
+        <source>Min. temp.</source>
+        <translation>Min. temp.</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="474"/>
-        <source>Other activities</source>
-        <translation>Other activities</translation>
+        <location filename="../core/save-html.c" line="527"/>
+        <source>Max. temp.</source>
+        <translation>Max. temp.</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="498"/>
-        <source>Datatrak/Wlog notes</source>
-        <translation>Datatrak/Wlog notes</translation>
+        <location filename="../core/save-html.c" line="528"/>
+        <source>Back to list</source>
+        <translation>Back to list</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="537"/>
-        <source>Manually entered dive</source>
-        <translation>Manually entered dive</translation>
+        <location filename="../core/save-html.c" line="531"/>
+        <source>Dive No.</source>
+        <translation>Dive No.</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="588"/>
-        <source>Unknown</source>
-        <translation>Unknown</translation>
+        <location filename="../core/save-html.c" line="532"/>
+        <source>Dive profile</source>
+        <translation>Dive profile</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="674"/>
-        <source>Error: couldn&apos;t open the file %s</source>
-        <translation>Error: couldn&apos;t open the file %s</translation>
+        <location filename="../core/save-html.c" line="533"/>
+        <source>Dive information</source>
+        <translation>Dive information</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="687"/>
-        <source>Error: no dive</source>
-        <translation>Error: no dive</translation>
+        <location filename="../core/save-html.c" line="534"/>
+        <source>Dive equipment</source>
+        <translation>Dive equipment</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="27"/>
-        <source>student</source>
-        <translation>student</translation>
+        <location filename="../core/save-html.c" line="535"/>
+        <location filename="../core/save-html.c" line="542"/>
+        <source>Type</source>
+        <translation>Type</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="461"/>
-        <location filename="../core/dive.c" line="28"/>
-        <source>photo</source>
-        <translation>photo</translation>
+        <location filename="../core/save-html.c" line="536"/>
+        <source>Size</source>
+        <translation>Size</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="28"/>
-        <source>video</source>
-        <translation>video</translation>
+        <location filename="../core/save-html.c" line="537"/>
+        <source>Work pressure</source>
+        <translation>Work pressure</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="435"/>
-        <location filename="../core/dive.c" line="28"/>
-        <source>instructor</source>
-        <translation>instructor</translation>
+        <location filename="../core/save-html.c" line="538"/>
+        <source>Start pressure</source>
+        <translation>Start pressure</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="398"/>
-        <location filename="../core/dive.c" line="29"/>
-        <source>deco</source>
-        <translation>deco</translation>
+        <location filename="../core/save-html.c" line="539"/>
+        <source>End pressure</source>
+        <translation>End pressure</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="33"/>
-        <source>OC-gas</source>
-        <translation>OC-gas</translation>
+        <location filename="../core/save-html.c" line="540"/>
+        <source>Gas</source>
+        <translation>Gas</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="33"/>
-        <source>diluent</source>
-        <translation>diluent</translation>
+        <location filename="../core/save-html.c" line="541"/>
+        <source>Weight</source>
+        <translation>Weight</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="33"/>
-        <location filename="../core/equipment.c" line="88"/>
-        <location filename="../core/planner.c" line="1415"/>
-        <location filename="../core/planner.c" line="1418"/>
-        <source>oxygen</source>
-        <translation>oxygen</translation>
+        <location filename="../core/save-html.c" line="543"/>
+        <source>Events</source>
+        <translation>Events</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="227"/>
-        <source>ℓ</source>
-        <translation>ℓ</translation>
+        <location filename="../core/save-html.c" line="544"/>
+        <source>Name</source>
+        <translation>Name</translation>
+    </message>
+    <message>
+        <location filename="../core/save-html.c" line="545"/>
+        <source>Value</source>
+        <translation>Value</translation>
+    </message>
+    <message>
+        <location filename="../core/save-html.c" line="546"/>
+        <source>Coordinates</source>
+        <translation>Coordinates</translation>
+    </message>
+    <message>
+        <location filename="../core/save-html.c" line="547"/>
+        <source>Dive status</source>
+        <translation>Dive status</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="239"/>
+        <location filename="../core/statistics.c" line="242"/>
         <source>more than %d days</source>
         <translation>more than %d days</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="246"/>
+        <location filename="../core/statistics.c" line="249"/>
         <source>%dd %dh %dmin</source>
         <translation>%dd %dh %dmin</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="249"/>
+        <location filename="../core/statistics.c" line="252"/>
         <source>%dmin %dsecs</source>
         <translation>%dmin %dsecs</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="251"/>
+        <location filename="../core/statistics.c" line="254"/>
         <source>%dh %dmin</source>
         <translation>%dh %dmin</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="263"/>
+        <location filename="../core/statistics.c" line="266"/>
         <source>for dives #</source>
         <translation>for dive No.s</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="269"/>
+        <location filename="../core/statistics.c" line="272"/>
         <source>for selected dives</source>
         <translation>for selected dives</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="304"/>
+        <location filename="../core/statistics.c" line="307"/>
         <source>for dive #%d</source>
         <translation>for dive No. %d</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="306"/>
+        <location filename="../core/statistics.c" line="309"/>
         <source>for selected dive</source>
         <translation>for selected dive</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="308"/>
+        <location filename="../core/statistics.c" line="311"/>
         <source>for all dives</source>
         <translation>for all dives</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="310"/>
+        <location filename="../core/statistics.c" line="313"/>
         <source>(no dives)</source>
         <translation>(no dives)</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Sun</source>
         <translation>Sun</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Mon</source>
         <translation>Mon</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Tue</source>
         <translation>Tue</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Wed</source>
         <translation>Wed</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Thu</source>
         <translation>Thu</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Fri</source>
         <translation>Fri</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Sat</source>
         <translation>Sat</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Jan</source>
         <translation>Jan</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Feb</source>
         <translation>Feb</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Mar</source>
         <translation>Mar</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Apr</source>
         <translation>Apr</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>May</source>
         <translation>May</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Jun</source>
         <translation>Jun</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Jul</source>
         <translation>Jul</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Aug</source>
         <translation>Aug</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Sep</source>
         <translation>Sep</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Oct</source>
         <translation>Oct</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Nov</source>
         <translation>Nov</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Dec</source>
         <translation>Dec</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="191"/>
-        <location filename="../core/parse-xml.c" line="3284"/>
-        <location filename="../core/uemis-downloader.c" line="134"/>
-        <source>unknown</source>
-        <translation>unknown</translation>
-    </message>
-    <message>
-        <location filename="../core/uemis-downloader.c" line="467"/>
-        <source>data</source>
-        <translation>data</translation>
-    </message>
-    <message>
-        <location filename="../core/uemis-downloader.c" line="447"/>
-        <source>%s %s</source>
-        <translation>%s %s</translation>
-    </message>
-    <message>
         <location filename="../core/uemis-downloader.c" line="27"/>
         <source>Uemis Zurich: the file system is almost full.
 Disconnect/reconnect the dive computer
@@ -10089,6 +10545,16 @@ Is the Uemis Zurich plugged in correctly?</translation>
         <translation>No dives to download.</translation>
     </message>
     <message>
+        <location filename="../core/uemis-downloader.c" line="447"/>
+        <source>%s %s</source>
+        <translation>%s %s</translation>
+    </message>
+    <message>
+        <location filename="../core/uemis-downloader.c" line="467"/>
+        <source>data</source>
+        <translation>data</translation>
+    </message>
+    <message>
         <location filename="../core/uemis-downloader.c" line="495"/>
         <source>divelog #</source>
         <translation>divelog #</translation>
@@ -10259,281 +10725,6 @@ Is the Uemis Zurich plugged in correctly?</translation>
         <translation>Low battery alert</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="469"/>
-        <location filename="../core/save-html.c" line="553"/>
-        <location filename="../core/worldmap-save.c" line="111"/>
-        <source>Can&apos;t open file %s</source>
-        <translation>Can&apos;t open file %s</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="488"/>
-        <source>Number</source>
-        <translation>Number</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="489"/>
-        <source>Date</source>
-        <translation>Date</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="490"/>
-        <source>Time</source>
-        <translation>Time</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="491"/>
-        <source>Location</source>
-        <translation>Location</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="492"/>
-        <source>Air temp.</source>
-        <translation>Air temp.</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="493"/>
-        <source>Water temp.</source>
-        <translation>Water temp.</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="498"/>
-        <source>Statistics</source>
-        <translation>Statistics</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="502"/>
-        <source>Rating</source>
-        <translation>Rating</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="503"/>
-        <source>Visibility</source>
-        <translation>Visibility</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="504"/>
-        <source>Duration</source>
-        <translation>Duration</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="494"/>
-        <source>Dives</source>
-        <translation>Dives</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="495"/>
-        <source>Expand all</source>
-        <translation>Expand all</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="496"/>
-        <source>Collapse all</source>
-        <translation>Collapse all</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="497"/>
-        <source>Trips</source>
-        <translation>Trips</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="499"/>
-        <source>Advanced search</source>
-        <translation>Advanced search</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="505"/>
-        <source>Divemaster</source>
-        <translation>Divemaster</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="506"/>
-        <source>Buddy</source>
-        <translation>Buddy</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="507"/>
-        <source>Suit</source>
-        <translation>Suit</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="508"/>
-        <source>Tags</source>
-        <translation>Tags</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="509"/>
-        <location filename="../smtk-import/smartrak.c" line="251"/>
-        <location filename="../smtk-import/smartrak.c" line="321"/>
-        <source>Notes</source>
-        <translation>Notes</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="510"/>
-        <source>Show more details</source>
-        <translation>Show more details</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="513"/>
-        <source>Yearly statistics</source>
-        <translation>Yearly statistics</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="514"/>
-        <source>Year</source>
-        <translation>Year</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="515"/>
-        <source>Total time</source>
-        <translation>Total time</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="516"/>
-        <source>Average time</source>
-        <translation>Average time</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="517"/>
-        <source>Shortest time</source>
-        <translation>Shortest time</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="518"/>
-        <source>Longest time</source>
-        <translation>Longest time</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="519"/>
-        <source>Average depth</source>
-        <translation>Average depth</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="520"/>
-        <source>Min. depth</source>
-        <translation>Min. depth</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="521"/>
-        <source>Max. depth</source>
-        <translation>Max. depth</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="523"/>
-        <source>Min. SAC</source>
-        <translation>Min. SAC</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="524"/>
-        <source>Max. SAC</source>
-        <translation>Max. SAC</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="525"/>
-        <source>Average temp.</source>
-        <translation>Average temp.</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="526"/>
-        <source>Min. temp.</source>
-        <translation>Min. temp.</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="527"/>
-        <source>Max. temp.</source>
-        <translation>Max. temp.</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="528"/>
-        <source>Back to list</source>
-        <translation>Back to list</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="534"/>
-        <source>Dive equipment</source>
-        <translation>Dive equipment</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="537"/>
-        <source>Work pressure</source>
-        <translation>Work pressure</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="538"/>
-        <source>Start pressure</source>
-        <translation>Start pressure</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="539"/>
-        <source>End pressure</source>
-        <translation>End pressure</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="547"/>
-        <source>Dive status</source>
-        <translation>Dive status</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="522"/>
-        <source>Average SAC</source>
-        <translation>Average SAC</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="531"/>
-        <source>Dive No.</source>
-        <translation>Dive No.</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="532"/>
-        <source>Dive profile</source>
-        <translation>Dive profile</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="533"/>
-        <source>Dive information</source>
-        <translation>Dive information</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="535"/>
-        <location filename="../core/save-html.c" line="542"/>
-        <source>Type</source>
-        <translation>Type</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="536"/>
-        <source>Size</source>
-        <translation>Size</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="540"/>
-        <source>Gas</source>
-        <translation>Gas</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="541"/>
-        <source>Weight</source>
-        <translation>Weight</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="543"/>
-        <source>Events</source>
-        <translation>Events</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="544"/>
-        <source>Name</source>
-        <translation>Name</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="545"/>
-        <source>Value</source>
-        <translation>Value</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="546"/>
-        <source>Coordinates</source>
-        <translation>Coordinates</translation>
-    </message>
-    <message>
         <location filename="../core/worldmap-save.c" line="39"/>
         <source>Date:</source>
         <translation>Date:</translation>
@@ -10579,110 +10770,6 @@ Is the Uemis Zurich plugged in correctly?</translation>
         <translation>Notes:</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="91"/>
-        <location filename="../core/qthelper.cpp" line="226"/>
-        <source>N</source>
-        <translation>N</translation>
-    </message>
-    <message>
-        <location filename="../core/qthelper.cpp" line="91"/>
-        <location filename="../core/qthelper.cpp" line="227"/>
-        <source>S</source>
-        <translation>S</translation>
-    </message>
-    <message>
-        <location filename="../core/qthelper.cpp" line="92"/>
-        <location filename="../core/qthelper.cpp" line="228"/>
-        <source>E</source>
-        <translation>E</translation>
-    </message>
-    <message>
-        <location filename="../core/qthelper.cpp" line="92"/>
-        <location filename="../core/qthelper.cpp" line="229"/>
-        <source>W</source>
-        <translation>W</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="341"/>
-        <source>Remote storage and local data diverged. Error: merge failed (%s)</source>
-        <translation>Remote storage and local data diverged. Error: merge failed (%s)</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="134"/>
-        <source>Local cache directory %s corrupted - can&apos;t sync with Subsurface cloud storage</source>
-        <translation>Local cache directory %s corrupted - can&apos;t sync with Subsurface cloud storage</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="157"/>
-        <location filename="../core/git-access.c" line="177"/>
-        <source>Could not update local cache to newer remote data</source>
-        <translation>Could not update local cache to newer remote data</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="170"/>
-        <source>Subsurface cloud storage corrupted</source>
-        <translation>Subsurface cloud storage corrupted</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="285"/>
-        <source>Could not update Subsurface cloud storage, try again later</source>
-        <translation>Could not update Subsurface cloud storage, try again later</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="371"/>
-        <source>Remote storage and local data diverged. Cannot combine local and remote changes</source>
-        <translation>Remote storage and local data diverged. Cannot combine local and remote changes</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="405"/>
-        <source>Remote storage and local data diverged</source>
-        <translation>Remote storage and local data diverged</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="408"/>
-        <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source>
-        <translation>Remote storage and local data diverged. Error: writing the data failed (%s)</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="417"/>
-        <source>Problems with local cache of Subsurface cloud data</source>
-        <translation>Problems with local cache of Subsurface cloud data</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="418"/>
-        <source>Moved cache data to %s. Please try the operation again.</source>
-        <translation>Moved cache data to %s. Please try the operation again.</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="737"/>
-        <source>Error connecting to Subsurface cloud storage</source>
-        <translation>Error connecting to Subsurface cloud storage</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="740"/>
-        <source>git clone of %s failed (%s)</source>
-        <translation>git clone of %s failed (%s)</translation>
-    </message>
-    <message>
-        <location filename="../core/load-git.c" line="222"/>
-        <location filename="../core/parse-xml.c" line="1300"/>
-        <source>additional name for site: %s
-</source>
-        <translation>additional name for site: %s
-</translation>
-    </message>
-    <message>
-        <location filename="../core/ostctools.c" line="120"/>
-        <location filename="../core/ostctools.c" line="152"/>
-        <source>Unknown DC in dive %d</source>
-        <translation>Unknown DC in dive %d</translation>
-    </message>
-    <message>
-        <location filename="../core/ostctools.c" line="165"/>
-        <source>Error - %s - parsing dive %d</source>
-        <translation>Error - %s - parsing dive %d</translation>
-    </message>
-    <message>
         <location filename="../smtk-import/smartrak.c" line="247"/>
         <source>Built</source>
         <translation>Built</translation>
@@ -10766,155 +10853,120 @@ Is the Uemis Zurich plugged in correctly?</translation>
         <translation>Subsurface-mobile</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="91"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="103"/>
         <source>Subsurface</source>
         <translation>Subsurface</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="97"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="110"/>
         <source>Dive list</source>
         <translation>Dive list</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="112"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="125"/>
         <source>Cloud credentials</source>
         <translation>Cloud credentials</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="126"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="139"/>
         <source>Manage dives</source>
         <translation>Manage dives</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="138"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="141"/>
         <source>Add dive manually</source>
         <translation>Add dive manually</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="146"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="149"/>
         <source>Manual sync with cloud</source>
         <translation>Manual sync with cloud</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="164"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="167"/>
         <source>Offline mode</source>
         <translation>Offline mode</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="164"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="167"/>
         <source>Enable auto cloud sync</source>
         <translation>Enable auto cloud sync</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="182"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="187"/>
         <source>GPS</source>
         <translation>GPS</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="185"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="190"/>
         <source>GPS-tag dives</source>
         <translation>GPS-tag dives</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="192"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="197"/>
         <source>Upload GPS data</source>
         <translation>Upload GPS data</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="199"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="204"/>
         <source>Download GPS data</source>
         <translation>Download GPS data</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="206"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="211"/>
         <source>Show GPS fixes</source>
         <translation>Show GPS fixes</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="215"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="220"/>
         <source>Clear GPS cache</source>
         <translation>Clear GPS cache</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="221"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="226"/>
         <source>Preferences</source>
         <translation>Preferences</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="230"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="237"/>
         <source>Developer</source>
         <translation>Developer</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="232"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="239"/>
         <source>App log</source>
         <translation>App log</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="239"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="246"/>
         <source>Theme information</source>
         <translation>Theme information</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="246"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="253"/>
         <source>User manual</source>
         <translation>User manual</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="252"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="259"/>
         <source>About</source>
         <translation>About</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="283"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="304"/>
         <source>Run location service</source>
         <translation>Run location service</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="283"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="304"/>
         <source>No GPS source available</source>
         <translation>No GPS source available</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="295"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="316"/>
         <source>Actions</source>
         <translation>Actions</translation>
     </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="9"/>
-        <source>Hello World</source>
-        <translation>Hello World</translation>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="13"/>
-        <source>File</source>
-        <translation>File</translation>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="15"/>
-        <source>&amp;Open</source>
-        <translation>&amp;Open</translation>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="19"/>
-        <source>Exit</source>
-        <translation>Exit</translation>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="27"/>
-        <source>Button 1 pressed</source>
-        <translation>Button 1 pressed</translation>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="28"/>
-        <source>Button 2 pressed</source>
-        <translation>Button 2 pressed</translation>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="33"/>
-        <source>May I have your attention, please?</source>
-        <translation>May I have your attention, please?</translation>
-    </message>
 </context>
 <context>
     <name>plannerDetails</name>
@@ -10992,6 +11044,24 @@ p, li { white-space: pre-wrap; }
         <translation>m/min</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="121"/>
+        <location filename="../build/ui_plannerSettings.h" line="425"/>
+        <source>75% to 50% avg. depth</source>
+        <translation>75% to 50% avg. depth</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="138"/>
+        <location filename="../build/ui_plannerSettings.h" line="427"/>
+        <source>50% avg. depth to 6m</source>
+        <translation>50% avg. depth to 6m</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="155"/>
+        <location filename="../build/ui_plannerSettings.h" line="429"/>
+        <source>6m to surface</source>
+        <translation>6m to surface</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="175"/>
         <location filename="../build/ui_plannerSettings.h" line="431"/>
         <source>Descent</source>
@@ -11015,12 +11085,35 @@ p, li { white-space: pre-wrap; }
         <translation>VPM-B deco</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="268"/>
+        <source>Bühlmann deco</source>
+        <translation>Bühlmann deco</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="278"/>
         <location filename="../build/ui_plannerSettings.h" line="445"/>
         <source>Reserve gas</source>
         <translation>Reserve gas</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="288"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="549"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="578"/>
+        <location filename="../build/ui_plannerSettings.h" line="446"/>
+        <location filename="../build/ui_plannerSettings.h" line="459"/>
+        <location filename="../build/ui_plannerSettings.h" line="461"/>
+        <source>bar</source>
+        <translation>bar</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="307"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="416"/>
+        <location filename="../build/ui_plannerSettings.h" line="437"/>
+        <location filename="../build/ui_plannerSettings.h" line="440"/>
+        <source>%</source>
+        <translation>%</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="320"/>
         <location filename="../build/ui_plannerSettings.h" line="449"/>
         <source>Postpone gas change if a stop is not required</source>
@@ -11039,12 +11132,10 @@ p, li { white-space: pre-wrap; }
         <translation>GF low</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="307"/>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="416"/>
-        <location filename="../build/ui_plannerSettings.h" line="437"/>
-        <location filename="../build/ui_plannerSettings.h" line="440"/>
-        <source>%</source>
-        <translation>%</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="353"/>
+        <location filename="../build/ui_plannerSettings.h" line="436"/>
+        <source>Plan backgas breaks</source>
+        <translation>Plan backgas breaks</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="360"/>
@@ -11053,10 +11144,10 @@ p, li { white-space: pre-wrap; }
         <translation>GF high</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="429"/>
-        <location filename="../build/ui_plannerSettings.h" line="441"/>
-        <source>Drop to first depth</source>
-        <translation>Drop to first depth</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="370"/>
+        <location filename="../build/ui_plannerSettings.h" line="453"/>
+        <source>min</source>
+        <translation>min</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="389"/>
@@ -11065,163 +11156,139 @@ p, li { white-space: pre-wrap; }
         <translation>Last stop at 6m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="353"/>
-        <location filename="../build/ui_plannerSettings.h" line="436"/>
-        <source>Plan backgas breaks</source>
-        <translation>Plan backgas breaks</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="396"/>
+        <source>Maximize bottom time allowed by gas and no decompression limits</source>
+        <translation>Maximise bottom time allowed by gas and no decompression limits</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="515"/>
-        <location filename="../build/ui_plannerSettings.h" line="455"/>
-        <source>Gas options</source>
-        <translation>Gas options</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="399"/>
+        <location filename="../build/ui_plannerSettings.h" line="443"/>
+        <source>Recreational mode</source>
+        <translation>Recreational mode</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="594"/>
-        <location filename="../build/ui_plannerSettings.h" line="456"/>
-        <source>Bottom SAC</source>
-        <translation>Bottom SAC</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="429"/>
+        <location filename="../build/ui_plannerSettings.h" line="441"/>
+        <source>Drop to first depth</source>
+        <translation>Drop to first depth</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="692"/>
-        <location filename="../build/ui_plannerSettings.h" line="457"/>
-        <source>Deco SAC</source>
-        <translation>Deco SAC</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="436"/>
+        <location filename="../build/ui_plannerSettings.h" line="452"/>
+        <source>Min. switch duration</source>
+        <translation>Min. switch duration</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="601"/>
-        <location filename="../build/ui_plannerSettings.h" line="458"/>
-        <source>Bottom pO₂</source>
-        <translation>Bottom pO₂</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="459"/>
+        <location filename="../build/ui_plannerSettings.h" line="444"/>
+        <source>Safety stop</source>
+        <translation>Safety stop</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="685"/>
-        <location filename="../build/ui_plannerSettings.h" line="460"/>
-        <source>Deco pO₂</source>
-        <translation>Deco pO₂</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="495"/>
+        <source>Conservatism level</source>
+        <translation>Conservatism level</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="515"/>
+        <location filename="../build/ui_plannerSettings.h" line="455"/>
+        <source>Gas options</source>
+        <translation>Gas options</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="565"/>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="672"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="698"/>
         <location filename="../build/ui_plannerSettings.h" line="462"/>
         <location filename="../build/ui_plannerSettings.h" line="463"/>
         <source>ℓ/min</source>
         <translation>ℓ/min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="632"/>
-        <location filename="../build/ui_plannerSettings.h" line="468"/>
-        <source>Display runtime</source>
-        <translation>Display runtime</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="645"/>
-        <location filename="../build/ui_plannerSettings.h" line="472"/>
-        <source>Display segment duration</source>
-        <translation>Display segment duration</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="655"/>
-        <location filename="../build/ui_plannerSettings.h" line="476"/>
-        <source>Display transitions in deco</source>
-        <translation>Display transitions in deco</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="662"/>
-        <location filename="../build/ui_plannerSettings.h" line="477"/>
-        <source>Verbatim dive plan</source>
-        <translation>Verbatim dive plan</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="288"/>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="549"/>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="578"/>
-        <location filename="../build/ui_plannerSettings.h" line="446"/>
-        <location filename="../build/ui_plannerSettings.h" line="459"/>
-        <location filename="../build/ui_plannerSettings.h" line="461"/>
-        <source>bar</source>
-        <translation>bar</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="121"/>
-        <location filename="../build/ui_plannerSettings.h" line="425"/>
-        <source>75% to 50% avg. depth</source>
-        <translation>75% to 50% avg. depth</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="138"/>
-        <location filename="../build/ui_plannerSettings.h" line="427"/>
-        <source>50% avg. depth to 6m</source>
-        <translation>50% avg. depth to 6m</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="155"/>
-        <location filename="../build/ui_plannerSettings.h" line="429"/>
-        <source>6m to surface</source>
-        <translation>6m to surface</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="268"/>
-        <source>Bühlmann deco</source>
-        <translation>Bühlmann deco</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="370"/>
-        <location filename="../build/ui_plannerSettings.h" line="453"/>
-        <source>min</source>
-        <translation>min</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="396"/>
-        <source>Maximize bottom time allowed by gas and no decompression limits</source>
-        <translation>Maximise bottom time allowed by gas and no decompression limits</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="594"/>
+        <source>m</source>
+        <translation>m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="399"/>
-        <location filename="../build/ui_plannerSettings.h" line="443"/>
-        <source>Recreational mode</source>
-        <translation>Recreational mode</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="606"/>
+        <source>Used to calculate best mix. Select best mix depth in &apos;Available gases&apos; table by entering gas depth, followed by &quot;B&quot; (best trimix mix) or &quot;BN&quot; (best nitrox mix)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="436"/>
-        <location filename="../build/ui_plannerSettings.h" line="452"/>
-        <source>Min. switch duration</source>
-        <translation>Min. switch duration</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="613"/>
+        <location filename="../build/ui_plannerSettings.h" line="456"/>
+        <source>Bottom SAC</source>
+        <translation>Bottom SAC</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="459"/>
-        <location filename="../build/ui_plannerSettings.h" line="444"/>
-        <source>Safety stop</source>
-        <translation>Safety stop</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="620"/>
+        <location filename="../build/ui_plannerSettings.h" line="458"/>
+        <source>Bottom pO₂</source>
+        <translation>Bottom pO₂</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="495"/>
-        <source>Conservatism level</source>
-        <translation>Conservatism level</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="627"/>
+        <source>Best mix END</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="608"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="634"/>
         <location filename="../build/ui_plannerSettings.h" line="464"/>
         <source>Notes</source>
         <translation>Notes</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="629"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="655"/>
         <location filename="../build/ui_plannerSettings.h" line="466"/>
         <source>In dive plan, show runtime (absolute time) of stops</source>
         <translation>In dive plan, show runtime (absolute time) of stops</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="642"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="658"/>
+        <location filename="../build/ui_plannerSettings.h" line="468"/>
+        <source>Display runtime</source>
+        <translation>Display runtime</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="668"/>
         <location filename="../build/ui_plannerSettings.h" line="470"/>
         <source>In dive plan, show duration (relative time) of stops</source>
         <translation>In dive plan, show duration (relative time) of stops</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="652"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="671"/>
+        <location filename="../build/ui_plannerSettings.h" line="472"/>
+        <source>Display segment duration</source>
+        <translation>Display segment duration</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="678"/>
         <location filename="../build/ui_plannerSettings.h" line="474"/>
         <source>In diveplan, list transitions or treat them as implicit</source>
         <translation>In dive plan, list transitions or treat them as implicit</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="681"/>
+        <location filename="../build/ui_plannerSettings.h" line="476"/>
+        <source>Display transitions in deco</source>
+        <translation>Display transitions in deco</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="688"/>
+        <location filename="../build/ui_plannerSettings.h" line="477"/>
+        <source>Verbatim dive plan</source>
+        <translation>Verbatim dive plan</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="711"/>
+        <location filename="../build/ui_plannerSettings.h" line="460"/>
+        <source>Deco pO₂</source>
+        <translation>Deco pO₂</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="718"/>
+        <location filename="../build/ui_plannerSettings.h" line="457"/>
+        <source>Deco SAC</source>
+        <translation>Deco SAC</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 bce8de756..6cd05b456 100644
--- a/translations/subsurface_es_ES.ts
+++ b/translations/subsurface_es_ES.ts
@@ -109,6 +109,11 @@
         <translation>Nombre:</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="56"/>
+        <source>Could not initialize Winsock version 2.2</source>
+        <translation>No se pudo inicializar Winsock version 2.2</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="134"/>
         <source>Trying to turn on the local Bluetooth device...</source>
         <translation>Intentando activar el dispositivo Bluetooth local…</translation>
@@ -119,6 +124,11 @@
         <translation>Intentando desactivar el dispositivo Bluetooth local…</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="167"/>
+        <source>Remote devices list was cleared.</source>
+        <translation>Se ha borrado la lista de dispositivos remotos</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="183"/>
         <source>Scanning for remote devices...</source>
         <translation>Buscando dispositivos remotos…</translation>
@@ -129,6 +139,22 @@
         <translation>La búsqueda finalizó correctamente.</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="208"/>
+        <source>The local Bluetooth device was %1.</source>
+        <extracomment>%1 will be replaced with &quot;turned on&quot; or &quot;turned off&quot;</extracomment>
+        <translation>El dispositivo Bluetooth local está %1.</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
+        <source>turned on</source>
+        <translation>activado</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
+        <source>turned off</source>
+        <translation>desactivado</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="225"/>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="339"/>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="359"/>
@@ -176,37 +202,6 @@
         <translation>Emparejar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="352"/>
-        <source>Device %1 was paired and is authorized.</source>
-        <translation>El dispositivo %1 se emparejó y autorizó</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="56"/>
-        <source>Could not initialize Winsock version 2.2</source>
-        <translation>No se pudo inicializar Winsock version 2.2</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="167"/>
-        <source>Remote devices list was cleared.</source>
-        <translation>Se ha borrado la lista de dispositivos remotos</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="208"/>
-        <source>The local Bluetooth device was %1.</source>
-        <extracomment>%1 will be replaced with &quot;turned on&quot; or &quot;turned off&quot;</extracomment>
-        <translation>El dispositivo Bluetooth local está %1.</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
-        <source>turned on</source>
-        <translation>activado</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
-        <source>turned off</source>
-        <translation>desactivado</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="307"/>
         <source>Remove pairing</source>
         <translation>Borrar emparejamiento</translation>
@@ -232,6 +227,11 @@
         <translation>El dispositivo %1 ha sido emparejado.</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="352"/>
+        <source>Device %1 was paired and is authorized.</source>
+        <translation>El dispositivo %1 se emparejó y autorizó</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="378"/>
         <source>The device %1 can now be used for connection. You can press the Save button.</source>
         <translation>El dispositivo %1 puede usarse para conexión. Puedes pulsar el botón Guardar.</translation>
@@ -290,12 +290,12 @@
 <context>
     <name>BuddyFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="621"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="619"/>
         <source>Person: </source>
         <translation>Persona:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="622"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="620"/>
         <source>Searches for buddies and divemasters</source>
         <translation>Busca por compañeros y divemasters</translation>
     </message>
@@ -303,7 +303,7 @@
 <context>
     <name>BuddyFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="243"/>
+        <location filename="../qt-models/filtermodels.cpp" line="248"/>
         <source>No buddies</source>
         <translation>Sin compañeros</translation>
     </message>
@@ -311,25 +311,30 @@
 <context>
     <name>CloudCredentials</name>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="49"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="50"/>
         <source>Cloud credentials</source>
         <translation>Credenciales de la nube</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="55"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="56"/>
         <source>Email</source>
         <translation>Email</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="67"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="68"/>
         <source>Password</source>
         <translation>Contraseña</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="90"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="92"/>
         <source>Show password</source>
         <translation>Mostrar contraseña</translation>
     </message>
+    <message>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="97"/>
+        <source>PIN</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>ColumnNameProvider</name>
@@ -385,6 +390,16 @@
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
+        <source>Max. depth</source>
+        <translation>Prof. máxima</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
+        <source>Avg. depth</source>
+        <translation>Prof. media</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
         <source>Divemaster</source>
         <translation>Divemaster</translation>
     </message>
@@ -395,6 +410,11 @@
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
+        <source>Suit</source>
+        <translation>Traje</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
         <source>Notes</source>
         <translation>Notas</translation>
     </message>
@@ -414,21 +434,6 @@
         <translation>Temperatura del agua</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
-        <source>Max. depth</source>
-        <translation>Prof. máxima</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
-        <source>Avg. depth</source>
-        <translation>Prof. media</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
-        <source>Suit</source>
-        <translation>Traje</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="44"/>
         <source>O₂</source>
         <translation>O₂</translation>
@@ -542,7 +547,7 @@
         <translation>No es posible crear el contexto de libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../core/configuredivecomputer.cpp" line="660"/>
+        <location filename="../core/configuredivecomputer.cpp" line="656"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation>No se pudo establecer conexión con el ordenador de buceo.</translation>
     </message>
@@ -562,11 +567,19 @@
         <translation>Dispositivo o punto de montaje</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="170"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1520"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1533"/>
-        <source>...</source>
-        <translation>…</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="47"/>
+        <source>Connect via Bluetooth</source>
+        <translation>Conectar vía Bluetooth</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="54"/>
+        <source>Connect</source>
+        <translation>Conectar</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="64"/>
+        <source>Disconnect</source>
+        <translation>Desconectar</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="80"/>
@@ -575,12 +588,24 @@
         <translation>Descargar detalles disponibles</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="90"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1523"/>
+        <source>Read settings from backup file or from device before writing to the device</source>
+        <translation>Leer ajustes de un archivo de respaldo o del dispositivo antes de escribir al dispositivo</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="93"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1525"/>
         <source>Save changes to device</source>
         <translation>Guardar cambios en el dispositivo</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="116"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1527"/>
+        <source>Read settings from backup file or from device before writing to a backup file</source>
+        <translation>Leer ajustes de un archivo de respaldo o del dispositivo antes de escribir al dispositivo</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="119"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1529"/>
         <source>Backup</source>
@@ -599,15 +624,40 @@
         <translation>Actualizar firmware</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="163"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1532"/>
+        <source>Save libdivecomputer logfile</source>
+        <translation>Guardar registro de libdivecomputer</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="170"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1520"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1533"/>
+        <source>...</source>
+        <translation>…</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="177"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1534"/>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
     <message>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1539"/>
-        <source>OSTC 3</source>
-        <translation>OSTC 3</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="214"/>
+        <source>OSTC 3,Sport,Cr,2</source>
+        <translation>OSTC 3,Sport,Cr,2</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="223"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1541"/>
+        <source>Suunto Vyper family</source>
+        <translation>Familia Suunto Vyper</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="232"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1543"/>
+        <source>OSTC, Mk.2/2N/2C</source>
+        <translation>OSTC, Mk.2/2N/2C</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="253"/>
@@ -620,40 +670,56 @@
         <translation>Ajustes básicos</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="326"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1656"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1943"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1546"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1726"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1766"/>
-        <source>Serial No.</source>
-        <translation>N.º de serie</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="260"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1575"/>
+        <source>Eco</source>
+        <translation>Eco</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="349"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1679"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1980"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1547"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1727"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1767"/>
-        <source>Firmware version</source>
-        <translation>Versión de firmware</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="265"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1576"/>
+        <source>Medium</source>
+        <translation>Medio</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="538"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1713"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1990"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1548"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1729"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1768"/>
-        <source>Custom text</source>
-        <translation>Texto personalizado</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="270"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1577"/>
+        <source>High</source>
+        <translation>Alto</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="385"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1549"/>
-        <source>Language</source>
-        <translation>Idioma</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="278"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="826"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="849"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="875"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="927"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="993"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1019"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1101"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1117"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1450"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2278"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2382"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2408"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2434"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2474"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2497"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1586"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1621"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1623"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1625"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1628"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1637"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1638"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1710"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1785"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1789"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1801"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1803"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1806"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1807"/>
+        <source>%</source>
+        <translation>%</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="289"/>
@@ -680,44 +746,36 @@
         <translation>Italiano</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="579"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1557"/>
-        <source>Dive mode</source>
-        <translation>Modo de buceo</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="556"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1560"/>
-        <source>OC</source>
-        <translation>OC</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="561"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1561"/>
-        <source>CC</source>
-        <translation>CC</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="313"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1582"/>
+        <source>m/°C</source>
+        <translation>m/°C</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="566"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2336"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1562"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1793"/>
-        <source>Gauge</source>
-        <translation>Profundímetro</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="318"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1583"/>
+        <source>ft/°F</source>
+        <translation>ft/°F</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="571"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1563"/>
-        <source>Apnea</source>
-        <translation>Apnea</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="326"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1656"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1943"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1546"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1726"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1766"/>
+        <source>Serial No.</source>
+        <translation>N.º de serie</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="395"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2063"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1565"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1780"/>
-        <source>Date format</source>
-        <translation>Formato de fecha</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="349"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1679"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1980"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1547"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1727"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1767"/>
+        <source>Firmware version</source>
+        <translation>Versión de firmware</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="360"/>
@@ -738,108 +796,147 @@
         <translation>AAMMDD</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1042"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2457"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1639"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1805"/>
-        <source>Saturation</source>
-        <translation>Saturación</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="385"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1549"/>
+        <source>Language</source>
+        <translation>Idioma</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="278"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="826"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="849"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="875"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="927"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="993"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1019"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1101"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1117"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1450"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2278"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2382"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2408"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2434"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2474"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2497"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1586"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1621"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1623"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1625"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1628"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1637"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1638"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1710"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1785"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1789"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1801"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1803"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1806"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1807"/>
-        <source>%</source>
-        <translation>%</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="395"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2063"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1565"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1780"/>
+        <source>Date format</source>
+        <translation>Formato de fecha</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="865"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2261"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1624"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1784"/>
-        <source>Desaturation</source>
-        <translation>Desaturación</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="405"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1572"/>
+        <source>Brightness</source>
+        <translation>Brillo</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="983"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2398"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1636"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1800"/>
-        <source>Last deco</source>
-        <translation>Última parada</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="415"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1850"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1579"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1753"/>
+        <source>Units</source>
+        <translation>Unidades</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="711"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="736"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="758"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="904"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2181"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2206"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2228"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2307"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1626"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1786"/>
-        <source> m</source>
-        <translation> m</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="425"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1585"/>
+        <source>Salinity (0-5%)</source>
+        <translation>Salinidad (0-5 %)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="405"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1572"/>
-        <source>Brightness</source>
-        <translation>Brillo</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="438"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1615"/>
+        <source>Reset device to default settings</source>
+        <translation>Restablecer configuración inicial del dispositivo</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="260"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1575"/>
-        <source>Eco</source>
-        <translation>Eco</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="452"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1590"/>
+        <source>230LSB/Gauss</source>
+        <translation>230LSB/Gauss</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="265"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1576"/>
-        <source>Medium</source>
-        <translation>Medio</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="457"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1591"/>
+        <source>330LSB/Gauss</source>
+        <translation>330LSB/Gauss</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="270"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1577"/>
-        <source>High</source>
-        <translation>Alto</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="462"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1592"/>
+        <source>390LSB/Gauss</source>
+        <translation>390LSB/Gauss</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="603"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2034"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1599"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1779"/>
-        <source>Sampling rate</source>
-        <translation>Frecuencia de muestreo</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="467"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1593"/>
+        <source>440LSB/Gauss</source>
+        <translation>440LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="472"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1594"/>
+        <source>660LSB/Gauss</source>
+        <translation>660LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="477"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1595"/>
+        <source>820LSB/Gauss</source>
+        <translation>820LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="482"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1596"/>
+        <source>1090LSB/Gauss</source>
+        <translation>1090LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="487"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1597"/>
+        <source>1370LSB/Gauss</source>
+        <translation>1370LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="521"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1587"/>
+        <source>Compass gain</source>
+        <translation>Ganancia del compás</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="531"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1799"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1745"/>
+        <source>Computer model</source>
+        <translation>Modelo de ordenador</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="538"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1713"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1990"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1548"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1729"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1768"/>
+        <source>Custom text</source>
+        <translation>Texto personalizado</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="556"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1560"/>
+        <source>OC</source>
+        <translation>OC</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="561"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1561"/>
+        <source>CC</source>
+        <translation>CC</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="566"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2336"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1562"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1793"/>
+        <source>Gauge</source>
+        <translation>Profundímetro</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="571"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1563"/>
+        <source>Apnea</source>
+        <translation>Apnea</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="579"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1557"/>
+        <source>Dive mode</source>
+        <translation>Modo de buceo</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="590"/>
@@ -856,30 +953,12 @@
         <translation>10s</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="415"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1850"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1579"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1753"/>
-        <source>Units</source>
-        <translation>Unidades</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="313"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1582"/>
-        <source>m/°C</source>
-        <translation>m/°C</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="318"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1583"/>
-        <source>ft/°F</source>
-        <translation>ft/°F</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="644"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1605"/>
-        <source>Dive mode color</source>
-        <translation>Color en modo buceo</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="603"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2034"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1599"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1779"/>
+        <source>Sampling rate</source>
+        <translation>Frecuencia de muestreo</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="614"/>
@@ -906,12 +985,6 @@
         <translation>Azul</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="425"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1585"/>
-        <source>Salinity (0-5%)</source>
-        <translation>Salinidad (0-5 %)</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="637"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2092"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1613"/>
@@ -920,90 +993,80 @@
         <translation>Sincronizar la hora del ordenador con la del PC</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="521"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1587"/>
-        <source>Compass gain</source>
-        <translation>Ganancia del compás</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="90"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1523"/>
-        <source>Read settings from backup file or from device before writing to the device</source>
-        <translation>Leer ajustes de un archivo de respaldo o del dispositivo antes de escribir al dispositivo</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="116"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1527"/>
-        <source>Read settings from backup file or from device before writing to a backup file</source>
-        <translation>Leer ajustes de un archivo de respaldo o del dispositivo antes de escribir al dispositivo</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="232"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1543"/>
-        <source>OSTC, Mk.2/2N/2C</source>
-        <translation>OSTC, Mk.2/2N/2C</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="644"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1605"/>
+        <source>Dive mode color</source>
+        <translation>Color en modo buceo</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="452"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1590"/>
-        <source>230LSB/Gauss</source>
-        <translation>230LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="654"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2020"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1614"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1771"/>
+        <source>Show safety stop</source>
+        <translation>Mostrar parada de seguridad</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="457"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1591"/>
-        <source>330LSB/Gauss</source>
-        <translation>330LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="661"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2145"/>
+        <source>End Depth</source>
+        <translation>Profundidad de finalización</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="462"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1592"/>
-        <source>390LSB/Gauss</source>
-        <translation>390LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="671"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2162"/>
+        <source> s</source>
+        <translation> s</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="467"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1593"/>
-        <source>440LSB/Gauss</source>
-        <translation>440LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="687"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1953"/>
+        <source>Length</source>
+        <translation>Longitud</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="472"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1594"/>
-        <source>660LSB/Gauss</source>
-        <translation>660LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="694"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2138"/>
+        <source>Start Depth</source>
+        <translation>Prof. de inicio</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="477"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1595"/>
-        <source>820LSB/Gauss</source>
-        <translation>820LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="701"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2152"/>
+        <source>Reset Depth</source>
+        <translation>Prof. de reinicio</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="482"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1596"/>
-        <source>1090LSB/Gauss</source>
-        <translation>1090LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="711"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="736"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="758"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="904"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2181"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2206"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2228"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2307"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1626"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1786"/>
+        <source> m</source>
+        <translation> m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="487"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1597"/>
-        <source>1370LSB/Gauss</source>
-        <translation>1370LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="778"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2248"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1643"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1810"/>
+        <source>Advanced settings</source>
+        <translation>Ajustes avanzados</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="654"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2020"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1614"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1771"/>
-        <source>Show safety stop</source>
-        <translation>Mostrar parada de seguridad</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="784"/>
+        <source>Left button sensitivity</source>
+        <translation>Sensibilidad del botón izquierdo</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="438"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1615"/>
-        <source>Reset device to default settings</source>
-        <translation>Restablecer configuración inicial del dispositivo</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="791"/>
+        <source>Always show ppO2</source>
+        <translation>Mostrar siempre la ppO₂</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="798"/>
@@ -1014,20 +1077,6 @@
         <translation>Alt GF pueden seleccionarse bajo el agua</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="223"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1541"/>
-        <source>Suunto Vyper family</source>
-        <translation>Familia Suunto Vyper</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="778"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2248"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1643"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1810"/>
-        <source>Advanced settings</source>
-        <translation>Ajustes avanzados</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="805"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2271"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1618"/>
@@ -1058,6 +1107,14 @@
         <translation>GF alto</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="865"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2261"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1624"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1784"/>
+        <source>Desaturation</source>
+        <translation>Desaturación</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="917"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2320"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1627"/>
@@ -1072,14 +1129,6 @@
         <translation> mbar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="973"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2369"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1630"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1788"/>
-        <source> min</source>
-        <translation> min</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="960"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2331"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1633"/>
@@ -1088,63 +1137,28 @@
         <translation>ZH-L16</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="47"/>
-        <source>Connect via Bluetooth</source>
-        <translation>Conectar vía Bluetooth</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="163"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1532"/>
-        <source>Save libdivecomputer logfile</source>
-        <translation>Guardar registro de libdivecomputer</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="661"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2145"/>
-        <source>End Depth</source>
-        <translation>Profundidad de finalización</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="671"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2162"/>
-        <source> s</source>
-        <translation> s</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="687"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1953"/>
-        <source>Length</source>
-        <translation>Longitud</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="694"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2138"/>
-        <source>Start Depth</source>
-        <translation>Prof. de inicio</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="701"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2152"/>
-        <source>Reset Depth</source>
-        <translation>Prof. de reinicio</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="784"/>
-        <source>Left button sensitivity</source>
-        <translation>Sensibilidad del botón izquierdo</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="791"/>
-        <source>Always show ppO2</source>
-        <translation>Mostrar siempre la ppO₂</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="965"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1634"/>
         <source>ZH-L16+GF</source>
         <translation>ZH-L16+GF</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="973"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2369"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1630"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1788"/>
+        <source> min</source>
+        <translation> min</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="983"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2398"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1636"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1800"/>
+        <source>Last deco</source>
+        <translation>Última parada</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1009"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2424"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1640"/>
@@ -1161,6 +1175,14 @@
         <translation>Alt GFAlto</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1042"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2457"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1639"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1805"/>
+        <source>Saturation</source>
+        <translation>Saturación</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1052"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1642"/>
         <source>Flip screen</source>
@@ -1172,12 +1194,22 @@
         <translation>Sensibilidad del botón derecho</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1066"/>
+        <source>MOD warning</source>
+        <translation>Aviso de PMO</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1073"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2513"/>
         <source>Graphical speed indicator</source>
         <translation>Indicador gráfico de velocidad</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1080"/>
+        <source>Dynamic ascent rate</source>
+        <translation>Ritmo de ascenso dinámico</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1087"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2552"/>
         <source>Bottom gas consumption</source>
@@ -1190,6 +1222,14 @@
         <translation>Consumo de gas de deco</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1133"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1149"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2520"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2536"/>
+        <source> ℓ/min</source>
+        <translation> ℓ/min</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1165"/>
         <source>Temperature sensor offset</source>
         <translation>Compensado del sensor de Temp.</translation>
@@ -1208,6 +1248,18 @@
         <translation>Ajustes de gases</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1235"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1320"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2610"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2695"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1645"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1668"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1812"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1835"/>
+        <source>%O₂</source>
+        <translation>%O₂</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1240"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1325"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2615"/>
@@ -1326,16 +1378,10 @@
         <translation>Dil 5</translation>
     </message>
     <message>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1691"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1858"/>
-        <source>Set point [cbar]</source>
-        <translation>Set point [cbar]</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1693"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1860"/>
-        <source>Change depth [m]</source>
-        <translation>Prof.de cambio [m]</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1405"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2770"/>
+        <source>Setpoint</source>
+        <translation>Setpoint</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1415"/>
@@ -1374,6 +1420,12 @@
         <translation>SP 5</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1443"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1709"/>
+        <source>O₂ in calibration gas</source>
+        <translation>O₂ en el gas de calibrado</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1467"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1713"/>
         <source>Fixed setpoint</source>
@@ -1404,101 +1456,6 @@
         <translation> cbar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1748"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1733"/>
-        <source>P1 (medium)</source>
-        <extracomment>Suunto safety level</extracomment>
-        <translation>P1 (medio)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1753"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1734"/>
-        <source>P2 (high)</source>
-        <extracomment>Suunto safety level</extracomment>
-        <translation>P2 (alto)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1792"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1744"/>
-        <source>Total dive time</source>
-        <translation>Tiempo total de buceo</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2109"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1769"/>
-        <source>kg/ℓ</source>
-        <translation>kg/ℓ</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2346"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1795"/>
-        <source>Apnoea</source>
-        <translation>Apnea</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1583"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1722"/>
-        <source>Safety level</source>
-        <translation>Nivel de seguridad</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="54"/>
-        <source>Connect</source>
-        <translation>Conectar</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="64"/>
-        <source>Disconnect</source>
-        <translation>Desconectar</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="214"/>
-        <source>OSTC 3,Sport,Cr,2</source>
-        <translation>OSTC 3,Sport,Cr,2</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1066"/>
-        <source>MOD warning</source>
-        <translation>Aviso de PMO</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1080"/>
-        <source>Dynamic ascent rate</source>
-        <translation>Ritmo de ascenso dinámico</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1133"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1149"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2520"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2536"/>
-        <source> ℓ/min</source>
-        <translation> ℓ/min</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1235"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1320"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2610"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2695"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1645"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1668"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1812"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1835"/>
-        <source>%O₂</source>
-        <translation>%O₂</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1405"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2770"/>
-        <source>Setpoint</source>
-        <translation>Setpoint</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1443"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1709"/>
-        <source>O₂ in calibration gas</source>
-        <translation>O₂ en el gas de calibrado</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1535"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2843"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1719"/>
@@ -1515,6 +1472,12 @@
         <translation>pO₂ min</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1583"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1722"/>
+        <source>Safety level</source>
+        <translation>Nivel de seguridad</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1609"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1723"/>
         <source>Altitude range</source>
@@ -1548,6 +1511,20 @@
         <translation>P0 (nada)</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1748"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1733"/>
+        <source>P1 (medium)</source>
+        <extracomment>Suunto safety level</extracomment>
+        <translation>P1 (medio)</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1753"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1734"/>
+        <source>P2 (high)</source>
+        <extracomment>Suunto safety level</extracomment>
+        <translation>P2 (alto)</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1761"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1736"/>
         <source>Sample rate</source>
@@ -1572,11 +1549,10 @@
         <translation>60s</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="531"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1799"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1745"/>
-        <source>Computer model</source>
-        <translation>Modelo de ordenador</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1792"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1744"/>
+        <source>Total dive time</source>
+        <translation>Tiempo total de buceo</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1816"/>
@@ -1641,12 +1617,6 @@
         <translation>Alarma de tiempo</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2099"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1765"/>
-        <source>Salinity</source>
-        <translation>Salinidad</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2074"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1774"/>
         <source>MM/DD/YY</source>
@@ -1665,12 +1635,30 @@
         <translation>YY/MM/DD</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2099"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1765"/>
+        <source>Salinity</source>
+        <translation>Salinidad</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2109"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1769"/>
+        <source>kg/ℓ</source>
+        <translation>kg/ℓ</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2341"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1794"/>
         <source>ZH-L16 CC</source>
         <translation>ZH-L16 CC</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2346"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1795"/>
+        <source>Apnoea</source>
+        <translation>Apnea</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2351"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1796"/>
         <source>L16-GF OC</source>
@@ -1689,87 +1677,112 @@
         <translation>PSCR-GF</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1108"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1129"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1539"/>
+        <source>OSTC 3</source>
+        <translation>OSTC 3</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1691"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1858"/>
+        <source>Set point [cbar]</source>
+        <translation>Set point [cbar]</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1693"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1860"/>
+        <source>Change depth [m]</source>
+        <translation>Prof.de cambio [m]</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1110"/>
+        <source>Backup dive computer settings</source>
+        <translation>Hacer copia de seguridad de los ajustes</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1111"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1132"/>
         <source>Backup files (*.xml)</source>
         <translation>Archivos de copia de seguridad (*.xml)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1113"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1115"/>
+        <source>XML backup error</source>
+        <translation>Error en la copia de seguridad XML</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1116"/>
         <source>An error occurred while saving the backup file.
 %1</source>
         <translation>Se produjo un error al guardar la copia de seguridad.
 %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1116"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1119"/>
         <source>Backup succeeded</source>
         <translation>Copia de seguridad correcta</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1117"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1120"/>
         <source>Your settings have been saved to: %1</source>
         <translation>Se han guardado los ajustes en: %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1107"/>
-        <source>Backup dive computer settings</source>
-        <translation>Hacer copia de seguridad de los ajustes</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1112"/>
-        <source>XML backup error</source>
-        <translation>Error en la copia de seguridad XML</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1128"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1131"/>
         <source>Restore dive computer settings</source>
         <translation>Recuperar ajustes del ordenador de buceo</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1134"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1137"/>
         <source>XML restore error</source>
         <translation>Error al recuperar el XML</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1135"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1138"/>
         <source>An error occurred while restoring the backup file.
 %1</source>
         <translation>Ocurrió un error al recuperar la copia de seguridad.
 %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1139"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1142"/>
         <source>Restore succeeded</source>
         <translation>Recuperación correcta</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1140"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1143"/>
         <source>Your settings have been restored successfully.</source>
         <translation>Los ajustes se han recuperado correctamente.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1150"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1153"/>
         <source>Select firmware file</source>
         <translation>Seleccionar archivo de firmware</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1151"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1154"/>
         <source>All files (*.*)</source>
         <translation>Todos los archivos (*.*)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1207"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1210"/>
         <source>Choose file for divecomputer download logfile</source>
         <translation>Selecciona archivo para registro de descarga de libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1208"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1211"/>
         <source>Log files (*.log)</source>
         <translation>Archivos de registro (*.log)</translation>
     </message>
 </context>
 <context>
+    <name>ContextDrawer</name>
+    <message>
+        <location filename="../mobile-widgets/qml/kirigami/src/controls/ContextDrawer.qml" line="76"/>
+        <source>Actions</source>
+        <translation>Acciones</translation>
+    </message>
+</context>
+<context>
     <name>CylindersModel</name>
     <message>
         <location filename="../qt-models/cylindermodel.cpp" line="16"/>
@@ -1783,11 +1796,6 @@
     </message>
     <message>
         <location filename="../qt-models/cylindermodel.cpp" line="16"/>
-        <source>He%</source>
-        <translation>He%</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="16"/>
         <source>Work press.</source>
         <translation>Pres. Trabajo</translation>
     </message>
@@ -1807,9 +1815,24 @@
         <translation>O₂%</translation>
     </message>
     <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="16"/>
+        <source>He%</source>
+        <translation>He%</translation>
+    </message>
+    <message>
         <location filename="../qt-models/cylindermodel.cpp" line="17"/>
-        <source>Switch at</source>
-        <translation>Cambio a </translation>
+        <source>Deco switch at</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
+        <source>Bot. MOD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
+        <source>MND</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-models/cylindermodel.cpp" line="17"/>
@@ -1827,17 +1850,32 @@
         <translation>ℓ</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="161"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="177"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation>Pulsar aquí borrará esta botella</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="383"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="180"/>
+        <source>Switch depth for deco gas. Calculated using Deco pO₂ preference, unless set manually.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="183"/>
+        <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to &apos;*&apos; for best O₂% for max depth.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="186"/>
+        <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to &apos;*&apos; for best He% for max depth.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="444"/>
         <source>Cylinder cannot be removed</source>
         <translation>La botella no puede borrarse</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="384"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="445"/>
         <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source>
         <translation>
 Este gas se está usando. Solo se pueden borrar botellas que no se usen en la inmersión.</translation>
@@ -1858,42 +1896,24 @@ Este gas se está usando. Solo se pueden borrar botellas que no se usen en la in
         <translation>¿Qué componentes le gustaría copiar?</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="73"/>
+        <location filename="../build/ui_divecomponentselection.h" line="141"/>
+        <source>Dive site</source>
+        <translation>Punto de buceo</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="80"/>
         <location filename="../build/ui_divecomponentselection.h" line="142"/>
         <source>Suit</source>
         <translation>Traje</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="122"/>
-        <location filename="../build/ui_divecomponentselection.h" line="148"/>
-        <source>Divemaster</source>
-        <translation>Divemaster</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="129"/>
-        <location filename="../build/ui_divecomponentselection.h" line="149"/>
-        <source>Buddy</source>
-        <translation>Compañero</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="136"/>
-        <location filename="../build/ui_divecomponentselection.h" line="150"/>
-        <source>Rating</source>
-        <translation>Valoración</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="87"/>
         <location filename="../build/ui_divecomponentselection.h" line="143"/>
         <source>Visibility</source>
         <translation>Visibilidad</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="73"/>
-        <location filename="../build/ui_divecomponentselection.h" line="141"/>
-        <source>Dive site</source>
-        <translation>Punto de buceo</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="94"/>
         <location filename="../build/ui_divecomponentselection.h" line="144"/>
         <source>Notes</source>
@@ -1917,10 +1937,34 @@ Este gas se está usando. Solo se pueden borrar botellas que no se usen en la in
         <source>Cylinders</source>
         <translation>Botellas</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="122"/>
+        <location filename="../build/ui_divecomponentselection.h" line="148"/>
+        <source>Divemaster</source>
+        <translation>Divemaster</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="129"/>
+        <location filename="../build/ui_divecomponentselection.h" line="149"/>
+        <source>Buddy</source>
+        <translation>Compañero</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="136"/>
+        <location filename="../build/ui_divecomponentselection.h" line="150"/>
+        <source>Rating</source>
+        <translation>Valoración</translation>
+    </message>
 </context>
 <context>
     <name>DiveComputerManagementDialog</name>
     <message>
+        <location filename="../desktop-widgets/divecomputermanagementdialog.ui" line="17"/>
+        <location filename="../build/ui_divecomputermanagementdialog.h" line="65"/>
+        <source>Edit dive computer nicknames</source>
+        <translation>Editar los nombres de los ordenadores de buceo</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divecomputermanagementdialog.cpp" line="49"/>
         <source>Remove the selected dive computer?</source>
         <translation>¿Borrar el ordenador de buceo seleccionado?</translation>
@@ -1932,12 +1976,6 @@ Este gas se está usando. Solo se pueden borrar botellas que no se usen en la in
         <translation>¿Está seguro de que quiere eliminar 
 el ordenador de buceo seleccionado?</translation>
     </message>
-    <message>
-        <location filename="../desktop-widgets/divecomputermanagementdialog.ui" line="17"/>
-        <location filename="../build/ui_divecomputermanagementdialog.h" line="65"/>
-        <source>Edit dive computer nicknames</source>
-        <translation>Editar los nombres de los ordenadores de buceo</translation>
-    </message>
 </context>
 <context>
     <name>DiveComputerModel</name>
@@ -1965,17 +2003,17 @@ el ordenador de buceo seleccionado?</translation>
 <context>
     <name>DiveDetails</name>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="33"/>
+        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="38"/>
         <source>Dive details</source>
         <translation>Detalles de inmersión</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="67"/>
+        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="72"/>
         <source>Delete dive</source>
         <translation>Eliminar inmersión</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="84"/>
+        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="89"/>
         <source>Show on map</source>
         <translation>Mostrar en el mapa</translation>
     </message>
@@ -1983,89 +2021,94 @@ el ordenador de buceo seleccionado?</translation>
 <context>
     <name>DiveDetailsEdit</name>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="74"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="80"/>
         <source>Dive %1</source>
         <translation>Inmersión %1</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="78"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="84"/>
         <source>Date:</source>
         <translation>Fecha:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="86"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="92"/>
         <source>Location:</source>
         <translation>Ubicación:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="95"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="101"/>
         <source>Coordinates:</source>
         <translation>Coordenadas:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="104"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="110"/>
         <source>Use current
 GPS location:</source>
         <translation>Utilizar posición
 GPS actual:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="118"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="124"/>
         <source>Depth:</source>
         <translation>Profundidad:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="127"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="133"/>
         <source>Duration:</source>
         <translation>Duración:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="137"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="143"/>
         <source>Air Temp:</source>
         <translation>Temp. del aire:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="146"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="152"/>
         <source>Water Temp:</source>
         <translation>Temp. del agua:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="155"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="161"/>
         <source>Suit:</source>
         <translation>Traje:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="164"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="176"/>
         <source>Buddy:</source>
         <translation>Compañero:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="173"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="191"/>
         <source>Dive Master:</source>
         <translation>Dive Master:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="182"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="206"/>
         <source>Weight:</source>
         <translation>Peso:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="192"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="216"/>
+        <source>Cylinder:</source>
+        <translation>Botella:</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="231"/>
         <source>Gas mix:</source>
         <translation>Mezcla de gas:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="203"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="241"/>
         <source>Start Pressure:</source>
         <translation>Presión inicial:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="213"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="250"/>
         <source>End Pressure:</source>
         <translation>Presión final:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="224"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="260"/>
         <source>Notes:</source>
         <translation>Notas:</translation>
     </message>
@@ -2118,27 +2161,27 @@ GPS actual:</translation>
         <translation>Temp. del agua:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="199"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="198"/>
         <source>Dive Master:</source>
         <translation>Dive Master:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="213"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="211"/>
         <source>Weight:</source>
         <translation>Peso:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="226"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="224"/>
         <source>Buddy:</source>
         <translation>Compañero:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="239"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="237"/>
         <source>SAC:</source>
         <translation>CAS:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="254"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="252"/>
         <source>Notes</source>
         <translation>Notas</translation>
     </message>
@@ -2146,18 +2189,18 @@ GPS actual:</translation>
 <context>
     <name>DiveEventItem</name>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="134"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="165"/>
         <source>Manual switch to OC</source>
         <translation>Cambio manual a OC</translation>
     </message>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="136"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="167"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation>comienzo</translation>
     </message>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="137"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="168"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation>fin</translation>
@@ -2166,27 +2209,27 @@ GPS actual:</translation>
 <context>
     <name>DiveImportedModel</name>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="646"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="656"/>
         <source>Date/time</source>
         <translation>Fecha/hora</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="648"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="658"/>
         <source>Duration</source>
         <translation>Duración</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="650"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="660"/>
         <source>Depth</source>
         <translation>Prof.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="672"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="682"/>
         <source>h:</source>
         <translation>h:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="672"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="682"/>
         <source>min</source>
         <translation>min</translation>
     </message>
@@ -2195,8 +2238,8 @@ GPS actual:</translation>
     <name>DiveList</name>
     <message>
         <location filename="../mobile-widgets/qml/DiveList.qml" line="12"/>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="226"/>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="232"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="227"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="233"/>
         <source>Dive list</source>
         <translation>Lista de inmersiones</translation>
     </message>
@@ -2211,110 +2254,115 @@ GPS actual:</translation>
         <translation>Duración:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="222"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="223"/>
         <source>Cloud credentials</source>
         <translation>Credenciales de la nube</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="228"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="229"/>
         <source>Please tap the &apos;+&apos; button to add a dive</source>
         <translation>Pulsa el botón &apos;+&apos; para añadir una inmersión</translation>
     </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="248"/>
+        <source>No dives in dive list</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DiveListView</name>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="846"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="849"/>
         <source>Expand all</source>
         <translation>Expandir todos</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="848"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="851"/>
         <source>Collapse all</source>
         <translation>Contraer todo</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="852"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="855"/>
         <source>Collapse others</source>
         <translation>Contraer otras</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="856"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="859"/>
         <source>Remove dive(s) from trip</source>
         <translation>Borrar inmersión(es) del viaje</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="857"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="860"/>
         <source>Create new trip above</source>
         <translation>Crear nuevo viaje por encima</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="871"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="874"/>
         <source>Add dive(s) to trip immediately above</source>
         <translation>Añadir inmersión(es) al viaje de arriba</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="873"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="876"/>
         <source>Add dive(s) to trip immediately below</source>
         <translation>Añadir inmersión(es) al viaje de debajo</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="877"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="880"/>
         <source>Merge trip with trip above</source>
         <translation>Combinar viaje con el viaje de encima</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="878"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="881"/>
         <source>Merge trip with trip below</source>
         <translation>Combinar viaje con el viaje de abajo</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="882"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="885"/>
         <source>Delete dive(s)</source>
         <translation>Borrar inmersión(es)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="884"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="887"/>
         <source>Mark dive(s) invalid</source>
         <translation>Marcar inmersión(es) como no válida(s)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="888"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="891"/>
         <source>Merge selected dives</source>
         <translation>Mezclar las inmersiones seleccionadas</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="890"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="893"/>
         <source>Renumber dive(s)</source>
         <translation>Renumerar inmersiones</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="891"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="894"/>
         <source>Shift dive times</source>
         <translation>Desplazar hora de la inmersión</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="892"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="895"/>
         <source>Split selected dives</source>
         <translation>Divide las inmersiones seleccionadas</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="893"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="896"/>
         <source>Load image(s) from file(s)</source>
         <translation>Cargar imagen(es) de archivo(s)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="894"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="897"/>
         <source>Load image(s) from web</source>
         <translation>Cargar imagen(es) desde la web</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="917"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="919"/>
         <source>Open image files</source>
         <translation>Abrir archivos de imagen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="917"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="919"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>Archivos de imagen (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -2335,56 +2383,6 @@ GPS actual:</translation>
 <context>
     <name>DiveLogExportDialog</name>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="103"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="351"/>
-        <source>Export format</source>
-        <translation>Formato de exportación</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="134"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="353"/>
-        <source>UDDF</source>
-        <translation>UDDF</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="187"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="358"/>
-        <source>Worldmap</source>
-        <translation>Mapamundi</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="197"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="359"/>
-        <source>I&amp;mage depths</source>
-        <translation>Profundidades de las i&amp;mágenes</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="243"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="360"/>
-        <source>Selection</source>
-        <translation>Selección</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="252"/>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="346"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="361"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="372"/>
-        <source>Selected dives</source>
-        <translation>Inmersiones seleccionadas</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="262"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="362"/>
-        <source>All dives</source>
-        <translation>Todas las inmersiones</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="306"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="396"/>
-        <source>HTML</source>
-        <translation>HTML</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="14"/>
         <location filename="../build/ui_divelogexportdialog.h" line="349"/>
         <source>Export dive log files</source>
@@ -2397,12 +2395,24 @@ GPS actual:</translation>
         <translation>Exportación general</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="103"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="351"/>
+        <source>Export format</source>
+        <translation>Formato de exportación</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="115"/>
         <location filename="../build/ui_divelogexportdialog.h" line="352"/>
         <source>Subsurface &amp;XML</source>
         <translation>&amp;XML de Subsurface</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="134"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="353"/>
+        <source>UDDF</source>
+        <translation>UDDF</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="147"/>
         <location filename="../build/ui_divelogexportdialog.h" line="354"/>
         <source>di&amp;velogs.de</source>
@@ -2427,238 +2437,297 @@ GPS actual:</translation>
         <translation>Detalles de buceo CSV</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="275"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="187"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="358"/>
+        <source>Worldmap</source>
+        <translation>Mapamundi</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="197"/>
+        <source>TeX</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="207"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="359"/>
+        <source>I&amp;mage depths</source>
+        <translation>Profundidades de las i&amp;mágenes</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="253"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="360"/>
+        <source>Selection</source>
+        <translation>Selección</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="262"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="356"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="361"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="372"/>
+        <source>Selected dives</source>
+        <translation>Inmersiones seleccionadas</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="272"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="362"/>
+        <source>All dives</source>
+        <translation>Todas las inmersiones</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="285"/>
         <location filename="../build/ui_divelogexportdialog.h" line="363"/>
         <source>CSV units</source>
         <translation>Unidades CSV</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="288"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="298"/>
         <location filename="../build/ui_divelogexportdialog.h" line="366"/>
         <source>Metric</source>
         <translation>Métrico</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="293"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="303"/>
         <location filename="../build/ui_divelogexportdialog.h" line="367"/>
         <source>Imperial</source>
         <translation>Imperial</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="324"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="316"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="396"/>
+        <source>HTML</source>
+        <translation>HTML</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="334"/>
         <location filename="../build/ui_divelogexportdialog.h" line="370"/>
         <source>General settings</source>
         <translation>Ajustes generales</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="330"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="340"/>
         <location filename="../build/ui_divelogexportdialog.h" line="371"/>
         <source>Subsurface numbers</source>
         <translation>Numeración de Subsurface</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="359"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="369"/>
         <location filename="../build/ui_divelogexportdialog.h" line="373"/>
         <source>Export yearly statistics</source>
         <translation>Exportar estadísticas anuales</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="375"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="385"/>
         <location filename="../build/ui_divelogexportdialog.h" line="374"/>
         <source>All di&amp;ves</source>
         <translation>Todas las inmersiones</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="385"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="395"/>
         <location filename="../build/ui_divelogexportdialog.h" line="375"/>
         <source>Export list only</source>
         <translation>Exportar solo la lista</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="392"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="402"/>
         <location filename="../build/ui_divelogexportdialog.h" line="376"/>
         <source>Export photos</source>
         <translation>Exportar fotos</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="408"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="418"/>
         <location filename="../build/ui_divelogexportdialog.h" line="377"/>
         <source>Style options</source>
         <translation>Opciones de estilo</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="423"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="433"/>
         <location filename="../build/ui_divelogexportdialog.h" line="378"/>
         <source>Font</source>
         <translation>Tipo de letra</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="433"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="443"/>
         <location filename="../build/ui_divelogexportdialog.h" line="379"/>
         <source>Font size</source>
         <translation>Tamaño de letra</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="444"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="454"/>
         <location filename="../build/ui_divelogexportdialog.h" line="382"/>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="449"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="459"/>
         <location filename="../build/ui_divelogexportdialog.h" line="383"/>
         <source>10</source>
         <translation>10</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="454"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="464"/>
         <location filename="../build/ui_divelogexportdialog.h" line="384"/>
         <source>12</source>
         <translation>12</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="459"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="469"/>
         <location filename="../build/ui_divelogexportdialog.h" line="385"/>
         <source>14</source>
         <translation>14</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="464"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="474"/>
         <location filename="../build/ui_divelogexportdialog.h" line="386"/>
         <source>16</source>
         <translation>16</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="469"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="479"/>
         <location filename="../build/ui_divelogexportdialog.h" line="387"/>
         <source>18</source>
         <translation>18</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="474"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="484"/>
         <location filename="../build/ui_divelogexportdialog.h" line="388"/>
         <source>20</source>
         <translation>20</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="482"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="492"/>
         <location filename="../build/ui_divelogexportdialog.h" line="390"/>
         <source>Theme</source>
         <translation>Tema</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="493"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="503"/>
         <location filename="../build/ui_divelogexportdialog.h" line="393"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="95"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="99"/>
         <source>Light</source>
         <translation>Iluminación</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="498"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="508"/>
         <location filename="../build/ui_divelogexportdialog.h" line="394"/>
         <source>Sand</source>
         <translation>Arena</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="134"/>
-        <source>UDDF files (*.uddf *.UDDF)</source>
-        <translation>Archivos UDDF (*.uddf *.UDDF)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="142"/>
-        <source>CSV files (*.csv *.CSV)</source>
-        <translation>Archivos CSV (*.csv *.CSV)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="74"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="76"/>
         <source>Generic format that is used for data exchange between a variety of diving related programs.</source>
         <translation>Formato genérico que se utiliza para intercambio de datos entre programas relacionados con el buceo.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="76"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="78"/>
         <source>Comma separated values describing the dive profile.</source>
         <translation>Valores separados por comas que describen el perfil de buceo</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="78"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="80"/>
         <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source>
         <translation>Valores separados por comas de la información del buceo. Aquí se incluyen la mayoría de los detalles pero no la información del perfil.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="80"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="82"/>
         <source>Send the dive data to divelogs.de website.</source>
         <translation>Enviar los datos de buceo al sitio web divelogs.de.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="82"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="84"/>
         <source>Send the dive data to dive-share.appspot.com website</source>
         <translation>Enviar los datos de buceo al sitio web dive-share.appspot.com</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="84"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="86"/>
         <source>HTML export of the dive locations, visualized on a world map.</source>
         <translation>Exporta las ubicaciones de buceo en HTML, visualizándolas en un mapa mundial.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="86"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="88"/>
         <source>Subsurface native XML format.</source>
         <translation>Formato XML nativo de Subsurface.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="88"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="90"/>
         <source>Write depths of images to file.</source>
         <translation>Escribir la profundidad de las imágenes a archivo.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="133"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="92"/>
+        <source>Write dive as TeX macros to file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="137"/>
         <source>Export UDDF file as</source>
         <translation>Exportar archivo UDDF como</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="137"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/>
+        <source>UDDF files (*.uddf *.UDDF)</source>
+        <translation>Archivos UDDF (*.uddf *.UDDF)</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divelogexportdialog.cpp" line="141"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="145"/>
         <source>Export CSV file as</source>
         <translation>Exportar archivo CSV como</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="148"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="142"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="146"/>
+        <source>CSV files (*.csv *.CSV)</source>
+        <translation>Archivos CSV (*.csv *.CSV)</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="152"/>
         <source>Export world map</source>
         <translation>Exportar mapamundi</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="149"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="169"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="153"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="177"/>
         <source>HTML files (*.html)</source>
         <translation>Archivos HTML (*.html)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="153"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="157"/>
         <source>Export Subsurface XML</source>
         <translation>Exportar a XML de Subsurface</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="158"/>
         <source>XML files (*.xml *.ssrf)</source>
         <translation>Archivos XML (*.xml *.ssrf)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="162"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="166"/>
         <source>Save image depths</source>
         <translation>Guardar profundidades de las imágenes</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="168"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="170"/>
+        <source>Export to TeX file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="170"/>
+        <source>TeX files (*.tex)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="176"/>
         <source>Export HTML files as</source>
         <translation>Exportar archivos HTML como</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="184"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="192"/>
         <source>Please wait, exporting...</source>
         <translation>Espere mientras se exporta…</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="219"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="227"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="311"/>
         <source>Can&apos;t open file %s</source>
         <translation>No se puede abrir el archivo %s</translation>
     </message>
@@ -2672,25 +2741,6 @@ GPS actual:</translation>
         <translation>Importar archivo de registro</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="643"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="727"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="856"/>
-        <source>Time</source>
-        <translation>Hora de entrada</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.ui" line="127"/>
-        <location filename="../build/ui_divelogimportdialog.h" line="164"/>
-        <source>Metric</source>
-        <translation>Métrico</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.ui" line="132"/>
-        <location filename="../build/ui_divelogimportdialog.h" line="165"/>
-        <source>Imperial</source>
-        <translation>Imperial</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divelogimportdialog.ui" line="89"/>
         <location filename="../build/ui_divelogimportdialog.h" line="152"/>
         <source>dd.mm.yyyy</source>
@@ -2709,74 +2759,6 @@ GPS actual:</translation>
         <translation>aaaa-mm-dd</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.ui" line="155"/>
-        <location filename="../build/ui_divelogimportdialog.h" line="167"/>
-        <source>Drag the tags above to each corresponding column below</source>
-        <translation>Arrastra las etiquetas de arriba a las columnas correspondientes</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="641"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="729"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="852"/>
-        <source>Dive #</source>
-        <translation>Inmersión n.º</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="642"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="723"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="854"/>
-        <source>Date</source>
-        <translation>Fecha</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="644"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="858"/>
-        <source>Duration</source>
-        <translation>Duración</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="655"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="862"/>
-        <source>GPS</source>
-        <translation>GPS</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="645"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="864"/>
-        <source>Max. depth</source>
-        <translation>Prof. máxima</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="646"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="866"/>
-        <source>Avg. depth</source>
-        <translation>Prof. media</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="658"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="872"/>
-        <source>Suit</source>
-        <translation>Traje</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="663"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="878"/>
-        <source>Tags</source>
-        <translation>Etiquetas</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="652"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="894"/>
-        <source>O₂</source>
-        <translation>O₂</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="653"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="896"/>
-        <source>He</source>
-        <translation>He</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divelogimportdialog.ui" line="108"/>
         <location filename="../build/ui_divelogimportdialog.h" line="158"/>
         <source>Seconds</source>
@@ -2795,183 +2777,269 @@ GPS actual:</translation>
         <translation>Minutos:segundos</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="654"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="860"/>
-        <source>Location</source>
-        <translation>Ubicación</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.ui" line="127"/>
+        <location filename="../build/ui_divelogimportdialog.h" line="164"/>
+        <source>Metric</source>
+        <translation>Métrico</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.ui" line="132"/>
+        <location filename="../build/ui_divelogimportdialog.h" line="165"/>
+        <source>Imperial</source>
+        <translation>Imperial</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.ui" line="155"/>
+        <location filename="../build/ui_divelogimportdialog.h" line="167"/>
+        <source>Drag the tags above to each corresponding column below</source>
+        <translation>Arrastra las etiquetas de arriba a las columnas correspondientes</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="354"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="499"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="505"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="355"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="528"/>
         <source>Tab</source>
         <translation>Tabulador</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="575"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="598"/>
         <source>Some column headers were pre-populated; please drag and drop the headers so they match the column they are in.</source>
         <translation>Las cabeceras de algunas columnas pueden estar pre-rellenadas, por favor arrastra y suelta las cabeceras para que coincidan con las columnas correctas.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="613"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="731"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="782"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="848"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="636"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="761"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="857"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="925"/>
         <source>Sample time</source>
         <translation>Hora de la muestra</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="615"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="733"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="784"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="638"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="763"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="859"/>
         <source>Sample depth</source>
         <translation>Profundidad de la muestra</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="617"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="735"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="786"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="640"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="765"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="861"/>
         <source>Sample temperature</source>
         <translation>Temperatura de la muestra</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="621"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="739"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="790"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="642"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="767"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="863"/>
+        <source>Sample pO₂</source>
+        <translation>PO2 de la muestra</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="644"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="769"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="865"/>
         <source>Sample sensor1 pO₂</source>
         <translation>pO₂ del sensor 1 de la muestra</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="623"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="741"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="792"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="646"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="771"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="867"/>
         <source>Sample sensor2 pO₂</source>
         <translation>pO₂ del sensor 2 de la muestra</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="625"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="743"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="794"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="648"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="773"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="869"/>
         <source>Sample sensor3 pO₂</source>
         <translation>pO₂ del sensor 3 de la muestra</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="633"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="751"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="802"/>
-        <source>Sample stopdepth</source>
-        <translation>Profundidad de parada de la muestra</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="637"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="755"/>
-        <source>Sample setpoint</source>
-        <translation>Setpoint de la muestra</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="619"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="737"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="788"/>
-        <source>Sample pO₂</source>
-        <translation>PO2 de la muestra</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="627"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="745"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="796"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="650"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="775"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="871"/>
         <source>Sample CNS</source>
         <translation>CNS de la muestra</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="629"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="747"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="798"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="652"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="777"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="873"/>
         <source>Sample NDL</source>
         <translation>LND de la muestra</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="631"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="749"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="800"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="654"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="779"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="875"/>
         <source>Sample TTS</source>
         <translation>TTS de la muestra</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="635"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="753"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="804"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="656"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="781"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="877"/>
+        <source>Sample stopdepth</source>
+        <translation>Profundidad de parada de la muestra</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="658"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="783"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="879"/>
         <source>Sample pressure</source>
         <translation>Presión de la muestra</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="656"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="868"/>
-        <source>Divemaster</source>
-        <translation>Divemaster</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="660"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="785"/>
+        <source>Sample setpoint</source>
+        <translation>Setpoint de la muestra</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="657"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="870"/>
-        <source>Buddy</source>
-        <translation>Compañero</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="664"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="759"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="929"/>
+        <source>Dive #</source>
+        <translation>Inmersión n.º</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="659"/>
-        <source>Rating</source>
-        <translation>Valoración</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="665"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="753"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="931"/>
+        <source>Date</source>
+        <translation>Fecha</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="660"/>
-        <source>Visibility</source>
-        <translation>Visibilidad</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="666"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="757"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="933"/>
+        <source>Time</source>
+        <translation>Hora de entrada</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="661"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="874"/>
-        <source>Notes</source>
-        <translation>Notas</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="667"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="935"/>
+        <source>Duration</source>
+        <translation>Duración</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="662"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="876"/>
-        <source>Weight</source>
-        <translation>Peso</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="668"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="941"/>
+        <source>Max. depth</source>
+        <translation>Prof. máxima</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="669"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="943"/>
+        <source>Avg. depth</source>
+        <translation>Prof. media</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="670"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="975"/>
+        <source>Air temp.</source>
+        <translation>Temperatura del aire</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="671"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="977"/>
+        <source>Water temp.</source>
+        <translation>Temperatura del agua</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="649"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="888"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="672"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="965"/>
         <source>Cyl. size</source>
         <translation>Tam.botella</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="650"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="890"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="673"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="967"/>
         <source>Start pressure</source>
         <translation>Presión inicial</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="651"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="892"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="674"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="969"/>
         <source>End pressure</source>
         <translation>Presión final</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="647"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="898"/>
-        <source>Air temp.</source>
-        <translation>Temperatura del aire</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="675"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="971"/>
+        <source>O₂</source>
+        <translation>O₂</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="648"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="900"/>
-        <source>Water temp.</source>
-        <translation>Temperatura del agua</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="676"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="973"/>
+        <source>He</source>
+        <translation>He</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="677"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="937"/>
+        <source>Location</source>
+        <translation>Ubicación</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="678"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="939"/>
+        <source>GPS</source>
+        <translation>GPS</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="679"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="945"/>
+        <source>Divemaster</source>
+        <translation>Divemaster</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="680"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="947"/>
+        <source>Buddy</source>
+        <translation>Compañero</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="681"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="949"/>
+        <source>Suit</source>
+        <translation>Traje</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="682"/>
+        <source>Rating</source>
+        <translation>Valoración</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="683"/>
+        <source>Visibility</source>
+        <translation>Visibilidad</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="684"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="951"/>
+        <source>Notes</source>
+        <translation>Notas</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="685"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="953"/>
+        <source>Weight</source>
+        <translation>Peso</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="686"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="955"/>
+        <source>Tags</source>
+        <translation>Etiquetas</translation>
     </message>
 </context>
 <context>
     <name>DiveObjectHelper</name>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="287"/>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="323"/>
         <source>%1 dive(s)</source>
         <translation>%1 inmersión(es)</translation>
     </message>
@@ -2979,18 +3047,18 @@ GPS actual:</translation>
 <context>
     <name>DivePlanner</name>
     <message>
-        <location filename="../desktop-widgets/diveplanner.ui" line="152"/>
-        <location filename="../build/ui_diveplanner.h" line="190"/>
-        <source>Altitude</source>
-        <translation>Altitud</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/diveplanner.ui" line="109"/>
         <location filename="../build/ui_diveplanner.h" line="189"/>
         <source>Planned dive time</source>
         <translation>Fecha/Hora de la inmersión planeada</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/diveplanner.ui" line="152"/>
+        <location filename="../build/ui_diveplanner.h" line="190"/>
+        <source>Altitude</source>
+        <translation>Altitud</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/diveplanner.ui" line="159"/>
         <location filename="../build/ui_diveplanner.h" line="191"/>
         <source>ATM pressure</source>
@@ -3024,32 +3092,32 @@ GPS actual:</translation>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="134"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="136"/>
         <source>unknown</source>
         <translation>desconocido</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="312"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="326"/>
         <source>Final depth</source>
         <translation>Profundidad final</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="314"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="328"/>
         <source>Run time</source>
         <translation>Tiempo acumulado</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="316"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="330"/>
         <source>Duration</source>
         <translation>Duración</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="318"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="332"/>
         <source>Used gas</source>
         <translation>Gas usado</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="320"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="334"/>
         <source>CC setpoint</source>
         <translation>CC setpoint</translation>
     </message>
@@ -3057,22 +3125,22 @@ GPS actual:</translation>
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="108"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="112"/>
         <source>Dive planner points</source>
         <translation>Puntos del planificador de inmersiones</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="112"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="116"/>
         <source>Available gases</source>
         <translation>Gases disponibles</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="137"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="143"/>
         <source>Add dive data point</source>
         <translation>Añadir punto de datos de inmersión.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="146"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="152"/>
         <source>Save new</source>
         <translation>Guardar nueva</translation>
     </message>
@@ -3105,11 +3173,36 @@ GPS actual:</translation>
         <translation>Color</translation>
     </message>
     <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="124"/>
+        <source>User entered</source>
+        <translation>Introducido por el usuario</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="126"/>
+        <source>Cylinder index</source>
+        <translation>Índice de botellas</translation>
+    </message>
+    <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="128"/>
         <source>Pressure S</source>
         <translation>Presión S</translation>
     </message>
     <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="130"/>
+        <source>Pressure I</source>
+        <translation>Presión I</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="132"/>
+        <source>Ceiling</source>
+        <translation>Techo</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="134"/>
+        <source>SAC</source>
+        <translation>CAS</translation>
+    </message>
+    <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="136"/>
         <source>pN₂</source>
         <translation>pN₂</translation>
@@ -3145,49 +3238,24 @@ GPS actual:</translation>
         <translation>Sensor 3</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="152"/>
-        <source>Heart rate</source>
-        <translation>Ritmo cardiaco</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="156"/>
-        <source>Mean depth @ s</source>
-        <translation>Profundidad/es media/s</translation>
-    </message>
-    <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="150"/>
         <source>Ambient pressure</source>
         <translation>Presión ambiental</translation>
     </message>
     <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="152"/>
+        <source>Heart rate</source>
+        <translation>Ritmo cardiaco</translation>
+    </message>
+    <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="154"/>
         <source>Gradient factor</source>
         <translation>Factor de gradiente</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="130"/>
-        <source>Pressure I</source>
-        <translation>Presión I</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="124"/>
-        <source>User entered</source>
-        <translation>Introducido por el usuario</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="126"/>
-        <source>Cylinder index</source>
-        <translation>Índice de botellas</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="132"/>
-        <source>Ceiling</source>
-        <translation>Techo</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="134"/>
-        <source>SAC</source>
-        <translation>CAS</translation>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="156"/>
+        <source>Mean depth @ s</source>
+        <translation>Profundidad/es media/s</translation>
     </message>
 </context>
 <context>
@@ -3258,311 +3326,315 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="395"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="441"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="434"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="483"/>
         <source>#</source>
         <translation>N.º</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="398"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="444"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="437"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="486"/>
         <source>Date</source>
         <translation>Fecha</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="401"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="447"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="440"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="489"/>
         <source>Rating</source>
         <translation>Valoración</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="404"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="443"/>
         <source>Depth</source>
         <translation>Prof.</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="410"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="446"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="495"/>
+        <source>Duration</source>
+        <translation>Duración</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="449"/>
         <source>Temp</source>
         <translation>Temp</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="413"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="452"/>
         <source>Weight</source>
         <translation>Peso</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="425"/>
-        <source>SAC</source>
-        <translation>CAS</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
-        <source>m</source>
-        <translation>m</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
-        <source>ft</source>
-        <translation>ft</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
-        <source>Weight(%1)</source>
-        <translation>Lastre(%1)</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="416"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="462"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="455"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="504"/>
         <source>Suit</source>
         <translation>Traje</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="419"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="465"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="458"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="507"/>
         <source>Cyl</source>
         <translation>Botella</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="422"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="468"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="461"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="510"/>
         <source>Gas</source>
         <translation>Gas</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
-        <source>SAC(%1)</source>
-        <translation>CAS(%1)</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="464"/>
+        <source>SAC</source>
+        <translation>CAS</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
-        <source>/min</source>
-        <translation>/min</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="467"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="518"/>
+        <source>OTU</source>
+        <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="431"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="479"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="470"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="521"/>
         <source>Max CNS</source>
         <translation>CNS máximo</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="434"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="482"/>
-        <source>Location</source>
-        <translation>Ubicación</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
+        <source>Photos</source>
+        <translation>Fotos</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
-        <source>kg</source>
-        <translation>kg</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="476"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="527"/>
+        <source>Location</source>
+        <translation>Ubicación</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="492"/>
         <source>Depth(%1)</source>
         <translation>Prof.(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="407"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="453"/>
-        <source>Duration</source>
-        <translation>Duración</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="492"/>
+        <source>m</source>
+        <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="456"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="492"/>
+        <source>ft</source>
+        <translation>ft</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="498"/>
         <source>Temp(%1%2)</source>
         <translation>Temp(%1%2)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="501"/>
+        <source>Weight(%1)</source>
+        <translation>Lastre(%1)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="501"/>
+        <source>kg</source>
+        <translation>kg</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="501"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="428"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="476"/>
-        <source>OTU</source>
-        <translation>OTU</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="515"/>
+        <source>SAC(%1)</source>
+        <translation>CAS(%1)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="515"/>
+        <source>/min</source>
+        <translation>/min</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="524"/>
+        <source>Photos before/during/after dive</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="164"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="165"/>
         <source>no dives were selected</source>
         <translation>No se seleccionó ninguna inmersión</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="174"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="175"/>
         <source>stylesheet to export to divelogs.de is not found</source>
         <translation>No se ha encontrado la hoja de estilo para exportar a divelogs.de</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="184"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="185"/>
         <source>failed to create zip file for upload: %s</source>
         <translation>Fallo al crear archivo .zip para subir: %s</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="236"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="237"/>
         <source>internal error</source>
         <translation>Error interno</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="244"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="245"/>
         <source>Conversion of dive %1 to divelogs.de format failed</source>
         <translation>Ha fallado la conversión de la inmersión %d al formato de divelogs.de</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="272"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="273"/>
         <source>error writing zip file: %s zip error %d system error %d - %s</source>
         <translation>error al escribir el archivo zip:  %s error de zip %d error de sistema %d - %s</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="745"/>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="935"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="936"/>
         <source>Done</source>
         <translation>Hecho</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="778"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="779"/>
         <source>Uploading dive list...</source>
         <translation>Subiendo lista de inmersiones…</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="810"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="811"/>
         <source>Downloading dive list...</source>
         <translation>Descargando lista de inmersiones…</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="851"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="852"/>
         <source>Downloading %1 dives...</source>
         <translation>Descargando %1 inmersiones…</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="885"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="886"/>
         <source>Download finished - %1</source>
         <translation>Descarga finalizada - %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="899"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="900"/>
         <source>Problem with download</source>
         <translation>Problema con la descarga</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="900"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="901"/>
         <source>The archive could not be opened:
 </source>
         <translation>No se ha podido abrir el archivo:
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="909"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="910"/>
         <source>Corrupted download</source>
         <translation>Descarga corrompida</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="910"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="911"/>
         <source>The archive could not be opened:
 %1</source>
         <translation>El archivo no pudo abrirse
 %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="937"/>
+        <source>Upload finished</source>
+        <translation>Subida finalizada</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="950"/>
         <source>Upload failed</source>
         <translation>La subida ha fallado</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="952"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="953"/>
         <source>Upload successful</source>
         <translation>Subida correcta</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="955"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="956"/>
         <source>Login failed</source>
         <translation>El acceso ha fallado</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="958"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="959"/>
         <source>Cannot parse response</source>
         <translation>No se puede leer la respuesta</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="970"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="971"/>
         <source>Error: %1</source>
         <translation>Error: %1</translation>
     </message>
-    <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="936"/>
-        <source>Upload finished</source>
-        <translation>Subida finalizada</translation>
-    </message>
 </context>
 <context>
     <name>DownloadFromDCWidget</name>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="185"/>
-        <source>Error</source>
-        <translation>Error</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="436"/>
-        <source>Retry</source>
-        <translation>Intentar de nuevo</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="280"/>
-        <source>Find Uemis dive computer</source>
-        <translation>Encontrar ordenador de buceo Uemis</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="101"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="107"/>
         <source>Download</source>
         <translation>Descargar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="104"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="110"/>
         <source>Choose Bluetooth download mode</source>
         <translation>Elegir modo de descarga Bluetooth</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="382"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="191"/>
+        <source>Error</source>
+        <translation>Error</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="286"/>
+        <source>Find Uemis dive computer</source>
+        <translation>Encontrar ordenador de buceo Uemis</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="392"/>
         <source>Choose file for divecomputer download logfile</source>
         <translation>Selecciona archivo para registro de descarga de libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="383"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="393"/>
         <source>Log files (*.log)</source>
         <translation>Archivos Log (*.log)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="398"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="408"/>
         <source>Warning</source>
         <translation>Advertencia</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="399"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="409"/>
         <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="../desktop-widgets/downloadfromdivecomputer.cpp" line="410"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="420"/>
         <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="../desktop-widgets/downloadfromdivecomputer.cpp" line="411"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="421"/>
         <source>Dump files (*.bin)</source>
         <translation>Archivos de volcado (*.bin)</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="446"/>
+        <source>Retry</source>
+        <translation>Intentar de nuevo</translation>
+    </message>
 </context>
 <context>
     <name>DownloadFromDiveComputer</name>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="139"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="275"/>
-        <source>Vendor</source>
-        <translation>Proveedor</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="14"/>
         <location filename="../build/ui_downloadfromdivecomputer.h" line="265"/>
         <source>Download from dive computer</source>
@@ -3575,17 +3647,6 @@ p, li { white-space: pre-wrap; }
         <translation>Dispositivo o punto de montaje</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="122"/>
-        <source>Choose Bluetooth download mode</source>
-        <translation>Elegir modo de descarga Bluetooth</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="149"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="276"/>
-        <source>Dive computer</source>
-        <translation>Ordenador de buceo</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="66"/>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="101"/>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="115"/>
@@ -3609,11 +3670,46 @@ p, li { white-space: pre-wrap; }
         <translation>Preferir siempre las inmersiones descargadas</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="87"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="270"/>
+        <source>Download into new trip</source>
+        <translation>Descargar a un nuevo viaje</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="94"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="271"/>
+        <source>Save libdivecomputer logfile</source>
+        <translation>Guardar registro de libdivecomputer</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="108"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="273"/>
+        <source>Save libdivecomputer dumpfile</source>
+        <translation>Guardar volcado de libdivecomputer</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="122"/>
+        <source>Choose Bluetooth download mode</source>
+        <translation>Elegir modo de descarga Bluetooth</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="129"/>
         <source>Select a remote Bluetooth device.</source>
         <translation>Selecciona un dispositivo Bluetooth remoto</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="139"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="275"/>
+        <source>Vendor</source>
+        <translation>Proveedor</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="149"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="276"/>
+        <source>Dive computer</source>
+        <translation>Ordenador de buceo</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/>
         <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="52"/>
         <location filename="../build/ui_downloadfromdivecomputer.h" line="277"/>
@@ -3621,18 +3717,6 @@ p, li { white-space: pre-wrap; }
         <translation>Descargar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="284"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="281"/>
-        <source>OK</source>
-        <translation>Aceptar</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="291"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="282"/>
-        <source>Cancel</source>
-        <translation>Cancelar</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="226"/>
         <location filename="../build/ui_downloadfromdivecomputer.h" line="278"/>
         <source>Downloaded dives</source>
@@ -3651,22 +3735,16 @@ p, li { white-space: pre-wrap; }
         <translation>Deseleccionar todo</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="94"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="271"/>
-        <source>Save libdivecomputer logfile</source>
-        <translation>Guardar registro de libdivecomputer</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="108"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="273"/>
-        <source>Save libdivecomputer dumpfile</source>
-        <translation>Guardar volcado de libdivecomputer</translation>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="284"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="281"/>
+        <source>OK</source>
+        <translation>Aceptar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="87"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="270"/>
-        <source>Download into new trip</source>
-        <translation>Descargar a un nuevo viaje</translation>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="291"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="282"/>
+        <source>Cancel</source>
+        <translation>Cancelar</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="16"/>
@@ -3756,12 +3834,12 @@ p, li { white-space: pre-wrap; }
         <translation>Posición del conector a Facebook</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="297"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="242"/>
         <source>To disconnect Subsurface from your Facebook account, use the button below</source>
         <translation>Para desconectar Subsurface de su cuenta en Facebook, use el botón de abajo</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="306"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="251"/>
         <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source>
         <translation>Para conectar con Facebook, por favor inicie sesión. Esto permitirá a Subsurface publicar inmersiones en su historial.</translation>
     </message>
@@ -3769,22 +3847,22 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>FacebookManager</name>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="266"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="211"/>
         <source>Photo upload sucessfull</source>
         <translation>Foto enviada correctamente</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="267"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="212"/>
         <source>Your dive profile was updated to Facebook.</source>
         <translation>Tu perfil de buceo se ha subido a Facebook.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="271"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="216"/>
         <source>Photo upload failed</source>
         <translation>Fallo envío de Foto</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="272"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="217"/>
         <source>Your dive profile was not updated to Facebook, 
  please send the following to the developer. 
 </source>
@@ -3846,17 +3924,25 @@ por favor envía lo siguiente al equipo de desarrollo.
 <context>
     <name>FirmwareUpdateThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1750"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1739"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Esta función no está disponible, todavía, para el ordenador seleccionado</translation>
     </message>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1755"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1744"/>
         <source>Firmware update failed!</source>
         <translation>¡ Ha fallado la actualización de firmware !</translation>
     </message>
 </context>
 <context>
+    <name>GlobalDrawer</name>
+    <message>
+        <location filename="../mobile-widgets/qml/kirigami/src/controls/GlobalDrawer.qml" line="364"/>
+        <source>Back</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>GlobeGPS</name>
     <message>
         <location filename="../desktop-widgets/globe.cpp" line="124"/>
@@ -3872,27 +3958,27 @@ por favor envía lo siguiente al equipo de desarrollo.
         <translation>Posiciones GPS</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="40"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="32"/>
         <source>Date: </source>
         <translation>Fecha:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="50"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="42"/>
         <source>Name: </source>
         <translation>Nombre:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="60"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="52"/>
         <source>Latitude: </source>
         <translation>Latitud:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="69"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="61"/>
         <source>Longitude: </source>
         <translation>Longitud:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="113"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="105"/>
         <source>List of stored GPS fixes</source>
         <translation>Lista de posiciones GPS guardadas</translation>
     </message>
@@ -3921,7 +4007,7 @@ por favor envía lo siguiente al equipo de desarrollo.
 <context>
     <name>LocationFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="648"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="646"/>
         <source>Location: </source>
         <translation>Ubicación: </translation>
     </message>
@@ -3962,7 +4048,7 @@ por favor envía lo siguiente al equipo de desarrollo.
 <context>
     <name>LocationFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="299"/>
+        <location filename="../qt-models/filtermodels.cpp" line="304"/>
         <source>No location set</source>
         <translation>Sin localización</translation>
     </message>
@@ -4086,6 +4172,54 @@ por favor envía lo siguiente al equipo de desarrollo.
 <context>
     <name>MainTab</name>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="18"/>
+        <location filename="../desktop-widgets/maintab.ui" line="439"/>
+        <location filename="../build/ui_maintab.h" line="961"/>
+        <location filename="../build/ui_maintab.h" line="963"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="539"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="571"/>
+        <source>Notes</source>
+        <translation>Notas</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="21"/>
+        <location filename="../build/ui_maintab.h" line="964"/>
+        <source>General notes about the current selection</source>
+        <translation>Notas generales de la selección actual</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="92"/>
+        <location filename="../desktop-widgets/maintab.ui" line="646"/>
+        <location filename="../build/ui_maintab.h" line="947"/>
+        <location filename="../build/ui_maintab.h" line="967"/>
+        <source>Date</source>
+        <translation>Fecha</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="102"/>
+        <location filename="../build/ui_maintab.h" line="948"/>
+        <source>Time</source>
+        <translation>Hora de entrada</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="112"/>
+        <location filename="../desktop-widgets/maintab.ui" line="836"/>
+        <location filename="../build/ui_maintab.h" line="949"/>
+        <location filename="../build/ui_maintab.h" line="987"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="306"/>
+        <source>Air temp.</source>
+        <translation>Temperatura del aire</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="122"/>
+        <location filename="../desktop-widgets/maintab.ui" line="855"/>
+        <location filename="../build/ui_maintab.h" line="950"/>
+        <location filename="../build/ui_maintab.h" line="989"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="307"/>
+        <source>Water temp.</source>
+        <translation>Temperatura del agua</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="184"/>
         <location filename="../build/ui_maintab.h" line="951"/>
         <location filename="../desktop-widgets/maintab.cpp" line="570"/>
@@ -4093,6 +4227,17 @@ por favor envía lo siguiente al equipo de desarrollo.
         <translation>Ubicación</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="214"/>
+        <source>Edit dive site</source>
+        <translation>Editar punto de buceo</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="217"/>
+        <location filename="../build/ui_maintab.h" line="953"/>
+        <source>...</source>
+        <translation>…</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="252"/>
         <location filename="../build/ui_maintab.h" line="954"/>
         <source>Divemaster</source>
@@ -4105,12 +4250,6 @@ por favor envía lo siguiente al equipo de desarrollo.
         <translation>Compañero</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.ui" line="387"/>
-        <location filename="../build/ui_maintab.h" line="959"/>
-        <source>Tags</source>
-        <translation>Etiquetas</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/maintab.ui" line="308"/>
         <location filename="../build/ui_maintab.h" line="956"/>
         <source>Rating</source>
@@ -4129,57 +4268,18 @@ por favor envía lo siguiente al equipo de desarrollo.
         <translation>Traje</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="387"/>
+        <location filename="../build/ui_maintab.h" line="959"/>
+        <source>Tags</source>
+        <translation>Etiquetas</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="397"/>
         <location filename="../build/ui_maintab.h" line="960"/>
         <source>Dive mode</source>
         <translation>Modo de buceo</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.ui" line="112"/>
-        <location filename="../desktop-widgets/maintab.ui" line="836"/>
-        <location filename="../build/ui_maintab.h" line="949"/>
-        <location filename="../build/ui_maintab.h" line="987"/>
-        <location filename="../desktop-widgets/maintab.cpp" line="306"/>
-        <source>Air temp.</source>
-        <translation>Temperatura del aire</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="122"/>
-        <location filename="../desktop-widgets/maintab.ui" line="855"/>
-        <location filename="../build/ui_maintab.h" line="950"/>
-        <location filename="../build/ui_maintab.h" line="989"/>
-        <location filename="../desktop-widgets/maintab.cpp" line="307"/>
-        <source>Water temp.</source>
-        <translation>Temperatura del agua</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="18"/>
-        <location filename="../desktop-widgets/maintab.ui" line="439"/>
-        <location filename="../build/ui_maintab.h" line="961"/>
-        <location filename="../build/ui_maintab.h" line="963"/>
-        <location filename="../desktop-widgets/maintab.cpp" line="539"/>
-        <location filename="../desktop-widgets/maintab.cpp" line="571"/>
-        <source>Notes</source>
-        <translation>Notas</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="21"/>
-        <location filename="../build/ui_maintab.h" line="964"/>
-        <source>General notes about the current selection</source>
-        <translation>Notas generales de la selección actual</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="214"/>
-        <source>Edit dive site</source>
-        <translation>Editar punto de buceo</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="217"/>
-        <location filename="../build/ui_maintab.h" line="953"/>
-        <source>...</source>
-        <translation>…</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/maintab.ui" line="491"/>
         <location filename="../build/ui_maintab.h" line="965"/>
         <source>Equipment</source>
@@ -4204,6 +4304,12 @@ por favor envía lo siguiente al equipo de desarrollo.
         <translation>Información de la inmersión</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="665"/>
+        <location filename="../build/ui_maintab.h" line="969"/>
+        <source>Interval</source>
+        <translation>Intervalo</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="684"/>
         <location filename="../build/ui_maintab.h" line="971"/>
         <source>Gases used</source>
@@ -4216,18 +4322,38 @@ por favor envía lo siguiente al equipo de desarrollo.
         <translation>Gas consumido</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="722"/>
+        <location filename="../desktop-widgets/maintab.ui" line="1094"/>
+        <location filename="../build/ui_maintab.h" line="975"/>
+        <location filename="../build/ui_maintab.h" line="1003"/>
+        <source>SAC</source>
+        <translation>CAS</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="741"/>
         <location filename="../build/ui_maintab.h" line="977"/>
         <source>CNS</source>
         <translation>CNS</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="760"/>
+        <location filename="../build/ui_maintab.h" line="979"/>
+        <source>OTU</source>
+        <translation>OTU</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="779"/>
         <location filename="../build/ui_maintab.h" line="981"/>
         <source>Max. depth</source>
         <translation>Prof. máxima</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="798"/>
+        <location filename="../build/ui_maintab.h" line="983"/>
+        <source>Avg. depth</source>
+        <translation>Prof. media</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="817"/>
         <location filename="../build/ui_maintab.h" line="985"/>
         <source>Air pressure</source>
@@ -4240,82 +4366,6 @@ por favor envía lo siguiente al equipo de desarrollo.
         <translation>Duración de la inmersión</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.ui" line="933"/>
-        <location filename="../build/ui_maintab.h" line="1007"/>
-        <source>Simple statistics about the selection</source>
-        <translation>Estadísticas simples de la selección</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1039"/>
-        <location filename="../build/ui_maintab.h" line="999"/>
-        <source>Total time</source>
-        <translation>Tiempo total</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1106"/>
-        <location filename="../build/ui_maintab.h" line="1004"/>
-        <source>Gas consumption</source>
-        <translation>Consumo de gas</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1151"/>
-        <location filename="../build/ui_maintab.h" line="1009"/>
-        <source>All photos from the current selection</source>
-        <translation>Todas las fotos de la selección actual</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1177"/>
-        <location filename="../build/ui_maintab.h" line="1010"/>
-        <source>Extra data</source>
-        <translation>Otros datos</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1180"/>
-        <location filename="../build/ui_maintab.h" line="1011"/>
-        <source>Adittional data from the dive computer</source>
-        <translation>Datos adicionales del ordenador de buceo</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="92"/>
-        <location filename="../desktop-widgets/maintab.ui" line="646"/>
-        <location filename="../build/ui_maintab.h" line="947"/>
-        <location filename="../build/ui_maintab.h" line="967"/>
-        <source>Date</source>
-        <translation>Fecha</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="102"/>
-        <location filename="../build/ui_maintab.h" line="948"/>
-        <source>Time</source>
-        <translation>Hora de entrada</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="665"/>
-        <location filename="../build/ui_maintab.h" line="969"/>
-        <source>Interval</source>
-        <translation>Intervalo</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="722"/>
-        <location filename="../desktop-widgets/maintab.ui" line="1094"/>
-        <location filename="../build/ui_maintab.h" line="975"/>
-        <location filename="../build/ui_maintab.h" line="1003"/>
-        <source>SAC</source>
-        <translation>CAS</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="798"/>
-        <location filename="../build/ui_maintab.h" line="983"/>
-        <source>Avg. depth</source>
-        <translation>Prof. media</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="760"/>
-        <location filename="../build/ui_maintab.h" line="979"/>
-        <source>OTU</source>
-        <translation>OTU</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/maintab.ui" line="893"/>
         <location filename="../build/ui_maintab.h" line="993"/>
         <source>Salinity</source>
@@ -4328,22 +4378,34 @@ por favor envía lo siguiente al equipo de desarrollo.
         <translation>Estadísticas</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="933"/>
+        <location filename="../build/ui_maintab.h" line="1007"/>
+        <source>Simple statistics about the selection</source>
+        <translation>Estadísticas simples de la selección</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="986"/>
         <location filename="../build/ui_maintab.h" line="996"/>
         <source>Depth</source>
         <translation>Profundidad</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="998"/>
+        <location filename="../build/ui_maintab.h" line="997"/>
+        <source>Duration</source>
+        <translation>Duración</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="1027"/>
         <location filename="../build/ui_maintab.h" line="998"/>
         <source>Temperature</source>
         <translation>Temperatura</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.ui" line="998"/>
-        <location filename="../build/ui_maintab.h" line="997"/>
-        <source>Duration</source>
-        <translation>Duración</translation>
+        <location filename="../desktop-widgets/maintab.ui" line="1039"/>
+        <location filename="../build/ui_maintab.h" line="999"/>
+        <source>Total time</source>
+        <translation>Tiempo total</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/maintab.ui" line="1058"/>
@@ -4352,20 +4414,34 @@ por favor envía lo siguiente al equipo de desarrollo.
         <translation>Inmersiones</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="1106"/>
+        <location filename="../build/ui_maintab.h" line="1004"/>
+        <source>Gas consumption</source>
+        <translation>Consumo de gas</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="1148"/>
         <location filename="../build/ui_maintab.h" line="1008"/>
         <source>Photos</source>
         <translation>Fotos</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.cpp" line="88"/>
-        <source>Cylinders</source>
-        <translation>Botellas</translation>
+        <location filename="../desktop-widgets/maintab.ui" line="1151"/>
+        <location filename="../build/ui_maintab.h" line="1009"/>
+        <source>All photos from the current selection</source>
+        <translation>Todas las fotos de la selección actual</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.cpp" line="92"/>
-        <source>Weights</source>
-        <translation>Lastre</translation>
+        <location filename="../desktop-widgets/maintab.ui" line="1177"/>
+        <location filename="../build/ui_maintab.h" line="1010"/>
+        <source>Extra data</source>
+        <translation>Otros datos</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="1180"/>
+        <location filename="../build/ui_maintab.h" line="1011"/>
+        <source>Adittional data from the dive computer</source>
+        <translation>Datos adicionales del ordenador de buceo</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/maintab.cpp" line="63"/>
@@ -4378,11 +4454,21 @@ por favor envía lo siguiente al equipo de desarrollo.
         <translation>Descartar cambios</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.cpp" line="88"/>
+        <source>Cylinders</source>
+        <translation>Botellas</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.cpp" line="89"/>
         <source>Add cylinder</source>
         <translation>Añadir botella</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.cpp" line="92"/>
+        <source>Weights</source>
+        <translation>Lastre</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.cpp" line="93"/>
         <source>Add weight system</source>
         <translation>Añadir sistema de lastre</translation>
@@ -4575,659 +4661,685 @@ a partir de aire y usando:
         <translation>Archivo</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="455"/>
-        <location filename="../build/ui_mainwindow.h" line="534"/>
-        <source>Export dive logs</source>
-        <translation>Exportar diarios de buceo</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="510"/>
-        <location filename="../build/ui_mainwindow.h" line="542"/>
-        <source>Toggle pHe graph</source>
-        <translation>Activar el gráfico de pHe</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="546"/>
-        <location filename="../build/ui_mainwindow.h" line="545"/>
-        <source>Toggle calculating all tissues</source>
-        <translation>Activar cálculo de todos los tejidos</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="522"/>
-        <location filename="../build/ui_mainwindow.h" line="543"/>
-        <source>Toggle DC reported ceiling</source>
-        <translation>Activar techo informado por el ordenador</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="534"/>
-        <location filename="../build/ui_mainwindow.h" line="544"/>
-        <source>Toggle calculated ceiling</source>
-        <translation>Activar techo calculado</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="606"/>
-        <location filename="../build/ui_mainwindow.h" line="550"/>
-        <source>Toggle NDL, TTS</source>
-        <translation>Activar LND, TTS</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="558"/>
-        <location filename="../build/ui_mainwindow.h" line="546"/>
-        <source>Toggle calculated ceiling with 3m increments</source>
-        <translation>Activar techo calculado con incrementos de 3m</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="463"/>
-        <location filename="../build/ui_mainwindow.h" line="537"/>
-        <source>Configure &amp;dive computer</source>
-        <translation>Configurar or&amp;denador de buceo</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="570"/>
-        <location filename="../build/ui_mainwindow.h" line="547"/>
-        <source>Toggle heart rate</source>
-        <translation>Activar ritmo cardiaco</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="582"/>
-        <location filename="../build/ui_mainwindow.h" line="548"/>
-        <source>Toggle MOD</source>
-        <translation>Activar PMO</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="594"/>
-        <location filename="../build/ui_mainwindow.h" line="549"/>
-        <source>Toggle EAD, END, EADD</source>
-        <translation>Activar PEA, PNE y EADD</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="618"/>
-        <location filename="../build/ui_mainwindow.h" line="551"/>
-        <source>Toggle SAC rate</source>
-        <translation>Activar tasa de CAS</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="630"/>
-        <location filename="../build/ui_mainwindow.h" line="552"/>
-        <source>Toggle ruler</source>
-        <translation>Activar regla</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="86"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="87"/>
         <location filename="../build/ui_mainwindow.h" line="569"/>
         <source>&amp;Log</source>
         <translation>Registro</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="105"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="104"/>
         <location filename="../build/ui_mainwindow.h" line="570"/>
         <source>&amp;View</source>
         <translation>&amp;Vista</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="121"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="120"/>
         <location filename="../build/ui_mainwindow.h" line="571"/>
         <source>&amp;Help</source>
         <translation>Ayuda</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="130"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="129"/>
         <location filename="../build/ui_mainwindow.h" line="572"/>
         <source>&amp;Import</source>
         <translation>&amp;Importar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="139"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="138"/>
         <location filename="../build/ui_mainwindow.h" line="573"/>
         <source>&amp;Edit</source>
         <translation>&amp;Editar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="144"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="143"/>
         <source>Share on</source>
         <translation>Compartir</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="158"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="157"/>
         <location filename="../build/ui_mainwindow.h" line="453"/>
         <source>&amp;New logbook</source>
         <translation>&amp;Nuevo registro</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="161"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="160"/>
         <location filename="../build/ui_mainwindow.h" line="455"/>
         <source>New</source>
         <translation>Nuevo</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="164"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="163"/>
         <location filename="../build/ui_mainwindow.h" line="457"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="169"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="168"/>
         <location filename="../build/ui_mainwindow.h" line="458"/>
         <source>&amp;Open logbook</source>
         <translation>Abrir registr&amp;o</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="172"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="171"/>
         <location filename="../build/ui_mainwindow.h" line="460"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="508"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="502"/>
         <source>Open</source>
         <translation>Abrir</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="175"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="174"/>
         <location filename="../build/ui_mainwindow.h" line="462"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="180"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="179"/>
         <location filename="../build/ui_mainwindow.h" line="463"/>
         <source>&amp;Save</source>
         <translation>Guardar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="183"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="182"/>
         <location filename="../build/ui_mainwindow.h" line="465"/>
         <source>Save</source>
         <translation>Guardar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="186"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="185"/>
         <location filename="../build/ui_mainwindow.h" line="467"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="191"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="190"/>
         <location filename="../build/ui_mainwindow.h" line="468"/>
         <source>Sa&amp;ve as</source>
         <translation>Guardar como</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="194"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="193"/>
         <location filename="../build/ui_mainwindow.h" line="470"/>
         <source>Save as</source>
         <translation>Guardar como</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="197"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="196"/>
         <location filename="../build/ui_mainwindow.h" line="472"/>
         <source>Ctrl+Shift+S</source>
         <translation>Ctrl+Shift+S</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="202"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="201"/>
         <location filename="../build/ui_mainwindow.h" line="473"/>
         <source>&amp;Close</source>
         <translation>&amp;Cerrar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="205"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="204"/>
         <location filename="../build/ui_mainwindow.h" line="475"/>
         <source>Close</source>
         <translation>Cerrar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="208"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="207"/>
         <location filename="../build/ui_mainwindow.h" line="477"/>
         <source>Ctrl+W</source>
         <translation>Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="221"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="212"/>
+        <location filename="../build/ui_mainwindow.h" line="478"/>
+        <source>&amp;Print</source>
+        <translation>Im&amp;primir</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="215"/>
+        <location filename="../build/ui_mainwindow.h" line="479"/>
+        <source>Ctrl+P</source>
+        <translation>Ctrl+P</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="220"/>
         <location filename="../build/ui_mainwindow.h" line="480"/>
         <source>P&amp;references</source>
         <translation>P&amp;referencias</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="251"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="223"/>
+        <location filename="../build/ui_mainwindow.h" line="481"/>
+        <source>Ctrl+,</source>
+        <translation>Ctrl+,</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="231"/>
+        <location filename="../build/ui_mainwindow.h" line="482"/>
+        <source>&amp;Quit</source>
+        <translation>Salir</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="234"/>
+        <location filename="../build/ui_mainwindow.h" line="483"/>
+        <source>Ctrl+Q</source>
+        <translation>Ctrl+Q</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="242"/>
+        <location filename="../build/ui_mainwindow.h" line="484"/>
+        <source>Import from &amp;dive computer</source>
+        <translation>Importar del or&amp;denador de buceo</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="245"/>
+        <location filename="../build/ui_mainwindow.h" line="485"/>
+        <source>Ctrl+D</source>
+        <translation>Ctrl+D</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="250"/>
         <location filename="../build/ui_mainwindow.h" line="486"/>
         <source>Import &amp;GPS data from Subsurface web service</source>
         <translation>Importar datos &amp;GPS del servicio web de Subsurface</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="259"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="253"/>
+        <location filename="../build/ui_mainwindow.h" line="487"/>
+        <source>Ctrl+G</source>
+        <translation>Ctrl+G</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="258"/>
         <location filename="../build/ui_mainwindow.h" line="488"/>
         <source>Edit device &amp;names</source>
         <translation>Editar &amp;nombres de dispositivos</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="272"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="263"/>
+        <location filename="../build/ui_mainwindow.h" line="489"/>
+        <source>&amp;Add dive</source>
+        <translation>&amp;Añadir inmersión</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="266"/>
+        <location filename="../build/ui_mainwindow.h" line="490"/>
+        <source>Ctrl++</source>
+        <translation>Ctrl++</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="271"/>
         <location filename="../build/ui_mainwindow.h" line="491"/>
         <source>&amp;Edit dive</source>
         <translation>&amp;Editar inmersión</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="277"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="276"/>
         <location filename="../build/ui_mainwindow.h" line="492"/>
         <source>&amp;Copy dive components</source>
         <translation>&amp;Copiar componentes</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="280"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="279"/>
         <location filename="../build/ui_mainwindow.h" line="493"/>
         <source>Ctrl+C</source>
         <translation>Ctrl+C</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="285"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="284"/>
         <location filename="../build/ui_mainwindow.h" line="494"/>
         <source>&amp;Paste dive components</source>
         <translation>&amp;Pegar componentes</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="288"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="287"/>
         <location filename="../build/ui_mainwindow.h" line="495"/>
         <source>Ctrl+V</source>
         <translation>Ctrl+V</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="325"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="292"/>
+        <location filename="../build/ui_mainwindow.h" line="496"/>
+        <source>&amp;Renumber</source>
+        <translation>&amp;Renumerar</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="295"/>
+        <location filename="../build/ui_mainwindow.h" line="497"/>
+        <source>Ctrl+R</source>
+        <translation>Ctrl+R</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="303"/>
+        <location filename="../build/ui_mainwindow.h" line="498"/>
+        <source>Auto &amp;group</source>
+        <translation>Auto a&amp;grupar</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="308"/>
+        <location filename="../build/ui_mainwindow.h" line="499"/>
+        <source>&amp;Yearly statistics</source>
+        <translation>Estadísticas anuales</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="311"/>
+        <location filename="../build/ui_mainwindow.h" line="500"/>
+        <source>Ctrl+Y</source>
+        <translation>Ctrl+Y</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="316"/>
+        <location filename="../build/ui_mainwindow.h" line="501"/>
+        <source>&amp;Dive list</source>
+        <translation>Lista &amp;de Inmersiones</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="319"/>
+        <location filename="../build/ui_mainwindow.h" line="502"/>
+        <source>Ctrl+2</source>
+        <translation>Ctrl+2</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="324"/>
         <location filename="../build/ui_mainwindow.h" line="503"/>
         <source>&amp;Profile</source>
         <translation>&amp;Perfil</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="333"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="327"/>
+        <location filename="../build/ui_mainwindow.h" line="504"/>
+        <source>Ctrl+3</source>
+        <translation>Ctrl+3</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="332"/>
         <location filename="../build/ui_mainwindow.h" line="505"/>
         <source>&amp;Info</source>
         <translation>&amp;Información</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="341"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="335"/>
+        <location filename="../build/ui_mainwindow.h" line="506"/>
+        <source>Ctrl+4</source>
+        <translation>Ctrl+4</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="340"/>
         <location filename="../build/ui_mainwindow.h" line="507"/>
         <source>&amp;All</source>
         <translation>Todo</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="357"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="343"/>
+        <location filename="../build/ui_mainwindow.h" line="508"/>
+        <source>Ctrl+1</source>
+        <translation>Ctrl+1</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="348"/>
+        <location filename="../build/ui_mainwindow.h" line="509"/>
+        <source>P&amp;revious DC</source>
+        <translation>Ante&amp;rior ordenador</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="351"/>
+        <location filename="../build/ui_mainwindow.h" line="510"/>
+        <source>Left</source>
+        <translation>Izquierda</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="356"/>
         <location filename="../build/ui_mainwindow.h" line="511"/>
         <source>&amp;Next DC</source>
         <translation>Siguie&amp;nte ordenador</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="365"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="359"/>
+        <location filename="../build/ui_mainwindow.h" line="512"/>
+        <source>Right</source>
+        <translation>Derecha</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="364"/>
         <location filename="../build/ui_mainwindow.h" line="513"/>
         <source>&amp;About Subsurface</source>
         <translation>&amp;Acerca de Subsurface</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="381"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="372"/>
+        <location filename="../build/ui_mainwindow.h" line="514"/>
+        <source>User &amp;manual</source>
+        <translation>&amp;Manual de usuario</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="375"/>
+        <location filename="../build/ui_mainwindow.h" line="515"/>
+        <source>F1</source>
+        <translation>F1</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="380"/>
         <location filename="../build/ui_mainwindow.h" line="516"/>
         <source>&amp;Globe</source>
         <translation>&amp;Globo</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="403"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="383"/>
+        <location filename="../build/ui_mainwindow.h" line="517"/>
+        <source>Ctrl+5</source>
+        <translation>Ctrl+5</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="388"/>
+        <location filename="../build/ui_mainwindow.h" line="518"/>
+        <source>P&amp;lan dive</source>
+        <translation>P&amp;lanificar inmersión</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="391"/>
+        <location filename="../build/ui_mainwindow.h" line="519"/>
+        <source>Ctrl+L</source>
+        <translation>Ctrl+L</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="396"/>
+        <location filename="../build/ui_mainwindow.h" line="520"/>
+        <source>&amp;Import log files</source>
+        <translation>&amp;Importar archivos de registro</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="399"/>
+        <location filename="../build/ui_mainwindow.h" line="522"/>
+        <source>Import divelog files from other applications</source>
+        <translation>Importar archivos de registro de otras aplicaciones</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="402"/>
         <location filename="../build/ui_mainwindow.h" line="524"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="408"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="407"/>
         <location filename="../build/ui_mainwindow.h" line="525"/>
         <source>Import &amp;from divelogs.de</source>
         <translation>Importar desde Divelogs.de</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="416"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="415"/>
         <location filename="../build/ui_mainwindow.h" line="526"/>
         <source>&amp;Full screen</source>
         <translation>Pantalla completa</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="419"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="418"/>
         <location filename="../build/ui_mainwindow.h" line="528"/>
         <source>Toggle full screen</source>
         <translation>Activar pantalla completa</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="447"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="421"/>
+        <location filename="../build/ui_mainwindow.h" line="530"/>
+        <source>F11</source>
+        <translation>F11</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="446"/>
         <location filename="../build/ui_mainwindow.h" line="531"/>
         <source>&amp;Check for updates</source>
         <translation>&amp;Comprobar si hay actualizaciones</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="452"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="451"/>
         <location filename="../build/ui_mainwindow.h" line="532"/>
         <source>&amp;Export</source>
         <translation>&amp;Exportar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="458"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="454"/>
+        <location filename="../build/ui_mainwindow.h" line="534"/>
+        <source>Export dive logs</source>
+        <translation>Exportar diarios de buceo</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="457"/>
         <location filename="../build/ui_mainwindow.h" line="536"/>
         <source>Ctrl+E</source>
         <translation>Ctrl+E</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="466"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="462"/>
+        <location filename="../build/ui_mainwindow.h" line="537"/>
+        <source>Configure &amp;dive computer</source>
+        <translation>Configurar or&amp;denador de buceo</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="465"/>
         <location filename="../build/ui_mainwindow.h" line="538"/>
         <source>Ctrl+Shift+C</source>
         <translation>Ctrl+Shift+C</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="474"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="473"/>
         <location filename="../build/ui_mainwindow.h" line="539"/>
         <source>Edit &amp;dive in planner</source>
         <translation>Editar inmersión en el planificador</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="486"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="485"/>
         <location filename="../build/ui_mainwindow.h" line="540"/>
         <source>Toggle pO₂ graph</source>
         <translation>Activar gráfico de pO₂</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="498"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="497"/>
         <location filename="../build/ui_mainwindow.h" line="541"/>
         <source>Toggle pN₂ graph</source>
         <translation>Activar gráfico de pN₂</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="642"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="509"/>
+        <location filename="../build/ui_mainwindow.h" line="542"/>
+        <source>Toggle pHe graph</source>
+        <translation>Activar el gráfico de pHe</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="521"/>
+        <location filename="../build/ui_mainwindow.h" line="543"/>
+        <source>Toggle DC reported ceiling</source>
+        <translation>Activar techo informado por el ordenador</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="533"/>
+        <location filename="../build/ui_mainwindow.h" line="544"/>
+        <source>Toggle calculated ceiling</source>
+        <translation>Activar techo calculado</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="545"/>
+        <location filename="../build/ui_mainwindow.h" line="545"/>
+        <source>Toggle calculating all tissues</source>
+        <translation>Activar cálculo de todos los tejidos</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="557"/>
+        <location filename="../build/ui_mainwindow.h" line="546"/>
+        <source>Toggle calculated ceiling with 3m increments</source>
+        <translation>Activar techo calculado con incrementos de 3m</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="569"/>
+        <location filename="../build/ui_mainwindow.h" line="547"/>
+        <source>Toggle heart rate</source>
+        <translation>Activar ritmo cardiaco</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="581"/>
+        <location filename="../build/ui_mainwindow.h" line="548"/>
+        <source>Toggle MOD</source>
+        <translation>Activar PMO</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="593"/>
+        <location filename="../build/ui_mainwindow.h" line="549"/>
+        <source>Toggle EAD, END, EADD</source>
+        <translation>Activar PEA, PNE y EADD</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="605"/>
+        <location filename="../build/ui_mainwindow.h" line="550"/>
+        <source>Toggle NDL, TTS</source>
+        <translation>Activar LND, TTS</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="617"/>
+        <location filename="../build/ui_mainwindow.h" line="551"/>
+        <source>Toggle SAC rate</source>
+        <translation>Activar tasa de CAS</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="629"/>
+        <location filename="../build/ui_mainwindow.h" line="552"/>
+        <source>Toggle ruler</source>
+        <translation>Activar regla</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="641"/>
         <location filename="../build/ui_mainwindow.h" line="553"/>
         <source>Scale graph</source>
         <translation>Escalar gráfico</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="654"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="653"/>
         <location filename="../build/ui_mainwindow.h" line="554"/>
         <source>Toggle pictures</source>
         <translation>Activar fotografías</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="666"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="665"/>
         <location filename="../build/ui_mainwindow.h" line="555"/>
         <source>Toggle tank bar</source>
         <translation>Activar barra de la botella</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="674"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="673"/>
         <location filename="../build/ui_mainwindow.h" line="556"/>
         <source>&amp;Filter divelist</source>
         <translation>&amp;Filtrar la lista de inmersiones</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="689"/>
-        <location filename="../build/ui_mainwindow.h" line="558"/>
-        <source>Toggle tissue graph</source>
-        <translation>Activar el gráfico de tejidos</translation>
+        <location filename="../desktop-widgets/mainwindow.ui" line="676"/>
+        <location filename="../build/ui_mainwindow.h" line="557"/>
+        <source>Ctrl+F</source>
+        <translation>Ctrl+F</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="688"/>
+        <source>Toggle tissue heat-map</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="694"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="693"/>
         <location filename="../build/ui_mainwindow.h" line="559"/>
         <source>User &amp;survey</source>
         <translation>Encuesta de u&amp;suario</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="699"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="698"/>
         <location filename="../build/ui_mainwindow.h" line="560"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="238"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="231"/>
         <source>&amp;Undo</source>
         <translation>Deshacer</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="702"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="701"/>
         <location filename="../build/ui_mainwindow.h" line="561"/>
         <source>Ctrl+Z</source>
         <translation>Ctrl+Z</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="707"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="706"/>
         <location filename="../build/ui_mainwindow.h" line="562"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="239"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="232"/>
         <source>&amp;Redo</source>
         <translation>&amp;Rehacer</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="710"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="709"/>
         <location filename="../build/ui_mainwindow.h" line="563"/>
         <source>Ctrl+Shift+Z</source>
         <translation>Ctrl+Shift+Z</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="715"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="714"/>
         <location filename="../build/ui_mainwindow.h" line="564"/>
         <source>&amp;Find moved images</source>
         <translation>Encontrar imágenes movidas</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="720"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="719"/>
         <source>Open c&amp;loud storage</source>
         <translation>Abrir a&amp;lmacenamiento en la nube</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="725"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="724"/>
         <source>Save to clo&amp;ud storage</source>
         <translation>Guardar en almacenamiento en la n&amp;ube</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="730"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="729"/>
         <location filename="../build/ui_mainwindow.h" line="567"/>
         <source>&amp;Manage dive sites</source>
         <translation>Gestionar puntos de buceo</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="735"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="734"/>
         <source>Dive Site &amp;Edit</source>
         <translation>&amp;Editar punto de buceo</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="740"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="739"/>
         <source>Facebook</source>
         <translation>Facebook</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="745"/>
-        <source>Add GPS location here</source>
-        <translation>Añadir ubicación GPS aquí</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="677"/>
-        <location filename="../build/ui_mainwindow.h" line="557"/>
-        <source>Ctrl+F</source>
-        <translation>Ctrl+F</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="213"/>
-        <location filename="../build/ui_mainwindow.h" line="478"/>
-        <source>&amp;Print</source>
-        <translation>Im&amp;primir</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="224"/>
-        <location filename="../build/ui_mainwindow.h" line="481"/>
-        <source>Ctrl+,</source>
-        <translation>Ctrl+,</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="232"/>
-        <location filename="../build/ui_mainwindow.h" line="482"/>
-        <source>&amp;Quit</source>
-        <translation>Salir</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="243"/>
-        <location filename="../build/ui_mainwindow.h" line="484"/>
-        <source>Import from &amp;dive computer</source>
-        <translation>Importar del or&amp;denador de buceo</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="254"/>
-        <location filename="../build/ui_mainwindow.h" line="487"/>
-        <source>Ctrl+G</source>
-        <translation>Ctrl+G</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="267"/>
-        <location filename="../build/ui_mainwindow.h" line="490"/>
-        <source>Ctrl++</source>
-        <translation>Ctrl++</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="293"/>
-        <location filename="../build/ui_mainwindow.h" line="496"/>
-        <source>&amp;Renumber</source>
-        <translation>&amp;Renumerar</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="296"/>
-        <location filename="../build/ui_mainwindow.h" line="497"/>
-        <source>Ctrl+R</source>
-        <translation>Ctrl+R</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="312"/>
-        <location filename="../build/ui_mainwindow.h" line="500"/>
-        <source>Ctrl+Y</source>
-        <translation>Ctrl+Y</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="392"/>
-        <location filename="../build/ui_mainwindow.h" line="519"/>
-        <source>Ctrl+L</source>
-        <translation>Ctrl+L</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="216"/>
-        <location filename="../build/ui_mainwindow.h" line="479"/>
-        <source>Ctrl+P</source>
-        <translation>Ctrl+P</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="235"/>
-        <location filename="../build/ui_mainwindow.h" line="483"/>
-        <source>Ctrl+Q</source>
-        <translation>Ctrl+Q</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="246"/>
-        <location filename="../build/ui_mainwindow.h" line="485"/>
-        <source>Ctrl+D</source>
-        <translation>Ctrl+D</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="264"/>
-        <location filename="../build/ui_mainwindow.h" line="489"/>
-        <source>&amp;Add dive</source>
-        <translation>&amp;Añadir inmersión</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="304"/>
-        <location filename="../build/ui_mainwindow.h" line="498"/>
-        <source>Auto &amp;group</source>
-        <translation>Auto a&amp;grupar</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="309"/>
-        <location filename="../build/ui_mainwindow.h" line="499"/>
-        <source>&amp;Yearly statistics</source>
-        <translation>Estadísticas anuales</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="317"/>
-        <location filename="../build/ui_mainwindow.h" line="501"/>
-        <source>&amp;Dive list</source>
-        <translation>Lista &amp;de Inmersiones</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="320"/>
-        <location filename="../build/ui_mainwindow.h" line="502"/>
-        <source>Ctrl+2</source>
-        <translation>Ctrl+2</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="328"/>
-        <location filename="../build/ui_mainwindow.h" line="504"/>
-        <source>Ctrl+3</source>
-        <translation>Ctrl+3</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="336"/>
-        <location filename="../build/ui_mainwindow.h" line="506"/>
-        <source>Ctrl+4</source>
-        <translation>Ctrl+4</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="344"/>
-        <location filename="../build/ui_mainwindow.h" line="508"/>
-        <source>Ctrl+1</source>
-        <translation>Ctrl+1</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="349"/>
-        <location filename="../build/ui_mainwindow.h" line="509"/>
-        <source>P&amp;revious DC</source>
-        <translation>Ante&amp;rior ordenador</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="352"/>
-        <location filename="../build/ui_mainwindow.h" line="510"/>
-        <source>Left</source>
-        <translation>Izquierda</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="360"/>
-        <location filename="../build/ui_mainwindow.h" line="512"/>
-        <source>Right</source>
-        <translation>Derecha</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="373"/>
-        <location filename="../build/ui_mainwindow.h" line="514"/>
-        <source>User &amp;manual</source>
-        <translation>&amp;Manual de usuario</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="376"/>
-        <location filename="../build/ui_mainwindow.h" line="515"/>
-        <source>F1</source>
-        <translation>F1</translation>
+        <location filename="../desktop-widgets/mainwindow.ui" line="744"/>
+        <source>Take cloud storage online</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="384"/>
-        <location filename="../build/ui_mainwindow.h" line="517"/>
-        <source>Ctrl+5</source>
-        <translation>Ctrl+5</translation>
+        <location filename="../build/ui_mainwindow.h" line="558"/>
+        <source>Toggle tissue graph</source>
+        <translation>Activar el gráfico de tejidos</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="389"/>
-        <location filename="../build/ui_mainwindow.h" line="518"/>
-        <source>P&amp;lan dive</source>
-        <translation>P&amp;lanificar inmersión</translation>
+        <location filename="../build/ui_mainwindow.h" line="565"/>
+        <source>Open cloud storage</source>
+        <translation>Abrir registro en la nube</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="397"/>
-        <location filename="../build/ui_mainwindow.h" line="520"/>
-        <source>&amp;Import log files</source>
-        <translation>&amp;Importar archivos de registro</translation>
+        <location filename="../build/ui_mainwindow.h" line="566"/>
+        <source>Save to cloud storage</source>
+        <translation>Guardar registro en la nube</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="400"/>
-        <location filename="../build/ui_mainwindow.h" line="522"/>
-        <source>Import divelog files from other applications</source>
-        <translation>Importar archivos de registro de otras aplicaciones</translation>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="331"/>
+        <source>Connect to</source>
+        <translation>Conectar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="422"/>
-        <location filename="../build/ui_mainwindow.h" line="530"/>
-        <source>F11</source>
-        <translation>F11</translation>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="493"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="538"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1545"/>
+        <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="../desktop-widgets/mainwindow.cpp" line="505"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="499"/>
         <source>Open file</source>
         <translation>Abrir archivo</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="509"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="503"/>
         <location filename="../desktop-widgets/mainwindow.cpp" line="614"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1972"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1978"/>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
@@ -5247,6 +5359,16 @@ a partir de aire y usando:
         <translation>Buscando imágenes ... (esto puede llevar un tiempo)</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="649"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="796"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="977"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="983"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1849"/>
+        <source>Warning</source>
+        <translation>Advertencia</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="674"/>
         <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>
@@ -5262,125 +5384,98 @@ a partir de aire y usando:
         <translation>Imprimir tabla de tiempo acumulado</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="982"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
+        <source>Trying to replan a dive that&apos;s not a planned dive.</source>
+        <translation>Se está intentando re-planificar un buceo que no ha sido planificado</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="977"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1849"/>
+        <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>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="983"/>
         <source>Trying to edit a dive that&apos;s not a manually added dive.</source>
         <translation>Intentando editar una inmersión que no se ha añadido manualmente.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1243"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1030"/>
+        <source>Yearly statistics</source>
+        <translation>Estadísticas anuales</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1244"/>
         <source>Do you want to save the changes that you made in the file %1?</source>
         <translation>¿Quieres guardar los cambios realizados en el archivo %1?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1246"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1247"/>
         <source>Do you want to save the changes that you made in the data file?</source>
         <translation>¿Quieres guardar los cambios que has hecho en el archivo de datos?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1251"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1252"/>
         <source>Save changes?</source>
         <translation>¿Guardar cambios?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1587"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1253"/>
+        <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="../desktop-widgets/mainwindow.cpp" line="1572"/>
         <source>Save file as</source>
         <translation>Guardar archivo como</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1682"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1573"/>
+        <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
+        <translation>Archivos XML de Subsurface (*.ssrf *.xml *.XML)</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1670"/>
+        <source>[local cache for] %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1672"/>
         <source>[cloud storage for] %1</source>
         <translation>[almacenamiento en la nube de] %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1782"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1788"/>
         <source>Opening datafile from older version</source>
         <translation>Abriendo archivo de datos de una versión anterior</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1783"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1789"/>
         <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly.
 Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source>
         <translation>Has abierto un archivo de datos de una versión anterior de Subsurface. Te recomendaamos leer el manual para informarte acerca de los cambios de la nueva versión, especialmente sobre la gestión de puntos de buceo que ha variado significativamente.
 Subsurface ya ha intentado cargar los datos pero puede que merezca la pena perder un momento en echar una mirada al nuevo sistema de gestión de puntos de buceo para asegurarte de que todo este correcto.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1794"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1800"/>
         <source>Open dive log file</source>
         <translation>Abrir archivo de registro de inmersiones</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1795"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1801"/>
         <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;All files (*)</source>
         <translation>Archivos de divelog (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Archivos Cochran (*.can *.CAN);;Archivos CSV (*.csv *.CSV);;Archivos DiveLog.de (*.dld *.DLD);;Archivos JDiveLog (*.jlb *.JLB);;Archivos Liquivision (*.lvd *.LVD);;Archivos MkVI (*.txt *.TXT);;Archivos Suunto (*.sde *.db *.SDE *.DB);;Archivos Divesoft (*.dlf *.DLF);;Archivos UDDF/UDCF (*.uddf *.udcf *.UDDF *.UDCF);;Archivos XML (*.xml *.XML);;APD log viewer (*.apd *.APD);;Archivos Datatrak/WLog (*.log *.LOG);;Archivos OSTCtools (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;Todos los archivos (*)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1972"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1978"/>
         <source>Contacting cloud service...</source>
         <translation>Contactando con el servicio en la nube ...</translation>
     </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1252"/>
-        <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="../desktop-widgets/mainwindow.cpp" line="649"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="796"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="976"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="982"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/>
-        <source>Warning</source>
-        <translation>Advertencia</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="499"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="544"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1560"/>
-        <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="../desktop-widgets/mainwindow.cpp" line="338"/>
-        <source>Connect to</source>
-        <translation>Conectar</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
-        <source>Trying to replan a dive that&apos;s not a planned dive.</source>
-        <translation>Se está intentando re-planificar un buceo que no ha sido planificado</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1029"/>
-        <source>Yearly statistics</source>
-        <translation>Estadísticas anuales</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1588"/>
-        <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
-        <translation>Archivos XML de Subsurface (*.ssrf *.xml *.XML)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="976"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/>
-        <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>
-    <message>
-        <location filename="../build/ui_mainwindow.h" line="565"/>
-        <source>Open cloud storage</source>
-        <translation>Abrir registro en la nube</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_mainwindow.h" line="566"/>
-        <source>Save to cloud storage</source>
-        <translation>Guardar registro en la nube</translation>
-    </message>
 </context>
 <context>
     <name>MultiFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="733"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="731"/>
         <source>Filter shows %1 (of %2) dives</source>
         <translation>Los filtros muestran %1 (de %2) inmersiones</translation>
     </message>
@@ -5388,12 +5483,12 @@ Subsurface ya ha intentado cargar los datos pero puede que merezca la pena perde
 <context>
     <name>OstcFirmwareCheck</name>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="269"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="271"/>
         <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source>
         <translation>Se debería actualizar el firmware del ordenador de buceo: La versión actual es %1 pero la última versión estable es %2</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="273"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="275"/>
         <source>
 
 Please start Bluetooth on your OSTC Sport and do the same preparations as for a logbook download before continuing with the update</source>
@@ -5402,27 +5497,27 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 Por favor, inicia Bluetooth en tu OSTC Sport y efectúa los mismos preparativos que para descargar, antes de seguir con la actualización</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="274"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="276"/>
         <source>Not now</source>
         <translation>Ahora no</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="275"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="277"/>
         <source>Update firmware</source>
         <translation>Actualizar firmware</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="277"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="279"/>
         <source>Firmware upgrade notice</source>
         <translation>Aviso de actualización del firmware</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="295"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="297"/>
         <source>Save the downloaded firmware as</source>
         <translation>Guardar el firmware descargado como </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="296"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="298"/>
         <source>HEX files (*.hex)</source>
         <translation>Archivos HEX (*.hex)</translation>
     </message>
@@ -5430,79 +5525,89 @@ Por favor, inicia Bluetooth en tu OSTC Sport y efectúa los mismos preparativos
 <context>
     <name>PlannerSettingsWidget</name>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="322"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="302"/>
         <source>Open circuit</source>
         <translation>Circuito abierto</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="322"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="302"/>
         <source>CCR</source>
         <translation>CCR</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="322"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="302"/>
         <source>pSCR</source>
         <translation>pSCR</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="421"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="388"/>
         <source>ft/min</source>
         <translation>ft/min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="422"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="389"/>
         <source>Last stop at 20ft</source>
         <translation>Última parada a 20pies</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="423"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="390"/>
         <source>50% avg. depth to 20ft</source>
         <translation>De 50% de prof. media a 20 pies</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="424"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="391"/>
         <source>20ft to surface</source>
         <translation>De 20 pies a superficie</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="426"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="392"/>
+        <source>ft</source>
+        <translation>ft</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="394"/>
         <source>m/min</source>
         <translation>m/min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="427"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="395"/>
         <source>Last stop at 6m</source>
         <translation>Última parada a 6m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="428"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="396"/>
         <source>50% avg. depth to 6m</source>
         <translation>De 50% prof. media a 6m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="429"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="397"/>
         <source>6m to surface</source>
         <translation>De 6m a superficie</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="432"/>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="433"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="398"/>
+        <source>m</source>
+        <translation>m</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="401"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="402"/>
         <source>cuft/min</source>
         <translation>pies3/min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="441"/>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="442"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="410"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="411"/>
         <source>ℓ/min</source>
         <translation>ℓ/min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="451"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="420"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="456"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="425"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
@@ -5652,6 +5757,11 @@ Por favor, inicia Bluetooth en tu OSTC Sport y efectúa los mismos preparativos
 <context>
     <name>PreferencesDialog</name>
     <message>
+        <location filename="../build/ui_preferences.h" line="1283"/>
+        <source>Preferences</source>
+        <translation>Preferencias</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1288"/>
         <source>Defaults</source>
         <translation>Predeterminadas</translation>
@@ -5687,6 +5797,11 @@ Por favor, inicia Bluetooth en tu OSTC Sport y efectúa los mismos preparativos
         <translation>Georeference</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1303"/>
+        <source>Lists and tables</source>
+        <translation>Listas y tablas</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1304"/>
         <source>Font</source>
         <translation>Tipo de letra</translation>
@@ -5702,6 +5817,11 @@ Por favor, inicia Bluetooth en tu OSTC Sport y efectúa los mismos preparativos
         <translation>Inmersiones</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1307"/>
+        <source>Default dive log file</source>
+        <translation>Archivo de registro por defecto</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1308"/>
         <source>No default file</source>
         <translation>Sin archivo por defecto</translation>
@@ -5732,6 +5852,21 @@ Por favor, inicia Bluetooth en tu OSTC Sport y efectúa los mismos preparativos
         <translation>…</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1314"/>
+        <source>Display invalid</source>
+        <translation>Mostrar no validas</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1316"/>
+        <source>Default cylinder</source>
+        <translation>Botella por defecto</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1317"/>
+        <source>Use default cylinder</source>
+        <translation>Usar botella por defecto</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1318"/>
         <source>Animations</source>
         <translation>Animaciones</translation>
@@ -5762,40 +5897,24 @@ Por favor, inicia Bluetooth en tu OSTC Sport y efectúa los mismos preparativos
         <translation>Sistema</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1401"/>
-        <source>Dive site geo lookup</source>
-        <translation>Busqueda geográfica de puntos de buceo</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1402"/>
-        <source>Enable geocoding for dive site management</source>
-        <translation>Habilitar geocoding para la gestión de puntos de buceo</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1403"/>
-        <source>Parse site without GPS data</source>
-        <translation>Analizar puntos sin datos GPS</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1404"/>
-        <source>Same format for existing dives</source>
-        <translation>Igual formato para inmersiones existentes</translation>
+        <location filename="../build/ui_preferences.h" line="1324"/>
+        <source>&amp;Metric</source>
+        <translation>&amp;Métrico</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1405"/>
-        <source>Dive Site Layout</source>
-        <translation>Diseño del punto de buceo</translation>
+        <location filename="../build/ui_preferences.h" line="1325"/>
+        <source>Imperial</source>
+        <translation>Imperial</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1406"/>
-        <location filename="../build/ui_preferences.h" line="1407"/>
-        <source>/</source>
-        <translation>/</translation>
+        <location filename="../build/ui_preferences.h" line="1326"/>
+        <source>Personali&amp;ze</source>
+        <translation>Personali&amp;zar</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1325"/>
-        <source>Imperial</source>
-        <translation>Imperial</translation>
+        <location filename="../build/ui_preferences.h" line="1327"/>
+        <source>Individual settings</source>
+        <translation>Ajustes individuales</translation>
     </message>
     <message>
         <location filename="../build/ui_preferences.h" line="1328"/>
@@ -5813,6 +5932,11 @@ Por favor, inicia Bluetooth en tu OSTC Sport y efectúa los mismos preparativos
         <translation>pie</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1331"/>
+        <source>Pressure</source>
+        <translation>Presión</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1332"/>
         <location filename="../build/ui_preferences.h" line="1366"/>
         <source>bar</source>
@@ -5824,11 +5948,26 @@ Por favor, inicia Bluetooth en tu OSTC Sport y efectúa los mismos preparativos
         <translation>psi</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1334"/>
+        <source>Volume</source>
+        <translation>Volumen</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1335"/>
+        <source>&amp;liter</source>
+        <translation>&amp;litro</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1336"/>
         <source>cu ft</source>
         <translation>pie³</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1337"/>
+        <source>Temperature</source>
+        <translation>Temperatura</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1338"/>
         <source>celsius</source>
         <translation>celsius</translation>
@@ -5839,11 +5978,121 @@ Por favor, inicia Bluetooth en tu OSTC Sport y efectúa los mismos preparativos
         <translation>fahrenheit</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1340"/>
+        <source>Weight</source>
+        <translation>Peso</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1341"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1342"/>
+        <source>lbs</source>
+        <translation>lbs</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1343"/>
+        <source>Time units</source>
+        <translation>Unidades de tiempo</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1344"/>
+        <source>Ascent/descent speed denominator</source>
+        <translation>Denominador de la velocidad de ascenso/descenso</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1345"/>
+        <source>Minutes</source>
+        <translation>Minutos</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1346"/>
+        <source>Seconds</source>
+        <translation>Segundos</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1347"/>
+        <source>GPS coordinates</source>
+        <translation>Coordenadas GPS</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1348"/>
+        <source>Location Display</source>
+        <translation>Presentación de las coordenadas</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1349"/>
+        <source>traditional (dms)</source>
+        <translation>Tradicional (gms)</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1350"/>
+        <source>decimal</source>
+        <translation>Decimal</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1351"/>
+        <source>Show</source>
+        <translation>Mostrar</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1352"/>
+        <source>Threshold when showing pO₂</source>
+        <translation>Umbral al mostrar la pO₂ </translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1353"/>
+        <source>Threshold when showing pN₂</source>
+        <translation>Umbral al mostrar la pN₂ </translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1354"/>
+        <source>Threshold when showing pHe</source>
+        <translation>Umbral al mostrar la pHe</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1355"/>
+        <source>Max pO₂ when showing MOD</source>
+        <translation>Max pO₂ al mostrar PMO</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1356"/>
+        <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="../build/ui_preferences.h" line="1357"/>
+        <source>Show unused cylinders in Equipment tab</source>
+        <translation>Mostrar botellas no usadas en la pestaña Equipo</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1358"/>
+        <source>Show average depth</source>
+        <translation>Mostrar la profundidad media</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1359"/>
+        <source>Misc</source>
+        <translation>Varios</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1360"/>
+        <source>GFLow</source>
+        <translation>GF bajo</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1361"/>
+        <source>GFHigh</source>
+        <translation>GF alto</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1362"/>
+        <source>GFLow at max depth</source>
+        <translation>GF bajo a la máxima profundidad</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1363"/>
         <source>CCR: show setpoints when viewing pO₂</source>
         <translation>CCR: Mostrar setpoints al visualizar la pO₂</translation>
@@ -5889,14 +6138,19 @@ Por favor, inicia Bluetooth en tu OSTC Sport y efectúa los mismos preparativos
         <translation>Predeterminado del sistema</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1374"/>
+        <source>Filter</source>
+        <translation>Filtros</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1375"/>
         <source>Proxy</source>
         <translation>Proxy</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1379"/>
-        <source>Proxy type</source>
-        <translation>Tipo de proxy</translation>
+        <location filename="../build/ui_preferences.h" line="1376"/>
+        <source>Port</source>
+        <translation>Puerto</translation>
     </message>
     <message>
         <location filename="../build/ui_preferences.h" line="1377"/>
@@ -5904,16 +6158,16 @@ Por favor, inicia Bluetooth en tu OSTC Sport y efectúa los mismos preparativos
         <translation>Host</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1376"/>
-        <source>Port</source>
-        <translation>Puerto</translation>
-    </message>
-    <message>
         <location filename="../build/ui_preferences.h" line="1378"/>
         <source>Requires authentication</source>
         <translation>Requiere autenticación</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1379"/>
+        <source>Proxy type</source>
+        <translation>Tipo de proxy</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1380"/>
         <source>Username</source>
         <translation>Nombre de usuario</translation>
@@ -5925,46 +6179,6 @@ Por favor, inicia Bluetooth en tu OSTC Sport y efectúa los mismos preparativos
         <translation>Contraseña</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1400"/>
-        <source>Disconnect from Facebook</source>
-        <translation>Desconectar de Facebook</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1374"/>
-        <source>Filter</source>
-        <translation>Filtros</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1331"/>
-        <source>Pressure</source>
-        <translation>Presión</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1303"/>
-        <source>Lists and tables</source>
-        <translation>Listas y tablas</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1307"/>
-        <source>Default dive log file</source>
-        <translation>Archivo de registro por defecto</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1314"/>
-        <source>Display invalid</source>
-        <translation>Mostrar no validas</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1316"/>
-        <source>Default cylinder</source>
-        <translation>Botella por defecto</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1317"/>
-        <source>Use default cylinder</source>
-        <translation>Usar botella por defecto</translation>
-    </message>
-    <message>
         <location filename="../build/ui_preferences.h" line="1382"/>
         <source>Subsurface cloud storage</source>
         <translation>Almacenamiento en la nube de Subsurface</translation>
@@ -6005,149 +6219,40 @@ Por favor, inicia Bluetooth en tu OSTC Sport y efectúa los mismos preparativos
         <translation>¿Guardar localmente la ID de usuario?</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1334"/>
-        <source>Volume</source>
-        <translation>Volumen</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1337"/>
-        <source>Temperature</source>
-        <translation>Temperatura</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1340"/>
-        <source>Weight</source>
-        <translation>Peso</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1342"/>
-        <source>lbs</source>
-        <translation>lbs</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1343"/>
-        <source>Time units</source>
-        <translation>Unidades de tiempo</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1345"/>
-        <source>Minutes</source>
-        <translation>Minutos</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1346"/>
-        <source>Seconds</source>
-        <translation>Segundos</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1351"/>
-        <source>Show</source>
-        <translation>Mostrar</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1362"/>
-        <source>GFLow at max depth</source>
-        <translation>GF bajo a la máxima profundidad</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1359"/>
-        <source>Misc</source>
-        <translation>Varios</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1283"/>
-        <source>Preferences</source>
-        <translation>Preferencias</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1324"/>
-        <source>&amp;Metric</source>
-        <translation>&amp;Métrico</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1326"/>
-        <source>Personali&amp;ze</source>
-        <translation>Personali&amp;zar</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1327"/>
-        <source>Individual settings</source>
-        <translation>Ajustes individuales</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1335"/>
-        <source>&amp;liter</source>
-        <translation>&amp;litro</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1344"/>
-        <source>Ascent/descent speed denominator</source>
-        <translation>Denominador de la velocidad de ascenso/descenso</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1347"/>
-        <source>GPS coordinates</source>
-        <translation>Coordenadas GPS</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1348"/>
-        <source>Location Display</source>
-        <translation>Presentación de las coordenadas</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1349"/>
-        <source>traditional (dms)</source>
-        <translation>Tradicional (gms)</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1350"/>
-        <source>decimal</source>
-        <translation>Decimal</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1352"/>
-        <source>Threshold when showing pO₂</source>
-        <translation>Umbral al mostrar la pO₂ </translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1353"/>
-        <source>Threshold when showing pN₂</source>
-        <translation>Umbral al mostrar la pN₂ </translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1354"/>
-        <source>Threshold when showing pHe</source>
-        <translation>Umbral al mostrar la pHe</translation>
+        <location filename="../build/ui_preferences.h" line="1400"/>
+        <source>Disconnect from Facebook</source>
+        <translation>Desconectar de Facebook</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1355"/>
-        <source>Max pO₂ when showing MOD</source>
-        <translation>Max pO₂ al mostrar PMO</translation>
+        <location filename="../build/ui_preferences.h" line="1401"/>
+        <source>Dive site geo lookup</source>
+        <translation>Busqueda geográfica de puntos de buceo</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1356"/>
-        <source>Draw dive computer reported ceiling red</source>
-        <translation>Trazar en rojo el techo informado por el ordenador de buceo</translation>
+        <location filename="../build/ui_preferences.h" line="1402"/>
+        <source>Enable geocoding for dive site management</source>
+        <translation>Habilitar geocoding para la gestión de puntos de buceo</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1357"/>
-        <source>Show unused cylinders in Equipment tab</source>
-        <translation>Mostrar botellas no usadas en la pestaña Equipo</translation>
+        <location filename="../build/ui_preferences.h" line="1403"/>
+        <source>Parse site without GPS data</source>
+        <translation>Analizar puntos sin datos GPS</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1358"/>
-        <source>Show average depth</source>
-        <translation>Mostrar la profundidad media</translation>
+        <location filename="../build/ui_preferences.h" line="1404"/>
+        <source>Same format for existing dives</source>
+        <translation>Igual formato para inmersiones existentes</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1360"/>
-        <source>GFLow</source>
-        <translation>GF bajo</translation>
+        <location filename="../build/ui_preferences.h" line="1405"/>
+        <source>Dive Site Layout</source>
+        <translation>Diseño del punto de buceo</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1361"/>
-        <source>GFHigh</source>
-        <translation>GF alto</translation>
+        <location filename="../build/ui_preferences.h" line="1406"/>
+        <location filename="../build/ui_preferences.h" line="1407"/>
+        <source>/</source>
+        <translation>/</translation>
     </message>
 </context>
 <context>
@@ -6203,106 +6308,136 @@ Por favor, inicia Bluetooth en tu OSTC Sport y efectúa los mismos preparativos
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="20"/>
-        <source>Show</source>
-        <translation>Mostrar</translation>
+        <source>Gas pressure display setup</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="29"/>
-        <source>Threshold when showing pO₂</source>
-        <translation>Umbral al mostrar la pO₂ </translation>
+        <source>Threshold for pO₂ (bar)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="49"/>
-        <source>Threshold when showing pN₂</source>
-        <translation>Umbral al mostrar la pN₂ </translation>
+        <source>Threshold for pN₂ (bar)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="69"/>
-        <source>Threshold when showing pHe</source>
-        <translation>Umbral al mostrar la pHe</translation>
+        <source>Threshold for pHe (bar)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="89"/>
-        <source>Max pO₂ when showing MOD</source>
-        <translation>Max pO₂ al mostrar PMO</translation>
+        <source>pO₂ in calculating MOD (bar)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="106"/>
+        <source>CCR options:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="113"/>
+        <source>Dive planner default setpoint (bar)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="133"/>
+        <source>Show setpoints when viewing pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="140"/>
+        <source>Show individual O₂ sensor values when viewing pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="150"/>
+        <source>Ceiling display setup</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="109"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="159"/>
         <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="../desktop-widgets/preferences/preferences_graph.ui" line="116"/>
-        <source>Show unused cylinders in Equipment tab</source>
-        <translation>Mostrar botellas no usadas en la pestaña Equipo</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="169"/>
+        <source>Algorithm for calculated ceiling:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="123"/>
-        <source>Show mean depth</source>
-        <translation>Mostrar profundidad media</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="176"/>
+        <source>VPM-B</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="133"/>
-        <source>Misc</source>
-        <translation>Varios</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="183"/>
+        <source>VPM-B Conservatism</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="149"/>
-        <source>bar</source>
-        <translation>bar</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="193"/>
+        <source>+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="165"/>
-        <source>Default CCR set-point for dive planning</source>
-        <translation>Setpoint del CCR por defecto para planificación de inmersiones</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="206"/>
+        <source>Bühlmann</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="172"/>
-        <source>pSCR O₂ metabolism rate</source>
-        <translation>pSCR Ratio de O₂ en el metabolismo</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="216"/>
+        <source>GFHigh</source>
+        <translation>GF alto</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="179"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="236"/>
         <source>GFLow</source>
         <translation>GF bajo</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="186"/>
-        <source>GFHigh</source>
-        <translation>GF alto</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="256"/>
+        <source>GFLow at max depth</source>
+        <translation>GF bajo a la máxima profundidad</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="203"/>
-        <source>ℓ/min</source>
-        <translation>ℓ/min</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="263"/>
+        <source>pSCR options:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="213"/>
-        <source>pSCR ratio</source>
-        <translation>pSCR ratio</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="270"/>
+        <source>Metabolic rate (ℓ O₂/min)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="223"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="287"/>
+        <source>Dilution ratio</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="300"/>
         <source>1:</source>
         <translation>1:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="230"/>
-        <source>CCR: show individual O₂ sensor values when viewing pO₂</source>
-        <translation>CCR: Mostrar los valores de los sensores de O₂ al visualizar la pO₂</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="310"/>
+        <source>Misc</source>
+        <translation>Varios</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="237"/>
-        <source>CCR: show setpoints when viewing pO₂</source>
-        <translation>CCR: Mostrar setpoints al visualizar la pO₂</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="316"/>
+        <source>Show unused cylinders in Equipment tab</source>
+        <translation>Mostrar botellas no usadas en la pestaña Equipo</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="244"/>
-        <source>GFLow at max depth</source>
-        <translation>GF bajo a la máxima profundidad</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="323"/>
+        <source>Show mean depth in Profile</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="10"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="9"/>
         <source>Graph</source>
         <translation>Gráfico</translation>
     </message>
@@ -6371,15 +6506,29 @@ Por favor, inicia Bluetooth en tu OSTC Sport y efectúa los mismos preparativos
         <translation>Idioma</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="57"/>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="53"/>
         <source>Restart required</source>
         <translation>Reinicio requerido</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="58"/>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="54"/>
         <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="../desktop-widgets/preferences/preferences_language.cpp" line="76"/>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="82"/>
+        <source>Literal characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="77"/>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="83"/>
+        <source>Non-special character(s) in time format.
+These will be used as is. This might not be what you intended.
+See http://doc.qt.io/qt-5/qdatetime.html#toString</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PreferencesNetwork</name>
@@ -6426,7 +6575,7 @@ Por favor, inicia Bluetooth en tu OSTC Sport y efectúa los mismos preparativos
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_network.ui" line="156"/>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="148"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="134"/>
         <source>Subsurface cloud storage</source>
         <translation>Almacenamiento en la nube de Subsurface</translation>
     </message>
@@ -6471,39 +6620,39 @@ Por favor, inicia Bluetooth en tu OSTC Sport y efectúa los mismos preparativos
         <translation>¿Guardar localmente la ID de usuario?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="11"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="10"/>
         <source>Network</source>
         <translation>Red</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="15"/>
         <source>No proxy</source>
         <translation>Sin proxy</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/>
         <source>System proxy</source>
         <translation>Proxy del sistema</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/>
         <source>HTTP proxy</source>
         <translation>Proxy HTTP</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="19"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/>
         <source>SOCKS proxy</source>
         <translation>Proxy SOCKS</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="75"/>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="97"/>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="110"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="72"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="93"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="106"/>
         <source>Cloud storage email and password can only consist of letters, numbers, and &apos;.&apos;, &apos;-&apos;, &apos;_&apos;, and &apos;+&apos;.</source>
         <translation>El correo y la contraseña del almacenamiento en la nube solo pueden contener letras, números, &apos;.&apos;, &apos;-&apos;, &apos;_&apos;, y &apos;+&apos;.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="146"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="132"/>
         <source>Subsurface cloud storage (credentials verified)</source>
         <translation>Almacenamiento en la nube de Subsurface (credenciales verificadas)</translation>
     </message>
@@ -6661,7 +6810,7 @@ Por favor, inicia Bluetooth en tu OSTC Sport y efectúa los mismos preparativos
         <translation>Decimal</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="8"/>
+        <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="7"/>
         <source>Units</source>
         <translation>Unidades</translation>
     </message>
@@ -6669,17 +6818,17 @@ Por favor, inicia Bluetooth en tu OSTC Sport y efectúa los mismos preparativos
 <context>
     <name>PrintDialog</name>
     <message>
-        <location filename="../desktop-widgets/printdialog.cpp" line="118"/>
-        <source>&amp;Preview</source>
-        <translation>&amp;Previsualizar</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/printdialog.cpp" line="115"/>
+        <location filename="../desktop-widgets/printdialog.cpp" line="102"/>
         <source>P&amp;rint</source>
         <translation>Imp&amp;rimir</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/printdialog.cpp" line="130"/>
+        <location filename="../desktop-widgets/printdialog.cpp" line="105"/>
+        <source>&amp;Preview</source>
+        <translation>&amp;Previsualizar</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/printdialog.cpp" line="117"/>
         <source>Print</source>
         <translation>Imprimir</translation>
     </message>
@@ -6687,19 +6836,10 @@ Por favor, inicia Bluetooth en tu OSTC Sport y efectúa los mismos preparativos
 <context>
     <name>PrintOptions</name>
     <message>
-        <location filename="../build/ui_printoptions.h" line="150"/>
-        <source>&amp;Table print</source>
-        <translation>Impresión de &amp;tabla</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_printoptions.h" line="158"/>
-        <source>One dive per page</source>
-        <translation>Una inmersión por página</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_printoptions.h" line="159"/>
-        <source>Two dives per page</source>
-        <translation>Dos inmersiones por página</translation>
+        <location filename="../desktop-widgets/printoptions.ui" line="29"/>
+        <location filename="../build/ui_printoptions.h" line="148"/>
+        <source>Print type</source>
+        <translation>Tipo de impresión</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/printoptions.ui" line="41"/>
@@ -6759,10 +6899,19 @@ Por favor, inicia Bluetooth en tu OSTC Sport y efectúa los mismos preparativos
         <translation>Importar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/printoptions.ui" line="29"/>
-        <location filename="../build/ui_printoptions.h" line="148"/>
-        <source>Print type</source>
-        <translation>Tipo de impresión</translation>
+        <location filename="../build/ui_printoptions.h" line="150"/>
+        <source>&amp;Table print</source>
+        <translation>Impresión de &amp;tabla</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_printoptions.h" line="158"/>
+        <source>One dive per page</source>
+        <translation>Una inmersión por página</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_printoptions.h" line="159"/>
+        <source>Two dives per page</source>
+        <translation>Dos inmersiones por página</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/printoptions.cpp" line="128"/>
@@ -6804,103 +6953,103 @@ Por favor, inicia Bluetooth en tu OSTC Sport y efectúa los mismos preparativos
         <translation>Ordenador de buceo desconocido</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="755"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="752"/>
         <source>Show NDL / TTS was disabled because of excessive processing time</source>
         <translation>Mostrar LND/TTS se ha desactivado por excesivo tiempo de proceso</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1344"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1338"/>
         <source>Make first divecomputer</source>
         <translation>Hacer que sea el ordenador de buceo pricipal</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1346"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1340"/>
         <source>Delete this divecomputer</source>
         <translation>Borrar este ordenador de buceo</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1360"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1354"/>
         <source>Add gas change</source>
         <translation>Añadir cambio de gas</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1363"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1357"/>
         <source> (Tank %1)</source>
         <translation>(Botella %1)</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1371"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1365"/>
         <source>Add set-point change</source>
         <translation>Añadir cambio de &quot;set-point&quot;</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1373"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1367"/>
         <source>Add bookmark</source>
         <translation>Añadir marca</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1377"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1371"/>
         <source>Edit the profile</source>
         <translation>Editar el perfil</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1381"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1375"/>
         <source>Remove event</source>
         <translation>Borrar evento</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1386"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1380"/>
         <source>Hide similar events</source>
         <translation>Ocultar eventos similares</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1393"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1387"/>
         <source>Edit name</source>
         <translation>Editar nombre</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1422"/>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1429"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1416"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1423"/>
         <source>Adjust pressure of tank %1 (currently interpolated as %2)</source>
         <translation>Ajustar presión de botella %1 (actualmente calculada como %2)</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1444"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1438"/>
         <source>Unhide all events</source>
         <translation>Revelar todos los eventos</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1479"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1473"/>
         <source>Hide events</source>
         <translation>Ocultar eventos</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1479"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1473"/>
         <source>Hide all %1 events?</source>
         <translation>¿ Ocultar todos los eventos %1 ?</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1514"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1508"/>
         <source>Remove the selected event?</source>
         <translation>¿ Borrar el evento seleccionado ?</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1515"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1509"/>
         <source>%1 @ %2:%3</source>
         <translation>%1 @ %2:%3</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1638"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1632"/>
         <source>Edit name of bookmark</source>
         <translation>Editar el nombre de la marca</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1639"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1633"/>
         <source>Custom name:</source>
         <translation>Nombre personalizado:</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1644"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1638"/>
         <source>Name is too long!</source>
         <translation>¡El nombre es demasiado largo!</translation>
     </message>
@@ -6908,91 +7057,101 @@ Por favor, inicia Bluetooth en tu OSTC Sport y efectúa los mismos preparativos
 <context>
     <name>QMLManager</name>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="95"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="97"/>
         <source>Starting...</source>
         <translation>Iniciando...</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="202"/>
         <source>working in no-cloud mode</source>
         <translation>Funcionando en modo local</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="213"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="216"/>
         <source>no cloud credentials</source>
         <translation>sin credenciales para la nube</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="214"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="270"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="217"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="269"/>
         <source>Please enter valid cloud credentials.</source>
         <translation>Por favor, introduce credenciales para la nube validas</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="285"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="284"/>
         <source>Attempting to open cloud storage with new credentials</source>
         <translation>Intentando acceder al almacenamiento en la nube con nuevas credenciales</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="304"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="306"/>
         <source>Testing cloud credentials</source>
         <translation>Comprobando credenciales para la nube</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="331"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="320"/>
+        <source>No response from cloud server to validate the credentials</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="329"/>
+        <source>Cannot connect to cloud storage - cloud account not verified</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="361"/>
         <source>Cloud credentials are invalid</source>
         <translation>Credenciales para la nube invalidas</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="344"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="374"/>
         <source>Cannot open cloud storage: Error creating https connection</source>
         <translation>No se puede abrir el almacenamiento en la nube: Error al crear la conexión https</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="357"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="387"/>
         <source>Cannot open cloud storage: %1</source>
         <translation>No se pudo abrir el almacenamiento en la nube: %1</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="369"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="399"/>
         <source>Cannot connect to cloud storage</source>
         <translation>No se pudo conectar con el almacenamiento en la nube</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="411"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="441"/>
         <source>Cloud storage error: %1</source>
         <translation>Error en almacenamiento en la nube: %1</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="501"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="531"/>
         <source>Failed to connect to cloud server, reverting to no cloud status</source>
         <translation>Fallo al conectar con el servidor en la nube, volviendo al modo local</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="520"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="550"/>
         <source>Cloud storage open successfully. No dives in dive list.</source>
         <translation>Almacenamiento en la nube abierto. No hay inmersiones en la lista.</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="689"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="690"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="721"/>
         <source>h</source>
         <translation>h</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="689"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="690"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="691"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="721"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="722"/>
         <source>min</source>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="689"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/>
         <source>sec</source>
         <translation>seg</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="1041"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="1102"/>
         <source>Unknown GPS location</source>
         <translation>Posición GPS desconocida</translation>
     </message>
@@ -7000,126 +7159,126 @@ Por favor, inicia Bluetooth en tu OSTC Sport y efectúa los mismos preparativos
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../core/qthelper.cpp" line="866"/>
-        <location filename="../core/qthelper.cpp" line="1214"/>
-        <source>AIR</source>
-        <translation>AIRE</translation>
+        <location filename="../core/gpslocation.h" line="13"/>
+        <source>Waiting to aquire GPS location</source>
+        <translation>Esperando a obtener posición GPS</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="1214"/>
-        <source>OXYGEN</source>
-        <translation>OXÍGENO</translation>
+        <location filename="../core/qthelper.cpp" line="766"/>
+        <location filename="../core/qthelper.cpp" line="1275"/>
+        <source>m</source>
+        <translation>m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="59"/>
-        <source>Remove this point</source>
-        <translation>Borrar este punto</translation>
+        <location filename="../core/qthelper.cpp" line="768"/>
+        <location filename="../core/qthelper.cpp" line="1274"/>
+        <source>ft</source>
+        <translation>ft</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="32"/>
-        <source>Average</source>
-        <translation>Promedio</translation>
+        <location filename="../core/qthelper.cpp" line="794"/>
+        <source>C</source>
+        <translation>C</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="35"/>
-        <source>Minimum</source>
-        <translation>Mínima</translation>
+        <location filename="../core/qthelper.cpp" line="796"/>
+        <source>F</source>
+        <translation>F</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="38"/>
-        <source>Maximum</source>
-        <translation>Máxima</translation>
+        <location filename="../core/qthelper.cpp" line="821"/>
+        <location filename="../core/qthelper.cpp" line="1250"/>
+        <source>kg</source>
+        <translation>kg</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/globe.cpp" line="327"/>
-        <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>
+        <location filename="../core/qthelper.cpp" line="823"/>
+        <location filename="../core/qthelper.cpp" line="1251"/>
+        <source>lbs</source>
+        <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="28"/>
-        <source>unknown</source>
-        <translation>desconocido</translation>
+        <location filename="../core/qthelper.cpp" line="848"/>
+        <location filename="../core/qthelper.cpp" line="1300"/>
+        <source>bar</source>
+        <translation>bar</translation>
     </message>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="105"/>
-        <source>h:</source>
-        <translation>h:</translation>
+        <location filename="../core/qthelper.cpp" line="850"/>
+        <location filename="../core/qthelper.cpp" line="1299"/>
+        <source>psi</source>
+        <translation>psi</translation>
     </message>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="105"/>
-        <source>min</source>
-        <translation>min</translation>
+        <location filename="../core/qthelper.cpp" line="871"/>
+        <location filename="../core/qthelper.cpp" line="1235"/>
+        <source>AIR</source>
+        <translation>AIRE</translation>
     </message>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="337"/>
-        <source>Multiple</source>
-        <translation>Múltiple</translation>
+        <location filename="../core/qthelper.cpp" line="873"/>
+        <source>EAN</source>
+        <translation>EAN</translation>
     </message>
     <message numerus="yes">
-        <location filename="../core/qthelper.cpp" line="957"/>
+        <location filename="../core/qthelper.cpp" line="962"/>
         <source>(%n dive(s))</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="816"/>
-        <location filename="../core/qthelper.cpp" line="1228"/>
-        <source>kg</source>
-        <translation>kg</translation>
+        <location filename="../core/qthelper.cpp" line="1235"/>
+        <source>OXYGEN</source>
+        <translation>OXÍGENO</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="818"/>
-        <location filename="../core/qthelper.cpp" line="1229"/>
-        <source>lbs</source>
-        <translation>lbs</translation>
+        <location filename="../core/qthelper.cpp" line="1322"/>
+        <source>l</source>
+        <translation>l</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="763"/>
-        <location filename="../core/qthelper.cpp" line="1252"/>
-        <source>ft</source>
-        <translation>ft</translation>
+        <location filename="../core/qthelper.cpp" line="1323"/>
+        <source>cuft</source>
+        <translation>cuft</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="761"/>
-        <location filename="../core/qthelper.cpp" line="1253"/>
-        <source>m</source>
-        <translation>m</translation>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="29"/>
+        <source>unknown</source>
+        <translation>desconocido</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="789"/>
-        <source>C</source>
-        <translation>C</translation>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="114"/>
+        <source>h:</source>
+        <translation>h:</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="791"/>
-        <source>F</source>
-        <translation>F</translation>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="114"/>
+        <source>min</source>
+        <translation>min</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="845"/>
-        <location filename="../core/qthelper.cpp" line="1275"/>
-        <source>psi</source>
-        <translation>psi</translation>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="63"/>
+        <source>Remove this point</source>
+        <translation>Borrar este punto</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="843"/>
-        <location filename="../core/qthelper.cpp" line="1276"/>
-        <source>bar</source>
-        <translation>bar</translation>
+        <location filename="../desktop-widgets/globe.cpp" line="327"/>
+        <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>
     <message>
-        <location filename="../core/qthelper.cpp" line="868"/>
-        <source>EAN</source>
-        <translation>EAN</translation>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="32"/>
+        <source>Average</source>
+        <translation>Promedio</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="1298"/>
-        <source>l</source>
-        <translation>l</translation>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="35"/>
+        <source>Minimum</source>
+        <translation>Mínima</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="1299"/>
-        <source>cuft</source>
-        <translation>cuft</translation>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="38"/>
+        <source>Maximum</source>
+        <translation>Máxima</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="625"/>
@@ -7141,17 +7300,12 @@ Por favor, inicia Bluetooth en tu OSTC Sport y efectúa los mismos preparativos
         <source>Malformed XML response. Line %1: %2</source>
         <translation>Respuesta XML mal formada. Línea %1:%2</translation>
     </message>
-    <message>
-        <location filename="../core/gpslocation.h" line="13"/>
-        <source>Waiting to aquire GPS location</source>
-        <translation>Esperando a obtener posición GPS</translation>
-    </message>
 </context>
 <context>
     <name>ReadSettingsThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1651"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1676"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1640"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1665"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Esta función no esta disponible, todavía, para el ordenador seleccionado.</translation>
     </message>
@@ -7180,7 +7334,7 @@ Por favor, inicia Bluetooth en tu OSTC Sport y efectúa los mismos preparativos
 <context>
     <name>ResetSettingsThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1775"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1764"/>
         <source>Reset settings failed!</source>
         <translation>¡ Falló el reinicio de ajustes !</translation>
     </message>
@@ -7218,6 +7372,12 @@ Por favor, inicia Bluetooth en tu OSTC Sport y efectúa los mismos preparativos
 <context>
     <name>ShiftImageTimesDialog</name>
     <message>
+        <location filename="../desktop-widgets/shiftimagetimes.ui" line="23"/>
+        <location filename="../build/ui_shiftimagetimes.h" line="184"/>
+        <source>Shift selected image times</source>
+        <translation>Desplazar las horas de la imagen seleccionada</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/shiftimagetimes.ui" line="34"/>
         <location filename="../build/ui_shiftimagetimes.h" line="185"/>
         <source>Shift times of image(s) by</source>
@@ -7230,12 +7390,6 @@ Por favor, inicia Bluetooth en tu OSTC Sport y efectúa los mismos preparativos
         <translation>h:mm</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/shiftimagetimes.ui" line="23"/>
-        <location filename="../build/ui_shiftimagetimes.h" line="184"/>
-        <source>Shift selected image times</source>
-        <translation>Desplazar las horas de la imagen seleccionada</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/shiftimagetimes.ui" line="105"/>
         <location filename="../build/ui_shiftimagetimes.h" line="187"/>
         <source>Earlier</source>
@@ -7288,12 +7442,12 @@ cualquiera de las inmersiones seleccionadas.</translation>
         <translation>¿ Que fecha y hora se muestran en la imagen ?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="297"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="296"/>
         <source>Open image file</source>
         <translation>Abrir archivo de imagen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="299"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="298"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>Archivos de imagen (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -7451,54 +7605,54 @@ cualquiera de las inmersiones seleccionadas.</translation>
 <context>
     <name>SocialNetworkDialog</name>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="339"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="284"/>
         <source>Dive date: %1 
 </source>
         <translation>Fecha de la inmersión: %1 
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="342"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="287"/>
         <source>Duration: %1 
 </source>
         <translation>Duración: %1 
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="343"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="288"/>
         <source>h:</source>
         <comment>abbreviation for hours plus separator</comment>
         <translation>h:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="344"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="289"/>
         <source>min</source>
         <comment>abbreviation for minutes</comment>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="347"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="292"/>
         <source>Dive location: %1 
 </source>
         <translation>Lugar de la inmersión: %1 
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="350"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="295"/>
         <source>Buddy: %1 
 </source>
         <translation>Compañero: %1 
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="353"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="298"/>
         <source>Divemaster: %1 
 </source>
         <translation>Divemaster: %1 
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="356"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="301"/>
         <source>
 %1</source>
         <translation>
@@ -7584,12 +7738,21 @@ cualquiera de las inmersiones seleccionadas.</translation>
     <name>StartPage</name>
     <message>
         <location filename="../mobile-widgets/qml/StartPage.qml" line="19"/>
-        <source>To use Subsurface-mobile with Subsurface cloud storage, please enteryour cloud credentials.
-
-To use Subsurface-mobile only with local data on this device, tap on the no cloud icon below.</source>
-        <translation>Para utilizar Subsurface-mobile con el almacenamiento en la nube de Subsurface, por favor, introduce tus credenciales para la nube.
+        <source>To use Subsurface-mobile with Subsurface cloud storage, please enter your cloud credentials.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/StartPage.qml" line="20"/>
+        <source>If this is the first time you use Subsurface cloud storage, enter a valid email (all lower case) and a password of your choice (letters and numbers). The server will send a PIN to the email address provided that you will have to enter here.
 
-Para utilizar Subsurface-mobile con datos locales en el dispositivo, pulsa en el icono &quot;no nube&quot; en la parte inferior.</translation>
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/StartPage.qml" line="23"/>
+        <source>To use Subsurface-mobile only with local data on this device, tap on the no cloud icon below.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -7627,7 +7790,12 @@ Para utilizar Subsurface-mobile con datos locales en el dispositivo, pulsa en el
 <context>
     <name>SubsurfaceWebServices</name>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="419"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="395"/>
+        <source>Enter User ID and click Download</source>
+        <translation>Introducir ID de usuario y pulsar Descargar</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="417"/>
         <source>Webservice</source>
         <translation>Servicio web</translation>
     </message>
@@ -7652,30 +7820,25 @@ Para utilizar Subsurface-mobile con datos locales en el dispositivo, pulsa en el
         <translation>Error de conexión:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="557"/>
-        <source>Download successful</source>
-        <translation>Descarga completa</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="551"/>
         <source>Invalid user identifier!</source>
         <translation>El identificador de usuario no es válido.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="397"/>
-        <source>Enter User ID and click Download</source>
-        <translation>Introducir ID de usuario y pulsar Descargar</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="554"/>
         <source>Cannot parse response!</source>
         <translation>No se puede analizar la respuesta.</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="557"/>
+        <source>Download successful</source>
+        <translation>Descarga completa</translation>
+    </message>
 </context>
 <context>
     <name>SuitFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="674"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="672"/>
         <source>Suits: </source>
         <translation>Trajes:</translation>
     </message>
@@ -7683,7 +7846,7 @@ Para utilizar Subsurface-mobile con datos locales en el dispositivo, pulsa en el
 <context>
     <name>SuitsFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="123"/>
+        <location filename="../qt-models/filtermodels.cpp" line="128"/>
         <source>No suit set</source>
         <translation>Sin traje definido</translation>
     </message>
@@ -7702,7 +7865,7 @@ Para utilizar Subsurface-mobile con datos locales en el dispositivo, pulsa en el
 <context>
     <name>TagFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="595"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="593"/>
         <source>Tags: </source>
         <translation>Etiquetas:</translation>
     </message>
@@ -7710,7 +7873,7 @@ Para utilizar Subsurface-mobile con datos locales en el dispositivo, pulsa en el
 <context>
     <name>TagFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="148"/>
+        <location filename="../qt-models/filtermodels.cpp" line="153"/>
         <source>Empty tags</source>
         <translation>Etiquetas vacío</translation>
     </message>
@@ -7736,6 +7899,11 @@ Para utilizar Subsurface-mobile con datos locales en el dispositivo, pulsa en el
 <context>
     <name>TemplateEdit</name>
     <message>
+        <location filename="../desktop-widgets/templateedit.ui" line="14"/>
+        <source>Edit template</source>
+        <translation>Editar plantilla</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/templateedit.ui" line="37"/>
         <source>Preview</source>
         <translation>Vista previa</translation>
@@ -7781,11 +7949,6 @@ Para utilizar Subsurface-mobile con datos locales en el dispositivo, pulsa en el
         <translation>Tamaño de letra</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/templateedit.ui" line="14"/>
-        <source>Edit template</source>
-        <translation>Editar plantilla</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/templateedit.ui" line="165"/>
         <source>Color palette</source>
         <translation>Paleta de color</translation>
@@ -7967,7 +8130,7 @@ Para utilizar Subsurface-mobile con datos locales en el dispositivo, pulsa en el
 <context>
     <name>TextHyperlinkEventFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="817"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="815"/>
         <source>%1click to visit %2</source>
         <translation>%1clica para visitar %2</translation>
     </message>
@@ -7983,102 +8146,107 @@ Para utilizar Subsurface-mobile con datos locales en el dispositivo, pulsa en el
 <context>
     <name>TripItem</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="67"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="68"/>
         <source>(%1 shown)</source>
         <translation>(%1 mostrada)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="194"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
         <source>#</source>
         <translation>N.º</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="197"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="215"/>
         <source>Date</source>
         <translation>Fecha</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="200"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="218"/>
         <source>Rating</source>
         <translation>Valoración</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
         <source>Depth(%1)</source>
         <translation>Prof.(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="206"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="224"/>
         <source>Duration</source>
         <translation>Duración</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="209"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="227"/>
         <source>Temp(%1%2)</source>
         <translation>Temp(%1%2)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
         <source>Weight(%1)</source>
         <translation>Lastre(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="215"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="233"/>
         <source>Suit</source>
         <translation>Traje</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="218"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="236"/>
         <source>Cyl</source>
         <translation>Botella</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="239"/>
         <source>Gas</source>
         <translation>Gas</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="244"/>
         <source>SAC(%1)</source>
         <translation>CAS(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="244"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="229"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="247"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="232"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="250"/>
         <source>Max CNS</source>
         <translation>CNS máximo</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="235"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="253"/>
+        <source>Photos before/during/after dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="256"/>
         <source>Location</source>
         <translation>Ubicación</translation>
     </message>
@@ -8101,72 +8269,73 @@ Para utilizar Subsurface-mobile con datos locales en el dispositivo, pulsa en el
 <context>
     <name>UpdateManager</name>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="69"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="61"/>
         <source>Check for updates.</source>
         <translation>Buscar actualizaciones</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="70"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="62"/>
         <source>Subsurface was unable to check for updates.</source>
         <translation>Subsurface no pudo buscar actualizaciones.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="75"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="67"/>
         <source>The following error occurred:</source>
         <translation>Ocurrió el siguiente error:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="76"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="68"/>
         <source>Please check your internet connection.</source>
         <translation>Por favor, comprueba la conexión a internet.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="86"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="78"/>
         <source>You are using the latest version of Subsurface.</source>
         <translation>Está usando la última versión de Subsurface.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="89"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="81"/>
         <source>A new version of Subsurface is available.&lt;br/&gt;Click on:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; to download it.</source>
         <translation>Está disponible una nueva versión de Subsurface.&lt;br/&gt;Pulse en:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; para descargarla.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="95"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="87"/>
         <source>A new version of Subsurface is available.</source>
         <translation>Está disponible una nueva versión de Subsurface.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="96"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="88"/>
         <source>Latest version is %1, please check %2 our download page %3 for information in how to update.</source>
         <translation>La última versión es %1, por favor comprueba %2 nuestra página de descargas %3 para informarte sobre como actualizar.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="106"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="98"/>
         <source>Newest release version is </source>
         <translation>La versión más reciente es</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="107"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="99"/>
         <source>The server returned the following information:</source>
         <translation>El servidor devolvió la siguiente información:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="125"/>
-        <source>Subsurface is checking every two weeks if a new version is available. If you don&apos;t want Subsurface to continue checking, please click Decline.</source>
-        <translation>Subsurface comprueba cada dos semanas si está disponible una nueva versión. Si no deseas que Subsurface continúe efectuando la comprobación, pulsa &quot;Declinar&quot;, por favor.</translation>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="117"/>
+        <source>Subsurface is checking every two weeks if a new version is available. 
+ If you don&apos;t want Subsurface to continue checking, please click Decline.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="126"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="119"/>
         <source>Decline</source>
         <translation>Declinar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="127"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="120"/>
         <source>Accept</source>
         <translation>Aceptar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="129"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="122"/>
         <source>Automatic check for updates</source>
         <translation>Comprobación automática de actualizaciones</translation>
     </message>
@@ -8188,24 +8357,6 @@ Para utilizar Subsurface-mobile con datos locales en el dispositivo, pulsa en el
 <context>
     <name>UserSurvey</name>
     <message>
-        <location filename="../desktop-widgets/usersurvey.ui" line="44"/>
-        <location filename="../build/ui_usersurvey.h" line="151"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;We would love to learn more about our users, their preferences and their usage habits. Please spare a minute to fill out this form and submit it to the Subsurface team.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Nos encantaría saber más ssobre nuestros usuarios, sus preferencias y sus hábitos de uso. Por favor, invierte un minuto en completar este formulario y enviarlo al equipo de Subsurface&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/usersurvey.ui" line="115"/>
-        <location filename="../build/ui_usersurvey.h" line="156"/>
-        <source>Other software/sources</source>
-        <translation>Otro/as software/fuentes</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/usersurvey.ui" line="128"/>
-        <location filename="../build/ui_usersurvey.h" line="157"/>
-        <source>Manually entering dives</source>
-        <translation>Introducción manual de inmersiones</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="14"/>
         <location filename="../build/ui_usersurvey.h" line="149"/>
         <source>User survey</source>
@@ -8218,6 +8369,12 @@ Para utilizar Subsurface-mobile con datos locales en el dispositivo, pulsa en el
         <translation>Encuesta a usuarios de Subsurface</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/usersurvey.ui" line="44"/>
+        <location filename="../build/ui_usersurvey.h" line="151"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;We would love to learn more about our users, their preferences and their usage habits. Please spare a minute to fill out this form and submit it to the Subsurface team.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Nos encantaría saber más ssobre nuestros usuarios, sus preferencias y sus hábitos de uso. Por favor, invierte un minuto en completar este formulario y enviarlo al equipo de Subsurface&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="63"/>
         <location filename="../build/ui_usersurvey.h" line="152"/>
         <source>Technical diver</source>
@@ -8242,6 +8399,18 @@ Para utilizar Subsurface-mobile con datos locales en el dispositivo, pulsa en el
         <translation>Ordenador de buceo soportado</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/usersurvey.ui" line="115"/>
+        <location filename="../build/ui_usersurvey.h" line="156"/>
+        <source>Other software/sources</source>
+        <translation>Otro/as software/fuentes</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/usersurvey.ui" line="128"/>
+        <location filename="../build/ui_usersurvey.h" line="157"/>
+        <source>Manually entering dives</source>
+        <translation>Introducción manual de inmersiones</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="141"/>
         <location filename="../build/ui_usersurvey.h" line="158"/>
         <source>Android/iPhone companion app</source>
@@ -8272,6 +8441,11 @@ Para utilizar Subsurface-mobile con datos locales en el dispositivo, pulsa en el
         <translation>¿De donde importas los datos?</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/usersurvey.cpp" line="18"/>
+        <source>Send</source>
+        <translation>Enviar</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/usersurvey.cpp" line="43"/>
         <source>
 Operating system: %1</source>
@@ -8315,19 +8489,14 @@ Idioma: %1</translation>
         <translation>Pregúntame más adelante</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/usersurvey.cpp" line="101"/>
-        <source>Submit user survey.</source>
-        <translation>Enviar encuesta de Usuario.</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/usersurvey.cpp" line="82"/>
         <source>Ask again?</source>
         <translation>¿ Preguntar de nuevo ?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/usersurvey.cpp" line="18"/>
-        <source>Send</source>
-        <translation>Enviar</translation>
+        <location filename="../desktop-widgets/usersurvey.cpp" line="101"/>
+        <source>Submit user survey.</source>
+        <translation>Enviar encuesta de Usuario.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/usersurvey.cpp" line="102"/>
@@ -8419,12 +8588,12 @@ Idioma: %1</translation>
         <translation>Subir</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="324"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="325"/>
         <source>Operation timed out</source>
         <translation>Tiempo de espera sobrepasado</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="345"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="346"/>
         <source>Transferring data...</source>
         <translation>Transfiriendo datos ...</translation>
     </message>
@@ -8459,18 +8628,18 @@ Idioma: %1</translation>
 <context>
     <name>WriteSettingsThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1702"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1709"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1718"/>
-        <source>Failed!</source>
-        <translation>¡Fallo!</translation>
-    </message>
-    <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1700"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1721"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1689"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1710"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Esta función no está disponible, todavía, para el ordenador seleccionado.</translation>
     </message>
+    <message>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1691"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1698"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1707"/>
+        <source>Failed!</source>
+        <translation>¡Fallo!</translation>
+    </message>
 </context>
 <context>
     <name>YearlyStatisticsModel</name>
@@ -8595,7 +8764,7 @@ Media</translation>
 <context>
     <name>getextFromC</name>
     <message>
-        <location filename="../core/libdivecomputer.c" line="674"/>
+        <location filename="../core/libdivecomputer.c" line="737"/>
         <source>Error parsing the header</source>
         <translation>Error al analizar la cabecera</translation>
     </message>
@@ -8603,38 +8772,377 @@ Media</translation>
 <context>
     <name>gettextFromC</name>
     <message>
+        <location filename="../core/cochran.c" line="309"/>
+        <location filename="../core/cochran.c" line="315"/>
+        <location filename="../core/cochran.c" line="385"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>deco stop</source>
+        <translation>parada deco</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="336"/>
+        <location filename="../core/cochran.c" line="390"/>
+        <location filename="../core/file.c" line="777"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>ascent</source>
+        <translation>ascenso</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="342"/>
+        <location filename="../core/file.c" line="755"/>
+        <source>battery</source>
+        <translation>batería</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="348"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
+        <source>OLF</source>
+        <translation>OLF</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="353"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
+        <source>maxdepth</source>
+        <translation>Profundidad Max</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="358"/>
+        <location filename="../core/cochran.c" line="404"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
+        <source>pO₂</source>
+        <translation>pO₂</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="365"/>
+        <location filename="../core/cochran.c" line="414"/>
+        <location filename="../core/cochran.c" line="421"/>
+        <location filename="../core/file.c" line="868"/>
+        <location filename="../core/libdivecomputer.c" line="225"/>
+        <location filename="../core/libdivecomputer.c" line="228"/>
+        <source>gaschange</source>
+        <translation>cambio de mezcla</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="370"/>
+        <location filename="../core/cochran.c" line="409"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>rbt</source>
+        <translation>rbt</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="379"/>
+        <location filename="../core/cochran.c" line="426"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>ceiling</source>
+        <translation>techo</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="395"/>
+        <location filename="../core/libdivecomputer.c" line="224"/>
+        <source>transmitter</source>
+        <translation>transmisor</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="153"/>
+        <source>Error: the file does not appear to be a DATATRAK divelog</source>
+        <translation>Error: el archivo no parece ser un registro de DATATRAK</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="286"/>
+        <source>clear</source>
+        <translation>claro</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="289"/>
+        <source>misty</source>
+        <translation>nublado</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="292"/>
+        <source>fog</source>
+        <translation>niebla</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="295"/>
+        <source>rain</source>
+        <translation>lluvia</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="298"/>
+        <source>storm</source>
+        <translation>tormenta</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="301"/>
+        <source>snow</source>
+        <translation>nieve</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="321"/>
+        <source>No suit</source>
+        <translation>Sin traje</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="324"/>
+        <source>Shorty</source>
+        <translation>Shorty</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="327"/>
+        <source>Combi</source>
+        <translation>Combi</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="330"/>
+        <source>Wet suit</source>
+        <translation>Traje humedo</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="333"/>
+        <source>Semidry suit</source>
+        <translation>Traje semiseco</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="336"/>
+        <source>Dry suit</source>
+        <translation>Traje seco</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="396"/>
+        <source>no stop</source>
+        <translation>sin paradas</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="398"/>
+        <location filename="../core/dive.c" line="29"/>
+        <source>deco</source>
+        <translation>deco</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="400"/>
+        <source>single ascent</source>
+        <translation>ascenso sencillo</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="402"/>
+        <source>multiple ascent</source>
+        <translation>ascenso múltiple</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="404"/>
+        <location filename="../core/dive.c" line="27"/>
+        <source>fresh</source>
+        <translation>agua dulce</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="406"/>
+        <source>salt water</source>
+        <translation>agua salada</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="431"/>
+        <source>sight seeing</source>
+        <translation>paisaje</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="433"/>
+        <source>club dive</source>
+        <translation>inmersión de club</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="435"/>
+        <location filename="../core/dive.c" line="28"/>
+        <source>instructor</source>
+        <translation>instructor</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="437"/>
+        <source>instruction</source>
+        <translation>instrucción</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="439"/>
+        <location filename="../core/dive.c" line="27"/>
+        <source>night</source>
+        <translation>noche</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="441"/>
+        <location filename="../core/dive.c" line="25"/>
+        <source>cave</source>
+        <translation>cueva</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="443"/>
+        <location filename="../core/dive.c" line="24"/>
+        <source>ice</source>
+        <translation>hielo</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="445"/>
+        <source>search</source>
+        <translation>busqueda</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="455"/>
+        <location filename="../core/dive.c" line="25"/>
+        <source>wreck</source>
+        <translation>pecio</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="457"/>
+        <location filename="../core/dive.c" line="26"/>
+        <source>river</source>
+        <translation>río</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="459"/>
+        <location filename="../core/dive.c" line="23"/>
+        <source>drift</source>
+        <translation>a la deriva</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="461"/>
+        <location filename="../core/dive.c" line="28"/>
+        <source>photo</source>
+        <translation>foto</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="463"/>
+        <source>other</source>
+        <translation>otros</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="474"/>
+        <source>Other activities</source>
+        <translation>Otras actividades</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="498"/>
+        <source>Datatrak/Wlog notes</source>
+        <translation>Notas de Datatrak/Wlog</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="537"/>
+        <source>Manually entered dive</source>
+        <translation>Inmersión manual</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="588"/>
+        <source>Unknown</source>
+        <translation>Desconocido</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="674"/>
+        <source>Error: couldn&apos;t open the file %s</source>
+        <translation>Error: no se pudo abrir el archivo %s</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="687"/>
+        <source>Error: no dive</source>
+        <translation>Error: sin inmersiones</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="23"/>
+        <source>boat</source>
+        <translation>barco</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="23"/>
+        <source>shore</source>
+        <translation>orilla</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="24"/>
+        <source>deep</source>
+        <translation>profunda</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="24"/>
+        <source>cavern</source>
+        <translation>caverna</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="25"/>
+        <source>altitude</source>
+        <translation>altura</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="26"/>
+        <source>pool</source>
+        <translation>piscina</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="26"/>
+        <source>lake</source>
+        <translation>lago</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="27"/>
+        <source>student</source>
+        <translation>estudiante</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="28"/>
+        <source>video</source>
+        <translation>vídeo</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="33"/>
+        <source>OC-gas</source>
+        <translation>gas en OC</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="33"/>
+        <source>diluent</source>
+        <translation>diluyente</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="33"/>
+        <location filename="../core/equipment.c" line="88"/>
+        <location filename="../core/planner.c" line="1436"/>
+        <location filename="../core/planner.c" line="1439"/>
+        <source>oxygen</source>
+        <translation>oxígeno</translation>
+    </message>
+    <message>
         <location filename="../core/dive.c" line="181"/>
         <source>pascal</source>
         <translation>pascal</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="186"/>
-        <location filename="../core/qthelper.cpp" line="669"/>
+        <location filename="../core/qthelper.cpp" line="674"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="190"/>
-        <location filename="../core/qthelper.cpp" line="672"/>
+        <location filename="../core/qthelper.cpp" line="677"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
+        <location filename="../core/dive.c" line="227"/>
+        <source>ℓ</source>
+        <translation>ℓ</translation>
+    </message>
+    <message>
         <location filename="../core/dive.c" line="232"/>
         <source>cuft</source>
         <translation>pie³</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="269"/>
-        <location filename="../core/qthelper.cpp" line="590"/>
-        <location filename="../core/qthelper.cpp" line="605"/>
+        <location filename="../core/qthelper.cpp" line="595"/>
+        <location filename="../core/qthelper.cpp" line="610"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="274"/>
-        <location filename="../core/qthelper.cpp" line="593"/>
-        <location filename="../core/qthelper.cpp" line="607"/>
+        <location filename="../core/qthelper.cpp" line="598"/>
+        <location filename="../core/qthelper.cpp" line="612"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
@@ -8660,53 +9168,58 @@ Media</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="325"/>
-        <location filename="../core/qthelper.cpp" line="616"/>
-        <location filename="../core/qthelper.cpp" line="626"/>
+        <location filename="../core/qthelper.cpp" line="621"/>
+        <location filename="../core/qthelper.cpp" line="631"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="329"/>
-        <location filename="../core/qthelper.cpp" line="614"/>
-        <location filename="../core/qthelper.cpp" line="624"/>
+        <location filename="../core/qthelper.cpp" line="619"/>
+        <location filename="../core/qthelper.cpp" line="629"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="1772"/>
+        <location filename="../core/dive.c" line="1751"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) o (%s)</translation>
     </message>
     <message>
-        <location filename="../core/divelist.c" line="484"/>
+        <location filename="../core/divelist.c" line="487"/>
         <location filename="../core/equipment.c" line="84"/>
-        <location filename="../core/planner.c" line="1411"/>
-        <location filename="../core/planner.c" line="1414"/>
+        <location filename="../core/planner.c" line="1432"/>
+        <location filename="../core/planner.c" line="1435"/>
         <source>air</source>
         <translation>aire</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="197"/>
+        <location filename="../core/equipment.c" line="86"/>
+        <source>EAN%d</source>
+        <translation>EAN%d</translation>
+    </message>
+    <message>
+        <location filename="../core/equipment.c" line="198"/>
         <source>integrated</source>
         <translation>integrado</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="198"/>
+        <location filename="../core/equipment.c" line="199"/>
         <source>belt</source>
         <translation>cinturón</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="199"/>
+        <location filename="../core/equipment.c" line="200"/>
         <source>ankle</source>
         <translation>tobillo</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="200"/>
+        <location filename="../core/equipment.c" line="201"/>
         <source>backplate weight</source>
         <translation>lastre en el arnes</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="201"/>
+        <location filename="../core/equipment.c" line="202"/>
         <source>clip-on</source>
         <translation>clip-on</translation>
     </message>
@@ -8719,8 +9232,8 @@ Media</translation>
         <location filename="../core/file.c" line="121"/>
         <location filename="../core/file.c" line="512"/>
         <location filename="../core/file.c" line="597"/>
-        <location filename="../core/file.c" line="924"/>
-        <location filename="../core/file.c" line="1056"/>
+        <location filename="../core/file.c" line="909"/>
+        <location filename="../core/file.c" line="1092"/>
         <location filename="../core/ostctools.c" line="80"/>
         <source>Failed to read &apos;%s&apos;</source>
         <translation>No se pudo leer «%s»</translation>
@@ -8778,486 +9291,496 @@ Media</translation>
         <translation>Calibrado de O₂ </translation>
     </message>
     <message>
-        <location filename="../core/file.c" line="887"/>
-        <source>No matching DC found for file &apos;%s&apos;</source>
-        <translation>No se ha encontrado concordancia con ningún DC para el archivo &apos;%s&apos;</translation>
+        <location filename="../core/git-access.c" line="134"/>
+        <source>Local cache directory %s corrupted - can&apos;t sync with Subsurface cloud storage</source>
+        <translation>Carpeta de cache local %s corrupta - No se puede sincronizar con el almacenamiento en la nube de Subsurface</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>none</source>
-        <translation>ninguno</translation>
+        <location filename="../core/git-access.c" line="157"/>
+        <location filename="../core/git-access.c" line="177"/>
+        <source>Could not update local cache to newer remote data</source>
+        <translation>No se pudo actualizar la caché local con nuevos datos remotos</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="309"/>
-        <location filename="../core/cochran.c" line="315"/>
-        <location filename="../core/cochran.c" line="385"/>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>deco stop</source>
-        <translation>parada deco</translation>
+        <location filename="../core/git-access.c" line="170"/>
+        <source>Subsurface cloud storage corrupted</source>
+        <translation>Almacenamiento en la nube de Subsurface corrupto</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="342"/>
-        <location filename="../core/file.c" line="755"/>
-        <source>battery</source>
-        <translation>batería</translation>
+        <location filename="../core/git-access.c" line="284"/>
+        <source>Could not update Subsurface cloud storage, try again later</source>
+        <translation>No se pudo actualizar el almacenamiento en la nube de Subsurface, intentalo de nuevo más tarde.</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="370"/>
-        <location filename="../core/cochran.c" line="409"/>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>rbt</source>
-        <translation>rbt</translation>
+        <location filename="../core/git-access.c" line="344"/>
+        <source>Remote storage and local data diverged. Error: merge failed (%s)</source>
+        <translation>El almacenamiento remoto y los datos locales son diferentes. Error: falló el merge (%s)</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="336"/>
-        <location filename="../core/cochran.c" line="390"/>
-        <location filename="../core/file.c" line="777"/>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>ascent</source>
-        <translation>ascenso</translation>
+        <location filename="../core/git-access.c" line="374"/>
+        <source>Remote storage and local data diverged. Cannot combine local and remote changes</source>
+        <translation>El almacenamiento remoto y los datos locales son diferentes. No se pueden combinar los cambios en ambos.</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="379"/>
-        <location filename="../core/cochran.c" line="426"/>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>ceiling</source>
-        <translation>techo</translation>
+        <location filename="../core/git-access.c" line="408"/>
+        <source>Remote storage and local data diverged</source>
+        <translation>El almacenamiento remoto y los datos locales han divergido</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>workload</source>
-        <translation>esfuerzo</translation>
+        <location filename="../core/git-access.c" line="411"/>
+        <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source>
+        <translation>El almacenamiento remoto y los datos locales son diferentes. Error: fallo al escribir los datos (%s)</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="395"/>
-        <location filename="../core/libdivecomputer.c" line="203"/>
-        <source>transmitter</source>
-        <translation>transmisor</translation>
+        <location filename="../core/git-access.c" line="420"/>
+        <source>Problems with local cache of Subsurface cloud data</source>
+        <translation>Problemas con el caché local de los datos en la nube de Subsurface</translation>
+    </message>
+    <message>
+        <location filename="../core/git-access.c" line="421"/>
+        <source>Moved cache data to %s. Please try the operation again.</source>
+        <translation>Datos en caché movidos a %s. Por favor, reintenta la operación.</translation>
+    </message>
+    <message>
+        <location filename="../core/git-access.c" line="743"/>
+        <source>Error connecting to Subsurface cloud storage</source>
+        <translation>Error al conectar al almacenamiento en la nube de Subsurface</translation>
+    </message>
+    <message>
+        <location filename="../core/git-access.c" line="746"/>
+        <source>git clone of %s failed (%s)</source>
+        <translation>Falló &quot;git clone&quot; de %s (%s)</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="210"/>
+        <location filename="../core/parse-xml.c" line="3317"/>
+        <location filename="../core/uemis-downloader.c" line="134"/>
+        <source>unknown</source>
+        <translation>desconocido</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>none</source>
+        <translation>ninguno</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>workload</source>
+        <translation>esfuerzo</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="203"/>
+        <location filename="../core/libdivecomputer.c" line="224"/>
         <source>violation</source>
         <translation>violación</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="203"/>
+        <location filename="../core/libdivecomputer.c" line="224"/>
         <source>bookmark</source>
         <translation>marcador</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="203"/>
+        <location filename="../core/libdivecomputer.c" line="224"/>
         <source>surface</source>
         <translation>superficie</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="203"/>
+        <location filename="../core/libdivecomputer.c" line="224"/>
         <source>safety stop</source>
         <translation>parada de seguridad</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="365"/>
-        <location filename="../core/cochran.c" line="414"/>
-        <location filename="../core/cochran.c" line="421"/>
-        <location filename="../core/file.c" line="868"/>
-        <location filename="../core/libdivecomputer.c" line="204"/>
-        <location filename="../core/libdivecomputer.c" line="207"/>
-        <source>gaschange</source>
-        <translation>cambio de mezcla</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="204"/>
+        <location filename="../core/libdivecomputer.c" line="225"/>
         <source>safety stop (voluntary)</source>
         <translation>parada de seguridad (voluntaria)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="204"/>
+        <location filename="../core/libdivecomputer.c" line="225"/>
         <source>safety stop (mandatory)</source>
         <translation>parada de seguridad (obligatoria)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="205"/>
+        <location filename="../core/libdivecomputer.c" line="226"/>
         <source>deepstop</source>
         <translation>parada profunda</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="205"/>
+        <location filename="../core/libdivecomputer.c" line="226"/>
         <source>ceiling (safety stop)</source>
         <translation>techo (parada de seguridad)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="205"/>
-        <source>divetime</source>
-        <translation>duración de inmersión</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="205"/>
+        <location filename="../core/libdivecomputer.c" line="226"/>
         <source>below floor</source>
         <comment>event showing dive is below deco floor and adding deco time</comment>
         <translation>por debajo del techo</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="353"/>
-        <location filename="../core/libdivecomputer.c" line="206"/>
-        <source>maxdepth</source>
-        <translation>Profundidad Max</translation>
-    </message>
-    <message>
-        <location filename="../core/cochran.c" line="348"/>
-        <location filename="../core/libdivecomputer.c" line="206"/>
-        <source>OLF</source>
-        <translation>OLF</translation>
+        <location filename="../core/libdivecomputer.c" line="226"/>
+        <source>divetime</source>
+        <translation>duración de inmersión</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="206"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
         <source>airtime</source>
         <translation>tiempo de aire</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="206"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
         <source>rgbm</source>
         <translation>rgbm</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="206"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
         <source>heading</source>
         <translation>encabezado</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="358"/>
-        <location filename="../core/cochran.c" line="404"/>
-        <location filename="../core/libdivecomputer.c" line="206"/>
-        <source>pO₂</source>
-        <translation>pO₂</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="207"/>
+        <location filename="../core/libdivecomputer.c" line="228"/>
         <source>tissue level warning</source>
         <translation>Alarma de nivel de tejidos</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="207"/>
+        <location filename="../core/libdivecomputer.c" line="228"/>
         <source>non stop time</source>
         <translation>tiempo sin parada</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="224"/>
+        <location filename="../core/libdivecomputer.c" line="237"/>
         <source>invalid event number</source>
         <translation>el número de evento no es válido</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="658"/>
-        <source>Unable to create parser for %s %s</source>
-        <translation>No es posible crear el analizador para %s %s</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="664"/>
-        <source>Error registering the data</source>
-        <translation>Error al registrar los datos</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="495"/>
+        <location filename="../core/libdivecomputer.c" line="553"/>
         <source>Error parsing the datetime</source>
         <translation>Error al analizar la fecha</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="513"/>
+        <location filename="../core/libdivecomputer.c" line="571"/>
         <source>Dive %d: %s</source>
         <translation>Inmersión n.º %d: %s</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="519"/>
+        <location filename="../core/libdivecomputer.c" line="577"/>
         <source>Error parsing the divetime</source>
         <translation>Error al analizar el tiempo de buceo</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="529"/>
+        <location filename="../core/libdivecomputer.c" line="587"/>
         <source>Error parsing the maxdepth</source>
         <translation>Error al analizar la máxima profundidad</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="548"/>
+        <location filename="../core/libdivecomputer.c" line="606"/>
         <source>Error parsing temperature</source>
         <translation>Error al leer la temperatura</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="568"/>
+        <location filename="../core/libdivecomputer.c" line="626"/>
         <source>Error parsing the gas mix count</source>
         <translation>Error al analizar el conteo de mezcla de gas</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="580"/>
+        <location filename="../core/libdivecomputer.c" line="638"/>
         <source>Error obtaining water salinity</source>
         <translation>Error al obtener salinidad del agua</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="589"/>
+        <location filename="../core/libdivecomputer.c" line="647"/>
         <source>Error obtaining surface pressure</source>
         <translation>Error al obtener la presión en superficie</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="614"/>
+        <location filename="../core/libdivecomputer.c" line="672"/>
         <source>Error obtaining divemode</source>
         <translation>Error al obtener el modo de buceo</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="634"/>
+        <location filename="../core/libdivecomputer.c" line="692"/>
         <source>Error parsing the gas mix</source>
         <translation>Error al analizar la mezcla de gas</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="684"/>
+        <location filename="../core/libdivecomputer.c" line="717"/>
+        <source>Unable to create parser for %s %s</source>
+        <translation>No es posible crear el analizador para %s %s</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="723"/>
+        <source>Error registering the data</source>
+        <translation>Error al registrar los datos</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="744"/>
         <source>Error parsing the samples</source>
         <translation>Error al analizar las muestras</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="822"/>
+        <location filename="../core/libdivecomputer.c" line="882"/>
         <source>Event: waiting for user action</source>
         <translation>Evento: esperando acción del usuario</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="830"/>
+        <location filename="../core/libdivecomputer.c" line="890"/>
         <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="../core/libdivecomputer.c" line="894"/>
+        <location filename="../core/libdivecomputer.c" line="954"/>
         <source>Error registering the event handler.</source>
         <translation>Error al registrar el manejador de eventos</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="899"/>
+        <location filename="../core/libdivecomputer.c" line="959"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Error al registrar el manejador de cancelación</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="920"/>
+        <location filename="../core/libdivecomputer.c" line="980"/>
         <source>Dive data import error</source>
         <translation>Error al importar datos de inmersiones</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="959"/>
+        <location filename="../core/libdivecomputer.c" line="1019"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>No es posible crear el contexto de libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="966"/>
+        <location filename="../core/libdivecomputer.c" line="1026"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>No se pudo abrir  %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="992"/>
+        <location filename="../core/libdivecomputer.c" line="1048"/>
         <source>Insufficient privileges to open the device %s %s (%s)</source>
         <translation>Privilegios insuficientes para abrir el dispositivo %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../core/parse-xml.c" line="517"/>
-        <source>Strange percentage reading %s
+        <location filename="../core/load-git.c" line="194"/>
+        <location filename="../core/parse-xml.c" line="1242"/>
+        <source>multiple GPS locations for this dive site; also %s
 </source>
-        <translation>Porcentaje extraño al leer %s
+        <translation>multiples posiciones GPS para este punto de buceo; también %s
 </translation>
     </message>
     <message>
-        <location filename="../core/load-git.c" line="194"/>
-        <location filename="../core/parse-xml.c" line="1238"/>
-        <source>multiple GPS locations for this dive site; also %s
+        <location filename="../core/load-git.c" line="222"/>
+        <location filename="../core/parse-xml.c" line="1304"/>
+        <source>additional name for site: %s
 </source>
-        <translation>multiples posiciones GPS para este punto de buceo; también %s
+        <translation>otro nombre para este sitio: %s
+</translation>
+    </message>
+    <message>
+        <location filename="../core/ostctools.c" line="120"/>
+        <location filename="../core/ostctools.c" line="152"/>
+        <source>Unknown DC in dive %d</source>
+        <translation>Ordenador desconocido en inmersión %d</translation>
+    </message>
+    <message>
+        <location filename="../core/ostctools.c" line="165"/>
+        <source>Error - %s - parsing dive %d</source>
+        <translation>Error - %s - al analizar la inmersión %d</translation>
+    </message>
+    <message>
+        <location filename="../core/parse-xml.c" line="517"/>
+        <source>Strange percentage reading %s
+</source>
+        <translation>Porcentaje extraño al leer %s
 </translation>
     </message>
     <message>
-        <location filename="../core/parse-xml.c" line="2044"/>
+        <location filename="../core/parse-xml.c" line="2051"/>
         <source>Failed to parse &apos;%s&apos;</source>
         <translation>No se pudo analizar &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../core/parse-xml.c" line="3741"/>
+        <location filename="../core/parse-xml.c" line="3774"/>
         <source>Can&apos;t open stylesheet %s</source>
         <translation>No se puede abrir la hoja de estilo %s</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="86"/>
-        <source>EAN%d</source>
-        <translation>EAN%d</translation>
+        <location filename="../core/planner.c" line="555"/>
+        <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE %s ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source>
+        <translation>DESCARGO DE RESPONSABILIDAD / AVISO: ESTA ES UNA NUEVA IMPLEMENTACIÓN DEL ALGORITMO %s Y UNA IMPLEMENTACIÓN DE UN PLANIFICADOR DE INMERSIÓN BASADO EN ÉL QUE SOLO HA SIDO PROBADA DE FORMA LIMITADA. RECOMENDAMOS FIRMEMENTE NO PLANIFICAR INMERSIONES BASADAS SIMPLEMENTE EN LOS RESULTADOS QUE SE OBTENGAN AQUÍ.</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="1032"/>
-        <location filename="../core/planner.c" line="1184"/>
-        <source>Can&apos;t find gas %s</source>
-        <translation>No puedo encontrar el gas %s</translation>
+        <location filename="../core/planner.c" line="569"/>
+        <source>Decompression calculation aborted due to excessive time</source>
+        <translation>Cálculo de descompresión abortado por exceso de tiempo</translation>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="571"/>
+        <location filename="../core/planner.c" line="829"/>
+        <location filename="../core/planner.c" line="834"/>
+        <location filename="../core/planner.c" line="860"/>
+        <location filename="../core/planner.c" line="870"/>
+        <source>Warning:</source>
+        <translation>Aviso:</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="368"/>
-        <source>Too many gas mixes</source>
-        <translation>Demasiadas mezclas de gas</translation>
+        <location filename="../core/planner.c" line="581"/>
+        <source>based on Bühlmann ZHL-16C with GFlow = %d and GFhigh = %d</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="568"/>
-        <source>Decompression calculation aborted due to excessive time</source>
-        <translation>Cálculo de descompresión abortado por exceso de tiempo</translation>
+        <location filename="../core/planner.c" line="586"/>
+        <source>based on VPM-B at nominal conservatism</source>
+        <translation>basado en VPM-B sin conservadurismo</translation>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="588"/>
+        <source>based on VPM-B at +%d conservatism</source>
+        <translation>basado en VPM-B con +%d conservadurismo</translation>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="590"/>
+        <source>, effective GF=%d/%d</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="594"/>
+        <source>recreational mode based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source>
+        <translation>modo recreativo basado en Bühlmann ZHL-16B con GFbajo = %d y GFalto = %d</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="592"/>
+        <location filename="../core/planner.c" line="598"/>
         <source>Subsurface dive plan</source>
         <translation>Plan de buceo de Subsurface</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="596"/>
-        <source>depth</source>
-        <translation>Profundidad</translation>
+        <location filename="../core/planner.c" line="599"/>
+        <source>&lt;div&gt;Runtime: %dmin&lt;/div&gt;&lt;br&gt;</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="602"/>
-        <source>runtime</source>
-        <translation>Tiempo acumulado</translation>
+        <location filename="../core/planner.c" line="604"/>
+        <source>depth</source>
+        <translation>Profundidad</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="599"/>
+        <location filename="../core/planner.c" line="607"/>
         <source>duration</source>
         <translation>Duración</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="554"/>
-        <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE %s ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source>
-        <translation>DESCARGO DE RESPONSABILIDAD / AVISO: ESTA ES UNA NUEVA IMPLEMENTACIÓN DEL ALGORITMO %s Y UNA IMPLEMENTACIÓN DE UN PLANIFICADOR DE INMERSIÓN BASADO EN ÉL QUE SOLO HA SIDO PROBADA DE FORMA LIMITADA. RECOMENDAMOS FIRMEMENTE NO PLANIFICAR INMERSIONES BASADAS SIMPLEMENTE EN LOS RESULTADOS QUE SE OBTENGAN AQUÍ.</translation>
+        <location filename="../core/planner.c" line="610"/>
+        <source>runtime</source>
+        <translation>Tiempo acumulado</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="605"/>
+        <location filename="../core/planner.c" line="613"/>
         <source>gas</source>
         <translation>Gas</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="648"/>
+        <location filename="../core/planner.c" line="656"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation>Transición a %.*f %s en %d:%02d min - tiempo acumulado %d:%02u con %s (SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="656"/>
+        <location filename="../core/planner.c" line="664"/>
         <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 - tiempo acumulado %d:%02u con %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="669"/>
+        <location filename="../core/planner.c" line="677"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation>Permanecer a  %.*f %s durante %d:%02d min - tiempo acumulado %d:%02u con %s (SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="676"/>
+        <location filename="../core/planner.c" line="684"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source>
         <translation>Permanecer a %.*f %s durante %d:%02d min - tiempo acumulado %d:%02u con %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="721"/>
+        <location filename="../core/planner.c" line="729"/>
         <source>%3.0f%s</source>
         <translation>%3.0f%s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="724"/>
-        <location filename="../core/planner.c" line="728"/>
+        <location filename="../core/planner.c" line="732"/>
+        <location filename="../core/planner.c" line="736"/>
         <source>%3dmin</source>
         <translation>%3dmin</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="737"/>
-        <location filename="../core/planner.c" line="749"/>
+        <location filename="../core/planner.c" line="745"/>
+        <location filename="../core/planner.c" line="757"/>
         <source>(SP = %.1fbar)</source>
         <translation>(SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="772"/>
+        <location filename="../core/planner.c" line="780"/>
         <source>Switch gas to %s (SP = %.1fbar)</source>
         <translation>Cambiar gas a %s (SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="774"/>
+        <location filename="../core/planner.c" line="782"/>
         <source>Switch gas to %s</source>
         <translation>Cambiar gas a %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="793"/>
+        <location filename="../core/planner.c" line="801"/>
         <source>CNS</source>
         <translation>CNS</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="795"/>
+        <location filename="../core/planner.c" line="803"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="799"/>
+        <location filename="../core/planner.c" line="807"/>
         <source>Gas consumption (CCR legs excluded):</source>
         <translation>Consumo de gas (excluidos segmentos con CCR)</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="801"/>
+        <location filename="../core/planner.c" line="809"/>
         <source>Gas consumption:</source>
         <translation>Consumo de gas:</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="570"/>
-        <location filename="../core/planner.c" line="821"/>
-        <location filename="../core/planner.c" line="826"/>
-        <location filename="../core/planner.c" line="851"/>
-        <location filename="../core/planner.c" line="861"/>
-        <source>Warning:</source>
-        <translation>Aviso:</translation>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="580"/>
-        <source>based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source>
-        <translation>basado en Bülmann ZHL-16B con GFbajo = %d y GFalto = %d</translation>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="584"/>
-        <source>based on VPM-B at nominal conservatism</source>
-        <translation>basado en VPM-B sin conservadurismo</translation>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="586"/>
-        <source>based on VPM-B at +%d conservatism</source>
-        <translation>basado en VPM-B con +%d conservadurismo</translation>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="588"/>
-        <source>recreational mode based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source>
-        <translation>modo recreativo basado en Bühlmann ZHL-16B con GFbajo = %d y GFalto = %d</translation>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="822"/>
+        <location filename="../core/planner.c" line="830"/>
         <source>this is more gas than available in the specified cylinder!</source>
         <translation>!Esto es más gas del disponible en la botella especificada¡</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="827"/>
+        <location filename="../core/planner.c" line="835"/>
         <source>not enough reserve for gas sharing on ascent!</source>
         <translation>¡Reserva insuficiente para compartir gas durante el ascenso!</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="829"/>
+        <location filename="../core/planner.c" line="837"/>
         <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source>
         <translation>%.0f%s/%.0f%s de %s (%.0f%s/%.0f%s en el ascenso planeado)</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="831"/>
+        <location filename="../core/planner.c" line="839"/>
         <source>%.0f%s (%.0f%s during planned ascent) of %s</source>
         <translation>%.0f%s (%.0f%s durante el ascenso planeado) of %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="848"/>
+        <location filename="../core/planner.c" line="857"/>
         <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
         <translation>Valor de pO₂ alto %.2f a %d:%02u con %s a la profundidad de %.*f %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="858"/>
+        <location filename="../core/planner.c" line="867"/>
         <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
         <translation>valor de pO₂ bajo %.2f en %d:%02u con gas %s a profundidad %.*f %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="1419"/>
+        <location filename="../core/planner.c" line="1194"/>
+        <source>Can&apos;t find gas %s</source>
+        <translation>No puedo encontrar el gas %s</translation>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="1440"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1280"/>
+        <location filename="../core/profile.c" line="1298"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
@@ -9266,70 +9789,70 @@ Prof: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1283"/>
+        <location filename="../core/profile.c" line="1301"/>
         <source>P: %d%s
 </source>
         <translation>Pres: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1287"/>
+        <location filename="../core/profile.c" line="1305"/>
         <source>T: %.1f%s
 </source>
         <translation>T: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1293"/>
+        <location filename="../core/profile.c" line="1311"/>
         <source>V: %.1f%s
 </source>
         <translation>V: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1296"/>
+        <location filename="../core/profile.c" line="1314"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation>CAS: %.*f%s/min
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1298"/>
+        <location filename="../core/profile.c" line="1316"/>
         <source>CNS: %u%%
 </source>
         <translation>CNS: %u%%
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1300"/>
+        <location filename="../core/profile.c" line="1318"/>
         <source>pO%s: %.2fbar
 </source>
         <translation>pO%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1302"/>
+        <location filename="../core/profile.c" line="1320"/>
         <source>pN%s: %.2fbar
 </source>
         <translation>pN%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1304"/>
+        <location filename="../core/profile.c" line="1322"/>
         <source>pHe: %.2fbar
 </source>
         <translation>pHe: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1307"/>
+        <location filename="../core/profile.c" line="1325"/>
         <source>MOD: %d%s
 </source>
         <translation>PMO: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1314"/>
+        <location filename="../core/profile.c" line="1332"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
@@ -9338,7 +9861,7 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1318"/>
+        <location filename="../core/profile.c" line="1336"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
@@ -9347,174 +9870,179 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1331"/>
+        <location filename="../core/profile.c" line="1349"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation>Parada de seguridad: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1334"/>
+        <location filename="../core/profile.c" line="1352"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation>Parada de seguridad: tiempo desc @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1339"/>
+        <location filename="../core/profile.c" line="1357"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation>Parada deco: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1342"/>
+        <location filename="../core/profile.c" line="1360"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation>Parada deco: tiempo desc @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1346"/>
+        <location filename="../core/profile.c" line="1364"/>
         <source>In deco
 </source>
         <translation>En deco
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1348"/>
+        <location filename="../core/profile.c" line="1366"/>
         <source>NDL: %umin
 </source>
         <translation>NDL: %umin
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1351"/>
+        <location filename="../core/profile.c" line="1369"/>
         <source>TTS: %umin
 </source>
         <translation>TTS: %umin
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1354"/>
+        <location filename="../core/profile.c" line="1372"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation>Parada deco: %umin @ %.0f%s (calc)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1362"/>
+        <location filename="../core/profile.c" line="1380"/>
         <source>In deco (calc)
 </source>
         <translation>En deco (calc)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1365"/>
+        <location filename="../core/profile.c" line="1383"/>
         <source>NDL: %umin (calc)
 </source>
         <translation>NDL: %umin (calc)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1367"/>
+        <location filename="../core/profile.c" line="1385"/>
         <source>NDL: &gt;2h (calc)
 </source>
         <translation>LND: &gt;2h (calc)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1371"/>
+        <location filename="../core/profile.c" line="1389"/>
         <source>TTS: %umin (calc)
 </source>
         <translation>TTS: %umin (calc)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1373"/>
+        <location filename="../core/profile.c" line="1391"/>
         <source>TTS: &gt;2h (calc)
 </source>
         <translation>TTS: &gt;2h (calc)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1376"/>
+        <location filename="../core/profile.c" line="1394"/>
         <source>RBT: %umin
 </source>
         <translation>RBT: %umin
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1379"/>
+        <location filename="../core/profile.c" line="1397"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation>Techo calculado %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1385"/>
+        <location filename="../core/profile.c" line="1403"/>
         <source>Tissue %.0fmin: %.1f%s
 </source>
         <translation>Tejido %.0fmin: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1391"/>
+        <location filename="../core/profile.c" line="1409"/>
         <source>heartbeat: %d
 </source>
         <translation>Ritmo cardiaco: %d
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1393"/>
+        <location filename="../core/profile.c" line="1411"/>
         <source>bearing: %d
 </source>
         <translation>Soporte: %d
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1396"/>
+        <location filename="../core/profile.c" line="1414"/>
         <source>mean depth to here %.1f%s
 </source>
         <translation>Prof. media hasta aquí %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1491"/>
+        <location filename="../core/profile.c" line="1515"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1495"/>
-        <location filename="../core/profile.c" line="1499"/>
-        <location filename="../core/profile.c" line="1503"/>
+        <location filename="../core/profile.c" line="1519"/>
+        <location filename="../core/profile.c" line="1523"/>
+        <location filename="../core/profile.c" line="1527"/>
         <source>%s %sD:%.1f%s</source>
         <translation>%s %sProf:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1507"/>
+        <location filename="../core/profile.c" line="1531"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sProf:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1511"/>
+        <location filename="../core/profile.c" line="1535"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1515"/>
-        <location filename="../core/profile.c" line="1519"/>
+        <location filename="../core/profile.c" line="1539"/>
+        <location filename="../core/profile.c" line="1543"/>
         <source>%s %sV:%.2f%s</source>
         <translation>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1526"/>
+        <location filename="../core/profile.c" line="1550"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sPres:%d %s</translation>
     </message>
     <message>
+        <location filename="../core/profile.c" line="1575"/>
+        <source>%s SAC:%.*f %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../core/qthelper.cpp" line="67"/>
         <source>%1km</source>
         <translation>%1km</translation>
@@ -9535,446 +10063,460 @@ EADD: %d%s
         <translation>%1yd</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="635"/>
+        <location filename="../core/qthelper.cpp" line="91"/>
+        <location filename="../core/qthelper.cpp" line="226"/>
+        <source>N</source>
+        <translation>N</translation>
+    </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="91"/>
+        <location filename="../core/qthelper.cpp" line="227"/>
+        <source>S</source>
+        <translation>S</translation>
+    </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="92"/>
+        <location filename="../core/qthelper.cpp" line="228"/>
+        <source>E</source>
+        <translation>E</translation>
+    </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="92"/>
+        <location filename="../core/qthelper.cpp" line="229"/>
+        <source>W</source>
+        <translation>O</translation>
+    </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="640"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="638"/>
+        <location filename="../core/qthelper.cpp" line="643"/>
         <source>F</source>
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="23"/>
-        <source>boat</source>
-        <translation>barco</translation>
+        <location filename="../core/save-html.c" line="469"/>
+        <location filename="../core/save-html.c" line="553"/>
+        <location filename="../core/worldmap-save.c" line="111"/>
+        <source>Can&apos;t open file %s</source>
+        <translation>No se puede abrir el archivo %s</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="23"/>
-        <source>shore</source>
-        <translation>orilla</translation>
+        <location filename="../core/save-html.c" line="488"/>
+        <source>Number</source>
+        <translation>Número</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="459"/>
-        <location filename="../core/dive.c" line="23"/>
-        <source>drift</source>
-        <translation>a la deriva</translation>
+        <location filename="../core/save-html.c" line="489"/>
+        <source>Date</source>
+        <translation>Fecha</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="24"/>
-        <source>deep</source>
-        <translation>profunda</translation>
+        <location filename="../core/save-html.c" line="490"/>
+        <source>Time</source>
+        <translation>Hora</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="24"/>
-        <source>cavern</source>
-        <translation>caverna</translation>
+        <location filename="../core/save-html.c" line="491"/>
+        <source>Location</source>
+        <translation>Ubicación</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="443"/>
-        <location filename="../core/dive.c" line="24"/>
-        <source>ice</source>
-        <translation>hielo</translation>
+        <location filename="../core/save-html.c" line="492"/>
+        <source>Air temp.</source>
+        <translation>Temperatura del aire</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="445"/>
-        <source>search</source>
-        <translation>busqueda</translation>
+        <location filename="../core/save-html.c" line="493"/>
+        <source>Water temp.</source>
+        <translation>Temperatura del agua</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="455"/>
-        <location filename="../core/dive.c" line="25"/>
-        <source>wreck</source>
-        <translation>pecio</translation>
+        <location filename="../core/save-html.c" line="494"/>
+        <source>Dives</source>
+        <translation>Inmersiones</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="441"/>
-        <location filename="../core/dive.c" line="25"/>
-        <source>cave</source>
-        <translation>cueva</translation>
+        <location filename="../core/save-html.c" line="495"/>
+        <source>Expand all</source>
+        <translation>Expandir todos</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="25"/>
-        <source>altitude</source>
-        <translation>altura</translation>
+        <location filename="../core/save-html.c" line="496"/>
+        <source>Collapse all</source>
+        <translation>Contraer todo</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="26"/>
-        <source>pool</source>
-        <translation>piscina</translation>
+        <location filename="../core/save-html.c" line="497"/>
+        <source>Trips</source>
+        <translation>Viajes</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="26"/>
-        <source>lake</source>
-        <translation>lago</translation>
+        <location filename="../core/save-html.c" line="498"/>
+        <source>Statistics</source>
+        <translation>Estadísticas</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="457"/>
-        <location filename="../core/dive.c" line="26"/>
-        <source>river</source>
-        <translation>río</translation>
+        <location filename="../core/save-html.c" line="499"/>
+        <source>Advanced search</source>
+        <translation>Búsqueda avanzada</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="439"/>
-        <location filename="../core/dive.c" line="27"/>
-        <source>night</source>
-        <translation>noche</translation>
+        <location filename="../core/save-html.c" line="502"/>
+        <source>Rating</source>
+        <translation>Valoración</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="153"/>
-        <source>Error: the file does not appear to be a DATATRAK divelog</source>
-        <translation>Error: el archivo no parece ser un registro de DATATRAK</translation>
+        <location filename="../core/save-html.c" line="503"/>
+        <source>Visibility</source>
+        <translation>Visibilidad</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="286"/>
-        <source>clear</source>
-        <translation>claro</translation>
+        <location filename="../core/save-html.c" line="504"/>
+        <source>Duration</source>
+        <translation>Duración</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="289"/>
-        <source>misty</source>
-        <translation>nublado</translation>
+        <location filename="../core/save-html.c" line="505"/>
+        <source>Divemaster</source>
+        <translation>Divemaster</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="292"/>
-        <source>fog</source>
-        <translation>niebla</translation>
+        <location filename="../core/save-html.c" line="506"/>
+        <source>Buddy</source>
+        <translation>Compañero</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="295"/>
-        <source>rain</source>
-        <translation>lluvia</translation>
+        <location filename="../core/save-html.c" line="507"/>
+        <source>Suit</source>
+        <translation>Traje</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="298"/>
-        <source>storm</source>
-        <translation>tormenta</translation>
+        <location filename="../core/save-html.c" line="508"/>
+        <source>Tags</source>
+        <translation>Etiquetas</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="301"/>
-        <source>snow</source>
-        <translation>nieve</translation>
+        <location filename="../core/save-html.c" line="509"/>
+        <location filename="../smtk-import/smartrak.c" line="251"/>
+        <location filename="../smtk-import/smartrak.c" line="321"/>
+        <source>Notes</source>
+        <translation>Notas</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="321"/>
-        <source>No suit</source>
-        <translation>Sin traje</translation>
+        <location filename="../core/save-html.c" line="510"/>
+        <source>Show more details</source>
+        <translation>Mostrar más detalles</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="324"/>
-        <source>Shorty</source>
-        <translation>Shorty</translation>
+        <location filename="../core/save-html.c" line="513"/>
+        <source>Yearly statistics</source>
+        <translation>Estadísticas anuales</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="327"/>
-        <source>Combi</source>
-        <translation>Combi</translation>
+        <location filename="../core/save-html.c" line="514"/>
+        <source>Year</source>
+        <translation>Año</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="330"/>
-        <source>Wet suit</source>
-        <translation>Traje humedo</translation>
+        <location filename="../core/save-html.c" line="515"/>
+        <source>Total time</source>
+        <translation>Tiempo total</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="333"/>
-        <source>Semidry suit</source>
-        <translation>Traje semiseco</translation>
+        <location filename="../core/save-html.c" line="516"/>
+        <source>Average time</source>
+        <translation>Duración media</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="336"/>
-        <source>Dry suit</source>
-        <translation>Traje seco</translation>
+        <location filename="../core/save-html.c" line="517"/>
+        <source>Shortest time</source>
+        <translation>Duración mas corta</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="396"/>
-        <source>no stop</source>
-        <translation>sin paradas</translation>
+        <location filename="../core/save-html.c" line="518"/>
+        <source>Longest time</source>
+        <translation>Duración más larga</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="400"/>
-        <source>single ascent</source>
-        <translation>ascenso sencillo</translation>
+        <location filename="../core/save-html.c" line="519"/>
+        <source>Average depth</source>
+        <translation>Prof media</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="402"/>
-        <source>multiple ascent</source>
-        <translation>ascenso múltiple</translation>
+        <location filename="../core/save-html.c" line="520"/>
+        <source>Min. depth</source>
+        <translation>Prof. mínima</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="404"/>
-        <location filename="../core/dive.c" line="27"/>
-        <source>fresh</source>
-        <translation>agua dulce</translation>
+        <location filename="../core/save-html.c" line="521"/>
+        <source>Max. depth</source>
+        <translation>Prof. máxima</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="406"/>
-        <source>salt water</source>
-        <translation>agua salada</translation>
+        <location filename="../core/save-html.c" line="522"/>
+        <source>Average SAC</source>
+        <translation>CAS medio</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="431"/>
-        <source>sight seeing</source>
-        <translation>paisaje</translation>
+        <location filename="../core/save-html.c" line="523"/>
+        <source>Min. SAC</source>
+        <translation>CAS mínimo</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="433"/>
-        <source>club dive</source>
-        <translation>inmersión de club</translation>
+        <location filename="../core/save-html.c" line="524"/>
+        <source>Max. SAC</source>
+        <translation>CAS máximo</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="437"/>
-        <source>instruction</source>
-        <translation>instrucción</translation>
+        <location filename="../core/save-html.c" line="525"/>
+        <source>Average temp.</source>
+        <translation>Temp. promedio</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="463"/>
-        <source>other</source>
-        <translation>otros</translation>
+        <location filename="../core/save-html.c" line="526"/>
+        <source>Min. temp.</source>
+        <translation>Temp. mínima</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="474"/>
-        <source>Other activities</source>
-        <translation>Otras actividades</translation>
+        <location filename="../core/save-html.c" line="527"/>
+        <source>Max. temp.</source>
+        <translation>Temp. máxima</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="498"/>
-        <source>Datatrak/Wlog notes</source>
-        <translation>Notas de Datatrak/Wlog</translation>
+        <location filename="../core/save-html.c" line="528"/>
+        <source>Back to list</source>
+        <translation>Volver a la lista</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="537"/>
-        <source>Manually entered dive</source>
-        <translation>Inmersión manual</translation>
+        <location filename="../core/save-html.c" line="531"/>
+        <source>Dive No.</source>
+        <translation>Inm No.</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="588"/>
-        <source>Unknown</source>
-        <translation>Desconocido</translation>
+        <location filename="../core/save-html.c" line="532"/>
+        <source>Dive profile</source>
+        <translation>Perfil de la inmersión</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="674"/>
-        <source>Error: couldn&apos;t open the file %s</source>
-        <translation>Error: no se pudo abrir el archivo %s</translation>
+        <location filename="../core/save-html.c" line="533"/>
+        <source>Dive information</source>
+        <translation>Información de la inmersión</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="687"/>
-        <source>Error: no dive</source>
-        <translation>Error: sin inmersiones</translation>
+        <location filename="../core/save-html.c" line="534"/>
+        <source>Dive equipment</source>
+        <translation>Equipo de buceo</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="27"/>
-        <source>student</source>
-        <translation>estudiante</translation>
+        <location filename="../core/save-html.c" line="535"/>
+        <location filename="../core/save-html.c" line="542"/>
+        <source>Type</source>
+        <translation>Tipo</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="461"/>
-        <location filename="../core/dive.c" line="28"/>
-        <source>photo</source>
-        <translation>foto</translation>
+        <location filename="../core/save-html.c" line="536"/>
+        <source>Size</source>
+        <translation>Tamaño</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="28"/>
-        <source>video</source>
-        <translation>vídeo</translation>
+        <location filename="../core/save-html.c" line="537"/>
+        <source>Work pressure</source>
+        <translation>Presión de trabajo</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="435"/>
-        <location filename="../core/dive.c" line="28"/>
-        <source>instructor</source>
-        <translation>instructor</translation>
+        <location filename="../core/save-html.c" line="538"/>
+        <source>Start pressure</source>
+        <translation>Presión inicial</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="398"/>
-        <location filename="../core/dive.c" line="29"/>
-        <source>deco</source>
-        <translation>deco</translation>
+        <location filename="../core/save-html.c" line="539"/>
+        <source>End pressure</source>
+        <translation>Presión final</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="33"/>
-        <source>OC-gas</source>
-        <translation>gas en OC</translation>
+        <location filename="../core/save-html.c" line="540"/>
+        <source>Gas</source>
+        <translation>Gas</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="33"/>
-        <source>diluent</source>
-        <translation>diluyente</translation>
+        <location filename="../core/save-html.c" line="541"/>
+        <source>Weight</source>
+        <translation>Peso</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="33"/>
-        <location filename="../core/equipment.c" line="88"/>
-        <location filename="../core/planner.c" line="1415"/>
-        <location filename="../core/planner.c" line="1418"/>
-        <source>oxygen</source>
-        <translation>oxígeno</translation>
+        <location filename="../core/save-html.c" line="543"/>
+        <source>Events</source>
+        <translation>Sucesos</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="227"/>
-        <source>ℓ</source>
-        <translation>ℓ</translation>
+        <location filename="../core/save-html.c" line="544"/>
+        <source>Name</source>
+        <translation>Nombre</translation>
+    </message>
+    <message>
+        <location filename="../core/save-html.c" line="545"/>
+        <source>Value</source>
+        <translation>Valor</translation>
+    </message>
+    <message>
+        <location filename="../core/save-html.c" line="546"/>
+        <source>Coordinates</source>
+        <translation>Coordenadas</translation>
+    </message>
+    <message>
+        <location filename="../core/save-html.c" line="547"/>
+        <source>Dive status</source>
+        <translation>Estado de la inmersión</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="239"/>
+        <location filename="../core/statistics.c" line="242"/>
         <source>more than %d days</source>
         <translation>más de %d días</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="246"/>
+        <location filename="../core/statistics.c" line="249"/>
         <source>%dd %dh %dmin</source>
         <translation>%dd, %dh %dmin</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="249"/>
+        <location filename="../core/statistics.c" line="252"/>
         <source>%dmin %dsecs</source>
         <translation>%dmin %dsegs</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="251"/>
+        <location filename="../core/statistics.c" line="254"/>
         <source>%dh %dmin</source>
         <translation>%dh %dmin</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="263"/>
+        <location filename="../core/statistics.c" line="266"/>
         <source>for dives #</source>
         <translation>para las inmersiones n.º</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="269"/>
+        <location filename="../core/statistics.c" line="272"/>
         <source>for selected dives</source>
         <translation>para las inmersiones seleccionadas</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="304"/>
+        <location filename="../core/statistics.c" line="307"/>
         <source>for dive #%d</source>
         <translation>para la inmersión n.º %d</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="306"/>
+        <location filename="../core/statistics.c" line="309"/>
         <source>for selected dive</source>
         <translation>para la inmersión seleccionada</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="308"/>
+        <location filename="../core/statistics.c" line="311"/>
         <source>for all dives</source>
         <translation>Todas las inmersiones</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="310"/>
+        <location filename="../core/statistics.c" line="313"/>
         <source>(no dives)</source>
         <translation>(ninguna inmersión)</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Sun</source>
         <translation>Do</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Mon</source>
         <translation>Lu</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Tue</source>
         <translation>Ma</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Wed</source>
         <translation>Mi</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Thu</source>
         <translation>Ju</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Fri</source>
         <translation>Vi</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Sat</source>
         <translation>Sa</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Jan</source>
         <translation>Ene</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Feb</source>
         <translation>Feb</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Mar</source>
         <translation>Mar</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Apr</source>
         <translation>Abr</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>May</source>
         <translation>Mayo</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Jun</source>
         <translation>Jun</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Jul</source>
         <translation>Jul</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Aug</source>
         <translation>Ago</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Sep</source>
         <translation>Sep</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Oct</source>
         <translation>Oct</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Nov</source>
         <translation>Nov</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Dec</source>
         <translation>Dic</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="191"/>
-        <location filename="../core/parse-xml.c" line="3284"/>
-        <location filename="../core/uemis-downloader.c" line="134"/>
-        <source>unknown</source>
-        <translation>desconocido</translation>
-    </message>
-    <message>
-        <location filename="../core/uemis-downloader.c" line="467"/>
-        <source>data</source>
-        <translation>datos</translation>
-    </message>
-    <message>
-        <location filename="../core/uemis-downloader.c" line="447"/>
-        <source>%s %s</source>
-        <translation>%s %s</translation>
-    </message>
-    <message>
         <location filename="../core/uemis-downloader.c" line="27"/>
         <source>Uemis Zurich: the file system is almost full.
 Disconnect/reconnect the dive computer
@@ -10005,6 +10547,16 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation>No hay inmersiones que descargar.</translation>
     </message>
     <message>
+        <location filename="../core/uemis-downloader.c" line="447"/>
+        <source>%s %s</source>
+        <translation>%s %s</translation>
+    </message>
+    <message>
+        <location filename="../core/uemis-downloader.c" line="467"/>
+        <source>data</source>
+        <translation>datos</translation>
+    </message>
+    <message>
         <location filename="../core/uemis-downloader.c" line="495"/>
         <source>divelog #</source>
         <translation>divelog #</translation>
@@ -10175,281 +10727,6 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation>Alerta de batería baja</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="469"/>
-        <location filename="../core/save-html.c" line="553"/>
-        <location filename="../core/worldmap-save.c" line="111"/>
-        <source>Can&apos;t open file %s</source>
-        <translation>No se puede abrir el archivo %s</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="488"/>
-        <source>Number</source>
-        <translation>Número</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="489"/>
-        <source>Date</source>
-        <translation>Fecha</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="490"/>
-        <source>Time</source>
-        <translation>Hora</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="491"/>
-        <source>Location</source>
-        <translation>Ubicación</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="492"/>
-        <source>Air temp.</source>
-        <translation>Temperatura del aire</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="493"/>
-        <source>Water temp.</source>
-        <translation>Temperatura del agua</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="498"/>
-        <source>Statistics</source>
-        <translation>Estadísticas</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="502"/>
-        <source>Rating</source>
-        <translation>Valoración</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="503"/>
-        <source>Visibility</source>
-        <translation>Visibilidad</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="504"/>
-        <source>Duration</source>
-        <translation>Duración</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="494"/>
-        <source>Dives</source>
-        <translation>Inmersiones</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="495"/>
-        <source>Expand all</source>
-        <translation>Expandir todos</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="496"/>
-        <source>Collapse all</source>
-        <translation>Contraer todo</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="497"/>
-        <source>Trips</source>
-        <translation>Viajes</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="499"/>
-        <source>Advanced search</source>
-        <translation>Búsqueda avanzada</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="505"/>
-        <source>Divemaster</source>
-        <translation>Divemaster</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="506"/>
-        <source>Buddy</source>
-        <translation>Compañero</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="507"/>
-        <source>Suit</source>
-        <translation>Traje</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="508"/>
-        <source>Tags</source>
-        <translation>Etiquetas</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="509"/>
-        <location filename="../smtk-import/smartrak.c" line="251"/>
-        <location filename="../smtk-import/smartrak.c" line="321"/>
-        <source>Notes</source>
-        <translation>Notas</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="510"/>
-        <source>Show more details</source>
-        <translation>Mostrar más detalles</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="513"/>
-        <source>Yearly statistics</source>
-        <translation>Estadísticas anuales</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="514"/>
-        <source>Year</source>
-        <translation>Año</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="515"/>
-        <source>Total time</source>
-        <translation>Tiempo total</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="516"/>
-        <source>Average time</source>
-        <translation>Duración media</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="517"/>
-        <source>Shortest time</source>
-        <translation>Duración mas corta</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="518"/>
-        <source>Longest time</source>
-        <translation>Duración más larga</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="519"/>
-        <source>Average depth</source>
-        <translation>Prof media</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="520"/>
-        <source>Min. depth</source>
-        <translation>Prof. mínima</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="521"/>
-        <source>Max. depth</source>
-        <translation>Prof. máxima</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="523"/>
-        <source>Min. SAC</source>
-        <translation>CAS mínimo</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="524"/>
-        <source>Max. SAC</source>
-        <translation>CAS máximo</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="525"/>
-        <source>Average temp.</source>
-        <translation>Temp. promedio</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="526"/>
-        <source>Min. temp.</source>
-        <translation>Temp. mínima</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="527"/>
-        <source>Max. temp.</source>
-        <translation>Temp. máxima</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="528"/>
-        <source>Back to list</source>
-        <translation>Volver a la lista</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="534"/>
-        <source>Dive equipment</source>
-        <translation>Equipo de buceo</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="537"/>
-        <source>Work pressure</source>
-        <translation>Presión de trabajo</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="538"/>
-        <source>Start pressure</source>
-        <translation>Presión inicial</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="539"/>
-        <source>End pressure</source>
-        <translation>Presión final</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="547"/>
-        <source>Dive status</source>
-        <translation>Estado de la inmersión</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="522"/>
-        <source>Average SAC</source>
-        <translation>CAS medio</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="531"/>
-        <source>Dive No.</source>
-        <translation>Inm No.</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="532"/>
-        <source>Dive profile</source>
-        <translation>Perfil de la inmersión</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="533"/>
-        <source>Dive information</source>
-        <translation>Información de la inmersión</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="535"/>
-        <location filename="../core/save-html.c" line="542"/>
-        <source>Type</source>
-        <translation>Tipo</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="536"/>
-        <source>Size</source>
-        <translation>Tamaño</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="540"/>
-        <source>Gas</source>
-        <translation>Gas</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="541"/>
-        <source>Weight</source>
-        <translation>Peso</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="543"/>
-        <source>Events</source>
-        <translation>Sucesos</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="544"/>
-        <source>Name</source>
-        <translation>Nombre</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="545"/>
-        <source>Value</source>
-        <translation>Valor</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="546"/>
-        <source>Coordinates</source>
-        <translation>Coordenadas</translation>
-    </message>
-    <message>
         <location filename="../core/worldmap-save.c" line="39"/>
         <source>Date:</source>
         <translation>Fecha:</translation>
@@ -10495,110 +10772,6 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation>Notas:</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="91"/>
-        <location filename="../core/qthelper.cpp" line="226"/>
-        <source>N</source>
-        <translation>N</translation>
-    </message>
-    <message>
-        <location filename="../core/qthelper.cpp" line="91"/>
-        <location filename="../core/qthelper.cpp" line="227"/>
-        <source>S</source>
-        <translation>S</translation>
-    </message>
-    <message>
-        <location filename="../core/qthelper.cpp" line="92"/>
-        <location filename="../core/qthelper.cpp" line="228"/>
-        <source>E</source>
-        <translation>E</translation>
-    </message>
-    <message>
-        <location filename="../core/qthelper.cpp" line="92"/>
-        <location filename="../core/qthelper.cpp" line="229"/>
-        <source>W</source>
-        <translation>O</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="341"/>
-        <source>Remote storage and local data diverged. Error: merge failed (%s)</source>
-        <translation>El almacenamiento remoto y los datos locales son diferentes. Error: falló el merge (%s)</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="134"/>
-        <source>Local cache directory %s corrupted - can&apos;t sync with Subsurface cloud storage</source>
-        <translation>Carpeta de cache local %s corrupta - No se puede sincronizar con el almacenamiento en la nube de Subsurface</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="157"/>
-        <location filename="../core/git-access.c" line="177"/>
-        <source>Could not update local cache to newer remote data</source>
-        <translation>No se pudo actualizar la caché local con nuevos datos remotos</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="170"/>
-        <source>Subsurface cloud storage corrupted</source>
-        <translation>Almacenamiento en la nube de Subsurface corrupto</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="285"/>
-        <source>Could not update Subsurface cloud storage, try again later</source>
-        <translation>No se pudo actualizar el almacenamiento en la nube de Subsurface, intentalo de nuevo más tarde.</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="371"/>
-        <source>Remote storage and local data diverged. Cannot combine local and remote changes</source>
-        <translation>El almacenamiento remoto y los datos locales son diferentes. No se pueden combinar los cambios en ambos.</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="405"/>
-        <source>Remote storage and local data diverged</source>
-        <translation>El almacenamiento remoto y los datos locales han divergido</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="408"/>
-        <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source>
-        <translation>El almacenamiento remoto y los datos locales son diferentes. Error: fallo al escribir los datos (%s)</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="417"/>
-        <source>Problems with local cache of Subsurface cloud data</source>
-        <translation>Problemas con el caché local de los datos en la nube de Subsurface</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="418"/>
-        <source>Moved cache data to %s. Please try the operation again.</source>
-        <translation>Datos en caché movidos a %s. Por favor, reintenta la operación.</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="737"/>
-        <source>Error connecting to Subsurface cloud storage</source>
-        <translation>Error al conectar al almacenamiento en la nube de Subsurface</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="740"/>
-        <source>git clone of %s failed (%s)</source>
-        <translation>Falló &quot;git clone&quot; de %s (%s)</translation>
-    </message>
-    <message>
-        <location filename="../core/load-git.c" line="222"/>
-        <location filename="../core/parse-xml.c" line="1300"/>
-        <source>additional name for site: %s
-</source>
-        <translation>otro nombre para este sitio: %s
-</translation>
-    </message>
-    <message>
-        <location filename="../core/ostctools.c" line="120"/>
-        <location filename="../core/ostctools.c" line="152"/>
-        <source>Unknown DC in dive %d</source>
-        <translation>Ordenador desconocido en inmersión %d</translation>
-    </message>
-    <message>
-        <location filename="../core/ostctools.c" line="165"/>
-        <source>Error - %s - parsing dive %d</source>
-        <translation>Error - %s - al analizar la inmersión %d</translation>
-    </message>
-    <message>
         <location filename="../smtk-import/smartrak.c" line="247"/>
         <source>Built</source>
         <translation>Construido</translation>
@@ -10682,117 +10855,117 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation>Subsurface-mobile</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="91"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="103"/>
         <source>Subsurface</source>
         <translation>Subsurface</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="97"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="110"/>
         <source>Dive list</source>
         <translation>Lista de inmersiones</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="112"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="125"/>
         <source>Cloud credentials</source>
         <translation>Credenciales de la nube</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="126"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="139"/>
         <source>Manage dives</source>
         <translation>Gestionar inmersiones</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="138"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="141"/>
         <source>Add dive manually</source>
         <translation>Añadir inmersión manualmente</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="146"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="149"/>
         <source>Manual sync with cloud</source>
         <translation>Sincronización manual con la nube</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="164"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="167"/>
         <source>Offline mode</source>
         <translation>Modo offline</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="164"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="167"/>
         <source>Enable auto cloud sync</source>
         <translation>Activar sincronizado automático con la nube</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="182"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="187"/>
         <source>GPS</source>
         <translation>GPS</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="185"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="190"/>
         <source>GPS-tag dives</source>
         <translation>Aplicar coordenadas GPS a inmersiones</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="192"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="197"/>
         <source>Upload GPS data</source>
         <translation>Subir datos GPS</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="199"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="204"/>
         <source>Download GPS data</source>
         <translation>Descargar datos GPS</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="206"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="211"/>
         <source>Show GPS fixes</source>
         <translation>Mostrar posiciones GPS</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="215"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="220"/>
         <source>Clear GPS cache</source>
         <translation>Borrar la cache de GPS</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="221"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="226"/>
         <source>Preferences</source>
         <translation>Preferencias</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="230"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="237"/>
         <source>Developer</source>
         <translation>Desarrollador</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="232"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="239"/>
         <source>App log</source>
         <translation>Registro de la app</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="239"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="246"/>
         <source>Theme information</source>
         <translation>Información de tema</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="246"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="253"/>
         <source>User manual</source>
         <translation>Manual de usuario</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="252"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="259"/>
         <source>About</source>
         <translation>Acerca de</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="283"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="304"/>
         <source>Run location service</source>
         <translation>Activar servicio de posicionamiento</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="283"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="304"/>
         <source>No GPS source available</source>
         <translation>Fuente GPS no disponible</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="295"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="316"/>
         <source>Actions</source>
         <translation>Acciones</translation>
     </message>
@@ -10873,6 +11046,24 @@ p, li { white-space: pre-wrap; }
         <translation>m/min</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="121"/>
+        <location filename="../build/ui_plannerSettings.h" line="425"/>
+        <source>75% to 50% avg. depth</source>
+        <translation>De 75% a 50% de prof. media</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="138"/>
+        <location filename="../build/ui_plannerSettings.h" line="427"/>
+        <source>50% avg. depth to 6m</source>
+        <translation>De 50% prof. media a 6m</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="155"/>
+        <location filename="../build/ui_plannerSettings.h" line="429"/>
+        <source>6m to surface</source>
+        <translation>De 6m a superficie</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="175"/>
         <location filename="../build/ui_plannerSettings.h" line="431"/>
         <source>Descent</source>
@@ -10896,12 +11087,35 @@ p, li { white-space: pre-wrap; }
         <translation>Deco VPM-B</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="268"/>
+        <source>Bühlmann deco</source>
+        <translation>Deco Bühlmann</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="278"/>
         <location filename="../build/ui_plannerSettings.h" line="445"/>
         <source>Reserve gas</source>
         <translation>Gas de reserva</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="288"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="549"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="578"/>
+        <location filename="../build/ui_plannerSettings.h" line="446"/>
+        <location filename="../build/ui_plannerSettings.h" line="459"/>
+        <location filename="../build/ui_plannerSettings.h" line="461"/>
+        <source>bar</source>
+        <translation>bar</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="307"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="416"/>
+        <location filename="../build/ui_plannerSettings.h" line="437"/>
+        <location filename="../build/ui_plannerSettings.h" line="440"/>
+        <source>%</source>
+        <translation>%</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="320"/>
         <location filename="../build/ui_plannerSettings.h" line="449"/>
         <source>Postpone gas change if a stop is not required</source>
@@ -10920,12 +11134,10 @@ p, li { white-space: pre-wrap; }
         <translation>GF bajo</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="307"/>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="416"/>
-        <location filename="../build/ui_plannerSettings.h" line="437"/>
-        <location filename="../build/ui_plannerSettings.h" line="440"/>
-        <source>%</source>
-        <translation>%</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="353"/>
+        <location filename="../build/ui_plannerSettings.h" line="436"/>
+        <source>Plan backgas breaks</source>
+        <translation>Planear &quot;breaks&quot; con gas de fondo</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="360"/>
@@ -10934,10 +11146,10 @@ p, li { white-space: pre-wrap; }
         <translation>GF alto</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="429"/>
-        <location filename="../build/ui_plannerSettings.h" line="441"/>
-        <source>Drop to first depth</source>
-        <translation>Caer a la primera profundidad</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="370"/>
+        <location filename="../build/ui_plannerSettings.h" line="453"/>
+        <source>min</source>
+        <translation>min</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="389"/>
@@ -10946,163 +11158,139 @@ p, li { white-space: pre-wrap; }
         <translation>Última parada a 6m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="353"/>
-        <location filename="../build/ui_plannerSettings.h" line="436"/>
-        <source>Plan backgas breaks</source>
-        <translation>Planear &quot;breaks&quot; con gas de fondo</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="396"/>
+        <source>Maximize bottom time allowed by gas and no decompression limits</source>
+        <translation>Maximiza el tiempo de fondo permitido por el gas y los límites sin deco</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="515"/>
-        <location filename="../build/ui_plannerSettings.h" line="455"/>
-        <source>Gas options</source>
-        <translation>Opciones de gases</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="399"/>
+        <location filename="../build/ui_plannerSettings.h" line="443"/>
+        <source>Recreational mode</source>
+        <translation>Modo recreativo</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="594"/>
-        <location filename="../build/ui_plannerSettings.h" line="456"/>
-        <source>Bottom SAC</source>
-        <translation>CAS en fondo</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="429"/>
+        <location filename="../build/ui_plannerSettings.h" line="441"/>
+        <source>Drop to first depth</source>
+        <translation>Caer a la primera profundidad</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="692"/>
-        <location filename="../build/ui_plannerSettings.h" line="457"/>
-        <source>Deco SAC</source>
-        <translation>CAS en deco</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="436"/>
+        <location filename="../build/ui_plannerSettings.h" line="452"/>
+        <source>Min. switch duration</source>
+        <translation>Min. duración del cambio</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="601"/>
-        <location filename="../build/ui_plannerSettings.h" line="458"/>
-        <source>Bottom pO₂</source>
-        <translation>pO₂ en el fondo</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="459"/>
+        <location filename="../build/ui_plannerSettings.h" line="444"/>
+        <source>Safety stop</source>
+        <translation>Parada de seguridad</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="685"/>
-        <location filename="../build/ui_plannerSettings.h" line="460"/>
-        <source>Deco pO₂</source>
-        <translation>pO₂ en deco</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="495"/>
+        <source>Conservatism level</source>
+        <translation>Nivel de conservadurismo</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="515"/>
+        <location filename="../build/ui_plannerSettings.h" line="455"/>
+        <source>Gas options</source>
+        <translation>Opciones de gases</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="565"/>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="672"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="698"/>
         <location filename="../build/ui_plannerSettings.h" line="462"/>
         <location filename="../build/ui_plannerSettings.h" line="463"/>
         <source>ℓ/min</source>
         <translation>ℓ/min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="632"/>
-        <location filename="../build/ui_plannerSettings.h" line="468"/>
-        <source>Display runtime</source>
-        <translation>Mostrar tiempo acumulado</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="645"/>
-        <location filename="../build/ui_plannerSettings.h" line="472"/>
-        <source>Display segment duration</source>
-        <translation>Mostrar duración de los segmentos</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="655"/>
-        <location filename="../build/ui_plannerSettings.h" line="476"/>
-        <source>Display transitions in deco</source>
-        <translation>Mostrar transiciones en deco</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="662"/>
-        <location filename="../build/ui_plannerSettings.h" line="477"/>
-        <source>Verbatim dive plan</source>
-        <translation>Plan de buceo detallado</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="288"/>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="549"/>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="578"/>
-        <location filename="../build/ui_plannerSettings.h" line="446"/>
-        <location filename="../build/ui_plannerSettings.h" line="459"/>
-        <location filename="../build/ui_plannerSettings.h" line="461"/>
-        <source>bar</source>
-        <translation>bar</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="121"/>
-        <location filename="../build/ui_plannerSettings.h" line="425"/>
-        <source>75% to 50% avg. depth</source>
-        <translation>De 75% a 50% de prof. media</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="138"/>
-        <location filename="../build/ui_plannerSettings.h" line="427"/>
-        <source>50% avg. depth to 6m</source>
-        <translation>De 50% prof. media a 6m</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="155"/>
-        <location filename="../build/ui_plannerSettings.h" line="429"/>
-        <source>6m to surface</source>
-        <translation>De 6m a superficie</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="268"/>
-        <source>Bühlmann deco</source>
-        <translation>Deco Bühlmann</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="370"/>
-        <location filename="../build/ui_plannerSettings.h" line="453"/>
-        <source>min</source>
-        <translation>min</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="396"/>
-        <source>Maximize bottom time allowed by gas and no decompression limits</source>
-        <translation>Maximiza el tiempo de fondo permitido por el gas y los límites sin deco</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="594"/>
+        <source>m</source>
+        <translation>m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="399"/>
-        <location filename="../build/ui_plannerSettings.h" line="443"/>
-        <source>Recreational mode</source>
-        <translation>Modo recreativo</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="606"/>
+        <source>Used to calculate best mix. Select best mix depth in &apos;Available gases&apos; table by entering gas depth, followed by &quot;B&quot; (best trimix mix) or &quot;BN&quot; (best nitrox mix)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="436"/>
-        <location filename="../build/ui_plannerSettings.h" line="452"/>
-        <source>Min. switch duration</source>
-        <translation>Min. duración del cambio</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="613"/>
+        <location filename="../build/ui_plannerSettings.h" line="456"/>
+        <source>Bottom SAC</source>
+        <translation>CAS en fondo</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="459"/>
-        <location filename="../build/ui_plannerSettings.h" line="444"/>
-        <source>Safety stop</source>
-        <translation>Parada de seguridad</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="620"/>
+        <location filename="../build/ui_plannerSettings.h" line="458"/>
+        <source>Bottom pO₂</source>
+        <translation>pO₂ en el fondo</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="495"/>
-        <source>Conservatism level</source>
-        <translation>Nivel de conservadurismo</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="627"/>
+        <source>Best mix END</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="608"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="634"/>
         <location filename="../build/ui_plannerSettings.h" line="464"/>
         <source>Notes</source>
         <translation>Notas</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="629"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="655"/>
         <location filename="../build/ui_plannerSettings.h" line="466"/>
         <source>In dive plan, show runtime (absolute time) of stops</source>
         <translation>En planificación, mostrar tiempo acumulado de paradas (tiempo absoluto)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="642"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="658"/>
+        <location filename="../build/ui_plannerSettings.h" line="468"/>
+        <source>Display runtime</source>
+        <translation>Mostrar tiempo acumulado</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="668"/>
         <location filename="../build/ui_plannerSettings.h" line="470"/>
         <source>In dive plan, show duration (relative time) of stops</source>
         <translation>En planificación, mostrar duración de paradas (tiempo relativo)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="652"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="671"/>
+        <location filename="../build/ui_plannerSettings.h" line="472"/>
+        <source>Display segment duration</source>
+        <translation>Mostrar duración de los segmentos</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="678"/>
         <location filename="../build/ui_plannerSettings.h" line="474"/>
         <source>In diveplan, list transitions or treat them as implicit</source>
         <translation>En planificación, listar transiciones o considerarlas implicitas</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="681"/>
+        <location filename="../build/ui_plannerSettings.h" line="476"/>
+        <source>Display transitions in deco</source>
+        <translation>Mostrar transiciones en deco</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="688"/>
+        <location filename="../build/ui_plannerSettings.h" line="477"/>
+        <source>Verbatim dive plan</source>
+        <translation>Plan de buceo detallado</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="711"/>
+        <location filename="../build/ui_plannerSettings.h" line="460"/>
+        <source>Deco pO₂</source>
+        <translation>pO₂ en deco</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="718"/>
+        <location filename="../build/ui_plannerSettings.h" line="457"/>
+        <source>Deco SAC</source>
+        <translation>CAS en deco</translation>
+    </message>
 </context>
 </TS>
\ No newline at end of file
diff --git a/translations/subsurface_et_EE.ts b/translations/subsurface_et_EE.ts
index 498c48409..1577352d5 100644
--- a/translations/subsurface_et_EE.ts
+++ b/translations/subsurface_et_EE.ts
@@ -105,6 +105,11 @@
         <translation>Nimi:</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="56"/>
+        <source>Could not initialize Winsock version 2.2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="134"/>
         <source>Trying to turn on the local Bluetooth device...</source>
         <translation type="unfinished"/>
@@ -115,6 +120,11 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="167"/>
+        <source>Remote devices list was cleared.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="183"/>
         <source>Scanning for remote devices...</source>
         <translation type="unfinished"/>
@@ -125,6 +135,22 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="208"/>
+        <source>The local Bluetooth device was %1.</source>
+        <extracomment>%1 will be replaced with &quot;turned on&quot; or &quot;turned off&quot;</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
+        <source>turned on</source>
+        <translation>sisselülitatud</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
+        <source>turned off</source>
+        <translation>väljalülitatud</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="225"/>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="339"/>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="359"/>
@@ -172,37 +198,6 @@
         <translation>Paarita</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="352"/>
-        <source>Device %1 was paired and is authorized.</source>
-        <translation>Seade %1 on paaritatud ja autoriseeritud.</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="56"/>
-        <source>Could not initialize Winsock version 2.2</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="167"/>
-        <source>Remote devices list was cleared.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="208"/>
-        <source>The local Bluetooth device was %1.</source>
-        <extracomment>%1 will be replaced with &quot;turned on&quot; or &quot;turned off&quot;</extracomment>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
-        <source>turned on</source>
-        <translation>sisselülitatud</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
-        <source>turned off</source>
-        <translation>väljalülitatud</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="307"/>
         <source>Remove pairing</source>
         <translation>Eemalda paaritus</translation>
@@ -228,6 +223,11 @@
         <translation>Seade %1 on paaritatud.</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="352"/>
+        <source>Device %1 was paired and is authorized.</source>
+        <translation>Seade %1 on paaritatud ja autoriseeritud.</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="378"/>
         <source>The device %1 can now be used for connection. You can press the Save button.</source>
         <translation type="unfinished"/>
@@ -286,12 +286,12 @@
 <context>
     <name>BuddyFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="621"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="619"/>
         <source>Person: </source>
         <translation>Isik:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="622"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="620"/>
         <source>Searches for buddies and divemasters</source>
         <translation>Otsi semusid ja divemastereid</translation>
     </message>
@@ -299,7 +299,7 @@
 <context>
     <name>BuddyFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="243"/>
+        <location filename="../qt-models/filtermodels.cpp" line="248"/>
         <source>No buddies</source>
         <translation>Pole semu</translation>
     </message>
@@ -307,25 +307,30 @@
 <context>
     <name>CloudCredentials</name>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="49"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="50"/>
         <source>Cloud credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="55"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="56"/>
         <source>Email</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="67"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="68"/>
         <source>Password</source>
         <translation>Salasõna</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="90"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="92"/>
         <source>Show password</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="97"/>
+        <source>PIN</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>ColumnNameProvider</name>
@@ -381,6 +386,16 @@
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
+        <source>Max. depth</source>
+        <translation>Max sügavus</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
+        <source>Avg. depth</source>
+        <translation>Keskmine sügavus</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
         <source>Divemaster</source>
         <translation>Divemaster</translation>
     </message>
@@ -391,6 +406,11 @@
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
+        <source>Suit</source>
+        <translation>Ülikond</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
         <source>Notes</source>
         <translation>Märkmed</translation>
     </message>
@@ -410,21 +430,6 @@
         <translation>Vee temp.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
-        <source>Max. depth</source>
-        <translation>Max sügavus</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
-        <source>Avg. depth</source>
-        <translation>Keskmine sügavus</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
-        <source>Suit</source>
-        <translation>Ülikond</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="44"/>
         <source>O₂</source>
         <translation>O₂</translation>
@@ -538,7 +543,7 @@
         <translation>Ei saa luua libdivecomputer konteksti</translation>
     </message>
     <message>
-        <location filename="../core/configuredivecomputer.cpp" line="660"/>
+        <location filename="../core/configuredivecomputer.cpp" line="656"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation>Ei suuda luua sidet sukeldumiskompuutriga.</translation>
     </message>
@@ -558,11 +563,19 @@
         <translation>Seade või ühenduspunkt</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="170"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1520"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1533"/>
-        <source>...</source>
-        <translation>...</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="47"/>
+        <source>Connect via Bluetooth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="54"/>
+        <source>Connect</source>
+        <translation>Ühenda</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="64"/>
+        <source>Disconnect</source>
+        <translation>Ühenda lahti</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="80"/>
@@ -571,12 +584,24 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="90"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1523"/>
+        <source>Read settings from backup file or from device before writing to the device</source>
+        <translation>Loen seaded varukoopia failist või seadmest enne seadmesse kirjutamist</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="93"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1525"/>
         <source>Save changes to device</source>
         <translation>Salvesta muudatused seadmesse</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="116"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1527"/>
+        <source>Read settings from backup file or from device before writing to a backup file</source>
+        <translation>Loen seaded varukoopia failist või seadmest enne varukoopia faili kirjutamist</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="119"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1529"/>
         <source>Backup</source>
@@ -595,15 +620,40 @@
         <translation>Uuenda firmware</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="163"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1532"/>
+        <source>Save libdivecomputer logfile</source>
+        <translation>Salvesta libdivecomputer logifail</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="170"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1520"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1533"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="177"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1534"/>
         <source>Cancel</source>
         <translation>Loobu</translation>
     </message>
     <message>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1539"/>
-        <source>OSTC 3</source>
-        <translation>OSTC 3</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="214"/>
+        <source>OSTC 3,Sport,Cr,2</source>
+        <translation>OSTC 3,Sport,Cr,2</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="223"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1541"/>
+        <source>Suunto Vyper family</source>
+        <translation>Suunto Vyper pere</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="232"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1543"/>
+        <source>OSTC, Mk.2/2N/2C</source>
+        <translation>OSTC, Mk.2/2N/2C</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="253"/>
@@ -616,40 +666,56 @@
         <translation>Põhiseaded</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="326"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1656"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1943"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1546"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1726"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1766"/>
-        <source>Serial No.</source>
-        <translation>Seerianr.</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="260"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1575"/>
+        <source>Eco</source>
+        <translation>Öko</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="349"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1679"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1980"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1547"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1727"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1767"/>
-        <source>Firmware version</source>
-        <translation>Firmware versioon</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="265"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1576"/>
+        <source>Medium</source>
+        <translation>Keskmine</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="538"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1713"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1990"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1548"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1729"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1768"/>
-        <source>Custom text</source>
-        <translation>Oma tekst</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="270"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1577"/>
+        <source>High</source>
+        <translation>Kõrge</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="385"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1549"/>
-        <source>Language</source>
-        <translation>Keel</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="278"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="826"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="849"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="875"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="927"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="993"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1019"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1101"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1117"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1450"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2278"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2382"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2408"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2434"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2474"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2497"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1586"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1621"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1623"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1625"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1628"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1637"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1638"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1710"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1785"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1789"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1801"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1803"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1806"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1807"/>
+        <source>%</source>
+        <translation>%</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="289"/>
@@ -676,44 +742,36 @@
         <translation>Itaalia</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="579"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1557"/>
-        <source>Dive mode</source>
-        <translation>Sukeldumise liik</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="556"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1560"/>
-        <source>OC</source>
-        <translation>OC</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="561"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1561"/>
-        <source>CC</source>
-        <translation>CC</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="313"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1582"/>
+        <source>m/°C</source>
+        <translation>m/°C</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="566"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2336"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1562"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1793"/>
-        <source>Gauge</source>
-        <translation>Mõõdik</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="318"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1583"/>
+        <source>ft/°F</source>
+        <translation>jalg/°F</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="571"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1563"/>
-        <source>Apnea</source>
-        <translation>Apnea</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="326"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1656"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1943"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1546"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1726"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1766"/>
+        <source>Serial No.</source>
+        <translation>Seerianr.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="395"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2063"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1565"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1780"/>
-        <source>Date format</source>
-        <translation>Kuupäeva formaat</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="349"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1679"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1980"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1547"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1727"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1767"/>
+        <source>Firmware version</source>
+        <translation>Firmware versioon</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="360"/>
@@ -734,108 +792,147 @@
         <translation>AAKKPP</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1042"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2457"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1639"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1805"/>
-        <source>Saturation</source>
-        <translation>Küllastatus</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="385"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1549"/>
+        <source>Language</source>
+        <translation>Keel</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="278"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="826"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="849"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="875"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="927"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="993"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1019"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1101"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1117"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1450"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2278"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2382"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2408"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2434"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2474"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2497"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1586"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1621"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1623"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1625"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1628"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1637"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1638"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1710"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1785"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1789"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1801"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1803"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1806"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1807"/>
-        <source>%</source>
-        <translation>%</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="395"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2063"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1565"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1780"/>
+        <source>Date format</source>
+        <translation>Kuupäeva formaat</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="865"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2261"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1624"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1784"/>
-        <source>Desaturation</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="405"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1572"/>
+        <source>Brightness</source>
+        <translation>Heledus</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="983"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2398"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1636"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1800"/>
-        <source>Last deco</source>
-        <translation>Viimane deko</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="415"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1850"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1579"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1753"/>
+        <source>Units</source>
+        <translation>Ühikud</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="711"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="736"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="758"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="904"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2181"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2206"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2228"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2307"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1626"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1786"/>
-        <source> m</source>
-        <translation>m</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="425"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1585"/>
+        <source>Salinity (0-5%)</source>
+        <translation>Soolsus (0-5%)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="405"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1572"/>
-        <source>Brightness</source>
-        <translation>Heledus</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="438"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1615"/>
+        <source>Reset device to default settings</source>
+        <translation>Algväärtusta seade vaikeväärtustele</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="260"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1575"/>
-        <source>Eco</source>
-        <translation>Öko</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="452"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1590"/>
+        <source>230LSB/Gauss</source>
+        <translation>230LSB/Gauss</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="265"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1576"/>
-        <source>Medium</source>
-        <translation>Keskmine</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="457"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1591"/>
+        <source>330LSB/Gauss</source>
+        <translation>330LSB/Gauss</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="270"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1577"/>
-        <source>High</source>
-        <translation>Kõrge</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="462"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1592"/>
+        <source>390LSB/Gauss</source>
+        <translation>390LSB/Gauss</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="603"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2034"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1599"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1779"/>
-        <source>Sampling rate</source>
-        <translation>Mõõtmiste sagedus</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="467"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1593"/>
+        <source>440LSB/Gauss</source>
+        <translation>440LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="472"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1594"/>
+        <source>660LSB/Gauss</source>
+        <translation>660LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="477"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1595"/>
+        <source>820LSB/Gauss</source>
+        <translation>820LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="482"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1596"/>
+        <source>1090LSB/Gauss</source>
+        <translation>1090LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="487"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1597"/>
+        <source>1370LSB/Gauss</source>
+        <translation>1370LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="521"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1587"/>
+        <source>Compass gain</source>
+        <translation>Kompassi tundlikkus</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="531"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1799"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1745"/>
+        <source>Computer model</source>
+        <translation>Sukeldumiskompuutri mudel</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="538"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1713"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1990"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1548"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1729"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1768"/>
+        <source>Custom text</source>
+        <translation>Oma tekst</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="556"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1560"/>
+        <source>OC</source>
+        <translation>OC</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="561"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1561"/>
+        <source>CC</source>
+        <translation>CC</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="566"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2336"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1562"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1793"/>
+        <source>Gauge</source>
+        <translation>Mõõdik</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="571"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1563"/>
+        <source>Apnea</source>
+        <translation>Apnea</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="579"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1557"/>
+        <source>Dive mode</source>
+        <translation>Sukeldumise liik</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="590"/>
@@ -852,30 +949,12 @@
         <translation>10s</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="415"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1850"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1579"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1753"/>
-        <source>Units</source>
-        <translation>Ühikud</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="313"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1582"/>
-        <source>m/°C</source>
-        <translation>m/°C</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="318"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1583"/>
-        <source>ft/°F</source>
-        <translation>jalg/°F</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="644"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1605"/>
-        <source>Dive mode color</source>
-        <translation>Sukeldumise liigi värv</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="603"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2034"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1599"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1779"/>
+        <source>Sampling rate</source>
+        <translation>Mõõtmiste sagedus</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="614"/>
@@ -902,12 +981,6 @@
         <translation>Sinine</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="425"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1585"/>
-        <source>Salinity (0-5%)</source>
-        <translation>Soolsus (0-5%)</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="637"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2092"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1613"/>
@@ -916,90 +989,80 @@
         <translation>Sünkroniseeri sukeldumiskompuutri aeg arvutiga</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="521"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1587"/>
-        <source>Compass gain</source>
-        <translation>Kompassi tundlikkus</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="90"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1523"/>
-        <source>Read settings from backup file or from device before writing to the device</source>
-        <translation>Loen seaded varukoopia failist või seadmest enne seadmesse kirjutamist</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="116"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1527"/>
-        <source>Read settings from backup file or from device before writing to a backup file</source>
-        <translation>Loen seaded varukoopia failist või seadmest enne varukoopia faili kirjutamist</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="232"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1543"/>
-        <source>OSTC, Mk.2/2N/2C</source>
-        <translation>OSTC, Mk.2/2N/2C</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="644"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1605"/>
+        <source>Dive mode color</source>
+        <translation>Sukeldumise liigi värv</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="452"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1590"/>
-        <source>230LSB/Gauss</source>
-        <translation>230LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="654"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2020"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1614"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1771"/>
+        <source>Show safety stop</source>
+        <translation>Näita ohutuspeatust</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="457"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1591"/>
-        <source>330LSB/Gauss</source>
-        <translation>330LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="661"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2145"/>
+        <source>End Depth</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="462"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1592"/>
-        <source>390LSB/Gauss</source>
-        <translation>390LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="671"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2162"/>
+        <source> s</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="467"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1593"/>
-        <source>440LSB/Gauss</source>
-        <translation>440LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="687"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1953"/>
+        <source>Length</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="472"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1594"/>
-        <source>660LSB/Gauss</source>
-        <translation>660LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="694"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2138"/>
+        <source>Start Depth</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="477"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1595"/>
-        <source>820LSB/Gauss</source>
-        <translation>820LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="701"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2152"/>
+        <source>Reset Depth</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="482"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1596"/>
-        <source>1090LSB/Gauss</source>
-        <translation>1090LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="711"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="736"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="758"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="904"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2181"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2206"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2228"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2307"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1626"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1786"/>
+        <source> m</source>
+        <translation>m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="487"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1597"/>
-        <source>1370LSB/Gauss</source>
-        <translation>1370LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="778"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2248"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1643"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1810"/>
+        <source>Advanced settings</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="654"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2020"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1614"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1771"/>
-        <source>Show safety stop</source>
-        <translation>Näita ohutuspeatust</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="784"/>
+        <source>Left button sensitivity</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="438"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1615"/>
-        <source>Reset device to default settings</source>
-        <translation>Algväärtusta seade vaikeväärtustele</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="791"/>
+        <source>Always show ppO2</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="798"/>
@@ -1010,20 +1073,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="223"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1541"/>
-        <source>Suunto Vyper family</source>
-        <translation>Suunto Vyper pere</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="778"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2248"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1643"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1810"/>
-        <source>Advanced settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="805"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2271"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1618"/>
@@ -1054,6 +1103,14 @@
         <translation>GFHigh</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="865"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2261"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1624"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1784"/>
+        <source>Desaturation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="917"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2320"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1627"/>
@@ -1068,14 +1125,6 @@
         <translation>mbar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="973"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2369"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1630"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1788"/>
-        <source> min</source>
-        <translation>min</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="960"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2331"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1633"/>
@@ -1084,63 +1133,28 @@
         <translation>ZH-L16</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="47"/>
-        <source>Connect via Bluetooth</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="163"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1532"/>
-        <source>Save libdivecomputer logfile</source>
-        <translation>Salvesta libdivecomputer logifail</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="661"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2145"/>
-        <source>End Depth</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="671"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2162"/>
-        <source> s</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="687"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1953"/>
-        <source>Length</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="694"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2138"/>
-        <source>Start Depth</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="701"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2152"/>
-        <source>Reset Depth</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="784"/>
-        <source>Left button sensitivity</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="791"/>
-        <source>Always show ppO2</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="965"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1634"/>
         <source>ZH-L16+GF</source>
         <translation>ZH-L16+GF</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="973"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2369"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1630"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1788"/>
+        <source> min</source>
+        <translation>min</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="983"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2398"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1636"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1800"/>
+        <source>Last deco</source>
+        <translation>Viimane deko</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1009"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2424"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1640"/>
@@ -1157,6 +1171,14 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1042"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2457"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1639"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1805"/>
+        <source>Saturation</source>
+        <translation>Küllastatus</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1052"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1642"/>
         <source>Flip screen</source>
@@ -1168,12 +1190,22 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1066"/>
+        <source>MOD warning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1073"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2513"/>
         <source>Graphical speed indicator</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1080"/>
+        <source>Dynamic ascent rate</source>
+        <translation>Dünaamiline tõusukiirus</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1087"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2552"/>
         <source>Bottom gas consumption</source>
@@ -1186,6 +1218,14 @@
         <translation>Dekogaasi kulutus</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1133"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1149"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2520"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2536"/>
+        <source> ℓ/min</source>
+        <translation>ℓ/min</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1165"/>
         <source>Temperature sensor offset</source>
         <translation type="unfinished"/>
@@ -1204,6 +1244,18 @@
         <translation>Gaasi seaded</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1235"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1320"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2610"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2695"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1645"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1668"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1812"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1835"/>
+        <source>%O₂</source>
+        <translation>%O₂</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1240"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1325"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2615"/>
@@ -1322,18 +1374,12 @@
         <translation>Dil 5</translation>
     </message>
     <message>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1691"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1858"/>
-        <source>Set point [cbar]</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1405"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2770"/>
+        <source>Setpoint</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1693"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1860"/>
-        <source>Change depth [m]</source>
-        <translation>Muuda sügavus [m]</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1415"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2780"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1698"/>
@@ -1370,6 +1416,12 @@
         <translation>SP 5</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1443"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1709"/>
+        <source>O₂ in calibration gas</source>
+        <translation>O₂ kalibreerivas gaasis</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1467"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1713"/>
         <source>Fixed setpoint</source>
@@ -1400,101 +1452,6 @@
         <translation> cbar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1748"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1733"/>
-        <source>P1 (medium)</source>
-        <extracomment>Suunto safety level</extracomment>
-        <translation>P1 (keskmine)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1753"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1734"/>
-        <source>P2 (high)</source>
-        <extracomment>Suunto safety level</extracomment>
-        <translation>P2 (kõrge)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1792"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1744"/>
-        <source>Total dive time</source>
-        <translation>Sukeldumise koguaeg</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2109"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1769"/>
-        <source>kg/ℓ</source>
-        <translation>kg/ℓ</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2346"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1795"/>
-        <source>Apnoea</source>
-        <translation>Apnoe</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1583"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1722"/>
-        <source>Safety level</source>
-        <translation>Ohutuse tase</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="54"/>
-        <source>Connect</source>
-        <translation>Ühenda</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="64"/>
-        <source>Disconnect</source>
-        <translation>Ühenda lahti</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="214"/>
-        <source>OSTC 3,Sport,Cr,2</source>
-        <translation>OSTC 3,Sport,Cr,2</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1066"/>
-        <source>MOD warning</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1080"/>
-        <source>Dynamic ascent rate</source>
-        <translation>Dünaamiline tõusukiirus</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1133"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1149"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2520"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2536"/>
-        <source> ℓ/min</source>
-        <translation>ℓ/min</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1235"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1320"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2610"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2695"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1645"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1668"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1812"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1835"/>
-        <source>%O₂</source>
-        <translation>%O₂</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1405"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2770"/>
-        <source>Setpoint</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1443"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1709"/>
-        <source>O₂ in calibration gas</source>
-        <translation>O₂ kalibreerivas gaasis</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1535"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2843"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1719"/>
@@ -1511,6 +1468,12 @@
         <translation>pO₂ min</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1583"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1722"/>
+        <source>Safety level</source>
+        <translation>Ohutuse tase</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1609"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1723"/>
         <source>Altitude range</source>
@@ -1544,6 +1507,20 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1748"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1733"/>
+        <source>P1 (medium)</source>
+        <extracomment>Suunto safety level</extracomment>
+        <translation>P1 (keskmine)</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1753"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1734"/>
+        <source>P2 (high)</source>
+        <extracomment>Suunto safety level</extracomment>
+        <translation>P2 (kõrge)</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1761"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1736"/>
         <source>Sample rate</source>
@@ -1568,11 +1545,10 @@
         <translation>60s</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="531"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1799"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1745"/>
-        <source>Computer model</source>
-        <translation>Sukeldumiskompuutri mudel</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1792"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1744"/>
+        <source>Total dive time</source>
+        <translation>Sukeldumise koguaeg</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1816"/>
@@ -1637,12 +1613,6 @@
         <translation>Aja hoiatus</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2099"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1765"/>
-        <source>Salinity</source>
-        <translation>Soolsus</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2074"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1774"/>
         <source>MM/DD/YY</source>
@@ -1661,12 +1631,30 @@
         <translation>AA/KK/PP</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2099"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1765"/>
+        <source>Salinity</source>
+        <translation>Soolsus</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2109"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1769"/>
+        <source>kg/ℓ</source>
+        <translation>kg/ℓ</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2341"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1794"/>
         <source>ZH-L16 CC</source>
         <translation>ZH-L16 CC</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2346"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1795"/>
+        <source>Apnoea</source>
+        <translation>Apnoe</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2351"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1796"/>
         <source>L16-GF OC</source>
@@ -1685,87 +1673,112 @@
         <translation>PSCR-GF</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1108"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1129"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1539"/>
+        <source>OSTC 3</source>
+        <translation>OSTC 3</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1691"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1858"/>
+        <source>Set point [cbar]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1693"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1860"/>
+        <source>Change depth [m]</source>
+        <translation>Muuda sügavus [m]</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1110"/>
+        <source>Backup dive computer settings</source>
+        <translation>Varunda sukeldumiskompuutri seaded</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1111"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1132"/>
         <source>Backup files (*.xml)</source>
         <translation>Varukoopia failid (*.xml)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1113"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1115"/>
+        <source>XML backup error</source>
+        <translation>XML varundamise viga</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1116"/>
         <source>An error occurred while saving the backup file.
 %1</source>
         <translation>Viga varukoopia faili kirjutamisel.
 %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1116"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1119"/>
         <source>Backup succeeded</source>
         <translation>Varundamine õnnestus</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1117"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1120"/>
         <source>Your settings have been saved to: %1</source>
         <translation>Seaded on salvestatud: %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1107"/>
-        <source>Backup dive computer settings</source>
-        <translation>Varunda sukeldumiskompuutri seaded</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1112"/>
-        <source>XML backup error</source>
-        <translation>XML varundamise viga</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1128"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1131"/>
         <source>Restore dive computer settings</source>
         <translation>Taasta sukeldumiskompuutri seaded</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1134"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1137"/>
         <source>XML restore error</source>
         <translation>XML taastamise viga</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1135"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1138"/>
         <source>An error occurred while restoring the backup file.
 %1</source>
         <translation>Viga varukoopia taastamisel.
 %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1139"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1142"/>
         <source>Restore succeeded</source>
         <translation>Taastamine õnnestus</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1140"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1143"/>
         <source>Your settings have been restored successfully.</source>
         <translation>Seaded on edukalt taastatud.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1150"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1153"/>
         <source>Select firmware file</source>
         <translation>Vali firmware fail</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1151"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1154"/>
         <source>All files (*.*)</source>
         <translation>Kõik failid (*.*)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1207"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1210"/>
         <source>Choose file for divecomputer download logfile</source>
         <translation>Vali sukeldumiskompuutri allalaadimise logifail</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1208"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1211"/>
         <source>Log files (*.log)</source>
         <translation>Logifailid (*.log)</translation>
     </message>
 </context>
 <context>
+    <name>ContextDrawer</name>
+    <message>
+        <location filename="../mobile-widgets/qml/kirigami/src/controls/ContextDrawer.qml" line="76"/>
+        <source>Actions</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>CylindersModel</name>
     <message>
         <location filename="../qt-models/cylindermodel.cpp" line="16"/>
@@ -1779,11 +1792,6 @@
     </message>
     <message>
         <location filename="../qt-models/cylindermodel.cpp" line="16"/>
-        <source>He%</source>
-        <translation>He%</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="16"/>
         <source>Work press.</source>
         <translation>Töörõhk</translation>
     </message>
@@ -1803,9 +1811,24 @@
         <translation>O₂%</translation>
     </message>
     <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="16"/>
+        <source>He%</source>
+        <translation>He%</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
+        <source>Deco switch at</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../qt-models/cylindermodel.cpp" line="17"/>
-        <source>Switch at</source>
-        <translation>Vaheta</translation>
+        <source>Bot. MOD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
+        <source>MND</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-models/cylindermodel.cpp" line="17"/>
@@ -1823,17 +1846,32 @@
         <translation>ℓ</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="161"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="177"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation>Siin klikkamine eemaldab selle ballooni</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="383"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="180"/>
+        <source>Switch depth for deco gas. Calculated using Deco pO₂ preference, unless set manually.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="183"/>
+        <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to &apos;*&apos; for best O₂% for max depth.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="186"/>
+        <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to &apos;*&apos; for best He% for max depth.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="444"/>
         <source>Cylinder cannot be removed</source>
         <translation>Ballooni ei saa eemaldada</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="384"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="445"/>
         <source>This gas is 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, mis pole sellel sukeldumisel kasutusel.</translation>
     </message>
@@ -1853,42 +1891,24 @@
         <translation>Milliseid komponente soovid kopeerida</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="73"/>
+        <location filename="../build/ui_divecomponentselection.h" line="141"/>
+        <source>Dive site</source>
+        <translation>Sukeldumiskoht</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="80"/>
         <location filename="../build/ui_divecomponentselection.h" line="142"/>
         <source>Suit</source>
         <translation>Ülikond</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="122"/>
-        <location filename="../build/ui_divecomponentselection.h" line="148"/>
-        <source>Divemaster</source>
-        <translation>Divemaster</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="129"/>
-        <location filename="../build/ui_divecomponentselection.h" line="149"/>
-        <source>Buddy</source>
-        <translation>Semu</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="136"/>
-        <location filename="../build/ui_divecomponentselection.h" line="150"/>
-        <source>Rating</source>
-        <translation>Hinne</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="87"/>
         <location filename="../build/ui_divecomponentselection.h" line="143"/>
         <source>Visibility</source>
         <translation>Nähtavus</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="73"/>
-        <location filename="../build/ui_divecomponentselection.h" line="141"/>
-        <source>Dive site</source>
-        <translation>Sukeldumiskoht</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="94"/>
         <location filename="../build/ui_divecomponentselection.h" line="144"/>
         <source>Notes</source>
@@ -1912,10 +1932,34 @@
         <source>Cylinders</source>
         <translation>Balloonid</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="122"/>
+        <location filename="../build/ui_divecomponentselection.h" line="148"/>
+        <source>Divemaster</source>
+        <translation>Divemaster</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="129"/>
+        <location filename="../build/ui_divecomponentselection.h" line="149"/>
+        <source>Buddy</source>
+        <translation>Semu</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="136"/>
+        <location filename="../build/ui_divecomponentselection.h" line="150"/>
+        <source>Rating</source>
+        <translation>Hinne</translation>
+    </message>
 </context>
 <context>
     <name>DiveComputerManagementDialog</name>
     <message>
+        <location filename="../desktop-widgets/divecomputermanagementdialog.ui" line="17"/>
+        <location filename="../build/ui_divecomputermanagementdialog.h" line="65"/>
+        <source>Edit dive computer nicknames</source>
+        <translation>Toimeta sukeldumiskompuutrite hüüdnimesid</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divecomputermanagementdialog.cpp" line="49"/>
         <source>Remove the selected dive computer?</source>
         <translation>Eemalda valitud sukeldumiskompuuter?</translation>
@@ -1927,12 +1971,6 @@
         <translation>Oled kindel et soovid eemaldada
  valitud kompuutri?</translation>
     </message>
-    <message>
-        <location filename="../desktop-widgets/divecomputermanagementdialog.ui" line="17"/>
-        <location filename="../build/ui_divecomputermanagementdialog.h" line="65"/>
-        <source>Edit dive computer nicknames</source>
-        <translation>Toimeta sukeldumiskompuutrite hüüdnimesid</translation>
-    </message>
 </context>
 <context>
     <name>DiveComputerModel</name>
@@ -1960,17 +1998,17 @@
 <context>
     <name>DiveDetails</name>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="33"/>
+        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="38"/>
         <source>Dive details</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="67"/>
+        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="72"/>
         <source>Delete dive</source>
         <translation>Kustuta sukeldumine</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="84"/>
+        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="89"/>
         <source>Show on map</source>
         <translation type="unfinished"/>
     </message>
@@ -1978,88 +2016,93 @@
 <context>
     <name>DiveDetailsEdit</name>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="74"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="80"/>
         <source>Dive %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="78"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="84"/>
         <source>Date:</source>
         <translation>Kuupäev:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="86"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="92"/>
         <source>Location:</source>
         <translation>Asukoht:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="95"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="101"/>
         <source>Coordinates:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="104"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="110"/>
         <source>Use current
 GPS location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="118"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="124"/>
         <source>Depth:</source>
         <translation>Sügavus:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="127"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="133"/>
         <source>Duration:</source>
         <translation>Kestus:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="137"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="143"/>
         <source>Air Temp:</source>
         <translation>Õhu temp:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="146"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="152"/>
         <source>Water Temp:</source>
         <translation>Vee temp:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="155"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="161"/>
         <source>Suit:</source>
         <translation>Ülikond:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="164"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="176"/>
         <source>Buddy:</source>
         <translation>Semu:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="173"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="191"/>
         <source>Dive Master:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="182"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="206"/>
         <source>Weight:</source>
         <translation>Raskus</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="192"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="216"/>
+        <source>Cylinder:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="231"/>
         <source>Gas mix:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="203"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="241"/>
         <source>Start Pressure:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="213"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="250"/>
         <source>End Pressure:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="224"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="260"/>
         <source>Notes:</source>
         <translation>Märkmed:</translation>
     </message>
@@ -2112,27 +2155,27 @@ GPS location:</source>
         <translation>Vee temp:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="199"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="198"/>
         <source>Dive Master:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="213"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="211"/>
         <source>Weight:</source>
         <translation>Raskus</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="226"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="224"/>
         <source>Buddy:</source>
         <translation>Semu:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="239"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="237"/>
         <source>SAC:</source>
         <translation>SAC:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="254"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="252"/>
         <source>Notes</source>
         <translation>Märkmed</translation>
     </message>
@@ -2140,18 +2183,18 @@ GPS location:</source>
 <context>
     <name>DiveEventItem</name>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="134"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="165"/>
         <source>Manual switch to OC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="136"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="167"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation> algus</translation>
     </message>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="137"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="168"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation> lõpp</translation>
@@ -2160,27 +2203,27 @@ GPS location:</source>
 <context>
     <name>DiveImportedModel</name>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="646"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="656"/>
         <source>Date/time</source>
         <translation>Kuupäev /aeg</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="648"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="658"/>
         <source>Duration</source>
         <translation>Kestus</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="650"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="660"/>
         <source>Depth</source>
         <translation>Sügavus</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="672"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="682"/>
         <source>h:</source>
         <translation>h:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="672"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="682"/>
         <source>min</source>
         <translation>min</translation>
     </message>
@@ -2189,8 +2232,8 @@ GPS location:</source>
     <name>DiveList</name>
     <message>
         <location filename="../mobile-widgets/qml/DiveList.qml" line="12"/>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="226"/>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="232"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="227"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="233"/>
         <source>Dive list</source>
         <translation type="unfinished"/>
     </message>
@@ -2205,110 +2248,115 @@ GPS location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="222"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="223"/>
         <source>Cloud credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="228"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="229"/>
         <source>Please tap the &apos;+&apos; button to add a dive</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="248"/>
+        <source>No dives in dive list</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DiveListView</name>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="846"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="849"/>
         <source>Expand all</source>
         <translation>Laienda kõik</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="848"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="851"/>
         <source>Collapse all</source>
         <translation>Ahenda kõik kokku</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="852"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="855"/>
         <source>Collapse others</source>
         <translation>Ahenda teised</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="856"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="859"/>
         <source>Remove dive(s) from trip</source>
         <translation>Eemalda sukeldumine/sukeldumised väljasõidust</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="857"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="860"/>
         <source>Create new trip above</source>
         <translation>Loo uus väljasõit üles</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="871"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="874"/>
         <source>Add dive(s) to trip immediately above</source>
         <translation>Lisa sukeldumine/sukeldumised otse eespool asuvale väljasõidule</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="873"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="876"/>
         <source>Add dive(s) to trip immediately below</source>
         <translation>Lisa sukeldumine/sukeldumised otse allpool asuvale väljasõidule</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="877"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="880"/>
         <source>Merge trip with trip above</source>
         <translation>Ühenda väljasõit väljasõiduga ülal</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="878"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="881"/>
         <source>Merge trip with trip below</source>
         <translation>Ühenda väljasõit väljasõiduga all</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="882"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="885"/>
         <source>Delete dive(s)</source>
         <translation>Kustuta sukeldumine/sukeldumised</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="884"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="887"/>
         <source>Mark dive(s) invalid</source>
         <translation>Märgi sukeldumine/sukeldumised kehtetuks</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="888"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="891"/>
         <source>Merge selected dives</source>
         <translation>Ühenda valitud sukeldumised</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="890"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="893"/>
         <source>Renumber dive(s)</source>
         <translation>Nummerda sukeldumine/sukeldumised ümber</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="891"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="894"/>
         <source>Shift dive times</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="892"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="895"/>
         <source>Split selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="893"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="896"/>
         <source>Load image(s) from file(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="894"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="897"/>
         <source>Load image(s) from web</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="917"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="919"/>
         <source>Open image files</source>
         <translation>Ava pildifailid</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="917"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="919"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>Pildifailid (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -2329,56 +2377,6 @@ GPS location:</source>
 <context>
     <name>DiveLogExportDialog</name>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="103"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="351"/>
-        <source>Export format</source>
-        <translation>Ekspordi formaat</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="134"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="353"/>
-        <source>UDDF</source>
-        <translation>UDDF</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="187"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="358"/>
-        <source>Worldmap</source>
-        <translation>Maailmakaart</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="197"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="359"/>
-        <source>I&amp;mage depths</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="243"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="360"/>
-        <source>Selection</source>
-        <translation>Valik</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="252"/>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="346"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="361"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="372"/>
-        <source>Selected dives</source>
-        <translation>Valitud sukeldumised</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="262"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="362"/>
-        <source>All dives</source>
-        <translation>Kõik sukeldumised</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="306"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="396"/>
-        <source>HTML</source>
-        <translation>HTML</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="14"/>
         <location filename="../build/ui_divelogexportdialog.h" line="349"/>
         <source>Export dive log files</source>
@@ -2391,12 +2389,24 @@ GPS location:</source>
         <translation>Üldine eksport</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="103"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="351"/>
+        <source>Export format</source>
+        <translation>Ekspordi formaat</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="115"/>
         <location filename="../build/ui_divelogexportdialog.h" line="352"/>
         <source>Subsurface &amp;XML</source>
         <translation>Subsurface &amp;XML</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="134"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="353"/>
+        <source>UDDF</source>
+        <translation>UDDF</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="147"/>
         <location filename="../build/ui_divelogexportdialog.h" line="354"/>
         <source>di&amp;velogs.de</source>
@@ -2421,238 +2431,297 @@ GPS location:</source>
         <translation>CSV sukeldumise info</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="275"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="187"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="358"/>
+        <source>Worldmap</source>
+        <translation>Maailmakaart</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="197"/>
+        <source>TeX</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="207"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="359"/>
+        <source>I&amp;mage depths</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="253"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="360"/>
+        <source>Selection</source>
+        <translation>Valik</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="262"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="356"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="361"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="372"/>
+        <source>Selected dives</source>
+        <translation>Valitud sukeldumised</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="272"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="362"/>
+        <source>All dives</source>
+        <translation>Kõik sukeldumised</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="285"/>
         <location filename="../build/ui_divelogexportdialog.h" line="363"/>
         <source>CSV units</source>
         <translation>CSV mõõtühikud</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="288"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="298"/>
         <location filename="../build/ui_divelogexportdialog.h" line="366"/>
         <source>Metric</source>
         <translation>SI</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="293"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="303"/>
         <location filename="../build/ui_divelogexportdialog.h" line="367"/>
         <source>Imperial</source>
         <translation>Briti/Ameerika</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="324"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="316"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="396"/>
+        <source>HTML</source>
+        <translation>HTML</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="334"/>
         <location filename="../build/ui_divelogexportdialog.h" line="370"/>
         <source>General settings</source>
         <translation>Üldised seaded</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="330"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="340"/>
         <location filename="../build/ui_divelogexportdialog.h" line="371"/>
         <source>Subsurface numbers</source>
         <translation>Subsurface numbrid</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="359"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="369"/>
         <location filename="../build/ui_divelogexportdialog.h" line="373"/>
         <source>Export yearly statistics</source>
         <translation>Ekspordi aastased statistikad</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="375"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="385"/>
         <location filename="../build/ui_divelogexportdialog.h" line="374"/>
         <source>All di&amp;ves</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="385"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="395"/>
         <location filename="../build/ui_divelogexportdialog.h" line="375"/>
         <source>Export list only</source>
         <translation>Ekspordi ainult nimekiri</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="392"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="402"/>
         <location filename="../build/ui_divelogexportdialog.h" line="376"/>
         <source>Export photos</source>
         <translation>Ekspordi fotod</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="408"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="418"/>
         <location filename="../build/ui_divelogexportdialog.h" line="377"/>
         <source>Style options</source>
         <translation>Stiili valikud</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="423"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="433"/>
         <location filename="../build/ui_divelogexportdialog.h" line="378"/>
         <source>Font</source>
         <translation>Font</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="433"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="443"/>
         <location filename="../build/ui_divelogexportdialog.h" line="379"/>
         <source>Font size</source>
         <translation>Fondi suurus</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="444"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="454"/>
         <location filename="../build/ui_divelogexportdialog.h" line="382"/>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="449"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="459"/>
         <location filename="../build/ui_divelogexportdialog.h" line="383"/>
         <source>10</source>
         <translation>10</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="454"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="464"/>
         <location filename="../build/ui_divelogexportdialog.h" line="384"/>
         <source>12</source>
         <translation>12</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="459"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="469"/>
         <location filename="../build/ui_divelogexportdialog.h" line="385"/>
         <source>14</source>
         <translation>14</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="464"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="474"/>
         <location filename="../build/ui_divelogexportdialog.h" line="386"/>
         <source>16</source>
         <translation>16</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="469"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="479"/>
         <location filename="../build/ui_divelogexportdialog.h" line="387"/>
         <source>18</source>
         <translation>18</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="474"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="484"/>
         <location filename="../build/ui_divelogexportdialog.h" line="388"/>
         <source>20</source>
         <translation>20</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="482"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="492"/>
         <location filename="../build/ui_divelogexportdialog.h" line="390"/>
         <source>Theme</source>
         <translation>Teema</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="493"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="503"/>
         <location filename="../build/ui_divelogexportdialog.h" line="393"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="95"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="99"/>
         <source>Light</source>
         <translation>Valgus</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="498"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="508"/>
         <location filename="../build/ui_divelogexportdialog.h" line="394"/>
         <source>Sand</source>
         <translation>Liiv</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="134"/>
-        <source>UDDF files (*.uddf *.UDDF)</source>
-        <translation>UDDF failid (*.uddf *.UDDF)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="142"/>
-        <source>CSV files (*.csv *.CSV)</source>
-        <translation>CSV failid (*.csv *.CSV)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="74"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="76"/>
         <source>Generic format that is used for data exchange between a variety of diving related programs.</source>
         <translation>Geneeriline formaat, mida kasutatakse andmevahetuseks erinevate sukeldumisega seotud tarkvarade vahel.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="76"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="78"/>
         <source>Comma separated values describing the dive profile.</source>
         <translation>Sukeldumisprofiili andmed CSV formaadis</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="78"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="80"/>
         <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source>
         <translation>Sukeldumise info CSV formaadis. Sisaldab põhiosa sukeldumise infost v.a profiil.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="80"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="82"/>
         <source>Send the dive data to divelogs.de website.</source>
         <translation>Saada sukeldumiste info divelogs.de kodulehele</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="82"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="84"/>
         <source>Send the dive data to dive-share.appspot.com website</source>
         <translation>Saada sjukeldumiste andmed dive-share.appspot.com veebilehele</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="84"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="86"/>
         <source>HTML export of the dive locations, visualized on a world map.</source>
         <translation>Maailmakaardil visualiseeritavate sukeldumiskohtade eksport HTML-formaadis</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="86"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="88"/>
         <source>Subsurface native XML format.</source>
         <translation>Subsurface oma XML vorming</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="88"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="90"/>
         <source>Write depths of images to file.</source>
         <translation>Kirjuta piltide sügavused faili.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="133"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="92"/>
+        <source>Write dive as TeX macros to file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="137"/>
         <source>Export UDDF file as</source>
         <translation>Ekspordi UDDF fail kui</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="137"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/>
+        <source>UDDF files (*.uddf *.UDDF)</source>
+        <translation>UDDF failid (*.uddf *.UDDF)</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divelogexportdialog.cpp" line="141"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="145"/>
         <source>Export CSV file as</source>
         <translation>Ekspordi CSV fail kui</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="148"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="142"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="146"/>
+        <source>CSV files (*.csv *.CSV)</source>
+        <translation>CSV failid (*.csv *.CSV)</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="152"/>
         <source>Export world map</source>
         <translation>Ekspordi maailmakaart</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="149"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="169"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="153"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="177"/>
         <source>HTML files (*.html)</source>
         <translation>HTML failid (*.html)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="153"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="157"/>
         <source>Export Subsurface XML</source>
         <translation>Ekspordi Subsurface XML</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="158"/>
         <source>XML files (*.xml *.ssrf)</source>
         <translation>XML failid (*.xml *.ssrf)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="162"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="166"/>
         <source>Save image depths</source>
         <translation>Salvesta piltide sügavused</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="168"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="170"/>
+        <source>Export to TeX file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="170"/>
+        <source>TeX files (*.tex)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="176"/>
         <source>Export HTML files as</source>
         <translation>Ekspordi HTML fail kui</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="184"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="192"/>
         <source>Please wait, exporting...</source>
         <translation>Palun oota, ekspordin...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="219"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="227"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="311"/>
         <source>Can&apos;t open file %s</source>
         <translation>Ei saa avada faili %s</translation>
     </message>
@@ -2666,25 +2735,6 @@ GPS location:</source>
         <translation>Impordi sukeldumiste logi fail</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="643"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="727"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="856"/>
-        <source>Time</source>
-        <translation>Aeg</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.ui" line="127"/>
-        <location filename="../build/ui_divelogimportdialog.h" line="164"/>
-        <source>Metric</source>
-        <translation>SI</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.ui" line="132"/>
-        <location filename="../build/ui_divelogimportdialog.h" line="165"/>
-        <source>Imperial</source>
-        <translation>Briti/Ameerika</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divelogimportdialog.ui" line="89"/>
         <location filename="../build/ui_divelogimportdialog.h" line="152"/>
         <source>dd.mm.yyyy</source>
@@ -2703,74 +2753,6 @@ GPS location:</source>
         <translation>aaaa-kk-pp</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.ui" line="155"/>
-        <location filename="../build/ui_divelogimportdialog.h" line="167"/>
-        <source>Drag the tags above to each corresponding column below</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="641"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="729"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="852"/>
-        <source>Dive #</source>
-        <translation>Sukeldumise #</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="642"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="723"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="854"/>
-        <source>Date</source>
-        <translation>Kuupäev</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="644"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="858"/>
-        <source>Duration</source>
-        <translation>Kestus</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="655"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="862"/>
-        <source>GPS</source>
-        <translation>GPS</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="645"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="864"/>
-        <source>Max. depth</source>
-        <translation>Max sügavus</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="646"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="866"/>
-        <source>Avg. depth</source>
-        <translation>Keskmine sügavus</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="658"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="872"/>
-        <source>Suit</source>
-        <translation>Ülikond</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="663"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="878"/>
-        <source>Tags</source>
-        <translation>Märgendid</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="652"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="894"/>
-        <source>O₂</source>
-        <translation>O₂</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="653"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="896"/>
-        <source>He</source>
-        <translation>He</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divelogimportdialog.ui" line="108"/>
         <location filename="../build/ui_divelogimportdialog.h" line="158"/>
         <source>Seconds</source>
@@ -2789,183 +2771,269 @@ GPS location:</source>
         <translation>Minutid:sekundid</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="654"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="860"/>
-        <source>Location</source>
-        <translation>Asukoht</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.ui" line="127"/>
+        <location filename="../build/ui_divelogimportdialog.h" line="164"/>
+        <source>Metric</source>
+        <translation>SI</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.ui" line="132"/>
+        <location filename="../build/ui_divelogimportdialog.h" line="165"/>
+        <source>Imperial</source>
+        <translation>Briti/Ameerika</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="354"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="499"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="505"/>
+        <location filename="../desktop-widgets/divelogimportdialog.ui" line="155"/>
+        <location filename="../build/ui_divelogimportdialog.h" line="167"/>
+        <source>Drag the tags above to each corresponding column below</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="355"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="528"/>
         <source>Tab</source>
         <translation>Tab</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="575"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="598"/>
         <source>Some column headers were pre-populated; please drag and drop the headers so they match the column they are in.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="613"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="731"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="782"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="848"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="636"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="761"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="857"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="925"/>
         <source>Sample time</source>
         <translation>Näidis aeg</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="615"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="733"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="784"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="638"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="763"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="859"/>
         <source>Sample depth</source>
         <translation>Näidis sügavus</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="617"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="735"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="786"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="640"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="765"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="861"/>
         <source>Sample temperature</source>
         <translation>Näidis temp</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="621"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="739"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="790"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="642"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="767"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="863"/>
+        <source>Sample pO₂</source>
+        <translation>Näidis pO₂</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="644"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="769"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="865"/>
         <source>Sample sensor1 pO₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="623"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="741"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="792"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="646"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="771"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="867"/>
         <source>Sample sensor2 pO₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="625"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="743"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="794"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="648"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="773"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="869"/>
         <source>Sample sensor3 pO₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="633"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="751"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="802"/>
-        <source>Sample stopdepth</source>
-        <translation>Näidis peatuse sügavus</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="637"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="755"/>
-        <source>Sample setpoint</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="619"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="737"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="788"/>
-        <source>Sample pO₂</source>
-        <translation>Näidis pO₂</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="627"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="745"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="796"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="650"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="775"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="871"/>
         <source>Sample CNS</source>
         <translation>Näidis CNS</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="629"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="747"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="798"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="652"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="777"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="873"/>
         <source>Sample NDL</source>
         <translation>Näidis NDL</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="631"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="749"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="800"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="654"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="779"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="875"/>
         <source>Sample TTS</source>
         <translation>Näidis TTS</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="635"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="753"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="804"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="656"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="781"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="877"/>
+        <source>Sample stopdepth</source>
+        <translation>Näidis peatuse sügavus</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="658"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="783"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="879"/>
         <source>Sample pressure</source>
         <translation>Näidis TTS</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="656"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="868"/>
-        <source>Divemaster</source>
-        <translation>Divemaster</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="660"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="785"/>
+        <source>Sample setpoint</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="657"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="870"/>
-        <source>Buddy</source>
-        <translation>Semu</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="664"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="759"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="929"/>
+        <source>Dive #</source>
+        <translation>Sukeldumise #</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="659"/>
-        <source>Rating</source>
-        <translation>Hinne</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="665"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="753"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="931"/>
+        <source>Date</source>
+        <translation>Kuupäev</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="660"/>
-        <source>Visibility</source>
-        <translation>Nähtavus</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="666"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="757"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="933"/>
+        <source>Time</source>
+        <translation>Aeg</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="661"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="874"/>
-        <source>Notes</source>
-        <translation>Märkmed</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="667"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="935"/>
+        <source>Duration</source>
+        <translation>Kestus</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="662"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="876"/>
-        <source>Weight</source>
-        <translation>Raskus</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="668"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="941"/>
+        <source>Max. depth</source>
+        <translation>Max sügavus</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="669"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="943"/>
+        <source>Avg. depth</source>
+        <translation>Keskmine sügavus</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="670"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="975"/>
+        <source>Air temp.</source>
+        <translation>Õhu temp.</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="671"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="977"/>
+        <source>Water temp.</source>
+        <translation>Vee temp.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="649"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="888"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="672"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="965"/>
         <source>Cyl. size</source>
         <translation>Ball. suurus</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="650"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="890"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="673"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="967"/>
         <source>Start pressure</source>
         <translation>Algusrõhk</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="651"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="892"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="674"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="969"/>
         <source>End pressure</source>
         <translation>Lõpurõhk</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="647"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="898"/>
-        <source>Air temp.</source>
-        <translation>Õhu temp.</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="675"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="971"/>
+        <source>O₂</source>
+        <translation>O₂</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="648"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="900"/>
-        <source>Water temp.</source>
-        <translation>Vee temp.</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="676"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="973"/>
+        <source>He</source>
+        <translation>He</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="677"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="937"/>
+        <source>Location</source>
+        <translation>Asukoht</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="678"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="939"/>
+        <source>GPS</source>
+        <translation>GPS</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="679"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="945"/>
+        <source>Divemaster</source>
+        <translation>Divemaster</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="680"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="947"/>
+        <source>Buddy</source>
+        <translation>Semu</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="681"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="949"/>
+        <source>Suit</source>
+        <translation>Ülikond</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="682"/>
+        <source>Rating</source>
+        <translation>Hinne</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="683"/>
+        <source>Visibility</source>
+        <translation>Nähtavus</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="684"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="951"/>
+        <source>Notes</source>
+        <translation>Märkmed</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="685"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="953"/>
+        <source>Weight</source>
+        <translation>Raskus</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="686"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="955"/>
+        <source>Tags</source>
+        <translation>Märgendid</translation>
     </message>
 </context>
 <context>
     <name>DiveObjectHelper</name>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="287"/>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="323"/>
         <source>%1 dive(s)</source>
         <translation type="unfinished"/>
     </message>
@@ -2973,18 +3041,18 @@ GPS location:</source>
 <context>
     <name>DivePlanner</name>
     <message>
-        <location filename="../desktop-widgets/diveplanner.ui" line="152"/>
-        <location filename="../build/ui_diveplanner.h" line="190"/>
-        <source>Altitude</source>
-        <translation>Kõrgus</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/diveplanner.ui" line="109"/>
         <location filename="../build/ui_diveplanner.h" line="189"/>
         <source>Planned dive time</source>
         <translation>Plaanitud sukeldumise aeg</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/diveplanner.ui" line="152"/>
+        <location filename="../build/ui_diveplanner.h" line="190"/>
+        <source>Altitude</source>
+        <translation>Kõrgus</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/diveplanner.ui" line="159"/>
         <location filename="../build/ui_diveplanner.h" line="191"/>
         <source>ATM pressure</source>
@@ -3018,32 +3086,32 @@ GPS location:</source>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="134"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="136"/>
         <source>unknown</source>
         <translation>tundmatu</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="312"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="326"/>
         <source>Final depth</source>
         <translation>Lõppsügavus</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="314"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="328"/>
         <source>Run time</source>
         <translation>Töö aeg</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="316"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="330"/>
         <source>Duration</source>
         <translation>Kestus</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="318"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="332"/>
         <source>Used gas</source>
         <translation>Kasutatud gaas</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="320"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="334"/>
         <source>CC setpoint</source>
         <translation type="unfinished"/>
     </message>
@@ -3051,22 +3119,22 @@ GPS location:</source>
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="108"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="112"/>
         <source>Dive planner points</source>
         <translation>Sukeldumise planeerija punktid</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="112"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="116"/>
         <source>Available gases</source>
         <translation>Saadaval gaasid</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="137"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="143"/>
         <source>Add dive data point</source>
         <translation>Lisa sukeldumise andmepunkt</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="146"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="152"/>
         <source>Save new</source>
         <translation>Salvesta uus</translation>
     </message>
@@ -3099,11 +3167,36 @@ GPS location:</source>
         <translation>Värvus</translation>
     </message>
     <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="124"/>
+        <source>User entered</source>
+        <translation>Kasutaja sisestatud</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="126"/>
+        <source>Cylinder index</source>
+        <translation>Ballooni indeks</translation>
+    </message>
+    <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="128"/>
         <source>Pressure S</source>
         <translation>Rõhk S</translation>
     </message>
     <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="130"/>
+        <source>Pressure I</source>
+        <translation>Rõhk I</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="132"/>
+        <source>Ceiling</source>
+        <translation>Lagi</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="134"/>
+        <source>SAC</source>
+        <translation>SAC</translation>
+    </message>
+    <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="136"/>
         <source>pN₂</source>
         <translation>pN₂</translation>
@@ -3139,49 +3232,24 @@ GPS location:</source>
         <translation>Sensor 3</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="152"/>
-        <source>Heart rate</source>
-        <translation>Südame pulss</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="156"/>
-        <source>Mean depth @ s</source>
-        <translation>Keskmine sügavus @ s</translation>
-    </message>
-    <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="150"/>
         <source>Ambient pressure</source>
         <translation>Ümbritsev rõhk</translation>
     </message>
     <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="152"/>
+        <source>Heart rate</source>
+        <translation>Südame pulss</translation>
+    </message>
+    <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="154"/>
         <source>Gradient factor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="130"/>
-        <source>Pressure I</source>
-        <translation>Rõhk I</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="124"/>
-        <source>User entered</source>
-        <translation>Kasutaja sisestatud</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="126"/>
-        <source>Cylinder index</source>
-        <translation>Ballooni indeks</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="132"/>
-        <source>Ceiling</source>
-        <translation>Lagi</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="134"/>
-        <source>SAC</source>
-        <translation>SAC</translation>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="156"/>
+        <source>Mean depth @ s</source>
+        <translation>Keskmine sügavus @ s</translation>
     </message>
 </context>
 <context>
@@ -3248,310 +3316,314 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="395"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="441"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="434"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="483"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="398"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="444"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="437"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="486"/>
         <source>Date</source>
         <translation>Kuupäev</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="401"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="447"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="440"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="489"/>
         <source>Rating</source>
         <translation>Hinne</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="404"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="443"/>
         <source>Depth</source>
         <translation>Sügavus</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="410"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="446"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="495"/>
+        <source>Duration</source>
+        <translation>Kestus</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="449"/>
         <source>Temp</source>
         <translation>Temp</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="413"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="452"/>
         <source>Weight</source>
         <translation>Raskus</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="425"/>
-        <source>SAC</source>
-        <translation>SAC</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
-        <source>m</source>
-        <translation>m</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
-        <source>ft</source>
-        <translation>jalg</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
-        <source>Weight(%1)</source>
-        <translation>Raskus(%1)</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="416"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="462"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="455"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="504"/>
         <source>Suit</source>
         <translation>Ülikond</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="419"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="465"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="458"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="507"/>
         <source>Cyl</source>
         <translation>Ball</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="422"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="468"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="461"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="510"/>
         <source>Gas</source>
         <translation>Gaas</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
-        <source>SAC(%1)</source>
-        <translation>SAC(%1)</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="464"/>
+        <source>SAC</source>
+        <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
-        <source>/min</source>
-        <translation>/min</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="467"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="518"/>
+        <source>OTU</source>
+        <translation>Hapnikumürgistuse ühik (OTU)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="431"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="479"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="470"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="521"/>
         <source>Max CNS</source>
         <translation>Max CNS</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="434"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="482"/>
-        <source>Location</source>
-        <translation>Asukoht</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
+        <source>Photos</source>
+        <translation>Fotod</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
-        <source>kg</source>
-        <translation>kg</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="476"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="527"/>
+        <source>Location</source>
+        <translation>Asukoht</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="492"/>
         <source>Depth(%1)</source>
         <translation>Sügavus(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="407"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="453"/>
-        <source>Duration</source>
-        <translation>Kestus</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="492"/>
+        <source>m</source>
+        <translation>m</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="492"/>
+        <source>ft</source>
+        <translation>jalg</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="456"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="498"/>
         <source>Temp(%1%2)</source>
         <translation>Temp(%1%2)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="501"/>
+        <source>Weight(%1)</source>
+        <translation>Raskus(%1)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="501"/>
+        <source>kg</source>
+        <translation>kg</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="501"/>
         <source>lbs</source>
         <translation>nael</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="428"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="476"/>
-        <source>OTU</source>
-        <translation>Hapnikumürgistuse ühik (OTU)</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="515"/>
+        <source>SAC(%1)</source>
+        <translation>SAC(%1)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="515"/>
+        <source>/min</source>
+        <translation>/min</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="524"/>
+        <source>Photos before/during/after dive</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="164"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="165"/>
         <source>no dives were selected</source>
         <translation>Ühtegi sukeldumist pole valitud</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="174"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="175"/>
         <source>stylesheet to export to divelogs.de is not found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="184"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="185"/>
         <source>failed to create zip file for upload: %s</source>
         <translation>zip-faili loomine üleslaadimiseks ebaõnnestus: %s</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="236"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="237"/>
         <source>internal error</source>
         <translation>sisemine viga</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="244"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="245"/>
         <source>Conversion of dive %1 to divelogs.de format failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="272"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="273"/>
         <source>error writing zip file: %s zip error %d system error %d - %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="745"/>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="935"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="936"/>
         <source>Done</source>
         <translation>Valmis</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="778"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="779"/>
         <source>Uploading dive list...</source>
         <translation>Sukeldumiste listi üleslaadimine...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="810"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="811"/>
         <source>Downloading dive list...</source>
         <translation>Sukeldumiste listi allalaadimine...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="851"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="852"/>
         <source>Downloading %1 dives...</source>
         <translation>Laen alla %1 sukeldumist...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="885"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="886"/>
         <source>Download finished - %1</source>
         <translation>Allalaadimine lõppenud - %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="899"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="900"/>
         <source>Problem with download</source>
         <translation>Probleem allalaadimisel</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="900"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="901"/>
         <source>The archive could not be opened:
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="909"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="910"/>
         <source>Corrupted download</source>
         <translation>Vigane allalaadimine</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="910"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="911"/>
         <source>The archive could not be opened:
 %1</source>
         <translation>Arhiivi ei saa avada:
 %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="937"/>
+        <source>Upload finished</source>
+        <translation>Üleslaadimine lõppenud</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="950"/>
         <source>Upload failed</source>
         <translation>Üleslaadimine ebaõnnestus</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="952"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="953"/>
         <source>Upload successful</source>
         <translation>Üleslaadimine edukas</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="955"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="956"/>
         <source>Login failed</source>
         <translation>Sisselogimine ebaõnnestus</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="958"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="959"/>
         <source>Cannot parse response</source>
         <translation>Ei suuda vastust tuvastada</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="970"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="971"/>
         <source>Error: %1</source>
         <translation>Viga: %1</translation>
     </message>
-    <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="936"/>
-        <source>Upload finished</source>
-        <translation>Üleslaadimine lõppenud</translation>
-    </message>
 </context>
 <context>
     <name>DownloadFromDCWidget</name>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="185"/>
-        <source>Error</source>
-        <translation>Viga</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="436"/>
-        <source>Retry</source>
-        <translation>Korda</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="280"/>
-        <source>Find Uemis dive computer</source>
-        <translation>Leia Uemis sukeldumiskompuuter</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="101"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="107"/>
         <source>Download</source>
         <translation>Allalaadimine</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="104"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="110"/>
         <source>Choose Bluetooth download mode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="382"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="191"/>
+        <source>Error</source>
+        <translation>Viga</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="286"/>
+        <source>Find Uemis dive computer</source>
+        <translation>Leia Uemis sukeldumiskompuuter</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="392"/>
         <source>Choose file for divecomputer download logfile</source>
         <translation>Vali sukeldumiskompuutri allalaadimise logifail</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="383"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="393"/>
         <source>Log files (*.log)</source>
         <translation>Logifailid (*.log)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="398"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="408"/>
         <source>Warning</source>
         <translation>Hoiatus</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="399"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="409"/>
         <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source>
         <translation>libdivecomputer tõmmisefaili salvestamine EI LAE sukeldumised sukeldumiste listi.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="410"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="420"/>
         <source>Choose file for divecomputer binary dump file</source>
         <translation>Vali sukeldumiskompuutri binaarformaadis tõmmisefail</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="411"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="421"/>
         <source>Dump files (*.bin)</source>
         <translation>Tõmmisefailid (*.bin)</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="446"/>
+        <source>Retry</source>
+        <translation>Korda</translation>
+    </message>
 </context>
 <context>
     <name>DownloadFromDiveComputer</name>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="139"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="275"/>
-        <source>Vendor</source>
-        <translation>Tootja</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="14"/>
         <location filename="../build/ui_downloadfromdivecomputer.h" line="265"/>
         <source>Download from dive computer</source>
@@ -3564,17 +3636,6 @@ p, li { white-space: pre-wrap; }
         <translation>Seade või ühenduspunkt</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="122"/>
-        <source>Choose Bluetooth download mode</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="149"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="276"/>
-        <source>Dive computer</source>
-        <translation>Sukeldumiskompuuter</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="66"/>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="101"/>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="115"/>
@@ -3598,11 +3659,46 @@ p, li { white-space: pre-wrap; }
         <translation>Eelista alati allalaetud sukeldumisi</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="87"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="270"/>
+        <source>Download into new trip</source>
+        <translation>Lae alla uude väljasõitu</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="94"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="271"/>
+        <source>Save libdivecomputer logfile</source>
+        <translation>Salvesta libdivecomputer logifail</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="108"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="273"/>
+        <source>Save libdivecomputer dumpfile</source>
+        <translation>Salvesta libdivecomputer tõmmisefail</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="122"/>
+        <source>Choose Bluetooth download mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="129"/>
         <source>Select a remote Bluetooth device.</source>
         <translation>Vali väline Bluetooth seade.</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="139"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="275"/>
+        <source>Vendor</source>
+        <translation>Tootja</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="149"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="276"/>
+        <source>Dive computer</source>
+        <translation>Sukeldumiskompuuter</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/>
         <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="52"/>
         <location filename="../build/ui_downloadfromdivecomputer.h" line="277"/>
@@ -3610,18 +3706,6 @@ p, li { white-space: pre-wrap; }
         <translation>Allalaadimine</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="284"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="281"/>
-        <source>OK</source>
-        <translation>OK</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="291"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="282"/>
-        <source>Cancel</source>
-        <translation>Loobu</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="226"/>
         <location filename="../build/ui_downloadfromdivecomputer.h" line="278"/>
         <source>Downloaded dives</source>
@@ -3640,22 +3724,16 @@ p, li { white-space: pre-wrap; }
         <translation>Tühista kõik</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="94"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="271"/>
-        <source>Save libdivecomputer logfile</source>
-        <translation>Salvesta libdivecomputer logifail</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="108"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="273"/>
-        <source>Save libdivecomputer dumpfile</source>
-        <translation>Salvesta libdivecomputer tõmmisefail</translation>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="284"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="281"/>
+        <source>OK</source>
+        <translation>OK</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="87"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="270"/>
-        <source>Download into new trip</source>
-        <translation>Lae alla uude väljasõitu</translation>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="291"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="282"/>
+        <source>Cancel</source>
+        <translation>Loobu</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="16"/>
@@ -3745,12 +3823,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="297"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="242"/>
         <source>To disconnect Subsurface from your Facebook account, use the button below</source>
         <translation>Facebookiga ühenduse katkestamiseks kasuta all olevat nuppu </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="306"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="251"/>
         <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source>
         <translation>Facebookiga ühenduse loomiseks logi sinna sise. See võimaldab Suibsurface&apos;l avaldada sukeldumisi sinu ajajoonel</translation>
     </message>
@@ -3758,22 +3836,22 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>FacebookManager</name>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="266"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="211"/>
         <source>Photo upload sucessfull</source>
         <translation>Fotode üleslaadimine õnnestus</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="267"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="212"/>
         <source>Your dive profile was updated to Facebook.</source>
         <translation>Sukeldumise profiil on uuendatud Facebookis</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="271"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="216"/>
         <source>Photo upload failed</source>
         <translation>Fotode üleslaadimine ebaõnnestus</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="272"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="217"/>
         <source>Your dive profile was not updated to Facebook, 
  please send the following to the developer. 
 </source>
@@ -3835,17 +3913,25 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>FirmwareUpdateThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1750"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1739"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Omadus ei ole valitud sukeldumiskompuutril veel olemas</translation>
     </message>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1755"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1744"/>
         <source>Firmware update failed!</source>
         <translation>Firmware uuendamine ebaõnnestus!</translation>
     </message>
 </context>
 <context>
+    <name>GlobalDrawer</name>
+    <message>
+        <location filename="../mobile-widgets/qml/kirigami/src/controls/GlobalDrawer.qml" line="364"/>
+        <source>Back</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>GlobeGPS</name>
     <message>
         <location filename="../desktop-widgets/globe.cpp" line="124"/>
@@ -3861,27 +3947,27 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="40"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="32"/>
         <source>Date: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="50"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="42"/>
         <source>Name: </source>
         <translation>Nimi:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="60"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="52"/>
         <source>Latitude: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="69"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="61"/>
         <source>Longitude: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="113"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="105"/>
         <source>List of stored GPS fixes</source>
         <translation type="unfinished"/>
     </message>
@@ -3910,7 +3996,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>LocationFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="648"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="646"/>
         <source>Location: </source>
         <translation>Asukoht:</translation>
     </message>
@@ -3951,7 +4037,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>LocationFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="299"/>
+        <location filename="../qt-models/filtermodels.cpp" line="304"/>
         <source>No location set</source>
         <translation type="unfinished"/>
     </message>
@@ -4074,6 +4160,54 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>MainTab</name>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="18"/>
+        <location filename="../desktop-widgets/maintab.ui" line="439"/>
+        <location filename="../build/ui_maintab.h" line="961"/>
+        <location filename="../build/ui_maintab.h" line="963"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="539"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="571"/>
+        <source>Notes</source>
+        <translation>Märkmed</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="21"/>
+        <location filename="../build/ui_maintab.h" line="964"/>
+        <source>General notes about the current selection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="92"/>
+        <location filename="../desktop-widgets/maintab.ui" line="646"/>
+        <location filename="../build/ui_maintab.h" line="947"/>
+        <location filename="../build/ui_maintab.h" line="967"/>
+        <source>Date</source>
+        <translation>Kuupäev</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="102"/>
+        <location filename="../build/ui_maintab.h" line="948"/>
+        <source>Time</source>
+        <translation>Aeg</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="112"/>
+        <location filename="../desktop-widgets/maintab.ui" line="836"/>
+        <location filename="../build/ui_maintab.h" line="949"/>
+        <location filename="../build/ui_maintab.h" line="987"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="306"/>
+        <source>Air temp.</source>
+        <translation>Õhu temp.</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="122"/>
+        <location filename="../desktop-widgets/maintab.ui" line="855"/>
+        <location filename="../build/ui_maintab.h" line="950"/>
+        <location filename="../build/ui_maintab.h" line="989"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="307"/>
+        <source>Water temp.</source>
+        <translation>Vee temp.</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="184"/>
         <location filename="../build/ui_maintab.h" line="951"/>
         <location filename="../desktop-widgets/maintab.cpp" line="570"/>
@@ -4081,6 +4215,17 @@ p, li { white-space: pre-wrap; }
         <translation>Asukoht</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="214"/>
+        <source>Edit dive site</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="217"/>
+        <location filename="../build/ui_maintab.h" line="953"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="252"/>
         <location filename="../build/ui_maintab.h" line="954"/>
         <source>Divemaster</source>
@@ -4093,12 +4238,6 @@ p, li { white-space: pre-wrap; }
         <translation>Semu</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.ui" line="387"/>
-        <location filename="../build/ui_maintab.h" line="959"/>
-        <source>Tags</source>
-        <translation>Märgendid</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/maintab.ui" line="308"/>
         <location filename="../build/ui_maintab.h" line="956"/>
         <source>Rating</source>
@@ -4117,57 +4256,18 @@ p, li { white-space: pre-wrap; }
         <translation>Ülikond</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="387"/>
+        <location filename="../build/ui_maintab.h" line="959"/>
+        <source>Tags</source>
+        <translation>Märgendid</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="397"/>
         <location filename="../build/ui_maintab.h" line="960"/>
         <source>Dive mode</source>
         <translation>Sukeldumise liik</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.ui" line="112"/>
-        <location filename="../desktop-widgets/maintab.ui" line="836"/>
-        <location filename="../build/ui_maintab.h" line="949"/>
-        <location filename="../build/ui_maintab.h" line="987"/>
-        <location filename="../desktop-widgets/maintab.cpp" line="306"/>
-        <source>Air temp.</source>
-        <translation>Õhu temp.</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="122"/>
-        <location filename="../desktop-widgets/maintab.ui" line="855"/>
-        <location filename="../build/ui_maintab.h" line="950"/>
-        <location filename="../build/ui_maintab.h" line="989"/>
-        <location filename="../desktop-widgets/maintab.cpp" line="307"/>
-        <source>Water temp.</source>
-        <translation>Vee temp.</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="18"/>
-        <location filename="../desktop-widgets/maintab.ui" line="439"/>
-        <location filename="../build/ui_maintab.h" line="961"/>
-        <location filename="../build/ui_maintab.h" line="963"/>
-        <location filename="../desktop-widgets/maintab.cpp" line="539"/>
-        <location filename="../desktop-widgets/maintab.cpp" line="571"/>
-        <source>Notes</source>
-        <translation>Märkmed</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="21"/>
-        <location filename="../build/ui_maintab.h" line="964"/>
-        <source>General notes about the current selection</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="214"/>
-        <source>Edit dive site</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="217"/>
-        <location filename="../build/ui_maintab.h" line="953"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/maintab.ui" line="491"/>
         <location filename="../build/ui_maintab.h" line="965"/>
         <source>Equipment</source>
@@ -4192,6 +4292,12 @@ p, li { white-space: pre-wrap; }
         <translation>Sukeldumise info</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="665"/>
+        <location filename="../build/ui_maintab.h" line="969"/>
+        <source>Interval</source>
+        <translation>Pinnaintervall</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="684"/>
         <location filename="../build/ui_maintab.h" line="971"/>
         <source>Gases used</source>
@@ -4204,18 +4310,38 @@ p, li { white-space: pre-wrap; }
         <translation>Kulutatud gaasid</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="722"/>
+        <location filename="../desktop-widgets/maintab.ui" line="1094"/>
+        <location filename="../build/ui_maintab.h" line="975"/>
+        <location filename="../build/ui_maintab.h" line="1003"/>
+        <source>SAC</source>
+        <translation>SAC</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="741"/>
         <location filename="../build/ui_maintab.h" line="977"/>
         <source>CNS</source>
         <translation>CNS</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="760"/>
+        <location filename="../build/ui_maintab.h" line="979"/>
+        <source>OTU</source>
+        <translation>OTU</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="779"/>
         <location filename="../build/ui_maintab.h" line="981"/>
         <source>Max. depth</source>
         <translation>Max sügavus</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="798"/>
+        <location filename="../build/ui_maintab.h" line="983"/>
+        <source>Avg. depth</source>
+        <translation>Keskmine sügavus</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="817"/>
         <location filename="../build/ui_maintab.h" line="985"/>
         <source>Air pressure</source>
@@ -4228,82 +4354,6 @@ p, li { white-space: pre-wrap; }
         <translation>Sukeldumise aeg</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.ui" line="933"/>
-        <location filename="../build/ui_maintab.h" line="1007"/>
-        <source>Simple statistics about the selection</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1039"/>
-        <location filename="../build/ui_maintab.h" line="999"/>
-        <source>Total time</source>
-        <translation>Koguaeg</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1106"/>
-        <location filename="../build/ui_maintab.h" line="1004"/>
-        <source>Gas consumption</source>
-        <translation>Gaasi tarbimine</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1151"/>
-        <location filename="../build/ui_maintab.h" line="1009"/>
-        <source>All photos from the current selection</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1177"/>
-        <location filename="../build/ui_maintab.h" line="1010"/>
-        <source>Extra data</source>
-        <translation>Lisaandmed</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1180"/>
-        <location filename="../build/ui_maintab.h" line="1011"/>
-        <source>Adittional data from the dive computer</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="92"/>
-        <location filename="../desktop-widgets/maintab.ui" line="646"/>
-        <location filename="../build/ui_maintab.h" line="947"/>
-        <location filename="../build/ui_maintab.h" line="967"/>
-        <source>Date</source>
-        <translation>Kuupäev</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="102"/>
-        <location filename="../build/ui_maintab.h" line="948"/>
-        <source>Time</source>
-        <translation>Aeg</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="665"/>
-        <location filename="../build/ui_maintab.h" line="969"/>
-        <source>Interval</source>
-        <translation>Pinnaintervall</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="722"/>
-        <location filename="../desktop-widgets/maintab.ui" line="1094"/>
-        <location filename="../build/ui_maintab.h" line="975"/>
-        <location filename="../build/ui_maintab.h" line="1003"/>
-        <source>SAC</source>
-        <translation>SAC</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="798"/>
-        <location filename="../build/ui_maintab.h" line="983"/>
-        <source>Avg. depth</source>
-        <translation>Keskmine sügavus</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="760"/>
-        <location filename="../build/ui_maintab.h" line="979"/>
-        <source>OTU</source>
-        <translation>OTU</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/maintab.ui" line="893"/>
         <location filename="../build/ui_maintab.h" line="993"/>
         <source>Salinity</source>
@@ -4316,22 +4366,34 @@ p, li { white-space: pre-wrap; }
         <translation>Statistika</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="933"/>
+        <location filename="../build/ui_maintab.h" line="1007"/>
+        <source>Simple statistics about the selection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="986"/>
         <location filename="../build/ui_maintab.h" line="996"/>
         <source>Depth</source>
         <translation>Sügavus</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="998"/>
+        <location filename="../build/ui_maintab.h" line="997"/>
+        <source>Duration</source>
+        <translation>Kestus</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="1027"/>
         <location filename="../build/ui_maintab.h" line="998"/>
         <source>Temperature</source>
         <translation>Temperatuur</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.ui" line="998"/>
-        <location filename="../build/ui_maintab.h" line="997"/>
-        <source>Duration</source>
-        <translation>Kestus</translation>
+        <location filename="../desktop-widgets/maintab.ui" line="1039"/>
+        <location filename="../build/ui_maintab.h" line="999"/>
+        <source>Total time</source>
+        <translation>Koguaeg</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/maintab.ui" line="1058"/>
@@ -4340,20 +4402,34 @@ p, li { white-space: pre-wrap; }
         <translation>Sukeldumisi kokku</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="1106"/>
+        <location filename="../build/ui_maintab.h" line="1004"/>
+        <source>Gas consumption</source>
+        <translation>Gaasi tarbimine</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="1148"/>
         <location filename="../build/ui_maintab.h" line="1008"/>
         <source>Photos</source>
         <translation>Fotod</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.cpp" line="88"/>
-        <source>Cylinders</source>
-        <translation>Balloonid</translation>
+        <location filename="../desktop-widgets/maintab.ui" line="1151"/>
+        <location filename="../build/ui_maintab.h" line="1009"/>
+        <source>All photos from the current selection</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.cpp" line="92"/>
-        <source>Weights</source>
-        <translation>Raskused</translation>
+        <location filename="../desktop-widgets/maintab.ui" line="1177"/>
+        <location filename="../build/ui_maintab.h" line="1010"/>
+        <source>Extra data</source>
+        <translation>Lisaandmed</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="1180"/>
+        <location filename="../build/ui_maintab.h" line="1011"/>
+        <source>Adittional data from the dive computer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/maintab.cpp" line="63"/>
@@ -4366,11 +4442,21 @@ p, li { white-space: pre-wrap; }
         <translation>Tühista muudatused</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.cpp" line="88"/>
+        <source>Cylinders</source>
+        <translation>Balloonid</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.cpp" line="89"/>
         <source>Add cylinder</source>
         <translation>Lisa balloon</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.cpp" line="92"/>
+        <source>Weights</source>
+        <translation>Raskused</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.cpp" line="93"/>
         <source>Add weight system</source>
         <translation>Lisa raskuste süsteem</translation>
@@ -4562,659 +4648,685 @@ mixed from Air and using:
         <translation>&amp;Fail</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="455"/>
-        <location filename="../build/ui_mainwindow.h" line="534"/>
-        <source>Export dive logs</source>
-        <translation>Ekspordi sukeldumiste logid</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="510"/>
-        <location filename="../build/ui_mainwindow.h" line="542"/>
-        <source>Toggle pHe graph</source>
-        <translation>pHe graaf</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="546"/>
-        <location filename="../build/ui_mainwindow.h" line="545"/>
-        <source>Toggle calculating all tissues</source>
-        <translation>Kõik koed</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="522"/>
-        <location filename="../build/ui_mainwindow.h" line="543"/>
-        <source>Toggle DC reported ceiling</source>
-        <translation>Sukeldumiskompuutri poolt antud lagi</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="534"/>
-        <location filename="../build/ui_mainwindow.h" line="544"/>
-        <source>Toggle calculated ceiling</source>
-        <translation>Arvutatud lagi</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="606"/>
-        <location filename="../build/ui_mainwindow.h" line="550"/>
-        <source>Toggle NDL, TTS</source>
-        <translation>NDL, TTS</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="558"/>
-        <location filename="../build/ui_mainwindow.h" line="546"/>
-        <source>Toggle calculated ceiling with 3m increments</source>
-        <translation>Arvutatud lagi 3m intervalliga</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="463"/>
-        <location filename="../build/ui_mainwindow.h" line="537"/>
-        <source>Configure &amp;dive computer</source>
-        <translation>Seadista &amp;dive kompuuter</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="570"/>
-        <location filename="../build/ui_mainwindow.h" line="547"/>
-        <source>Toggle heart rate</source>
-        <translation>Südame pulss</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="582"/>
-        <location filename="../build/ui_mainwindow.h" line="548"/>
-        <source>Toggle MOD</source>
-        <translation>MOD</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="594"/>
-        <location filename="../build/ui_mainwindow.h" line="549"/>
-        <source>Toggle EAD, END, EADD</source>
-        <translation>EAD, END, EADD</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="618"/>
-        <location filename="../build/ui_mainwindow.h" line="551"/>
-        <source>Toggle SAC rate</source>
-        <translation>SAC määr</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="630"/>
-        <location filename="../build/ui_mainwindow.h" line="552"/>
-        <source>Toggle ruler</source>
-        <translation>Joonlaud</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="86"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="87"/>
         <location filename="../build/ui_mainwindow.h" line="569"/>
         <source>&amp;Log</source>
         <translation>&amp;Logi</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="105"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="104"/>
         <location filename="../build/ui_mainwindow.h" line="570"/>
         <source>&amp;View</source>
         <translation>&amp;Vaade</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="121"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="120"/>
         <location filename="../build/ui_mainwindow.h" line="571"/>
         <source>&amp;Help</source>
         <translation>&amp;Abi</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="130"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="129"/>
         <location filename="../build/ui_mainwindow.h" line="572"/>
         <source>&amp;Import</source>
         <translation>&amp;Import</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="139"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="138"/>
         <location filename="../build/ui_mainwindow.h" line="573"/>
         <source>&amp;Edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="144"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="143"/>
         <source>Share on</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="158"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="157"/>
         <location filename="../build/ui_mainwindow.h" line="453"/>
         <source>&amp;New logbook</source>
         <translation>&amp;Uus logiraamat</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="161"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="160"/>
         <location filename="../build/ui_mainwindow.h" line="455"/>
         <source>New</source>
         <translation>Uus</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="164"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="163"/>
         <location filename="../build/ui_mainwindow.h" line="457"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="169"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="168"/>
         <location filename="../build/ui_mainwindow.h" line="458"/>
         <source>&amp;Open logbook</source>
         <translation>&amp;Ava logiraamat</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="172"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="171"/>
         <location filename="../build/ui_mainwindow.h" line="460"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="508"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="502"/>
         <source>Open</source>
         <translation>Ava</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="175"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="174"/>
         <location filename="../build/ui_mainwindow.h" line="462"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="180"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="179"/>
         <location filename="../build/ui_mainwindow.h" line="463"/>
         <source>&amp;Save</source>
         <translation>&amp;Salvesta</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="183"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="182"/>
         <location filename="../build/ui_mainwindow.h" line="465"/>
         <source>Save</source>
         <translation>Salvesta</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="186"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="185"/>
         <location filename="../build/ui_mainwindow.h" line="467"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="191"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="190"/>
         <location filename="../build/ui_mainwindow.h" line="468"/>
         <source>Sa&amp;ve as</source>
         <translation>Sa&amp;lvesta nimega</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="194"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="193"/>
         <location filename="../build/ui_mainwindow.h" line="470"/>
         <source>Save as</source>
         <translation>Salvesta nimega</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="197"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="196"/>
         <location filename="../build/ui_mainwindow.h" line="472"/>
         <source>Ctrl+Shift+S</source>
         <translation>Ctrl+Shift+S</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="202"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="201"/>
         <location filename="../build/ui_mainwindow.h" line="473"/>
         <source>&amp;Close</source>
         <translation>&amp;Sulge</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="205"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="204"/>
         <location filename="../build/ui_mainwindow.h" line="475"/>
         <source>Close</source>
         <translation>Sulge</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="208"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="207"/>
         <location filename="../build/ui_mainwindow.h" line="477"/>
         <source>Ctrl+W</source>
         <translation>Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="221"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="212"/>
+        <location filename="../build/ui_mainwindow.h" line="478"/>
+        <source>&amp;Print</source>
+        <translation>&amp;Väljastus</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="215"/>
+        <location filename="../build/ui_mainwindow.h" line="479"/>
+        <source>Ctrl+P</source>
+        <translation>Ctrl+P</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="220"/>
         <location filename="../build/ui_mainwindow.h" line="480"/>
         <source>P&amp;references</source>
         <translation>Eelistused</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="251"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="223"/>
+        <location filename="../build/ui_mainwindow.h" line="481"/>
+        <source>Ctrl+,</source>
+        <translation>Ctrl+,</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="231"/>
+        <location filename="../build/ui_mainwindow.h" line="482"/>
+        <source>&amp;Quit</source>
+        <translation>&amp;Välju</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="234"/>
+        <location filename="../build/ui_mainwindow.h" line="483"/>
+        <source>Ctrl+Q</source>
+        <translation>Ctrl+Q</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="242"/>
+        <location filename="../build/ui_mainwindow.h" line="484"/>
+        <source>Import from &amp;dive computer</source>
+        <translation>Impordi &amp;sukeldumiskompuutrist</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="245"/>
+        <location filename="../build/ui_mainwindow.h" line="485"/>
+        <source>Ctrl+D</source>
+        <translation>Ctrl+D</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="250"/>
         <location filename="../build/ui_mainwindow.h" line="486"/>
         <source>Import &amp;GPS data from Subsurface web service</source>
         <translation>Impordi &amp;GPS andmed Subsurface veebiteenusest</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="259"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="253"/>
+        <location filename="../build/ui_mainwindow.h" line="487"/>
+        <source>Ctrl+G</source>
+        <translation>Ctrl+G</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="258"/>
         <location filename="../build/ui_mainwindow.h" line="488"/>
         <source>Edit device &amp;names</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="272"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="263"/>
+        <location filename="../build/ui_mainwindow.h" line="489"/>
+        <source>&amp;Add dive</source>
+        <translation>&amp;Lisa sukeldumine</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="266"/>
+        <location filename="../build/ui_mainwindow.h" line="490"/>
+        <source>Ctrl++</source>
+        <translation>Ctrl++</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="271"/>
         <location filename="../build/ui_mainwindow.h" line="491"/>
         <source>&amp;Edit dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="277"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="276"/>
         <location filename="../build/ui_mainwindow.h" line="492"/>
         <source>&amp;Copy dive components</source>
         <translation>&amp;Kopeeri sukeldumise komponendid</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="280"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="279"/>
         <location filename="../build/ui_mainwindow.h" line="493"/>
         <source>Ctrl+C</source>
         <translation>Ctrl+C</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="285"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="284"/>
         <location filename="../build/ui_mainwindow.h" line="494"/>
         <source>&amp;Paste dive components</source>
         <translation>&amp;kleebi sukeldumise komponendid</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="288"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="287"/>
         <location filename="../build/ui_mainwindow.h" line="495"/>
         <source>Ctrl+V</source>
         <translation>Ctrl+V</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="325"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="292"/>
+        <location filename="../build/ui_mainwindow.h" line="496"/>
+        <source>&amp;Renumber</source>
+        <translation>&amp;Nummerda ümber</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="295"/>
+        <location filename="../build/ui_mainwindow.h" line="497"/>
+        <source>Ctrl+R</source>
+        <translation>Ctrl+R</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="303"/>
+        <location filename="../build/ui_mainwindow.h" line="498"/>
+        <source>Auto &amp;group</source>
+        <translation>Automaatne grupeerimine</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="308"/>
+        <location filename="../build/ui_mainwindow.h" line="499"/>
+        <source>&amp;Yearly statistics</source>
+        <translation>&amp;Aastane statistika</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="311"/>
+        <location filename="../build/ui_mainwindow.h" line="500"/>
+        <source>Ctrl+Y</source>
+        <translation>Ctrl+Y</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="316"/>
+        <location filename="../build/ui_mainwindow.h" line="501"/>
+        <source>&amp;Dive list</source>
+        <translation>&amp;Sukeldumiste nimekiri</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="319"/>
+        <location filename="../build/ui_mainwindow.h" line="502"/>
+        <source>Ctrl+2</source>
+        <translation>Ctrl+2</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="324"/>
         <location filename="../build/ui_mainwindow.h" line="503"/>
         <source>&amp;Profile</source>
         <translation>&amp;Profiil</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="333"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="327"/>
+        <location filename="../build/ui_mainwindow.h" line="504"/>
+        <source>Ctrl+3</source>
+        <translation>Ctrl+3</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="332"/>
         <location filename="../build/ui_mainwindow.h" line="505"/>
         <source>&amp;Info</source>
         <translation>&amp;info</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="341"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="335"/>
+        <location filename="../build/ui_mainwindow.h" line="506"/>
+        <source>Ctrl+4</source>
+        <translation>CTRL+4</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="340"/>
         <location filename="../build/ui_mainwindow.h" line="507"/>
         <source>&amp;All</source>
         <translation>&amp;Kõik</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="357"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="343"/>
+        <location filename="../build/ui_mainwindow.h" line="508"/>
+        <source>Ctrl+1</source>
+        <translation>CTRL+1</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="348"/>
+        <location filename="../build/ui_mainwindow.h" line="509"/>
+        <source>P&amp;revious DC</source>
+        <translation>&amp;Eelmine sukeldumiskompuuter</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="351"/>
+        <location filename="../build/ui_mainwindow.h" line="510"/>
+        <source>Left</source>
+        <translation>Vasak</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="356"/>
         <location filename="../build/ui_mainwindow.h" line="511"/>
         <source>&amp;Next DC</source>
         <translation>&amp;Järgmine sukeldumiskompuuter</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="365"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="359"/>
+        <location filename="../build/ui_mainwindow.h" line="512"/>
+        <source>Right</source>
+        <translation>Parem</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="364"/>
         <location filename="../build/ui_mainwindow.h" line="513"/>
         <source>&amp;About Subsurface</source>
         <translation>Subsurface kohta</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="381"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="372"/>
+        <location filename="../build/ui_mainwindow.h" line="514"/>
+        <source>User &amp;manual</source>
+        <translation>Kasutaja &amp;juhend</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="375"/>
+        <location filename="../build/ui_mainwindow.h" line="515"/>
+        <source>F1</source>
+        <translation>F1</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="380"/>
         <location filename="../build/ui_mainwindow.h" line="516"/>
         <source>&amp;Globe</source>
         <translation>&amp;Maakera</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="403"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="383"/>
+        <location filename="../build/ui_mainwindow.h" line="517"/>
+        <source>Ctrl+5</source>
+        <translation>Ctrl+5</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="388"/>
+        <location filename="../build/ui_mainwindow.h" line="518"/>
+        <source>P&amp;lan dive</source>
+        <translation>P&amp;laneeri sukeldumine</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="391"/>
+        <location filename="../build/ui_mainwindow.h" line="519"/>
+        <source>Ctrl+L</source>
+        <translation>Ctrl+L</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="396"/>
+        <location filename="../build/ui_mainwindow.h" line="520"/>
+        <source>&amp;Import log files</source>
+        <translation>&amp;Impordi logifailid</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="399"/>
+        <location filename="../build/ui_mainwindow.h" line="522"/>
+        <source>Import divelog files from other applications</source>
+        <translation>Impordi sukeldumislogi failid teistest rakendustest</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="402"/>
         <location filename="../build/ui_mainwindow.h" line="524"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="408"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="407"/>
         <location filename="../build/ui_mainwindow.h" line="525"/>
         <source>Import &amp;from divelogs.de</source>
         <translation>Import divelogs.de-st</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="416"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="415"/>
         <location filename="../build/ui_mainwindow.h" line="526"/>
         <source>&amp;Full screen</source>
         <translation>&amp;Täisekraan</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="419"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="418"/>
         <location filename="../build/ui_mainwindow.h" line="528"/>
         <source>Toggle full screen</source>
         <translation>Kuva täisekraan</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="447"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="421"/>
+        <location filename="../build/ui_mainwindow.h" line="530"/>
+        <source>F11</source>
+        <translation>F11</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="446"/>
         <location filename="../build/ui_mainwindow.h" line="531"/>
         <source>&amp;Check for updates</source>
         <translation>Kontrolli uuendusi</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="452"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="451"/>
         <location filename="../build/ui_mainwindow.h" line="532"/>
         <source>&amp;Export</source>
         <translation>&amp;Eksport</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="458"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="454"/>
+        <location filename="../build/ui_mainwindow.h" line="534"/>
+        <source>Export dive logs</source>
+        <translation>Ekspordi sukeldumiste logid</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="457"/>
         <location filename="../build/ui_mainwindow.h" line="536"/>
         <source>Ctrl+E</source>
         <translation>Ctrl+E</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="466"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="462"/>
+        <location filename="../build/ui_mainwindow.h" line="537"/>
+        <source>Configure &amp;dive computer</source>
+        <translation>Seadista &amp;dive kompuuter</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="465"/>
         <location filename="../build/ui_mainwindow.h" line="538"/>
         <source>Ctrl+Shift+C</source>
         <translation>Ctrl+Shift+C</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="474"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="473"/>
         <location filename="../build/ui_mainwindow.h" line="539"/>
         <source>Edit &amp;dive in planner</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="486"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="485"/>
         <location filename="../build/ui_mainwindow.h" line="540"/>
         <source>Toggle pO₂ graph</source>
         <translation>pO₂ graaf</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="498"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="497"/>
         <location filename="../build/ui_mainwindow.h" line="541"/>
         <source>Toggle pN₂ graph</source>
         <translation>pN₂ graaf</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="642"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="509"/>
+        <location filename="../build/ui_mainwindow.h" line="542"/>
+        <source>Toggle pHe graph</source>
+        <translation>pHe graaf</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="521"/>
+        <location filename="../build/ui_mainwindow.h" line="543"/>
+        <source>Toggle DC reported ceiling</source>
+        <translation>Sukeldumiskompuutri poolt antud lagi</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="533"/>
+        <location filename="../build/ui_mainwindow.h" line="544"/>
+        <source>Toggle calculated ceiling</source>
+        <translation>Arvutatud lagi</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="545"/>
+        <location filename="../build/ui_mainwindow.h" line="545"/>
+        <source>Toggle calculating all tissues</source>
+        <translation>Kõik koed</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="557"/>
+        <location filename="../build/ui_mainwindow.h" line="546"/>
+        <source>Toggle calculated ceiling with 3m increments</source>
+        <translation>Arvutatud lagi 3m intervalliga</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="569"/>
+        <location filename="../build/ui_mainwindow.h" line="547"/>
+        <source>Toggle heart rate</source>
+        <translation>Südame pulss</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="581"/>
+        <location filename="../build/ui_mainwindow.h" line="548"/>
+        <source>Toggle MOD</source>
+        <translation>MOD</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="593"/>
+        <location filename="../build/ui_mainwindow.h" line="549"/>
+        <source>Toggle EAD, END, EADD</source>
+        <translation>EAD, END, EADD</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="605"/>
+        <location filename="../build/ui_mainwindow.h" line="550"/>
+        <source>Toggle NDL, TTS</source>
+        <translation>NDL, TTS</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="617"/>
+        <location filename="../build/ui_mainwindow.h" line="551"/>
+        <source>Toggle SAC rate</source>
+        <translation>SAC määr</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="629"/>
+        <location filename="../build/ui_mainwindow.h" line="552"/>
+        <source>Toggle ruler</source>
+        <translation>Joonlaud</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="641"/>
         <location filename="../build/ui_mainwindow.h" line="553"/>
         <source>Scale graph</source>
         <translation>Skaleeri graaf</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="654"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="653"/>
         <location filename="../build/ui_mainwindow.h" line="554"/>
         <source>Toggle pictures</source>
         <translation>Pildid</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="666"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="665"/>
         <location filename="../build/ui_mainwindow.h" line="555"/>
         <source>Toggle tank bar</source>
         <translation>Balloon(id)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="674"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="673"/>
         <location filename="../build/ui_mainwindow.h" line="556"/>
         <source>&amp;Filter divelist</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="689"/>
-        <location filename="../build/ui_mainwindow.h" line="558"/>
-        <source>Toggle tissue graph</source>
-        <translation>Kudede graaf</translation>
+        <location filename="../desktop-widgets/mainwindow.ui" line="676"/>
+        <location filename="../build/ui_mainwindow.h" line="557"/>
+        <source>Ctrl+F</source>
+        <translation>Ctrl+F</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="694"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="688"/>
+        <source>Toggle tissue heat-map</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="693"/>
         <location filename="../build/ui_mainwindow.h" line="559"/>
         <source>User &amp;survey</source>
         <translation>Kasutajaküsitlus</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="699"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="698"/>
         <location filename="../build/ui_mainwindow.h" line="560"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="238"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="231"/>
         <source>&amp;Undo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="702"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="701"/>
         <location filename="../build/ui_mainwindow.h" line="561"/>
         <source>Ctrl+Z</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="707"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="706"/>
         <location filename="../build/ui_mainwindow.h" line="562"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="239"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="232"/>
         <source>&amp;Redo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="710"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="709"/>
         <location filename="../build/ui_mainwindow.h" line="563"/>
         <source>Ctrl+Shift+Z</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="715"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="714"/>
         <location filename="../build/ui_mainwindow.h" line="564"/>
         <source>&amp;Find moved images</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="720"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="719"/>
         <source>Open c&amp;loud storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="725"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="724"/>
         <source>Save to clo&amp;ud storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="730"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="729"/>
         <location filename="../build/ui_mainwindow.h" line="567"/>
         <source>&amp;Manage dive sites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="735"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="734"/>
         <source>Dive Site &amp;Edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="740"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="739"/>
         <source>Facebook</source>
         <translation>Facebook</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="745"/>
-        <source>Add GPS location here</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="744"/>
+        <source>Take cloud storage online</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="677"/>
-        <location filename="../build/ui_mainwindow.h" line="557"/>
-        <source>Ctrl+F</source>
-        <translation>Ctrl+F</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="213"/>
-        <location filename="../build/ui_mainwindow.h" line="478"/>
-        <source>&amp;Print</source>
-        <translation>&amp;Väljastus</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="224"/>
-        <location filename="../build/ui_mainwindow.h" line="481"/>
-        <source>Ctrl+,</source>
-        <translation>Ctrl+,</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="232"/>
-        <location filename="../build/ui_mainwindow.h" line="482"/>
-        <source>&amp;Quit</source>
-        <translation>&amp;Välju</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="243"/>
-        <location filename="../build/ui_mainwindow.h" line="484"/>
-        <source>Import from &amp;dive computer</source>
-        <translation>Impordi &amp;sukeldumiskompuutrist</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="254"/>
-        <location filename="../build/ui_mainwindow.h" line="487"/>
-        <source>Ctrl+G</source>
-        <translation>Ctrl+G</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="267"/>
-        <location filename="../build/ui_mainwindow.h" line="490"/>
-        <source>Ctrl++</source>
-        <translation>Ctrl++</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="293"/>
-        <location filename="../build/ui_mainwindow.h" line="496"/>
-        <source>&amp;Renumber</source>
-        <translation>&amp;Nummerda ümber</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="296"/>
-        <location filename="../build/ui_mainwindow.h" line="497"/>
-        <source>Ctrl+R</source>
-        <translation>Ctrl+R</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="312"/>
-        <location filename="../build/ui_mainwindow.h" line="500"/>
-        <source>Ctrl+Y</source>
-        <translation>Ctrl+Y</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="392"/>
-        <location filename="../build/ui_mainwindow.h" line="519"/>
-        <source>Ctrl+L</source>
-        <translation>Ctrl+L</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="216"/>
-        <location filename="../build/ui_mainwindow.h" line="479"/>
-        <source>Ctrl+P</source>
-        <translation>Ctrl+P</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="235"/>
-        <location filename="../build/ui_mainwindow.h" line="483"/>
-        <source>Ctrl+Q</source>
-        <translation>Ctrl+Q</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="246"/>
-        <location filename="../build/ui_mainwindow.h" line="485"/>
-        <source>Ctrl+D</source>
-        <translation>Ctrl+D</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="264"/>
-        <location filename="../build/ui_mainwindow.h" line="489"/>
-        <source>&amp;Add dive</source>
-        <translation>&amp;Lisa sukeldumine</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="304"/>
-        <location filename="../build/ui_mainwindow.h" line="498"/>
-        <source>Auto &amp;group</source>
-        <translation>Automaatne grupeerimine</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="309"/>
-        <location filename="../build/ui_mainwindow.h" line="499"/>
-        <source>&amp;Yearly statistics</source>
-        <translation>&amp;Aastane statistika</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="317"/>
-        <location filename="../build/ui_mainwindow.h" line="501"/>
-        <source>&amp;Dive list</source>
-        <translation>&amp;Sukeldumiste nimekiri</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="320"/>
-        <location filename="../build/ui_mainwindow.h" line="502"/>
-        <source>Ctrl+2</source>
-        <translation>Ctrl+2</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="328"/>
-        <location filename="../build/ui_mainwindow.h" line="504"/>
-        <source>Ctrl+3</source>
-        <translation>Ctrl+3</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="336"/>
-        <location filename="../build/ui_mainwindow.h" line="506"/>
-        <source>Ctrl+4</source>
-        <translation>CTRL+4</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="344"/>
-        <location filename="../build/ui_mainwindow.h" line="508"/>
-        <source>Ctrl+1</source>
-        <translation>CTRL+1</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="349"/>
-        <location filename="../build/ui_mainwindow.h" line="509"/>
-        <source>P&amp;revious DC</source>
-        <translation>&amp;Eelmine sukeldumiskompuuter</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="352"/>
-        <location filename="../build/ui_mainwindow.h" line="510"/>
-        <source>Left</source>
-        <translation>Vasak</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="360"/>
-        <location filename="../build/ui_mainwindow.h" line="512"/>
-        <source>Right</source>
-        <translation>Parem</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="373"/>
-        <location filename="../build/ui_mainwindow.h" line="514"/>
-        <source>User &amp;manual</source>
-        <translation>Kasutaja &amp;juhend</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="376"/>
-        <location filename="../build/ui_mainwindow.h" line="515"/>
-        <source>F1</source>
-        <translation>F1</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="384"/>
-        <location filename="../build/ui_mainwindow.h" line="517"/>
-        <source>Ctrl+5</source>
-        <translation>Ctrl+5</translation>
+        <location filename="../build/ui_mainwindow.h" line="558"/>
+        <source>Toggle tissue graph</source>
+        <translation>Kudede graaf</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="389"/>
-        <location filename="../build/ui_mainwindow.h" line="518"/>
-        <source>P&amp;lan dive</source>
-        <translation>P&amp;laneeri sukeldumine</translation>
+        <location filename="../build/ui_mainwindow.h" line="565"/>
+        <source>Open cloud storage</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="397"/>
-        <location filename="../build/ui_mainwindow.h" line="520"/>
-        <source>&amp;Import log files</source>
-        <translation>&amp;Impordi logifailid</translation>
+        <location filename="../build/ui_mainwindow.h" line="566"/>
+        <source>Save to cloud storage</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="400"/>
-        <location filename="../build/ui_mainwindow.h" line="522"/>
-        <source>Import divelog files from other applications</source>
-        <translation>Impordi sukeldumislogi failid teistest rakendustest</translation>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="331"/>
+        <source>Connect to</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="422"/>
-        <location filename="../build/ui_mainwindow.h" line="530"/>
-        <source>F11</source>
-        <translation>F11</translation>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="493"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="538"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1545"/>
+        <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="../desktop-widgets/mainwindow.cpp" line="505"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="499"/>
         <source>Open file</source>
         <translation>Ava fail</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="509"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="503"/>
         <location filename="../desktop-widgets/mainwindow.cpp" line="614"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1972"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1978"/>
         <source>Cancel</source>
         <translation>Loobu</translation>
     </message>
@@ -5234,6 +5346,16 @@ mixed from Air and using:
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="649"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="796"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="977"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="983"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1849"/>
+        <source>Warning</source>
+        <translation>Hoiatus</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="674"/>
         <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>
@@ -5249,124 +5371,97 @@ mixed from Air and using:
         <translation>Väljasta jooksva aja tabel</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="982"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
+        <source>Trying to replan a dive that&apos;s not a planned dive.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="977"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1849"/>
+        <source>Please, first finish the current edition before trying to do another.</source>
+        <translation>Lõpeta praegune toimetamine enne järgmise alustamist.</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="983"/>
         <source>Trying to edit a dive that&apos;s not a manually added dive.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1243"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1030"/>
+        <source>Yearly statistics</source>
+        <translation>Aastane statistika</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1244"/>
         <source>Do you want to save the changes that you made in the file %1?</source>
         <translation>Kas soovid salvestada muudatused mis tegid faili %1?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1246"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1247"/>
         <source>Do you want to save the changes that you made in the data file?</source>
         <translation>Kas soovid salvestada muudatused mis tegid andmefaili?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1251"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1252"/>
         <source>Save changes?</source>
         <translation>Salvesta muudatused?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1587"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1253"/>
+        <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="../desktop-widgets/mainwindow.cpp" line="1572"/>
         <source>Save file as</source>
         <translation>Salvesta nimega</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1682"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1573"/>
+        <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
+        <translation>Subsurface XML files (*.ssrf *.xml *.XML)</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1670"/>
+        <source>[local cache for] %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1672"/>
         <source>[cloud storage for] %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1782"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1788"/>
         <source>Opening datafile from older version</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1783"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1789"/>
         <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly.
 Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1794"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1800"/>
         <source>Open dive log file</source>
         <translation>Ava sukeldumislogi fail</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1795"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1801"/>
         <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1972"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1978"/>
         <source>Contacting cloud service...</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1252"/>
-        <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="../desktop-widgets/mainwindow.cpp" line="649"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="796"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="976"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="982"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/>
-        <source>Warning</source>
-        <translation>Hoiatus</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="499"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="544"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1560"/>
-        <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="../desktop-widgets/mainwindow.cpp" line="338"/>
-        <source>Connect to</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
-        <source>Trying to replan a dive that&apos;s not a planned dive.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1029"/>
-        <source>Yearly statistics</source>
-        <translation>Aastane statistika</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1588"/>
-        <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
-        <translation>Subsurface XML files (*.ssrf *.xml *.XML)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="976"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/>
-        <source>Please, first finish the current edition before trying to do another.</source>
-        <translation>Lõpeta praegune toimetamine enne järgmise alustamist.</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_mainwindow.h" line="565"/>
-        <source>Open cloud storage</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../build/ui_mainwindow.h" line="566"/>
-        <source>Save to cloud storage</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>MultiFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="733"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="731"/>
         <source>Filter shows %1 (of %2) dives</source>
         <translation type="unfinished"/>
     </message>
@@ -5374,39 +5469,39 @@ Subsurface has already tried to pre-populate the data but it might be worth whil
 <context>
     <name>OstcFirmwareCheck</name>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="269"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="271"/>
         <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source>
         <translation>Sukeldumiskompuutri firmware vajaks uuendamist: praegune on versioon %1, viimane stabiilne versioon on aga %2</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="273"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="275"/>
         <source>
 
 Please start Bluetooth on your OSTC Sport and do the same preparations as for a logbook download before continuing with the update</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="274"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="276"/>
         <source>Not now</source>
         <translation>Mitte praegu</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="275"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="277"/>
         <source>Update firmware</source>
         <translation>Uuenda firmware</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="277"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="279"/>
         <source>Firmware upgrade notice</source>
         <translation>Firmware uuendamise teade</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="295"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="297"/>
         <source>Save the downloaded firmware as</source>
         <translation>Salvesta allalaetud firmware nimega</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="296"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="298"/>
         <source>HEX files (*.hex)</source>
         <translation>HEX failid (*.hex)</translation>
     </message>
@@ -5414,79 +5509,89 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PlannerSettingsWidget</name>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="322"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="302"/>
         <source>Open circuit</source>
         <translation>Avatud süsteem</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="322"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="302"/>
         <source>CCR</source>
         <translation>CCR</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="322"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="302"/>
         <source>pSCR</source>
         <translation>pSCR</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="421"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="388"/>
         <source>ft/min</source>
         <translation>jalg/min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="422"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="389"/>
         <source>Last stop at 20ft</source>
         <translation>Viimane peatus 20 jala peal</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="423"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="390"/>
         <source>50% avg. depth to 20ft</source>
         <translation>50% keskmine sügavus 20 jalani</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="424"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="391"/>
         <source>20ft to surface</source>
         <translation>20 jalga pinnani</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="426"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="392"/>
+        <source>ft</source>
+        <translation>jalg</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="394"/>
         <source>m/min</source>
         <translation>m/min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="427"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="395"/>
         <source>Last stop at 6m</source>
         <translation>Viimane peatus 6m peal</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="428"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="396"/>
         <source>50% avg. depth to 6m</source>
         <translation>50% keskmine sügavus 6m-i</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="429"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="397"/>
         <source>6m to surface</source>
         <translation>6m pinnani</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="432"/>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="433"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="398"/>
+        <source>m</source>
+        <translation>m</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="401"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="402"/>
         <source>cuft/min</source>
         <translation>kuupjalg/min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="441"/>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="442"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="410"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="411"/>
         <source>ℓ/min</source>
         <translation>ℓ/min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="451"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="420"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="456"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="425"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
@@ -5637,6 +5742,11 @@ väärtused</translation>
 <context>
     <name>PreferencesDialog</name>
     <message>
+        <location filename="../build/ui_preferences.h" line="1283"/>
+        <source>Preferences</source>
+        <translation>Eelistused</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1288"/>
         <source>Defaults</source>
         <translation>Vaike-
@@ -5673,6 +5783,11 @@ väärtused</translation>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1303"/>
+        <source>Lists and tables</source>
+        <translation>Nimekirjad ja tabelid</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1304"/>
         <source>Font</source>
         <translation>Font</translation>
@@ -5688,6 +5803,11 @@ väärtused</translation>
         <translation>Sukeldumised</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1307"/>
+        <source>Default dive log file</source>
+        <translation>Vaikimis sukeldumise logi fail</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1308"/>
         <source>No default file</source>
         <translation type="unfinished"/>
@@ -5718,6 +5838,21 @@ väärtused</translation>
         <translation>...</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1314"/>
+        <source>Display invalid</source>
+        <translation>Kuva ebaõnnestunud</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1316"/>
+        <source>Default cylinder</source>
+        <translation>Vaikimisi balloon</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1317"/>
+        <source>Use default cylinder</source>
+        <translation>Kasuta vaikimis ballooni</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1318"/>
         <source>Animations</source>
         <translation>Animatsioonid</translation>
@@ -5748,42 +5883,26 @@ väärtused</translation>
         <translation>Süsteem</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1401"/>
-        <source>Dive site geo lookup</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1402"/>
-        <source>Enable geocoding for dive site management</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1403"/>
-        <source>Parse site without GPS data</source>
+        <location filename="../build/ui_preferences.h" line="1324"/>
+        <source>&amp;Metric</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1404"/>
-        <source>Same format for existing dives</source>
-        <translation type="unfinished"/>
+        <location filename="../build/ui_preferences.h" line="1325"/>
+        <source>Imperial</source>
+        <translation>Briti/Ameerika</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1405"/>
-        <source>Dive Site Layout</source>
+        <location filename="../build/ui_preferences.h" line="1326"/>
+        <source>Personali&amp;ze</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1406"/>
-        <location filename="../build/ui_preferences.h" line="1407"/>
-        <source>/</source>
+        <location filename="../build/ui_preferences.h" line="1327"/>
+        <source>Individual settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1325"/>
-        <source>Imperial</source>
-        <translation>Briti/Ameerika</translation>
-    </message>
-    <message>
         <location filename="../build/ui_preferences.h" line="1328"/>
         <source>Depth</source>
         <translation>Sügavus</translation>
@@ -5799,6 +5918,11 @@ väärtused</translation>
         <translation>jalg</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1331"/>
+        <source>Pressure</source>
+        <translation>Rõhk</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1332"/>
         <location filename="../build/ui_preferences.h" line="1366"/>
         <source>bar</source>
@@ -5810,11 +5934,26 @@ väärtused</translation>
         <translation>psi</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1334"/>
+        <source>Volume</source>
+        <translation>Maht</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1335"/>
+        <source>&amp;liter</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1336"/>
         <source>cu ft</source>
         <translation>kuupjalg</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1337"/>
+        <source>Temperature</source>
+        <translation>Temperatuur</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1338"/>
         <source>celsius</source>
         <translation>celsius</translation>
@@ -5825,11 +5964,121 @@ väärtused</translation>
         <translation>fahrenheit</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1340"/>
+        <source>Weight</source>
+        <translation>Raskus</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1341"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1342"/>
+        <source>lbs</source>
+        <translation>nael</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1343"/>
+        <source>Time units</source>
+        <translation>Ajaühikud</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1344"/>
+        <source>Ascent/descent speed denominator</source>
+        <translation>Tõusu/laskumise kiiruse nimetaja</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1345"/>
+        <source>Minutes</source>
+        <translation>Minutid</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1346"/>
+        <source>Seconds</source>
+        <translation>Sekundid</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1347"/>
+        <source>GPS coordinates</source>
+        <translation>GPS koordinaadid</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1348"/>
+        <source>Location Display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1349"/>
+        <source>traditional (dms)</source>
+        <translation>Traditsiooniline (dms)</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1350"/>
+        <source>decimal</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1351"/>
+        <source>Show</source>
+        <translation>Näita</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1352"/>
+        <source>Threshold when showing pO₂</source>
+        <translation>Lävi pO₂ kuvamisel</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1353"/>
+        <source>Threshold when showing pN₂</source>
+        <translation>Lävi pN₂ kuvamisel</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1354"/>
+        <source>Threshold when showing pHe</source>
+        <translation>Lävi pHe kuvamisel</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1355"/>
+        <source>Max pO₂ when showing MOD</source>
+        <translation>Max pO₂ MOD kuvamisel</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1356"/>
+        <source>Draw dive computer reported ceiling red</source>
+        <translation>Joonista sukeldumiskompuutri väljastatud lagi punasega</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1357"/>
+        <source>Show unused cylinders in Equipment tab</source>
+        <translation>Näita kasutamata balloonid varustuse saki all</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1358"/>
+        <source>Show average depth</source>
+        <translation>Näita keskmine sügavus</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1359"/>
+        <source>Misc</source>
+        <translation>Muu</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1360"/>
+        <source>GFLow</source>
+        <translation>GFLow</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1361"/>
+        <source>GFHigh</source>
+        <translation>GFHigh</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1362"/>
+        <source>GFLow at max depth</source>
+        <translation>GFlow max sügavusel</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1363"/>
         <source>CCR: show setpoints when viewing pO₂</source>
         <translation type="unfinished"/>
@@ -5875,14 +6124,19 @@ väärtused</translation>
         <translation>Süsteemi vaikeväärtus</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1374"/>
+        <source>Filter</source>
+        <translation>Filter</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1375"/>
         <source>Proxy</source>
         <translation>Proxy</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1379"/>
-        <source>Proxy type</source>
-        <translation>Proxy tüüp</translation>
+        <location filename="../build/ui_preferences.h" line="1376"/>
+        <source>Port</source>
+        <translation>Port</translation>
     </message>
     <message>
         <location filename="../build/ui_preferences.h" line="1377"/>
@@ -5890,16 +6144,16 @@ väärtused</translation>
         <translation>Peaarvuti</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1376"/>
-        <source>Port</source>
-        <translation>Port</translation>
-    </message>
-    <message>
         <location filename="../build/ui_preferences.h" line="1378"/>
         <source>Requires authentication</source>
         <translation>Nõuab autentimist</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1379"/>
+        <source>Proxy type</source>
+        <translation>Proxy tüüp</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1380"/>
         <source>Username</source>
         <translation>Kasutajanimi</translation>
@@ -5911,46 +6165,6 @@ väärtused</translation>
         <translation>Salasõna</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1400"/>
-        <source>Disconnect from Facebook</source>
-        <translation>Katkesta ühendus Facebookiga</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1374"/>
-        <source>Filter</source>
-        <translation>Filter</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1331"/>
-        <source>Pressure</source>
-        <translation>Rõhk</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1303"/>
-        <source>Lists and tables</source>
-        <translation>Nimekirjad ja tabelid</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1307"/>
-        <source>Default dive log file</source>
-        <translation>Vaikimis sukeldumise logi fail</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1314"/>
-        <source>Display invalid</source>
-        <translation>Kuva ebaõnnestunud</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1316"/>
-        <source>Default cylinder</source>
-        <translation>Vaikimisi balloon</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1317"/>
-        <source>Use default cylinder</source>
-        <translation>Kasuta vaikimis ballooni</translation>
-    </message>
-    <message>
         <location filename="../build/ui_preferences.h" line="1382"/>
         <source>Subsurface cloud storage</source>
         <translation type="unfinished"/>
@@ -5991,150 +6205,41 @@ väärtused</translation>
         <translation>Salvesta kasutaja ID lokaalselt?</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1334"/>
-        <source>Volume</source>
-        <translation>Maht</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1337"/>
-        <source>Temperature</source>
-        <translation>Temperatuur</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1340"/>
-        <source>Weight</source>
-        <translation>Raskus</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1342"/>
-        <source>lbs</source>
-        <translation>nael</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1343"/>
-        <source>Time units</source>
-        <translation>Ajaühikud</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1345"/>
-        <source>Minutes</source>
-        <translation>Minutid</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1346"/>
-        <source>Seconds</source>
-        <translation>Sekundid</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1351"/>
-        <source>Show</source>
-        <translation>Näita</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1362"/>
-        <source>GFLow at max depth</source>
-        <translation>GFlow max sügavusel</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1359"/>
-        <source>Misc</source>
-        <translation>Muu</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1283"/>
-        <source>Preferences</source>
-        <translation>Eelistused</translation>
+        <location filename="../build/ui_preferences.h" line="1400"/>
+        <source>Disconnect from Facebook</source>
+        <translation>Katkesta ühendus Facebookiga</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1324"/>
-        <source>&amp;Metric</source>
+        <location filename="../build/ui_preferences.h" line="1401"/>
+        <source>Dive site geo lookup</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1326"/>
-        <source>Personali&amp;ze</source>
+        <location filename="../build/ui_preferences.h" line="1402"/>
+        <source>Enable geocoding for dive site management</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1327"/>
-        <source>Individual settings</source>
+        <location filename="../build/ui_preferences.h" line="1403"/>
+        <source>Parse site without GPS data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1335"/>
-        <source>&amp;liter</source>
+        <location filename="../build/ui_preferences.h" line="1404"/>
+        <source>Same format for existing dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1344"/>
-        <source>Ascent/descent speed denominator</source>
-        <translation>Tõusu/laskumise kiiruse nimetaja</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1347"/>
-        <source>GPS coordinates</source>
-        <translation>GPS koordinaadid</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1348"/>
-        <source>Location Display</source>
+        <location filename="../build/ui_preferences.h" line="1405"/>
+        <source>Dive Site Layout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1349"/>
-        <source>traditional (dms)</source>
-        <translation>Traditsiooniline (dms)</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1350"/>
-        <source>decimal</source>
+        <location filename="../build/ui_preferences.h" line="1406"/>
+        <location filename="../build/ui_preferences.h" line="1407"/>
+        <source>/</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1352"/>
-        <source>Threshold when showing pO₂</source>
-        <translation>Lävi pO₂ kuvamisel</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1353"/>
-        <source>Threshold when showing pN₂</source>
-        <translation>Lävi pN₂ kuvamisel</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1354"/>
-        <source>Threshold when showing pHe</source>
-        <translation>Lävi pHe kuvamisel</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1355"/>
-        <source>Max pO₂ when showing MOD</source>
-        <translation>Max pO₂ MOD kuvamisel</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1356"/>
-        <source>Draw dive computer reported ceiling red</source>
-        <translation>Joonista sukeldumiskompuutri väljastatud lagi punasega</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1357"/>
-        <source>Show unused cylinders in Equipment tab</source>
-        <translation>Näita kasutamata balloonid varustuse saki all</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1358"/>
-        <source>Show average depth</source>
-        <translation>Näita keskmine sügavus</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1360"/>
-        <source>GFLow</source>
-        <translation>GFLow</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1361"/>
-        <source>GFHigh</source>
-        <translation>GFHigh</translation>
-    </message>
 </context>
 <context>
     <name>PreferencesGeoreference</name>
@@ -6189,106 +6294,136 @@ väärtused</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="20"/>
-        <source>Show</source>
-        <translation>Näita</translation>
+        <source>Gas pressure display setup</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="29"/>
-        <source>Threshold when showing pO₂</source>
-        <translation>Lävi pO₂ kuvamisel</translation>
+        <source>Threshold for pO₂ (bar)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="49"/>
-        <source>Threshold when showing pN₂</source>
-        <translation>Lävi pN₂ kuvamisel</translation>
+        <source>Threshold for pN₂ (bar)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="69"/>
-        <source>Threshold when showing pHe</source>
-        <translation>Lävi pHe kuvamisel</translation>
+        <source>Threshold for pHe (bar)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="89"/>
-        <source>Max pO₂ when showing MOD</source>
-        <translation>Max pO₂ MOD kuvamisel</translation>
+        <source>pO₂ in calculating MOD (bar)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="106"/>
+        <source>CCR options:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="113"/>
+        <source>Dive planner default setpoint (bar)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="133"/>
+        <source>Show setpoints when viewing pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="140"/>
+        <source>Show individual O₂ sensor values when viewing pO₂</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="109"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="150"/>
+        <source>Ceiling display setup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="159"/>
         <source>Draw dive computer reported ceiling red</source>
         <translation>Joonista sukeldumiskompuutri väljastatud lagi punasega</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="116"/>
-        <source>Show unused cylinders in Equipment tab</source>
-        <translation>Näita kasutamata balloonid varustuse saki all</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="169"/>
+        <source>Algorithm for calculated ceiling:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="123"/>
-        <source>Show mean depth</source>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="176"/>
+        <source>VPM-B</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="133"/>
-        <source>Misc</source>
-        <translation>Muu</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="183"/>
+        <source>VPM-B Conservatism</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="149"/>
-        <source>bar</source>
-        <translation>bar</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="193"/>
+        <source>+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="165"/>
-        <source>Default CCR set-point for dive planning</source>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="206"/>
+        <source>Bühlmann</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="172"/>
-        <source>pSCR O₂ metabolism rate</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="216"/>
+        <source>GFHigh</source>
+        <translation>GFHigh</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="179"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="236"/>
         <source>GFLow</source>
         <translation>GFLow</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="186"/>
-        <source>GFHigh</source>
-        <translation>GFHigh</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="256"/>
+        <source>GFLow at max depth</source>
+        <translation>GFlow max sügavusel</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="203"/>
-        <source>ℓ/min</source>
-        <translation>ℓ/min</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="263"/>
+        <source>pSCR options:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="213"/>
-        <source>pSCR ratio</source>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="270"/>
+        <source>Metabolic rate (ℓ O₂/min)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="223"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="287"/>
+        <source>Dilution ratio</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="300"/>
         <source>1:</source>
         <translation>1:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="230"/>
-        <source>CCR: show individual O₂ sensor values when viewing pO₂</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="310"/>
+        <source>Misc</source>
+        <translation>Muu</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="237"/>
-        <source>CCR: show setpoints when viewing pO₂</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="316"/>
+        <source>Show unused cylinders in Equipment tab</source>
+        <translation>Näita kasutamata balloonid varustuse saki all</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="244"/>
-        <source>GFLow at max depth</source>
-        <translation>GFlow max sügavusel</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="323"/>
+        <source>Show mean depth in Profile</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="10"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="9"/>
         <source>Graph</source>
         <translation>Graaf</translation>
     </message>
@@ -6357,15 +6492,29 @@ väärtused</translation>
         <translation>Keel</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="57"/>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="53"/>
         <source>Restart required</source>
         <translation>Nõutav taaskäivitus</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="58"/>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="54"/>
         <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="../desktop-widgets/preferences/preferences_language.cpp" line="76"/>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="82"/>
+        <source>Literal characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="77"/>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="83"/>
+        <source>Non-special character(s) in time format.
+These will be used as is. This might not be what you intended.
+See http://doc.qt.io/qt-5/qdatetime.html#toString</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PreferencesNetwork</name>
@@ -6412,7 +6561,7 @@ väärtused</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_network.ui" line="156"/>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="148"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="134"/>
         <source>Subsurface cloud storage</source>
         <translation type="unfinished"/>
     </message>
@@ -6457,39 +6606,39 @@ väärtused</translation>
         <translation>Salvesta kasutaja ID lokaalselt?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="11"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="10"/>
         <source>Network</source>
         <translation>Võrk</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="15"/>
         <source>No proxy</source>
         <translation>Pole proxyt</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/>
         <source>System proxy</source>
         <translation>Süsteemi proxy</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/>
         <source>HTTP proxy</source>
         <translation>HTTP proxy</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="19"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/>
         <source>SOCKS proxy</source>
         <translation>SOCKS proxy</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="75"/>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="97"/>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="110"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="72"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="93"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="106"/>
         <source>Cloud storage email and password can only consist of letters, numbers, and &apos;.&apos;, &apos;-&apos;, &apos;_&apos;, and &apos;+&apos;.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="146"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="132"/>
         <source>Subsurface cloud storage (credentials verified)</source>
         <translation type="unfinished"/>
     </message>
@@ -6647,7 +6796,7 @@ väärtused</translation>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="8"/>
+        <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="7"/>
         <source>Units</source>
         <translation>Ühikud</translation>
     </message>
@@ -6655,17 +6804,17 @@ väärtused</translation>
 <context>
     <name>PrintDialog</name>
     <message>
-        <location filename="../desktop-widgets/printdialog.cpp" line="118"/>
-        <source>&amp;Preview</source>
-        <translation>&amp;Eelvaade</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/printdialog.cpp" line="115"/>
+        <location filename="../desktop-widgets/printdialog.cpp" line="102"/>
         <source>P&amp;rint</source>
         <translation>P&amp;rindi</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/printdialog.cpp" line="130"/>
+        <location filename="../desktop-widgets/printdialog.cpp" line="105"/>
+        <source>&amp;Preview</source>
+        <translation>&amp;Eelvaade</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/printdialog.cpp" line="117"/>
         <source>Print</source>
         <translation>Väljastus</translation>
     </message>
@@ -6673,19 +6822,10 @@ väärtused</translation>
 <context>
     <name>PrintOptions</name>
     <message>
-        <location filename="../build/ui_printoptions.h" line="150"/>
-        <source>&amp;Table print</source>
-        <translation>&amp;Tabel</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_printoptions.h" line="158"/>
-        <source>One dive per page</source>
-        <translation>Üks sukeldumine lk</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_printoptions.h" line="159"/>
-        <source>Two dives per page</source>
-        <translation>Kaks sukeldumist lk</translation>
+        <location filename="../desktop-widgets/printoptions.ui" line="29"/>
+        <location filename="../build/ui_printoptions.h" line="148"/>
+        <source>Print type</source>
+        <translation>Väljundi tüüp</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/printoptions.ui" line="41"/>
@@ -6745,10 +6885,19 @@ väärtused</translation>
         <translation>Import</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/printoptions.ui" line="29"/>
-        <location filename="../build/ui_printoptions.h" line="148"/>
-        <source>Print type</source>
-        <translation>Väljundi tüüp</translation>
+        <location filename="../build/ui_printoptions.h" line="150"/>
+        <source>&amp;Table print</source>
+        <translation>&amp;Tabel</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_printoptions.h" line="158"/>
+        <source>One dive per page</source>
+        <translation>Üks sukeldumine lk</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_printoptions.h" line="159"/>
+        <source>Two dives per page</source>
+        <translation>Kaks sukeldumist lk</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/printoptions.cpp" line="128"/>
@@ -6790,103 +6939,103 @@ väärtused</translation>
         <translation>Tundmatu sukeldumiskompuuter</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="755"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="752"/>
         <source>Show NDL / TTS was disabled because of excessive processing time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1344"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1338"/>
         <source>Make first divecomputer</source>
         <translation>Loo esimene sukeldumiskompuuter</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1346"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1340"/>
         <source>Delete this divecomputer</source>
         <translation>Kustuta see sukeldumiskompuuter</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1360"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1354"/>
         <source>Add gas change</source>
         <translation>Lisa gaasivahetus</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1363"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1357"/>
         <source> (Tank %1)</source>
         <translation> (Balloon %1)</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1371"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1365"/>
         <source>Add set-point change</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1373"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1367"/>
         <source>Add bookmark</source>
         <translation>Lisa järjehoidja</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1377"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1371"/>
         <source>Edit the profile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1381"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1375"/>
         <source>Remove event</source>
         <translation>Eemalda sündmus</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1386"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1380"/>
         <source>Hide similar events</source>
         <translation>Peida sarnased sündmused</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1393"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1387"/>
         <source>Edit name</source>
         <translation>Toimeta nimi</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1422"/>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1429"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1416"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1423"/>
         <source>Adjust pressure of tank %1 (currently interpolated as %2)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1444"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1438"/>
         <source>Unhide all events</source>
         <translation>Peida kõik sündmused</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1479"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1473"/>
         <source>Hide events</source>
         <translation>Peida sündmused</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1479"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1473"/>
         <source>Hide all %1 events?</source>
         <translation>Peida kõik %1 sündmust?</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1514"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1508"/>
         <source>Remove the selected event?</source>
         <translation>Eemalda valitud sündmus?</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1515"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1509"/>
         <source>%1 @ %2:%3</source>
         <translation>%1 @ %2:%3</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1638"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1632"/>
         <source>Edit name of bookmark</source>
         <translation>Toimeta järjehoidja nimi</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1639"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1633"/>
         <source>Custom name:</source>
         <translation>Kohandatud nimi</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1644"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1638"/>
         <source>Name is too long!</source>
         <translation>Nimi on liiga pikk!</translation>
     </message>
@@ -6894,91 +7043,101 @@ väärtused</translation>
 <context>
     <name>QMLManager</name>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="95"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="97"/>
         <source>Starting...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="202"/>
         <source>working in no-cloud mode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="213"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="216"/>
         <source>no cloud credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="214"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="270"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="217"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="269"/>
         <source>Please enter valid cloud credentials.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="285"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="284"/>
         <source>Attempting to open cloud storage with new credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="304"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="306"/>
         <source>Testing cloud credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="331"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="320"/>
+        <source>No response from cloud server to validate the credentials</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="329"/>
+        <source>Cannot connect to cloud storage - cloud account not verified</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="361"/>
         <source>Cloud credentials are invalid</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="344"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="374"/>
         <source>Cannot open cloud storage: Error creating https connection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="357"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="387"/>
         <source>Cannot open cloud storage: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="369"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="399"/>
         <source>Cannot connect to cloud storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="411"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="441"/>
         <source>Cloud storage error: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="501"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="531"/>
         <source>Failed to connect to cloud server, reverting to no cloud status</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="520"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="550"/>
         <source>Cloud storage open successfully. No dives in dive list.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="689"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="690"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="721"/>
         <source>h</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="689"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="690"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="691"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="721"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="722"/>
         <source>min</source>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="689"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/>
         <source>sec</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="1041"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="1102"/>
         <source>Unknown GPS location</source>
         <translation type="unfinished"/>
     </message>
@@ -6986,126 +7145,126 @@ väärtused</translation>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../core/qthelper.cpp" line="866"/>
-        <location filename="../core/qthelper.cpp" line="1214"/>
-        <source>AIR</source>
-        <translation>ÕHK</translation>
+        <location filename="../core/gpslocation.h" line="13"/>
+        <source>Waiting to aquire GPS location</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="1214"/>
-        <source>OXYGEN</source>
-        <translation>HAPNIK</translation>
+        <location filename="../core/qthelper.cpp" line="766"/>
+        <location filename="../core/qthelper.cpp" line="1275"/>
+        <source>m</source>
+        <translation>m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="59"/>
-        <source>Remove this point</source>
-        <translation>Eemalda punkt</translation>
+        <location filename="../core/qthelper.cpp" line="768"/>
+        <location filename="../core/qthelper.cpp" line="1274"/>
+        <source>ft</source>
+        <translation>jalg</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="32"/>
-        <source>Average</source>
-        <translation>Keskmine</translation>
+        <location filename="../core/qthelper.cpp" line="794"/>
+        <source>C</source>
+        <translation>C</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="35"/>
-        <source>Minimum</source>
-        <translation>Miinimum</translation>
+        <location filename="../core/qthelper.cpp" line="796"/>
+        <source>F</source>
+        <translation>F</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="38"/>
-        <source>Maximum</source>
-        <translation>Maksimum</translation>
+        <location filename="../core/qthelper.cpp" line="821"/>
+        <location filename="../core/qthelper.cpp" line="1250"/>
+        <source>kg</source>
+        <translation>kg</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/globe.cpp" line="327"/>
-        <source>Move the map and double-click to set the dive location</source>
-        <translation>Liigu kaardil soovitud kohta ja märgi topeltklikiga sukeldumiskoht</translation>
+        <location filename="../core/qthelper.cpp" line="823"/>
+        <location filename="../core/qthelper.cpp" line="1251"/>
+        <source>lbs</source>
+        <translation>nael</translation>
     </message>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="28"/>
-        <source>unknown</source>
-        <translation>tundmatu</translation>
+        <location filename="../core/qthelper.cpp" line="848"/>
+        <location filename="../core/qthelper.cpp" line="1300"/>
+        <source>bar</source>
+        <translation>bar</translation>
     </message>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="105"/>
-        <source>h:</source>
-        <translation>h:</translation>
+        <location filename="../core/qthelper.cpp" line="850"/>
+        <location filename="../core/qthelper.cpp" line="1299"/>
+        <source>psi</source>
+        <translation>psi</translation>
     </message>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="105"/>
-        <source>min</source>
-        <translation>min</translation>
+        <location filename="../core/qthelper.cpp" line="871"/>
+        <location filename="../core/qthelper.cpp" line="1235"/>
+        <source>AIR</source>
+        <translation>ÕHK</translation>
     </message>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="337"/>
-        <source>Multiple</source>
+        <location filename="../core/qthelper.cpp" line="873"/>
+        <source>EAN</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="../core/qthelper.cpp" line="957"/>
+        <location filename="../core/qthelper.cpp" line="962"/>
         <source>(%n dive(s))</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="816"/>
-        <location filename="../core/qthelper.cpp" line="1228"/>
-        <source>kg</source>
-        <translation>kg</translation>
+        <location filename="../core/qthelper.cpp" line="1235"/>
+        <source>OXYGEN</source>
+        <translation>HAPNIK</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="818"/>
-        <location filename="../core/qthelper.cpp" line="1229"/>
-        <source>lbs</source>
-        <translation>nael</translation>
+        <location filename="../core/qthelper.cpp" line="1322"/>
+        <source>l</source>
+        <translation>l</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="763"/>
-        <location filename="../core/qthelper.cpp" line="1252"/>
-        <source>ft</source>
-        <translation>jalg</translation>
+        <location filename="../core/qthelper.cpp" line="1323"/>
+        <source>cuft</source>
+        <translation>kuupjalg</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="761"/>
-        <location filename="../core/qthelper.cpp" line="1253"/>
-        <source>m</source>
-        <translation>m</translation>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="29"/>
+        <source>unknown</source>
+        <translation>tundmatu</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="789"/>
-        <source>C</source>
-        <translation>C</translation>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="114"/>
+        <source>h:</source>
+        <translation>h:</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="791"/>
-        <source>F</source>
-        <translation>F</translation>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="114"/>
+        <source>min</source>
+        <translation>min</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="845"/>
-        <location filename="../core/qthelper.cpp" line="1275"/>
-        <source>psi</source>
-        <translation>psi</translation>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="63"/>
+        <source>Remove this point</source>
+        <translation>Eemalda punkt</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="843"/>
-        <location filename="../core/qthelper.cpp" line="1276"/>
-        <source>bar</source>
-        <translation>bar</translation>
+        <location filename="../desktop-widgets/globe.cpp" line="327"/>
+        <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>
     <message>
-        <location filename="../core/qthelper.cpp" line="868"/>
-        <source>EAN</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="32"/>
+        <source>Average</source>
+        <translation>Keskmine</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="1298"/>
-        <source>l</source>
-        <translation>l</translation>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="35"/>
+        <source>Minimum</source>
+        <translation>Miinimum</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="1299"/>
-        <source>cuft</source>
-        <translation>kuupjalg</translation>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="38"/>
+        <source>Maximum</source>
+        <translation>Maksimum</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="625"/>
@@ -7127,17 +7286,12 @@ väärtused</translation>
         <source>Malformed XML response. Line %1: %2</source>
         <translation>Vigane XML vastus. Rida %1: %2</translation>
     </message>
-    <message>
-        <location filename="../core/gpslocation.h" line="13"/>
-        <source>Waiting to aquire GPS location</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>ReadSettingsThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1651"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1676"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1640"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1665"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Omadus ei ole valitud sukeldumiskompuutril veel olemas</translation>
     </message>
@@ -7166,7 +7320,7 @@ väärtused</translation>
 <context>
     <name>ResetSettingsThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1775"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1764"/>
         <source>Reset settings failed!</source>
         <translation type="unfinished"/>
     </message>
@@ -7204,6 +7358,12 @@ väärtused</translation>
 <context>
     <name>ShiftImageTimesDialog</name>
     <message>
+        <location filename="../desktop-widgets/shiftimagetimes.ui" line="23"/>
+        <location filename="../build/ui_shiftimagetimes.h" line="184"/>
+        <source>Shift selected image times</source>
+        <translation>Nihuta valitud piltide ajad</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/shiftimagetimes.ui" line="34"/>
         <location filename="../build/ui_shiftimagetimes.h" line="185"/>
         <source>Shift times of image(s) by</source>
@@ -7216,12 +7376,6 @@ väärtused</translation>
         <translation>t:mm</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/shiftimagetimes.ui" line="23"/>
-        <location filename="../build/ui_shiftimagetimes.h" line="184"/>
-        <source>Shift selected image times</source>
-        <translation>Nihuta valitud piltide ajad</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/shiftimagetimes.ui" line="105"/>
         <location filename="../build/ui_shiftimagetimes.h" line="187"/>
         <source>Earlier</source>
@@ -7271,12 +7425,12 @@ Not all images have timestamps in the range between
         <translation>Mis kuupäev ja kellaaeg on pildil?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="297"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="296"/>
         <source>Open image file</source>
         <translation>Ava pildifail</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="299"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="298"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>Pildifailid  (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -7434,54 +7588,54 @@ Not all images have timestamps in the range between
 <context>
     <name>SocialNetworkDialog</name>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="339"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="284"/>
         <source>Dive date: %1 
 </source>
         <translation>Sukeldumise kuupäev: %1 
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="342"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="287"/>
         <source>Duration: %1 
 </source>
         <translation>Kestus: %1 
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="343"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="288"/>
         <source>h:</source>
         <comment>abbreviation for hours plus separator</comment>
         <translation>h:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="344"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="289"/>
         <source>min</source>
         <comment>abbreviation for minutes</comment>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="347"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="292"/>
         <source>Dive location: %1 
 </source>
         <translation>Sukeldumise asukoht: %1 
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="350"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="295"/>
         <source>Buddy: %1 
 </source>
         <translation>Semu: %1 
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="353"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="298"/>
         <source>Divemaster: %1 
 </source>
         <translation>Divemaster: %1 
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="356"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="301"/>
         <source>
 %1</source>
         <translation>
@@ -7567,9 +7721,20 @@ Not all images have timestamps in the range between
     <name>StartPage</name>
     <message>
         <location filename="../mobile-widgets/qml/StartPage.qml" line="19"/>
-        <source>To use Subsurface-mobile with Subsurface cloud storage, please enteryour cloud credentials.
+        <source>To use Subsurface-mobile with Subsurface cloud storage, please enter your cloud credentials.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/StartPage.qml" line="20"/>
+        <source>If this is the first time you use Subsurface cloud storage, enter a valid email (all lower case) and a password of your choice (letters and numbers). The server will send a PIN to the email address provided that you will have to enter here.
 
-To use Subsurface-mobile only with local data on this device, tap on the no cloud icon below.</source>
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/StartPage.qml" line="23"/>
+        <source>To use Subsurface-mobile only with local data on this device, tap on the no cloud icon below.</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -7608,7 +7773,12 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>SubsurfaceWebServices</name>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="419"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="395"/>
+        <source>Enter User ID and click Download</source>
+        <translation>Sisesta kasutaja ID ja kliki Allalaadimisel</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="417"/>
         <source>Webservice</source>
         <translation>Veebiteenus</translation>
     </message>
@@ -7633,30 +7803,25 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
         <translation>Ühenduse viga:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="557"/>
-        <source>Download successful</source>
-        <translation>Allalaadimine õnnestus</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="551"/>
         <source>Invalid user identifier!</source>
         <translation>Vale kasutaja ID!</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="397"/>
-        <source>Enter User ID and click Download</source>
-        <translation>Sisesta kasutaja ID ja kliki Allalaadimisel</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="554"/>
         <source>Cannot parse response!</source>
         <translation>Ei suuda vastust tuvastada</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="557"/>
+        <source>Download successful</source>
+        <translation>Allalaadimine õnnestus</translation>
+    </message>
 </context>
 <context>
     <name>SuitFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="674"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="672"/>
         <source>Suits: </source>
         <translation>Ülikond:</translation>
     </message>
@@ -7664,7 +7829,7 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>SuitsFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="123"/>
+        <location filename="../qt-models/filtermodels.cpp" line="128"/>
         <source>No suit set</source>
         <translation type="unfinished"/>
     </message>
@@ -7683,7 +7848,7 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>TagFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="595"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="593"/>
         <source>Tags: </source>
         <translation>Märgendid:</translation>
     </message>
@@ -7691,7 +7856,7 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>TagFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="148"/>
+        <location filename="../qt-models/filtermodels.cpp" line="153"/>
         <source>Empty tags</source>
         <translation>Tühjad märgendid</translation>
     </message>
@@ -7717,6 +7882,11 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>TemplateEdit</name>
     <message>
+        <location filename="../desktop-widgets/templateedit.ui" line="14"/>
+        <source>Edit template</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/templateedit.ui" line="37"/>
         <source>Preview</source>
         <translation type="unfinished"/>
@@ -7762,11 +7932,6 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
         <translation>Fondi suurus</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/templateedit.ui" line="14"/>
-        <source>Edit template</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/templateedit.ui" line="165"/>
         <source>Color palette</source>
         <translation type="unfinished"/>
@@ -7948,7 +8113,7 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>TextHyperlinkEventFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="817"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="815"/>
         <source>%1click to visit %2</source>
         <translation type="unfinished"/>
     </message>
@@ -7964,102 +8129,107 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>TripItem</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="67"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="68"/>
         <source>(%1 shown)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="194"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="197"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="215"/>
         <source>Date</source>
         <translation>Kuupäev</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="200"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="218"/>
         <source>Rating</source>
         <translation>Hinne</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
         <source>Depth(%1)</source>
         <translation>Sügavus(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
         <source>ft</source>
         <translation>jalg</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="206"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="224"/>
         <source>Duration</source>
         <translation>Kestus</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="209"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="227"/>
         <source>Temp(%1%2)</source>
         <translation>Temp(%1%2)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
         <source>Weight(%1)</source>
         <translation>Raskus(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
         <source>lbs</source>
         <translation>nael</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="215"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="233"/>
         <source>Suit</source>
         <translation>Ülikond</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="218"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="236"/>
         <source>Cyl</source>
         <translation>Ball</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="239"/>
         <source>Gas</source>
         <translation>Gaas</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="244"/>
         <source>SAC(%1)</source>
         <translation>SAC(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="244"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="229"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="247"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="232"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="250"/>
         <source>Max CNS</source>
         <translation>Max CNS</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="235"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="253"/>
+        <source>Photos before/during/after dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="256"/>
         <source>Location</source>
         <translation>Asukoht</translation>
     </message>
@@ -8082,72 +8252,73 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>UpdateManager</name>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="69"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="61"/>
         <source>Check for updates.</source>
         <translation>Kontrolli kas on uuendusi</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="70"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="62"/>
         <source>Subsurface was unable to check for updates.</source>
         <translation>Subsurface ei saanud uurida uuenduste kohta.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="75"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="67"/>
         <source>The following error occurred:</source>
         <translation>Tekkis järgmine viga:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="76"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="68"/>
         <source>Please check your internet connection.</source>
         <translation>Palun kontrolli oma netiühendust.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="86"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="78"/>
         <source>You are using the latest version of Subsurface.</source>
         <translation>Kasutad kõige uuemat Subsurface versiooni.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="89"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="81"/>
         <source>A new version of Subsurface is available.&lt;br/&gt;Click on:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; to download it.</source>
         <translation>Uuem Subsurface on väljas.&lt;br/&gt;Klikka allalaadimiseks:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt;</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="95"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="87"/>
         <source>A new version of Subsurface is available.</source>
         <translation>Subsurface uuem versioon on väljas.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="96"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="88"/>
         <source>Latest version is %1, please check %2 our download page %3 for information in how to update.</source>
         <translation>Viimane versioon on %1, vaata %2 allalaadimise lehte %3 kuidas uuendada.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="106"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="98"/>
         <source>Newest release version is </source>
         <translation>Uusim versioon on</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="107"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="99"/>
         <source>The server returned the following information:</source>
         <translation>Server saatis järgneva info:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="125"/>
-        <source>Subsurface is checking every two weeks if a new version is available. If you don&apos;t want Subsurface to continue checking, please click Decline.</source>
-        <translation>Subsurface kontrollib iga kahe nädala tagant uue versiooni olemasolu. Kui ei soovi seda kontrolli, vali Loobu.</translation>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="117"/>
+        <source>Subsurface is checking every two weeks if a new version is available. 
+ If you don&apos;t want Subsurface to continue checking, please click Decline.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="126"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="119"/>
         <source>Decline</source>
         <translation>Loobu</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="127"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="120"/>
         <source>Accept</source>
         <translation>Kinnita</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="129"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="122"/>
         <source>Automatic check for updates</source>
         <translation>Automaatne uuenduste kontroll</translation>
     </message>
@@ -8169,24 +8340,6 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>UserSurvey</name>
     <message>
-        <location filename="../desktop-widgets/usersurvey.ui" line="44"/>
-        <location filename="../build/ui_usersurvey.h" line="151"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;We would love to learn more about our users, their preferences and their usage habits. Please spare a minute to fill out this form and submit it to the Subsurface team.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Me sooviksime rohkem teada meie kasutajatest, nende eelistustest ja kasutamise kommetest. Palun leidke minut selle küsitluse täitmiseks ja Subsurface tiimile saatmiseks.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/usersurvey.ui" line="115"/>
-        <location filename="../build/ui_usersurvey.h" line="156"/>
-        <source>Other software/sources</source>
-        <translation>Muu tarkvara/allikad</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/usersurvey.ui" line="128"/>
-        <location filename="../build/ui_usersurvey.h" line="157"/>
-        <source>Manually entering dives</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="14"/>
         <location filename="../build/ui_usersurvey.h" line="149"/>
         <source>User survey</source>
@@ -8199,6 +8352,12 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
         <translation>Subsurface kasutajauuring</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/usersurvey.ui" line="44"/>
+        <location filename="../build/ui_usersurvey.h" line="151"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;We would love to learn more about our users, their preferences and their usage habits. Please spare a minute to fill out this form and submit it to the Subsurface team.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Me sooviksime rohkem teada meie kasutajatest, nende eelistustest ja kasutamise kommetest. Palun leidke minut selle küsitluse täitmiseks ja Subsurface tiimile saatmiseks.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="63"/>
         <location filename="../build/ui_usersurvey.h" line="152"/>
         <source>Technical diver</source>
@@ -8223,6 +8382,18 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
         <translation>Toetatud sukeldumiskompuuter</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/usersurvey.ui" line="115"/>
+        <location filename="../build/ui_usersurvey.h" line="156"/>
+        <source>Other software/sources</source>
+        <translation>Muu tarkvara/allikad</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/usersurvey.ui" line="128"/>
+        <location filename="../build/ui_usersurvey.h" line="157"/>
+        <source>Manually entering dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="141"/>
         <location filename="../build/ui_usersurvey.h" line="158"/>
         <source>Android/iPhone companion app</source>
@@ -8253,6 +8424,11 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/usersurvey.cpp" line="18"/>
+        <source>Send</source>
+        <translation>Saada</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/usersurvey.cpp" line="43"/>
         <source>
 Operating system: %1</source>
@@ -8296,19 +8472,14 @@ Keel: %1</translation>
         <translation>Küsi hiljem</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/usersurvey.cpp" line="101"/>
-        <source>Submit user survey.</source>
-        <translation>Saada kasutusuuring.</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/usersurvey.cpp" line="82"/>
         <source>Ask again?</source>
         <translation>Küsi uuesti?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/usersurvey.cpp" line="18"/>
-        <source>Send</source>
-        <translation>Saada</translation>
+        <location filename="../desktop-widgets/usersurvey.cpp" line="101"/>
+        <source>Submit user survey.</source>
+        <translation>Saada kasutusuuring.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/usersurvey.cpp" line="102"/>
@@ -8400,12 +8571,12 @@ Keel: %1</translation>
         <translation>Üleslaadimine</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="324"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="325"/>
         <source>Operation timed out</source>
         <translation>Toiming aegus</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="345"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="346"/>
         <source>Transferring data...</source>
         <translation>Andmete ülekanne...</translation>
     </message>
@@ -8440,18 +8611,18 @@ Keel: %1</translation>
 <context>
     <name>WriteSettingsThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1702"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1709"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1718"/>
-        <source>Failed!</source>
-        <translation>Ebaõnnestus!</translation>
-    </message>
-    <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1700"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1721"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1689"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1710"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Omadus ei ole valitud sukeldumiskompuutril veel olemas.</translation>
     </message>
+    <message>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1691"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1698"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1707"/>
+        <source>Failed!</source>
+        <translation>Ebaõnnestus!</translation>
+    </message>
 </context>
 <context>
     <name>YearlyStatisticsModel</name>
@@ -8576,7 +8747,7 @@ Max</translation>
 <context>
     <name>getextFromC</name>
     <message>
-        <location filename="../core/libdivecomputer.c" line="674"/>
+        <location filename="../core/libdivecomputer.c" line="737"/>
         <source>Error parsing the header</source>
         <translation type="unfinished"/>
     </message>
@@ -8584,38 +8755,377 @@ Max</translation>
 <context>
     <name>gettextFromC</name>
     <message>
+        <location filename="../core/cochran.c" line="309"/>
+        <location filename="../core/cochran.c" line="315"/>
+        <location filename="../core/cochran.c" line="385"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>deco stop</source>
+        <translation>dekopeatus</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="336"/>
+        <location filename="../core/cochran.c" line="390"/>
+        <location filename="../core/file.c" line="777"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>ascent</source>
+        <translation>tõus</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="342"/>
+        <location filename="../core/file.c" line="755"/>
+        <source>battery</source>
+        <translation>patarei</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="348"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
+        <source>OLF</source>
+        <translation>Hapnikulimiidi osa (OLF)</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="353"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
+        <source>maxdepth</source>
+        <translation>max sügavus</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="358"/>
+        <location filename="../core/cochran.c" line="404"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
+        <source>pO₂</source>
+        <translation>pO₂</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="365"/>
+        <location filename="../core/cochran.c" line="414"/>
+        <location filename="../core/cochran.c" line="421"/>
+        <location filename="../core/file.c" line="868"/>
+        <location filename="../core/libdivecomputer.c" line="225"/>
+        <location filename="../core/libdivecomputer.c" line="228"/>
+        <source>gaschange</source>
+        <translation>gaasivahetus</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="370"/>
+        <location filename="../core/cochran.c" line="409"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>rbt</source>
+        <translation>rbt</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="379"/>
+        <location filename="../core/cochran.c" line="426"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>ceiling</source>
+        <translation>lagi</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="395"/>
+        <location filename="../core/libdivecomputer.c" line="224"/>
+        <source>transmitter</source>
+        <translation>saatja</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="153"/>
+        <source>Error: the file does not appear to be a DATATRAK divelog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="286"/>
+        <source>clear</source>
+        <translation>selge</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="289"/>
+        <source>misty</source>
+        <translation>vine</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="292"/>
+        <source>fog</source>
+        <translation>udu</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="295"/>
+        <source>rain</source>
+        <translation>vihm</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="298"/>
+        <source>storm</source>
+        <translation>torm</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="301"/>
+        <source>snow</source>
+        <translation>lumi</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="321"/>
+        <source>No suit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="324"/>
+        <source>Shorty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="327"/>
+        <source>Combi</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="330"/>
+        <source>Wet suit</source>
+        <translation>Märg ülikond</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="333"/>
+        <source>Semidry suit</source>
+        <translation>Poolkuiv ülikond</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="336"/>
+        <source>Dry suit</source>
+        <translation>Kuiv ülikond</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="396"/>
+        <source>no stop</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="398"/>
+        <location filename="../core/dive.c" line="29"/>
+        <source>deco</source>
+        <translation>deko</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="400"/>
+        <source>single ascent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="402"/>
+        <source>multiple ascent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="404"/>
+        <location filename="../core/dive.c" line="27"/>
+        <source>fresh</source>
+        <translation>magevesi</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="406"/>
+        <source>salt water</source>
+        <translation>soolane vesi</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="431"/>
+        <source>sight seeing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="433"/>
+        <source>club dive</source>
+        <translation>Klubisukeldumine</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="435"/>
+        <location filename="../core/dive.c" line="28"/>
+        <source>instructor</source>
+        <translation>instruktor</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="437"/>
+        <source>instruction</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="439"/>
+        <location filename="../core/dive.c" line="27"/>
+        <source>night</source>
+        <translation>öö</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="441"/>
+        <location filename="../core/dive.c" line="25"/>
+        <source>cave</source>
+        <translation>koobas</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="443"/>
+        <location filename="../core/dive.c" line="24"/>
+        <source>ice</source>
+        <translation>jää</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="445"/>
+        <source>search</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="455"/>
+        <location filename="../core/dive.c" line="25"/>
+        <source>wreck</source>
+        <translation>vrakk</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="457"/>
+        <location filename="../core/dive.c" line="26"/>
+        <source>river</source>
+        <translation>jõgi</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="459"/>
+        <location filename="../core/dive.c" line="23"/>
+        <source>drift</source>
+        <translation>hoovus</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="461"/>
+        <location filename="../core/dive.c" line="28"/>
+        <source>photo</source>
+        <translation>foto</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="463"/>
+        <source>other</source>
+        <translation>muu</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="474"/>
+        <source>Other activities</source>
+        <translation>Muu tegevus</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="498"/>
+        <source>Datatrak/Wlog notes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="537"/>
+        <source>Manually entered dive</source>
+        <translation>Käsitsi sisestatud sukeldumine</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="588"/>
+        <source>Unknown</source>
+        <translation>Tundmatu</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="674"/>
+        <source>Error: couldn&apos;t open the file %s</source>
+        <translation>Viga: ei suuda avada faili %s</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="687"/>
+        <source>Error: no dive</source>
+        <translation>Viga: pole sukeldumisi</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="23"/>
+        <source>boat</source>
+        <translation>paat</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="23"/>
+        <source>shore</source>
+        <translation>kallas</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="24"/>
+        <source>deep</source>
+        <translation>sügav</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="24"/>
+        <source>cavern</source>
+        <translation>õõs</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="25"/>
+        <source>altitude</source>
+        <translation>kõrgus</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="26"/>
+        <source>pool</source>
+        <translation>bassein</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="26"/>
+        <source>lake</source>
+        <translation>järv</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="27"/>
+        <source>student</source>
+        <translation>õpilane</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="28"/>
+        <source>video</source>
+        <translation>video</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="33"/>
+        <source>OC-gas</source>
+        <translation>avatud süsteemi gaas</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="33"/>
+        <source>diluent</source>
+        <translation>vedeldi</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="33"/>
+        <location filename="../core/equipment.c" line="88"/>
+        <location filename="../core/planner.c" line="1436"/>
+        <location filename="../core/planner.c" line="1439"/>
+        <source>oxygen</source>
+        <translation>hapnik</translation>
+    </message>
+    <message>
         <location filename="../core/dive.c" line="181"/>
         <source>pascal</source>
         <translation>paskal</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="186"/>
-        <location filename="../core/qthelper.cpp" line="669"/>
+        <location filename="../core/qthelper.cpp" line="674"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="190"/>
-        <location filename="../core/qthelper.cpp" line="672"/>
+        <location filename="../core/qthelper.cpp" line="677"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
+        <location filename="../core/dive.c" line="227"/>
+        <source>ℓ</source>
+        <translation>ℓ</translation>
+    </message>
+    <message>
         <location filename="../core/dive.c" line="232"/>
         <source>cuft</source>
         <translation>kuupjalg</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="269"/>
-        <location filename="../core/qthelper.cpp" line="590"/>
-        <location filename="../core/qthelper.cpp" line="605"/>
+        <location filename="../core/qthelper.cpp" line="595"/>
+        <location filename="../core/qthelper.cpp" line="610"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="274"/>
-        <location filename="../core/qthelper.cpp" line="593"/>
-        <location filename="../core/qthelper.cpp" line="607"/>
+        <location filename="../core/qthelper.cpp" line="598"/>
+        <location filename="../core/qthelper.cpp" line="612"/>
         <source>ft</source>
         <translation>jalg</translation>
     </message>
@@ -8641,53 +9151,58 @@ Max</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="325"/>
-        <location filename="../core/qthelper.cpp" line="616"/>
-        <location filename="../core/qthelper.cpp" line="626"/>
+        <location filename="../core/qthelper.cpp" line="621"/>
+        <location filename="../core/qthelper.cpp" line="631"/>
         <source>lbs</source>
         <translation>nael</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="329"/>
-        <location filename="../core/qthelper.cpp" line="614"/>
-        <location filename="../core/qthelper.cpp" line="624"/>
+        <location filename="../core/qthelper.cpp" line="619"/>
+        <location filename="../core/qthelper.cpp" line="629"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="1772"/>
+        <location filename="../core/dive.c" line="1751"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) või (%s)</translation>
     </message>
     <message>
-        <location filename="../core/divelist.c" line="484"/>
+        <location filename="../core/divelist.c" line="487"/>
         <location filename="../core/equipment.c" line="84"/>
-        <location filename="../core/planner.c" line="1411"/>
-        <location filename="../core/planner.c" line="1414"/>
+        <location filename="../core/planner.c" line="1432"/>
+        <location filename="../core/planner.c" line="1435"/>
         <source>air</source>
         <translation>õhk</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="197"/>
+        <location filename="../core/equipment.c" line="86"/>
+        <source>EAN%d</source>
+        <translation>EAN%d</translation>
+    </message>
+    <message>
+        <location filename="../core/equipment.c" line="198"/>
         <source>integrated</source>
         <translation>integreeritud</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="198"/>
+        <location filename="../core/equipment.c" line="199"/>
         <source>belt</source>
         <translation>vöö</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="199"/>
+        <location filename="../core/equipment.c" line="200"/>
         <source>ankle</source>
         <translation>pahkluu</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="200"/>
+        <location filename="../core/equipment.c" line="201"/>
         <source>backplate weight</source>
         <translation>seljaplaadi kaal</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="201"/>
+        <location filename="../core/equipment.c" line="202"/>
         <source>clip-on</source>
         <translation>külgeriputatav</translation>
     </message>
@@ -8700,8 +9215,8 @@ Max</translation>
         <location filename="../core/file.c" line="121"/>
         <location filename="../core/file.c" line="512"/>
         <location filename="../core/file.c" line="597"/>
-        <location filename="../core/file.c" line="924"/>
-        <location filename="../core/file.c" line="1056"/>
+        <location filename="../core/file.c" line="909"/>
+        <location filename="../core/file.c" line="1092"/>
         <location filename="../core/ostctools.c" line="80"/>
         <source>Failed to read &apos;%s&apos;</source>
         <translation>&apos;%s&apos; lugemine ebaõnnestus</translation>
@@ -8759,485 +9274,494 @@ Max</translation>
         <translation>O₂ kalibreerimine</translation>
     </message>
     <message>
-        <location filename="../core/file.c" line="887"/>
-        <source>No matching DC found for file &apos;%s&apos;</source>
+        <location filename="../core/git-access.c" line="134"/>
+        <source>Local cache directory %s corrupted - can&apos;t sync with Subsurface cloud storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>none</source>
-        <translation>mitte ükski</translation>
+        <location filename="../core/git-access.c" line="157"/>
+        <location filename="../core/git-access.c" line="177"/>
+        <source>Could not update local cache to newer remote data</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="309"/>
-        <location filename="../core/cochran.c" line="315"/>
-        <location filename="../core/cochran.c" line="385"/>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>deco stop</source>
-        <translation>dekopeatus</translation>
+        <location filename="../core/git-access.c" line="170"/>
+        <source>Subsurface cloud storage corrupted</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="342"/>
-        <location filename="../core/file.c" line="755"/>
-        <source>battery</source>
-        <translation>patarei</translation>
+        <location filename="../core/git-access.c" line="284"/>
+        <source>Could not update Subsurface cloud storage, try again later</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="370"/>
-        <location filename="../core/cochran.c" line="409"/>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>rbt</source>
-        <translation>rbt</translation>
+        <location filename="../core/git-access.c" line="344"/>
+        <source>Remote storage and local data diverged. Error: merge failed (%s)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="336"/>
-        <location filename="../core/cochran.c" line="390"/>
-        <location filename="../core/file.c" line="777"/>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>ascent</source>
-        <translation>tõus</translation>
+        <location filename="../core/git-access.c" line="374"/>
+        <source>Remote storage and local data diverged. Cannot combine local and remote changes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="379"/>
-        <location filename="../core/cochran.c" line="426"/>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>ceiling</source>
-        <translation>lagi</translation>
+        <location filename="../core/git-access.c" line="408"/>
+        <source>Remote storage and local data diverged</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>workload</source>
-        <translation>töökoormus</translation>
+        <location filename="../core/git-access.c" line="411"/>
+        <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="395"/>
-        <location filename="../core/libdivecomputer.c" line="203"/>
-        <source>transmitter</source>
-        <translation>saatja</translation>
+        <location filename="../core/git-access.c" line="420"/>
+        <source>Problems with local cache of Subsurface cloud data</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="203"/>
+        <location filename="../core/git-access.c" line="421"/>
+        <source>Moved cache data to %s. Please try the operation again.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/git-access.c" line="743"/>
+        <source>Error connecting to Subsurface cloud storage</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/git-access.c" line="746"/>
+        <source>git clone of %s failed (%s)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="210"/>
+        <location filename="../core/parse-xml.c" line="3317"/>
+        <location filename="../core/uemis-downloader.c" line="134"/>
+        <source>unknown</source>
+        <translation>tundmatu</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>none</source>
+        <translation>mitte ükski</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>workload</source>
+        <translation>töökoormus</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="224"/>
         <source>violation</source>
         <translation>rikkumine</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="203"/>
+        <location filename="../core/libdivecomputer.c" line="224"/>
         <source>bookmark</source>
         <translation>järjehoidja</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="203"/>
+        <location filename="../core/libdivecomputer.c" line="224"/>
         <source>surface</source>
         <translation>pind</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="203"/>
+        <location filename="../core/libdivecomputer.c" line="224"/>
         <source>safety stop</source>
         <translation>ohutuspeatus</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="365"/>
-        <location filename="../core/cochran.c" line="414"/>
-        <location filename="../core/cochran.c" line="421"/>
-        <location filename="../core/file.c" line="868"/>
-        <location filename="../core/libdivecomputer.c" line="204"/>
-        <location filename="../core/libdivecomputer.c" line="207"/>
-        <source>gaschange</source>
-        <translation>gaasivahetus</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="204"/>
+        <location filename="../core/libdivecomputer.c" line="225"/>
         <source>safety stop (voluntary)</source>
         <translation>ohutuspeatus (vabatahtlik)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="204"/>
+        <location filename="../core/libdivecomputer.c" line="225"/>
         <source>safety stop (mandatory)</source>
         <translation>ohutuspeatus (kohustuslik)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="205"/>
+        <location filename="../core/libdivecomputer.c" line="226"/>
         <source>deepstop</source>
         <translation>sügavpeatus</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="205"/>
+        <location filename="../core/libdivecomputer.c" line="226"/>
         <source>ceiling (safety stop)</source>
         <translation>lagi (ohutuspeatus)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="205"/>
-        <source>divetime</source>
-        <translation>põhjaaeg</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="205"/>
+        <location filename="../core/libdivecomputer.c" line="226"/>
         <source>below floor</source>
         <comment>event showing dive is below deco floor and adding deco time</comment>
         <translation>allpool taset</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="353"/>
-        <location filename="../core/libdivecomputer.c" line="206"/>
-        <source>maxdepth</source>
-        <translation>max sügavus</translation>
-    </message>
-    <message>
-        <location filename="../core/cochran.c" line="348"/>
-        <location filename="../core/libdivecomputer.c" line="206"/>
-        <source>OLF</source>
-        <translation>Hapnikulimiidi osa (OLF)</translation>
+        <location filename="../core/libdivecomputer.c" line="226"/>
+        <source>divetime</source>
+        <translation>põhjaaeg</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="206"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
         <source>airtime</source>
         <translation>aeg õhuga</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="206"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
         <source>rgbm</source>
         <translation>rgbm</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="206"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
         <source>heading</source>
         <translation>suund</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="358"/>
-        <location filename="../core/cochran.c" line="404"/>
-        <location filename="../core/libdivecomputer.c" line="206"/>
-        <source>pO₂</source>
-        <translation>pO₂</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="207"/>
+        <location filename="../core/libdivecomputer.c" line="228"/>
         <source>tissue level warning</source>
         <translation>koe taseme hoiatus</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="207"/>
+        <location filename="../core/libdivecomputer.c" line="228"/>
         <source>non stop time</source>
         <translation>mittepeatuste aeg</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="224"/>
+        <location filename="../core/libdivecomputer.c" line="237"/>
         <source>invalid event number</source>
         <translation>vale sündmuse nr</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="658"/>
-        <source>Unable to create parser for %s %s</source>
-        <translation>Ei saa luua parserit %s %s jaoks</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="664"/>
-        <source>Error registering the data</source>
-        <translation>Viga andmete registreerimisel</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="495"/>
+        <location filename="../core/libdivecomputer.c" line="553"/>
         <source>Error parsing the datetime</source>
         <translation>Viga kuupäeva ja aja tuvastamisel</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="513"/>
+        <location filename="../core/libdivecomputer.c" line="571"/>
         <source>Dive %d: %s</source>
         <translation>Sukeldumine %d: %s</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="519"/>
+        <location filename="../core/libdivecomputer.c" line="577"/>
         <source>Error parsing the divetime</source>
         <translation>Viga põhjaaja tuvastamisel</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="529"/>
+        <location filename="../core/libdivecomputer.c" line="587"/>
         <source>Error parsing the maxdepth</source>
         <translation>Viga max sügavuse tuvastamisel</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="548"/>
+        <location filename="../core/libdivecomputer.c" line="606"/>
         <source>Error parsing temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="568"/>
+        <location filename="../core/libdivecomputer.c" line="626"/>
         <source>Error parsing the gas mix count</source>
         <translation>Viga gaasisegude arvu tuvastamisel</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="580"/>
+        <location filename="../core/libdivecomputer.c" line="638"/>
         <source>Error obtaining water salinity</source>
         <translation>Viga vee soolsuse saamisel</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="589"/>
+        <location filename="../core/libdivecomputer.c" line="647"/>
         <source>Error obtaining surface pressure</source>
         <translation>Viga pinnarõhu saamisel</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="614"/>
+        <location filename="../core/libdivecomputer.c" line="672"/>
         <source>Error obtaining divemode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="634"/>
+        <location filename="../core/libdivecomputer.c" line="692"/>
         <source>Error parsing the gas mix</source>
         <translation>Viga gaasisegu tuvastamisel</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="684"/>
+        <location filename="../core/libdivecomputer.c" line="717"/>
+        <source>Unable to create parser for %s %s</source>
+        <translation>Ei saa luua parserit %s %s jaoks</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="723"/>
+        <source>Error registering the data</source>
+        <translation>Viga andmete registreerimisel</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="744"/>
         <source>Error parsing the samples</source>
         <translation>Viga proovide tuvastamisel</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="822"/>
+        <location filename="../core/libdivecomputer.c" line="882"/>
         <source>Event: waiting for user action</source>
         <translation>Sündmus: ootan kasutaja sekkumist</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="830"/>
+        <location filename="../core/libdivecomputer.c" line="890"/>
         <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="../core/libdivecomputer.c" line="894"/>
+        <location filename="../core/libdivecomputer.c" line="954"/>
         <source>Error registering the event handler.</source>
         <translation>Viga sündmuste draiveri registreerimisel.</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="899"/>
+        <location filename="../core/libdivecomputer.c" line="959"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Viga tühistamise draiveri registreerimisel</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="920"/>
+        <location filename="../core/libdivecomputer.c" line="980"/>
         <source>Dive data import error</source>
         <translation>Viga sukeldumise andmete impordil</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="959"/>
+        <location filename="../core/libdivecomputer.c" line="1019"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Ei saa luua libdivecomputer konteksti</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="966"/>
+        <location filename="../core/libdivecomputer.c" line="1026"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Ei saa avada %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="992"/>
+        <location filename="../core/libdivecomputer.c" line="1048"/>
         <source>Insufficient privileges to open the device %s %s (%s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/parse-xml.c" line="517"/>
-        <source>Strange percentage reading %s
+        <location filename="../core/load-git.c" line="194"/>
+        <location filename="../core/parse-xml.c" line="1242"/>
+        <source>multiple GPS locations for this dive site; also %s
 </source>
-        <translation>Imelik protsendilugem %s
-</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/load-git.c" line="194"/>
-        <location filename="../core/parse-xml.c" line="1238"/>
-        <source>multiple GPS locations for this dive site; also %s
+        <location filename="../core/load-git.c" line="222"/>
+        <location filename="../core/parse-xml.c" line="1304"/>
+        <source>additional name for site: %s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/parse-xml.c" line="2044"/>
+        <location filename="../core/ostctools.c" line="120"/>
+        <location filename="../core/ostctools.c" line="152"/>
+        <source>Unknown DC in dive %d</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/ostctools.c" line="165"/>
+        <source>Error - %s - parsing dive %d</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/parse-xml.c" line="517"/>
+        <source>Strange percentage reading %s
+</source>
+        <translation>Imelik protsendilugem %s
+</translation>
+    </message>
+    <message>
+        <location filename="../core/parse-xml.c" line="2051"/>
         <source>Failed to parse &apos;%s&apos;</source>
         <translation>&apos;%s&apos; tuvastamine ebaõnnestus</translation>
     </message>
     <message>
-        <location filename="../core/parse-xml.c" line="3741"/>
+        <location filename="../core/parse-xml.c" line="3774"/>
         <source>Can&apos;t open stylesheet %s</source>
         <translation>Ei suuda avada stiililehte %s</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="86"/>
-        <source>EAN%d</source>
-        <translation>EAN%d</translation>
+        <location filename="../core/planner.c" line="555"/>
+        <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE %s ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="1032"/>
-        <location filename="../core/planner.c" line="1184"/>
-        <source>Can&apos;t find gas %s</source>
-        <translation>Ei leia gaasi %s</translation>
+        <location filename="../core/planner.c" line="569"/>
+        <source>Decompression calculation aborted due to excessive time</source>
+        <translation>Dekompressiooni arvutamine katkestatud liigse ajakulu tõttu</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="368"/>
-        <source>Too many gas mixes</source>
-        <translation>Liiga palju gaasisegusid</translation>
+        <location filename="../core/planner.c" line="571"/>
+        <location filename="../core/planner.c" line="829"/>
+        <location filename="../core/planner.c" line="834"/>
+        <location filename="../core/planner.c" line="860"/>
+        <location filename="../core/planner.c" line="870"/>
+        <source>Warning:</source>
+        <translation>Hoiatus:</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="568"/>
-        <source>Decompression calculation aborted due to excessive time</source>
-        <translation>Dekompressiooni arvutamine katkestatud liigse ajakulu tõttu</translation>
+        <location filename="../core/planner.c" line="581"/>
+        <source>based on Bühlmann ZHL-16C with GFlow = %d and GFhigh = %d</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="586"/>
+        <source>based on VPM-B at nominal conservatism</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="588"/>
+        <source>based on VPM-B at +%d conservatism</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="590"/>
+        <source>, effective GF=%d/%d</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="594"/>
+        <source>recreational mode based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="592"/>
+        <location filename="../core/planner.c" line="598"/>
         <source>Subsurface dive plan</source>
         <translation>Subsurface sukeldumise plaan</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="596"/>
-        <source>depth</source>
-        <translation>sügavus</translation>
+        <location filename="../core/planner.c" line="599"/>
+        <source>&lt;div&gt;Runtime: %dmin&lt;/div&gt;&lt;br&gt;</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="602"/>
-        <source>runtime</source>
-        <translation>jooksev aeg</translation>
+        <location filename="../core/planner.c" line="604"/>
+        <source>depth</source>
+        <translation>sügavus</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="599"/>
+        <location filename="../core/planner.c" line="607"/>
         <source>duration</source>
         <translation>kestus</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="554"/>
-        <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE %s ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source>
-        <translation type="unfinished"/>
+        <location filename="../core/planner.c" line="610"/>
+        <source>runtime</source>
+        <translation>jooksev aeg</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="605"/>
+        <location filename="../core/planner.c" line="613"/>
         <source>gas</source>
         <translation>gaas</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="648"/>
+        <location filename="../core/planner.c" line="656"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="656"/>
+        <location filename="../core/planner.c" line="664"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source>
         <translation>Üleminek %.*f %s-le %d:%02d min jooksul - jooksev aeg %d:%02u %s peal</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="669"/>
+        <location filename="../core/planner.c" line="677"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="676"/>
+        <location filename="../core/planner.c" line="684"/>
         <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 %s peal</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="721"/>
+        <location filename="../core/planner.c" line="729"/>
         <source>%3.0f%s</source>
         <translation>%3.0f%s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="724"/>
-        <location filename="../core/planner.c" line="728"/>
+        <location filename="../core/planner.c" line="732"/>
+        <location filename="../core/planner.c" line="736"/>
         <source>%3dmin</source>
         <translation>%3dmin</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="737"/>
-        <location filename="../core/planner.c" line="749"/>
+        <location filename="../core/planner.c" line="745"/>
+        <location filename="../core/planner.c" line="757"/>
         <source>(SP = %.1fbar)</source>
         <translation>(SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="772"/>
+        <location filename="../core/planner.c" line="780"/>
         <source>Switch gas to %s (SP = %.1fbar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="774"/>
+        <location filename="../core/planner.c" line="782"/>
         <source>Switch gas to %s</source>
         <translation>Vaheta gaasiks %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="793"/>
+        <location filename="../core/planner.c" line="801"/>
         <source>CNS</source>
         <translation>CNS</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="795"/>
+        <location filename="../core/planner.c" line="803"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="799"/>
+        <location filename="../core/planner.c" line="807"/>
         <source>Gas consumption (CCR legs excluded):</source>
         <translation>Gaasikulu (CCR lõigud välja arvatud):</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="801"/>
+        <location filename="../core/planner.c" line="809"/>
         <source>Gas consumption:</source>
         <translation>Gaasi tarbimine:</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="570"/>
-        <location filename="../core/planner.c" line="821"/>
-        <location filename="../core/planner.c" line="826"/>
-        <location filename="../core/planner.c" line="851"/>
-        <location filename="../core/planner.c" line="861"/>
-        <source>Warning:</source>
-        <translation>Hoiatus:</translation>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="580"/>
-        <source>based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="584"/>
-        <source>based on VPM-B at nominal conservatism</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="586"/>
-        <source>based on VPM-B at +%d conservatism</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="588"/>
-        <source>recreational mode based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="822"/>
+        <location filename="../core/planner.c" line="830"/>
         <source>this is more gas than available in the specified cylinder!</source>
         <translation>gaasi hulk on suurem kui määratud balloonis võimalik!</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="827"/>
+        <location filename="../core/planner.c" line="835"/>
         <source>not enough reserve for gas sharing on ascent!</source>
         <translation>pole piisavalt reservi gaasi jagamiseks tõusul!</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="829"/>
+        <location filename="../core/planner.c" line="837"/>
         <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source>
         <translation>%.0f%s/%.0f%s %s-st (%.0f%s/%.0f%s planeeritud tõusul)</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="831"/>
+        <location filename="../core/planner.c" line="839"/>
         <source>%.0f%s (%.0f%s during planned ascent) of %s</source>
         <translation>%.0f%s (%.0f%s planeeritud tõusu jooksul) %s-st</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="848"/>
+        <location filename="../core/planner.c" line="857"/>
         <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
         <translation>kõrge pO₂ väärtus %.2f %d:%02u peal gaasiga %s sügavusel %.*f %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="858"/>
+        <location filename="../core/planner.c" line="867"/>
         <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="1419"/>
+        <location filename="../core/planner.c" line="1194"/>
+        <source>Can&apos;t find gas %s</source>
+        <translation>Ei leia gaasi %s</translation>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="1440"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1280"/>
+        <location filename="../core/profile.c" line="1298"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
@@ -9246,70 +9770,70 @@ D: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1283"/>
+        <location filename="../core/profile.c" line="1301"/>
         <source>P: %d%s
 </source>
         <translation>P: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1287"/>
+        <location filename="../core/profile.c" line="1305"/>
         <source>T: %.1f%s
 </source>
         <translation>T: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1293"/>
+        <location filename="../core/profile.c" line="1311"/>
         <source>V: %.1f%s
 </source>
         <translation>V: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1296"/>
+        <location filename="../core/profile.c" line="1314"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation>SAC: %.*f%s/min
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1298"/>
+        <location filename="../core/profile.c" line="1316"/>
         <source>CNS: %u%%
 </source>
         <translation>CNS: %u%%
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1300"/>
+        <location filename="../core/profile.c" line="1318"/>
         <source>pO%s: %.2fbar
 </source>
         <translation>pO%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1302"/>
+        <location filename="../core/profile.c" line="1320"/>
         <source>pN%s: %.2fbar
 </source>
         <translation>pN%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1304"/>
+        <location filename="../core/profile.c" line="1322"/>
         <source>pHe: %.2fbar
 </source>
         <translation>pHe: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1307"/>
+        <location filename="../core/profile.c" line="1325"/>
         <source>MOD: %d%s
 </source>
         <translation>MOD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1314"/>
+        <location filename="../core/profile.c" line="1332"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
@@ -9318,7 +9842,7 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1318"/>
+        <location filename="../core/profile.c" line="1336"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
@@ -9327,165 +9851,170 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1331"/>
+        <location filename="../core/profile.c" line="1349"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation>Ohutuspeatus: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1334"/>
+        <location filename="../core/profile.c" line="1352"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation>Ohutuspeatus: teadmata aeg @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1339"/>
+        <location filename="../core/profile.c" line="1357"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation>Deko: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1342"/>
+        <location filename="../core/profile.c" line="1360"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation>Deko: teadmata aeg @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1346"/>
+        <location filename="../core/profile.c" line="1364"/>
         <source>In deco
 </source>
         <translation>Dekos
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1348"/>
+        <location filename="../core/profile.c" line="1366"/>
         <source>NDL: %umin
 </source>
         <translation>NDL: %umin
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1351"/>
+        <location filename="../core/profile.c" line="1369"/>
         <source>TTS: %umin
 </source>
         <translation>TTS: %umin
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1354"/>
+        <location filename="../core/profile.c" line="1372"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation>Deko: %umin @ %.0f%s (arvutatud)</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1362"/>
+        <location filename="../core/profile.c" line="1380"/>
         <source>In deco (calc)
 </source>
         <translation>Dekos (arvutatud)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1365"/>
+        <location filename="../core/profile.c" line="1383"/>
         <source>NDL: %umin (calc)
 </source>
         <translation>NDL: %umin (arvutatud)</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1367"/>
+        <location filename="../core/profile.c" line="1385"/>
         <source>NDL: &gt;2h (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1371"/>
+        <location filename="../core/profile.c" line="1389"/>
         <source>TTS: %umin (calc)
 </source>
         <translation>TTS: %umin (arvutatud)</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1373"/>
+        <location filename="../core/profile.c" line="1391"/>
         <source>TTS: &gt;2h (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1376"/>
+        <location filename="../core/profile.c" line="1394"/>
         <source>RBT: %umin
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1379"/>
+        <location filename="../core/profile.c" line="1397"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation>Arvutatud lagi %.0f%s</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1385"/>
+        <location filename="../core/profile.c" line="1403"/>
         <source>Tissue %.0fmin: %.1f%s
 </source>
         <translation>Kude %.0fmin: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1391"/>
+        <location filename="../core/profile.c" line="1409"/>
         <source>heartbeat: %d
 </source>
         <translation>Pulss: %d
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1393"/>
+        <location filename="../core/profile.c" line="1411"/>
         <source>bearing: %d
 </source>
         <translation>Kurss: %d
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1396"/>
+        <location filename="../core/profile.c" line="1414"/>
         <source>mean depth to here %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1491"/>
+        <location filename="../core/profile.c" line="1515"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1495"/>
-        <location filename="../core/profile.c" line="1499"/>
-        <location filename="../core/profile.c" line="1503"/>
+        <location filename="../core/profile.c" line="1519"/>
+        <location filename="../core/profile.c" line="1523"/>
+        <location filename="../core/profile.c" line="1527"/>
         <source>%s %sD:%.1f%s</source>
         <translation>%s %sD:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1507"/>
+        <location filename="../core/profile.c" line="1531"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sD:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1511"/>
+        <location filename="../core/profile.c" line="1535"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1515"/>
-        <location filename="../core/profile.c" line="1519"/>
+        <location filename="../core/profile.c" line="1539"/>
+        <location filename="../core/profile.c" line="1543"/>
         <source>%s %sV:%.2f%s</source>
         <translation>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1526"/>
+        <location filename="../core/profile.c" line="1550"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s</translation>
     </message>
     <message>
+        <location filename="../core/profile.c" line="1575"/>
+        <source>%s SAC:%.*f %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../core/qthelper.cpp" line="67"/>
         <source>%1km</source>
         <translation>%1km</translation>
@@ -9506,446 +10035,460 @@ EADD: %d%s
         <translation>%1jard</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="635"/>
+        <location filename="../core/qthelper.cpp" line="91"/>
+        <location filename="../core/qthelper.cpp" line="226"/>
+        <source>N</source>
+        <translation>N</translation>
+    </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="91"/>
+        <location filename="../core/qthelper.cpp" line="227"/>
+        <source>S</source>
+        <translation>S</translation>
+    </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="92"/>
+        <location filename="../core/qthelper.cpp" line="228"/>
+        <source>E</source>
+        <translation>E</translation>
+    </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="92"/>
+        <location filename="../core/qthelper.cpp" line="229"/>
+        <source>W</source>
+        <translation>W</translation>
+    </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="640"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="638"/>
+        <location filename="../core/qthelper.cpp" line="643"/>
         <source>F</source>
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="23"/>
-        <source>boat</source>
-        <translation>paat</translation>
+        <location filename="../core/save-html.c" line="469"/>
+        <location filename="../core/save-html.c" line="553"/>
+        <location filename="../core/worldmap-save.c" line="111"/>
+        <source>Can&apos;t open file %s</source>
+        <translation>Ei saa avada faili %s</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="23"/>
-        <source>shore</source>
-        <translation>kallas</translation>
+        <location filename="../core/save-html.c" line="488"/>
+        <source>Number</source>
+        <translation>Number</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="459"/>
-        <location filename="../core/dive.c" line="23"/>
-        <source>drift</source>
-        <translation>hoovus</translation>
+        <location filename="../core/save-html.c" line="489"/>
+        <source>Date</source>
+        <translation>Kuupäev</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="24"/>
-        <source>deep</source>
-        <translation>sügav</translation>
+        <location filename="../core/save-html.c" line="490"/>
+        <source>Time</source>
+        <translation>Aeg</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="24"/>
-        <source>cavern</source>
-        <translation>õõs</translation>
+        <location filename="../core/save-html.c" line="491"/>
+        <source>Location</source>
+        <translation>Asukoht</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="443"/>
-        <location filename="../core/dive.c" line="24"/>
-        <source>ice</source>
-        <translation>jää</translation>
+        <location filename="../core/save-html.c" line="492"/>
+        <source>Air temp.</source>
+        <translation>Õhu temp.</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="445"/>
-        <source>search</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="493"/>
+        <source>Water temp.</source>
+        <translation>Vee temp.</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="455"/>
-        <location filename="../core/dive.c" line="25"/>
-        <source>wreck</source>
-        <translation>vrakk</translation>
+        <location filename="../core/save-html.c" line="494"/>
+        <source>Dives</source>
+        <translation>Sukeldumisi kokku</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="441"/>
-        <location filename="../core/dive.c" line="25"/>
-        <source>cave</source>
-        <translation>koobas</translation>
+        <location filename="../core/save-html.c" line="495"/>
+        <source>Expand all</source>
+        <translation>Laienda kõik</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="25"/>
-        <source>altitude</source>
-        <translation>kõrgus</translation>
+        <location filename="../core/save-html.c" line="496"/>
+        <source>Collapse all</source>
+        <translation>Ahenda kõik kokku</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="26"/>
-        <source>pool</source>
-        <translation>bassein</translation>
+        <location filename="../core/save-html.c" line="497"/>
+        <source>Trips</source>
+        <translation>Väljasõidud</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="26"/>
-        <source>lake</source>
-        <translation>järv</translation>
+        <location filename="../core/save-html.c" line="498"/>
+        <source>Statistics</source>
+        <translation>Statistika</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="457"/>
-        <location filename="../core/dive.c" line="26"/>
-        <source>river</source>
-        <translation>jõgi</translation>
+        <location filename="../core/save-html.c" line="499"/>
+        <source>Advanced search</source>
+        <translation>Detailsem otsing</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="439"/>
-        <location filename="../core/dive.c" line="27"/>
-        <source>night</source>
-        <translation>öö</translation>
+        <location filename="../core/save-html.c" line="502"/>
+        <source>Rating</source>
+        <translation>Hinne</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="153"/>
-        <source>Error: the file does not appear to be a DATATRAK divelog</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="503"/>
+        <source>Visibility</source>
+        <translation>Nähtavus</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="286"/>
-        <source>clear</source>
-        <translation>selge</translation>
+        <location filename="../core/save-html.c" line="504"/>
+        <source>Duration</source>
+        <translation>Kestus</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="289"/>
-        <source>misty</source>
-        <translation>vine</translation>
+        <location filename="../core/save-html.c" line="505"/>
+        <source>Divemaster</source>
+        <translation>Divemaster</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="292"/>
-        <source>fog</source>
-        <translation>udu</translation>
+        <location filename="../core/save-html.c" line="506"/>
+        <source>Buddy</source>
+        <translation>Semu</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="295"/>
-        <source>rain</source>
-        <translation>vihm</translation>
+        <location filename="../core/save-html.c" line="507"/>
+        <source>Suit</source>
+        <translation>Ülikond</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="298"/>
-        <source>storm</source>
-        <translation>torm</translation>
+        <location filename="../core/save-html.c" line="508"/>
+        <source>Tags</source>
+        <translation>Märgendid</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="301"/>
-        <source>snow</source>
-        <translation>lumi</translation>
+        <location filename="../core/save-html.c" line="509"/>
+        <location filename="../smtk-import/smartrak.c" line="251"/>
+        <location filename="../smtk-import/smartrak.c" line="321"/>
+        <source>Notes</source>
+        <translation>Märkmed</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="321"/>
-        <source>No suit</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="510"/>
+        <source>Show more details</source>
+        <translation>Näita rohkem detaile</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="324"/>
-        <source>Shorty</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="513"/>
+        <source>Yearly statistics</source>
+        <translation>Aastane statistika</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="327"/>
-        <source>Combi</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="514"/>
+        <source>Year</source>
+        <translation>Aasta</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="330"/>
-        <source>Wet suit</source>
-        <translation>Märg ülikond</translation>
+        <location filename="../core/save-html.c" line="515"/>
+        <source>Total time</source>
+        <translation>Koguaeg</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="333"/>
-        <source>Semidry suit</source>
-        <translation>Poolkuiv ülikond</translation>
+        <location filename="../core/save-html.c" line="516"/>
+        <source>Average time</source>
+        <translation>Keskmine aeg</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="336"/>
-        <source>Dry suit</source>
-        <translation>Kuiv ülikond</translation>
+        <location filename="../core/save-html.c" line="517"/>
+        <source>Shortest time</source>
+        <translation>Lühim aeg</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="396"/>
-        <source>no stop</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="518"/>
+        <source>Longest time</source>
+        <translation>Pikim aeg</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="400"/>
-        <source>single ascent</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="519"/>
+        <source>Average depth</source>
+        <translation>Keskmine sügavus</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="402"/>
-        <source>multiple ascent</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="520"/>
+        <source>Min. depth</source>
+        <translation>Min sügavus</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="404"/>
-        <location filename="../core/dive.c" line="27"/>
-        <source>fresh</source>
-        <translation>magevesi</translation>
+        <location filename="../core/save-html.c" line="521"/>
+        <source>Max. depth</source>
+        <translation>Max sügavus</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="406"/>
-        <source>salt water</source>
-        <translation>soolane vesi</translation>
+        <location filename="../core/save-html.c" line="522"/>
+        <source>Average SAC</source>
+        <translation>Keskmine SAC</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="431"/>
-        <source>sight seeing</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="523"/>
+        <source>Min. SAC</source>
+        <translation>Min. SAC</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="433"/>
-        <source>club dive</source>
-        <translation>Klubisukeldumine</translation>
+        <location filename="../core/save-html.c" line="524"/>
+        <source>Max. SAC</source>
+        <translation>Max. SAC</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="437"/>
-        <source>instruction</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="525"/>
+        <source>Average temp.</source>
+        <translation>Keskmine temp</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="463"/>
-        <source>other</source>
-        <translation>muu</translation>
+        <location filename="../core/save-html.c" line="526"/>
+        <source>Min. temp.</source>
+        <translation>Min. temp.</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="474"/>
-        <source>Other activities</source>
-        <translation>Muu tegevus</translation>
+        <location filename="../core/save-html.c" line="527"/>
+        <source>Max. temp.</source>
+        <translation>Max. temp.</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="498"/>
-        <source>Datatrak/Wlog notes</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="528"/>
+        <source>Back to list</source>
+        <translation>Tagasi nimekirja</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="537"/>
-        <source>Manually entered dive</source>
-        <translation>Käsitsi sisestatud sukeldumine</translation>
+        <location filename="../core/save-html.c" line="531"/>
+        <source>Dive No.</source>
+        <translation>Sukeldumise nr</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="588"/>
-        <source>Unknown</source>
-        <translation>Tundmatu</translation>
+        <location filename="../core/save-html.c" line="532"/>
+        <source>Dive profile</source>
+        <translation>Sukeldumise profiil</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="674"/>
-        <source>Error: couldn&apos;t open the file %s</source>
-        <translation>Viga: ei suuda avada faili %s</translation>
+        <location filename="../core/save-html.c" line="533"/>
+        <source>Dive information</source>
+        <translation>Sukeldumise info</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="687"/>
-        <source>Error: no dive</source>
-        <translation>Viga: pole sukeldumisi</translation>
+        <location filename="../core/save-html.c" line="534"/>
+        <source>Dive equipment</source>
+        <translation>Sukeldumisvarustus</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="27"/>
-        <source>student</source>
-        <translation>õpilane</translation>
+        <location filename="../core/save-html.c" line="535"/>
+        <location filename="../core/save-html.c" line="542"/>
+        <source>Type</source>
+        <translation>Tüüp</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="461"/>
-        <location filename="../core/dive.c" line="28"/>
-        <source>photo</source>
-        <translation>foto</translation>
+        <location filename="../core/save-html.c" line="536"/>
+        <source>Size</source>
+        <translation>Suurus</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="28"/>
-        <source>video</source>
-        <translation>video</translation>
+        <location filename="../core/save-html.c" line="537"/>
+        <source>Work pressure</source>
+        <translation>Töörõhk</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="435"/>
-        <location filename="../core/dive.c" line="28"/>
-        <source>instructor</source>
-        <translation>instruktor</translation>
+        <location filename="../core/save-html.c" line="538"/>
+        <source>Start pressure</source>
+        <translation>Algusrõhk</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="398"/>
-        <location filename="../core/dive.c" line="29"/>
-        <source>deco</source>
-        <translation>deko</translation>
+        <location filename="../core/save-html.c" line="539"/>
+        <source>End pressure</source>
+        <translation>Lõpurõhk</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="33"/>
-        <source>OC-gas</source>
-        <translation>avatud süsteemi gaas</translation>
+        <location filename="../core/save-html.c" line="540"/>
+        <source>Gas</source>
+        <translation>Gaas</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="33"/>
-        <source>diluent</source>
-        <translation>vedeldi</translation>
+        <location filename="../core/save-html.c" line="541"/>
+        <source>Weight</source>
+        <translation>Raskus</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="33"/>
-        <location filename="../core/equipment.c" line="88"/>
-        <location filename="../core/planner.c" line="1415"/>
-        <location filename="../core/planner.c" line="1418"/>
-        <source>oxygen</source>
-        <translation>hapnik</translation>
+        <location filename="../core/save-html.c" line="543"/>
+        <source>Events</source>
+        <translation>Sündmused</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="227"/>
-        <source>ℓ</source>
-        <translation>ℓ</translation>
+        <location filename="../core/save-html.c" line="544"/>
+        <source>Name</source>
+        <translation>Nimi</translation>
+    </message>
+    <message>
+        <location filename="../core/save-html.c" line="545"/>
+        <source>Value</source>
+        <translation>Väärtus</translation>
+    </message>
+    <message>
+        <location filename="../core/save-html.c" line="546"/>
+        <source>Coordinates</source>
+        <translation>Koordinaadid</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="239"/>
+        <location filename="../core/save-html.c" line="547"/>
+        <source>Dive status</source>
+        <translation>Sukeldumise staatus</translation>
+    </message>
+    <message>
+        <location filename="../core/statistics.c" line="242"/>
         <source>more than %d days</source>
         <translation>enam kui %d päeva</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="246"/>
+        <location filename="../core/statistics.c" line="249"/>
         <source>%dd %dh %dmin</source>
         <translation>%dd %dh %dmin</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="249"/>
+        <location filename="../core/statistics.c" line="252"/>
         <source>%dmin %dsecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="251"/>
+        <location filename="../core/statistics.c" line="254"/>
         <source>%dh %dmin</source>
         <translation>%dt %dmin</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="263"/>
+        <location filename="../core/statistics.c" line="266"/>
         <source>for dives #</source>
         <translation>sukeldumiste nr</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="269"/>
+        <location filename="../core/statistics.c" line="272"/>
         <source>for selected dives</source>
         <translation>valitud sukeldumiste</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="304"/>
+        <location filename="../core/statistics.c" line="307"/>
         <source>for dive #%d</source>
         <translation>sukeldumise nr %d</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="306"/>
+        <location filename="../core/statistics.c" line="309"/>
         <source>for selected dive</source>
         <translation>valitud sukeldumise</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="308"/>
+        <location filename="../core/statistics.c" line="311"/>
         <source>for all dives</source>
         <translation>kõikide sukeldumiste</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="310"/>
+        <location filename="../core/statistics.c" line="313"/>
         <source>(no dives)</source>
         <translation>(pole sukeldumisi)</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Sun</source>
         <translation>Pühap</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Mon</source>
         <translation>Esmasp</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Tue</source>
         <translation>Teisip</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Wed</source>
         <translation>Kolmap</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Thu</source>
         <translation>Neljap</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Fri</source>
         <translation>Reede</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Sat</source>
         <translation>Laup</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Jan</source>
         <translation>Jaan</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Feb</source>
         <translation>Veebr</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Mar</source>
         <translation>Märts</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Apr</source>
         <translation>Apr</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>May</source>
         <translation>Mai</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Jun</source>
         <translation>Juuni</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Jul</source>
         <translation>Juuli</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Aug</source>
         <translation>Aug</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Sep</source>
         <translation>Sept</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Oct</source>
         <translation>Okt</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Nov</source>
         <translation>Nov</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Dec</source>
         <translation>Dets</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="191"/>
-        <location filename="../core/parse-xml.c" line="3284"/>
-        <location filename="../core/uemis-downloader.c" line="134"/>
-        <source>unknown</source>
-        <translation>tundmatu</translation>
-    </message>
-    <message>
-        <location filename="../core/uemis-downloader.c" line="467"/>
-        <source>data</source>
-        <translation>andmed</translation>
-    </message>
-    <message>
-        <location filename="../core/uemis-downloader.c" line="447"/>
-        <source>%s %s</source>
-        <translation>%s %s</translation>
-    </message>
-    <message>
         <location filename="../core/uemis-downloader.c" line="27"/>
         <source>Uemis Zurich: the file system is almost full.
 Disconnect/reconnect the dive computer
@@ -9971,6 +10514,16 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation>Pole sukeldumisi mida alla laadida.</translation>
     </message>
     <message>
+        <location filename="../core/uemis-downloader.c" line="447"/>
+        <source>%s %s</source>
+        <translation>%s %s</translation>
+    </message>
+    <message>
+        <location filename="../core/uemis-downloader.c" line="467"/>
+        <source>data</source>
+        <translation>andmed</translation>
+    </message>
+    <message>
         <location filename="../core/uemis-downloader.c" line="495"/>
         <source>divelog #</source>
         <translation>sukeldumise logi #</translation>
@@ -10141,281 +10694,6 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation>Patarei tühjenemise alarm</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="469"/>
-        <location filename="../core/save-html.c" line="553"/>
-        <location filename="../core/worldmap-save.c" line="111"/>
-        <source>Can&apos;t open file %s</source>
-        <translation>Ei saa avada faili %s</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="488"/>
-        <source>Number</source>
-        <translation>Number</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="489"/>
-        <source>Date</source>
-        <translation>Kuupäev</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="490"/>
-        <source>Time</source>
-        <translation>Aeg</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="491"/>
-        <source>Location</source>
-        <translation>Asukoht</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="492"/>
-        <source>Air temp.</source>
-        <translation>Õhu temp.</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="493"/>
-        <source>Water temp.</source>
-        <translation>Vee temp.</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="498"/>
-        <source>Statistics</source>
-        <translation>Statistika</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="502"/>
-        <source>Rating</source>
-        <translation>Hinne</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="503"/>
-        <source>Visibility</source>
-        <translation>Nähtavus</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="504"/>
-        <source>Duration</source>
-        <translation>Kestus</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="494"/>
-        <source>Dives</source>
-        <translation>Sukeldumisi kokku</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="495"/>
-        <source>Expand all</source>
-        <translation>Laienda kõik</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="496"/>
-        <source>Collapse all</source>
-        <translation>Ahenda kõik kokku</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="497"/>
-        <source>Trips</source>
-        <translation>Väljasõidud</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="499"/>
-        <source>Advanced search</source>
-        <translation>Detailsem otsing</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="505"/>
-        <source>Divemaster</source>
-        <translation>Divemaster</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="506"/>
-        <source>Buddy</source>
-        <translation>Semu</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="507"/>
-        <source>Suit</source>
-        <translation>Ülikond</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="508"/>
-        <source>Tags</source>
-        <translation>Märgendid</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="509"/>
-        <location filename="../smtk-import/smartrak.c" line="251"/>
-        <location filename="../smtk-import/smartrak.c" line="321"/>
-        <source>Notes</source>
-        <translation>Märkmed</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="510"/>
-        <source>Show more details</source>
-        <translation>Näita rohkem detaile</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="513"/>
-        <source>Yearly statistics</source>
-        <translation>Aastane statistika</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="514"/>
-        <source>Year</source>
-        <translation>Aasta</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="515"/>
-        <source>Total time</source>
-        <translation>Koguaeg</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="516"/>
-        <source>Average time</source>
-        <translation>Keskmine aeg</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="517"/>
-        <source>Shortest time</source>
-        <translation>Lühim aeg</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="518"/>
-        <source>Longest time</source>
-        <translation>Pikim aeg</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="519"/>
-        <source>Average depth</source>
-        <translation>Keskmine sügavus</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="520"/>
-        <source>Min. depth</source>
-        <translation>Min sügavus</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="521"/>
-        <source>Max. depth</source>
-        <translation>Max sügavus</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="523"/>
-        <source>Min. SAC</source>
-        <translation>Min. SAC</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="524"/>
-        <source>Max. SAC</source>
-        <translation>Max. SAC</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="525"/>
-        <source>Average temp.</source>
-        <translation>Keskmine temp</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="526"/>
-        <source>Min. temp.</source>
-        <translation>Min. temp.</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="527"/>
-        <source>Max. temp.</source>
-        <translation>Max. temp.</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="528"/>
-        <source>Back to list</source>
-        <translation>Tagasi nimekirja</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="534"/>
-        <source>Dive equipment</source>
-        <translation>Sukeldumisvarustus</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="537"/>
-        <source>Work pressure</source>
-        <translation>Töörõhk</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="538"/>
-        <source>Start pressure</source>
-        <translation>Algusrõhk</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="539"/>
-        <source>End pressure</source>
-        <translation>Lõpurõhk</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="547"/>
-        <source>Dive status</source>
-        <translation>Sukeldumise staatus</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="522"/>
-        <source>Average SAC</source>
-        <translation>Keskmine SAC</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="531"/>
-        <source>Dive No.</source>
-        <translation>Sukeldumise nr</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="532"/>
-        <source>Dive profile</source>
-        <translation>Sukeldumise profiil</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="533"/>
-        <source>Dive information</source>
-        <translation>Sukeldumise info</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="535"/>
-        <location filename="../core/save-html.c" line="542"/>
-        <source>Type</source>
-        <translation>Tüüp</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="536"/>
-        <source>Size</source>
-        <translation>Suurus</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="540"/>
-        <source>Gas</source>
-        <translation>Gaas</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="541"/>
-        <source>Weight</source>
-        <translation>Raskus</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="543"/>
-        <source>Events</source>
-        <translation>Sündmused</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="544"/>
-        <source>Name</source>
-        <translation>Nimi</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="545"/>
-        <source>Value</source>
-        <translation>Väärtus</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="546"/>
-        <source>Coordinates</source>
-        <translation>Koordinaadid</translation>
-    </message>
-    <message>
         <location filename="../core/worldmap-save.c" line="39"/>
         <source>Date:</source>
         <translation>Kuupäev:</translation>
@@ -10461,109 +10739,6 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation>Märkmed:</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="91"/>
-        <location filename="../core/qthelper.cpp" line="226"/>
-        <source>N</source>
-        <translation>N</translation>
-    </message>
-    <message>
-        <location filename="../core/qthelper.cpp" line="91"/>
-        <location filename="../core/qthelper.cpp" line="227"/>
-        <source>S</source>
-        <translation>S</translation>
-    </message>
-    <message>
-        <location filename="../core/qthelper.cpp" line="92"/>
-        <location filename="../core/qthelper.cpp" line="228"/>
-        <source>E</source>
-        <translation>E</translation>
-    </message>
-    <message>
-        <location filename="../core/qthelper.cpp" line="92"/>
-        <location filename="../core/qthelper.cpp" line="229"/>
-        <source>W</source>
-        <translation>W</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="341"/>
-        <source>Remote storage and local data diverged. Error: merge failed (%s)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="134"/>
-        <source>Local cache directory %s corrupted - can&apos;t sync with Subsurface cloud storage</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="157"/>
-        <location filename="../core/git-access.c" line="177"/>
-        <source>Could not update local cache to newer remote data</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="170"/>
-        <source>Subsurface cloud storage corrupted</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="285"/>
-        <source>Could not update Subsurface cloud storage, try again later</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="371"/>
-        <source>Remote storage and local data diverged. Cannot combine local and remote changes</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="405"/>
-        <source>Remote storage and local data diverged</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="408"/>
-        <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="417"/>
-        <source>Problems with local cache of Subsurface cloud data</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="418"/>
-        <source>Moved cache data to %s. Please try the operation again.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="737"/>
-        <source>Error connecting to Subsurface cloud storage</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="740"/>
-        <source>git clone of %s failed (%s)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/load-git.c" line="222"/>
-        <location filename="../core/parse-xml.c" line="1300"/>
-        <source>additional name for site: %s
-</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/ostctools.c" line="120"/>
-        <location filename="../core/ostctools.c" line="152"/>
-        <source>Unknown DC in dive %d</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/ostctools.c" line="165"/>
-        <source>Error - %s - parsing dive %d</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../smtk-import/smartrak.c" line="247"/>
         <source>Built</source>
         <translation type="unfinished"/>
@@ -10647,117 +10822,117 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="91"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="103"/>
         <source>Subsurface</source>
         <translation>Subsurface</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="97"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="110"/>
         <source>Dive list</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="112"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="125"/>
         <source>Cloud credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="126"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="139"/>
         <source>Manage dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="138"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="141"/>
         <source>Add dive manually</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="146"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="149"/>
         <source>Manual sync with cloud</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="164"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="167"/>
         <source>Offline mode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="164"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="167"/>
         <source>Enable auto cloud sync</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="182"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="187"/>
         <source>GPS</source>
         <translation>GPS</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="185"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="190"/>
         <source>GPS-tag dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="192"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="197"/>
         <source>Upload GPS data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="199"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="204"/>
         <source>Download GPS data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="206"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="211"/>
         <source>Show GPS fixes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="215"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="220"/>
         <source>Clear GPS cache</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="221"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="226"/>
         <source>Preferences</source>
         <translation>Eelistused</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="230"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="237"/>
         <source>Developer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="232"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="239"/>
         <source>App log</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="239"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="246"/>
         <source>Theme information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="246"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="253"/>
         <source>User manual</source>
         <translation>Kasutusjuhend</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="252"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="259"/>
         <source>About</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="283"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="304"/>
         <source>Run location service</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="283"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="304"/>
         <source>No GPS source available</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="295"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="316"/>
         <source>Actions</source>
         <translation type="unfinished"/>
     </message>
@@ -10838,6 +11013,24 @@ p, li { white-space: pre-wrap; }
         <translation>m/min</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="121"/>
+        <location filename="../build/ui_plannerSettings.h" line="425"/>
+        <source>75% to 50% avg. depth</source>
+        <translation>75% kuni 50%-ni keskmisest sügavusest</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="138"/>
+        <location filename="../build/ui_plannerSettings.h" line="427"/>
+        <source>50% avg. depth to 6m</source>
+        <translation>50% keskmine sügavus 6m-i</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="155"/>
+        <location filename="../build/ui_plannerSettings.h" line="429"/>
+        <source>6m to surface</source>
+        <translation>6m pinnani</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="175"/>
         <location filename="../build/ui_plannerSettings.h" line="431"/>
         <source>Descent</source>
@@ -10861,12 +11054,35 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="268"/>
+        <source>Bühlmann deco</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="278"/>
         <location filename="../build/ui_plannerSettings.h" line="445"/>
         <source>Reserve gas</source>
         <translation>Varugaas</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="288"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="549"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="578"/>
+        <location filename="../build/ui_plannerSettings.h" line="446"/>
+        <location filename="../build/ui_plannerSettings.h" line="459"/>
+        <location filename="../build/ui_plannerSettings.h" line="461"/>
+        <source>bar</source>
+        <translation>bar</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="307"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="416"/>
+        <location filename="../build/ui_plannerSettings.h" line="437"/>
+        <location filename="../build/ui_plannerSettings.h" line="440"/>
+        <source>%</source>
+        <translation>%</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="320"/>
         <location filename="../build/ui_plannerSettings.h" line="449"/>
         <source>Postpone gas change if a stop is not required</source>
@@ -10885,12 +11101,10 @@ p, li { white-space: pre-wrap; }
         <translation>GF madal</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="307"/>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="416"/>
-        <location filename="../build/ui_plannerSettings.h" line="437"/>
-        <location filename="../build/ui_plannerSettings.h" line="440"/>
-        <source>%</source>
-        <translation>%</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="353"/>
+        <location filename="../build/ui_plannerSettings.h" line="436"/>
+        <source>Plan backgas breaks</source>
+        <translation>planeeri põhigaasi pausid</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="360"/>
@@ -10899,10 +11113,10 @@ p, li { white-space: pre-wrap; }
         <translation>GF kõrge</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="429"/>
-        <location filename="../build/ui_plannerSettings.h" line="441"/>
-        <source>Drop to first depth</source>
-        <translation>Lasku esimesele sügavusele</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="370"/>
+        <location filename="../build/ui_plannerSettings.h" line="453"/>
+        <source>min</source>
+        <translation>min</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="389"/>
@@ -10911,163 +11125,139 @@ p, li { white-space: pre-wrap; }
         <translation>Viimane peatus 6m peal</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="353"/>
-        <location filename="../build/ui_plannerSettings.h" line="436"/>
-        <source>Plan backgas breaks</source>
-        <translation>planeeri põhigaasi pausid</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="396"/>
+        <source>Maximize bottom time allowed by gas and no decompression limits</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="515"/>
-        <location filename="../build/ui_plannerSettings.h" line="455"/>
-        <source>Gas options</source>
-        <translation>Gaasi valikud</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="399"/>
+        <location filename="../build/ui_plannerSettings.h" line="443"/>
+        <source>Recreational mode</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="594"/>
-        <location filename="../build/ui_plannerSettings.h" line="456"/>
-        <source>Bottom SAC</source>
-        <translation>SAC põhjas</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="429"/>
+        <location filename="../build/ui_plannerSettings.h" line="441"/>
+        <source>Drop to first depth</source>
+        <translation>Lasku esimesele sügavusele</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="692"/>
-        <location filename="../build/ui_plannerSettings.h" line="457"/>
-        <source>Deco SAC</source>
-        <translation>Deko SAC</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="436"/>
+        <location filename="../build/ui_plannerSettings.h" line="452"/>
+        <source>Min. switch duration</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="601"/>
-        <location filename="../build/ui_plannerSettings.h" line="458"/>
-        <source>Bottom pO₂</source>
-        <translation>Põhja pO₂</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="459"/>
+        <location filename="../build/ui_plannerSettings.h" line="444"/>
+        <source>Safety stop</source>
+        <translation>Ohutuspeatus</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="685"/>
-        <location filename="../build/ui_plannerSettings.h" line="460"/>
-        <source>Deco pO₂</source>
-        <translation>Deco pO₂</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="495"/>
+        <source>Conservatism level</source>
+        <translation>Konservatiivsuse tase</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="515"/>
+        <location filename="../build/ui_plannerSettings.h" line="455"/>
+        <source>Gas options</source>
+        <translation>Gaasi valikud</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="565"/>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="672"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="698"/>
         <location filename="../build/ui_plannerSettings.h" line="462"/>
         <location filename="../build/ui_plannerSettings.h" line="463"/>
         <source>ℓ/min</source>
         <translation>ℓ/min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="632"/>
-        <location filename="../build/ui_plannerSettings.h" line="468"/>
-        <source>Display runtime</source>
-        <translation>Kuva jooksev aeg</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="645"/>
-        <location filename="../build/ui_plannerSettings.h" line="472"/>
-        <source>Display segment duration</source>
-        <translation>Kuva segmendi kestust</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="655"/>
-        <location filename="../build/ui_plannerSettings.h" line="476"/>
-        <source>Display transitions in deco</source>
-        <translation>Kuva üleminekud dekos</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="662"/>
-        <location filename="../build/ui_plannerSettings.h" line="477"/>
-        <source>Verbatim dive plan</source>
-        <translation>Tekstiline sukeldumise plaan</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="288"/>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="549"/>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="578"/>
-        <location filename="../build/ui_plannerSettings.h" line="446"/>
-        <location filename="../build/ui_plannerSettings.h" line="459"/>
-        <location filename="../build/ui_plannerSettings.h" line="461"/>
-        <source>bar</source>
-        <translation>bar</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="121"/>
-        <location filename="../build/ui_plannerSettings.h" line="425"/>
-        <source>75% to 50% avg. depth</source>
-        <translation>75% kuni 50%-ni keskmisest sügavusest</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="138"/>
-        <location filename="../build/ui_plannerSettings.h" line="427"/>
-        <source>50% avg. depth to 6m</source>
-        <translation>50% keskmine sügavus 6m-i</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="155"/>
-        <location filename="../build/ui_plannerSettings.h" line="429"/>
-        <source>6m to surface</source>
-        <translation>6m pinnani</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="594"/>
+        <source>m</source>
+        <translation>m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="268"/>
-        <source>Bühlmann deco</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="606"/>
+        <source>Used to calculate best mix. Select best mix depth in &apos;Available gases&apos; table by entering gas depth, followed by &quot;B&quot; (best trimix mix) or &quot;BN&quot; (best nitrox mix)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="370"/>
-        <location filename="../build/ui_plannerSettings.h" line="453"/>
-        <source>min</source>
-        <translation>min</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="396"/>
-        <source>Maximize bottom time allowed by gas and no decompression limits</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="613"/>
+        <location filename="../build/ui_plannerSettings.h" line="456"/>
+        <source>Bottom SAC</source>
+        <translation>SAC põhjas</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="399"/>
-        <location filename="../build/ui_plannerSettings.h" line="443"/>
-        <source>Recreational mode</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="620"/>
+        <location filename="../build/ui_plannerSettings.h" line="458"/>
+        <source>Bottom pO₂</source>
+        <translation>Põhja pO₂</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="436"/>
-        <location filename="../build/ui_plannerSettings.h" line="452"/>
-        <source>Min. switch duration</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="627"/>
+        <source>Best mix END</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="459"/>
-        <location filename="../build/ui_plannerSettings.h" line="444"/>
-        <source>Safety stop</source>
-        <translation>Ohutuspeatus</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="495"/>
-        <source>Conservatism level</source>
-        <translation>Konservatiivsuse tase</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="608"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="634"/>
         <location filename="../build/ui_plannerSettings.h" line="464"/>
         <source>Notes</source>
         <translation>Märkmed</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="629"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="655"/>
         <location filename="../build/ui_plannerSettings.h" line="466"/>
         <source>In dive plan, show runtime (absolute time) of stops</source>
         <translation>Näita sukeldumise plaanis peatuste jooksvat (tõelist) aega</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="642"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="658"/>
+        <location filename="../build/ui_plannerSettings.h" line="468"/>
+        <source>Display runtime</source>
+        <translation>Kuva jooksev aeg</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="668"/>
         <location filename="../build/ui_plannerSettings.h" line="470"/>
         <source>In dive plan, show duration (relative time) of stops</source>
         <translation>Näita sukeldumiste plaanis peatuste pikkust (suhtelist aega)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="652"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="671"/>
+        <location filename="../build/ui_plannerSettings.h" line="472"/>
+        <source>Display segment duration</source>
+        <translation>Kuva segmendi kestust</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="678"/>
         <location filename="../build/ui_plannerSettings.h" line="474"/>
         <source>In diveplan, list transitions or treat them as implicit</source>
         <translation>Näita sukeldumiste plaanis üleminekuid või käsitle neid peidetuna</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="681"/>
+        <location filename="../build/ui_plannerSettings.h" line="476"/>
+        <source>Display transitions in deco</source>
+        <translation>Kuva üleminekud dekos</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="688"/>
+        <location filename="../build/ui_plannerSettings.h" line="477"/>
+        <source>Verbatim dive plan</source>
+        <translation>Tekstiline sukeldumise plaan</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="711"/>
+        <location filename="../build/ui_plannerSettings.h" line="460"/>
+        <source>Deco pO₂</source>
+        <translation>Deco pO₂</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="718"/>
+        <location filename="../build/ui_plannerSettings.h" line="457"/>
+        <source>Deco SAC</source>
+        <translation>Deko SAC</translation>
+    </message>
 </context>
 </TS>
\ No newline at end of file
diff --git a/translations/subsurface_fi_FI.ts b/translations/subsurface_fi_FI.ts
index 89859e0dd..3502e9f09 100644
--- a/translations/subsurface_fi_FI.ts
+++ b/translations/subsurface_fi_FI.ts
@@ -109,6 +109,11 @@
         <translation>Nimi:</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="56"/>
+        <source>Could not initialize Winsock version 2.2</source>
+        <translation>Winsockin (versio 2.2) alustaminen epäonnistui</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="134"/>
         <source>Trying to turn on the local Bluetooth device...</source>
         <translation>Yritetään käynnistää Bluetooth -laitetta...</translation>
@@ -119,6 +124,11 @@
         <translation>Yritetään sammuttaa Bluetooth -laitetta...</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="167"/>
+        <source>Remote devices list was cleared.</source>
+        <translation>Etälaitelista on tyhjennetty</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="183"/>
         <source>Scanning for remote devices...</source>
         <translation>Etsitään laitteita...</translation>
@@ -129,6 +139,22 @@
         <translation>Etsintä päättyi onnistuneesti.</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="208"/>
+        <source>The local Bluetooth device was %1.</source>
+        <extracomment>%1 will be replaced with &quot;turned on&quot; or &quot;turned off&quot;</extracomment>
+        <translation>Paikallinen Bluetooth -laite oli %1.</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
+        <source>turned on</source>
+        <translation>käynnistetty</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
+        <source>turned off</source>
+        <translation>sammutettu</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="225"/>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="339"/>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="359"/>
@@ -176,37 +202,6 @@
         <translation>Parita</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="352"/>
-        <source>Device %1 was paired and is authorized.</source>
-        <translation>Laite %1 on autorisoitu ja paritettu.</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="56"/>
-        <source>Could not initialize Winsock version 2.2</source>
-        <translation>Winsockin (versio 2.2) alustaminen epäonnistui</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="167"/>
-        <source>Remote devices list was cleared.</source>
-        <translation>Etälaitelista on tyhjennetty</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="208"/>
-        <source>The local Bluetooth device was %1.</source>
-        <extracomment>%1 will be replaced with &quot;turned on&quot; or &quot;turned off&quot;</extracomment>
-        <translation>Paikallinen Bluetooth -laite oli %1.</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
-        <source>turned on</source>
-        <translation>käynnistetty</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
-        <source>turned off</source>
-        <translation>sammutettu</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="307"/>
         <source>Remove pairing</source>
         <translation>Poista paritus</translation>
@@ -232,6 +227,11 @@
         <translation>Laite %1 on paritettu.</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="352"/>
+        <source>Device %1 was paired and is authorized.</source>
+        <translation>Laite %1 on autorisoitu ja paritettu.</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="378"/>
         <source>The device %1 can now be used for connection. You can press the Save button.</source>
         <translation>Laitetta %1 voidaan käyttää yhteyden muodostukseen. Voita painaa Tallenna -painiketta.</translation>
@@ -290,12 +290,12 @@
 <context>
     <name>BuddyFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="621"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="619"/>
         <source>Person: </source>
         <translation>Henkilö:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="622"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="620"/>
         <source>Searches for buddies and divemasters</source>
         <translation>Etsii sukelluskavereita ja divemastereita</translation>
     </message>
@@ -303,7 +303,7 @@
 <context>
     <name>BuddyFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="243"/>
+        <location filename="../qt-models/filtermodels.cpp" line="248"/>
         <source>No buddies</source>
         <translation>Ei kavereita</translation>
     </message>
@@ -311,25 +311,30 @@
 <context>
     <name>CloudCredentials</name>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="49"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="50"/>
         <source>Cloud credentials</source>
         <translation>Pilvipalvelun tunnus</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="55"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="56"/>
         <source>Email</source>
         <translation>Sähköposti</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="67"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="68"/>
         <source>Password</source>
         <translation>Salasana</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="90"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="92"/>
         <source>Show password</source>
         <translation>Näytä salasana</translation>
     </message>
+    <message>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="97"/>
+        <source>PIN</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>ColumnNameProvider</name>
@@ -385,6 +390,16 @@
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
+        <source>Max. depth</source>
+        <translation>Suurin syvyys</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
+        <source>Avg. depth</source>
+        <translation>Keskisyvyys</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
         <source>Divemaster</source>
         <translation>Divemaster</translation>
     </message>
@@ -395,6 +410,11 @@
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
+        <source>Suit</source>
+        <translation>Puku</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
         <source>Notes</source>
         <translation>Muistiinpanot</translation>
     </message>
@@ -414,21 +434,6 @@
         <translation>Veden lämpötila</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
-        <source>Max. depth</source>
-        <translation>Suurin syvyys</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
-        <source>Avg. depth</source>
-        <translation>Keskisyvyys</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
-        <source>Suit</source>
-        <translation>Puku</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="44"/>
         <source>O₂</source>
         <translation>O₂</translation>
@@ -542,7 +547,7 @@
         <translation>libdivecomputer-kontekstin luominen epäonnistui</translation>
     </message>
     <message>
-        <location filename="../core/configuredivecomputer.cpp" line="660"/>
+        <location filename="../core/configuredivecomputer.cpp" line="656"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation>Yhteys sukellustietokoneeseen epäonnistui.</translation>
     </message>
@@ -562,11 +567,19 @@
         <translation>Laite- tai hakemistopolku</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="170"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1520"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1533"/>
-        <source>...</source>
-        <translation>...</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="47"/>
+        <source>Connect via Bluetooth</source>
+        <translation>Yhdistä Bluetoothin kautta</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="54"/>
+        <source>Connect</source>
+        <translation>Yhdistä</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="64"/>
+        <source>Disconnect</source>
+        <translation>Katkaise yhteys</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="80"/>
@@ -575,12 +588,24 @@
         <translation>Hae yksityiskohdat</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="90"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1523"/>
+        <source>Read settings from backup file or from device before writing to the device</source>
+        <translation>Lue asetukset varmuuskopiolta tai sukellustietokoneesta, ennen niiden kirjoittamista laitteelle</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="93"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1525"/>
         <source>Save changes to device</source>
         <translation>Tallenna muutokset laitteelle</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="116"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1527"/>
+        <source>Read settings from backup file or from device before writing to a backup file</source>
+        <translation>Lue asetukset varmuuskopiosta tai sukellustietokoneesta, ennen niiden kirjoittamista varmuuskopioon</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="119"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1529"/>
         <source>Backup</source>
@@ -599,15 +624,40 @@
         <translation>Päivitä laiteohjelmisto</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="163"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1532"/>
+        <source>Save libdivecomputer logfile</source>
+        <translation>Tallenna sukellustietokoneen lokitiedosto</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="170"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1520"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1533"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="177"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1534"/>
         <source>Cancel</source>
         <translation>Peruuta</translation>
     </message>
     <message>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1539"/>
-        <source>OSTC 3</source>
-        <translation>OSTC 3</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="214"/>
+        <source>OSTC 3,Sport,Cr,2</source>
+        <translation>OSTC 3,Sport,Cr,2</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="223"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1541"/>
+        <source>Suunto Vyper family</source>
+        <translation>Suunto Vyper -tuoteperhe</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="232"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1543"/>
+        <source>OSTC, Mk.2/2N/2C</source>
+        <translation>OSTC, Mk.2/2N/2C</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="253"/>
@@ -620,40 +670,56 @@
         <translation>Perusasetukset</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="326"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1656"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1943"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1546"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1726"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1766"/>
-        <source>Serial No.</source>
-        <translation>Sarjanumero</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="260"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1575"/>
+        <source>Eco</source>
+        <translation>Eko</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="349"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1679"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1980"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1547"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1727"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1767"/>
-        <source>Firmware version</source>
-        <translation>Laiteohjelmiston versio</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="265"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1576"/>
+        <source>Medium</source>
+        <translation>Keskimääräinen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="538"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1713"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1990"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1548"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1729"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1768"/>
-        <source>Custom text</source>
-        <translation>Valinnainen teksti</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="270"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1577"/>
+        <source>High</source>
+        <translation>Korkea</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="385"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1549"/>
-        <source>Language</source>
-        <translation>Kieli</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="278"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="826"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="849"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="875"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="927"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="993"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1019"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1101"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1117"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1450"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2278"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2382"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2408"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2434"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2474"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2497"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1586"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1621"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1623"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1625"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1628"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1637"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1638"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1710"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1785"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1789"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1801"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1803"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1806"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1807"/>
+        <source>%</source>
+        <translation>%</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="289"/>
@@ -680,44 +746,36 @@
         <translation>Italia</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="579"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1557"/>
-        <source>Dive mode</source>
-        <translation>Sukellustyyppi</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="556"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1560"/>
-        <source>OC</source>
-        <translation>Vapaakierto</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="561"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1561"/>
-        <source>CC</source>
-        <translation>Suljettukierto</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="313"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1582"/>
+        <source>m/°C</source>
+        <translation>m/°C</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="566"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2336"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1562"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1793"/>
-        <source>Gauge</source>
-        <translation>Mittari</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="318"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1583"/>
+        <source>ft/°F</source>
+        <translation>ft/°F</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="571"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1563"/>
-        <source>Apnea</source>
-        <translation>Vapaasukellus</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="326"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1656"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1943"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1546"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1726"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1766"/>
+        <source>Serial No.</source>
+        <translation>Sarjanumero</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="395"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2063"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1565"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1780"/>
-        <source>Date format</source>
-        <translation>Päiväyksen muoto</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="349"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1679"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1980"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1547"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1727"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1767"/>
+        <source>Firmware version</source>
+        <translation>Laiteohjelmiston versio</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="360"/>
@@ -738,108 +796,147 @@
         <translation>VVKKPP</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1042"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2457"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1639"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1805"/>
-        <source>Saturation</source>
-        <translation>Saturaatio</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="385"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1549"/>
+        <source>Language</source>
+        <translation>Kieli</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="278"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="826"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="849"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="875"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="927"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="993"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1019"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1101"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1117"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1450"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2278"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2382"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2408"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2434"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2474"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2497"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1586"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1621"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1623"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1625"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1628"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1637"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1638"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1710"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1785"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1789"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1801"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1803"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1806"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1807"/>
-        <source>%</source>
-        <translation>%</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="395"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2063"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1565"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1780"/>
+        <source>Date format</source>
+        <translation>Päiväyksen muoto</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="865"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2261"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1624"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1784"/>
-        <source>Desaturation</source>
-        <translation>Desaturaatio</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="405"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1572"/>
+        <source>Brightness</source>
+        <translation>Kirkkaus</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="983"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2398"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1636"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1800"/>
-        <source>Last deco</source>
-        <translation>Viimeisin dekosyvyys</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="415"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1850"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1579"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1753"/>
+        <source>Units</source>
+        <translation>Yksiköt</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="711"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="736"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="758"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="904"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2181"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2206"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2228"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2307"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1626"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1786"/>
-        <source> m</source>
-        <translation>m</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="425"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1585"/>
+        <source>Salinity (0-5%)</source>
+        <translation>Suolapitoisuus (0-5%)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="405"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1572"/>
-        <source>Brightness</source>
-        <translation>Kirkkaus</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="438"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1615"/>
+        <source>Reset device to default settings</source>
+        <translation>Palauta laite oletusasetuksiin</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="260"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1575"/>
-        <source>Eco</source>
-        <translation>Eko</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="452"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1590"/>
+        <source>230LSB/Gauss</source>
+        <translation>230LSB/Gauss</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="265"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1576"/>
-        <source>Medium</source>
-        <translation>Keskimääräinen</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="457"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1591"/>
+        <source>330LSB/Gauss</source>
+        <translation>330LSB/Gauss</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="270"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1577"/>
-        <source>High</source>
-        <translation>Korkea</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="462"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1592"/>
+        <source>390LSB/Gauss</source>
+        <translation>390LSB/Gauss</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="603"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2034"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1599"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1779"/>
-        <source>Sampling rate</source>
-        <translation>Näytetiheys</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="467"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1593"/>
+        <source>440LSB/Gauss</source>
+        <translation>440LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="472"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1594"/>
+        <source>660LSB/Gauss</source>
+        <translation>660LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="477"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1595"/>
+        <source>820LSB/Gauss</source>
+        <translation>820LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="482"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1596"/>
+        <source>1090LSB/Gauss</source>
+        <translation>1090LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="487"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1597"/>
+        <source>1370LSB/Gauss</source>
+        <translation>1370LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="521"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1587"/>
+        <source>Compass gain</source>
+        <translation>Kompassin vahvistus</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="531"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1799"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1745"/>
+        <source>Computer model</source>
+        <translation>Sukellustietokoneen malli</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="538"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1713"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1990"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1548"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1729"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1768"/>
+        <source>Custom text</source>
+        <translation>Valinnainen teksti</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="556"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1560"/>
+        <source>OC</source>
+        <translation>Vapaakierto</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="561"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1561"/>
+        <source>CC</source>
+        <translation>Suljettukierto</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="566"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2336"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1562"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1793"/>
+        <source>Gauge</source>
+        <translation>Mittari</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="571"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1563"/>
+        <source>Apnea</source>
+        <translation>Vapaasukellus</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="579"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1557"/>
+        <source>Dive mode</source>
+        <translation>Sukellustyyppi</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="590"/>
@@ -856,30 +953,12 @@
         <translation>10s</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="415"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1850"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1579"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1753"/>
-        <source>Units</source>
-        <translation>Yksiköt</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="313"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1582"/>
-        <source>m/°C</source>
-        <translation>m/°C</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="318"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1583"/>
-        <source>ft/°F</source>
-        <translation>ft/°F</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="644"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1605"/>
-        <source>Dive mode color</source>
-        <translation>Sukellustyypin väri</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="603"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2034"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1599"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1779"/>
+        <source>Sampling rate</source>
+        <translation>Näytetiheys</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="614"/>
@@ -906,12 +985,6 @@
         <translation>Sininen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="425"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1585"/>
-        <source>Salinity (0-5%)</source>
-        <translation>Suolapitoisuus (0-5%)</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="637"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2092"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1613"/>
@@ -920,90 +993,80 @@
         <translation>Synkronoi sukellustietokoneen aika</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="521"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1587"/>
-        <source>Compass gain</source>
-        <translation>Kompassin vahvistus</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="90"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1523"/>
-        <source>Read settings from backup file or from device before writing to the device</source>
-        <translation>Lue asetukset varmuuskopiolta tai sukellustietokoneesta, ennen niiden kirjoittamista laitteelle</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="116"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1527"/>
-        <source>Read settings from backup file or from device before writing to a backup file</source>
-        <translation>Lue asetukset varmuuskopiosta tai sukellustietokoneesta, ennen niiden kirjoittamista varmuuskopioon</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="232"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1543"/>
-        <source>OSTC, Mk.2/2N/2C</source>
-        <translation>OSTC, Mk.2/2N/2C</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="644"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1605"/>
+        <source>Dive mode color</source>
+        <translation>Sukellustyypin väri</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="452"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1590"/>
-        <source>230LSB/Gauss</source>
-        <translation>230LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="654"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2020"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1614"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1771"/>
+        <source>Show safety stop</source>
+        <translation>Näytä turvapysähdys</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="457"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1591"/>
-        <source>330LSB/Gauss</source>
-        <translation>330LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="661"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2145"/>
+        <source>End Depth</source>
+        <translation>Kohdesyvyys</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="462"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1592"/>
-        <source>390LSB/Gauss</source>
-        <translation>390LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="671"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2162"/>
+        <source> s</source>
+        <translation>s</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="467"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1593"/>
-        <source>440LSB/Gauss</source>
-        <translation>440LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="687"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1953"/>
+        <source>Length</source>
+        <translation>Pituus</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="472"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1594"/>
-        <source>660LSB/Gauss</source>
-        <translation>660LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="694"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2138"/>
+        <source>Start Depth</source>
+        <translation>Alkusyvyys</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="477"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1595"/>
-        <source>820LSB/Gauss</source>
-        <translation>820LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="701"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2152"/>
+        <source>Reset Depth</source>
+        <translation>Nollaa syvyys</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="482"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1596"/>
-        <source>1090LSB/Gauss</source>
-        <translation>1090LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="711"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="736"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="758"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="904"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2181"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2206"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2228"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2307"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1626"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1786"/>
+        <source> m</source>
+        <translation>m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="487"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1597"/>
-        <source>1370LSB/Gauss</source>
-        <translation>1370LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="778"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2248"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1643"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1810"/>
+        <source>Advanced settings</source>
+        <translation>Kehittyneet asetukset</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="654"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2020"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1614"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1771"/>
-        <source>Show safety stop</source>
-        <translation>Näytä turvapysähdys</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="784"/>
+        <source>Left button sensitivity</source>
+        <translation>Vasemman painikkeen herkkyys</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="438"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1615"/>
-        <source>Reset device to default settings</source>
-        <translation>Palauta laite oletusasetuksiin</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="791"/>
+        <source>Always show ppO2</source>
+        <translation>Näytä aina ppO2</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="798"/>
@@ -1014,20 +1077,6 @@
         <translation>Vaihtoehtoinen GF voidaan valita sukelluksen aikana</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="223"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1541"/>
-        <source>Suunto Vyper family</source>
-        <translation>Suunto Vyper -tuoteperhe</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="778"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2248"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1643"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1810"/>
-        <source>Advanced settings</source>
-        <translation>Kehittyneet asetukset</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="805"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2271"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1618"/>
@@ -1058,6 +1107,14 @@
         <translation>GFHigh</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="865"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2261"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1624"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1784"/>
+        <source>Desaturation</source>
+        <translation>Desaturaatio</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="917"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2320"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1627"/>
@@ -1072,14 +1129,6 @@
         <translation> mbar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="973"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2369"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1630"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1788"/>
-        <source> min</source>
-        <translation> min</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="960"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2331"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1633"/>
@@ -1088,63 +1137,28 @@
         <translation>ZH-L16</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="47"/>
-        <source>Connect via Bluetooth</source>
-        <translation>Yhdistä Bluetoothin kautta</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="163"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1532"/>
-        <source>Save libdivecomputer logfile</source>
-        <translation>Tallenna sukellustietokoneen lokitiedosto</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="661"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2145"/>
-        <source>End Depth</source>
-        <translation>Kohdesyvyys</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="671"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2162"/>
-        <source> s</source>
-        <translation>s</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="687"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1953"/>
-        <source>Length</source>
-        <translation>Pituus</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="694"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2138"/>
-        <source>Start Depth</source>
-        <translation>Alkusyvyys</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="701"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2152"/>
-        <source>Reset Depth</source>
-        <translation>Nollaa syvyys</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="784"/>
-        <source>Left button sensitivity</source>
-        <translation>Vasemman painikkeen herkkyys</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="791"/>
-        <source>Always show ppO2</source>
-        <translation>Näytä aina ppO2</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="965"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1634"/>
         <source>ZH-L16+GF</source>
         <translation>ZH-L16+GF</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="973"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2369"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1630"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1788"/>
+        <source> min</source>
+        <translation> min</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="983"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2398"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1636"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1800"/>
+        <source>Last deco</source>
+        <translation>Viimeisin dekosyvyys</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1009"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2424"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1640"/>
@@ -1161,6 +1175,14 @@
         <translation>Vaihtoehtoinen GFHigh</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1042"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2457"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1639"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1805"/>
+        <source>Saturation</source>
+        <translation>Saturaatio</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1052"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1642"/>
         <source>Flip screen</source>
@@ -1172,12 +1194,22 @@
         <translation>Oikean painikkeen herkkyys</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1066"/>
+        <source>MOD warning</source>
+        <translation>Varoitus: MOD</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1073"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2513"/>
         <source>Graphical speed indicator</source>
         <translation>Graafinen nopeusnäyttö</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1080"/>
+        <source>Dynamic ascent rate</source>
+        <translation>Vaihtuva nousunopeus</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1087"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2552"/>
         <source>Bottom gas consumption</source>
@@ -1190,6 +1222,14 @@
         <translation>Deko-kaasun kulutus</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1133"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1149"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2520"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2536"/>
+        <source> ℓ/min</source>
+        <translation> ℓ/min</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1165"/>
         <source>Temperature sensor offset</source>
         <translation>Lämpötila-anturin poikkeama</translation>
@@ -1208,6 +1248,18 @@
         <translation>Kaasuasetukset</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1235"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1320"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2610"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2695"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1645"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1668"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1812"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1835"/>
+        <source>%O₂</source>
+        <translation>%O₂</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1240"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1325"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2615"/>
@@ -1326,16 +1378,10 @@
         <translation>Laimenne 5</translation>
     </message>
     <message>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1691"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1858"/>
-        <source>Set point [cbar]</source>
-        <translation>Set point [cbar]</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1693"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1860"/>
-        <source>Change depth [m]</source>
-        <translation>Vaihdon syvyys [m]</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1405"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2770"/>
+        <source>Setpoint</source>
+        <translation>Setpoint</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1415"/>
@@ -1374,6 +1420,12 @@
         <translation>SP 5</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1443"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1709"/>
+        <source>O₂ in calibration gas</source>
+        <translation>Kalibrointikaasun happipitoisuus</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1467"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1713"/>
         <source>Fixed setpoint</source>
@@ -1404,101 +1456,6 @@
         <translation>cbar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1748"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1733"/>
-        <source>P1 (medium)</source>
-        <extracomment>Suunto safety level</extracomment>
-        <translation>P1 (keskimääräinen)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1753"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1734"/>
-        <source>P2 (high)</source>
-        <extracomment>Suunto safety level</extracomment>
-        <translation>P2 (korkea)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1792"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1744"/>
-        <source>Total dive time</source>
-        <translation>Sukellusaika</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2109"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1769"/>
-        <source>kg/ℓ</source>
-        <translation>kg/ℓ</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2346"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1795"/>
-        <source>Apnoea</source>
-        <translation>Apnea</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1583"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1722"/>
-        <source>Safety level</source>
-        <translation>Turvamarginaali</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="54"/>
-        <source>Connect</source>
-        <translation>Yhdistä</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="64"/>
-        <source>Disconnect</source>
-        <translation>Katkaise yhteys</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="214"/>
-        <source>OSTC 3,Sport,Cr,2</source>
-        <translation>OSTC 3,Sport,Cr,2</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1066"/>
-        <source>MOD warning</source>
-        <translation>Varoitus: MOD</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1080"/>
-        <source>Dynamic ascent rate</source>
-        <translation>Vaihtuva nousunopeus</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1133"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1149"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2520"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2536"/>
-        <source> ℓ/min</source>
-        <translation> ℓ/min</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1235"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1320"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2610"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2695"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1645"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1668"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1812"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1835"/>
-        <source>%O₂</source>
-        <translation>%O₂</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1405"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2770"/>
-        <source>Setpoint</source>
-        <translation>Setpoint</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1443"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1709"/>
-        <source>O₂ in calibration gas</source>
-        <translation>Kalibrointikaasun happipitoisuus</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1535"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2843"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1719"/>
@@ -1515,6 +1472,12 @@
         <translation>pO₂ min</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1583"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1722"/>
+        <source>Safety level</source>
+        <translation>Turvamarginaali</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1609"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1723"/>
         <source>Altitude range</source>
@@ -1548,6 +1511,20 @@
         <translation>P0 (ei mitään)</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1748"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1733"/>
+        <source>P1 (medium)</source>
+        <extracomment>Suunto safety level</extracomment>
+        <translation>P1 (keskimääräinen)</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1753"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1734"/>
+        <source>P2 (high)</source>
+        <extracomment>Suunto safety level</extracomment>
+        <translation>P2 (korkea)</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1761"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1736"/>
         <source>Sample rate</source>
@@ -1572,11 +1549,10 @@
         <translation>60s</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="531"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1799"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1745"/>
-        <source>Computer model</source>
-        <translation>Sukellustietokoneen malli</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1792"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1744"/>
+        <source>Total dive time</source>
+        <translation>Sukellusaika</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1816"/>
@@ -1641,12 +1617,6 @@
         <translation>Aikahälytys</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2099"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1765"/>
-        <source>Salinity</source>
-        <translation>Suolapitoisuus</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2074"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1774"/>
         <source>MM/DD/YY</source>
@@ -1665,12 +1635,30 @@
         <translation>VV/KK/PP</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2099"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1765"/>
+        <source>Salinity</source>
+        <translation>Suolapitoisuus</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2109"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1769"/>
+        <source>kg/ℓ</source>
+        <translation>kg/ℓ</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2341"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1794"/>
         <source>ZH-L16 CC</source>
         <translation>ZH-L16 CC</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2346"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1795"/>
+        <source>Apnoea</source>
+        <translation>Apnea</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2351"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1796"/>
         <source>L16-GF OC</source>
@@ -1689,87 +1677,112 @@
         <translation>PSCR-GF</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1108"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1129"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1539"/>
+        <source>OSTC 3</source>
+        <translation>OSTC 3</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1691"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1858"/>
+        <source>Set point [cbar]</source>
+        <translation>Set point [cbar]</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1693"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1860"/>
+        <source>Change depth [m]</source>
+        <translation>Vaihdon syvyys [m]</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1110"/>
+        <source>Backup dive computer settings</source>
+        <translation>Varmuuskopioi sukellustietokoneen asetukset</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1111"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1132"/>
         <source>Backup files (*.xml)</source>
         <translation>Varmuustiedostot (*.xml)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1113"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1115"/>
+        <source>XML backup error</source>
+        <translation>Virhe XML-varmuuskopioinnissa</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1116"/>
         <source>An error occurred while saving the backup file.
 %1</source>
         <translation>Virhe tallennettaessa varmistustiedostoa.
 %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1116"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1119"/>
         <source>Backup succeeded</source>
         <translation>Varmistus onnistui</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1117"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1120"/>
         <source>Your settings have been saved to: %1</source>
         <translation>Asetuksesi on tallennettu: %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1107"/>
-        <source>Backup dive computer settings</source>
-        <translation>Varmuuskopioi sukellustietokoneen asetukset</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1112"/>
-        <source>XML backup error</source>
-        <translation>Virhe XML-varmuuskopioinnissa</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1128"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1131"/>
         <source>Restore dive computer settings</source>
         <translation>Palauta sukellustietokoneen asetukset</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1134"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1137"/>
         <source>XML restore error</source>
         <translation>XML-tiedoston palautuksessa virhe</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1135"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1138"/>
         <source>An error occurred while restoring the backup file.
 %1</source>
         <translation>Virhe varmistustiedoston palautuksessa.
 %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1139"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1142"/>
         <source>Restore succeeded</source>
         <translation>Palautus onnistui</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1140"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1143"/>
         <source>Your settings have been restored successfully.</source>
         <translation>Asetuksesi on palautettu onnistuneesti.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1150"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1153"/>
         <source>Select firmware file</source>
         <translation>Valitse laiteohjelmiston tiedosto</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1151"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1154"/>
         <source>All files (*.*)</source>
         <translation>Kaikki tiedostot (*.*)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1207"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1210"/>
         <source>Choose file for divecomputer download logfile</source>
         <translation>Valitse lokitiedosto sukellustietokoneen purun tietojen tallennukseen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1208"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1211"/>
         <source>Log files (*.log)</source>
         <translation>Lokitiedostot (*.log)</translation>
     </message>
 </context>
 <context>
+    <name>ContextDrawer</name>
+    <message>
+        <location filename="../mobile-widgets/qml/kirigami/src/controls/ContextDrawer.qml" line="76"/>
+        <source>Actions</source>
+        <translation>Tapahtumat</translation>
+    </message>
+</context>
+<context>
     <name>CylindersModel</name>
     <message>
         <location filename="../qt-models/cylindermodel.cpp" line="16"/>
@@ -1783,11 +1796,6 @@
     </message>
     <message>
         <location filename="../qt-models/cylindermodel.cpp" line="16"/>
-        <source>He%</source>
-        <translation>He%</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="16"/>
         <source>Work press.</source>
         <translation>Paineluokka</translation>
     </message>
@@ -1807,9 +1815,24 @@
         <translation>O₂%</translation>
     </message>
     <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="16"/>
+        <source>He%</source>
+        <translation>He%</translation>
+    </message>
+    <message>
         <location filename="../qt-models/cylindermodel.cpp" line="17"/>
-        <source>Switch at</source>
-        <translation>Vaihda syvyydessä</translation>
+        <source>Deco switch at</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
+        <source>Bot. MOD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
+        <source>MND</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-models/cylindermodel.cpp" line="17"/>
@@ -1827,17 +1850,32 @@
         <translation>ℓ</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="161"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="177"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation>Poista säiliö.</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="383"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="180"/>
+        <source>Switch depth for deco gas. Calculated using Deco pO₂ preference, unless set manually.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="183"/>
+        <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to &apos;*&apos; for best O₂% for max depth.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="186"/>
+        <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to &apos;*&apos; for best He% for max depth.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="444"/>
         <source>Cylinder cannot be removed</source>
         <translation>Säiliötä ei voida poistaa</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="384"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="445"/>
         <source>This gas is 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>
@@ -1857,42 +1895,24 @@
         <translation>Mitkä osat haluat kopioida</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="73"/>
+        <location filename="../build/ui_divecomponentselection.h" line="141"/>
+        <source>Dive site</source>
+        <translation>Sukelluskohde</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="80"/>
         <location filename="../build/ui_divecomponentselection.h" line="142"/>
         <source>Suit</source>
         <translation>Puku</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="122"/>
-        <location filename="../build/ui_divecomponentselection.h" line="148"/>
-        <source>Divemaster</source>
-        <translation>Divemaster</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="129"/>
-        <location filename="../build/ui_divecomponentselection.h" line="149"/>
-        <source>Buddy</source>
-        <translation>Sukelluspari</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="136"/>
-        <location filename="../build/ui_divecomponentselection.h" line="150"/>
-        <source>Rating</source>
-        <translation>Yleisarvio</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="87"/>
         <location filename="../build/ui_divecomponentselection.h" line="143"/>
         <source>Visibility</source>
         <translation>Näkyvyys</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="73"/>
-        <location filename="../build/ui_divecomponentselection.h" line="141"/>
-        <source>Dive site</source>
-        <translation>Sukelluskohde</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="94"/>
         <location filename="../build/ui_divecomponentselection.h" line="144"/>
         <source>Notes</source>
@@ -1916,10 +1936,34 @@
         <source>Cylinders</source>
         <translation>Säiliöt</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="122"/>
+        <location filename="../build/ui_divecomponentselection.h" line="148"/>
+        <source>Divemaster</source>
+        <translation>Divemaster</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="129"/>
+        <location filename="../build/ui_divecomponentselection.h" line="149"/>
+        <source>Buddy</source>
+        <translation>Sukelluspari</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="136"/>
+        <location filename="../build/ui_divecomponentselection.h" line="150"/>
+        <source>Rating</source>
+        <translation>Yleisarvio</translation>
+    </message>
 </context>
 <context>
     <name>DiveComputerManagementDialog</name>
     <message>
+        <location filename="../desktop-widgets/divecomputermanagementdialog.ui" line="17"/>
+        <location filename="../build/ui_divecomputermanagementdialog.h" line="65"/>
+        <source>Edit dive computer nicknames</source>
+        <translation>Muokkaa sukellustietokoneiden lempinimiä</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divecomputermanagementdialog.cpp" line="49"/>
         <source>Remove the selected dive computer?</source>
         <translation>Poistetaanko valittu sukellustietokone?</translation>
@@ -1931,12 +1975,6 @@
         <translation>Oletko varma, että haluat
 poistaa valitun sukellustietokoneen?</translation>
     </message>
-    <message>
-        <location filename="../desktop-widgets/divecomputermanagementdialog.ui" line="17"/>
-        <location filename="../build/ui_divecomputermanagementdialog.h" line="65"/>
-        <source>Edit dive computer nicknames</source>
-        <translation>Muokkaa sukellustietokoneiden lempinimiä</translation>
-    </message>
 </context>
 <context>
     <name>DiveComputerModel</name>
@@ -1964,17 +2002,17 @@ poistaa valitun sukellustietokoneen?</translation>
 <context>
     <name>DiveDetails</name>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="33"/>
+        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="38"/>
         <source>Dive details</source>
         <translation>Sukelluksen yksityiskohdat</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="67"/>
+        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="72"/>
         <source>Delete dive</source>
         <translation>Poista sukellus</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="84"/>
+        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="89"/>
         <source>Show on map</source>
         <translation>Näytä kartalla</translation>
     </message>
@@ -1982,88 +2020,93 @@ poistaa valitun sukellustietokoneen?</translation>
 <context>
     <name>DiveDetailsEdit</name>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="74"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="80"/>
         <source>Dive %1</source>
         <translation>Sukellus %1</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="78"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="84"/>
         <source>Date:</source>
         <translation>Päivä:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="86"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="92"/>
         <source>Location:</source>
         <translation>Kohde:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="95"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="101"/>
         <source>Coordinates:</source>
         <translation>Koordinaatit:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="104"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="110"/>
         <source>Use current
 GPS location:</source>
         <translation>Käytä GPS -sijaintia:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="118"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="124"/>
         <source>Depth:</source>
         <translation>Syvyys:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="127"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="133"/>
         <source>Duration:</source>
         <translation>Kesto:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="137"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="143"/>
         <source>Air Temp:</source>
         <translation>Ilman lämpötila:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="146"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="152"/>
         <source>Water Temp:</source>
         <translation>Veden lämpötila:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="155"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="161"/>
         <source>Suit:</source>
         <translation>Puku:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="164"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="176"/>
         <source>Buddy:</source>
         <translation>Sukelluspari:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="173"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="191"/>
         <source>Dive Master:</source>
         <translation>Sukellusvastaava:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="182"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="206"/>
         <source>Weight:</source>
         <translation>Massa:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="192"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="216"/>
+        <source>Cylinder:</source>
+        <translation>Säiliö:</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="231"/>
         <source>Gas mix:</source>
         <translation>Kaasuseos:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="203"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="241"/>
         <source>Start Pressure:</source>
         <translation>Alkupaine:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="213"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="250"/>
         <source>End Pressure:</source>
         <translation>Loppupaine:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="224"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="260"/>
         <source>Notes:</source>
         <translation>Muistiinpanot:</translation>
     </message>
@@ -2116,27 +2159,27 @@ GPS location:</source>
         <translation>Veden lämpötila:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="199"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="198"/>
         <source>Dive Master:</source>
         <translation>Sukellusvastaava:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="213"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="211"/>
         <source>Weight:</source>
         <translation>Massa:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="226"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="224"/>
         <source>Buddy:</source>
         <translation>Sukelluspari:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="239"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="237"/>
         <source>SAC:</source>
         <translation>Pintakulutus:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="254"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="252"/>
         <source>Notes</source>
         <translation>Muistiinpanot</translation>
     </message>
@@ -2144,18 +2187,18 @@ GPS location:</source>
 <context>
     <name>DiveEventItem</name>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="134"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="165"/>
         <source>Manual switch to OC</source>
         <translation>Vaihto avoimeen kiertoon</translation>
     </message>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="136"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="167"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation>alku</translation>
     </message>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="137"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="168"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation>loppu</translation>
@@ -2164,27 +2207,27 @@ GPS location:</source>
 <context>
     <name>DiveImportedModel</name>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="646"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="656"/>
         <source>Date/time</source>
         <translation>Päivä/aika</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="648"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="658"/>
         <source>Duration</source>
         <translation>Kesto</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="650"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="660"/>
         <source>Depth</source>
         <translation>Syvyys</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="672"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="682"/>
         <source>h:</source>
         <translation>t:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="672"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="682"/>
         <source>min</source>
         <translation>min</translation>
     </message>
@@ -2193,8 +2236,8 @@ GPS location:</source>
     <name>DiveList</name>
     <message>
         <location filename="../mobile-widgets/qml/DiveList.qml" line="12"/>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="226"/>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="232"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="227"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="233"/>
         <source>Dive list</source>
         <translation>Sukelluslista</translation>
     </message>
@@ -2209,110 +2252,115 @@ GPS location:</source>
         <translation>Kesto:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="222"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="223"/>
         <source>Cloud credentials</source>
         <translation>Pilvipalvelun tunnus</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="228"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="229"/>
         <source>Please tap the &apos;+&apos; button to add a dive</source>
         <translation>Napauta &apos;+&apos; -painiketta lisätäksesi sukelluksen</translation>
     </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="248"/>
+        <source>No dives in dive list</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DiveListView</name>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="846"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="849"/>
         <source>Expand all</source>
         <translation>Laajenna kaikki retket</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="848"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="851"/>
         <source>Collapse all</source>
         <translation>Supista kaikki retket</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="852"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="855"/>
         <source>Collapse others</source>
         <translation>Tiivistä muut</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="856"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="859"/>
         <source>Remove dive(s) from trip</source>
         <translation>Erota sukellukset retkestä</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="857"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="860"/>
         <source>Create new trip above</source>
         <translation>Liitä uuteen retkeen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="871"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="874"/>
         <source>Add dive(s) to trip immediately above</source>
         <translation>Lisää sukellukset yläpuoliseen retkeen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="873"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="876"/>
         <source>Add dive(s) to trip immediately below</source>
         <translation>Lisää sukellukset alapuoliseen retkeen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="877"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="880"/>
         <source>Merge trip with trip above</source>
         <translation>Liitä retki yllä olevaan retkeen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="878"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="881"/>
         <source>Merge trip with trip below</source>
         <translation>Liitä retki alla olevaan retkeen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="882"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="885"/>
         <source>Delete dive(s)</source>
         <translation>Poista sukellukset</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="884"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="887"/>
         <source>Mark dive(s) invalid</source>
         <translation>Merkitse sukellukset epäkelvoiksi</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="888"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="891"/>
         <source>Merge selected dives</source>
         <translation>Yhdistä valitut sukellukset</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="890"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="893"/>
         <source>Renumber dive(s)</source>
         <translation>Numeroi uudelleen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="891"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="894"/>
         <source>Shift dive times</source>
         <translation>Muuta sukellusaikoja</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="892"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="895"/>
         <source>Split selected dives</source>
         <translation>Jaa valitut sukellukset</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="893"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="896"/>
         <source>Load image(s) from file(s)</source>
         <translation>Lataa kuvia tiedostoista</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="894"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="897"/>
         <source>Load image(s) from web</source>
         <translation>Lataa kuvia verkosta</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="917"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="919"/>
         <source>Open image files</source>
         <translation>Avaa kuvatiedostot</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="917"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="919"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>Kuvatiedostot (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -2333,56 +2381,6 @@ GPS location:</source>
 <context>
     <name>DiveLogExportDialog</name>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="103"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="351"/>
-        <source>Export format</source>
-        <translation>Tiedostomuoto</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="134"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="353"/>
-        <source>UDDF</source>
-        <translation>UDDF</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="187"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="358"/>
-        <source>Worldmap</source>
-        <translation>Maailmankartta</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="197"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="359"/>
-        <source>I&amp;mage depths</source>
-        <translation>Kuvien syvyydet</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="243"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="360"/>
-        <source>Selection</source>
-        <translation>Valinta</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="252"/>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="346"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="361"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="372"/>
-        <source>Selected dives</source>
-        <translation>Valitut sukellukset</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="262"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="362"/>
-        <source>All dives</source>
-        <translation>Kaikki sukellukset</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="306"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="396"/>
-        <source>HTML</source>
-        <translation>HTML</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="14"/>
         <location filename="../build/ui_divelogexportdialog.h" line="349"/>
         <source>Export dive log files</source>
@@ -2395,12 +2393,24 @@ GPS location:</source>
         <translation>Yleiset vientimuodot</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="103"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="351"/>
+        <source>Export format</source>
+        <translation>Tiedostomuoto</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="115"/>
         <location filename="../build/ui_divelogexportdialog.h" line="352"/>
         <source>Subsurface &amp;XML</source>
         <translation>Subsurface &amp;XML</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="134"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="353"/>
+        <source>UDDF</source>
+        <translation>UDDF</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="147"/>
         <location filename="../build/ui_divelogexportdialog.h" line="354"/>
         <source>di&amp;velogs.de</source>
@@ -2425,238 +2435,297 @@ GPS location:</source>
         <translation>CSV sukelluksen tiedot</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="275"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="187"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="358"/>
+        <source>Worldmap</source>
+        <translation>Maailmankartta</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="197"/>
+        <source>TeX</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="207"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="359"/>
+        <source>I&amp;mage depths</source>
+        <translation>Kuvien syvyydet</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="253"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="360"/>
+        <source>Selection</source>
+        <translation>Valinta</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="262"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="356"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="361"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="372"/>
+        <source>Selected dives</source>
+        <translation>Valitut sukellukset</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="272"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="362"/>
+        <source>All dives</source>
+        <translation>Kaikki sukellukset</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="285"/>
         <location filename="../build/ui_divelogexportdialog.h" line="363"/>
         <source>CSV units</source>
         <translation>CSV -yksiköt</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="288"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="298"/>
         <location filename="../build/ui_divelogexportdialog.h" line="366"/>
         <source>Metric</source>
         <translation>Metrinen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="293"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="303"/>
         <location filename="../build/ui_divelogexportdialog.h" line="367"/>
         <source>Imperial</source>
         <translation>Brittiläinen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="324"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="316"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="396"/>
+        <source>HTML</source>
+        <translation>HTML</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="334"/>
         <location filename="../build/ui_divelogexportdialog.h" line="370"/>
         <source>General settings</source>
         <translation>Yleisasetukset</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="330"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="340"/>
         <location filename="../build/ui_divelogexportdialog.h" line="371"/>
         <source>Subsurface numbers</source>
         <translation>Subsurfacen numerointi</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="359"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="369"/>
         <location filename="../build/ui_divelogexportdialog.h" line="373"/>
         <source>Export yearly statistics</source>
         <translation>Vie vuositilastot</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="375"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="385"/>
         <location filename="../build/ui_divelogexportdialog.h" line="374"/>
         <source>All di&amp;ves</source>
         <translation>All di&amp;ves</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="385"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="395"/>
         <location filename="../build/ui_divelogexportdialog.h" line="375"/>
         <source>Export list only</source>
         <translation>Vie listamuodossa</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="392"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="402"/>
         <location filename="../build/ui_divelogexportdialog.h" line="376"/>
         <source>Export photos</source>
         <translation>Vie kuvat</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="408"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="418"/>
         <location filename="../build/ui_divelogexportdialog.h" line="377"/>
         <source>Style options</source>
         <translation>Tyyliasetukset</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="423"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="433"/>
         <location filename="../build/ui_divelogexportdialog.h" line="378"/>
         <source>Font</source>
         <translation>Fontti</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="433"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="443"/>
         <location filename="../build/ui_divelogexportdialog.h" line="379"/>
         <source>Font size</source>
         <translation>Fontin koko</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="444"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="454"/>
         <location filename="../build/ui_divelogexportdialog.h" line="382"/>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="449"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="459"/>
         <location filename="../build/ui_divelogexportdialog.h" line="383"/>
         <source>10</source>
         <translation>10</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="454"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="464"/>
         <location filename="../build/ui_divelogexportdialog.h" line="384"/>
         <source>12</source>
         <translation>12</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="459"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="469"/>
         <location filename="../build/ui_divelogexportdialog.h" line="385"/>
         <source>14</source>
         <translation>14</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="464"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="474"/>
         <location filename="../build/ui_divelogexportdialog.h" line="386"/>
         <source>16</source>
         <translation>16</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="469"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="479"/>
         <location filename="../build/ui_divelogexportdialog.h" line="387"/>
         <source>18</source>
         <translation>18</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="474"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="484"/>
         <location filename="../build/ui_divelogexportdialog.h" line="388"/>
         <source>20</source>
         <translation>20</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="482"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="492"/>
         <location filename="../build/ui_divelogexportdialog.h" line="390"/>
         <source>Theme</source>
         <translation>Teema</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="493"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="503"/>
         <location filename="../build/ui_divelogexportdialog.h" line="393"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="95"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="99"/>
         <source>Light</source>
         <translation>Vaalea</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="498"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="508"/>
         <location filename="../build/ui_divelogexportdialog.h" line="394"/>
         <source>Sand</source>
         <translation>Hiekka</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="134"/>
-        <source>UDDF files (*.uddf *.UDDF)</source>
-        <translation>UDDF -tiedostot (*.uddf *.UDDF)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="142"/>
-        <source>CSV files (*.csv *.CSV)</source>
-        <translation>CSV tiedostot (*.csv *.CSV)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="74"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="76"/>
         <source>Generic format that is used for data exchange between a variety of diving related programs.</source>
         <translation>Yleinen tiedostomuoto, jota käytetään sukelluslokien siirtämisessä eri sukellusohjelmistojen välillä.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="76"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="78"/>
         <source>Comma separated values describing the dive profile.</source>
         <translation>Pilkulla erotettu lista, joka kuvaa sukelluksen syvyysprofiilin.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="78"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="80"/>
         <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source>
         <translation>Pilkuilla erotettu lista sukelluksen tiedoista. Tässä on mukana suurin osa tiedoista, mutta ei sukellusprofiilia.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="80"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="82"/>
         <source>Send the dive data to divelogs.de website.</source>
         <translation>Lähetä sukellustiedot divelogs.de -verkkopalveluun.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="82"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="84"/>
         <source>Send the dive data to dive-share.appspot.com website</source>
         <translation>Lähetä sukellustiedot dive-share.appspot.com -verkkopalveluun</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="84"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="86"/>
         <source>HTML export of the dive locations, visualized on a world map.</source>
         <translation>Tallenna sukelluskohteet HTML -tiedostoon, joka näyttää sijainnit maailmankartalla.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="86"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="88"/>
         <source>Subsurface native XML format.</source>
         <translation>Subsurfacen oma XML -tiedostomuoto.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="88"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="90"/>
         <source>Write depths of images to file.</source>
         <translation>Tallenna kuvien syvyydet tiedostoon.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="133"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="92"/>
+        <source>Write dive as TeX macros to file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="137"/>
         <source>Export UDDF file as</source>
         <translation>Vienti UDDF -tiedostoon</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="137"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/>
+        <source>UDDF files (*.uddf *.UDDF)</source>
+        <translation>UDDF -tiedostot (*.uddf *.UDDF)</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divelogexportdialog.cpp" line="141"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="145"/>
         <source>Export CSV file as</source>
         <translation>Vienti CSV -tiedostoon</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="148"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="142"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="146"/>
+        <source>CSV files (*.csv *.CSV)</source>
+        <translation>CSV tiedostot (*.csv *.CSV)</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="152"/>
         <source>Export world map</source>
         <translation>Vie maailmankartta</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="149"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="169"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="153"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="177"/>
         <source>HTML files (*.html)</source>
         <translation>HTML -tiedostot (*.html)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="153"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="157"/>
         <source>Export Subsurface XML</source>
         <translation>Vie Subsurface XML</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="158"/>
         <source>XML files (*.xml *.ssrf)</source>
         <translation>XML -tiedostot (*.xml *.ssrf)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="162"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="166"/>
         <source>Save image depths</source>
         <translation>Tallenna kuvien syvyydet</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="168"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="170"/>
+        <source>Export to TeX file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="170"/>
+        <source>TeX files (*.tex)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="176"/>
         <source>Export HTML files as</source>
         <translation>Vie HTML -tiedostoihin</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="184"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="192"/>
         <source>Please wait, exporting...</source>
         <translation>Odota, vienti kesken...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="219"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="227"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="311"/>
         <source>Can&apos;t open file %s</source>
         <translation>Tiedoston avaus ei onnistu %s</translation>
     </message>
@@ -2670,25 +2739,6 @@ GPS location:</source>
         <translation>Liitä sukellusloki</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="643"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="727"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="856"/>
-        <source>Time</source>
-        <translation>Kello</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.ui" line="127"/>
-        <location filename="../build/ui_divelogimportdialog.h" line="164"/>
-        <source>Metric</source>
-        <translation>Metrinen</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.ui" line="132"/>
-        <location filename="../build/ui_divelogimportdialog.h" line="165"/>
-        <source>Imperial</source>
-        <translation>Brittiläinen</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divelogimportdialog.ui" line="89"/>
         <location filename="../build/ui_divelogimportdialog.h" line="152"/>
         <source>dd.mm.yyyy</source>
@@ -2707,74 +2757,6 @@ GPS location:</source>
         <translation>vvvv-kk-pp</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.ui" line="155"/>
-        <location filename="../build/ui_divelogimportdialog.h" line="167"/>
-        <source>Drag the tags above to each corresponding column below</source>
-        <translation>Raahaa yllä olevat tagit alapuolelle vastaaviin sarakkeisiin</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="641"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="729"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="852"/>
-        <source>Dive #</source>
-        <translation>Sukellus</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="642"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="723"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="854"/>
-        <source>Date</source>
-        <translation>Ajankohta</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="644"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="858"/>
-        <source>Duration</source>
-        <translation>Kesto</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="655"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="862"/>
-        <source>GPS</source>
-        <translation>GPS</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="645"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="864"/>
-        <source>Max. depth</source>
-        <translation>Suurin syvyys</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="646"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="866"/>
-        <source>Avg. depth</source>
-        <translation>Keskisyvyys</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="658"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="872"/>
-        <source>Suit</source>
-        <translation>Puku</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="663"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="878"/>
-        <source>Tags</source>
-        <translation>Avainsanat</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="652"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="894"/>
-        <source>O₂</source>
-        <translation>O₂</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="653"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="896"/>
-        <source>He</source>
-        <translation>He</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divelogimportdialog.ui" line="108"/>
         <location filename="../build/ui_divelogimportdialog.h" line="158"/>
         <source>Seconds</source>
@@ -2793,183 +2775,269 @@ GPS location:</source>
         <translation>Minuutit:sekunnit</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="654"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="860"/>
-        <source>Location</source>
-        <translation>Kohde</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.ui" line="127"/>
+        <location filename="../build/ui_divelogimportdialog.h" line="164"/>
+        <source>Metric</source>
+        <translation>Metrinen</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.ui" line="132"/>
+        <location filename="../build/ui_divelogimportdialog.h" line="165"/>
+        <source>Imperial</source>
+        <translation>Brittiläinen</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.ui" line="155"/>
+        <location filename="../build/ui_divelogimportdialog.h" line="167"/>
+        <source>Drag the tags above to each corresponding column below</source>
+        <translation>Raahaa yllä olevat tagit alapuolelle vastaaviin sarakkeisiin</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="354"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="499"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="505"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="355"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="528"/>
         <source>Tab</source>
         <translation>Sarkain</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="575"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="598"/>
         <source>Some column headers were pre-populated; please drag and drop the headers so they match the column they are in.</source>
         <translation>Osa otsakkeista on valmiiksi generoitu; raahaa otsakkeita s.e. ne vastaavat sarakkeiden tietoja.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="613"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="731"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="782"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="848"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="636"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="761"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="857"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="925"/>
         <source>Sample time</source>
         <translation>Näytteen aika</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="615"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="733"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="784"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="638"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="763"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="859"/>
         <source>Sample depth</source>
         <translation>Näytteen syvyys</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="617"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="735"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="786"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="640"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="765"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="861"/>
         <source>Sample temperature</source>
         <translation>Näytteen lämpötila</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="621"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="739"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="790"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="642"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="767"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="863"/>
+        <source>Sample pO₂</source>
+        <translation>Näytteen </translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="644"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="769"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="865"/>
         <source>Sample sensor1 pO₂</source>
         <translation>Näytesensori1 pO₂</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="623"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="741"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="792"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="646"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="771"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="867"/>
         <source>Sample sensor2 pO₂</source>
         <translation>Näytesensori2 pO₂</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="625"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="743"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="794"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="648"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="773"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="869"/>
         <source>Sample sensor3 pO₂</source>
         <translation>Näytesensori3 pO₂</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="633"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="751"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="802"/>
-        <source>Sample stopdepth</source>
-        <translation>Näytteen pysähdyssyvyys</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="637"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="755"/>
-        <source>Sample setpoint</source>
-        <translation>Näytteen setpoint</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="619"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="737"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="788"/>
-        <source>Sample pO₂</source>
-        <translation>Näytteen </translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="627"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="745"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="796"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="650"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="775"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="871"/>
         <source>Sample CNS</source>
         <translation>Näytteen CNS</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="629"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="747"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="798"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="652"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="777"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="873"/>
         <source>Sample NDL</source>
         <translation>Näytteen NDL</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="631"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="749"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="800"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="654"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="779"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="875"/>
         <source>Sample TTS</source>
         <translation>Näytteen TTS</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="635"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="753"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="804"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="656"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="781"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="877"/>
+        <source>Sample stopdepth</source>
+        <translation>Näytteen pysähdyssyvyys</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="658"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="783"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="879"/>
         <source>Sample pressure</source>
         <translation>Näytteen säiliöpaine</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="656"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="868"/>
-        <source>Divemaster</source>
-        <translation>Divemaster</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="660"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="785"/>
+        <source>Sample setpoint</source>
+        <translation>Näytteen setpoint</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="657"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="870"/>
-        <source>Buddy</source>
-        <translation>Sukelluspari</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="664"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="759"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="929"/>
+        <source>Dive #</source>
+        <translation>Sukellus</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="659"/>
-        <source>Rating</source>
-        <translation>Yleisarvio</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="665"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="753"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="931"/>
+        <source>Date</source>
+        <translation>Ajankohta</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="660"/>
-        <source>Visibility</source>
-        <translation>Näkyvyys</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="666"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="757"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="933"/>
+        <source>Time</source>
+        <translation>Kello</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="661"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="874"/>
-        <source>Notes</source>
-        <translation>Muistiinpanot</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="667"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="935"/>
+        <source>Duration</source>
+        <translation>Kesto</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="662"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="876"/>
-        <source>Weight</source>
-        <translation>Painot</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="668"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="941"/>
+        <source>Max. depth</source>
+        <translation>Suurin syvyys</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="669"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="943"/>
+        <source>Avg. depth</source>
+        <translation>Keskisyvyys</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="670"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="975"/>
+        <source>Air temp.</source>
+        <translation>Ilman lämpötila</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="671"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="977"/>
+        <source>Water temp.</source>
+        <translation>Veden lämpötila</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="649"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="888"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="672"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="965"/>
         <source>Cyl. size</source>
         <translation>Säiliön koko</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="650"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="890"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="673"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="967"/>
         <source>Start pressure</source>
         <translation>Alkupaine</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="651"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="892"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="674"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="969"/>
         <source>End pressure</source>
         <translation>Loppupaine</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="647"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="898"/>
-        <source>Air temp.</source>
-        <translation>Ilman lämpötila</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="675"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="971"/>
+        <source>O₂</source>
+        <translation>O₂</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="648"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="900"/>
-        <source>Water temp.</source>
-        <translation>Veden lämpötila</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="676"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="973"/>
+        <source>He</source>
+        <translation>He</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="677"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="937"/>
+        <source>Location</source>
+        <translation>Kohde</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="678"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="939"/>
+        <source>GPS</source>
+        <translation>GPS</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="679"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="945"/>
+        <source>Divemaster</source>
+        <translation>Divemaster</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="680"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="947"/>
+        <source>Buddy</source>
+        <translation>Sukelluspari</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="681"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="949"/>
+        <source>Suit</source>
+        <translation>Puku</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="682"/>
+        <source>Rating</source>
+        <translation>Yleisarvio</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="683"/>
+        <source>Visibility</source>
+        <translation>Näkyvyys</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="684"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="951"/>
+        <source>Notes</source>
+        <translation>Muistiinpanot</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="685"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="953"/>
+        <source>Weight</source>
+        <translation>Painot</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="686"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="955"/>
+        <source>Tags</source>
+        <translation>Avainsanat</translation>
     </message>
 </context>
 <context>
     <name>DiveObjectHelper</name>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="287"/>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="323"/>
         <source>%1 dive(s)</source>
         <translation>%1 sukellusta</translation>
     </message>
@@ -2977,18 +3045,18 @@ GPS location:</source>
 <context>
     <name>DivePlanner</name>
     <message>
-        <location filename="../desktop-widgets/diveplanner.ui" line="152"/>
-        <location filename="../build/ui_diveplanner.h" line="190"/>
-        <source>Altitude</source>
-        <translation>Korkeus</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/diveplanner.ui" line="109"/>
         <location filename="../build/ui_diveplanner.h" line="189"/>
         <source>Planned dive time</source>
         <translation>Suunniteltu sukelluksen kesto</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/diveplanner.ui" line="152"/>
+        <location filename="../build/ui_diveplanner.h" line="190"/>
+        <source>Altitude</source>
+        <translation>Korkeus</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/diveplanner.ui" line="159"/>
         <location filename="../build/ui_diveplanner.h" line="191"/>
         <source>ATM pressure</source>
@@ -3022,32 +3090,32 @@ GPS location:</source>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="134"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="136"/>
         <source>unknown</source>
         <translation>tuntematon</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="312"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="326"/>
         <source>Final depth</source>
         <translation>Lopullinen syvyys</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="314"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="328"/>
         <source>Run time</source>
         <translation>Kesto</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="316"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="330"/>
         <source>Duration</source>
         <translation>Kesto</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="318"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="332"/>
         <source>Used gas</source>
         <translation>Käytetty kaasuseos</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="320"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="334"/>
         <source>CC setpoint</source>
         <translation>CC -asetuspiste</translation>
     </message>
@@ -3055,22 +3123,22 @@ GPS location:</source>
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="108"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="112"/>
         <source>Dive planner points</source>
         <translation>Sukellussuunnitelman etappipisteet</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="112"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="116"/>
         <source>Available gases</source>
         <translation>Mahdolliset kaasut</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="137"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="143"/>
         <source>Add dive data point</source>
         <translation>Lisää sukellusetappi</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="146"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="152"/>
         <source>Save new</source>
         <translation>Tallenna uusi</translation>
     </message>
@@ -3103,11 +3171,36 @@ GPS location:</source>
         <translation>Väri</translation>
     </message>
     <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="124"/>
+        <source>User entered</source>
+        <translation>Käyttäjän syöttämä</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="126"/>
+        <source>Cylinder index</source>
+        <translation>Säiliöindeksi</translation>
+    </message>
+    <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="128"/>
         <source>Pressure S</source>
         <translation>Sensoripaine</translation>
     </message>
     <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="130"/>
+        <source>Pressure I</source>
+        <translation>Arvioitu paine</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="132"/>
+        <source>Ceiling</source>
+        <translation>Katto</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="134"/>
+        <source>SAC</source>
+        <translation>Pintakulutus</translation>
+    </message>
+    <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="136"/>
         <source>pN₂</source>
         <translation>pN₂</translation>
@@ -3143,49 +3236,24 @@ GPS location:</source>
         <translation>Sensori 3</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="152"/>
-        <source>Heart rate</source>
-        <translation>Syke</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="156"/>
-        <source>Mean depth @ s</source>
-        <translation>Keskisyvyys @ s</translation>
-    </message>
-    <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="150"/>
         <source>Ambient pressure</source>
         <translation>Ympäröivä paine</translation>
     </message>
     <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="152"/>
+        <source>Heart rate</source>
+        <translation>Syke</translation>
+    </message>
+    <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="154"/>
         <source>Gradient factor</source>
         <translation>Gradient Factor</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="130"/>
-        <source>Pressure I</source>
-        <translation>Arvioitu paine</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="124"/>
-        <source>User entered</source>
-        <translation>Käyttäjän syöttämä</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="126"/>
-        <source>Cylinder index</source>
-        <translation>Säiliöindeksi</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="132"/>
-        <source>Ceiling</source>
-        <translation>Katto</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="134"/>
-        <source>SAC</source>
-        <translation>Pintakulutus</translation>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="156"/>
+        <source>Mean depth @ s</source>
+        <translation>Keskisyvyys @ s</translation>
     </message>
 </context>
 <context>
@@ -3256,311 +3324,315 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="395"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="441"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="434"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="483"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="398"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="444"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="437"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="486"/>
         <source>Date</source>
         <translation>Ajankohta</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="401"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="447"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="440"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="489"/>
         <source>Rating</source>
         <translation>Yleisarvio</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="404"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="443"/>
         <source>Depth</source>
         <translation>Syvyys</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="410"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="446"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="495"/>
+        <source>Duration</source>
+        <translation>Kesto</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="449"/>
         <source>Temp</source>
         <translation>Lämpötila</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="413"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="452"/>
         <source>Weight</source>
         <translation>Painot</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="425"/>
-        <source>SAC</source>
-        <translation>Pintakulutus</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
-        <source>m</source>
-        <translation>m</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
-        <source>ft</source>
-        <translation>ft</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
-        <source>Weight(%1)</source>
-        <translation>Massa(%1)</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="416"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="462"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="455"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="504"/>
         <source>Suit</source>
         <translation>Puku</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="419"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="465"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="458"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="507"/>
         <source>Cyl</source>
         <translation>Säiliöt</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="422"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="468"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="461"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="510"/>
         <source>Gas</source>
         <translation>Kaasu</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
-        <source>SAC(%1)</source>
-        <translation>Pintakulutus(%1)</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="464"/>
+        <source>SAC</source>
+        <translation>Pintakulutus</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
-        <source>/min</source>
-        <translation>/min</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="467"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="518"/>
+        <source>OTU</source>
+        <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="431"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="479"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="470"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="521"/>
         <source>Max CNS</source>
         <translation>Max CNS</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="434"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="482"/>
-        <source>Location</source>
-        <translation>Kohde</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
+        <source>Photos</source>
+        <translation>Valokuvat</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
-        <source>kg</source>
-        <translation>kg</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="476"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="527"/>
+        <source>Location</source>
+        <translation>Kohde</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="492"/>
         <source>Depth(%1)</source>
         <translation>Syvyys(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="407"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="453"/>
-        <source>Duration</source>
-        <translation>Kesto</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="492"/>
+        <source>m</source>
+        <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="456"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="492"/>
+        <source>ft</source>
+        <translation>ft</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="498"/>
         <source>Temp(%1%2)</source>
         <translation>Lämpötila(%1%2)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="501"/>
+        <source>Weight(%1)</source>
+        <translation>Massa(%1)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="501"/>
+        <source>kg</source>
+        <translation>kg</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="501"/>
         <source>lbs</source>
         <translation>pauna</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="428"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="476"/>
-        <source>OTU</source>
-        <translation>OTU</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="515"/>
+        <source>SAC(%1)</source>
+        <translation>Pintakulutus(%1)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="515"/>
+        <source>/min</source>
+        <translation>/min</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="524"/>
+        <source>Photos before/during/after dive</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="164"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="165"/>
         <source>no dives were selected</source>
         <translation>sukelluksia ei ole valittu</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="174"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="175"/>
         <source>stylesheet to export to divelogs.de is not found</source>
         <translation>tyylitiedostoa divelogs.de:hen vientiin ei löytynyt</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="184"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="185"/>
         <source>failed to create zip file for upload: %s</source>
         <translation>zip -tiedoston luonti vientiä varten epäonnistui: %s</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="236"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="237"/>
         <source>internal error</source>
         <translation>sisäinen virhe</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="244"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="245"/>
         <source>Conversion of dive %1 to divelogs.de format failed</source>
         <translation>Sukelluksen %1 muuntaminen divelogs.de:n muotoon epäonnistui</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="272"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="273"/>
         <source>error writing zip file: %s zip error %d system error %d - %s</source>
         <translation>virhe zip -tiedoston kirjoittamisessa: %s zip virhe %d järjestelmävirhe %d - %s</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="745"/>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="935"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="936"/>
         <source>Done</source>
         <translation>Valmis</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="778"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="779"/>
         <source>Uploading dive list...</source>
         <translation>Lähetetään sukelluslokia...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="810"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="811"/>
         <source>Downloading dive list...</source>
         <translation>Ladataan sukelluslokia...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="851"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="852"/>
         <source>Downloading %1 dives...</source>
         <translation>Ladataan %1 sukellusta...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="885"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="886"/>
         <source>Download finished - %1</source>
         <translation>Lataus päättynyt - %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="899"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="900"/>
         <source>Problem with download</source>
         <translation>Virhe latauksessa</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="900"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="901"/>
         <source>The archive could not be opened:
 </source>
         <translation>Pakattua tiedostoa ei voitu avata:
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="909"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="910"/>
         <source>Corrupted download</source>
         <translation>Lataus on korruptoitunut</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="910"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="911"/>
         <source>The archive could not be opened:
 %1</source>
         <translation>Pakattua tiedostoa ei voitu avata:
 %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="937"/>
+        <source>Upload finished</source>
+        <translation>Lähetys valmistui</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="950"/>
         <source>Upload failed</source>
         <translation>Lähetys epäonnistui</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="952"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="953"/>
         <source>Upload successful</source>
         <translation>Lähetys onnistui</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="955"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="956"/>
         <source>Login failed</source>
         <translation>Kirjautuminen epäonnistui</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="958"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="959"/>
         <source>Cannot parse response</source>
         <translation>Vastauksen jäsentäminen ei onnistu!</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="970"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="971"/>
         <source>Error: %1</source>
         <translation>Virhe: %1</translation>
     </message>
-    <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="936"/>
-        <source>Upload finished</source>
-        <translation>Lähetys valmistui</translation>
-    </message>
 </context>
 <context>
     <name>DownloadFromDCWidget</name>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="185"/>
-        <source>Error</source>
-        <translation>Virhe</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="436"/>
-        <source>Retry</source>
-        <translation>Yritä uudestaan</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="280"/>
-        <source>Find Uemis dive computer</source>
-        <translation>Etsi Uemis -sukellustietokone</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="101"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="107"/>
         <source>Download</source>
         <translation>Lataa</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="104"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="110"/>
         <source>Choose Bluetooth download mode</source>
         <translation>Valitse latausmoodi Bluetoothille</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="382"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="191"/>
+        <source>Error</source>
+        <translation>Virhe</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="286"/>
+        <source>Find Uemis dive computer</source>
+        <translation>Etsi Uemis -sukellustietokone</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="392"/>
         <source>Choose file for divecomputer download logfile</source>
         <translation>Valitse lokitiedosto sukellustietokoneen purun tietojen tallennukseen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="383"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="393"/>
         <source>Log files (*.log)</source>
         <translation>Lokitiedostot (*.log)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="398"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="408"/>
         <source>Warning</source>
         <translation>Varoitus</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="399"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="409"/>
         <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="../desktop-widgets/downloadfromdivecomputer.cpp" line="410"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="420"/>
         <source>Choose file for divecomputer binary dump file</source>
         <translation>Valitse tiedosto sukellustietokoneen latauksen raakatiedostolle</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="411"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="421"/>
         <source>Dump files (*.bin)</source>
         <translation>Raakatiedostot (*.bin)</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="446"/>
+        <source>Retry</source>
+        <translation>Yritä uudestaan</translation>
+    </message>
 </context>
 <context>
     <name>DownloadFromDiveComputer</name>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="139"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="275"/>
-        <source>Vendor</source>
-        <translation>Valmistaja</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="14"/>
         <location filename="../build/ui_downloadfromdivecomputer.h" line="265"/>
         <source>Download from dive computer</source>
@@ -3573,17 +3645,6 @@ p, li { white-space: pre-wrap; }
         <translation>Laite- tai hakemistopolku</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="122"/>
-        <source>Choose Bluetooth download mode</source>
-        <translation>Valitse latausmoodi Bluetoothille</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="149"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="276"/>
-        <source>Dive computer</source>
-        <translation>Sukellustietokone</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="66"/>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="101"/>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="115"/>
@@ -3607,11 +3668,46 @@ p, li { white-space: pre-wrap; }
         <translation>Suosi aina ladattuja sukelluksia</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="87"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="270"/>
+        <source>Download into new trip</source>
+        <translation>Lataa uuteen rekteen</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="94"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="271"/>
+        <source>Save libdivecomputer logfile</source>
+        <translation>Tallenna sukellustietokoneen lokitiedosto</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="108"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="273"/>
+        <source>Save libdivecomputer dumpfile</source>
+        <translation>Tallenna sukellustietokoneen raakatiedosto</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="122"/>
+        <source>Choose Bluetooth download mode</source>
+        <translation>Valitse latausmoodi Bluetoothille</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="129"/>
         <source>Select a remote Bluetooth device.</source>
         <translation>Valitse ulkoinen Bluetooth -laite.</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="139"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="275"/>
+        <source>Vendor</source>
+        <translation>Valmistaja</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="149"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="276"/>
+        <source>Dive computer</source>
+        <translation>Sukellustietokone</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/>
         <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="52"/>
         <location filename="../build/ui_downloadfromdivecomputer.h" line="277"/>
@@ -3619,18 +3715,6 @@ p, li { white-space: pre-wrap; }
         <translation>Lataa</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="284"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="281"/>
-        <source>OK</source>
-        <translation>OK</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="291"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="282"/>
-        <source>Cancel</source>
-        <translation>Peruuta</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="226"/>
         <location filename="../build/ui_downloadfromdivecomputer.h" line="278"/>
         <source>Downloaded dives</source>
@@ -3649,22 +3733,16 @@ p, li { white-space: pre-wrap; }
         <translation>Poista valinnat</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="94"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="271"/>
-        <source>Save libdivecomputer logfile</source>
-        <translation>Tallenna sukellustietokoneen lokitiedosto</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="108"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="273"/>
-        <source>Save libdivecomputer dumpfile</source>
-        <translation>Tallenna sukellustietokoneen raakatiedosto</translation>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="284"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="281"/>
+        <source>OK</source>
+        <translation>OK</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="87"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="270"/>
-        <source>Download into new trip</source>
-        <translation>Lataa uuteen rekteen</translation>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="291"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="282"/>
+        <source>Cancel</source>
+        <translation>Peruuta</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="16"/>
@@ -3754,12 +3832,12 @@ p, li { white-space: pre-wrap; }
         <translation>Varaus yhdistämiseen Facebookiin</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="297"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="242"/>
         <source>To disconnect Subsurface from your Facebook account, use the button below</source>
         <translation>Yhteyden katkaisu Facebookiin onnistuu alapuolisella painikkeella</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="306"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="251"/>
         <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source>
         <translation>Kirjaudu sisään luodaksesi yhteyden Facebookiin. Tämä mahdollistaa sukelluslokien julkaisun aikajanaasi suoraan Subsurfacesta</translation>
     </message>
@@ -3767,22 +3845,22 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>FacebookManager</name>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="266"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="211"/>
         <source>Photo upload sucessfull</source>
         <translation>Kuvien lähetys onnistui</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="267"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="212"/>
         <source>Your dive profile was updated to Facebook.</source>
         <translation>Sukellusprofiilis päivitettiin Facebookiin.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="271"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="216"/>
         <source>Photo upload failed</source>
         <translation>Kuvien lähetys epäonnistui</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="272"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="217"/>
         <source>Your dive profile was not updated to Facebook, 
  please send the following to the developer. 
 </source>
@@ -3844,17 +3922,25 @@ ole hyvä ja lähetä seuraava tieto kehittäjille.
 <context>
     <name>FirmwareUpdateThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1750"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1739"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Ominaisuus ei ole vielä saatavilla valitulle sukellustietokoneelle.</translation>
     </message>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1755"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1744"/>
         <source>Firmware update failed!</source>
         <translation>Laiteohjelmiston päivitys epäonnistui!</translation>
     </message>
 </context>
 <context>
+    <name>GlobalDrawer</name>
+    <message>
+        <location filename="../mobile-widgets/qml/kirigami/src/controls/GlobalDrawer.qml" line="364"/>
+        <source>Back</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>GlobeGPS</name>
     <message>
         <location filename="../desktop-widgets/globe.cpp" line="124"/>
@@ -3870,27 +3956,27 @@ ole hyvä ja lähetä seuraava tieto kehittäjille.
         <translation>GPS sijainnit</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="40"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="32"/>
         <source>Date: </source>
         <translation>Päiväys:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="50"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="42"/>
         <source>Name: </source>
         <translation>Nimi:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="60"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="52"/>
         <source>Latitude: </source>
         <translation>Leveyspiiri:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="69"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="61"/>
         <source>Longitude: </source>
         <translation>Pituuspiiri:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="113"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="105"/>
         <source>List of stored GPS fixes</source>
         <translation>Tallennetut GPS sijainnit</translation>
     </message>
@@ -3919,7 +4005,7 @@ ole hyvä ja lähetä seuraava tieto kehittäjille.
 <context>
     <name>LocationFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="648"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="646"/>
         <source>Location: </source>
         <translation>Sijainti:</translation>
     </message>
@@ -3960,7 +4046,7 @@ ole hyvä ja lähetä seuraava tieto kehittäjille.
 <context>
     <name>LocationFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="299"/>
+        <location filename="../qt-models/filtermodels.cpp" line="304"/>
         <source>No location set</source>
         <translation>Sijaintia ei asetettu</translation>
     </message>
@@ -4083,6 +4169,54 @@ ole hyvä ja lähetä seuraava tieto kehittäjille.
 <context>
     <name>MainTab</name>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="18"/>
+        <location filename="../desktop-widgets/maintab.ui" line="439"/>
+        <location filename="../build/ui_maintab.h" line="961"/>
+        <location filename="../build/ui_maintab.h" line="963"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="539"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="571"/>
+        <source>Notes</source>
+        <translation>Muistiinpanot</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="21"/>
+        <location filename="../build/ui_maintab.h" line="964"/>
+        <source>General notes about the current selection</source>
+        <translation>Yleisiä huomioita valinnasta</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="92"/>
+        <location filename="../desktop-widgets/maintab.ui" line="646"/>
+        <location filename="../build/ui_maintab.h" line="947"/>
+        <location filename="../build/ui_maintab.h" line="967"/>
+        <source>Date</source>
+        <translation>Ajankohta</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="102"/>
+        <location filename="../build/ui_maintab.h" line="948"/>
+        <source>Time</source>
+        <translation>Kello</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="112"/>
+        <location filename="../desktop-widgets/maintab.ui" line="836"/>
+        <location filename="../build/ui_maintab.h" line="949"/>
+        <location filename="../build/ui_maintab.h" line="987"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="306"/>
+        <source>Air temp.</source>
+        <translation>Ilman lämpötila</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="122"/>
+        <location filename="../desktop-widgets/maintab.ui" line="855"/>
+        <location filename="../build/ui_maintab.h" line="950"/>
+        <location filename="../build/ui_maintab.h" line="989"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="307"/>
+        <source>Water temp.</source>
+        <translation>Veden lämpötila</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="184"/>
         <location filename="../build/ui_maintab.h" line="951"/>
         <location filename="../desktop-widgets/maintab.cpp" line="570"/>
@@ -4090,6 +4224,17 @@ ole hyvä ja lähetä seuraava tieto kehittäjille.
         <translation>Kohde</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="214"/>
+        <source>Edit dive site</source>
+        <translation>Muokkaa sukelluskohdetta</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="217"/>
+        <location filename="../build/ui_maintab.h" line="953"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="252"/>
         <location filename="../build/ui_maintab.h" line="954"/>
         <source>Divemaster</source>
@@ -4102,12 +4247,6 @@ ole hyvä ja lähetä seuraava tieto kehittäjille.
         <translation>Sukelluspari</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.ui" line="387"/>
-        <location filename="../build/ui_maintab.h" line="959"/>
-        <source>Tags</source>
-        <translation>Avainsanat</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/maintab.ui" line="308"/>
         <location filename="../build/ui_maintab.h" line="956"/>
         <source>Rating</source>
@@ -4126,57 +4265,18 @@ ole hyvä ja lähetä seuraava tieto kehittäjille.
         <translation>Puku</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="387"/>
+        <location filename="../build/ui_maintab.h" line="959"/>
+        <source>Tags</source>
+        <translation>Avainsanat</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="397"/>
         <location filename="../build/ui_maintab.h" line="960"/>
         <source>Dive mode</source>
         <translation>Sukellustyyppi</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.ui" line="112"/>
-        <location filename="../desktop-widgets/maintab.ui" line="836"/>
-        <location filename="../build/ui_maintab.h" line="949"/>
-        <location filename="../build/ui_maintab.h" line="987"/>
-        <location filename="../desktop-widgets/maintab.cpp" line="306"/>
-        <source>Air temp.</source>
-        <translation>Ilman lämpötila</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="122"/>
-        <location filename="../desktop-widgets/maintab.ui" line="855"/>
-        <location filename="../build/ui_maintab.h" line="950"/>
-        <location filename="../build/ui_maintab.h" line="989"/>
-        <location filename="../desktop-widgets/maintab.cpp" line="307"/>
-        <source>Water temp.</source>
-        <translation>Veden lämpötila</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="18"/>
-        <location filename="../desktop-widgets/maintab.ui" line="439"/>
-        <location filename="../build/ui_maintab.h" line="961"/>
-        <location filename="../build/ui_maintab.h" line="963"/>
-        <location filename="../desktop-widgets/maintab.cpp" line="539"/>
-        <location filename="../desktop-widgets/maintab.cpp" line="571"/>
-        <source>Notes</source>
-        <translation>Muistiinpanot</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="21"/>
-        <location filename="../build/ui_maintab.h" line="964"/>
-        <source>General notes about the current selection</source>
-        <translation>Yleisiä huomioita valinnasta</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="214"/>
-        <source>Edit dive site</source>
-        <translation>Muokkaa sukelluskohdetta</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="217"/>
-        <location filename="../build/ui_maintab.h" line="953"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/maintab.ui" line="491"/>
         <location filename="../build/ui_maintab.h" line="965"/>
         <source>Equipment</source>
@@ -4201,6 +4301,12 @@ ole hyvä ja lähetä seuraava tieto kehittäjille.
         <translation>Sukellustiedot</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="665"/>
+        <location filename="../build/ui_maintab.h" line="969"/>
+        <source>Interval</source>
+        <translation>Pinta-aika</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="684"/>
         <location filename="../build/ui_maintab.h" line="971"/>
         <source>Gases used</source>
@@ -4213,18 +4319,38 @@ ole hyvä ja lähetä seuraava tieto kehittäjille.
         <translation>Kaasun kulutus</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="722"/>
+        <location filename="../desktop-widgets/maintab.ui" line="1094"/>
+        <location filename="../build/ui_maintab.h" line="975"/>
+        <location filename="../build/ui_maintab.h" line="1003"/>
+        <source>SAC</source>
+        <translation>Pintakulutus</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="741"/>
         <location filename="../build/ui_maintab.h" line="977"/>
         <source>CNS</source>
         <translation>Happikertymä (CNS)</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="760"/>
+        <location filename="../build/ui_maintab.h" line="979"/>
+        <source>OTU</source>
+        <translation>Happikertymä (OTU)</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="779"/>
         <location filename="../build/ui_maintab.h" line="981"/>
         <source>Max. depth</source>
         <translation>Suurin syvyys</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="798"/>
+        <location filename="../build/ui_maintab.h" line="983"/>
+        <source>Avg. depth</source>
+        <translation>Keskisyvyys</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="817"/>
         <location filename="../build/ui_maintab.h" line="985"/>
         <source>Air pressure</source>
@@ -4237,82 +4363,6 @@ ole hyvä ja lähetä seuraava tieto kehittäjille.
         <translation>Sukellusaika</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.ui" line="933"/>
-        <location filename="../build/ui_maintab.h" line="1007"/>
-        <source>Simple statistics about the selection</source>
-        <translation>Valinnan tilastot</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1039"/>
-        <location filename="../build/ui_maintab.h" line="999"/>
-        <source>Total time</source>
-        <translation>Kokonaisaika</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1106"/>
-        <location filename="../build/ui_maintab.h" line="1004"/>
-        <source>Gas consumption</source>
-        <translation>Kaasun kulutus</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1151"/>
-        <location filename="../build/ui_maintab.h" line="1009"/>
-        <source>All photos from the current selection</source>
-        <translation>Kaikki tämänhetkisen valinnan kuvat</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1177"/>
-        <location filename="../build/ui_maintab.h" line="1010"/>
-        <source>Extra data</source>
-        <translation>Lisätiedot</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1180"/>
-        <location filename="../build/ui_maintab.h" line="1011"/>
-        <source>Adittional data from the dive computer</source>
-        <translation>Lisätietoja sukellustietokoneelta</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="92"/>
-        <location filename="../desktop-widgets/maintab.ui" line="646"/>
-        <location filename="../build/ui_maintab.h" line="947"/>
-        <location filename="../build/ui_maintab.h" line="967"/>
-        <source>Date</source>
-        <translation>Ajankohta</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="102"/>
-        <location filename="../build/ui_maintab.h" line="948"/>
-        <source>Time</source>
-        <translation>Kello</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="665"/>
-        <location filename="../build/ui_maintab.h" line="969"/>
-        <source>Interval</source>
-        <translation>Pinta-aika</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="722"/>
-        <location filename="../desktop-widgets/maintab.ui" line="1094"/>
-        <location filename="../build/ui_maintab.h" line="975"/>
-        <location filename="../build/ui_maintab.h" line="1003"/>
-        <source>SAC</source>
-        <translation>Pintakulutus</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="798"/>
-        <location filename="../build/ui_maintab.h" line="983"/>
-        <source>Avg. depth</source>
-        <translation>Keskisyvyys</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="760"/>
-        <location filename="../build/ui_maintab.h" line="979"/>
-        <source>OTU</source>
-        <translation>Happikertymä (OTU)</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/maintab.ui" line="893"/>
         <location filename="../build/ui_maintab.h" line="993"/>
         <source>Salinity</source>
@@ -4325,22 +4375,34 @@ ole hyvä ja lähetä seuraava tieto kehittäjille.
         <translation>Tilastot</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="933"/>
+        <location filename="../build/ui_maintab.h" line="1007"/>
+        <source>Simple statistics about the selection</source>
+        <translation>Valinnan tilastot</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="986"/>
         <location filename="../build/ui_maintab.h" line="996"/>
         <source>Depth</source>
         <translation>Syvyys</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="998"/>
+        <location filename="../build/ui_maintab.h" line="997"/>
+        <source>Duration</source>
+        <translation>Kesto</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="1027"/>
         <location filename="../build/ui_maintab.h" line="998"/>
         <source>Temperature</source>
         <translation>Lämpötila</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.ui" line="998"/>
-        <location filename="../build/ui_maintab.h" line="997"/>
-        <source>Duration</source>
-        <translation>Kesto</translation>
+        <location filename="../desktop-widgets/maintab.ui" line="1039"/>
+        <location filename="../build/ui_maintab.h" line="999"/>
+        <source>Total time</source>
+        <translation>Kokonaisaika</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/maintab.ui" line="1058"/>
@@ -4349,20 +4411,34 @@ ole hyvä ja lähetä seuraava tieto kehittäjille.
         <translation>Sukelluksia</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="1106"/>
+        <location filename="../build/ui_maintab.h" line="1004"/>
+        <source>Gas consumption</source>
+        <translation>Kaasun kulutus</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="1148"/>
         <location filename="../build/ui_maintab.h" line="1008"/>
         <source>Photos</source>
         <translation>Valokuvat</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.cpp" line="88"/>
-        <source>Cylinders</source>
-        <translation>Säiliöt</translation>
+        <location filename="../desktop-widgets/maintab.ui" line="1151"/>
+        <location filename="../build/ui_maintab.h" line="1009"/>
+        <source>All photos from the current selection</source>
+        <translation>Kaikki tämänhetkisen valinnan kuvat</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.cpp" line="92"/>
-        <source>Weights</source>
-        <translation>Painot</translation>
+        <location filename="../desktop-widgets/maintab.ui" line="1177"/>
+        <location filename="../build/ui_maintab.h" line="1010"/>
+        <source>Extra data</source>
+        <translation>Lisätiedot</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="1180"/>
+        <location filename="../build/ui_maintab.h" line="1011"/>
+        <source>Adittional data from the dive computer</source>
+        <translation>Lisätietoja sukellustietokoneelta</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/maintab.cpp" line="63"/>
@@ -4375,11 +4451,21 @@ ole hyvä ja lähetä seuraava tieto kehittäjille.
         <translation>Hylkää muutokset</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.cpp" line="88"/>
+        <source>Cylinders</source>
+        <translation>Säiliöt</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.cpp" line="89"/>
         <source>Add cylinder</source>
         <translation>Lisää säiliö</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.cpp" line="92"/>
+        <source>Weights</source>
+        <translation>Painot</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.cpp" line="93"/>
         <source>Add weight system</source>
         <translation>Lisää painojärjestelmä</translation>
@@ -4572,659 +4658,685 @@ sekoittaa ilmasta ja käyttäen:
         <translation>Tiedosto</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="455"/>
-        <location filename="../build/ui_mainwindow.h" line="534"/>
-        <source>Export dive logs</source>
-        <translation>Sukelluslokin vienti</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="510"/>
-        <location filename="../build/ui_mainwindow.h" line="542"/>
-        <source>Toggle pHe graph</source>
-        <translation>Näytä/piilota pHe-kuvaaja</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="546"/>
-        <location filename="../build/ui_mainwindow.h" line="545"/>
-        <source>Toggle calculating all tissues</source>
-        <translation>Näytä/piilota kaikkien kudosten laskenta</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="522"/>
-        <location filename="../build/ui_mainwindow.h" line="543"/>
-        <source>Toggle DC reported ceiling</source>
-        <translation>Näytä/piilota sukellustietokoneen raportoima kattosyvyys</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="534"/>
-        <location filename="../build/ui_mainwindow.h" line="544"/>
-        <source>Toggle calculated ceiling</source>
-        <translation>Näytä/piilota laskettu kattosyvyys</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="606"/>
-        <location filename="../build/ui_mainwindow.h" line="550"/>
-        <source>Toggle NDL, TTS</source>
-        <translation>Näytä/piilota NDL, TTS</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="558"/>
-        <location filename="../build/ui_mainwindow.h" line="546"/>
-        <source>Toggle calculated ceiling with 3m increments</source>
-        <translation>Näytä/piilota laskettu kattosyvyys 3m:n tarkkuudella</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="463"/>
-        <location filename="../build/ui_mainwindow.h" line="537"/>
-        <source>Configure &amp;dive computer</source>
-        <translation>Ohjelmoi sukellustietokone</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="570"/>
-        <location filename="../build/ui_mainwindow.h" line="547"/>
-        <source>Toggle heart rate</source>
-        <translation>Näytä/piilota syke</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="582"/>
-        <location filename="../build/ui_mainwindow.h" line="548"/>
-        <source>Toggle MOD</source>
-        <translation>Näytä/piilota MOD</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="594"/>
-        <location filename="../build/ui_mainwindow.h" line="549"/>
-        <source>Toggle EAD, END, EADD</source>
-        <translation>Näytä/piilota EAD, END sekä EADD</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="618"/>
-        <location filename="../build/ui_mainwindow.h" line="551"/>
-        <source>Toggle SAC rate</source>
-        <translation>Näytä/piilota hengitysnopeus</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="630"/>
-        <location filename="../build/ui_mainwindow.h" line="552"/>
-        <source>Toggle ruler</source>
-        <translation>Näytä/piilota viivain</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="86"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="87"/>
         <location filename="../build/ui_mainwindow.h" line="569"/>
         <source>&amp;Log</source>
         <translation>Loki</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="105"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="104"/>
         <location filename="../build/ui_mainwindow.h" line="570"/>
         <source>&amp;View</source>
         <translation>Näkymä</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="121"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="120"/>
         <location filename="../build/ui_mainwindow.h" line="571"/>
         <source>&amp;Help</source>
         <translation>Apua</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="130"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="129"/>
         <location filename="../build/ui_mainwindow.h" line="572"/>
         <source>&amp;Import</source>
         <translation>Liitä</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="139"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="138"/>
         <location filename="../build/ui_mainwindow.h" line="573"/>
         <source>&amp;Edit</source>
         <translation>Muuta</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="144"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="143"/>
         <source>Share on</source>
         <translation>Jaa</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="158"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="157"/>
         <location filename="../build/ui_mainwindow.h" line="453"/>
         <source>&amp;New logbook</source>
         <translation>Uusi loki</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="161"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="160"/>
         <location filename="../build/ui_mainwindow.h" line="455"/>
         <source>New</source>
         <translation>Uusi</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="164"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="163"/>
         <location filename="../build/ui_mainwindow.h" line="457"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="169"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="168"/>
         <location filename="../build/ui_mainwindow.h" line="458"/>
         <source>&amp;Open logbook</source>
         <translation>Avaa loki</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="172"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="171"/>
         <location filename="../build/ui_mainwindow.h" line="460"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="508"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="502"/>
         <source>Open</source>
         <translation>Avaa</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="175"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="174"/>
         <location filename="../build/ui_mainwindow.h" line="462"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="180"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="179"/>
         <location filename="../build/ui_mainwindow.h" line="463"/>
         <source>&amp;Save</source>
         <translation>Tallenna</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="183"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="182"/>
         <location filename="../build/ui_mainwindow.h" line="465"/>
         <source>Save</source>
         <translation>Tallenna</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="186"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="185"/>
         <location filename="../build/ui_mainwindow.h" line="467"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="191"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="190"/>
         <location filename="../build/ui_mainwindow.h" line="468"/>
         <source>Sa&amp;ve as</source>
         <translation>Tallenna nimellä</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="194"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="193"/>
         <location filename="../build/ui_mainwindow.h" line="470"/>
         <source>Save as</source>
         <translation>Tallenna nimellä...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="197"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="196"/>
         <location filename="../build/ui_mainwindow.h" line="472"/>
         <source>Ctrl+Shift+S</source>
         <translation>Ctrl+Shift+S</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="202"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="201"/>
         <location filename="../build/ui_mainwindow.h" line="473"/>
         <source>&amp;Close</source>
         <translation>Sulje</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="205"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="204"/>
         <location filename="../build/ui_mainwindow.h" line="475"/>
         <source>Close</source>
         <translation>Sulje</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="208"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="207"/>
         <location filename="../build/ui_mainwindow.h" line="477"/>
         <source>Ctrl+W</source>
         <translation>Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="221"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="212"/>
+        <location filename="../build/ui_mainwindow.h" line="478"/>
+        <source>&amp;Print</source>
+        <translation>Tulosta</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="215"/>
+        <location filename="../build/ui_mainwindow.h" line="479"/>
+        <source>Ctrl+P</source>
+        <translation>Ctrl+P</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="220"/>
         <location filename="../build/ui_mainwindow.h" line="480"/>
         <source>P&amp;references</source>
         <translation>Asetukset</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="251"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="223"/>
+        <location filename="../build/ui_mainwindow.h" line="481"/>
+        <source>Ctrl+,</source>
+        <translation>Ctrl+,</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="231"/>
+        <location filename="../build/ui_mainwindow.h" line="482"/>
+        <source>&amp;Quit</source>
+        <translation>Lopeta</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="234"/>
+        <location filename="../build/ui_mainwindow.h" line="483"/>
+        <source>Ctrl+Q</source>
+        <translation>Ctrl+Q</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="242"/>
+        <location filename="../build/ui_mainwindow.h" line="484"/>
+        <source>Import from &amp;dive computer</source>
+        <translation>Hae sukellustietokoneelta</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="245"/>
+        <location filename="../build/ui_mainwindow.h" line="485"/>
+        <source>Ctrl+D</source>
+        <translation>Ctrl+D</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="250"/>
         <location filename="../build/ui_mainwindow.h" line="486"/>
         <source>Import &amp;GPS data from Subsurface web service</source>
         <translation>Liitä GPS-tiedot Subsurfacen on-line -palvelusta</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="259"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="253"/>
+        <location filename="../build/ui_mainwindow.h" line="487"/>
+        <source>Ctrl+G</source>
+        <translation>Ctrl+G</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="258"/>
         <location filename="../build/ui_mainwindow.h" line="488"/>
         <source>Edit device &amp;names</source>
         <translation>Muokkaa laitenimeä</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="272"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="263"/>
+        <location filename="../build/ui_mainwindow.h" line="489"/>
+        <source>&amp;Add dive</source>
+        <translation>Lisää sukellus</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="266"/>
+        <location filename="../build/ui_mainwindow.h" line="490"/>
+        <source>Ctrl++</source>
+        <translation>Ctrl++</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="271"/>
         <location filename="../build/ui_mainwindow.h" line="491"/>
         <source>&amp;Edit dive</source>
         <translation>Muokkaa sukellusta</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="277"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="276"/>
         <location filename="../build/ui_mainwindow.h" line="492"/>
         <source>&amp;Copy dive components</source>
         <translation>Kopioi sukelluksen osat</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="280"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="279"/>
         <location filename="../build/ui_mainwindow.h" line="493"/>
         <source>Ctrl+C</source>
         <translation>Ctrl+C</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="285"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="284"/>
         <location filename="../build/ui_mainwindow.h" line="494"/>
         <source>&amp;Paste dive components</source>
         <translation>Liitä sukelluksen osat</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="288"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="287"/>
         <location filename="../build/ui_mainwindow.h" line="495"/>
         <source>Ctrl+V</source>
         <translation>Ctrl+V</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="325"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="292"/>
+        <location filename="../build/ui_mainwindow.h" line="496"/>
+        <source>&amp;Renumber</source>
+        <translation>Numeroi uudelleen</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="295"/>
+        <location filename="../build/ui_mainwindow.h" line="497"/>
+        <source>Ctrl+R</source>
+        <translation>Ctrl+R</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="303"/>
+        <location filename="../build/ui_mainwindow.h" line="498"/>
+        <source>Auto &amp;group</source>
+        <translation>Ryhmittele automaattisesti</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="308"/>
+        <location filename="../build/ui_mainwindow.h" line="499"/>
+        <source>&amp;Yearly statistics</source>
+        <translation>Vuositilastot</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="311"/>
+        <location filename="../build/ui_mainwindow.h" line="500"/>
+        <source>Ctrl+Y</source>
+        <translation>Ctrl+Y</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="316"/>
+        <location filename="../build/ui_mainwindow.h" line="501"/>
+        <source>&amp;Dive list</source>
+        <translation>Sukelluslista</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="319"/>
+        <location filename="../build/ui_mainwindow.h" line="502"/>
+        <source>Ctrl+2</source>
+        <translation>Ctrl+2</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="324"/>
         <location filename="../build/ui_mainwindow.h" line="503"/>
         <source>&amp;Profile</source>
         <translation>Profiilikuvaaja</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="333"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="327"/>
+        <location filename="../build/ui_mainwindow.h" line="504"/>
+        <source>Ctrl+3</source>
+        <translation>Ctrl+3</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="332"/>
         <location filename="../build/ui_mainwindow.h" line="505"/>
         <source>&amp;Info</source>
         <translation>Tiedot</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="341"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="335"/>
+        <location filename="../build/ui_mainwindow.h" line="506"/>
+        <source>Ctrl+4</source>
+        <translation>Ctrl+4</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="340"/>
         <location filename="../build/ui_mainwindow.h" line="507"/>
         <source>&amp;All</source>
         <translation>Kaikki</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="357"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="343"/>
+        <location filename="../build/ui_mainwindow.h" line="508"/>
+        <source>Ctrl+1</source>
+        <translation>Ctrl+1</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="348"/>
+        <location filename="../build/ui_mainwindow.h" line="509"/>
+        <source>P&amp;revious DC</source>
+        <translation>Edellinen tietokone</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="351"/>
+        <location filename="../build/ui_mainwindow.h" line="510"/>
+        <source>Left</source>
+        <translation>Vasen</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="356"/>
         <location filename="../build/ui_mainwindow.h" line="511"/>
         <source>&amp;Next DC</source>
         <translation>Seuraava tietokone</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="365"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="359"/>
+        <location filename="../build/ui_mainwindow.h" line="512"/>
+        <source>Right</source>
+        <translation>Oikea</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="364"/>
         <location filename="../build/ui_mainwindow.h" line="513"/>
         <source>&amp;About Subsurface</source>
         <translation>Tietoja Subsurfacesta</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="381"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="372"/>
+        <location filename="../build/ui_mainwindow.h" line="514"/>
+        <source>User &amp;manual</source>
+        <translation>Käyttöohje</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="375"/>
+        <location filename="../build/ui_mainwindow.h" line="515"/>
+        <source>F1</source>
+        <translation>F1</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="380"/>
         <location filename="../build/ui_mainwindow.h" line="516"/>
         <source>&amp;Globe</source>
         <translation>Maapallo</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="403"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="383"/>
+        <location filename="../build/ui_mainwindow.h" line="517"/>
+        <source>Ctrl+5</source>
+        <translation>Ctrl+5</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="388"/>
+        <location filename="../build/ui_mainwindow.h" line="518"/>
+        <source>P&amp;lan dive</source>
+        <translation>Sukelluksen suunnittelu</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="391"/>
+        <location filename="../build/ui_mainwindow.h" line="519"/>
+        <source>Ctrl+L</source>
+        <translation>Ctrl+L</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="396"/>
+        <location filename="../build/ui_mainwindow.h" line="520"/>
+        <source>&amp;Import log files</source>
+        <translation>Liitä lokitiedostoja</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="399"/>
+        <location filename="../build/ui_mainwindow.h" line="522"/>
+        <source>Import divelog files from other applications</source>
+        <translation>Liitä lokitiedostoja toisesta sovelluksesta</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="402"/>
         <location filename="../build/ui_mainwindow.h" line="524"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="408"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="407"/>
         <location filename="../build/ui_mainwindow.h" line="525"/>
         <source>Import &amp;from divelogs.de</source>
         <translation>Tuo Divelogs.de -sivustolta</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="416"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="415"/>
         <location filename="../build/ui_mainwindow.h" line="526"/>
         <source>&amp;Full screen</source>
         <translation>Kokoruututila</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="419"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="418"/>
         <location filename="../build/ui_mainwindow.h" line="528"/>
         <source>Toggle full screen</source>
         <translation>Käytä kokoruututilaa</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="447"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="421"/>
+        <location filename="../build/ui_mainwindow.h" line="530"/>
+        <source>F11</source>
+        <translation>F11</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="446"/>
         <location filename="../build/ui_mainwindow.h" line="531"/>
         <source>&amp;Check for updates</source>
         <translation>Tarkista päivitykset</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="452"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="451"/>
         <location filename="../build/ui_mainwindow.h" line="532"/>
         <source>&amp;Export</source>
         <translation>Vienti</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="458"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="454"/>
+        <location filename="../build/ui_mainwindow.h" line="534"/>
+        <source>Export dive logs</source>
+        <translation>Sukelluslokin vienti</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="457"/>
         <location filename="../build/ui_mainwindow.h" line="536"/>
         <source>Ctrl+E</source>
         <translation>Ctrl+E</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="466"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="462"/>
+        <location filename="../build/ui_mainwindow.h" line="537"/>
+        <source>Configure &amp;dive computer</source>
+        <translation>Ohjelmoi sukellustietokone</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="465"/>
         <location filename="../build/ui_mainwindow.h" line="538"/>
         <source>Ctrl+Shift+C</source>
         <translation>Ctrl+Shift+C</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="474"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="473"/>
         <location filename="../build/ui_mainwindow.h" line="539"/>
         <source>Edit &amp;dive in planner</source>
         <translation>Muokkaa sukellussuunnitelmaa</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="486"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="485"/>
         <location filename="../build/ui_mainwindow.h" line="540"/>
         <source>Toggle pO₂ graph</source>
         <translation>Näytä/piilota pO₂ -kuvaaja</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="498"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="497"/>
         <location filename="../build/ui_mainwindow.h" line="541"/>
         <source>Toggle pN₂ graph</source>
         <translation>Näytä/piilota pN₂ -kuvaaja</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="642"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="509"/>
+        <location filename="../build/ui_mainwindow.h" line="542"/>
+        <source>Toggle pHe graph</source>
+        <translation>Näytä/piilota pHe-kuvaaja</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="521"/>
+        <location filename="../build/ui_mainwindow.h" line="543"/>
+        <source>Toggle DC reported ceiling</source>
+        <translation>Näytä/piilota sukellustietokoneen raportoima kattosyvyys</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="533"/>
+        <location filename="../build/ui_mainwindow.h" line="544"/>
+        <source>Toggle calculated ceiling</source>
+        <translation>Näytä/piilota laskettu kattosyvyys</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="545"/>
+        <location filename="../build/ui_mainwindow.h" line="545"/>
+        <source>Toggle calculating all tissues</source>
+        <translation>Näytä/piilota kaikkien kudosten laskenta</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="557"/>
+        <location filename="../build/ui_mainwindow.h" line="546"/>
+        <source>Toggle calculated ceiling with 3m increments</source>
+        <translation>Näytä/piilota laskettu kattosyvyys 3m:n tarkkuudella</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="569"/>
+        <location filename="../build/ui_mainwindow.h" line="547"/>
+        <source>Toggle heart rate</source>
+        <translation>Näytä/piilota syke</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="581"/>
+        <location filename="../build/ui_mainwindow.h" line="548"/>
+        <source>Toggle MOD</source>
+        <translation>Näytä/piilota MOD</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="593"/>
+        <location filename="../build/ui_mainwindow.h" line="549"/>
+        <source>Toggle EAD, END, EADD</source>
+        <translation>Näytä/piilota EAD, END sekä EADD</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="605"/>
+        <location filename="../build/ui_mainwindow.h" line="550"/>
+        <source>Toggle NDL, TTS</source>
+        <translation>Näytä/piilota NDL, TTS</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="617"/>
+        <location filename="../build/ui_mainwindow.h" line="551"/>
+        <source>Toggle SAC rate</source>
+        <translation>Näytä/piilota hengitysnopeus</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="629"/>
+        <location filename="../build/ui_mainwindow.h" line="552"/>
+        <source>Toggle ruler</source>
+        <translation>Näytä/piilota viivain</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="641"/>
         <location filename="../build/ui_mainwindow.h" line="553"/>
         <source>Scale graph</source>
         <translation>Muuta kuvasuhdetta</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="654"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="653"/>
         <location filename="../build/ui_mainwindow.h" line="554"/>
         <source>Toggle pictures</source>
         <translation>Näytä/piilota kuvat</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="666"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="665"/>
         <location filename="../build/ui_mainwindow.h" line="555"/>
         <source>Toggle tank bar</source>
         <translation>Näytä/piilota säiliöpalkki</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="674"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="673"/>
         <location filename="../build/ui_mainwindow.h" line="556"/>
         <source>&amp;Filter divelist</source>
         <translation>Suodata sukelluslista</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="689"/>
-        <location filename="../build/ui_mainwindow.h" line="558"/>
-        <source>Toggle tissue graph</source>
-        <translation>Näytä/piilota kudoskuvaaja</translation>
+        <location filename="../desktop-widgets/mainwindow.ui" line="676"/>
+        <location filename="../build/ui_mainwindow.h" line="557"/>
+        <source>Ctrl+F</source>
+        <translation>Ctrl+F</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="688"/>
+        <source>Toggle tissue heat-map</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="694"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="693"/>
         <location filename="../build/ui_mainwindow.h" line="559"/>
         <source>User &amp;survey</source>
         <translation>Käyttäjäkysely</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="699"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="698"/>
         <location filename="../build/ui_mainwindow.h" line="560"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="238"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="231"/>
         <source>&amp;Undo</source>
         <translation>Peruuta</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="702"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="701"/>
         <location filename="../build/ui_mainwindow.h" line="561"/>
         <source>Ctrl+Z</source>
         <translation>Ctrl+Z</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="707"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="706"/>
         <location filename="../build/ui_mainwindow.h" line="562"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="239"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="232"/>
         <source>&amp;Redo</source>
         <translation>Tee uudelleen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="710"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="709"/>
         <location filename="../build/ui_mainwindow.h" line="563"/>
         <source>Ctrl+Shift+Z</source>
         <translation>Ctrl+Shift+Z</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="715"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="714"/>
         <location filename="../build/ui_mainwindow.h" line="564"/>
         <source>&amp;Find moved images</source>
         <translation>Etsi siirretyt kuvat</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="720"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="719"/>
         <source>Open c&amp;loud storage</source>
         <translation>Avaa pilvitallennustila</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="725"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="724"/>
         <source>Save to clo&amp;ud storage</source>
         <translation>Tallenna pilveen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="730"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="729"/>
         <location filename="../build/ui_mainwindow.h" line="567"/>
         <source>&amp;Manage dive sites</source>
         <translation>Hallinnoi sukelliskohteita</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="735"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="734"/>
         <source>Dive Site &amp;Edit</source>
         <translation>Muokkaa sukelluskohteita</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="740"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="739"/>
         <source>Facebook</source>
         <translation>Facebook</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="745"/>
-        <source>Add GPS location here</source>
-        <translation>Lisää GPS -sijainti</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="677"/>
-        <location filename="../build/ui_mainwindow.h" line="557"/>
-        <source>Ctrl+F</source>
-        <translation>Ctrl+F</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="213"/>
-        <location filename="../build/ui_mainwindow.h" line="478"/>
-        <source>&amp;Print</source>
-        <translation>Tulosta</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="224"/>
-        <location filename="../build/ui_mainwindow.h" line="481"/>
-        <source>Ctrl+,</source>
-        <translation>Ctrl+,</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="232"/>
-        <location filename="../build/ui_mainwindow.h" line="482"/>
-        <source>&amp;Quit</source>
-        <translation>Lopeta</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="243"/>
-        <location filename="../build/ui_mainwindow.h" line="484"/>
-        <source>Import from &amp;dive computer</source>
-        <translation>Hae sukellustietokoneelta</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="254"/>
-        <location filename="../build/ui_mainwindow.h" line="487"/>
-        <source>Ctrl+G</source>
-        <translation>Ctrl+G</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="267"/>
-        <location filename="../build/ui_mainwindow.h" line="490"/>
-        <source>Ctrl++</source>
-        <translation>Ctrl++</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="293"/>
-        <location filename="../build/ui_mainwindow.h" line="496"/>
-        <source>&amp;Renumber</source>
-        <translation>Numeroi uudelleen</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="296"/>
-        <location filename="../build/ui_mainwindow.h" line="497"/>
-        <source>Ctrl+R</source>
-        <translation>Ctrl+R</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="312"/>
-        <location filename="../build/ui_mainwindow.h" line="500"/>
-        <source>Ctrl+Y</source>
-        <translation>Ctrl+Y</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="392"/>
-        <location filename="../build/ui_mainwindow.h" line="519"/>
-        <source>Ctrl+L</source>
-        <translation>Ctrl+L</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="216"/>
-        <location filename="../build/ui_mainwindow.h" line="479"/>
-        <source>Ctrl+P</source>
-        <translation>Ctrl+P</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="235"/>
-        <location filename="../build/ui_mainwindow.h" line="483"/>
-        <source>Ctrl+Q</source>
-        <translation>Ctrl+Q</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="246"/>
-        <location filename="../build/ui_mainwindow.h" line="485"/>
-        <source>Ctrl+D</source>
-        <translation>Ctrl+D</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="264"/>
-        <location filename="../build/ui_mainwindow.h" line="489"/>
-        <source>&amp;Add dive</source>
-        <translation>Lisää sukellus</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="304"/>
-        <location filename="../build/ui_mainwindow.h" line="498"/>
-        <source>Auto &amp;group</source>
-        <translation>Ryhmittele automaattisesti</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="309"/>
-        <location filename="../build/ui_mainwindow.h" line="499"/>
-        <source>&amp;Yearly statistics</source>
-        <translation>Vuositilastot</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="317"/>
-        <location filename="../build/ui_mainwindow.h" line="501"/>
-        <source>&amp;Dive list</source>
-        <translation>Sukelluslista</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="320"/>
-        <location filename="../build/ui_mainwindow.h" line="502"/>
-        <source>Ctrl+2</source>
-        <translation>Ctrl+2</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="328"/>
-        <location filename="../build/ui_mainwindow.h" line="504"/>
-        <source>Ctrl+3</source>
-        <translation>Ctrl+3</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="336"/>
-        <location filename="../build/ui_mainwindow.h" line="506"/>
-        <source>Ctrl+4</source>
-        <translation>Ctrl+4</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="344"/>
-        <location filename="../build/ui_mainwindow.h" line="508"/>
-        <source>Ctrl+1</source>
-        <translation>Ctrl+1</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="349"/>
-        <location filename="../build/ui_mainwindow.h" line="509"/>
-        <source>P&amp;revious DC</source>
-        <translation>Edellinen tietokone</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="352"/>
-        <location filename="../build/ui_mainwindow.h" line="510"/>
-        <source>Left</source>
-        <translation>Vasen</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="360"/>
-        <location filename="../build/ui_mainwindow.h" line="512"/>
-        <source>Right</source>
-        <translation>Oikea</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="373"/>
-        <location filename="../build/ui_mainwindow.h" line="514"/>
-        <source>User &amp;manual</source>
-        <translation>Käyttöohje</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="376"/>
-        <location filename="../build/ui_mainwindow.h" line="515"/>
-        <source>F1</source>
-        <translation>F1</translation>
+        <location filename="../desktop-widgets/mainwindow.ui" line="744"/>
+        <source>Take cloud storage online</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="384"/>
-        <location filename="../build/ui_mainwindow.h" line="517"/>
-        <source>Ctrl+5</source>
-        <translation>Ctrl+5</translation>
+        <location filename="../build/ui_mainwindow.h" line="558"/>
+        <source>Toggle tissue graph</source>
+        <translation>Näytä/piilota kudoskuvaaja</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="389"/>
-        <location filename="../build/ui_mainwindow.h" line="518"/>
-        <source>P&amp;lan dive</source>
-        <translation>Sukelluksen suunnittelu</translation>
+        <location filename="../build/ui_mainwindow.h" line="565"/>
+        <source>Open cloud storage</source>
+        <translation>Avaa pilvitallennustila</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="397"/>
-        <location filename="../build/ui_mainwindow.h" line="520"/>
-        <source>&amp;Import log files</source>
-        <translation>Liitä lokitiedostoja</translation>
+        <location filename="../build/ui_mainwindow.h" line="566"/>
+        <source>Save to cloud storage</source>
+        <translation>Tallenna pilvitallennustilaan</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="400"/>
-        <location filename="../build/ui_mainwindow.h" line="522"/>
-        <source>Import divelog files from other applications</source>
-        <translation>Liitä lokitiedostoja toisesta sovelluksesta</translation>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="331"/>
+        <source>Connect to</source>
+        <translation>Yhdistä</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="422"/>
-        <location filename="../build/ui_mainwindow.h" line="530"/>
-        <source>F11</source>
-        <translation>F11</translation>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="493"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="538"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1545"/>
+        <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="../desktop-widgets/mainwindow.cpp" line="505"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="499"/>
         <source>Open file</source>
         <translation>Avaa tiedosto</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="509"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="503"/>
         <location filename="../desktop-widgets/mainwindow.cpp" line="614"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1972"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1978"/>
         <source>Cancel</source>
         <translation>Peruuta</translation>
     </message>
@@ -5244,6 +5356,16 @@ sekoittaa ilmasta ja käyttäen:
         <translation>Kuvien etsintä käynnissä...(tämä voi kestää kauan)</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="649"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="796"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="977"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="983"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1849"/>
+        <source>Warning</source>
+        <translation>Varoitus</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="674"/>
         <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>
@@ -5259,125 +5381,98 @@ sekoittaa ilmasta ja käyttäen:
         <translation>Tulosta sukellussuunnitelma</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="982"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
+        <source>Trying to replan a dive that&apos;s not a planned dive.</source>
+        <translation>Yritetään muokata sukellusta, joka ei ole sukellussuunnitelma.</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="977"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1849"/>
+        <source>Please, first finish the current edition before trying to do another.</source>
+        <translation>Ole hyvä ja lopeta nykyinen muokkaus ennen kuin aloitat uuden.</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="983"/>
         <source>Trying to edit a dive that&apos;s not a manually added dive.</source>
         <translation>Yrität muokata sukellusta, joka ei ole syötetty käsin.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1243"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1030"/>
+        <source>Yearly statistics</source>
+        <translation>Vuositilastot</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1244"/>
         <source>Do you want to save the changes that you made in the file %1?</source>
         <translation>Haluatko tallentaa muutoksesi tiedostoon %1?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1246"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1247"/>
         <source>Do you want to save the changes that you made in the data file?</source>
         <translation>Haluatko tallentaa muutoksesi tiedostoon?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1251"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1252"/>
         <source>Save changes?</source>
         <translation>Tallenna muutokset?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1587"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1253"/>
+        <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="../desktop-widgets/mainwindow.cpp" line="1572"/>
         <source>Save file as</source>
         <translation>Tallenna nimellä</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1682"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1573"/>
+        <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
+        <translation>Subsurfacen XML tiedostot (*.ssrf *.xml *.XML)</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1670"/>
+        <source>[local cache for] %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1672"/>
         <source>[cloud storage for] %1</source>
         <translation>[pilvitallennus] %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1782"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1788"/>
         <source>Opening datafile from older version</source>
         <translation>Avataan vanhan tiedostomuodon loki</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1783"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1789"/>
         <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly.
 Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source>
         <translation>Avasit vanhan tiedostomuodon lokitiedoston. Suosittelemme, että luet uuden version muutoksista käyttöohjeesta, etenkin sukelluskohteiden hallinnasta, sillä se on muuttunut huomattavasti.
 Subsurface on jo yrittänyt esi-täyttää sijaintitiedot, mutta kannattaa vielä tarkistaa uudesta sukelluskohteiden hallinnasta, että kaikki tiedot ovat oikein.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1794"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1800"/>
         <source>Open dive log file</source>
         <translation>Avaa sukellusloki</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1795"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1801"/>
         <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;All files (*)</source>
         <translation>Sukellusloki -tiedostot (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran -tiedostot (*.can *.CAN);;CSV -tiedostot (*.csv *.CSV);;DiveLog.de -tiedostot (*.dld *.DLD);;JDiveLog -tiedostot (*.jlb *.JLB);;Liquivision -tiedostot (*.lvd *.LVD);;MkVI -tiedostot (*.txt *.TXT);;Suunto -tiedostot (*.sde *.db *.SDE *.DB);;Divesoft -tiedostot (*.dlf *.DLF);;UDDF/UDCF -tiedostot (*.uddf *.udcf *.UDDF *.UDCF);;XML -tiedostot (*.xml *.XML);;APD log -tiedostot (*.apd *.APD);;Datatrak/WLog -tiedostot (*.log *.LOG);;OSTCtools -tiedostot (*.dive *.DIVE);;DAN DL7 -tiedostot (*.zxu *.zxl *.ZXU *.ZXL);;Kaikki tiedostot (*)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1972"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1978"/>
         <source>Contacting cloud service...</source>
         <translation>Otetaan yhteyttä pilvipalveluun...</translation>
     </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1252"/>
-        <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="../desktop-widgets/mainwindow.cpp" line="649"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="796"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="976"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="982"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/>
-        <source>Warning</source>
-        <translation>Varoitus</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="499"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="544"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1560"/>
-        <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="../desktop-widgets/mainwindow.cpp" line="338"/>
-        <source>Connect to</source>
-        <translation>Yhdistä</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
-        <source>Trying to replan a dive that&apos;s not a planned dive.</source>
-        <translation>Yritetään muokata sukellusta, joka ei ole sukellussuunnitelma.</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1029"/>
-        <source>Yearly statistics</source>
-        <translation>Vuositilastot</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1588"/>
-        <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
-        <translation>Subsurfacen XML tiedostot (*.ssrf *.xml *.XML)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="976"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/>
-        <source>Please, first finish the current edition before trying to do another.</source>
-        <translation>Ole hyvä ja lopeta nykyinen muokkaus ennen kuin aloitat uuden.</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_mainwindow.h" line="565"/>
-        <source>Open cloud storage</source>
-        <translation>Avaa pilvitallennustila</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_mainwindow.h" line="566"/>
-        <source>Save to cloud storage</source>
-        <translation>Tallenna pilvitallennustilaan</translation>
-    </message>
 </context>
 <context>
     <name>MultiFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="733"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="731"/>
         <source>Filter shows %1 (of %2) dives</source>
         <translation>Suodin näyttää %1 (%2:sta) sukelluksesta</translation>
     </message>
@@ -5385,12 +5480,12 @@ Subsurface on jo yrittänyt esi-täyttää sijaintitiedot, mutta kannattaa viel�
 <context>
     <name>OstcFirmwareCheck</name>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="269"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="271"/>
         <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source>
         <translation>Sinun tulisi päivittää sukellustietokoneesi ohjelmisto (firmware): käytössä on versio %1, kun viimeisin vakaa versio on %2</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="273"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="275"/>
         <source>
 
 Please start Bluetooth on your OSTC Sport and do the same preparations as for a logbook download before continuing with the update</source>
@@ -5399,27 +5494,27 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 Ennen kuin päivitystä voidaan jatkaa, sinun tulee käynnistää Bluetooth OSTC Sport -laitteessasi ja tehdä samat toimenpiteet kuin lokikirjan latauksessa</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="274"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="276"/>
         <source>Not now</source>
         <translation>Ei nyt</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="275"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="277"/>
         <source>Update firmware</source>
         <translation>Päivitä laiteohjelmisto</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="277"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="279"/>
         <source>Firmware upgrade notice</source>
         <translation>Huomautus laiteohjelmiston päivityksessä</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="295"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="297"/>
         <source>Save the downloaded firmware as</source>
         <translation>Tallenna ladattu laiteohjelmisto nimellä</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="296"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="298"/>
         <source>HEX files (*.hex)</source>
         <translation>HEX -tiedostot (*.hex)</translation>
     </message>
@@ -5427,79 +5522,89 @@ Ennen kuin päivitystä voidaan jatkaa, sinun tulee käynnistää Bluetooth OSTC
 <context>
     <name>PlannerSettingsWidget</name>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="322"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="302"/>
         <source>Open circuit</source>
         <translation>Avoin kierto</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="322"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="302"/>
         <source>CCR</source>
         <translation>CCR</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="322"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="302"/>
         <source>pSCR</source>
         <translation>pSCR</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="421"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="388"/>
         <source>ft/min</source>
         <translation>ft/min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="422"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="389"/>
         <source>Last stop at 20ft</source>
         <translation>Viimeinen pysähdys 20 jalassa</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="423"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="390"/>
         <source>50% avg. depth to 20ft</source>
         <translation>50% keskisyvyydestä - 20 jalkaan</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="424"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="391"/>
         <source>20ft to surface</source>
         <translation>20 jalasta pintaan</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="426"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="392"/>
+        <source>ft</source>
+        <translation>ft</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="394"/>
         <source>m/min</source>
         <translation>m/min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="427"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="395"/>
         <source>Last stop at 6m</source>
         <translation>Viimeinen pysähdys kuudessa metrissä</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="428"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="396"/>
         <source>50% avg. depth to 6m</source>
         <translation>50% keskisyvyydestä - 6m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="429"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="397"/>
         <source>6m to surface</source>
         <translation>6m:stä pintaan</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="432"/>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="433"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="398"/>
+        <source>m</source>
+        <translation>m</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="401"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="402"/>
         <source>cuft/min</source>
         <translation>ft³/min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="441"/>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="442"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="410"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="411"/>
         <source>ℓ/min</source>
         <translation>ℓ/min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="451"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="420"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="456"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="425"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
@@ -5649,6 +5754,11 @@ Ennen kuin päivitystä voidaan jatkaa, sinun tulee käynnistää Bluetooth OSTC
 <context>
     <name>PreferencesDialog</name>
     <message>
+        <location filename="../build/ui_preferences.h" line="1283"/>
+        <source>Preferences</source>
+        <translation>Asetukset</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1288"/>
         <source>Defaults</source>
         <translation>Oletukset</translation>
@@ -5684,6 +5794,11 @@ Ennen kuin päivitystä voidaan jatkaa, sinun tulee käynnistää Bluetooth OSTC
         <translation>Maantieteellinen sijainti</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1303"/>
+        <source>Lists and tables</source>
+        <translation>Listat ja taulukot</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1304"/>
         <source>Font</source>
         <translation>Fontti</translation>
@@ -5699,6 +5814,11 @@ Ennen kuin päivitystä voidaan jatkaa, sinun tulee käynnistää Bluetooth OSTC
         <translation>Sukelluksia</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1307"/>
+        <source>Default dive log file</source>
+        <translation>Oletus lokitiedosto</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1308"/>
         <source>No default file</source>
         <translation>Ei oletustiedostoa</translation>
@@ -5729,6 +5849,21 @@ Ennen kuin päivitystä voidaan jatkaa, sinun tulee käynnistää Bluetooth OSTC
         <translation>...</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1314"/>
+        <source>Display invalid</source>
+        <translation>Näytä epäkelvot</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1316"/>
+        <source>Default cylinder</source>
+        <translation>Oletussäiliö</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1317"/>
+        <source>Use default cylinder</source>
+        <translation>Käytä oletussäiliötä</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1318"/>
         <source>Animations</source>
         <translation>Animaatiot</translation>
@@ -5759,40 +5894,24 @@ Ennen kuin päivitystä voidaan jatkaa, sinun tulee käynnistää Bluetooth OSTC
         <translation>Järjestelmä</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1401"/>
-        <source>Dive site geo lookup</source>
-        <translation>Sukelluskohteen sijainnin haku</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1402"/>
-        <source>Enable geocoding for dive site management</source>
-        <translation>Ota käyttöön sukelluskohteiden maantiedehaku</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1403"/>
-        <source>Parse site without GPS data</source>
-        <translation>Lue kohde ilman GPS -tietoja</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1404"/>
-        <source>Same format for existing dives</source>
-        <translation>Käytä samaa muotoa olemassaoleville sukelluksille</translation>
+        <location filename="../build/ui_preferences.h" line="1324"/>
+        <source>&amp;Metric</source>
+        <translation>Metrinen</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1405"/>
-        <source>Dive Site Layout</source>
-        <translation>Sukelluskohteiden määrittely</translation>
+        <location filename="../build/ui_preferences.h" line="1325"/>
+        <source>Imperial</source>
+        <translation>Brittiläinen</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1406"/>
-        <location filename="../build/ui_preferences.h" line="1407"/>
-        <source>/</source>
-        <translation>/</translation>
+        <location filename="../build/ui_preferences.h" line="1326"/>
+        <source>Personali&amp;ze</source>
+        <translation>Mukauta</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1325"/>
-        <source>Imperial</source>
-        <translation>Brittiläinen</translation>
+        <location filename="../build/ui_preferences.h" line="1327"/>
+        <source>Individual settings</source>
+        <translation>Yksittäiset asetukset</translation>
     </message>
     <message>
         <location filename="../build/ui_preferences.h" line="1328"/>
@@ -5810,6 +5929,11 @@ Ennen kuin päivitystä voidaan jatkaa, sinun tulee käynnistää Bluetooth OSTC
         <translation>jalka</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1331"/>
+        <source>Pressure</source>
+        <translation>Paine</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1332"/>
         <location filename="../build/ui_preferences.h" line="1366"/>
         <source>bar</source>
@@ -5821,11 +5945,26 @@ Ennen kuin päivitystä voidaan jatkaa, sinun tulee käynnistää Bluetooth OSTC
         <translation>psi</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1334"/>
+        <source>Volume</source>
+        <translation>Tilavuus</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1335"/>
+        <source>&amp;liter</source>
+        <translation>litra</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1336"/>
         <source>cu ft</source>
         <translation>kuutiojalka</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1337"/>
+        <source>Temperature</source>
+        <translation>Lämpötila</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1338"/>
         <source>celsius</source>
         <translation>Celsius</translation>
@@ -5836,11 +5975,121 @@ Ennen kuin päivitystä voidaan jatkaa, sinun tulee käynnistää Bluetooth OSTC
         <translation>Fahrenheit</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1340"/>
+        <source>Weight</source>
+        <translation>Painot</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1341"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1342"/>
+        <source>lbs</source>
+        <translation>pauna</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1343"/>
+        <source>Time units</source>
+        <translation>Aikayksiköt</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1344"/>
+        <source>Ascent/descent speed denominator</source>
+        <translation>Nousu-/laskunopeuden yksikkö</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1345"/>
+        <source>Minutes</source>
+        <translation>Minuuttia</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1346"/>
+        <source>Seconds</source>
+        <translation>Sekuntia</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1347"/>
+        <source>GPS coordinates</source>
+        <translation>Koordinaatit</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1348"/>
+        <source>Location Display</source>
+        <translation>Sijainnin näyttö</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1349"/>
+        <source>traditional (dms)</source>
+        <translation>perinteinen (dms)</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1350"/>
+        <source>decimal</source>
+        <translation>desimaali</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1351"/>
+        <source>Show</source>
+        <translation>Näytä</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1352"/>
+        <source>Threshold when showing pO₂</source>
+        <translation>Kynnysarvo pO₂:lle</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1353"/>
+        <source>Threshold when showing pN₂</source>
+        <translation>Kynnysarvo pN₂:lle</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1354"/>
+        <source>Threshold when showing pHe</source>
+        <translation>Kynnysarvo pHe:lle</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1355"/>
+        <source>Max pO₂ when showing MOD</source>
+        <translation>Maksimi pO₂, kun näytetään MOD</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1356"/>
+        <source>Draw dive computer reported ceiling red</source>
+        <translation>Näytä sukellustietokoneen raportoima kattosyvyys punaisella</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1357"/>
+        <source>Show unused cylinders in Equipment tab</source>
+        <translation>Näytä käyttämättömät säiliöt varusteluettelossa</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1358"/>
+        <source>Show average depth</source>
+        <translation>näytä keskisyvyys</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1359"/>
+        <source>Misc</source>
+        <translation>Sekalaiset</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1360"/>
+        <source>GFLow</source>
+        <translation>GFlow</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1361"/>
+        <source>GFHigh</source>
+        <translation>GFhigh</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1362"/>
+        <source>GFLow at max depth</source>
+        <translation>GFLow maksimisyvyydessä</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1363"/>
         <source>CCR: show setpoints when viewing pO₂</source>
         <translation>CCR: näytä setpointit kun katsotaan </translation>
@@ -5886,14 +6135,19 @@ Ennen kuin päivitystä voidaan jatkaa, sinun tulee käynnistää Bluetooth OSTC
         <translation>Järjestelmän oletus</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1374"/>
+        <source>Filter</source>
+        <translation>Suodattimet</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1375"/>
         <source>Proxy</source>
         <translation>Välityspalvelin</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1379"/>
-        <source>Proxy type</source>
-        <translation>Välityspalvelimen tyyppi</translation>
+        <location filename="../build/ui_preferences.h" line="1376"/>
+        <source>Port</source>
+        <translation>Portti</translation>
     </message>
     <message>
         <location filename="../build/ui_preferences.h" line="1377"/>
@@ -5901,16 +6155,16 @@ Ennen kuin päivitystä voidaan jatkaa, sinun tulee käynnistää Bluetooth OSTC
         <translation>Osoite</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1376"/>
-        <source>Port</source>
-        <translation>Portti</translation>
-    </message>
-    <message>
         <location filename="../build/ui_preferences.h" line="1378"/>
         <source>Requires authentication</source>
         <translation>Vaatii kirjautumisen</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1379"/>
+        <source>Proxy type</source>
+        <translation>Välityspalvelimen tyyppi</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1380"/>
         <source>Username</source>
         <translation>Käyttäjätunnus</translation>
@@ -5922,46 +6176,6 @@ Ennen kuin päivitystä voidaan jatkaa, sinun tulee käynnistää Bluetooth OSTC
         <translation>Salasana</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1400"/>
-        <source>Disconnect from Facebook</source>
-        <translation>Katkaise yhteys Facebookiin</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1374"/>
-        <source>Filter</source>
-        <translation>Suodattimet</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1331"/>
-        <source>Pressure</source>
-        <translation>Paine</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1303"/>
-        <source>Lists and tables</source>
-        <translation>Listat ja taulukot</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1307"/>
-        <source>Default dive log file</source>
-        <translation>Oletus lokitiedosto</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1314"/>
-        <source>Display invalid</source>
-        <translation>Näytä epäkelvot</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1316"/>
-        <source>Default cylinder</source>
-        <translation>Oletussäiliö</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1317"/>
-        <source>Use default cylinder</source>
-        <translation>Käytä oletussäiliötä</translation>
-    </message>
-    <message>
         <location filename="../build/ui_preferences.h" line="1382"/>
         <source>Subsurface cloud storage</source>
         <translation>Subsurfacen pilvitallennustila</translation>
@@ -6002,149 +6216,40 @@ Ennen kuin päivitystä voidaan jatkaa, sinun tulee käynnistää Bluetooth OSTC
         <translation>Tallennetaanko käyttäjätunnus paikallisesti?</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1334"/>
-        <source>Volume</source>
-        <translation>Tilavuus</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1337"/>
-        <source>Temperature</source>
-        <translation>Lämpötila</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1340"/>
-        <source>Weight</source>
-        <translation>Painot</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1342"/>
-        <source>lbs</source>
-        <translation>pauna</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1343"/>
-        <source>Time units</source>
-        <translation>Aikayksiköt</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1345"/>
-        <source>Minutes</source>
-        <translation>Minuuttia</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1346"/>
-        <source>Seconds</source>
-        <translation>Sekuntia</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1351"/>
-        <source>Show</source>
-        <translation>Näytä</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1362"/>
-        <source>GFLow at max depth</source>
-        <translation>GFLow maksimisyvyydessä</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1359"/>
-        <source>Misc</source>
-        <translation>Sekalaiset</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1283"/>
-        <source>Preferences</source>
-        <translation>Asetukset</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1324"/>
-        <source>&amp;Metric</source>
-        <translation>Metrinen</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1326"/>
-        <source>Personali&amp;ze</source>
-        <translation>Mukauta</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1327"/>
-        <source>Individual settings</source>
-        <translation>Yksittäiset asetukset</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1335"/>
-        <source>&amp;liter</source>
-        <translation>litra</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1344"/>
-        <source>Ascent/descent speed denominator</source>
-        <translation>Nousu-/laskunopeuden yksikkö</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1347"/>
-        <source>GPS coordinates</source>
-        <translation>Koordinaatit</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1348"/>
-        <source>Location Display</source>
-        <translation>Sijainnin näyttö</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1349"/>
-        <source>traditional (dms)</source>
-        <translation>perinteinen (dms)</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1350"/>
-        <source>decimal</source>
-        <translation>desimaali</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1352"/>
-        <source>Threshold when showing pO₂</source>
-        <translation>Kynnysarvo pO₂:lle</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1353"/>
-        <source>Threshold when showing pN₂</source>
-        <translation>Kynnysarvo pN₂:lle</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1354"/>
-        <source>Threshold when showing pHe</source>
-        <translation>Kynnysarvo pHe:lle</translation>
+        <location filename="../build/ui_preferences.h" line="1400"/>
+        <source>Disconnect from Facebook</source>
+        <translation>Katkaise yhteys Facebookiin</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1355"/>
-        <source>Max pO₂ when showing MOD</source>
-        <translation>Maksimi pO₂, kun näytetään MOD</translation>
+        <location filename="../build/ui_preferences.h" line="1401"/>
+        <source>Dive site geo lookup</source>
+        <translation>Sukelluskohteen sijainnin haku</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1356"/>
-        <source>Draw dive computer reported ceiling red</source>
-        <translation>Näytä sukellustietokoneen raportoima kattosyvyys punaisella</translation>
+        <location filename="../build/ui_preferences.h" line="1402"/>
+        <source>Enable geocoding for dive site management</source>
+        <translation>Ota käyttöön sukelluskohteiden maantiedehaku</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1357"/>
-        <source>Show unused cylinders in Equipment tab</source>
-        <translation>Näytä käyttämättömät säiliöt varusteluettelossa</translation>
+        <location filename="../build/ui_preferences.h" line="1403"/>
+        <source>Parse site without GPS data</source>
+        <translation>Lue kohde ilman GPS -tietoja</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1358"/>
-        <source>Show average depth</source>
-        <translation>näytä keskisyvyys</translation>
+        <location filename="../build/ui_preferences.h" line="1404"/>
+        <source>Same format for existing dives</source>
+        <translation>Käytä samaa muotoa olemassaoleville sukelluksille</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1360"/>
-        <source>GFLow</source>
-        <translation>GFlow</translation>
+        <location filename="../build/ui_preferences.h" line="1405"/>
+        <source>Dive Site Layout</source>
+        <translation>Sukelluskohteiden määrittely</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1361"/>
-        <source>GFHigh</source>
-        <translation>GFhigh</translation>
+        <location filename="../build/ui_preferences.h" line="1406"/>
+        <location filename="../build/ui_preferences.h" line="1407"/>
+        <source>/</source>
+        <translation>/</translation>
     </message>
 </context>
 <context>
@@ -6200,106 +6305,136 @@ Ennen kuin päivitystä voidaan jatkaa, sinun tulee käynnistää Bluetooth OSTC
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="20"/>
-        <source>Show</source>
-        <translation>Näytä</translation>
+        <source>Gas pressure display setup</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="29"/>
-        <source>Threshold when showing pO₂</source>
-        <translation>Kynnysarvo pO₂:lle</translation>
+        <source>Threshold for pO₂ (bar)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="49"/>
-        <source>Threshold when showing pN₂</source>
-        <translation>Kynnysarvo pN₂:lle</translation>
+        <source>Threshold for pN₂ (bar)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="69"/>
-        <source>Threshold when showing pHe</source>
-        <translation>Kynnysarvo pHe:lle</translation>
+        <source>Threshold for pHe (bar)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="89"/>
-        <source>Max pO₂ when showing MOD</source>
-        <translation>Maksimi pO₂, kun näytetään MOD</translation>
+        <source>pO₂ in calculating MOD (bar)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="106"/>
+        <source>CCR options:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="113"/>
+        <source>Dive planner default setpoint (bar)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="133"/>
+        <source>Show setpoints when viewing pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="140"/>
+        <source>Show individual O₂ sensor values when viewing pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="150"/>
+        <source>Ceiling display setup</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="109"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="159"/>
         <source>Draw dive computer reported ceiling red</source>
         <translation>Näytä sukellustietokoneen raportoima kattosyvyys punaisella</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="116"/>
-        <source>Show unused cylinders in Equipment tab</source>
-        <translation>Näytä käyttämättömät säiliöt varusteluettelossa</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="169"/>
+        <source>Algorithm for calculated ceiling:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="123"/>
-        <source>Show mean depth</source>
-        <translation>Näytä keskisyvyys</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="176"/>
+        <source>VPM-B</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="133"/>
-        <source>Misc</source>
-        <translation>Sekalaiset</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="183"/>
+        <source>VPM-B Conservatism</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="149"/>
-        <source>bar</source>
-        <translation>bar</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="193"/>
+        <source>+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="165"/>
-        <source>Default CCR set-point for dive planning</source>
-        <translation>Oletus suljetun kierron setpoint sukellus suunnittelussa</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="206"/>
+        <source>Bühlmann</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="172"/>
-        <source>pSCR O₂ metabolism rate</source>
-        <translation>pSCR O₂ aineenvaihdunnan nopeus</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="216"/>
+        <source>GFHigh</source>
+        <translation>GFHigh</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="179"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="236"/>
         <source>GFLow</source>
         <translation>GFLow</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="186"/>
-        <source>GFHigh</source>
-        <translation>GFHigh</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="256"/>
+        <source>GFLow at max depth</source>
+        <translation>GFLow maksimisyvyydessä</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="203"/>
-        <source>ℓ/min</source>
-        <translation>ℓ/min</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="263"/>
+        <source>pSCR options:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="213"/>
-        <source>pSCR ratio</source>
-        <translation>pSCR -suhde</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="270"/>
+        <source>Metabolic rate (ℓ O₂/min)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="223"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="287"/>
+        <source>Dilution ratio</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="300"/>
         <source>1:</source>
         <translation>1:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="230"/>
-        <source>CCR: show individual O₂ sensor values when viewing pO₂</source>
-        <translation>CCR: Näytä yksittäisen happisensorin arvot, kun katsotaan </translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="310"/>
+        <source>Misc</source>
+        <translation>Sekalaiset</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="237"/>
-        <source>CCR: show setpoints when viewing pO₂</source>
-        <translation>CCR: näytä setpointit kun katsotaan </translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="316"/>
+        <source>Show unused cylinders in Equipment tab</source>
+        <translation>Näytä käyttämättömät säiliöt varusteluettelossa</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="244"/>
-        <source>GFLow at max depth</source>
-        <translation>GFLow maksimisyvyydessä</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="323"/>
+        <source>Show mean depth in Profile</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="10"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="9"/>
         <source>Graph</source>
         <translation>Kaavio</translation>
     </message>
@@ -6368,16 +6503,30 @@ Ennen kuin päivitystä voidaan jatkaa, sinun tulee käynnistää Bluetooth OSTC
         <translation>Kieli</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="57"/>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="53"/>
         <source>Restart required</source>
         <translation>Vaaditaan uudelleenkäynnistys</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="58"/>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="54"/>
         <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="../desktop-widgets/preferences/preferences_language.cpp" line="76"/>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="82"/>
+        <source>Literal characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="77"/>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="83"/>
+        <source>Non-special character(s) in time format.
+These will be used as is. This might not be what you intended.
+See http://doc.qt.io/qt-5/qdatetime.html#toString</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PreferencesNetwork</name>
@@ -6424,7 +6573,7 @@ Ennen kuin päivitystä voidaan jatkaa, sinun tulee käynnistää Bluetooth OSTC
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_network.ui" line="156"/>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="148"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="134"/>
         <source>Subsurface cloud storage</source>
         <translation>Subsurfacen pilvitallennustila</translation>
     </message>
@@ -6469,39 +6618,39 @@ Ennen kuin päivitystä voidaan jatkaa, sinun tulee käynnistää Bluetooth OSTC
         <translation>Tallennetaanko käyttäjätunnus paikallisesti?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="11"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="10"/>
         <source>Network</source>
         <translation>Verkko</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="15"/>
         <source>No proxy</source>
         <translation>Ei välityspalvelinta</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/>
         <source>System proxy</source>
         <translation>Järjestelmän proxy -asetukset</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/>
         <source>HTTP proxy</source>
         <translation>HTTP proxy</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="19"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/>
         <source>SOCKS proxy</source>
         <translation>SOCKS proxy</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="75"/>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="97"/>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="110"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="72"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="93"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="106"/>
         <source>Cloud storage email and password can only consist of letters, numbers, and &apos;.&apos;, &apos;-&apos;, &apos;_&apos;, and &apos;+&apos;.</source>
         <translation>Pilvipalvelun sähköpostiosoitteessa ja salasanassa voi olla vain kirjaimia, numeroita ja merkit  &apos;.&apos;, &apos;-&apos;, &apos;_&apos;, &apos;+&apos;.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="146"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="132"/>
         <source>Subsurface cloud storage (credentials verified)</source>
         <translation>Subsurfacen pilvitallennustila (käyttäjä todennettu)</translation>
     </message>
@@ -6659,7 +6808,7 @@ Ennen kuin päivitystä voidaan jatkaa, sinun tulee käynnistää Bluetooth OSTC
         <translation>desimaali</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="8"/>
+        <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="7"/>
         <source>Units</source>
         <translation>Yksiköt</translation>
     </message>
@@ -6667,17 +6816,17 @@ Ennen kuin päivitystä voidaan jatkaa, sinun tulee käynnistää Bluetooth OSTC
 <context>
     <name>PrintDialog</name>
     <message>
-        <location filename="../desktop-widgets/printdialog.cpp" line="118"/>
-        <source>&amp;Preview</source>
-        <translation>Esikatselu</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/printdialog.cpp" line="115"/>
+        <location filename="../desktop-widgets/printdialog.cpp" line="102"/>
         <source>P&amp;rint</source>
         <translation>Tulosta</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/printdialog.cpp" line="130"/>
+        <location filename="../desktop-widgets/printdialog.cpp" line="105"/>
+        <source>&amp;Preview</source>
+        <translation>Esikatselu</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/printdialog.cpp" line="117"/>
         <source>Print</source>
         <translation>Tulosta</translation>
     </message>
@@ -6685,19 +6834,10 @@ Ennen kuin päivitystä voidaan jatkaa, sinun tulee käynnistää Bluetooth OSTC
 <context>
     <name>PrintOptions</name>
     <message>
-        <location filename="../build/ui_printoptions.h" line="150"/>
-        <source>&amp;Table print</source>
-        <translation>Taulukkotuloste</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_printoptions.h" line="158"/>
-        <source>One dive per page</source>
-        <translation>Yksi sukellus sivulle</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_printoptions.h" line="159"/>
-        <source>Two dives per page</source>
-        <translation>Kaksi sukellusta sivulle</translation>
+        <location filename="../desktop-widgets/printoptions.ui" line="29"/>
+        <location filename="../build/ui_printoptions.h" line="148"/>
+        <source>Print type</source>
+        <translation>Tulosteen tyyppi</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/printoptions.ui" line="41"/>
@@ -6757,10 +6897,19 @@ Ennen kuin päivitystä voidaan jatkaa, sinun tulee käynnistää Bluetooth OSTC
         <translation>Tuonti</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/printoptions.ui" line="29"/>
-        <location filename="../build/ui_printoptions.h" line="148"/>
-        <source>Print type</source>
-        <translation>Tulosteen tyyppi</translation>
+        <location filename="../build/ui_printoptions.h" line="150"/>
+        <source>&amp;Table print</source>
+        <translation>Taulukkotuloste</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_printoptions.h" line="158"/>
+        <source>One dive per page</source>
+        <translation>Yksi sukellus sivulle</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_printoptions.h" line="159"/>
+        <source>Two dives per page</source>
+        <translation>Kaksi sukellusta sivulle</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/printoptions.cpp" line="128"/>
@@ -6802,103 +6951,103 @@ Ennen kuin päivitystä voidaan jatkaa, sinun tulee käynnistää Bluetooth OSTC
         <translation>Tuntematon sukellustietokone</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="755"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="752"/>
         <source>Show NDL / TTS was disabled because of excessive processing time</source>
         <translation>Suoranousu-/pintautumisaikaa ei näytetä, koska niiden laskemiseen kuluu liikaa aikaa</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1344"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1338"/>
         <source>Make first divecomputer</source>
         <translation>Aseta ensisijaiseksi sukellustietokoneeksi</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1346"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1340"/>
         <source>Delete this divecomputer</source>
         <translation>Poista tämä sukellustietokone</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1360"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1354"/>
         <source>Add gas change</source>
         <translation>Lisää kaasun vaihto</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1363"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1357"/>
         <source> (Tank %1)</source>
         <translation>(Säiliö %1)</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1371"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1365"/>
         <source>Add set-point change</source>
         <translation>Aseta setpointin vaihto</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1373"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1367"/>
         <source>Add bookmark</source>
         <translation>Lisää kirjanmerkki</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1377"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1371"/>
         <source>Edit the profile</source>
         <translation>Muokkaa profiilia</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1381"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1375"/>
         <source>Remove event</source>
         <translation>Poista tapahtuma</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1386"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1380"/>
         <source>Hide similar events</source>
         <translation>Piilota samankaltaiset tapahtumat</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1393"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1387"/>
         <source>Edit name</source>
         <translation>Muokkaa nimeä</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1422"/>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1429"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1416"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1423"/>
         <source>Adjust pressure of tank %1 (currently interpolated as %2)</source>
         <translation>Muuta säiliön %1 painetta (tällä hetkellä %2)</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1444"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1438"/>
         <source>Unhide all events</source>
         <translation>Näytä kaikki tapahtumat</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1479"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1473"/>
         <source>Hide events</source>
         <translation>Piilota tapahtumat</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1479"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1473"/>
         <source>Hide all %1 events?</source>
         <translation>Piilota kaikki %1 tapahtumat</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1514"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1508"/>
         <source>Remove the selected event?</source>
         <translation>Poistetaanko valitut tapahtumat?</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1515"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1509"/>
         <source>%1 @ %2:%3</source>
         <translation>%1 @ %2:%3</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1638"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1632"/>
         <source>Edit name of bookmark</source>
         <translation>Muokkaa kirjanmerkin nimeä</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1639"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1633"/>
         <source>Custom name:</source>
         <translation>Valinnainen nimi:</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1644"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1638"/>
         <source>Name is too long!</source>
         <translation>Nimi on liian pitkä!</translation>
     </message>
@@ -6906,91 +7055,101 @@ Ennen kuin päivitystä voidaan jatkaa, sinun tulee käynnistää Bluetooth OSTC
 <context>
     <name>QMLManager</name>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="95"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="97"/>
         <source>Starting...</source>
         <translation>Ladataan...</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="202"/>
         <source>working in no-cloud mode</source>
         <translation>käytä off-line -tilassa</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="213"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="216"/>
         <source>no cloud credentials</source>
         <translation>Ei pilvipalvelun tunnuksia</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="214"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="270"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="217"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="269"/>
         <source>Please enter valid cloud credentials.</source>
         <translation>Syötä pilvipalvelun tunnuksent.</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="285"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="284"/>
         <source>Attempting to open cloud storage with new credentials</source>
         <translation>Yritetään avata yhteyttä pilvipalveluun uusilla tunnuksilla</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="304"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="306"/>
         <source>Testing cloud credentials</source>
         <translation>Testataan pilvipalvelun tunnuksia</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="331"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="320"/>
+        <source>No response from cloud server to validate the credentials</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="329"/>
+        <source>Cannot connect to cloud storage - cloud account not verified</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="361"/>
         <source>Cloud credentials are invalid</source>
         <translation>Virheelliset pilvipalvelun tunnukset</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="344"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="374"/>
         <source>Cannot open cloud storage: Error creating https connection</source>
         <translation>Yhteys pivlipalveluun epäonnistui: Virhe luotaessa HTTPS -yhteyttä</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="357"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="387"/>
         <source>Cannot open cloud storage: %1</source>
         <translation>Pilvitallennuksen yhteyden avaus epäonnistui: %1</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="369"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="399"/>
         <source>Cannot connect to cloud storage</source>
         <translation>Yhteys pilvitallennukseen epäonnistui</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="411"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="441"/>
         <source>Cloud storage error: %1</source>
         <translation>Virhe pilvitallennuksessa: %1</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="501"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="531"/>
         <source>Failed to connect to cloud server, reverting to no cloud status</source>
         <translation>Yhteysvirhe pilvipalveluun, käytetään off-line -tilassa</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="520"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="550"/>
         <source>Cloud storage open successfully. No dives in dive list.</source>
         <translation>Yhteys muodostettu pilvipalveluun. Sukelluslista on tyhjä.</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="689"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="690"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="721"/>
         <source>h</source>
         <translation>t</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="689"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="690"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="691"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="721"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="722"/>
         <source>min</source>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="689"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/>
         <source>sec</source>
         <translation>sek</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="1041"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="1102"/>
         <source>Unknown GPS location</source>
         <translation>Tuntemattomat GPS -sijainnit</translation>
     </message>
@@ -6998,126 +7157,126 @@ Ennen kuin päivitystä voidaan jatkaa, sinun tulee käynnistää Bluetooth OSTC
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../core/qthelper.cpp" line="866"/>
-        <location filename="../core/qthelper.cpp" line="1214"/>
-        <source>AIR</source>
-        <translation>Ilma</translation>
+        <location filename="../core/gpslocation.h" line="13"/>
+        <source>Waiting to aquire GPS location</source>
+        <translation>Odotetaan GPS -sijaintia</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="1214"/>
-        <source>OXYGEN</source>
-        <translation>HAPPI</translation>
+        <location filename="../core/qthelper.cpp" line="766"/>
+        <location filename="../core/qthelper.cpp" line="1275"/>
+        <source>m</source>
+        <translation>m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="59"/>
-        <source>Remove this point</source>
-        <translation>Poista tämä etappi</translation>
+        <location filename="../core/qthelper.cpp" line="768"/>
+        <location filename="../core/qthelper.cpp" line="1274"/>
+        <source>ft</source>
+        <translation>ft</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="32"/>
-        <source>Average</source>
-        <translation>Keskim.</translation>
+        <location filename="../core/qthelper.cpp" line="794"/>
+        <source>C</source>
+        <translation>C</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="35"/>
-        <source>Minimum</source>
-        <translation>Alin</translation>
+        <location filename="../core/qthelper.cpp" line="796"/>
+        <source>F</source>
+        <translation>F</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="38"/>
-        <source>Maximum</source>
-        <translation>Korkein</translation>
+        <location filename="../core/qthelper.cpp" line="821"/>
+        <location filename="../core/qthelper.cpp" line="1250"/>
+        <source>kg</source>
+        <translation>kg</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/globe.cpp" line="327"/>
-        <source>Move the map and double-click to set the dive location</source>
-        <translation>Kaksoisnäpäytä karttaa valitaksesi sukelluskohteen</translation>
+        <location filename="../core/qthelper.cpp" line="823"/>
+        <location filename="../core/qthelper.cpp" line="1251"/>
+        <source>lbs</source>
+        <translation>pauna</translation>
     </message>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="28"/>
-        <source>unknown</source>
-        <translation>tuntematon</translation>
+        <location filename="../core/qthelper.cpp" line="848"/>
+        <location filename="../core/qthelper.cpp" line="1300"/>
+        <source>bar</source>
+        <translation>bar</translation>
     </message>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="105"/>
-        <source>h:</source>
-        <translation>t:</translation>
+        <location filename="../core/qthelper.cpp" line="850"/>
+        <location filename="../core/qthelper.cpp" line="1299"/>
+        <source>psi</source>
+        <translation>psi</translation>
     </message>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="105"/>
-        <source>min</source>
-        <translation>min</translation>
+        <location filename="../core/qthelper.cpp" line="871"/>
+        <location filename="../core/qthelper.cpp" line="1235"/>
+        <source>AIR</source>
+        <translation>Ilma</translation>
     </message>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="337"/>
-        <source>Multiple</source>
-        <translation>Useita</translation>
+        <location filename="../core/qthelper.cpp" line="873"/>
+        <source>EAN</source>
+        <translation>EAN</translation>
     </message>
     <message numerus="yes">
-        <location filename="../core/qthelper.cpp" line="957"/>
+        <location filename="../core/qthelper.cpp" line="962"/>
         <source>(%n dive(s))</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="816"/>
-        <location filename="../core/qthelper.cpp" line="1228"/>
-        <source>kg</source>
-        <translation>kg</translation>
+        <location filename="../core/qthelper.cpp" line="1235"/>
+        <source>OXYGEN</source>
+        <translation>HAPPI</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="818"/>
-        <location filename="../core/qthelper.cpp" line="1229"/>
-        <source>lbs</source>
-        <translation>pauna</translation>
+        <location filename="../core/qthelper.cpp" line="1322"/>
+        <source>l</source>
+        <translation>l</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="763"/>
-        <location filename="../core/qthelper.cpp" line="1252"/>
-        <source>ft</source>
-        <translation>ft</translation>
+        <location filename="../core/qthelper.cpp" line="1323"/>
+        <source>cuft</source>
+        <translation>ft³</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="761"/>
-        <location filename="../core/qthelper.cpp" line="1253"/>
-        <source>m</source>
-        <translation>m</translation>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="29"/>
+        <source>unknown</source>
+        <translation>tuntematon</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="789"/>
-        <source>C</source>
-        <translation>C</translation>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="114"/>
+        <source>h:</source>
+        <translation>t:</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="791"/>
-        <source>F</source>
-        <translation>F</translation>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="114"/>
+        <source>min</source>
+        <translation>min</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="845"/>
-        <location filename="../core/qthelper.cpp" line="1275"/>
-        <source>psi</source>
-        <translation>psi</translation>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="63"/>
+        <source>Remove this point</source>
+        <translation>Poista tämä etappi</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="843"/>
-        <location filename="../core/qthelper.cpp" line="1276"/>
-        <source>bar</source>
-        <translation>bar</translation>
+        <location filename="../desktop-widgets/globe.cpp" line="327"/>
+        <source>Move the map and double-click to set the dive location</source>
+        <translation>Kaksoisnäpäytä karttaa valitaksesi sukelluskohteen</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="868"/>
-        <source>EAN</source>
-        <translation>EAN</translation>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="32"/>
+        <source>Average</source>
+        <translation>Keskim.</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="1298"/>
-        <source>l</source>
-        <translation>l</translation>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="35"/>
+        <source>Minimum</source>
+        <translation>Alin</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="1299"/>
-        <source>cuft</source>
-        <translation>ft³</translation>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="38"/>
+        <source>Maximum</source>
+        <translation>Korkein</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="625"/>
@@ -7139,17 +7298,12 @@ Ennen kuin päivitystä voidaan jatkaa, sinun tulee käynnistää Bluetooth OSTC
         <source>Malformed XML response. Line %1: %2</source>
         <translation>Virheellinen XML vastasu. Rivi %1: %2</translation>
     </message>
-    <message>
-        <location filename="../core/gpslocation.h" line="13"/>
-        <source>Waiting to aquire GPS location</source>
-        <translation>Odotetaan GPS -sijaintia</translation>
-    </message>
 </context>
 <context>
     <name>ReadSettingsThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1651"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1676"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1640"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1665"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Ominaisuus ei ole vielä saatavilla valitulle sukellustietokoneelle.</translation>
     </message>
@@ -7178,7 +7332,7 @@ Ennen kuin päivitystä voidaan jatkaa, sinun tulee käynnistää Bluetooth OSTC
 <context>
     <name>ResetSettingsThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1775"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1764"/>
         <source>Reset settings failed!</source>
         <translation>Asetusten nollaus epäonnistui!</translation>
     </message>
@@ -7216,6 +7370,12 @@ Ennen kuin päivitystä voidaan jatkaa, sinun tulee käynnistää Bluetooth OSTC
 <context>
     <name>ShiftImageTimesDialog</name>
     <message>
+        <location filename="../desktop-widgets/shiftimagetimes.ui" line="23"/>
+        <location filename="../build/ui_shiftimagetimes.h" line="184"/>
+        <source>Shift selected image times</source>
+        <translation>Muuta valittujen kuvien aikaa</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/shiftimagetimes.ui" line="34"/>
         <location filename="../build/ui_shiftimagetimes.h" line="185"/>
         <source>Shift times of image(s) by</source>
@@ -7228,12 +7388,6 @@ Ennen kuin päivitystä voidaan jatkaa, sinun tulee käynnistää Bluetooth OSTC
         <translation>h:mm</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/shiftimagetimes.ui" line="23"/>
-        <location filename="../build/ui_shiftimagetimes.h" line="184"/>
-        <source>Shift selected image times</source>
-        <translation>Muuta valittujen kuvien aikaa</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/shiftimagetimes.ui" line="105"/>
         <location filename="../build/ui_shiftimagetimes.h" line="187"/>
         <source>Earlier</source>
@@ -7284,12 +7438,12 @@ Osa kuvien aikaleimasta ei ole minkään valitun sukelluksen aikana (+- 30 minuu
         <translation>Mikä päivä ja aika näkyy kuvassa?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="297"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="296"/>
         <source>Open image file</source>
         <translation>Avaa kuvatiedosto</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="299"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="298"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>Kuvatiedostot (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -7447,54 +7601,54 @@ Osa kuvien aikaleimasta ei ole minkään valitun sukelluksen aikana (+- 30 minuu
 <context>
     <name>SocialNetworkDialog</name>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="339"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="284"/>
         <source>Dive date: %1 
 </source>
         <translation>Sukelluspäivä: %1
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="342"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="287"/>
         <source>Duration: %1 
 </source>
         <translation>Kesto: %1
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="343"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="288"/>
         <source>h:</source>
         <comment>abbreviation for hours plus separator</comment>
         <translation>t:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="344"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="289"/>
         <source>min</source>
         <comment>abbreviation for minutes</comment>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="347"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="292"/>
         <source>Dive location: %1 
 </source>
         <translation>Sukelluskohde: %1
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="350"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="295"/>
         <source>Buddy: %1 
 </source>
         <translation>Sukelluspari: %1
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="353"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="298"/>
         <source>Divemaster: %1 
 </source>
         <translation>Divemaster: %1 
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="356"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="301"/>
         <source>
 %1</source>
         <translation>
@@ -7580,12 +7734,21 @@ Osa kuvien aikaleimasta ei ole minkään valitun sukelluksen aikana (+- 30 minuu
     <name>StartPage</name>
     <message>
         <location filename="../mobile-widgets/qml/StartPage.qml" line="19"/>
-        <source>To use Subsurface-mobile with Subsurface cloud storage, please enteryour cloud credentials.
-
-To use Subsurface-mobile only with local data on this device, tap on the no cloud icon below.</source>
-        <translation>Käyttääksesi Subsurface-mobiilia pilvipalvelun kanssa, syötä pilvipalvelun käyttäjätunnuksesi.
+        <source>To use Subsurface-mobile with Subsurface cloud storage, please enter your cloud credentials.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/StartPage.qml" line="20"/>
+        <source>If this is the first time you use Subsurface cloud storage, enter a valid email (all lower case) and a password of your choice (letters and numbers). The server will send a PIN to the email address provided that you will have to enter here.
 
-Käyttääksesis Subsurface-mobiilia paikallisesti, napauta &quot;ei pilveä&quot; -ikonia.</translation>
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/StartPage.qml" line="23"/>
+        <source>To use Subsurface-mobile only with local data on this device, tap on the no cloud icon below.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -7623,7 +7786,12 @@ Käyttääksesis Subsurface-mobiilia paikallisesti, napauta &quot;ei pilveä&quo
 <context>
     <name>SubsurfaceWebServices</name>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="419"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="395"/>
+        <source>Enter User ID and click Download</source>
+        <translation>Syötä käyttäjätunnus ja näpäytä Lataa</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="417"/>
         <source>Webservice</source>
         <translation>Verkkopalvelu</translation>
     </message>
@@ -7648,30 +7816,25 @@ Käyttääksesis Subsurface-mobiilia paikallisesti, napauta &quot;ei pilveä&quo
         <translation>Yhteysvirhe:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="557"/>
-        <source>Download successful</source>
-        <translation>Lataus onnistui</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="551"/>
         <source>Invalid user identifier!</source>
         <translation>Tuntematon käyttäjä!</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="397"/>
-        <source>Enter User ID and click Download</source>
-        <translation>Syötä käyttäjätunnus ja näpäytä Lataa</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="554"/>
         <source>Cannot parse response!</source>
         <translation>Vastauksen jäsentäminen ei onnistu!</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="557"/>
+        <source>Download successful</source>
+        <translation>Lataus onnistui</translation>
+    </message>
 </context>
 <context>
     <name>SuitFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="674"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="672"/>
         <source>Suits: </source>
         <translation>Puvut:</translation>
     </message>
@@ -7679,7 +7842,7 @@ Käyttääksesis Subsurface-mobiilia paikallisesti, napauta &quot;ei pilveä&quo
 <context>
     <name>SuitsFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="123"/>
+        <location filename="../qt-models/filtermodels.cpp" line="128"/>
         <source>No suit set</source>
         <translation>Pukua ei asetettu</translation>
     </message>
@@ -7698,7 +7861,7 @@ Käyttääksesis Subsurface-mobiilia paikallisesti, napauta &quot;ei pilveä&quo
 <context>
     <name>TagFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="595"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="593"/>
         <source>Tags: </source>
         <translation>Avainsanat:</translation>
     </message>
@@ -7706,7 +7869,7 @@ Käyttääksesis Subsurface-mobiilia paikallisesti, napauta &quot;ei pilveä&quo
 <context>
     <name>TagFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="148"/>
+        <location filename="../qt-models/filtermodels.cpp" line="153"/>
         <source>Empty tags</source>
         <translation>Tyhjennä avainsanat</translation>
     </message>
@@ -7732,6 +7895,11 @@ Käyttääksesis Subsurface-mobiilia paikallisesti, napauta &quot;ei pilveä&quo
 <context>
     <name>TemplateEdit</name>
     <message>
+        <location filename="../desktop-widgets/templateedit.ui" line="14"/>
+        <source>Edit template</source>
+        <translation>Muokkaa sapluunaa</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/templateedit.ui" line="37"/>
         <source>Preview</source>
         <translation>Esikatselu</translation>
@@ -7777,11 +7945,6 @@ Käyttääksesis Subsurface-mobiilia paikallisesti, napauta &quot;ei pilveä&quo
         <translation>Fontin koko</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/templateedit.ui" line="14"/>
-        <source>Edit template</source>
-        <translation>Muokkaa sapluunaa</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/templateedit.ui" line="165"/>
         <source>Color palette</source>
         <translation>Väripaletti</translation>
@@ -7963,7 +8126,7 @@ Käyttääksesis Subsurface-mobiilia paikallisesti, napauta &quot;ei pilveä&quo
 <context>
     <name>TextHyperlinkEventFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="817"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="815"/>
         <source>%1click to visit %2</source>
         <translation>napauta %1 pohjassa avataksesi %2</translation>
     </message>
@@ -7979,102 +8142,107 @@ Käyttääksesis Subsurface-mobiilia paikallisesti, napauta &quot;ei pilveä&quo
 <context>
     <name>TripItem</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="67"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="68"/>
         <source>(%1 shown)</source>
         <translation> (näytetään %1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="194"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="197"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="215"/>
         <source>Date</source>
         <translation>Ajankohta</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="200"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="218"/>
         <source>Rating</source>
         <translation>Yleisarvio</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
         <source>Depth(%1)</source>
         <translation>Syvyys(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="206"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="224"/>
         <source>Duration</source>
         <translation>Kesto</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="209"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="227"/>
         <source>Temp(%1%2)</source>
         <translation>Lämpötila(%1%2)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
         <source>Weight(%1)</source>
         <translation>Massa(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
         <source>lbs</source>
         <translation>pauna</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="215"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="233"/>
         <source>Suit</source>
         <translation>Puku</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="218"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="236"/>
         <source>Cyl</source>
         <translation>Säiliöt</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="239"/>
         <source>Gas</source>
         <translation>Kaasu</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="244"/>
         <source>SAC(%1)</source>
         <translation>Pintakulutus(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="244"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="229"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="247"/>
         <source>OTU</source>
         <translation>Happikertymä (OTU)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="232"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="250"/>
         <source>Max CNS</source>
         <translation>Max CNS</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="235"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="253"/>
+        <source>Photos before/during/after dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="256"/>
         <source>Location</source>
         <translation>Kohde</translation>
     </message>
@@ -8097,72 +8265,73 @@ Käyttääksesis Subsurface-mobiilia paikallisesti, napauta &quot;ei pilveä&quo
 <context>
     <name>UpdateManager</name>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="69"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="61"/>
         <source>Check for updates.</source>
         <translation>Tarkista päivitykset.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="70"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="62"/>
         <source>Subsurface was unable to check for updates.</source>
         <translation>Päivitysten tarkistus epäonnistui.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="75"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="67"/>
         <source>The following error occurred:</source>
         <translation>Tapahtui seuraava virhe:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="76"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="68"/>
         <source>Please check your internet connection.</source>
         <translation>Tarkista Internetyhteys.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="86"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="78"/>
         <source>You are using the latest version of Subsurface.</source>
         <translation>Käytössä on uusin versio Subsurfacesta.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="89"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="81"/>
         <source>A new version of Subsurface is available.&lt;br/&gt;Click on:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; to download it.</source>
         <translation>Saatavilla on uusi versio Subsurfacesta.&lt;br/&gt;Näpäytä:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; ladataksesi sen.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="95"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="87"/>
         <source>A new version of Subsurface is available.</source>
         <translation>Saatavilla on uusi versio Subsurfacesta.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="96"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="88"/>
         <source>Latest version is %1, please check %2 our download page %3 for information in how to update.</source>
         <translation>Uusin versio on %1, tarkista %2 lataussivultamme %3 päivitysohjeiksi.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="106"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="98"/>
         <source>Newest release version is </source>
         <translation>Uusin julkaistu versio on</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="107"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="99"/>
         <source>The server returned the following information:</source>
         <translation>Palvelin palautti seuraavan tiedon:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="125"/>
-        <source>Subsurface is checking every two weeks if a new version is available. If you don&apos;t want Subsurface to continue checking, please click Decline.</source>
-        <translation>Päivitykset tarkistetaan kahden viikon välein. Voit kieltäytyä, jos et halua automaattista versiopäivitysten tarkastusta.</translation>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="117"/>
+        <source>Subsurface is checking every two weeks if a new version is available. 
+ If you don&apos;t want Subsurface to continue checking, please click Decline.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="126"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="119"/>
         <source>Decline</source>
         <translation>Kieltäydy</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="127"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="120"/>
         <source>Accept</source>
         <translation>Hyväksy</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="129"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="122"/>
         <source>Automatic check for updates</source>
         <translation>Päivitysten automaattinen tarkistus</translation>
     </message>
@@ -8184,24 +8353,6 @@ Käyttääksesis Subsurface-mobiilia paikallisesti, napauta &quot;ei pilveä&quo
 <context>
     <name>UserSurvey</name>
     <message>
-        <location filename="../desktop-widgets/usersurvey.ui" line="44"/>
-        <location filename="../build/ui_usersurvey.h" line="151"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;We would love to learn more about our users, their preferences and their usage habits. Please spare a minute to fill out this form and submit it to the Subsurface team.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Haluaisimme tietää enemmän käyttäjistämme, heidän asetuksistaan ja tyypillisestä Subsurfacen käytöstä. Voisitko täyttää tämän lomakkeen ja lähettää sen Subsurfacen kehittäjille.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/usersurvey.ui" line="115"/>
-        <location filename="../build/ui_usersurvey.h" line="156"/>
-        <source>Other software/sources</source>
-        <translation>Muut ohjelmat/lähteet</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/usersurvey.ui" line="128"/>
-        <location filename="../build/ui_usersurvey.h" line="157"/>
-        <source>Manually entering dives</source>
-        <translation>Sukellusten syöttö käsin</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="14"/>
         <location filename="../build/ui_usersurvey.h" line="149"/>
         <source>User survey</source>
@@ -8214,6 +8365,12 @@ Käyttääksesis Subsurface-mobiilia paikallisesti, napauta &quot;ei pilveä&quo
         <translation>Subsurfacen käyttäjäkysely</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/usersurvey.ui" line="44"/>
+        <location filename="../build/ui_usersurvey.h" line="151"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;We would love to learn more about our users, their preferences and their usage habits. Please spare a minute to fill out this form and submit it to the Subsurface team.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Haluaisimme tietää enemmän käyttäjistämme, heidän asetuksistaan ja tyypillisestä Subsurfacen käytöstä. Voisitko täyttää tämän lomakkeen ja lähettää sen Subsurfacen kehittäjille.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="63"/>
         <location filename="../build/ui_usersurvey.h" line="152"/>
         <source>Technical diver</source>
@@ -8238,6 +8395,18 @@ Käyttääksesis Subsurface-mobiilia paikallisesti, napauta &quot;ei pilveä&quo
         <translation>Tuettu sukellustietokone</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/usersurvey.ui" line="115"/>
+        <location filename="../build/ui_usersurvey.h" line="156"/>
+        <source>Other software/sources</source>
+        <translation>Muut ohjelmat/lähteet</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/usersurvey.ui" line="128"/>
+        <location filename="../build/ui_usersurvey.h" line="157"/>
+        <source>Manually entering dives</source>
+        <translation>Sukellusten syöttö käsin</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="141"/>
         <location filename="../build/ui_usersurvey.h" line="158"/>
         <source>Android/iPhone companion app</source>
@@ -8268,6 +8437,11 @@ Käyttääksesis Subsurface-mobiilia paikallisesti, napauta &quot;ei pilveä&quo
         <translation>Mistä tuot tietoja?</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/usersurvey.cpp" line="18"/>
+        <source>Send</source>
+        <translation>Lähetä</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/usersurvey.cpp" line="43"/>
         <source>
 Operating system: %1</source>
@@ -8311,19 +8485,14 @@ Kieli: %1</translation>
         <translation>Kysy myöhemmin</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/usersurvey.cpp" line="101"/>
-        <source>Submit user survey.</source>
-        <translation>Lähetä käyttäjäkysely.</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/usersurvey.cpp" line="82"/>
         <source>Ask again?</source>
         <translation>Kysytäänkö uudestaan?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/usersurvey.cpp" line="18"/>
-        <source>Send</source>
-        <translation>Lähetä</translation>
+        <location filename="../desktop-widgets/usersurvey.cpp" line="101"/>
+        <source>Submit user survey.</source>
+        <translation>Lähetä käyttäjäkysely.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/usersurvey.cpp" line="102"/>
@@ -8415,12 +8584,12 @@ Kieli: %1</translation>
         <translation>Lähetä</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="324"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="325"/>
         <source>Operation timed out</source>
         <translation>Toimenpide ei valmistunut ajoissa</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="345"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="346"/>
         <source>Transferring data...</source>
         <translation>Tietoa siirretään...</translation>
     </message>
@@ -8455,18 +8624,18 @@ Kieli: %1</translation>
 <context>
     <name>WriteSettingsThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1702"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1709"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1718"/>
-        <source>Failed!</source>
-        <translation>Epäonnistui!</translation>
-    </message>
-    <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1700"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1721"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1689"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1710"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Ominaisuus ei ole vielä saatavilla valitulle sukellustietokoneelle.</translation>
     </message>
+    <message>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1691"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1698"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1707"/>
+        <source>Failed!</source>
+        <translation>Epäonnistui!</translation>
+    </message>
 </context>
 <context>
     <name>YearlyStatisticsModel</name>
@@ -8591,7 +8760,7 @@ Keski</translation>
 <context>
     <name>getextFromC</name>
     <message>
-        <location filename="../core/libdivecomputer.c" line="674"/>
+        <location filename="../core/libdivecomputer.c" line="737"/>
         <source>Error parsing the header</source>
         <translation>Virhe otsaketietojen tulkinnassa</translation>
     </message>
@@ -8599,38 +8768,377 @@ Keski</translation>
 <context>
     <name>gettextFromC</name>
     <message>
+        <location filename="../core/cochran.c" line="309"/>
+        <location filename="../core/cochran.c" line="315"/>
+        <location filename="../core/cochran.c" line="385"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>deco stop</source>
+        <translation>deko-pysähdys</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="336"/>
+        <location filename="../core/cochran.c" line="390"/>
+        <location filename="../core/file.c" line="777"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>ascent</source>
+        <translation>nousu</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="342"/>
+        <location filename="../core/file.c" line="755"/>
+        <source>battery</source>
+        <translation>paristo</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="348"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
+        <source>OLF</source>
+        <translation>Happikertymä</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="353"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
+        <source>maxdepth</source>
+        <translation>Suurin syvyys</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="358"/>
+        <location filename="../core/cochran.c" line="404"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
+        <source>pO₂</source>
+        <translation>pO₂</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="365"/>
+        <location filename="../core/cochran.c" line="414"/>
+        <location filename="../core/cochran.c" line="421"/>
+        <location filename="../core/file.c" line="868"/>
+        <location filename="../core/libdivecomputer.c" line="225"/>
+        <location filename="../core/libdivecomputer.c" line="228"/>
+        <source>gaschange</source>
+        <translation>Kaasun vaihto</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="370"/>
+        <location filename="../core/cochran.c" line="409"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>rbt</source>
+        <translation>pohja-aika</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="379"/>
+        <location filename="../core/cochran.c" line="426"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>ceiling</source>
+        <translation>katto</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="395"/>
+        <location filename="../core/libdivecomputer.c" line="224"/>
+        <source>transmitter</source>
+        <translation>lähetin</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="153"/>
+        <source>Error: the file does not appear to be a DATATRAK divelog</source>
+        <translation>Virhe: tiedosto ei vaikuta DTATRAK -sukelluslokilta</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="286"/>
+        <source>clear</source>
+        <translation>tyhjennä</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="289"/>
+        <source>misty</source>
+        <translation>sumuinen</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="292"/>
+        <source>fog</source>
+        <translation>sumu</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="295"/>
+        <source>rain</source>
+        <translation>sade</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="298"/>
+        <source>storm</source>
+        <translation>myrsky</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="301"/>
+        <source>snow</source>
+        <translation>lumi</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="321"/>
+        <source>No suit</source>
+        <translation>Ei pukua</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="324"/>
+        <source>Shorty</source>
+        <translation>lyhyt</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="327"/>
+        <source>Combi</source>
+        <translation>yhdistelmä</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="330"/>
+        <source>Wet suit</source>
+        <translation>Märkäpuku</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="333"/>
+        <source>Semidry suit</source>
+        <translation>Puolikuiva</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="336"/>
+        <source>Dry suit</source>
+        <translation>Kuivapuku</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="396"/>
+        <source>no stop</source>
+        <translation>ilman pysähdystä</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="398"/>
+        <location filename="../core/dive.c" line="29"/>
+        <source>deco</source>
+        <translation>deko</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="400"/>
+        <source>single ascent</source>
+        <translation>yksittäinen nousu</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="402"/>
+        <source>multiple ascent</source>
+        <translation>useita nousuja</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="404"/>
+        <location filename="../core/dive.c" line="27"/>
+        <source>fresh</source>
+        <translation>makea</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="406"/>
+        <source>salt water</source>
+        <translation>suolavesi</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="431"/>
+        <source>sight seeing</source>
+        <translation>nähtävyydet</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="433"/>
+        <source>club dive</source>
+        <translation>seurasukellus</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="435"/>
+        <location filename="../core/dive.c" line="28"/>
+        <source>instructor</source>
+        <translation>kouluttaja</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="437"/>
+        <source>instruction</source>
+        <translation>opastus</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="439"/>
+        <location filename="../core/dive.c" line="27"/>
+        <source>night</source>
+        <translation>yö</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="441"/>
+        <location filename="../core/dive.c" line="25"/>
+        <source>cave</source>
+        <translation>luola</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="443"/>
+        <location filename="../core/dive.c" line="24"/>
+        <source>ice</source>
+        <translation>jää</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="445"/>
+        <source>search</source>
+        <translation>etsi</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="455"/>
+        <location filename="../core/dive.c" line="25"/>
+        <source>wreck</source>
+        <translation>hylky</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="457"/>
+        <location filename="../core/dive.c" line="26"/>
+        <source>river</source>
+        <translation>joki</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="459"/>
+        <location filename="../core/dive.c" line="23"/>
+        <source>drift</source>
+        <translation>virta</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="461"/>
+        <location filename="../core/dive.c" line="28"/>
+        <source>photo</source>
+        <translation>valokuva</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="463"/>
+        <source>other</source>
+        <translation>muu</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="474"/>
+        <source>Other activities</source>
+        <translation>Muut aktiviteetit</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="498"/>
+        <source>Datatrak/Wlog notes</source>
+        <translation>Datatrak/Wlog -muistiinpanot</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="537"/>
+        <source>Manually entered dive</source>
+        <translation>Käsin syötetty sukellus</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="588"/>
+        <source>Unknown</source>
+        <translation>Tuntematon</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="674"/>
+        <source>Error: couldn&apos;t open the file %s</source>
+        <translation>Virhe: tiedoston %s avaus ei onnistunut</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="687"/>
+        <source>Error: no dive</source>
+        <translation>Virhe: ei sukellusta</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="23"/>
+        <source>boat</source>
+        <translation>vene</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="23"/>
+        <source>shore</source>
+        <translation>ranta</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="24"/>
+        <source>deep</source>
+        <translation>syvä</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="24"/>
+        <source>cavern</source>
+        <translation>luola (cavern)</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="25"/>
+        <source>altitude</source>
+        <translation>korkeus</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="26"/>
+        <source>pool</source>
+        <translation>uima-allas</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="26"/>
+        <source>lake</source>
+        <translation>järvi</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="27"/>
+        <source>student</source>
+        <translation>oppilas</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="28"/>
+        <source>video</source>
+        <translation>video</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="33"/>
+        <source>OC-gas</source>
+        <translation>Vapaankierron seos</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="33"/>
+        <source>diluent</source>
+        <translation>diluent</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="33"/>
+        <location filename="../core/equipment.c" line="88"/>
+        <location filename="../core/planner.c" line="1436"/>
+        <location filename="../core/planner.c" line="1439"/>
+        <source>oxygen</source>
+        <translation>happi</translation>
+    </message>
+    <message>
         <location filename="../core/dive.c" line="181"/>
         <source>pascal</source>
         <translation>Pa</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="186"/>
-        <location filename="../core/qthelper.cpp" line="669"/>
+        <location filename="../core/qthelper.cpp" line="674"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="190"/>
-        <location filename="../core/qthelper.cpp" line="672"/>
+        <location filename="../core/qthelper.cpp" line="677"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
+        <location filename="../core/dive.c" line="227"/>
+        <source>ℓ</source>
+        <translation>ℓ</translation>
+    </message>
+    <message>
         <location filename="../core/dive.c" line="232"/>
         <source>cuft</source>
         <translation>ft³</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="269"/>
-        <location filename="../core/qthelper.cpp" line="590"/>
-        <location filename="../core/qthelper.cpp" line="605"/>
+        <location filename="../core/qthelper.cpp" line="595"/>
+        <location filename="../core/qthelper.cpp" line="610"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="274"/>
-        <location filename="../core/qthelper.cpp" line="593"/>
-        <location filename="../core/qthelper.cpp" line="607"/>
+        <location filename="../core/qthelper.cpp" line="598"/>
+        <location filename="../core/qthelper.cpp" line="612"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
@@ -8656,53 +9164,58 @@ Keski</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="325"/>
-        <location filename="../core/qthelper.cpp" line="616"/>
-        <location filename="../core/qthelper.cpp" line="626"/>
+        <location filename="../core/qthelper.cpp" line="621"/>
+        <location filename="../core/qthelper.cpp" line="631"/>
         <source>lbs</source>
         <translation>pauna</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="329"/>
-        <location filename="../core/qthelper.cpp" line="614"/>
-        <location filename="../core/qthelper.cpp" line="624"/>
+        <location filename="../core/qthelper.cpp" line="619"/>
+        <location filename="../core/qthelper.cpp" line="629"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="1772"/>
+        <location filename="../core/dive.c" line="1751"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) tai (%s)</translation>
     </message>
     <message>
-        <location filename="../core/divelist.c" line="484"/>
+        <location filename="../core/divelist.c" line="487"/>
         <location filename="../core/equipment.c" line="84"/>
-        <location filename="../core/planner.c" line="1411"/>
-        <location filename="../core/planner.c" line="1414"/>
+        <location filename="../core/planner.c" line="1432"/>
+        <location filename="../core/planner.c" line="1435"/>
         <source>air</source>
         <translation>ilma</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="197"/>
+        <location filename="../core/equipment.c" line="86"/>
+        <source>EAN%d</source>
+        <translation>EAN%d</translation>
+    </message>
+    <message>
+        <location filename="../core/equipment.c" line="198"/>
         <source>integrated</source>
         <translation>integroitu</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="198"/>
+        <location filename="../core/equipment.c" line="199"/>
         <source>belt</source>
         <translation>vyöpaino</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="199"/>
+        <location filename="../core/equipment.c" line="200"/>
         <source>ankle</source>
         <translation>nilkkapaino</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="200"/>
+        <location filename="../core/equipment.c" line="201"/>
         <source>backplate weight</source>
         <translation>selkäpaino</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="201"/>
+        <location filename="../core/equipment.c" line="202"/>
         <source>clip-on</source>
         <translation>clip-on</translation>
     </message>
@@ -8715,8 +9228,8 @@ Keski</translation>
         <location filename="../core/file.c" line="121"/>
         <location filename="../core/file.c" line="512"/>
         <location filename="../core/file.c" line="597"/>
-        <location filename="../core/file.c" line="924"/>
-        <location filename="../core/file.c" line="1056"/>
+        <location filename="../core/file.c" line="909"/>
+        <location filename="../core/file.c" line="1092"/>
         <location filename="../core/ostctools.c" line="80"/>
         <source>Failed to read &apos;%s&apos;</source>
         <translation>Tiedoston &apos;%s&apos; avaaminen epäonnistui</translation>
@@ -8774,488 +9287,498 @@ Keski</translation>
         <translation>Happikalibrointi</translation>
     </message>
     <message>
-        <location filename="../core/file.c" line="887"/>
-        <source>No matching DC found for file &apos;%s&apos;</source>
-        <translation>Vastaavaa sukellustietokonetta tiedostolle &apos;%s&apos; ei löytynyt</translation>
+        <location filename="../core/git-access.c" line="134"/>
+        <source>Local cache directory %s corrupted - can&apos;t sync with Subsurface cloud storage</source>
+        <translation>Paikallinen välimuistihakemisto %s on korruptoitunut - synkronointi Subsurfacen pilvitallennustilaan ei onnistu</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>none</source>
-        <translation>ei mitään</translation>
+        <location filename="../core/git-access.c" line="157"/>
+        <location filename="../core/git-access.c" line="177"/>
+        <source>Could not update local cache to newer remote data</source>
+        <translation>Paikallisen kopion päivitys uudempaan etäversioon epäonnistui</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="309"/>
-        <location filename="../core/cochran.c" line="315"/>
-        <location filename="../core/cochran.c" line="385"/>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>deco stop</source>
-        <translation>deko-pysähdys</translation>
+        <location filename="../core/git-access.c" line="170"/>
+        <source>Subsurface cloud storage corrupted</source>
+        <translation>Virhe: Subsurfacen pilvitallennustila on korruptoitunut</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="342"/>
-        <location filename="../core/file.c" line="755"/>
-        <source>battery</source>
-        <translation>paristo</translation>
+        <location filename="../core/git-access.c" line="284"/>
+        <source>Could not update Subsurface cloud storage, try again later</source>
+        <translation>Virhe: Subsurfacen pilvitallennustilan päivitys epäonnistui, yritä myöhemmin uudelleen</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="370"/>
-        <location filename="../core/cochran.c" line="409"/>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>rbt</source>
-        <translation>pohja-aika</translation>
+        <location filename="../core/git-access.c" line="344"/>
+        <source>Remote storage and local data diverged. Error: merge failed (%s)</source>
+        <translation>Etä- ja paikallinen tallennus eroavat toisistaan. Error: merge failed (%s)</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="336"/>
-        <location filename="../core/cochran.c" line="390"/>
-        <location filename="../core/file.c" line="777"/>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>ascent</source>
-        <translation>nousu</translation>
+        <location filename="../core/git-access.c" line="374"/>
+        <source>Remote storage and local data diverged. Cannot combine local and remote changes</source>
+        <translation>Virhe: paikallinen- ja pilvitadata eroavat toisistaan. Emme voi yhdistää näitä keskenään</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="379"/>
-        <location filename="../core/cochran.c" line="426"/>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>ceiling</source>
-        <translation>katto</translation>
+        <location filename="../core/git-access.c" line="408"/>
+        <source>Remote storage and local data diverged</source>
+        <translation>Virhe: paikallinen ja pilvidata eroavat toisistaan</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>workload</source>
-        <translation>työmäärä</translation>
+        <location filename="../core/git-access.c" line="411"/>
+        <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source>
+        <translation>Paikallinen ja pilvidata eroavat toisistaan. Virhe: tiedon tallennus epäonnistui (%s)</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="395"/>
-        <location filename="../core/libdivecomputer.c" line="203"/>
-        <source>transmitter</source>
-        <translation>lähetin</translation>
+        <location filename="../core/git-access.c" line="420"/>
+        <source>Problems with local cache of Subsurface cloud data</source>
+        <translation>Virhe: ongelmia paikallisen pilvidatan kopion kanssa</translation>
+    </message>
+    <message>
+        <location filename="../core/git-access.c" line="421"/>
+        <source>Moved cache data to %s. Please try the operation again.</source>
+        <translation>Paikallinen kopio siirretty %s. Ole hyvä ja yritä toimintoa uudelleen.</translation>
+    </message>
+    <message>
+        <location filename="../core/git-access.c" line="743"/>
+        <source>Error connecting to Subsurface cloud storage</source>
+        <translation>Virhe: yhteys Subsurfacen pilvitallennustilaan</translation>
+    </message>
+    <message>
+        <location filename="../core/git-access.c" line="746"/>
+        <source>git clone of %s failed (%s)</source>
+        <translation>lokin %s haku epäonnistui (%s)</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="210"/>
+        <location filename="../core/parse-xml.c" line="3317"/>
+        <location filename="../core/uemis-downloader.c" line="134"/>
+        <source>unknown</source>
+        <translation>tuntematon</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>none</source>
+        <translation>ei mitään</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>workload</source>
+        <translation>työmäärä</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="203"/>
+        <location filename="../core/libdivecomputer.c" line="224"/>
         <source>violation</source>
         <translation>rike</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="203"/>
+        <location filename="../core/libdivecomputer.c" line="224"/>
         <source>bookmark</source>
         <translation>kirjanmerkki</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="203"/>
+        <location filename="../core/libdivecomputer.c" line="224"/>
         <source>surface</source>
         <translation>pinta</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="203"/>
+        <location filename="../core/libdivecomputer.c" line="224"/>
         <source>safety stop</source>
         <translation>turvapysähdys</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="365"/>
-        <location filename="../core/cochran.c" line="414"/>
-        <location filename="../core/cochran.c" line="421"/>
-        <location filename="../core/file.c" line="868"/>
-        <location filename="../core/libdivecomputer.c" line="204"/>
-        <location filename="../core/libdivecomputer.c" line="207"/>
-        <source>gaschange</source>
-        <translation>Kaasun vaihto</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="204"/>
+        <location filename="../core/libdivecomputer.c" line="225"/>
         <source>safety stop (voluntary)</source>
         <translation>turvapysähdys (vapaaehtoinen)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="204"/>
+        <location filename="../core/libdivecomputer.c" line="225"/>
         <source>safety stop (mandatory)</source>
         <translation>turvapysähdys (pakollinen)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="205"/>
+        <location filename="../core/libdivecomputer.c" line="226"/>
         <source>deepstop</source>
         <translation>syväpysähdys</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="205"/>
+        <location filename="../core/libdivecomputer.c" line="226"/>
         <source>ceiling (safety stop)</source>
         <translation>katto (turvapysähdys)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="205"/>
-        <source>divetime</source>
-        <translation>sukellusaika</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="205"/>
+        <location filename="../core/libdivecomputer.c" line="226"/>
         <source>below floor</source>
         <comment>event showing dive is below deco floor and adding deco time</comment>
         <translation>liian syvällä</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="353"/>
-        <location filename="../core/libdivecomputer.c" line="206"/>
-        <source>maxdepth</source>
-        <translation>Suurin syvyys</translation>
-    </message>
-    <message>
-        <location filename="../core/cochran.c" line="348"/>
-        <location filename="../core/libdivecomputer.c" line="206"/>
-        <source>OLF</source>
-        <translation>Happikertymä</translation>
+        <location filename="../core/libdivecomputer.c" line="226"/>
+        <source>divetime</source>
+        <translation>sukellusaika</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="206"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
         <source>airtime</source>
         <translation>Ilma-aika</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="206"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
         <source>rgbm</source>
         <translation>rgbm</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="206"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
         <source>heading</source>
         <translation>suunta</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="358"/>
-        <location filename="../core/cochran.c" line="404"/>
-        <location filename="../core/libdivecomputer.c" line="206"/>
-        <source>pO₂</source>
-        <translation>pO₂</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="207"/>
+        <location filename="../core/libdivecomputer.c" line="228"/>
         <source>tissue level warning</source>
         <translation>kudoskertymän varoitus</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="207"/>
+        <location filename="../core/libdivecomputer.c" line="228"/>
         <source>non stop time</source>
         <translation>keskeytyksetön aika</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="224"/>
+        <location filename="../core/libdivecomputer.c" line="237"/>
         <source>invalid event number</source>
         <translation>tuntematon tapahtumanumero</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="658"/>
-        <source>Unable to create parser for %s %s</source>
-        <translation>Jäsentäjän luominen %s %s epäonnistui</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="664"/>
-        <source>Error registering the data</source>
-        <translation>Virhe tiedon rekisteröinnissä</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="495"/>
+        <location filename="../core/libdivecomputer.c" line="553"/>
         <source>Error parsing the datetime</source>
         <translation>Virhe ajan jäsentämisessä</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="513"/>
+        <location filename="../core/libdivecomputer.c" line="571"/>
         <source>Dive %d: %s</source>
         <translation>Sukellus %d: %s</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="519"/>
+        <location filename="../core/libdivecomputer.c" line="577"/>
         <source>Error parsing the divetime</source>
         <translation>Virhe sukelluksen keston jäsentämisessä</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="529"/>
+        <location filename="../core/libdivecomputer.c" line="587"/>
         <source>Error parsing the maxdepth</source>
         <translation>Virhe maksimisyvyyden jäsentämisessä</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="548"/>
+        <location filename="../core/libdivecomputer.c" line="606"/>
         <source>Error parsing temperature</source>
         <translation>Virhe lämpötilan jäsentämisessä</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="568"/>
+        <location filename="../core/libdivecomputer.c" line="626"/>
         <source>Error parsing the gas mix count</source>
         <translation>Virhe kaasuseosten määrän jäsentämisessä</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="580"/>
+        <location filename="../core/libdivecomputer.c" line="638"/>
         <source>Error obtaining water salinity</source>
         <translation>Virhe veden suolapitoisuuden määrityksessä</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="589"/>
+        <location filename="../core/libdivecomputer.c" line="647"/>
         <source>Error obtaining surface pressure</source>
         <translation>Virhe ilmanpaineen määrityksessä</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="614"/>
+        <location filename="../core/libdivecomputer.c" line="672"/>
         <source>Error obtaining divemode</source>
         <translation>Virhe sukellustyypin lataamisessa</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="634"/>
+        <location filename="../core/libdivecomputer.c" line="692"/>
         <source>Error parsing the gas mix</source>
         <translation>Virhe kaasuseoksen jäsentämisessä</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="684"/>
+        <location filename="../core/libdivecomputer.c" line="717"/>
+        <source>Unable to create parser for %s %s</source>
+        <translation>Jäsentäjän luominen %s %s epäonnistui</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="723"/>
+        <source>Error registering the data</source>
+        <translation>Virhe tiedon rekisteröinnissä</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="744"/>
         <source>Error parsing the samples</source>
         <translation>Virhe näytteiden tulkinnassa</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="822"/>
+        <location filename="../core/libdivecomputer.c" line="882"/>
         <source>Event: waiting for user action</source>
         <translation>Tapahtuma: odotetaan käyttäjän toimia</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="830"/>
+        <location filename="../core/libdivecomputer.c" line="890"/>
         <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="../core/libdivecomputer.c" line="894"/>
+        <location filename="../core/libdivecomputer.c" line="954"/>
         <source>Error registering the event handler.</source>
         <translation>Virhe tapahtumakäsittelijän rekisteröinnissä.</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="899"/>
+        <location filename="../core/libdivecomputer.c" line="959"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Virhe perumiskäsittelijän rekisteröinnissä.</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="920"/>
+        <location filename="../core/libdivecomputer.c" line="980"/>
         <source>Dive data import error</source>
         <translation>Virhe sukellusten jäsentämisessä</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="959"/>
+        <location filename="../core/libdivecomputer.c" line="1019"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>libdivecomputer-kontekstin luominen epäonnistui</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="966"/>
+        <location filename="../core/libdivecomputer.c" line="1026"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Avaaminen epäonnistui: %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="992"/>
+        <location filename="../core/libdivecomputer.c" line="1048"/>
         <source>Insufficient privileges to open the device %s %s (%s)</source>
         <translation>Käyttövaltuudet eivät riitä laitteen %s %s (%s) avaamiseen</translation>
     </message>
     <message>
-        <location filename="../core/parse-xml.c" line="517"/>
-        <source>Strange percentage reading %s
+        <location filename="../core/load-git.c" line="194"/>
+        <location filename="../core/parse-xml.c" line="1242"/>
+        <source>multiple GPS locations for this dive site; also %s
 </source>
-        <translation>Outo prosenttiosuus: %s
+        <translation>sukelluskohteella on useita GPS -positioita; %s
 </translation>
     </message>
     <message>
-        <location filename="../core/load-git.c" line="194"/>
-        <location filename="../core/parse-xml.c" line="1238"/>
-        <source>multiple GPS locations for this dive site; also %s
+        <location filename="../core/load-git.c" line="222"/>
+        <location filename="../core/parse-xml.c" line="1304"/>
+        <source>additional name for site: %s
 </source>
-        <translation>sukelluskohteella on useita GPS -positioita; %s
+        <translation>Ylimääräinen nimi sukelluskohteelle: %s
+</translation>
+    </message>
+    <message>
+        <location filename="../core/ostctools.c" line="120"/>
+        <location filename="../core/ostctools.c" line="152"/>
+        <source>Unknown DC in dive %d</source>
+        <translation>Tuntematon sukellustietokone sukelluksella %d</translation>
+    </message>
+    <message>
+        <location filename="../core/ostctools.c" line="165"/>
+        <source>Error - %s - parsing dive %d</source>
+        <translation>Virhe - %s - jäsentäessä sukellusta %d</translation>
+    </message>
+    <message>
+        <location filename="../core/parse-xml.c" line="517"/>
+        <source>Strange percentage reading %s
+</source>
+        <translation>Outo prosenttiosuus: %s
 </translation>
     </message>
     <message>
-        <location filename="../core/parse-xml.c" line="2044"/>
+        <location filename="../core/parse-xml.c" line="2051"/>
         <source>Failed to parse &apos;%s&apos;</source>
         <translation>Tiedoston &apos;%s&apos; lukeminen epäonnistui.</translation>
     </message>
     <message>
-        <location filename="../core/parse-xml.c" line="3741"/>
+        <location filename="../core/parse-xml.c" line="3774"/>
         <source>Can&apos;t open stylesheet %s</source>
         <translation>Tyylitiedoston %1 avaus ei onnistu</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="86"/>
-        <source>EAN%d</source>
-        <translation>EAN%d</translation>
+        <location filename="../core/planner.c" line="555"/>
+        <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE %s ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source>
+        <translation>VAROITUS: TÄMÄ ON UUSI TOTEUTUS %s ALGORITMISTA JA SUKELLUSTEN SUUNNITTELUOMINAISUUDESTA. TESTAUS EI OLE OLLUT RIITTÄVÄN KATTAVAA, JOTEN SUOSITAMME, ETTÄ ETTE SUKELLA VAIN NÄIDEN TULOSTEN PERUSTEELLA.</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="1032"/>
-        <location filename="../core/planner.c" line="1184"/>
-        <source>Can&apos;t find gas %s</source>
-        <translation>Seosta %s ei löydy</translation>
+        <location filename="../core/planner.c" line="569"/>
+        <source>Decompression calculation aborted due to excessive time</source>
+        <translation>Dekon laskeminen on keskeytetty kohtuuttoman keston vuoksi</translation>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="571"/>
+        <location filename="../core/planner.c" line="829"/>
+        <location filename="../core/planner.c" line="834"/>
+        <location filename="../core/planner.c" line="860"/>
+        <location filename="../core/planner.c" line="870"/>
+        <source>Warning:</source>
+        <translation>Varoitus:</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="368"/>
-        <source>Too many gas mixes</source>
-        <translation>Liian monta kaasuseosta</translation>
+        <location filename="../core/planner.c" line="581"/>
+        <source>based on Bühlmann ZHL-16C with GFlow = %d and GFhigh = %d</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="568"/>
-        <source>Decompression calculation aborted due to excessive time</source>
-        <translation>Dekon laskeminen on keskeytetty kohtuuttoman keston vuoksi</translation>
+        <location filename="../core/planner.c" line="586"/>
+        <source>based on VPM-B at nominal conservatism</source>
+        <translation>perustuu VPM-B:hen nominaalikonservatismilla</translation>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="588"/>
+        <source>based on VPM-B at +%d conservatism</source>
+        <translation>Perustuu VPM-B:hen +%d:n konservatismilla</translation>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="590"/>
+        <source>, effective GF=%d/%d</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="594"/>
+        <source>recreational mode based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source>
+        <translation>harrastemoodi perustuu Bühlmannin ZHL-16B algoritmiin arvoilla GFlow = %d ja GFhigh = %d</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="592"/>
+        <location filename="../core/planner.c" line="598"/>
         <source>Subsurface dive plan</source>
         <translation>Subsurfacen sukellussuunnitelma</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="596"/>
-        <source>depth</source>
-        <translation>syvyys</translation>
+        <location filename="../core/planner.c" line="599"/>
+        <source>&lt;div&gt;Runtime: %dmin&lt;/div&gt;&lt;br&gt;</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="602"/>
-        <source>runtime</source>
-        <translation>sukellusaika</translation>
+        <location filename="../core/planner.c" line="604"/>
+        <source>depth</source>
+        <translation>syvyys</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="599"/>
+        <location filename="../core/planner.c" line="607"/>
         <source>duration</source>
         <translation>kesto</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="554"/>
-        <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE %s ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source>
-        <translation>VAROITUS: TÄMÄ ON UUSI TOTEUTUS %s ALGORITMISTA JA SUKELLUSTEN SUUNNITTELUOMINAISUUDESTA. TESTAUS EI OLE OLLUT RIITTÄVÄN KATTAVAA, JOTEN SUOSITAMME, ETTÄ ETTE SUKELLA VAIN NÄIDEN TULOSTEN PERUSTEELLA.</translation>
+        <location filename="../core/planner.c" line="610"/>
+        <source>runtime</source>
+        <translation>sukellusaika</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="605"/>
+        <location filename="../core/planner.c" line="613"/>
         <source>gas</source>
         <translation>kaasu</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="648"/>
+        <location filename="../core/planner.c" line="656"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation>Siirtymä %.*f %s ajassa %d:%02d min - aika %d:%02u seoksella %s (SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="656"/>
+        <location filename="../core/planner.c" line="664"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source>
         <translation>Siirtymä %.*f %s ajassa %d:%02d min - sukellusaika %d:%02u on %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="669"/>
+        <location filename="../core/planner.c" line="677"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation>Pysy syvyydessä %.*f %s %d:%02d min - aika %d:%02u seoksella %s (SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="676"/>
+        <location filename="../core/planner.c" line="684"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source>
         <translation>Pysy %.*f %s:n syvyydessä %d:%02d min - sukellusaika %d:%02u %s:lla</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="721"/>
+        <location filename="../core/planner.c" line="729"/>
         <source>%3.0f%s</source>
         <translation>%3.0f%s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="724"/>
-        <location filename="../core/planner.c" line="728"/>
+        <location filename="../core/planner.c" line="732"/>
+        <location filename="../core/planner.c" line="736"/>
         <source>%3dmin</source>
         <translation>%3d min</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="737"/>
-        <location filename="../core/planner.c" line="749"/>
+        <location filename="../core/planner.c" line="745"/>
+        <location filename="../core/planner.c" line="757"/>
         <source>(SP = %.1fbar)</source>
         <translation>(SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="772"/>
+        <location filename="../core/planner.c" line="780"/>
         <source>Switch gas to %s (SP = %.1fbar)</source>
         <translation>Vaihda kaasu seuraavaan %s (SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="774"/>
+        <location filename="../core/planner.c" line="782"/>
         <source>Switch gas to %s</source>
         <translation>Vaihda kaasu seuraavaan: %s
 </translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="793"/>
+        <location filename="../core/planner.c" line="801"/>
         <source>CNS</source>
         <translation>Happikertymä (CNS)</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="795"/>
+        <location filename="../core/planner.c" line="803"/>
         <source>OTU</source>
         <translation>Happikertymä (OTU)</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="799"/>
+        <location filename="../core/planner.c" line="807"/>
         <source>Gas consumption (CCR legs excluded):</source>
         <translation>Kaasun kulutus (CCR -etappeja ei mukana):</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="801"/>
+        <location filename="../core/planner.c" line="809"/>
         <source>Gas consumption:</source>
         <translation>Kaasun kulutus:
 </translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="570"/>
-        <location filename="../core/planner.c" line="821"/>
-        <location filename="../core/planner.c" line="826"/>
-        <location filename="../core/planner.c" line="851"/>
-        <location filename="../core/planner.c" line="861"/>
-        <source>Warning:</source>
-        <translation>Varoitus:</translation>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="580"/>
-        <source>based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source>
-        <translation>perustuu Bühlmann ZHL-16B algoritmiin GFlow = %d ja GFhigh = %d arvoihin</translation>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="584"/>
-        <source>based on VPM-B at nominal conservatism</source>
-        <translation>perustuu VPM-B:hen nominaalikonservatismilla</translation>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="586"/>
-        <source>based on VPM-B at +%d conservatism</source>
-        <translation>Perustuu VPM-B:hen +%d:n konservatismilla</translation>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="588"/>
-        <source>recreational mode based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source>
-        <translation>harrastemoodi perustuu Bühlmannin ZHL-16B algoritmiin arvoilla GFlow = %d ja GFhigh = %d</translation>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="822"/>
+        <location filename="../core/planner.c" line="830"/>
         <source>this is more gas than available in the specified cylinder!</source>
         <translation>tämä on enemmän kaasua kuin sinulla on määritellyissä säiliöissä!</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="827"/>
+        <location filename="../core/planner.c" line="835"/>
         <source>not enough reserve for gas sharing on ascent!</source>
         <translation>sinulla ei ole tarpeeksi kaasua jakaaksesi sitä pintaan nousun ajan!</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="829"/>
+        <location filename="../core/planner.c" line="837"/>
         <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source>
         <translation>%.0f%s/%.0f%s / %s (%.0f%s/%.0f%s suunnitellussa nousussa)</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="831"/>
+        <location filename="../core/planner.c" line="839"/>
         <source>%.0f%s (%.0f%s during planned ascent) of %s</source>
         <translation>%.0f%s (%.0f%s suunnitellun nousun aikana) / %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="848"/>
+        <location filename="../core/planner.c" line="857"/>
         <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
         <translation>korkea pO₂ -arvo %.2f %d:%02u:ssa seoksella %s syvyydessä %.*f %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="858"/>
+        <location filename="../core/planner.c" line="867"/>
         <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
         <translation>matala pO₂ -arvo %.2f %d:%02u:ssa seoksella %s syvyydessä %.*f %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="1419"/>
+        <location filename="../core/planner.c" line="1194"/>
+        <source>Can&apos;t find gas %s</source>
+        <translation>Seosta %s ei löydy</translation>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="1440"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1280"/>
+        <location filename="../core/profile.c" line="1298"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
@@ -9264,70 +9787,70 @@ S: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1283"/>
+        <location filename="../core/profile.c" line="1301"/>
         <source>P: %d%s
 </source>
         <translation>P: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1287"/>
+        <location filename="../core/profile.c" line="1305"/>
         <source>T: %.1f%s
 </source>
         <translation>L: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1293"/>
+        <location filename="../core/profile.c" line="1311"/>
         <source>V: %.1f%s
 </source>
         <translation>N: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1296"/>
+        <location filename="../core/profile.c" line="1314"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation>SAC: %.*f%s/min
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1298"/>
+        <location filename="../core/profile.c" line="1316"/>
         <source>CNS: %u%%
 </source>
         <translation>CNS: %u%%
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1300"/>
+        <location filename="../core/profile.c" line="1318"/>
         <source>pO%s: %.2fbar
 </source>
         <translation>pO%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1302"/>
+        <location filename="../core/profile.c" line="1320"/>
         <source>pN%s: %.2fbar
 </source>
         <translation>pN%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1304"/>
+        <location filename="../core/profile.c" line="1322"/>
         <source>pHe: %.2fbar
 </source>
         <translation>pHe: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1307"/>
+        <location filename="../core/profile.c" line="1325"/>
         <source>MOD: %d%s
 </source>
         <translation>MOD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1314"/>
+        <location filename="../core/profile.c" line="1332"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
@@ -9336,7 +9859,7 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1318"/>
+        <location filename="../core/profile.c" line="1336"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
@@ -9345,173 +9868,178 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1331"/>
+        <location filename="../core/profile.c" line="1349"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation>Turvapysähdys: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1334"/>
+        <location filename="../core/profile.c" line="1352"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation>Turvapysähdys: ajankohta? @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1339"/>
+        <location filename="../core/profile.c" line="1357"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation>Deko: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1342"/>
+        <location filename="../core/profile.c" line="1360"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation>Deko: ajankohta? @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1346"/>
+        <location filename="../core/profile.c" line="1364"/>
         <source>In deco
 </source>
         <translation>Dekossa</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1348"/>
+        <location filename="../core/profile.c" line="1366"/>
         <source>NDL: %umin
 </source>
         <translation>NDL: %umin
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1351"/>
+        <location filename="../core/profile.c" line="1369"/>
         <source>TTS: %umin
 </source>
         <translation>TTS: %umin
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1354"/>
+        <location filename="../core/profile.c" line="1372"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation>Deko: %umin @ %.0f%s (lask.)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1362"/>
+        <location filename="../core/profile.c" line="1380"/>
         <source>In deco (calc)
 </source>
         <translation>Dekossa (lask.)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1365"/>
+        <location filename="../core/profile.c" line="1383"/>
         <source>NDL: %umin (calc)
 </source>
         <translation>NDL: %umin (calc)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1367"/>
+        <location filename="../core/profile.c" line="1385"/>
         <source>NDL: &gt;2h (calc)
 </source>
         <translation>NDL: &gt;2h (lask.)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1371"/>
+        <location filename="../core/profile.c" line="1389"/>
         <source>TTS: %umin (calc)
 </source>
         <translation>TTS: %umin (calc)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1373"/>
+        <location filename="../core/profile.c" line="1391"/>
         <source>TTS: &gt;2h (calc)
 </source>
         <translation>TTS: &gt;2h (lask.)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1376"/>
+        <location filename="../core/profile.c" line="1394"/>
         <source>RBT: %umin
 </source>
         <translation>RBT: %umin
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1379"/>
+        <location filename="../core/profile.c" line="1397"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation>Laskettu katto %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1385"/>
+        <location filename="../core/profile.c" line="1403"/>
         <source>Tissue %.0fmin: %.1f%s
 </source>
         <translation>Kudos %.0fmin: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1391"/>
+        <location filename="../core/profile.c" line="1409"/>
         <source>heartbeat: %d
 </source>
         <translation>syke: %d
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1393"/>
+        <location filename="../core/profile.c" line="1411"/>
         <source>bearing: %d
 </source>
         <translation>suunta: %d
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1396"/>
+        <location filename="../core/profile.c" line="1414"/>
         <source>mean depth to here %.1f%s
 </source>
         <translation>Keskisyvyys tähän asti %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1491"/>
+        <location filename="../core/profile.c" line="1515"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sA: %d:%02d min</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1495"/>
-        <location filename="../core/profile.c" line="1499"/>
-        <location filename="../core/profile.c" line="1503"/>
+        <location filename="../core/profile.c" line="1519"/>
+        <location filename="../core/profile.c" line="1523"/>
+        <location filename="../core/profile.c" line="1527"/>
         <source>%s %sD:%.1f%s</source>
         <translation>%s %sS:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1507"/>
+        <location filename="../core/profile.c" line="1531"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sS:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1511"/>
+        <location filename="../core/profile.c" line="1535"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sN:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1515"/>
-        <location filename="../core/profile.c" line="1519"/>
+        <location filename="../core/profile.c" line="1539"/>
+        <location filename="../core/profile.c" line="1543"/>
         <source>%s %sV:%.2f%s</source>
         <translation>%s %sN:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1526"/>
+        <location filename="../core/profile.c" line="1550"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s</translation>
     </message>
     <message>
+        <location filename="../core/profile.c" line="1575"/>
+        <source>%s SAC:%.*f %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../core/qthelper.cpp" line="67"/>
         <source>%1km</source>
         <translation>%1km</translation>
@@ -9532,446 +10060,460 @@ EADD: %d%s
         <translation>%1 vuotta</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="635"/>
+        <location filename="../core/qthelper.cpp" line="91"/>
+        <location filename="../core/qthelper.cpp" line="226"/>
+        <source>N</source>
+        <translation>N</translation>
+    </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="91"/>
+        <location filename="../core/qthelper.cpp" line="227"/>
+        <source>S</source>
+        <translation>S</translation>
+    </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="92"/>
+        <location filename="../core/qthelper.cpp" line="228"/>
+        <source>E</source>
+        <translation>E</translation>
+    </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="92"/>
+        <location filename="../core/qthelper.cpp" line="229"/>
+        <source>W</source>
+        <translation>W</translation>
+    </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="640"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="638"/>
+        <location filename="../core/qthelper.cpp" line="643"/>
         <source>F</source>
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="23"/>
-        <source>boat</source>
-        <translation>vene</translation>
+        <location filename="../core/save-html.c" line="469"/>
+        <location filename="../core/save-html.c" line="553"/>
+        <location filename="../core/worldmap-save.c" line="111"/>
+        <source>Can&apos;t open file %s</source>
+        <translation>Tiedoston avaus ei onnistu %s</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="23"/>
-        <source>shore</source>
-        <translation>ranta</translation>
+        <location filename="../core/save-html.c" line="488"/>
+        <source>Number</source>
+        <translation>Numero</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="459"/>
-        <location filename="../core/dive.c" line="23"/>
-        <source>drift</source>
-        <translation>virta</translation>
+        <location filename="../core/save-html.c" line="489"/>
+        <source>Date</source>
+        <translation>Ajankohta</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="24"/>
-        <source>deep</source>
-        <translation>syvä</translation>
+        <location filename="../core/save-html.c" line="490"/>
+        <source>Time</source>
+        <translation>Kello</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="24"/>
-        <source>cavern</source>
-        <translation>luola (cavern)</translation>
+        <location filename="../core/save-html.c" line="491"/>
+        <source>Location</source>
+        <translation>Kohde</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="443"/>
-        <location filename="../core/dive.c" line="24"/>
-        <source>ice</source>
-        <translation>jää</translation>
+        <location filename="../core/save-html.c" line="492"/>
+        <source>Air temp.</source>
+        <translation>Ilman lämpötila</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="445"/>
-        <source>search</source>
-        <translation>etsi</translation>
+        <location filename="../core/save-html.c" line="493"/>
+        <source>Water temp.</source>
+        <translation>Veden lämpötila</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="455"/>
-        <location filename="../core/dive.c" line="25"/>
-        <source>wreck</source>
-        <translation>hylky</translation>
+        <location filename="../core/save-html.c" line="494"/>
+        <source>Dives</source>
+        <translation>Sukelluksia</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="441"/>
-        <location filename="../core/dive.c" line="25"/>
-        <source>cave</source>
-        <translation>luola</translation>
+        <location filename="../core/save-html.c" line="495"/>
+        <source>Expand all</source>
+        <translation>Laajenna kaikki retket</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="25"/>
-        <source>altitude</source>
-        <translation>korkeus</translation>
+        <location filename="../core/save-html.c" line="496"/>
+        <source>Collapse all</source>
+        <translation>Supista kaikki retket</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="26"/>
-        <source>pool</source>
-        <translation>uima-allas</translation>
+        <location filename="../core/save-html.c" line="497"/>
+        <source>Trips</source>
+        <translation>Retkiä</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="26"/>
-        <source>lake</source>
-        <translation>järvi</translation>
+        <location filename="../core/save-html.c" line="498"/>
+        <source>Statistics</source>
+        <translation>Tilastot</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="457"/>
-        <location filename="../core/dive.c" line="26"/>
-        <source>river</source>
-        <translation>joki</translation>
+        <location filename="../core/save-html.c" line="499"/>
+        <source>Advanced search</source>
+        <translation>Laajennettu haku</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="439"/>
-        <location filename="../core/dive.c" line="27"/>
-        <source>night</source>
-        <translation>yö</translation>
+        <location filename="../core/save-html.c" line="502"/>
+        <source>Rating</source>
+        <translation>Yleisarvio</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="153"/>
-        <source>Error: the file does not appear to be a DATATRAK divelog</source>
-        <translation>Virhe: tiedosto ei vaikuta DTATRAK -sukelluslokilta</translation>
+        <location filename="../core/save-html.c" line="503"/>
+        <source>Visibility</source>
+        <translation>Näkyvyys</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="286"/>
-        <source>clear</source>
-        <translation>tyhjennä</translation>
+        <location filename="../core/save-html.c" line="504"/>
+        <source>Duration</source>
+        <translation>Kesto</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="289"/>
-        <source>misty</source>
-        <translation>sumuinen</translation>
+        <location filename="../core/save-html.c" line="505"/>
+        <source>Divemaster</source>
+        <translation>Sukellusvanhin</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="292"/>
-        <source>fog</source>
-        <translation>sumu</translation>
+        <location filename="../core/save-html.c" line="506"/>
+        <source>Buddy</source>
+        <translation>Sukelluspari</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="295"/>
-        <source>rain</source>
-        <translation>sade</translation>
+        <location filename="../core/save-html.c" line="507"/>
+        <source>Suit</source>
+        <translation>Puku</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="298"/>
-        <source>storm</source>
-        <translation>myrsky</translation>
+        <location filename="../core/save-html.c" line="508"/>
+        <source>Tags</source>
+        <translation>Avainsanat</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="301"/>
-        <source>snow</source>
-        <translation>lumi</translation>
+        <location filename="../core/save-html.c" line="509"/>
+        <location filename="../smtk-import/smartrak.c" line="251"/>
+        <location filename="../smtk-import/smartrak.c" line="321"/>
+        <source>Notes</source>
+        <translation>Muistiinpanot</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="321"/>
-        <source>No suit</source>
-        <translation>Ei pukua</translation>
+        <location filename="../core/save-html.c" line="510"/>
+        <source>Show more details</source>
+        <translation>Näytä lisää yksityiskohtia</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="324"/>
-        <source>Shorty</source>
-        <translation>lyhyt</translation>
+        <location filename="../core/save-html.c" line="513"/>
+        <source>Yearly statistics</source>
+        <translation>Vuositilastot</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="327"/>
-        <source>Combi</source>
-        <translation>yhdistelmä</translation>
+        <location filename="../core/save-html.c" line="514"/>
+        <source>Year</source>
+        <translation>Vuosi</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="330"/>
-        <source>Wet suit</source>
-        <translation>Märkäpuku</translation>
+        <location filename="../core/save-html.c" line="515"/>
+        <source>Total time</source>
+        <translation>Kokonaisaika</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="333"/>
-        <source>Semidry suit</source>
-        <translation>Puolikuiva</translation>
+        <location filename="../core/save-html.c" line="516"/>
+        <source>Average time</source>
+        <translation>Keskimääräinen kesto</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="336"/>
-        <source>Dry suit</source>
-        <translation>Kuivapuku</translation>
+        <location filename="../core/save-html.c" line="517"/>
+        <source>Shortest time</source>
+        <translation>Lyhin kesto</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="396"/>
-        <source>no stop</source>
-        <translation>ilman pysähdystä</translation>
+        <location filename="../core/save-html.c" line="518"/>
+        <source>Longest time</source>
+        <translation>Pisin kesto</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="400"/>
-        <source>single ascent</source>
-        <translation>yksittäinen nousu</translation>
+        <location filename="../core/save-html.c" line="519"/>
+        <source>Average depth</source>
+        <translation>Keskisyvyys</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="402"/>
-        <source>multiple ascent</source>
-        <translation>useita nousuja</translation>
+        <location filename="../core/save-html.c" line="520"/>
+        <source>Min. depth</source>
+        <translation>Pienin syvyys</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="404"/>
-        <location filename="../core/dive.c" line="27"/>
-        <source>fresh</source>
-        <translation>makea</translation>
+        <location filename="../core/save-html.c" line="521"/>
+        <source>Max. depth</source>
+        <translation>Suurin syvyys</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="406"/>
-        <source>salt water</source>
-        <translation>suolavesi</translation>
+        <location filename="../core/save-html.c" line="522"/>
+        <source>Average SAC</source>
+        <translation>Pintakulutus</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="431"/>
-        <source>sight seeing</source>
-        <translation>nähtävyydet</translation>
+        <location filename="../core/save-html.c" line="523"/>
+        <source>Min. SAC</source>
+        <translation>Pienin pintakulutus</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="433"/>
-        <source>club dive</source>
-        <translation>seurasukellus</translation>
+        <location filename="../core/save-html.c" line="524"/>
+        <source>Max. SAC</source>
+        <translation>Suurin pintakulutus</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="437"/>
-        <source>instruction</source>
-        <translation>opastus</translation>
+        <location filename="../core/save-html.c" line="525"/>
+        <source>Average temp.</source>
+        <translation>Keskilämpötila</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="463"/>
-        <source>other</source>
-        <translation>muu</translation>
+        <location filename="../core/save-html.c" line="526"/>
+        <source>Min. temp.</source>
+        <translation>Alin lämpötila</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="474"/>
-        <source>Other activities</source>
-        <translation>Muut aktiviteetit</translation>
+        <location filename="../core/save-html.c" line="527"/>
+        <source>Max. temp.</source>
+        <translation>Ylin lämpötila</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="498"/>
-        <source>Datatrak/Wlog notes</source>
-        <translation>Datatrak/Wlog -muistiinpanot</translation>
+        <location filename="../core/save-html.c" line="528"/>
+        <source>Back to list</source>
+        <translation>Takaisin listalle</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="537"/>
-        <source>Manually entered dive</source>
-        <translation>Käsin syötetty sukellus</translation>
+        <location filename="../core/save-html.c" line="531"/>
+        <source>Dive No.</source>
+        <translation>Sukellus</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="588"/>
-        <source>Unknown</source>
-        <translation>Tuntematon</translation>
+        <location filename="../core/save-html.c" line="532"/>
+        <source>Dive profile</source>
+        <translation>Sukellusprofiili</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="674"/>
-        <source>Error: couldn&apos;t open the file %s</source>
-        <translation>Virhe: tiedoston %s avaus ei onnistunut</translation>
+        <location filename="../core/save-html.c" line="533"/>
+        <source>Dive information</source>
+        <translation>Sukellustiedot</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="687"/>
-        <source>Error: no dive</source>
-        <translation>Virhe: ei sukellusta</translation>
+        <location filename="../core/save-html.c" line="534"/>
+        <source>Dive equipment</source>
+        <translation>Sukellusvarusteet</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="27"/>
-        <source>student</source>
-        <translation>oppilas</translation>
+        <location filename="../core/save-html.c" line="535"/>
+        <location filename="../core/save-html.c" line="542"/>
+        <source>Type</source>
+        <translation>Tyyppi</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="461"/>
-        <location filename="../core/dive.c" line="28"/>
-        <source>photo</source>
-        <translation>valokuva</translation>
+        <location filename="../core/save-html.c" line="536"/>
+        <source>Size</source>
+        <translation>Tilavuus</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="28"/>
-        <source>video</source>
-        <translation>video</translation>
+        <location filename="../core/save-html.c" line="537"/>
+        <source>Work pressure</source>
+        <translation>Paineluokka</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="435"/>
-        <location filename="../core/dive.c" line="28"/>
-        <source>instructor</source>
-        <translation>kouluttaja</translation>
+        <location filename="../core/save-html.c" line="538"/>
+        <source>Start pressure</source>
+        <translation>Alkupaine</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="398"/>
-        <location filename="../core/dive.c" line="29"/>
-        <source>deco</source>
-        <translation>deko</translation>
+        <location filename="../core/save-html.c" line="539"/>
+        <source>End pressure</source>
+        <translation>Loppupaine</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="33"/>
-        <source>OC-gas</source>
-        <translation>Vapaankierron seos</translation>
+        <location filename="../core/save-html.c" line="540"/>
+        <source>Gas</source>
+        <translation>Kaasu</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="33"/>
-        <source>diluent</source>
-        <translation>diluent</translation>
+        <location filename="../core/save-html.c" line="541"/>
+        <source>Weight</source>
+        <translation>Painot</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="33"/>
-        <location filename="../core/equipment.c" line="88"/>
-        <location filename="../core/planner.c" line="1415"/>
-        <location filename="../core/planner.c" line="1418"/>
-        <source>oxygen</source>
-        <translation>happi</translation>
+        <location filename="../core/save-html.c" line="543"/>
+        <source>Events</source>
+        <translation>Tapahtumat</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="227"/>
-        <source>ℓ</source>
-        <translation>ℓ</translation>
+        <location filename="../core/save-html.c" line="544"/>
+        <source>Name</source>
+        <translation>Nimi</translation>
+    </message>
+    <message>
+        <location filename="../core/save-html.c" line="545"/>
+        <source>Value</source>
+        <translation>Arvo</translation>
+    </message>
+    <message>
+        <location filename="../core/save-html.c" line="546"/>
+        <source>Coordinates</source>
+        <translation>Koordinaatit</translation>
+    </message>
+    <message>
+        <location filename="../core/save-html.c" line="547"/>
+        <source>Dive status</source>
+        <translation>Sukelluksen tila</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="239"/>
+        <location filename="../core/statistics.c" line="242"/>
         <source>more than %d days</source>
         <translation>yli %d päivää</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="246"/>
+        <location filename="../core/statistics.c" line="249"/>
         <source>%dd %dh %dmin</source>
         <translation>%d pv %d t %d min</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="249"/>
+        <location filename="../core/statistics.c" line="252"/>
         <source>%dmin %dsecs</source>
         <translation>%dmin %dsek</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="251"/>
+        <location filename="../core/statistics.c" line="254"/>
         <source>%dh %dmin</source>
         <translation>%d t %d min</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="263"/>
+        <location filename="../core/statistics.c" line="266"/>
         <source>for dives #</source>
         <translation>sukellukselle numero </translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="269"/>
+        <location filename="../core/statistics.c" line="272"/>
         <source>for selected dives</source>
         <translation>valitut sukellukset</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="304"/>
+        <location filename="../core/statistics.c" line="307"/>
         <source>for dive #%d</source>
         <translation>Sukellus #%d</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="306"/>
+        <location filename="../core/statistics.c" line="309"/>
         <source>for selected dive</source>
         <translation>valittu sukellus</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="308"/>
+        <location filename="../core/statistics.c" line="311"/>
         <source>for all dives</source>
         <translation>kaikille sukelluksille</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="310"/>
+        <location filename="../core/statistics.c" line="313"/>
         <source>(no dives)</source>
         <translation>(ei sukelluksia)</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Sun</source>
         <translation>su</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Mon</source>
         <translation>ma</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Tue</source>
         <translation>ti</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Wed</source>
         <translation>ke</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Thu</source>
         <translation>to</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Fri</source>
         <translation>pe</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Sat</source>
         <translation>la</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Jan</source>
         <translation>tammi</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Feb</source>
         <translation>helmi</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Mar</source>
         <translation>maalis</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Apr</source>
         <translation>huhti</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>May</source>
         <translation>touko</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Jun</source>
         <translation>kesä</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Jul</source>
         <translation>heinä</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Aug</source>
         <translation>elo</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Sep</source>
         <translation>syys</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Oct</source>
         <translation>loka</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Nov</source>
         <translation>marras</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Dec</source>
         <translation>joulu</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="191"/>
-        <location filename="../core/parse-xml.c" line="3284"/>
-        <location filename="../core/uemis-downloader.c" line="134"/>
-        <source>unknown</source>
-        <translation>tuntematon</translation>
-    </message>
-    <message>
-        <location filename="../core/uemis-downloader.c" line="467"/>
-        <source>data</source>
-        <translation>tieto</translation>
-    </message>
-    <message>
-        <location filename="../core/uemis-downloader.c" line="447"/>
-        <source>%s %s</source>
-        <translation>%s %s</translation>
-    </message>
-    <message>
         <location filename="../core/uemis-downloader.c" line="27"/>
         <source>Uemis Zurich: the file system is almost full.
 Disconnect/reconnect the dive computer
@@ -10001,6 +10543,16 @@ Onko Uemis Zurich kytketty oikein?</translation>
         <translation>Ei ladattavia sukelluksia.</translation>
     </message>
     <message>
+        <location filename="../core/uemis-downloader.c" line="447"/>
+        <source>%s %s</source>
+        <translation>%s %s</translation>
+    </message>
+    <message>
+        <location filename="../core/uemis-downloader.c" line="467"/>
+        <source>data</source>
+        <translation>tieto</translation>
+    </message>
+    <message>
         <location filename="../core/uemis-downloader.c" line="495"/>
         <source>divelog #</source>
         <translation>sukellusloki #</translation>
@@ -10171,281 +10723,6 @@ Onko Uemis Zurich kytketty oikein?</translation>
         <translation>Hälytys: heikko paristo</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="469"/>
-        <location filename="../core/save-html.c" line="553"/>
-        <location filename="../core/worldmap-save.c" line="111"/>
-        <source>Can&apos;t open file %s</source>
-        <translation>Tiedoston avaus ei onnistu %s</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="488"/>
-        <source>Number</source>
-        <translation>Numero</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="489"/>
-        <source>Date</source>
-        <translation>Ajankohta</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="490"/>
-        <source>Time</source>
-        <translation>Kello</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="491"/>
-        <source>Location</source>
-        <translation>Kohde</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="492"/>
-        <source>Air temp.</source>
-        <translation>Ilman lämpötila</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="493"/>
-        <source>Water temp.</source>
-        <translation>Veden lämpötila</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="498"/>
-        <source>Statistics</source>
-        <translation>Tilastot</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="502"/>
-        <source>Rating</source>
-        <translation>Yleisarvio</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="503"/>
-        <source>Visibility</source>
-        <translation>Näkyvyys</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="504"/>
-        <source>Duration</source>
-        <translation>Kesto</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="494"/>
-        <source>Dives</source>
-        <translation>Sukelluksia</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="495"/>
-        <source>Expand all</source>
-        <translation>Laajenna kaikki retket</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="496"/>
-        <source>Collapse all</source>
-        <translation>Supista kaikki retket</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="497"/>
-        <source>Trips</source>
-        <translation>Retkiä</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="499"/>
-        <source>Advanced search</source>
-        <translation>Laajennettu haku</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="505"/>
-        <source>Divemaster</source>
-        <translation>Sukellusvanhin</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="506"/>
-        <source>Buddy</source>
-        <translation>Sukelluspari</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="507"/>
-        <source>Suit</source>
-        <translation>Puku</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="508"/>
-        <source>Tags</source>
-        <translation>Avainsanat</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="509"/>
-        <location filename="../smtk-import/smartrak.c" line="251"/>
-        <location filename="../smtk-import/smartrak.c" line="321"/>
-        <source>Notes</source>
-        <translation>Muistiinpanot</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="510"/>
-        <source>Show more details</source>
-        <translation>Näytä lisää yksityiskohtia</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="513"/>
-        <source>Yearly statistics</source>
-        <translation>Vuositilastot</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="514"/>
-        <source>Year</source>
-        <translation>Vuosi</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="515"/>
-        <source>Total time</source>
-        <translation>Kokonaisaika</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="516"/>
-        <source>Average time</source>
-        <translation>Keskimääräinen kesto</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="517"/>
-        <source>Shortest time</source>
-        <translation>Lyhin kesto</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="518"/>
-        <source>Longest time</source>
-        <translation>Pisin kesto</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="519"/>
-        <source>Average depth</source>
-        <translation>Keskisyvyys</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="520"/>
-        <source>Min. depth</source>
-        <translation>Pienin syvyys</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="521"/>
-        <source>Max. depth</source>
-        <translation>Suurin syvyys</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="523"/>
-        <source>Min. SAC</source>
-        <translation>Pienin pintakulutus</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="524"/>
-        <source>Max. SAC</source>
-        <translation>Suurin pintakulutus</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="525"/>
-        <source>Average temp.</source>
-        <translation>Keskilämpötila</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="526"/>
-        <source>Min. temp.</source>
-        <translation>Alin lämpötila</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="527"/>
-        <source>Max. temp.</source>
-        <translation>Ylin lämpötila</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="528"/>
-        <source>Back to list</source>
-        <translation>Takaisin listalle</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="534"/>
-        <source>Dive equipment</source>
-        <translation>Sukellusvarusteet</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="537"/>
-        <source>Work pressure</source>
-        <translation>Paineluokka</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="538"/>
-        <source>Start pressure</source>
-        <translation>Alkupaine</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="539"/>
-        <source>End pressure</source>
-        <translation>Loppupaine</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="547"/>
-        <source>Dive status</source>
-        <translation>Sukelluksen tila</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="522"/>
-        <source>Average SAC</source>
-        <translation>Pintakulutus</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="531"/>
-        <source>Dive No.</source>
-        <translation>Sukellus</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="532"/>
-        <source>Dive profile</source>
-        <translation>Sukellusprofiili</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="533"/>
-        <source>Dive information</source>
-        <translation>Sukellustiedot</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="535"/>
-        <location filename="../core/save-html.c" line="542"/>
-        <source>Type</source>
-        <translation>Tyyppi</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="536"/>
-        <source>Size</source>
-        <translation>Tilavuus</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="540"/>
-        <source>Gas</source>
-        <translation>Kaasu</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="541"/>
-        <source>Weight</source>
-        <translation>Painot</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="543"/>
-        <source>Events</source>
-        <translation>Tapahtumat</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="544"/>
-        <source>Name</source>
-        <translation>Nimi</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="545"/>
-        <source>Value</source>
-        <translation>Arvo</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="546"/>
-        <source>Coordinates</source>
-        <translation>Koordinaatit</translation>
-    </message>
-    <message>
         <location filename="../core/worldmap-save.c" line="39"/>
         <source>Date:</source>
         <translation>Päivä:</translation>
@@ -10491,110 +10768,6 @@ Onko Uemis Zurich kytketty oikein?</translation>
         <translation>Muistiinpanot:</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="91"/>
-        <location filename="../core/qthelper.cpp" line="226"/>
-        <source>N</source>
-        <translation>N</translation>
-    </message>
-    <message>
-        <location filename="../core/qthelper.cpp" line="91"/>
-        <location filename="../core/qthelper.cpp" line="227"/>
-        <source>S</source>
-        <translation>S</translation>
-    </message>
-    <message>
-        <location filename="../core/qthelper.cpp" line="92"/>
-        <location filename="../core/qthelper.cpp" line="228"/>
-        <source>E</source>
-        <translation>E</translation>
-    </message>
-    <message>
-        <location filename="../core/qthelper.cpp" line="92"/>
-        <location filename="../core/qthelper.cpp" line="229"/>
-        <source>W</source>
-        <translation>W</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="341"/>
-        <source>Remote storage and local data diverged. Error: merge failed (%s)</source>
-        <translation>Etä- ja paikallinen tallennus eroavat toisistaan. Error: merge failed (%s)</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="134"/>
-        <source>Local cache directory %s corrupted - can&apos;t sync with Subsurface cloud storage</source>
-        <translation>Paikallinen välimuistihakemisto %s on korruptoitunut - synkronointi Subsurfacen pilvitallennustilaan ei onnistu</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="157"/>
-        <location filename="../core/git-access.c" line="177"/>
-        <source>Could not update local cache to newer remote data</source>
-        <translation>Paikallisen kopion päivitys uudempaan etäversioon epäonnistui</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="170"/>
-        <source>Subsurface cloud storage corrupted</source>
-        <translation>Virhe: Subsurfacen pilvitallennustila on korruptoitunut</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="285"/>
-        <source>Could not update Subsurface cloud storage, try again later</source>
-        <translation>Virhe: Subsurfacen pilvitallennustilan päivitys epäonnistui, yritä myöhemmin uudelleen</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="371"/>
-        <source>Remote storage and local data diverged. Cannot combine local and remote changes</source>
-        <translation>Virhe: paikallinen- ja pilvitadata eroavat toisistaan. Emme voi yhdistää näitä keskenään</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="405"/>
-        <source>Remote storage and local data diverged</source>
-        <translation>Virhe: paikallinen ja pilvidata eroavat toisistaan</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="408"/>
-        <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source>
-        <translation>Paikallinen ja pilvidata eroavat toisistaan. Virhe: tiedon tallennus epäonnistui (%s)</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="417"/>
-        <source>Problems with local cache of Subsurface cloud data</source>
-        <translation>Virhe: ongelmia paikallisen pilvidatan kopion kanssa</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="418"/>
-        <source>Moved cache data to %s. Please try the operation again.</source>
-        <translation>Paikallinen kopio siirretty %s. Ole hyvä ja yritä toimintoa uudelleen.</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="737"/>
-        <source>Error connecting to Subsurface cloud storage</source>
-        <translation>Virhe: yhteys Subsurfacen pilvitallennustilaan</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="740"/>
-        <source>git clone of %s failed (%s)</source>
-        <translation>lokin %s haku epäonnistui (%s)</translation>
-    </message>
-    <message>
-        <location filename="../core/load-git.c" line="222"/>
-        <location filename="../core/parse-xml.c" line="1300"/>
-        <source>additional name for site: %s
-</source>
-        <translation>Ylimääräinen nimi sukelluskohteelle: %s
-</translation>
-    </message>
-    <message>
-        <location filename="../core/ostctools.c" line="120"/>
-        <location filename="../core/ostctools.c" line="152"/>
-        <source>Unknown DC in dive %d</source>
-        <translation>Tuntematon sukellustietokone sukelluksella %d</translation>
-    </message>
-    <message>
-        <location filename="../core/ostctools.c" line="165"/>
-        <source>Error - %s - parsing dive %d</source>
-        <translation>Virhe - %s - jäsentäessä sukellusta %d</translation>
-    </message>
-    <message>
         <location filename="../smtk-import/smartrak.c" line="247"/>
         <source>Built</source>
         <translation>Käännetty</translation>
@@ -10678,117 +10851,117 @@ Onko Uemis Zurich kytketty oikein?</translation>
         <translation>Subsurface-mobiili</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="91"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="103"/>
         <source>Subsurface</source>
         <translation>Subsurface</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="97"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="110"/>
         <source>Dive list</source>
         <translation>Sukelluslista</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="112"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="125"/>
         <source>Cloud credentials</source>
         <translation>Pilvipalvelun tunnus</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="126"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="139"/>
         <source>Manage dives</source>
         <translation>Hallinnoi sukelluksia</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="138"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="141"/>
         <source>Add dive manually</source>
         <translation>Lisää sukellus käsin</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="146"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="149"/>
         <source>Manual sync with cloud</source>
         <translation>Synkronoi pilvipalveluun</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="164"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="167"/>
         <source>Offline mode</source>
         <translation>Käytä ilman verkkoa</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="164"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="167"/>
         <source>Enable auto cloud sync</source>
         <translation>Ota automaattinen pilvisynkronointi käyttöön</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="182"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="187"/>
         <source>GPS</source>
         <translation>GPS</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="185"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="190"/>
         <source>GPS-tag dives</source>
         <translation>Liitä GPS -sijainnit sukelluksiin</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="192"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="197"/>
         <source>Upload GPS data</source>
         <translation>Vie GPS -tiedot</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="199"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="204"/>
         <source>Download GPS data</source>
         <translation>Lataa GPS -tiedot</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="206"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="211"/>
         <source>Show GPS fixes</source>
         <translation>Näytä GPS -sijainnit</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="215"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="220"/>
         <source>Clear GPS cache</source>
         <translation>Tyhjennä GPS:n väliaikaistiedot</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="221"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="226"/>
         <source>Preferences</source>
         <translation>Asetukset</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="230"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="237"/>
         <source>Developer</source>
         <translation>Kehittäjä</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="232"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="239"/>
         <source>App log</source>
         <translation>Sovellusloki</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="239"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="246"/>
         <source>Theme information</source>
         <translation>Teeman tiedot</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="246"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="253"/>
         <source>User manual</source>
         <translation>Käyttöohje</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="252"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="259"/>
         <source>About</source>
         <translation>Tietoja</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="283"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="304"/>
         <source>Run location service</source>
         <translation>Käytä sijaintipalvelua</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="283"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="304"/>
         <source>No GPS source available</source>
         <translation>Ei GPS -yhteyttä</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="295"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="316"/>
         <source>Actions</source>
         <translation>Tapahtumat</translation>
     </message>
@@ -10869,6 +11042,24 @@ p, li { white-space: pre-wrap; }
         <translation>m/min</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="121"/>
+        <location filename="../build/ui_plannerSettings.h" line="425"/>
+        <source>75% to 50% avg. depth</source>
+        <translation>75%-50% keskisyvyydestä</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="138"/>
+        <location filename="../build/ui_plannerSettings.h" line="427"/>
+        <source>50% avg. depth to 6m</source>
+        <translation>50% keskisyvyydestä - 6m</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="155"/>
+        <location filename="../build/ui_plannerSettings.h" line="429"/>
+        <source>6m to surface</source>
+        <translation>6m:stä pintaan</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="175"/>
         <location filename="../build/ui_plannerSettings.h" line="431"/>
         <source>Descent</source>
@@ -10892,12 +11083,35 @@ p, li { white-space: pre-wrap; }
         <translation>VPM-B deko</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="268"/>
+        <source>Bühlmann deco</source>
+        <translation>Bühlmann deko</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="278"/>
         <location filename="../build/ui_plannerSettings.h" line="445"/>
         <source>Reserve gas</source>
         <translation>Varakaasu</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="288"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="549"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="578"/>
+        <location filename="../build/ui_plannerSettings.h" line="446"/>
+        <location filename="../build/ui_plannerSettings.h" line="459"/>
+        <location filename="../build/ui_plannerSettings.h" line="461"/>
+        <source>bar</source>
+        <translation>bar</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="307"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="416"/>
+        <location filename="../build/ui_plannerSettings.h" line="437"/>
+        <location filename="../build/ui_plannerSettings.h" line="440"/>
+        <source>%</source>
+        <translation>%</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="320"/>
         <location filename="../build/ui_plannerSettings.h" line="449"/>
         <source>Postpone gas change if a stop is not required</source>
@@ -10916,12 +11130,10 @@ p, li { white-space: pre-wrap; }
         <translation>GF matala</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="307"/>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="416"/>
-        <location filename="../build/ui_plannerSettings.h" line="437"/>
-        <location filename="../build/ui_plannerSettings.h" line="440"/>
-        <source>%</source>
-        <translation>%</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="353"/>
+        <location filename="../build/ui_plannerSettings.h" line="436"/>
+        <source>Plan backgas breaks</source>
+        <translation>Suunnittele ilmatauot</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="360"/>
@@ -10930,10 +11142,10 @@ p, li { white-space: pre-wrap; }
         <translation>GF korkea</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="429"/>
-        <location filename="../build/ui_plannerSettings.h" line="441"/>
-        <source>Drop to first depth</source>
-        <translation>Putoaminen alkusyvyyteen</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="370"/>
+        <location filename="../build/ui_plannerSettings.h" line="453"/>
+        <source>min</source>
+        <translation>min</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="389"/>
@@ -10942,163 +11154,139 @@ p, li { white-space: pre-wrap; }
         <translation>Viimeinen pysähdys kuudessa metrissä</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="353"/>
-        <location filename="../build/ui_plannerSettings.h" line="436"/>
-        <source>Plan backgas breaks</source>
-        <translation>Suunnittele ilmatauot</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="396"/>
+        <source>Maximize bottom time allowed by gas and no decompression limits</source>
+        <translation>Maksimoi pohja-aika ottaen huomioon kaasun määrä ja suoranousumahdollisuus</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="515"/>
-        <location filename="../build/ui_plannerSettings.h" line="455"/>
-        <source>Gas options</source>
-        <translation>Kaasuasetukset</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="399"/>
+        <location filename="../build/ui_plannerSettings.h" line="443"/>
+        <source>Recreational mode</source>
+        <translation>Harrastemoodi</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="594"/>
-        <location filename="../build/ui_plannerSettings.h" line="456"/>
-        <source>Bottom SAC</source>
-        <translation>Ilmankulutus pohjalla</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="429"/>
+        <location filename="../build/ui_plannerSettings.h" line="441"/>
+        <source>Drop to first depth</source>
+        <translation>Putoaminen alkusyvyyteen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="692"/>
-        <location filename="../build/ui_plannerSettings.h" line="457"/>
-        <source>Deco SAC</source>
-        <translation>Ilmankulutus (deko)</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="436"/>
+        <location filename="../build/ui_plannerSettings.h" line="452"/>
+        <source>Min. switch duration</source>
+        <translation>Lyhin vaihdon kesto</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="601"/>
-        <location filename="../build/ui_plannerSettings.h" line="458"/>
-        <source>Bottom pO₂</source>
-        <translation>pO₂ pohjalla</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="459"/>
+        <location filename="../build/ui_plannerSettings.h" line="444"/>
+        <source>Safety stop</source>
+        <translation>Turvapysähdys</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="685"/>
-        <location filename="../build/ui_plannerSettings.h" line="460"/>
-        <source>Deco pO₂</source>
-        <translation>pO₂ dekossa</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="495"/>
+        <source>Conservatism level</source>
+        <translation>Konservatismi</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="515"/>
+        <location filename="../build/ui_plannerSettings.h" line="455"/>
+        <source>Gas options</source>
+        <translation>Kaasuasetukset</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="565"/>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="672"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="698"/>
         <location filename="../build/ui_plannerSettings.h" line="462"/>
         <location filename="../build/ui_plannerSettings.h" line="463"/>
         <source>ℓ/min</source>
         <translation>ℓ/min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="632"/>
-        <location filename="../build/ui_plannerSettings.h" line="468"/>
-        <source>Display runtime</source>
-        <translation>Näytä sukellusaika</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="645"/>
-        <location filename="../build/ui_plannerSettings.h" line="472"/>
-        <source>Display segment duration</source>
-        <translation>Näytä etappien kestot</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="655"/>
-        <location filename="../build/ui_plannerSettings.h" line="476"/>
-        <source>Display transitions in deco</source>
-        <translation>Näytä siirtymät dekossa</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="662"/>
-        <location filename="../build/ui_plannerSettings.h" line="477"/>
-        <source>Verbatim dive plan</source>
-        <translation>Tarkka sukellussuunnitelma</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="288"/>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="549"/>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="578"/>
-        <location filename="../build/ui_plannerSettings.h" line="446"/>
-        <location filename="../build/ui_plannerSettings.h" line="459"/>
-        <location filename="../build/ui_plannerSettings.h" line="461"/>
-        <source>bar</source>
-        <translation>bar</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="121"/>
-        <location filename="../build/ui_plannerSettings.h" line="425"/>
-        <source>75% to 50% avg. depth</source>
-        <translation>75%-50% keskisyvyydestä</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="138"/>
-        <location filename="../build/ui_plannerSettings.h" line="427"/>
-        <source>50% avg. depth to 6m</source>
-        <translation>50% keskisyvyydestä - 6m</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="155"/>
-        <location filename="../build/ui_plannerSettings.h" line="429"/>
-        <source>6m to surface</source>
-        <translation>6m:stä pintaan</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="268"/>
-        <source>Bühlmann deco</source>
-        <translation>Bühlmann deko</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="370"/>
-        <location filename="../build/ui_plannerSettings.h" line="453"/>
-        <source>min</source>
-        <translation>min</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="396"/>
-        <source>Maximize bottom time allowed by gas and no decompression limits</source>
-        <translation>Maksimoi pohja-aika ottaen huomioon kaasun määrä ja suoranousumahdollisuus</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="594"/>
+        <source>m</source>
+        <translation>m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="399"/>
-        <location filename="../build/ui_plannerSettings.h" line="443"/>
-        <source>Recreational mode</source>
-        <translation>Harrastemoodi</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="606"/>
+        <source>Used to calculate best mix. Select best mix depth in &apos;Available gases&apos; table by entering gas depth, followed by &quot;B&quot; (best trimix mix) or &quot;BN&quot; (best nitrox mix)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="436"/>
-        <location filename="../build/ui_plannerSettings.h" line="452"/>
-        <source>Min. switch duration</source>
-        <translation>Lyhin vaihdon kesto</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="613"/>
+        <location filename="../build/ui_plannerSettings.h" line="456"/>
+        <source>Bottom SAC</source>
+        <translation>Ilmankulutus pohjalla</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="459"/>
-        <location filename="../build/ui_plannerSettings.h" line="444"/>
-        <source>Safety stop</source>
-        <translation>Turvapysähdys</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="620"/>
+        <location filename="../build/ui_plannerSettings.h" line="458"/>
+        <source>Bottom pO₂</source>
+        <translation>pO₂ pohjalla</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="495"/>
-        <source>Conservatism level</source>
-        <translation>Konservatismi</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="627"/>
+        <source>Best mix END</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="608"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="634"/>
         <location filename="../build/ui_plannerSettings.h" line="464"/>
         <source>Notes</source>
         <translation>Muistiinpanot</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="629"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="655"/>
         <location filename="../build/ui_plannerSettings.h" line="466"/>
         <source>In dive plan, show runtime (absolute time) of stops</source>
         <translation>Sukelluksen suunnittelu: näytä kokonaiskesto (absoluuttinen aika)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="642"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="658"/>
+        <location filename="../build/ui_plannerSettings.h" line="468"/>
+        <source>Display runtime</source>
+        <translation>Näytä sukellusaika</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="668"/>
         <location filename="../build/ui_plannerSettings.h" line="470"/>
         <source>In dive plan, show duration (relative time) of stops</source>
         <translation>Sukelluksen suunnittelu: näytä pysähdysten kesto (suhteellinen aika)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="652"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="671"/>
+        <location filename="../build/ui_plannerSettings.h" line="472"/>
+        <source>Display segment duration</source>
+        <translation>Näytä etappien kestot</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="678"/>
         <location filename="../build/ui_plannerSettings.h" line="474"/>
         <source>In diveplan, list transitions or treat them as implicit</source>
         <translation>Listataanko siirtymät erikseen sukellussuunnitelmassa?</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="681"/>
+        <location filename="../build/ui_plannerSettings.h" line="476"/>
+        <source>Display transitions in deco</source>
+        <translation>Näytä siirtymät dekossa</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="688"/>
+        <location filename="../build/ui_plannerSettings.h" line="477"/>
+        <source>Verbatim dive plan</source>
+        <translation>Tarkka sukellussuunnitelma</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="711"/>
+        <location filename="../build/ui_plannerSettings.h" line="460"/>
+        <source>Deco pO₂</source>
+        <translation>pO₂ dekossa</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="718"/>
+        <location filename="../build/ui_plannerSettings.h" line="457"/>
+        <source>Deco SAC</source>
+        <translation>Ilmankulutus (deko)</translation>
+    </message>
 </context>
 </TS>
\ No newline at end of file
diff --git a/translations/subsurface_fr_FR.ts b/translations/subsurface_fr_FR.ts
index 51c7beca4..336c2a280 100644
--- a/translations/subsurface_fr_FR.ts
+++ b/translations/subsurface_fr_FR.ts
@@ -105,6 +105,11 @@
         <translation>Nom :</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="56"/>
+        <source>Could not initialize Winsock version 2.2</source>
+        <translation>Impossible d&apos;initialiser Winsock version 2.2</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="134"/>
         <source>Trying to turn on the local Bluetooth device...</source>
         <translation>Tentative d&apos;activation du périphérique Bluetooth local ...</translation>
@@ -115,6 +120,11 @@
         <translation>Tentative de désactivation du périphérique Bluetooth local ...</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="167"/>
+        <source>Remote devices list was cleared.</source>
+        <translation>La liste des périphériques distants a été supprimée.</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="183"/>
         <source>Scanning for remote devices...</source>
         <translation>Recherche des périphériques distants...</translation>
@@ -125,6 +135,22 @@
         <translation>Recherche terminée avec succès.</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="208"/>
+        <source>The local Bluetooth device was %1.</source>
+        <extracomment>%1 will be replaced with &quot;turned on&quot; or &quot;turned off&quot;</extracomment>
+        <translation>Le périphérique Bluetooth local était %1.</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
+        <source>turned on</source>
+        <translation>allumé</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
+        <source>turned off</source>
+        <translation>éteint</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="225"/>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="339"/>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="359"/>
@@ -172,37 +198,6 @@
         <translation>Appairer</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="352"/>
-        <source>Device %1 was paired and is authorized.</source>
-        <translation>Le périphérique %1 a été appairé et est autorisé.</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="56"/>
-        <source>Could not initialize Winsock version 2.2</source>
-        <translation>Impossible d&apos;initialiser Winsock version 2.2</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="167"/>
-        <source>Remote devices list was cleared.</source>
-        <translation>La liste des périphériques distants a été supprimée.</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="208"/>
-        <source>The local Bluetooth device was %1.</source>
-        <extracomment>%1 will be replaced with &quot;turned on&quot; or &quot;turned off&quot;</extracomment>
-        <translation>Le périphérique Bluetooth local était %1.</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
-        <source>turned on</source>
-        <translation>allumé</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
-        <source>turned off</source>
-        <translation>éteint</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="307"/>
         <source>Remove pairing</source>
         <translation>Supprimer l&apos;appairage</translation>
@@ -228,6 +223,11 @@
         <translation>Le périphérique %1 a été appairé.</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="352"/>
+        <source>Device %1 was paired and is authorized.</source>
+        <translation>Le périphérique %1 a été appairé et est autorisé.</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="378"/>
         <source>The device %1 can now be used for connection. You can press the Save button.</source>
         <translation>Le périphérique %1 peut maintenant être utilisé pour la connexion. Vous pouvez cliquer sur le bouton Enregistrer.</translation>
@@ -286,12 +286,12 @@
 <context>
     <name>BuddyFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="621"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="619"/>
         <source>Person: </source>
         <translation>Personne : </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="622"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="620"/>
         <source>Searches for buddies and divemasters</source>
         <translation>Recherches d&apos;équipiers et de moniteurs</translation>
     </message>
@@ -299,7 +299,7 @@
 <context>
     <name>BuddyFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="243"/>
+        <location filename="../qt-models/filtermodels.cpp" line="248"/>
         <source>No buddies</source>
         <translation>Pas d&apos;équiper</translation>
     </message>
@@ -307,25 +307,30 @@
 <context>
     <name>CloudCredentials</name>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="49"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="50"/>
         <source>Cloud credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="55"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="56"/>
         <source>Email</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="67"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="68"/>
         <source>Password</source>
         <translation>Mot de passe</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="90"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="92"/>
         <source>Show password</source>
         <translation>Afficher le mot de passe</translation>
     </message>
+    <message>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="97"/>
+        <source>PIN</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>ColumnNameProvider</name>
@@ -381,6 +386,16 @@
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
+        <source>Max. depth</source>
+        <translation>Prof. Max.</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
+        <source>Avg. depth</source>
+        <translation>Prof. moyenne</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
         <source>Divemaster</source>
         <translation>Moniteur / Guide de palanquée</translation>
     </message>
@@ -391,6 +406,11 @@
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
+        <source>Suit</source>
+        <translation>Combinaison</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
         <source>Notes</source>
         <translation>Notes</translation>
     </message>
@@ -410,21 +430,6 @@
         <translation>Temp. de l&apos;eau</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
-        <source>Max. depth</source>
-        <translation>Prof. Max.</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
-        <source>Avg. depth</source>
-        <translation>Prof. moyenne</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
-        <source>Suit</source>
-        <translation>Combinaison</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="44"/>
         <source>O₂</source>
         <translation>O₂</translation>
@@ -538,7 +543,7 @@
         <translation>Impossible de créer un contexte libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../core/configuredivecomputer.cpp" line="660"/>
+        <location filename="../core/configuredivecomputer.cpp" line="656"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation>Impossible de se connecter à l&apos;ordinateur de plongée.</translation>
     </message>
@@ -558,11 +563,19 @@
         <translation>Périphérique ou point de montage</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="170"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1520"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1533"/>
-        <source>...</source>
-        <translation>...</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="47"/>
+        <source>Connect via Bluetooth</source>
+        <translation>Connecter via Bluetooth</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="54"/>
+        <source>Connect</source>
+        <translation>Connecter</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="64"/>
+        <source>Disconnect</source>
+        <translation>Déconnecter</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="80"/>
@@ -571,12 +584,24 @@
         <translation>Récupérer les détails disponibles</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="90"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1523"/>
+        <source>Read settings from backup file or from device before writing to the device</source>
+        <translation>Lire les paramètres à partir du fichier de sauvegarde ou de l&apos;ordinateur de plongée avant d&apos;écrire sur l&apos;ordinateur de plongée</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="93"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1525"/>
         <source>Save changes to device</source>
         <translation>Enregistrer les modifications sur le périphérique</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="116"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1527"/>
+        <source>Read settings from backup file or from device before writing to a backup file</source>
+        <translation>Lire les paramètres à partir du fichier de sauvegarde ou de l&apos;ordinateur de plongée avant d&apos;écrire dans un fichier de sauvegarde</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="119"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1529"/>
         <source>Backup</source>
@@ -595,15 +620,40 @@
         <translation>Mettre à jour le firmware</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="163"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1532"/>
+        <source>Save libdivecomputer logfile</source>
+        <translation>Sauvegarder le fichier log de libdivecomputer</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="170"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1520"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1533"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="177"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1534"/>
         <source>Cancel</source>
         <translation>Annuler</translation>
     </message>
     <message>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1539"/>
-        <source>OSTC 3</source>
-        <translation>OSTC 3</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="214"/>
+        <source>OSTC 3,Sport,Cr,2</source>
+        <translation>OSTC 3,Sport,Cr,2</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="223"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1541"/>
+        <source>Suunto Vyper family</source>
+        <translation>Famille Suunto Vyper</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="232"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1543"/>
+        <source>OSTC, Mk.2/2N/2C</source>
+        <translation>OSTC, Mk.2/2N/2C</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="253"/>
@@ -616,40 +666,56 @@
         <translation>Paramètres de base</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="326"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1656"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1943"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1546"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1726"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1766"/>
-        <source>Serial No.</source>
-        <translation>N° de série</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="260"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1575"/>
+        <source>Eco</source>
+        <translation>Eco</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="349"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1679"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1980"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1547"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1727"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1767"/>
-        <source>Firmware version</source>
-        <translation>Version du firmware</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="265"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1576"/>
+        <source>Medium</source>
+        <translation>Moyen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="538"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1713"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1990"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1548"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1729"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1768"/>
-        <source>Custom text</source>
-        <translation>Texte personnalisé</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="270"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1577"/>
+        <source>High</source>
+        <translation>Fort</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="385"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1549"/>
-        <source>Language</source>
-        <translation>Langue</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="278"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="826"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="849"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="875"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="927"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="993"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1019"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1101"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1117"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1450"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2278"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2382"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2408"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2434"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2474"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2497"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1586"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1621"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1623"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1625"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1628"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1637"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1638"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1710"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1785"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1789"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1801"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1803"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1806"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1807"/>
+        <source>%</source>
+        <translation>%</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="289"/>
@@ -676,44 +742,36 @@
         <translation>Italien</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="579"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1557"/>
-        <source>Dive mode</source>
-        <translation>Mode de plongée</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="556"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1560"/>
-        <source>OC</source>
-        <translation>OC</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="561"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1561"/>
-        <source>CC</source>
-        <translation>CC</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="313"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1582"/>
+        <source>m/°C</source>
+        <translation>m/°C</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="566"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2336"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1562"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1793"/>
-        <source>Gauge</source>
-        <translation>Profondimètre</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="318"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1583"/>
+        <source>ft/°F</source>
+        <translation>ft/°F</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="571"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1563"/>
-        <source>Apnea</source>
-        <translation>Apnée</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="326"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1656"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1943"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1546"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1726"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1766"/>
+        <source>Serial No.</source>
+        <translation>N° de série</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="395"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2063"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1565"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1780"/>
-        <source>Date format</source>
-        <translation>Format de date</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="349"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1679"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1980"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1547"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1727"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1767"/>
+        <source>Firmware version</source>
+        <translation>Version du firmware</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="360"/>
@@ -734,108 +792,147 @@
         <translation>AAMMJJ</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1042"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2457"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1639"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1805"/>
-        <source>Saturation</source>
-        <translation>Saturation</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="385"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1549"/>
+        <source>Language</source>
+        <translation>Langue</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="278"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="826"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="849"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="875"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="927"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="993"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1019"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1101"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1117"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1450"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2278"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2382"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2408"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2434"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2474"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2497"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1586"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1621"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1623"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1625"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1628"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1637"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1638"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1710"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1785"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1789"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1801"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1803"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1806"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1807"/>
-        <source>%</source>
-        <translation>%</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="395"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2063"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1565"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1780"/>
+        <source>Date format</source>
+        <translation>Format de date</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="865"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2261"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1624"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1784"/>
-        <source>Desaturation</source>
-        <translation>Désaturation</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="405"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1572"/>
+        <source>Brightness</source>
+        <translation>Luminosité</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="983"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2398"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1636"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1800"/>
-        <source>Last deco</source>
-        <translation>Dernière déco</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="415"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1850"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1579"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1753"/>
+        <source>Units</source>
+        <translation>Unités</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="711"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="736"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="758"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="904"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2181"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2206"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2228"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2307"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1626"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1786"/>
-        <source> m</source>
-        <translation>m</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="425"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1585"/>
+        <source>Salinity (0-5%)</source>
+        <translation>Salinité (0-5%)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="405"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1572"/>
-        <source>Brightness</source>
-        <translation>Luminosité</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="438"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1615"/>
+        <source>Reset device to default settings</source>
+        <translation>Rétablir les paramètres par défaut sur l&apos;ordinateur de plongée</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="260"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1575"/>
-        <source>Eco</source>
-        <translation>Eco</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="452"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1590"/>
+        <source>230LSB/Gauss</source>
+        <translation>230LSB/Gauss</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="265"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1576"/>
-        <source>Medium</source>
-        <translation>Moyen</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="457"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1591"/>
+        <source>330LSB/Gauss</source>
+        <translation>330LSB/Gauss</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="270"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1577"/>
-        <source>High</source>
-        <translation>Fort</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="462"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1592"/>
+        <source>390LSB/Gauss</source>
+        <translation>390LSB/Gauss</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="603"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2034"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1599"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1779"/>
-        <source>Sampling rate</source>
-        <translation>Taux d&apos;échantillonnage</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="467"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1593"/>
+        <source>440LSB/Gauss</source>
+        <translation>440LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="472"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1594"/>
+        <source>660LSB/Gauss</source>
+        <translation>660LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="477"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1595"/>
+        <source>820LSB/Gauss</source>
+        <translation>820LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="482"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1596"/>
+        <source>1090LSB/Gauss</source>
+        <translation>1090LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="487"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1597"/>
+        <source>1370LSB/Gauss</source>
+        <translation>1370LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="521"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1587"/>
+        <source>Compass gain</source>
+        <translation>Gain de la boussole</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="531"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1799"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1745"/>
+        <source>Computer model</source>
+        <translation>Modèle d&apos;ordinateur</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="538"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1713"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1990"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1548"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1729"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1768"/>
+        <source>Custom text</source>
+        <translation>Texte personnalisé</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="556"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1560"/>
+        <source>OC</source>
+        <translation>OC</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="561"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1561"/>
+        <source>CC</source>
+        <translation>CC</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="566"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2336"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1562"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1793"/>
+        <source>Gauge</source>
+        <translation>Profondimètre</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="571"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1563"/>
+        <source>Apnea</source>
+        <translation>Apnée</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="579"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1557"/>
+        <source>Dive mode</source>
+        <translation>Mode de plongée</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="590"/>
@@ -852,30 +949,12 @@
         <translation>10 s</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="415"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1850"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1579"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1753"/>
-        <source>Units</source>
-        <translation>Unités</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="313"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1582"/>
-        <source>m/°C</source>
-        <translation>m/°C</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="318"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1583"/>
-        <source>ft/°F</source>
-        <translation>ft/°F</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="644"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1605"/>
-        <source>Dive mode color</source>
-        <translation>Couleur du mode de plongée</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="603"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2034"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1599"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1779"/>
+        <source>Sampling rate</source>
+        <translation>Taux d&apos;échantillonnage</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="614"/>
@@ -902,12 +981,6 @@
         <translation>Bleu</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="425"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1585"/>
-        <source>Salinity (0-5%)</source>
-        <translation>Salinité (0-5%)</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="637"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2092"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1613"/>
@@ -916,90 +989,80 @@
         <translation>Synchroniser l&apos;heure de l&apos;ordinateur de plongée avec le PC</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="521"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1587"/>
-        <source>Compass gain</source>
-        <translation>Gain de la boussole</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="90"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1523"/>
-        <source>Read settings from backup file or from device before writing to the device</source>
-        <translation>Lire les paramètres à partir du fichier de sauvegarde ou de l&apos;ordinateur de plongée avant d&apos;écrire sur l&apos;ordinateur de plongée</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="116"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1527"/>
-        <source>Read settings from backup file or from device before writing to a backup file</source>
-        <translation>Lire les paramètres à partir du fichier de sauvegarde ou de l&apos;ordinateur de plongée avant d&apos;écrire dans un fichier de sauvegarde</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="232"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1543"/>
-        <source>OSTC, Mk.2/2N/2C</source>
-        <translation>OSTC, Mk.2/2N/2C</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="644"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1605"/>
+        <source>Dive mode color</source>
+        <translation>Couleur du mode de plongée</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="452"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1590"/>
-        <source>230LSB/Gauss</source>
-        <translation>230LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="654"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2020"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1614"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1771"/>
+        <source>Show safety stop</source>
+        <translation>Afficher le palier de sécurité</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="457"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1591"/>
-        <source>330LSB/Gauss</source>
-        <translation>330LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="661"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2145"/>
+        <source>End Depth</source>
+        <translation>Profondeur finale</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="462"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1592"/>
-        <source>390LSB/Gauss</source>
-        <translation>390LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="671"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2162"/>
+        <source> s</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="467"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1593"/>
-        <source>440LSB/Gauss</source>
-        <translation>440LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="687"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1953"/>
+        <source>Length</source>
+        <translation>Longueur</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="472"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1594"/>
-        <source>660LSB/Gauss</source>
-        <translation>660LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="694"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2138"/>
+        <source>Start Depth</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="477"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1595"/>
-        <source>820LSB/Gauss</source>
-        <translation>820LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="701"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2152"/>
+        <source>Reset Depth</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="482"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1596"/>
-        <source>1090LSB/Gauss</source>
-        <translation>1090LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="711"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="736"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="758"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="904"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2181"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2206"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2228"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2307"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1626"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1786"/>
+        <source> m</source>
+        <translation>m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="487"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1597"/>
-        <source>1370LSB/Gauss</source>
-        <translation>1370LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="778"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2248"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1643"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1810"/>
+        <source>Advanced settings</source>
+        <translation>Paramètres avancés</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="654"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2020"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1614"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1771"/>
-        <source>Show safety stop</source>
-        <translation>Afficher le palier de sécurité</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="784"/>
+        <source>Left button sensitivity</source>
+        <translation>Sensibilité du bouton gauche</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="438"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1615"/>
-        <source>Reset device to default settings</source>
-        <translation>Rétablir les paramètres par défaut sur l&apos;ordinateur de plongée</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="791"/>
+        <source>Always show ppO2</source>
+        <translation>Toujours afficher la ppO2</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="798"/>
@@ -1010,20 +1073,6 @@
         <translation>GF alternatifs sélectionnables sous l&apos;eau</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="223"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1541"/>
-        <source>Suunto Vyper family</source>
-        <translation>Famille Suunto Vyper</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="778"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2248"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1643"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1810"/>
-        <source>Advanced settings</source>
-        <translation>Paramètres avancés</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="805"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2271"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1618"/>
@@ -1054,6 +1103,14 @@
         <translation>GFHigh</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="865"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2261"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1624"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1784"/>
+        <source>Desaturation</source>
+        <translation>Désaturation</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="917"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2320"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1627"/>
@@ -1068,14 +1125,6 @@
         <translation>mbar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="973"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2369"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1630"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1788"/>
-        <source> min</source>
-        <translation> min</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="960"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2331"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1633"/>
@@ -1084,63 +1133,28 @@
         <translation>ZH-L16</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="47"/>
-        <source>Connect via Bluetooth</source>
-        <translation>Connecter via Bluetooth</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="163"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1532"/>
-        <source>Save libdivecomputer logfile</source>
-        <translation>Sauvegarder le fichier log de libdivecomputer</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="661"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2145"/>
-        <source>End Depth</source>
-        <translation>Profondeur finale</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="671"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2162"/>
-        <source> s</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="687"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1953"/>
-        <source>Length</source>
-        <translation>Longueur</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="694"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2138"/>
-        <source>Start Depth</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="701"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2152"/>
-        <source>Reset Depth</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="784"/>
-        <source>Left button sensitivity</source>
-        <translation>Sensibilité du bouton gauche</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="791"/>
-        <source>Always show ppO2</source>
-        <translation>Toujours afficher la ppO2</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="965"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1634"/>
         <source>ZH-L16+GF</source>
         <translation>ZH-L16+GF</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="973"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2369"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1630"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1788"/>
+        <source> min</source>
+        <translation> min</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="983"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2398"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1636"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1800"/>
+        <source>Last deco</source>
+        <translation>Dernière déco</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1009"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2424"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1640"/>
@@ -1157,6 +1171,14 @@
         <translation>GFHigh alternatif</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1042"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2457"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1639"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1805"/>
+        <source>Saturation</source>
+        <translation>Saturation</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1052"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1642"/>
         <source>Flip screen</source>
@@ -1168,12 +1190,22 @@
         <translation>Sensibilité du bouton droit</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1066"/>
+        <source>MOD warning</source>
+        <translation>Avertissement MOD</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1073"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2513"/>
         <source>Graphical speed indicator</source>
         <translation>Indicateur de vitesse graphique</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1080"/>
+        <source>Dynamic ascent rate</source>
+        <translation>Vitesse de remontée dynamique</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1087"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2552"/>
         <source>Bottom gas consumption</source>
@@ -1186,6 +1218,14 @@
         <translation>Consommation de gaz de déco</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1133"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1149"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2520"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2536"/>
+        <source> ℓ/min</source>
+        <translation> ℓ/min</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1165"/>
         <source>Temperature sensor offset</source>
         <translation type="unfinished"/>
@@ -1204,6 +1244,18 @@
         <translation>Paramètres de gaz</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1235"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1320"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2610"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2695"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1645"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1668"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1812"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1835"/>
+        <source>%O₂</source>
+        <translation>%O₂</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1240"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1325"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2615"/>
@@ -1322,16 +1374,10 @@
         <translation>Dil 5</translation>
     </message>
     <message>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1691"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1858"/>
-        <source>Set point [cbar]</source>
-        <translation>Ajouter un point [cbar]</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1693"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1860"/>
-        <source>Change depth [m]</source>
-        <translation>Modifier la profondeur [m]</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1405"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2770"/>
+        <source>Setpoint</source>
+        <translation>Consigne</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1415"/>
@@ -1370,6 +1416,12 @@
         <translation>SP 5</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1443"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1709"/>
+        <source>O₂ in calibration gas</source>
+        <translation>O₂ dans le gaz de calibration</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1467"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1713"/>
         <source>Fixed setpoint</source>
@@ -1400,101 +1452,6 @@
         <translation>cbar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1748"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1733"/>
-        <source>P1 (medium)</source>
-        <extracomment>Suunto safety level</extracomment>
-        <translation>P1 (moyen)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1753"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1734"/>
-        <source>P2 (high)</source>
-        <extracomment>Suunto safety level</extracomment>
-        <translation>P2 (haut)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1792"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1744"/>
-        <source>Total dive time</source>
-        <translation>Durée totale de la plongée</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2109"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1769"/>
-        <source>kg/ℓ</source>
-        <translation>kg/ℓ</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2346"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1795"/>
-        <source>Apnoea</source>
-        <translation>Apnée</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1583"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1722"/>
-        <source>Safety level</source>
-        <translation>Niveau de sécurité</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="54"/>
-        <source>Connect</source>
-        <translation>Connecter</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="64"/>
-        <source>Disconnect</source>
-        <translation>Déconnecter</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="214"/>
-        <source>OSTC 3,Sport,Cr,2</source>
-        <translation>OSTC 3,Sport,Cr,2</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1066"/>
-        <source>MOD warning</source>
-        <translation>Avertissement MOD</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1080"/>
-        <source>Dynamic ascent rate</source>
-        <translation>Vitesse de remontée dynamique</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1133"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1149"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2520"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2536"/>
-        <source> ℓ/min</source>
-        <translation> ℓ/min</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1235"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1320"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2610"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2695"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1645"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1668"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1812"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1835"/>
-        <source>%O₂</source>
-        <translation>%O₂</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1405"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2770"/>
-        <source>Setpoint</source>
-        <translation>Consigne</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1443"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1709"/>
-        <source>O₂ in calibration gas</source>
-        <translation>O₂ dans le gaz de calibration</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1535"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2843"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1719"/>
@@ -1511,6 +1468,12 @@
         <translation>pO₂ min</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1583"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1722"/>
+        <source>Safety level</source>
+        <translation>Niveau de sécurité</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1609"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1723"/>
         <source>Altitude range</source>
@@ -1544,6 +1507,20 @@
         <translation>P0 (aucun)</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1748"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1733"/>
+        <source>P1 (medium)</source>
+        <extracomment>Suunto safety level</extracomment>
+        <translation>P1 (moyen)</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1753"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1734"/>
+        <source>P2 (high)</source>
+        <extracomment>Suunto safety level</extracomment>
+        <translation>P2 (haut)</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1761"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1736"/>
         <source>Sample rate</source>
@@ -1568,11 +1545,10 @@
         <translation>60s</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="531"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1799"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1745"/>
-        <source>Computer model</source>
-        <translation>Modèle d&apos;ordinateur</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1792"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1744"/>
+        <source>Total dive time</source>
+        <translation>Durée totale de la plongée</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1816"/>
@@ -1637,12 +1613,6 @@
         <translation>Alarme de durée</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2099"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1765"/>
-        <source>Salinity</source>
-        <translation>Salinité</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2074"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1774"/>
         <source>MM/DD/YY</source>
@@ -1661,12 +1631,30 @@
         <translation>AA/MM/JJ</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2099"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1765"/>
+        <source>Salinity</source>
+        <translation>Salinité</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2109"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1769"/>
+        <source>kg/ℓ</source>
+        <translation>kg/ℓ</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2341"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1794"/>
         <source>ZH-L16 CC</source>
         <translation>ZH-L16 CC</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2346"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1795"/>
+        <source>Apnoea</source>
+        <translation>Apnée</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2351"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1796"/>
         <source>L16-GF OC</source>
@@ -1685,87 +1673,112 @@
         <translation>PSCR-GF</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1108"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1129"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1539"/>
+        <source>OSTC 3</source>
+        <translation>OSTC 3</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1691"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1858"/>
+        <source>Set point [cbar]</source>
+        <translation>Ajouter un point [cbar]</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1693"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1860"/>
+        <source>Change depth [m]</source>
+        <translation>Modifier la profondeur [m]</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1110"/>
+        <source>Backup dive computer settings</source>
+        <translation>Sauvegarder les paramètres de l&apos;ordinateur de plongée</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1111"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1132"/>
         <source>Backup files (*.xml)</source>
         <translation>Sauvegarder les fichiers (*.xml)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1113"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1115"/>
+        <source>XML backup error</source>
+        <translation>Erreur de sauvegarde XML</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1116"/>
         <source>An error occurred while saving the backup file.
 %1</source>
         <translation>Une erreur s&apos;est produite lors de l&apos;enregistrement du fichier de sauvegarde.
 %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1116"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1119"/>
         <source>Backup succeeded</source>
         <translation>Sauvegarde réussie</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1117"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1120"/>
         <source>Your settings have been saved to: %1</source>
         <translation>Vos paramètres ont été enregistrés vers : %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1107"/>
-        <source>Backup dive computer settings</source>
-        <translation>Sauvegarder les paramètres de l&apos;ordinateur de plongée</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1112"/>
-        <source>XML backup error</source>
-        <translation>Erreur de sauvegarde XML</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1128"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1131"/>
         <source>Restore dive computer settings</source>
         <translation>Restaurer les paramètres de l&apos;ordinateur de plongée</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1134"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1137"/>
         <source>XML restore error</source>
         <translation>Erreur de restauration XML</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1135"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1138"/>
         <source>An error occurred while restoring the backup file.
 %1</source>
         <translation>Une erreur s&apos;est produite lors de la restauration du fichier de sauvegarde.
 %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1139"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1142"/>
         <source>Restore succeeded</source>
         <translation>La restauration s&apos;est effectuée avec succès</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1140"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1143"/>
         <source>Your settings have been restored successfully.</source>
         <translation>Vos paramètres ont été restaurés avec succès.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1150"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1153"/>
         <source>Select firmware file</source>
         <translation>Sélectionner le fichier de firmware</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1151"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1154"/>
         <source>All files (*.*)</source>
         <translation>Tous les fichiers (*.*)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1207"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1210"/>
         <source>Choose file for divecomputer download logfile</source>
         <translation>Choisir le fichier pour le téléchargement du fichier log de l&apos;ordinateur de plongée</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1208"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1211"/>
         <source>Log files (*.log)</source>
         <translation>Fichier de log (*.log)</translation>
     </message>
 </context>
 <context>
+    <name>ContextDrawer</name>
+    <message>
+        <location filename="../mobile-widgets/qml/kirigami/src/controls/ContextDrawer.qml" line="76"/>
+        <source>Actions</source>
+        <translation>Actions</translation>
+    </message>
+</context>
+<context>
     <name>CylindersModel</name>
     <message>
         <location filename="../qt-models/cylindermodel.cpp" line="16"/>
@@ -1779,11 +1792,6 @@
     </message>
     <message>
         <location filename="../qt-models/cylindermodel.cpp" line="16"/>
-        <source>He%</source>
-        <translation>He%</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="16"/>
         <source>Work press.</source>
         <translation>Pression de service</translation>
     </message>
@@ -1803,9 +1811,24 @@
         <translation>O₂%</translation>
     </message>
     <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="16"/>
+        <source>He%</source>
+        <translation>He%</translation>
+    </message>
+    <message>
         <location filename="../qt-models/cylindermodel.cpp" line="17"/>
-        <source>Switch at</source>
-        <translation>Changement à</translation>
+        <source>Deco switch at</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
+        <source>Bot. MOD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
+        <source>MND</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-models/cylindermodel.cpp" line="17"/>
@@ -1823,17 +1846,32 @@
         <translation>ℓ</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="161"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="177"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation>Cliquer ici retirera ce bloc.</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="383"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="180"/>
+        <source>Switch depth for deco gas. Calculated using Deco pO₂ preference, unless set manually.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="183"/>
+        <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to &apos;*&apos; for best O₂% for max depth.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="186"/>
+        <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to &apos;*&apos; for best He% for max depth.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="444"/>
         <source>Cylinder cannot be removed</source>
         <translation>Le bloc ne peut pas être retiré.</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="384"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="445"/>
         <source>This gas is 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>
@@ -1853,42 +1891,24 @@
         <translation>Quels composants voulez-vous copier</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="73"/>
+        <location filename="../build/ui_divecomponentselection.h" line="141"/>
+        <source>Dive site</source>
+        <translation>Site de plongée</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="80"/>
         <location filename="../build/ui_divecomponentselection.h" line="142"/>
         <source>Suit</source>
         <translation>Combinaison</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="122"/>
-        <location filename="../build/ui_divecomponentselection.h" line="148"/>
-        <source>Divemaster</source>
-        <translation>Moniteur / Guide de palanquée</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="129"/>
-        <location filename="../build/ui_divecomponentselection.h" line="149"/>
-        <source>Buddy</source>
-        <translation>Équipier</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="136"/>
-        <location filename="../build/ui_divecomponentselection.h" line="150"/>
-        <source>Rating</source>
-        <translation>Évaluation</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="87"/>
         <location filename="../build/ui_divecomponentselection.h" line="143"/>
         <source>Visibility</source>
         <translation>Visibilité</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="73"/>
-        <location filename="../build/ui_divecomponentselection.h" line="141"/>
-        <source>Dive site</source>
-        <translation>Site de plongée</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="94"/>
         <location filename="../build/ui_divecomponentselection.h" line="144"/>
         <source>Notes</source>
@@ -1912,10 +1932,34 @@
         <source>Cylinders</source>
         <translation>Blocs</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="122"/>
+        <location filename="../build/ui_divecomponentselection.h" line="148"/>
+        <source>Divemaster</source>
+        <translation>Moniteur / Guide de palanquée</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="129"/>
+        <location filename="../build/ui_divecomponentselection.h" line="149"/>
+        <source>Buddy</source>
+        <translation>Équipier</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="136"/>
+        <location filename="../build/ui_divecomponentselection.h" line="150"/>
+        <source>Rating</source>
+        <translation>Évaluation</translation>
+    </message>
 </context>
 <context>
     <name>DiveComputerManagementDialog</name>
     <message>
+        <location filename="../desktop-widgets/divecomputermanagementdialog.ui" line="17"/>
+        <location filename="../build/ui_divecomputermanagementdialog.h" line="65"/>
+        <source>Edit dive computer nicknames</source>
+        <translation>Éditer les noms des ordinateurs de plongée</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divecomputermanagementdialog.cpp" line="49"/>
         <source>Remove the selected dive computer?</source>
         <translation>Retirer l&apos;ordinateur de plongée sélectionné ?</translation>
@@ -1927,12 +1971,6 @@
         <translation>Êtes-vous sûr de vouloir retirer 
  l&apos;ordinateur de plongée sélectionné ?</translation>
     </message>
-    <message>
-        <location filename="../desktop-widgets/divecomputermanagementdialog.ui" line="17"/>
-        <location filename="../build/ui_divecomputermanagementdialog.h" line="65"/>
-        <source>Edit dive computer nicknames</source>
-        <translation>Éditer les noms des ordinateurs de plongée</translation>
-    </message>
 </context>
 <context>
     <name>DiveComputerModel</name>
@@ -1960,17 +1998,17 @@
 <context>
     <name>DiveDetails</name>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="33"/>
+        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="38"/>
         <source>Dive details</source>
         <translation>Détails de la plongée</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="67"/>
+        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="72"/>
         <source>Delete dive</source>
         <translation>Supprimer la plongée</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="84"/>
+        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="89"/>
         <source>Show on map</source>
         <translation>Afficher sur la carte</translation>
     </message>
@@ -1978,88 +2016,93 @@
 <context>
     <name>DiveDetailsEdit</name>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="74"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="80"/>
         <source>Dive %1</source>
         <translation>Plongée n°%1</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="78"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="84"/>
         <source>Date:</source>
         <translation>Date  :</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="86"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="92"/>
         <source>Location:</source>
         <translation>Lieu :</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="95"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="101"/>
         <source>Coordinates:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="104"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="110"/>
         <source>Use current
 GPS location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="118"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="124"/>
         <source>Depth:</source>
         <translation>Profondeur :</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="127"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="133"/>
         <source>Duration:</source>
         <translation>Durée :</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="137"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="143"/>
         <source>Air Temp:</source>
         <translation>Température de l&apos;air:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="146"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="152"/>
         <source>Water Temp:</source>
         <translation>Température de l&apos;eau:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="155"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="161"/>
         <source>Suit:</source>
         <translation>Combinaison :</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="164"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="176"/>
         <source>Buddy:</source>
         <translation>Équipier :</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="173"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="191"/>
         <source>Dive Master:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="182"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="206"/>
         <source>Weight:</source>
         <translation>Poids:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="192"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="216"/>
+        <source>Cylinder:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="231"/>
         <source>Gas mix:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="203"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="241"/>
         <source>Start Pressure:</source>
         <translation>Pression de départ</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="213"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="250"/>
         <source>End Pressure:</source>
         <translation>Pression finale</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="224"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="260"/>
         <source>Notes:</source>
         <translation>Notes :</translation>
     </message>
@@ -2112,27 +2155,27 @@ GPS location:</source>
         <translation>Température de l&apos;eau:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="199"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="198"/>
         <source>Dive Master:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="213"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="211"/>
         <source>Weight:</source>
         <translation>Poids:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="226"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="224"/>
         <source>Buddy:</source>
         <translation>Équipier :</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="239"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="237"/>
         <source>SAC:</source>
         <translation>Consommation d&apos;air (SAC) :</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="254"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="252"/>
         <source>Notes</source>
         <translation>Notes</translation>
     </message>
@@ -2140,18 +2183,18 @@ GPS location:</source>
 <context>
     <name>DiveEventItem</name>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="134"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="165"/>
         <source>Manual switch to OC</source>
         <translation>Passer manuellement sur OC</translation>
     </message>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="136"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="167"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation> début</translation>
     </message>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="137"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="168"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation> fin</translation>
@@ -2160,27 +2203,27 @@ GPS location:</source>
 <context>
     <name>DiveImportedModel</name>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="646"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="656"/>
         <source>Date/time</source>
         <translation>Date/heure</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="648"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="658"/>
         <source>Duration</source>
         <translation>Durée</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="650"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="660"/>
         <source>Depth</source>
         <translation>Profondeur</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="672"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="682"/>
         <source>h:</source>
         <translation>h:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="672"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="682"/>
         <source>min</source>
         <translation>min</translation>
     </message>
@@ -2189,8 +2232,8 @@ GPS location:</source>
     <name>DiveList</name>
     <message>
         <location filename="../mobile-widgets/qml/DiveList.qml" line="12"/>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="226"/>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="232"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="227"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="233"/>
         <source>Dive list</source>
         <translation>Liste des plongées</translation>
     </message>
@@ -2205,110 +2248,115 @@ GPS location:</source>
         <translation>Durée:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="222"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="223"/>
         <source>Cloud credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="228"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="229"/>
         <source>Please tap the &apos;+&apos; button to add a dive</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="248"/>
+        <source>No dives in dive list</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DiveListView</name>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="846"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="849"/>
         <source>Expand all</source>
         <translation>Tout déplier</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="848"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="851"/>
         <source>Collapse all</source>
         <translation>Tout replier</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="852"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="855"/>
         <source>Collapse others</source>
         <translation>Replier les autres</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="856"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="859"/>
         <source>Remove dive(s) from trip</source>
         <translation>Supprimer la (les) plongée(s) du voyage</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="857"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="860"/>
         <source>Create new trip above</source>
         <translation>Créer un nouveau voyage au-dessus</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="871"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="874"/>
         <source>Add dive(s) to trip immediately above</source>
         <translation>Ajouter la(les) plongée(s) au voyage immédiatement au dessus</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="873"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="876"/>
         <source>Add dive(s) to trip immediately below</source>
         <translation>Ajouter la (les) plongée(s) au voyage immédiatement ci-dessous</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="877"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="880"/>
         <source>Merge trip with trip above</source>
         <translation>Fusionner le voyage avec le voyage du dessus</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="878"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="881"/>
         <source>Merge trip with trip below</source>
         <translation>Fusionner le groupe avec le voyage du dessous</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="882"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="885"/>
         <source>Delete dive(s)</source>
         <translation>Effacer la (les) plongée(s)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="884"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="887"/>
         <source>Mark dive(s) invalid</source>
         <translation>Marquer la (les) plongée(s) comme invalides</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="888"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="891"/>
         <source>Merge selected dives</source>
         <translation>Fusionner les plongées sélectionnées</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="890"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="893"/>
         <source>Renumber dive(s)</source>
         <translation>Renuméroter la (les) plongée(s)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="891"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="894"/>
         <source>Shift dive times</source>
         <translation>Décaler l&apos;heure des plongées</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="892"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="895"/>
         <source>Split selected dives</source>
         <translation>Diviser les plongées sélectionnées</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="893"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="896"/>
         <source>Load image(s) from file(s)</source>
         <translation>Charger le(s) image(s) à partir du(des) fichier(s)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="894"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="897"/>
         <source>Load image(s) from web</source>
         <translation>Charger le(s) image(s) à partir du web</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="917"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="919"/>
         <source>Open image files</source>
         <translation>Ouvrir les fichiers images</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="917"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="919"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>Fichier image (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -2329,56 +2377,6 @@ GPS location:</source>
 <context>
     <name>DiveLogExportDialog</name>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="103"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="351"/>
-        <source>Export format</source>
-        <translation>Format d&apos;export</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="134"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="353"/>
-        <source>UDDF</source>
-        <translation>UDDF</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="187"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="358"/>
-        <source>Worldmap</source>
-        <translation>Mappemonde</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="197"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="359"/>
-        <source>I&amp;mage depths</source>
-        <translation>Profondeurs d&apos;i&amp;mage</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="243"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="360"/>
-        <source>Selection</source>
-        <translation>Sélection</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="252"/>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="346"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="361"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="372"/>
-        <source>Selected dives</source>
-        <translation>Plongées sélectionnées</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="262"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="362"/>
-        <source>All dives</source>
-        <translation>Toutes les plongées</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="306"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="396"/>
-        <source>HTML</source>
-        <translation>HTML</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="14"/>
         <location filename="../build/ui_divelogexportdialog.h" line="349"/>
         <source>Export dive log files</source>
@@ -2391,12 +2389,24 @@ GPS location:</source>
         <translation>Export général</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="103"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="351"/>
+        <source>Export format</source>
+        <translation>Format d&apos;export</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="115"/>
         <location filename="../build/ui_divelogexportdialog.h" line="352"/>
         <source>Subsurface &amp;XML</source>
         <translation>&amp;XML Subsurface</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="134"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="353"/>
+        <source>UDDF</source>
+        <translation>UDDF</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="147"/>
         <location filename="../build/ui_divelogexportdialog.h" line="354"/>
         <source>di&amp;velogs.de</source>
@@ -2421,238 +2431,297 @@ GPS location:</source>
         <translation>Détails de plongée CSV</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="275"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="187"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="358"/>
+        <source>Worldmap</source>
+        <translation>Mappemonde</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="197"/>
+        <source>TeX</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="207"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="359"/>
+        <source>I&amp;mage depths</source>
+        <translation>Profondeurs d&apos;i&amp;mage</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="253"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="360"/>
+        <source>Selection</source>
+        <translation>Sélection</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="262"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="356"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="361"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="372"/>
+        <source>Selected dives</source>
+        <translation>Plongées sélectionnées</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="272"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="362"/>
+        <source>All dives</source>
+        <translation>Toutes les plongées</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="285"/>
         <location filename="../build/ui_divelogexportdialog.h" line="363"/>
         <source>CSV units</source>
         <translation>Unités CSV</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="288"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="298"/>
         <location filename="../build/ui_divelogexportdialog.h" line="366"/>
         <source>Metric</source>
         <translation>Métrique</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="293"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="303"/>
         <location filename="../build/ui_divelogexportdialog.h" line="367"/>
         <source>Imperial</source>
         <translation>Impérial</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="324"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="316"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="396"/>
+        <source>HTML</source>
+        <translation>HTML</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="334"/>
         <location filename="../build/ui_divelogexportdialog.h" line="370"/>
         <source>General settings</source>
         <translation>Préférences générales</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="330"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="340"/>
         <location filename="../build/ui_divelogexportdialog.h" line="371"/>
         <source>Subsurface numbers</source>
         <translation>Numéros Subsurface</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="359"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="369"/>
         <location filename="../build/ui_divelogexportdialog.h" line="373"/>
         <source>Export yearly statistics</source>
         <translation>Exporter les statistiques annuelles</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="375"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="385"/>
         <location filename="../build/ui_divelogexportdialog.h" line="374"/>
         <source>All di&amp;ves</source>
         <translation>Toutes les &amp;plongées</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="385"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="395"/>
         <location filename="../build/ui_divelogexportdialog.h" line="375"/>
         <source>Export list only</source>
         <translation>Export de liste uniquement</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="392"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="402"/>
         <location filename="../build/ui_divelogexportdialog.h" line="376"/>
         <source>Export photos</source>
         <translation>Exporter les photos</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="408"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="418"/>
         <location filename="../build/ui_divelogexportdialog.h" line="377"/>
         <source>Style options</source>
         <translation>Options de style</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="423"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="433"/>
         <location filename="../build/ui_divelogexportdialog.h" line="378"/>
         <source>Font</source>
         <translation>Police</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="433"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="443"/>
         <location filename="../build/ui_divelogexportdialog.h" line="379"/>
         <source>Font size</source>
         <translation>Taille de police</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="444"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="454"/>
         <location filename="../build/ui_divelogexportdialog.h" line="382"/>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="449"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="459"/>
         <location filename="../build/ui_divelogexportdialog.h" line="383"/>
         <source>10</source>
         <translation>10</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="454"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="464"/>
         <location filename="../build/ui_divelogexportdialog.h" line="384"/>
         <source>12</source>
         <translation>12</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="459"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="469"/>
         <location filename="../build/ui_divelogexportdialog.h" line="385"/>
         <source>14</source>
         <translation>14</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="464"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="474"/>
         <location filename="../build/ui_divelogexportdialog.h" line="386"/>
         <source>16</source>
         <translation>16</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="469"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="479"/>
         <location filename="../build/ui_divelogexportdialog.h" line="387"/>
         <source>18</source>
         <translation>18</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="474"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="484"/>
         <location filename="../build/ui_divelogexportdialog.h" line="388"/>
         <source>20</source>
         <translation>20</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="482"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="492"/>
         <location filename="../build/ui_divelogexportdialog.h" line="390"/>
         <source>Theme</source>
         <translation>Thème</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="493"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="503"/>
         <location filename="../build/ui_divelogexportdialog.h" line="393"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="95"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="99"/>
         <source>Light</source>
         <translation>Clair</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="498"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="508"/>
         <location filename="../build/ui_divelogexportdialog.h" line="394"/>
         <source>Sand</source>
         <translation>Sable</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="134"/>
-        <source>UDDF files (*.uddf *.UDDF)</source>
-        <translation>Fichiers UDDF (*.uddf *.UDDF)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="142"/>
-        <source>CSV files (*.csv *.CSV)</source>
-        <translation>Fichiers CSV (*.csv *.CSV)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="74"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="76"/>
         <source>Generic format that is used for data exchange between a variety of diving related programs.</source>
         <translation>Format générique utilisé pour l&apos;échange de données entre plusieurs logiciels de plongée</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="76"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="78"/>
         <source>Comma separated values describing the dive profile.</source>
         <translation>Valeurs séparées par des virgules décrivant le profil de plongée.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="78"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="80"/>
         <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source>
         <translation>Valeurs séparées par des virgules pour les informations de plongée. Cela inclut la plupart des détails de plongée mais aucune information de profil.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="80"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="82"/>
         <source>Send the dive data to divelogs.de website.</source>
         <translation>Envoyer les données de la plongée au site divelogs.de</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="82"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="84"/>
         <source>Send the dive data to dive-share.appspot.com website</source>
         <translation>Envoyer les informations des plongées au site dive-share.appspot.com</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="84"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="86"/>
         <source>HTML export of the dive locations, visualized on a world map.</source>
         <translation>Export HTML des lieux de plongées, indiqués sur une carte du monde</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="86"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="88"/>
         <source>Subsurface native XML format.</source>
         <translation>Format XML natif de Subsurface.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="88"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="90"/>
         <source>Write depths of images to file.</source>
         <translation>Sauvegarder les profondeurs des images dans le fichier.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="133"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="92"/>
+        <source>Write dive as TeX macros to file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="137"/>
         <source>Export UDDF file as</source>
         <translation>Exporter le fichier UDDF en</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="137"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/>
+        <source>UDDF files (*.uddf *.UDDF)</source>
+        <translation>Fichiers UDDF (*.uddf *.UDDF)</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divelogexportdialog.cpp" line="141"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="145"/>
         <source>Export CSV file as</source>
         <translation>Exporter le fichier CSV en</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="148"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="142"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="146"/>
+        <source>CSV files (*.csv *.CSV)</source>
+        <translation>Fichiers CSV (*.csv *.CSV)</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="152"/>
         <source>Export world map</source>
         <translation>Exporter la carte mondiale</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="149"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="169"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="153"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="177"/>
         <source>HTML files (*.html)</source>
         <translation>Fichiers HTML (*.html)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="153"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="157"/>
         <source>Export Subsurface XML</source>
         <translation>Exporter vers fichier XML Subsurface</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="158"/>
         <source>XML files (*.xml *.ssrf)</source>
         <translation>Fichiers XML (*.xml *.ssrf)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="162"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="166"/>
         <source>Save image depths</source>
         <translation>Sauvegarder la profondeur de l&apos;image</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="168"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="170"/>
+        <source>Export to TeX file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="170"/>
+        <source>TeX files (*.tex)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="176"/>
         <source>Export HTML files as</source>
         <translation>Exporter le fichier HTML comme</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="184"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="192"/>
         <source>Please wait, exporting...</source>
         <translation>Veuillez patienter, exportation...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="219"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="227"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="311"/>
         <source>Can&apos;t open file %s</source>
         <translation>Impossible d&apos;ouvrir le fichier %s</translation>
     </message>
@@ -2666,25 +2735,6 @@ GPS location:</source>
         <translation>Importer des plongées depuis un fichier</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="643"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="727"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="856"/>
-        <source>Time</source>
-        <translation>Heure</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.ui" line="127"/>
-        <location filename="../build/ui_divelogimportdialog.h" line="164"/>
-        <source>Metric</source>
-        <translation>Métrique</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.ui" line="132"/>
-        <location filename="../build/ui_divelogimportdialog.h" line="165"/>
-        <source>Imperial</source>
-        <translation>Impérial</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divelogimportdialog.ui" line="89"/>
         <location filename="../build/ui_divelogimportdialog.h" line="152"/>
         <source>dd.mm.yyyy</source>
@@ -2703,74 +2753,6 @@ GPS location:</source>
         <translation>aaaa-mm-jj</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.ui" line="155"/>
-        <location filename="../build/ui_divelogimportdialog.h" line="167"/>
-        <source>Drag the tags above to each corresponding column below</source>
-        <translation>Déplacer les tags ci-dessus vers chaque colonne correspondante ci-dessous</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="641"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="729"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="852"/>
-        <source>Dive #</source>
-        <translation>Plongée n°</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="642"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="723"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="854"/>
-        <source>Date</source>
-        <translation>Date</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="644"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="858"/>
-        <source>Duration</source>
-        <translation>Durée</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="655"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="862"/>
-        <source>GPS</source>
-        <translation>GPS</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="645"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="864"/>
-        <source>Max. depth</source>
-        <translation>Prof. Max.</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="646"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="866"/>
-        <source>Avg. depth</source>
-        <translation>Prof. moyenne</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="658"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="872"/>
-        <source>Suit</source>
-        <translation>Combinaison</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="663"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="878"/>
-        <source>Tags</source>
-        <translation>Étiquettes</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="652"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="894"/>
-        <source>O₂</source>
-        <translation>O₂</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="653"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="896"/>
-        <source>He</source>
-        <translation>He</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divelogimportdialog.ui" line="108"/>
         <location filename="../build/ui_divelogimportdialog.h" line="158"/>
         <source>Seconds</source>
@@ -2789,183 +2771,269 @@ GPS location:</source>
         <translation>Minutes:secondes</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="654"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="860"/>
-        <source>Location</source>
-        <translation>Lieu</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.ui" line="127"/>
+        <location filename="../build/ui_divelogimportdialog.h" line="164"/>
+        <source>Metric</source>
+        <translation>Métrique</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.ui" line="132"/>
+        <location filename="../build/ui_divelogimportdialog.h" line="165"/>
+        <source>Imperial</source>
+        <translation>Impérial</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="354"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="499"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="505"/>
+        <location filename="../desktop-widgets/divelogimportdialog.ui" line="155"/>
+        <location filename="../build/ui_divelogimportdialog.h" line="167"/>
+        <source>Drag the tags above to each corresponding column below</source>
+        <translation>Déplacer les tags ci-dessus vers chaque colonne correspondante ci-dessous</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="355"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="528"/>
         <source>Tab</source>
         <translation>Tab</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="575"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="598"/>
         <source>Some column headers were pre-populated; please drag and drop the headers so they match the column they are in.</source>
         <translation>Certains entêtes de colonnes ont été pré-remplies : veuillez déplacer les entêtes pour qu&apos;ils correspondent à leurs colonnes.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="613"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="731"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="782"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="848"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="636"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="761"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="857"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="925"/>
         <source>Sample time</source>
         <translation>Heure de l&apos;échantillon</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="615"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="733"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="784"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="638"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="763"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="859"/>
         <source>Sample depth</source>
         <translation>Profondeur de l&apos;échantillon</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="617"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="735"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="786"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="640"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="765"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="861"/>
         <source>Sample temperature</source>
         <translation>Température de l&apos;échantillon</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="621"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="739"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="790"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="642"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="767"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="863"/>
+        <source>Sample pO₂</source>
+        <translation>pO₂ de l&apos;échantillon</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="644"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="769"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="865"/>
         <source>Sample sensor1 pO₂</source>
         <translation>Échantillonnage pO₂ capteur1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="623"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="741"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="792"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="646"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="771"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="867"/>
         <source>Sample sensor2 pO₂</source>
         <translation>Échantillonnage pO₂ capteur2</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="625"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="743"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="794"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="648"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="773"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="869"/>
         <source>Sample sensor3 pO₂</source>
         <translation>Échantillonnage pO₂ capteur3</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="633"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="751"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="802"/>
-        <source>Sample stopdepth</source>
-        <translation>Profondeur d’arrêt de l&apos;échantillon</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="637"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="755"/>
-        <source>Sample setpoint</source>
-        <translation>Échantillonnage de la consigne</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="619"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="737"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="788"/>
-        <source>Sample pO₂</source>
-        <translation>pO₂ de l&apos;échantillon</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="627"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="745"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="796"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="650"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="775"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="871"/>
         <source>Sample CNS</source>
         <translation>SNC de l&apos;échantillon</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="629"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="747"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="798"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="652"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="777"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="873"/>
         <source>Sample NDL</source>
         <translation>LND de l&apos;échantillon</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="631"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="749"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="800"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="654"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="779"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="875"/>
         <source>Sample TTS</source>
         <translation>DTR de l&apos;échantillon</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="635"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="753"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="804"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="656"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="781"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="877"/>
+        <source>Sample stopdepth</source>
+        <translation>Profondeur d’arrêt de l&apos;échantillon</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="658"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="783"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="879"/>
         <source>Sample pressure</source>
         <translation>Pression de l&apos;échantillon</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="656"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="868"/>
-        <source>Divemaster</source>
-        <translation>Moniteur / Guide de palanquée</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="660"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="785"/>
+        <source>Sample setpoint</source>
+        <translation>Échantillonnage de la consigne</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="657"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="870"/>
-        <source>Buddy</source>
-        <translation>Équipier</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="664"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="759"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="929"/>
+        <source>Dive #</source>
+        <translation>Plongée n°</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="659"/>
-        <source>Rating</source>
-        <translation>Évaluation</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="665"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="753"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="931"/>
+        <source>Date</source>
+        <translation>Date</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="660"/>
-        <source>Visibility</source>
-        <translation>Visibilité</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="666"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="757"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="933"/>
+        <source>Time</source>
+        <translation>Heure</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="661"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="874"/>
-        <source>Notes</source>
-        <translation>Notes</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="667"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="935"/>
+        <source>Duration</source>
+        <translation>Durée</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="662"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="876"/>
-        <source>Weight</source>
-        <translation>Poids</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="668"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="941"/>
+        <source>Max. depth</source>
+        <translation>Prof. Max.</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="669"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="943"/>
+        <source>Avg. depth</source>
+        <translation>Prof. moyenne</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="670"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="975"/>
+        <source>Air temp.</source>
+        <translation>Temp. de l&apos;air</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="649"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="888"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="671"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="977"/>
+        <source>Water temp.</source>
+        <translation>Temp. de l&apos;eau</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="672"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="965"/>
         <source>Cyl. size</source>
         <translation>Taille de bloc</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="650"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="890"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="673"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="967"/>
         <source>Start pressure</source>
         <translation>Pression de départ</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="651"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="892"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="674"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="969"/>
         <source>End pressure</source>
         <translation>Pression finale</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="647"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="898"/>
-        <source>Air temp.</source>
-        <translation>Temp. de l&apos;air</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="675"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="971"/>
+        <source>O₂</source>
+        <translation>O₂</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="648"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="900"/>
-        <source>Water temp.</source>
-        <translation>Temp. de l&apos;eau</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="676"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="973"/>
+        <source>He</source>
+        <translation>He</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="677"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="937"/>
+        <source>Location</source>
+        <translation>Lieu</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="678"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="939"/>
+        <source>GPS</source>
+        <translation>GPS</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="679"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="945"/>
+        <source>Divemaster</source>
+        <translation>Moniteur / Guide de palanquée</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="680"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="947"/>
+        <source>Buddy</source>
+        <translation>Équipier</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="681"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="949"/>
+        <source>Suit</source>
+        <translation>Combinaison</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="682"/>
+        <source>Rating</source>
+        <translation>Évaluation</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="683"/>
+        <source>Visibility</source>
+        <translation>Visibilité</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="684"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="951"/>
+        <source>Notes</source>
+        <translation>Notes</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="685"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="953"/>
+        <source>Weight</source>
+        <translation>Poids</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="686"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="955"/>
+        <source>Tags</source>
+        <translation>Étiquettes</translation>
     </message>
 </context>
 <context>
     <name>DiveObjectHelper</name>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="287"/>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="323"/>
         <source>%1 dive(s)</source>
         <translation>%1 plongée(s)</translation>
     </message>
@@ -2973,18 +3041,18 @@ GPS location:</source>
 <context>
     <name>DivePlanner</name>
     <message>
-        <location filename="../desktop-widgets/diveplanner.ui" line="152"/>
-        <location filename="../build/ui_diveplanner.h" line="190"/>
-        <source>Altitude</source>
-        <translation>Altitude</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/diveplanner.ui" line="109"/>
         <location filename="../build/ui_diveplanner.h" line="189"/>
         <source>Planned dive time</source>
         <translation>Heure de plongée planifiée</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/diveplanner.ui" line="152"/>
+        <location filename="../build/ui_diveplanner.h" line="190"/>
+        <source>Altitude</source>
+        <translation>Altitude</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/diveplanner.ui" line="159"/>
         <location filename="../build/ui_diveplanner.h" line="191"/>
         <source>ATM pressure</source>
@@ -3018,32 +3086,32 @@ GPS location:</source>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="134"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="136"/>
         <source>unknown</source>
         <translation>inconnu</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="312"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="326"/>
         <source>Final depth</source>
         <translation>Prof. finale</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="314"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="328"/>
         <source>Run time</source>
         <translation>Durée de plongée</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="316"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="330"/>
         <source>Duration</source>
         <translation>Durée</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="318"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="332"/>
         <source>Used gas</source>
         <translation>Gaz utilisé</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="320"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="334"/>
         <source>CC setpoint</source>
         <translation>Setpoint CC</translation>
     </message>
@@ -3051,22 +3119,22 @@ GPS location:</source>
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="108"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="112"/>
         <source>Dive planner points</source>
         <translation>Points du plannificateur</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="112"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="116"/>
         <source>Available gases</source>
         <translation>Gaz disponibles</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="137"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="143"/>
         <source>Add dive data point</source>
         <translation>Ajouter un point de donnée de plongée</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="146"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="152"/>
         <source>Save new</source>
         <translation>Enregistrer sous</translation>
     </message>
@@ -3099,11 +3167,36 @@ GPS location:</source>
         <translation>Couleur</translation>
     </message>
     <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="124"/>
+        <source>User entered</source>
+        <translation>Entré par l&apos;utilisateur</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="126"/>
+        <source>Cylinder index</source>
+        <translation>Index du bloc</translation>
+    </message>
+    <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="128"/>
         <source>Pressure S</source>
         <translation>Pression S</translation>
     </message>
     <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="130"/>
+        <source>Pressure I</source>
+        <translation>Pression I</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="132"/>
+        <source>Ceiling</source>
+        <translation>Plafond</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="134"/>
+        <source>SAC</source>
+        <translation>Consommation d&apos;air</translation>
+    </message>
+    <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="136"/>
         <source>pN₂</source>
         <translation>pN₂</translation>
@@ -3139,49 +3232,24 @@ GPS location:</source>
         <translation>Capteur 3</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="152"/>
-        <source>Heart rate</source>
-        <translation>Freq. cardiaque</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="156"/>
-        <source>Mean depth @ s</source>
-        <translation>Prof. moyenne @ s</translation>
-    </message>
-    <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="150"/>
         <source>Ambient pressure</source>
         <translation>Pression ambiante</translation>
     </message>
     <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="152"/>
+        <source>Heart rate</source>
+        <translation>Freq. cardiaque</translation>
+    </message>
+    <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="154"/>
         <source>Gradient factor</source>
         <translation>Facteur de gradient (GF)</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="130"/>
-        <source>Pressure I</source>
-        <translation>Pression I</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="124"/>
-        <source>User entered</source>
-        <translation>Entré par l&apos;utilisateur</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="126"/>
-        <source>Cylinder index</source>
-        <translation>Index du bloc</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="132"/>
-        <source>Ceiling</source>
-        <translation>Plafond</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="134"/>
-        <source>SAC</source>
-        <translation>Consommation d&apos;air</translation>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="156"/>
+        <source>Mean depth @ s</source>
+        <translation>Prof. moyenne @ s</translation>
     </message>
 </context>
 <context>
@@ -3252,311 +3320,315 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="395"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="441"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="434"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="483"/>
         <source>#</source>
         <translation>N°</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="398"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="444"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="437"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="486"/>
         <source>Date</source>
         <translation>Date</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="401"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="447"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="440"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="489"/>
         <source>Rating</source>
         <translation>Évaluation</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="404"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="443"/>
         <source>Depth</source>
         <translation>Profondeur</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="410"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="446"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="495"/>
+        <source>Duration</source>
+        <translation>Durée</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="449"/>
         <source>Temp</source>
         <translation>Temp.</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="413"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="452"/>
         <source>Weight</source>
         <translation>Poids</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="425"/>
-        <source>SAC</source>
-        <translation>Consommation d&apos;air</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
-        <source>m</source>
-        <translation>m</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
-        <source>ft</source>
-        <translation>pied</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
-        <source>Weight(%1)</source>
-        <translation>Poids(%1)</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="416"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="462"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="455"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="504"/>
         <source>Suit</source>
         <translation>Combinaison</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="419"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="465"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="458"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="507"/>
         <source>Cyl</source>
         <translation>Bloc</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="422"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="468"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="461"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="510"/>
         <source>Gas</source>
         <translation>Gaz</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
-        <source>SAC(%1)</source>
-        <translation>Consommation d&apos;air(%1)</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="464"/>
+        <source>SAC</source>
+        <translation>Consommation d&apos;air</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
-        <source>/min</source>
-        <translation>/min</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="467"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="518"/>
+        <source>OTU</source>
+        <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="431"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="479"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="470"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="521"/>
         <source>Max CNS</source>
         <translation>SNC max</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="434"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="482"/>
-        <source>Location</source>
-        <translation>Lieu</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
+        <source>Photos</source>
+        <translation>Photos</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
-        <source>kg</source>
-        <translation>kg</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="476"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="527"/>
+        <source>Location</source>
+        <translation>Lieu</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="492"/>
         <source>Depth(%1)</source>
         <translation>Profondeur(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="407"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="453"/>
-        <source>Duration</source>
-        <translation>Durée</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="492"/>
+        <source>m</source>
+        <translation>m</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="492"/>
+        <source>ft</source>
+        <translation>pied</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="456"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="498"/>
         <source>Temp(%1%2)</source>
         <translation>Température(%1%2)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="501"/>
+        <source>Weight(%1)</source>
+        <translation>Poids(%1)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="501"/>
+        <source>kg</source>
+        <translation>kg</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="501"/>
         <source>lbs</source>
         <translation>livre US</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="428"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="476"/>
-        <source>OTU</source>
-        <translation>OTU</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="515"/>
+        <source>SAC(%1)</source>
+        <translation>Consommation d&apos;air(%1)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="515"/>
+        <source>/min</source>
+        <translation>/min</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="524"/>
+        <source>Photos before/during/after dive</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="164"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="165"/>
         <source>no dives were selected</source>
         <translation>Aucune plongée sélectionnée</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="174"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="175"/>
         <source>stylesheet to export to divelogs.de is not found</source>
         <translation>La feuille de style pour exporter vers divelogs.de n&apos;a pas été trouvée</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="184"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="185"/>
         <source>failed to create zip file for upload: %s</source>
         <translation>Erreur de création du fichier zip pour envoi : %s</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="236"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="237"/>
         <source>internal error</source>
         <translation>Erreur interne</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="244"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="245"/>
         <source>Conversion of dive %1 to divelogs.de format failed</source>
         <translation>La conversion de la plongée %1 au format divelogs.de a échoué</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="272"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="273"/>
         <source>error writing zip file: %s zip error %d system error %d - %s</source>
         <translation>erreur lors de l&apos;écriture du fichier zip : %s erreur zip %d erreur système %d - %s</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="745"/>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="935"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="936"/>
         <source>Done</source>
         <translation>Terminé</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="778"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="779"/>
         <source>Uploading dive list...</source>
         <translation>Envoi de la liste des plongées</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="810"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="811"/>
         <source>Downloading dive list...</source>
         <translation>Téléchargement de la liste des plongées...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="851"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="852"/>
         <source>Downloading %1 dives...</source>
         <translation>Téléchargement de %1 plongées...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="885"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="886"/>
         <source>Download finished - %1</source>
         <translation>Téléchargement terminé - %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="899"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="900"/>
         <source>Problem with download</source>
         <translation>Problème avec le téléchargement</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="900"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="901"/>
         <source>The archive could not be opened:
 </source>
         <translation>L&apos;archive n&apos;a pas pu être ouverte :
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="909"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="910"/>
         <source>Corrupted download</source>
         <translation>Téléchargement corrompu</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="910"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="911"/>
         <source>The archive could not be opened:
 %1</source>
         <translation>L&apos;archive ne peut pas être ouverte :
 %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="937"/>
+        <source>Upload finished</source>
+        <translation>Envoi terminé</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="950"/>
         <source>Upload failed</source>
         <translation>Échec de l&apos;envoi</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="952"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="953"/>
         <source>Upload successful</source>
         <translation>Envoi terminé avec succès</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="955"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="956"/>
         <source>Login failed</source>
         <translation>Échec de connexion</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="958"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="959"/>
         <source>Cannot parse response</source>
         <translation>Impossible d&apos;analyser la réponse</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="970"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="971"/>
         <source>Error: %1</source>
         <translation>Erreur : %1</translation>
     </message>
-    <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="936"/>
-        <source>Upload finished</source>
-        <translation>Envoi terminé</translation>
-    </message>
 </context>
 <context>
     <name>DownloadFromDCWidget</name>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="185"/>
-        <source>Error</source>
-        <translation>Erreur</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="436"/>
-        <source>Retry</source>
-        <translation>Essayer à nouveau</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="280"/>
-        <source>Find Uemis dive computer</source>
-        <translation>Trouver l&apos;ordinateur de plongée Uemis</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="101"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="107"/>
         <source>Download</source>
         <translation>Télécharger</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="104"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="110"/>
         <source>Choose Bluetooth download mode</source>
         <translation>Choisir le mode de téléchargement Bluetooth</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="382"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="191"/>
+        <source>Error</source>
+        <translation>Erreur</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="286"/>
+        <source>Find Uemis dive computer</source>
+        <translation>Trouver l&apos;ordinateur de plongée Uemis</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="392"/>
         <source>Choose file for divecomputer download logfile</source>
         <translation>Choisir le fichier pour le téléchargement du fichier log de l&apos;ordinateur de plongée</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="383"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="393"/>
         <source>Log files (*.log)</source>
         <translation>Fichier de log (*.log)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="398"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="408"/>
         <source>Warning</source>
         <translation>Avertissement</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="399"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="409"/>
         <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source>
         <translation>Sauvegarder les données brutes de libdivecomputer NE téléchargera PAS les plongées dans la liste des plongées.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="410"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="420"/>
         <source>Choose file for divecomputer binary dump file</source>
         <translation>Choisir le fichier pour les données brutes binaires de libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="411"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="421"/>
         <source>Dump files (*.bin)</source>
         <translation>Fichiers de données brutes (*.bin)</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="446"/>
+        <source>Retry</source>
+        <translation>Essayer à nouveau</translation>
+    </message>
 </context>
 <context>
     <name>DownloadFromDiveComputer</name>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="139"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="275"/>
-        <source>Vendor</source>
-        <translation>Fabricant</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="14"/>
         <location filename="../build/ui_downloadfromdivecomputer.h" line="265"/>
         <source>Download from dive computer</source>
@@ -3569,17 +3641,6 @@ p, li { white-space: pre-wrap; }
         <translation>Périphérique ou point de montage</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="122"/>
-        <source>Choose Bluetooth download mode</source>
-        <translation>Choisir le mode de téléchargement Bluetooth</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="149"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="276"/>
-        <source>Dive computer</source>
-        <translation>Ordinateur de plongée</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="66"/>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="101"/>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="115"/>
@@ -3603,11 +3664,46 @@ p, li { white-space: pre-wrap; }
         <translation>Toujours préférer les plongées téléchargées</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="87"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="270"/>
+        <source>Download into new trip</source>
+        <translation>Télécharger dans un nouveau voyage</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="94"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="271"/>
+        <source>Save libdivecomputer logfile</source>
+        <translation>Sauvegarder le fichier log de libdivecomputer</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="108"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="273"/>
+        <source>Save libdivecomputer dumpfile</source>
+        <translation>Sauvegarder le fichier de données brutes de libdivecomputer</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="122"/>
+        <source>Choose Bluetooth download mode</source>
+        <translation>Choisir le mode de téléchargement Bluetooth</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="129"/>
         <source>Select a remote Bluetooth device.</source>
         <translation>Sélectionner un périphérique Bluetooth distant.</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="139"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="275"/>
+        <source>Vendor</source>
+        <translation>Fabricant</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="149"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="276"/>
+        <source>Dive computer</source>
+        <translation>Ordinateur de plongée</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/>
         <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="52"/>
         <location filename="../build/ui_downloadfromdivecomputer.h" line="277"/>
@@ -3615,18 +3711,6 @@ p, li { white-space: pre-wrap; }
         <translation>Télécharger</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="284"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="281"/>
-        <source>OK</source>
-        <translation>OK</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="291"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="282"/>
-        <source>Cancel</source>
-        <translation>Annuler</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="226"/>
         <location filename="../build/ui_downloadfromdivecomputer.h" line="278"/>
         <source>Downloaded dives</source>
@@ -3645,22 +3729,16 @@ p, li { white-space: pre-wrap; }
         <translation>Tout désélectionner</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="94"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="271"/>
-        <source>Save libdivecomputer logfile</source>
-        <translation>Sauvegarder le fichier log de libdivecomputer</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="108"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="273"/>
-        <source>Save libdivecomputer dumpfile</source>
-        <translation>Sauvegarder le fichier de données brutes de libdivecomputer</translation>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="284"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="281"/>
+        <source>OK</source>
+        <translation>OK</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="87"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="270"/>
-        <source>Download into new trip</source>
-        <translation>Télécharger dans un nouveau voyage</translation>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="291"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="282"/>
+        <source>Cancel</source>
+        <translation>Annuler</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="16"/>
@@ -3750,12 +3828,12 @@ p, li { white-space: pre-wrap; }
         <translation>Se connecter à Facebook</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="297"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="242"/>
         <source>To disconnect Subsurface from your Facebook account, use the button below</source>
         <translation>Pour déconnecter Subsurface de votre compte Facebook, utilisez le bouton ci-dessous</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="306"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="251"/>
         <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source>
         <translation>Pour se connecter à Facebook, veuillez vous identifiez. Cela permet à Subsurface de publier vos plongées sur votre profil</translation>
     </message>
@@ -3763,22 +3841,22 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>FacebookManager</name>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="266"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="211"/>
         <source>Photo upload sucessfull</source>
         <translation>Envoi des photos réussi</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="267"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="212"/>
         <source>Your dive profile was updated to Facebook.</source>
         <translation>Votre profil de plongée a été mis à jour sur Facebook.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="271"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="216"/>
         <source>Photo upload failed</source>
         <translation>Échec de l&apos;envoi des photos</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="272"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="217"/>
         <source>Your dive profile was not updated to Facebook, 
  please send the following to the developer. 
 </source>
@@ -3839,17 +3917,25 @@ veuillez envoyer les informations suivantes aux développeurs. </translation>
 <context>
     <name>FirmwareUpdateThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1750"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1739"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Cette fonctionnalité n&apos;est pas disponible pour l&apos;ordinateur de plongé sélectionné</translation>
     </message>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1755"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1744"/>
         <source>Firmware update failed!</source>
         <translation>La mise à jour du firmware à échoué !</translation>
     </message>
 </context>
 <context>
+    <name>GlobalDrawer</name>
+    <message>
+        <location filename="../mobile-widgets/qml/kirigami/src/controls/GlobalDrawer.qml" line="364"/>
+        <source>Back</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>GlobeGPS</name>
     <message>
         <location filename="../desktop-widgets/globe.cpp" line="124"/>
@@ -3865,27 +3951,27 @@ veuillez envoyer les informations suivantes aux développeurs. </translation>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="40"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="32"/>
         <source>Date: </source>
         <translation>Date :</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="50"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="42"/>
         <source>Name: </source>
         <translation>Nom : </translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="60"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="52"/>
         <source>Latitude: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="69"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="61"/>
         <source>Longitude: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="113"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="105"/>
         <source>List of stored GPS fixes</source>
         <translation type="unfinished"/>
     </message>
@@ -3914,7 +4000,7 @@ veuillez envoyer les informations suivantes aux développeurs. </translation>
 <context>
     <name>LocationFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="648"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="646"/>
         <source>Location: </source>
         <translation>Lieu : </translation>
     </message>
@@ -3955,7 +4041,7 @@ veuillez envoyer les informations suivantes aux développeurs. </translation>
 <context>
     <name>LocationFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="299"/>
+        <location filename="../qt-models/filtermodels.cpp" line="304"/>
         <source>No location set</source>
         <translation>Lieu non défini</translation>
     </message>
@@ -4079,6 +4165,54 @@ cette opération. Voulez-vous vraiment continuer ?</translation>
 <context>
     <name>MainTab</name>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="18"/>
+        <location filename="../desktop-widgets/maintab.ui" line="439"/>
+        <location filename="../build/ui_maintab.h" line="961"/>
+        <location filename="../build/ui_maintab.h" line="963"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="539"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="571"/>
+        <source>Notes</source>
+        <translation>Notes</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="21"/>
+        <location filename="../build/ui_maintab.h" line="964"/>
+        <source>General notes about the current selection</source>
+        <translation>Informations générales sur la sélection actuelle</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="92"/>
+        <location filename="../desktop-widgets/maintab.ui" line="646"/>
+        <location filename="../build/ui_maintab.h" line="947"/>
+        <location filename="../build/ui_maintab.h" line="967"/>
+        <source>Date</source>
+        <translation>Date</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="102"/>
+        <location filename="../build/ui_maintab.h" line="948"/>
+        <source>Time</source>
+        <translation>Heure</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="112"/>
+        <location filename="../desktop-widgets/maintab.ui" line="836"/>
+        <location filename="../build/ui_maintab.h" line="949"/>
+        <location filename="../build/ui_maintab.h" line="987"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="306"/>
+        <source>Air temp.</source>
+        <translation>Temp. de l&apos;air</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="122"/>
+        <location filename="../desktop-widgets/maintab.ui" line="855"/>
+        <location filename="../build/ui_maintab.h" line="950"/>
+        <location filename="../build/ui_maintab.h" line="989"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="307"/>
+        <source>Water temp.</source>
+        <translation>Temp. de l&apos;eau</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="184"/>
         <location filename="../build/ui_maintab.h" line="951"/>
         <location filename="../desktop-widgets/maintab.cpp" line="570"/>
@@ -4086,6 +4220,17 @@ cette opération. Voulez-vous vraiment continuer ?</translation>
         <translation>Lieu</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="214"/>
+        <source>Edit dive site</source>
+        <translation>Modifier le site de plongée</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="217"/>
+        <location filename="../build/ui_maintab.h" line="953"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="252"/>
         <location filename="../build/ui_maintab.h" line="954"/>
         <source>Divemaster</source>
@@ -4098,12 +4243,6 @@ cette opération. Voulez-vous vraiment continuer ?</translation>
         <translation>Équipier</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.ui" line="387"/>
-        <location filename="../build/ui_maintab.h" line="959"/>
-        <source>Tags</source>
-        <translation>Étiquettes</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/maintab.ui" line="308"/>
         <location filename="../build/ui_maintab.h" line="956"/>
         <source>Rating</source>
@@ -4122,57 +4261,18 @@ cette opération. Voulez-vous vraiment continuer ?</translation>
         <translation>Combinaison</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="387"/>
+        <location filename="../build/ui_maintab.h" line="959"/>
+        <source>Tags</source>
+        <translation>Étiquettes</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="397"/>
         <location filename="../build/ui_maintab.h" line="960"/>
         <source>Dive mode</source>
         <translation>Mode de plongée</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.ui" line="112"/>
-        <location filename="../desktop-widgets/maintab.ui" line="836"/>
-        <location filename="../build/ui_maintab.h" line="949"/>
-        <location filename="../build/ui_maintab.h" line="987"/>
-        <location filename="../desktop-widgets/maintab.cpp" line="306"/>
-        <source>Air temp.</source>
-        <translation>Temp. de l&apos;air</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="122"/>
-        <location filename="../desktop-widgets/maintab.ui" line="855"/>
-        <location filename="../build/ui_maintab.h" line="950"/>
-        <location filename="../build/ui_maintab.h" line="989"/>
-        <location filename="../desktop-widgets/maintab.cpp" line="307"/>
-        <source>Water temp.</source>
-        <translation>Temp. de l&apos;eau</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="18"/>
-        <location filename="../desktop-widgets/maintab.ui" line="439"/>
-        <location filename="../build/ui_maintab.h" line="961"/>
-        <location filename="../build/ui_maintab.h" line="963"/>
-        <location filename="../desktop-widgets/maintab.cpp" line="539"/>
-        <location filename="../desktop-widgets/maintab.cpp" line="571"/>
-        <source>Notes</source>
-        <translation>Notes</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="21"/>
-        <location filename="../build/ui_maintab.h" line="964"/>
-        <source>General notes about the current selection</source>
-        <translation>Informations générales sur la sélection actuelle</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="214"/>
-        <source>Edit dive site</source>
-        <translation>Modifier le site de plongée</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="217"/>
-        <location filename="../build/ui_maintab.h" line="953"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/maintab.ui" line="491"/>
         <location filename="../build/ui_maintab.h" line="965"/>
         <source>Equipment</source>
@@ -4197,6 +4297,12 @@ cette opération. Voulez-vous vraiment continuer ?</translation>
         <translation>Informations de plongée</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="665"/>
+        <location filename="../build/ui_maintab.h" line="969"/>
+        <source>Interval</source>
+        <translation>Intervalle</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="684"/>
         <location filename="../build/ui_maintab.h" line="971"/>
         <source>Gases used</source>
@@ -4209,18 +4315,38 @@ cette opération. Voulez-vous vraiment continuer ?</translation>
         <translation>Gaz consommé</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="722"/>
+        <location filename="../desktop-widgets/maintab.ui" line="1094"/>
+        <location filename="../build/ui_maintab.h" line="975"/>
+        <location filename="../build/ui_maintab.h" line="1003"/>
+        <source>SAC</source>
+        <translation>Consommation d&apos;air (SAC)</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="741"/>
         <location filename="../build/ui_maintab.h" line="977"/>
         <source>CNS</source>
         <translation>SNC</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="760"/>
+        <location filename="../build/ui_maintab.h" line="979"/>
+        <source>OTU</source>
+        <translation>OTU</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="779"/>
         <location filename="../build/ui_maintab.h" line="981"/>
         <source>Max. depth</source>
         <translation>Prof. Max.</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="798"/>
+        <location filename="../build/ui_maintab.h" line="983"/>
+        <source>Avg. depth</source>
+        <translation>Prof. moyenne</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="817"/>
         <location filename="../build/ui_maintab.h" line="985"/>
         <source>Air pressure</source>
@@ -4233,82 +4359,6 @@ cette opération. Voulez-vous vraiment continuer ?</translation>
         <translation>Durée de plongée</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.ui" line="933"/>
-        <location filename="../build/ui_maintab.h" line="1007"/>
-        <source>Simple statistics about the selection</source>
-        <translation>Statistiques simples sur la sélection</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1039"/>
-        <location filename="../build/ui_maintab.h" line="999"/>
-        <source>Total time</source>
-        <translation>Durée totale</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1106"/>
-        <location filename="../build/ui_maintab.h" line="1004"/>
-        <source>Gas consumption</source>
-        <translation>Consommation de gaz</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1151"/>
-        <location filename="../build/ui_maintab.h" line="1009"/>
-        <source>All photos from the current selection</source>
-        <translation>Toutes les photos de la sélection actuelle </translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1177"/>
-        <location filename="../build/ui_maintab.h" line="1010"/>
-        <source>Extra data</source>
-        <translation>Données supplémentaires</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1180"/>
-        <location filename="../build/ui_maintab.h" line="1011"/>
-        <source>Adittional data from the dive computer</source>
-        <translation>Données supplémentaires de l&apos;ordinateur de plongée</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="92"/>
-        <location filename="../desktop-widgets/maintab.ui" line="646"/>
-        <location filename="../build/ui_maintab.h" line="947"/>
-        <location filename="../build/ui_maintab.h" line="967"/>
-        <source>Date</source>
-        <translation>Date</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="102"/>
-        <location filename="../build/ui_maintab.h" line="948"/>
-        <source>Time</source>
-        <translation>Heure</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="665"/>
-        <location filename="../build/ui_maintab.h" line="969"/>
-        <source>Interval</source>
-        <translation>Intervalle</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="722"/>
-        <location filename="../desktop-widgets/maintab.ui" line="1094"/>
-        <location filename="../build/ui_maintab.h" line="975"/>
-        <location filename="../build/ui_maintab.h" line="1003"/>
-        <source>SAC</source>
-        <translation>Consommation d&apos;air (SAC)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="798"/>
-        <location filename="../build/ui_maintab.h" line="983"/>
-        <source>Avg. depth</source>
-        <translation>Prof. moyenne</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="760"/>
-        <location filename="../build/ui_maintab.h" line="979"/>
-        <source>OTU</source>
-        <translation>OTU</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/maintab.ui" line="893"/>
         <location filename="../build/ui_maintab.h" line="993"/>
         <source>Salinity</source>
@@ -4321,22 +4371,34 @@ cette opération. Voulez-vous vraiment continuer ?</translation>
         <translation>Stats</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="933"/>
+        <location filename="../build/ui_maintab.h" line="1007"/>
+        <source>Simple statistics about the selection</source>
+        <translation>Statistiques simples sur la sélection</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="986"/>
         <location filename="../build/ui_maintab.h" line="996"/>
         <source>Depth</source>
         <translation>Profondeur</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="998"/>
+        <location filename="../build/ui_maintab.h" line="997"/>
+        <source>Duration</source>
+        <translation>Durée</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="1027"/>
         <location filename="../build/ui_maintab.h" line="998"/>
         <source>Temperature</source>
         <translation>Température</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.ui" line="998"/>
-        <location filename="../build/ui_maintab.h" line="997"/>
-        <source>Duration</source>
-        <translation>Durée</translation>
+        <location filename="../desktop-widgets/maintab.ui" line="1039"/>
+        <location filename="../build/ui_maintab.h" line="999"/>
+        <source>Total time</source>
+        <translation>Durée totale</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/maintab.ui" line="1058"/>
@@ -4345,20 +4407,34 @@ cette opération. Voulez-vous vraiment continuer ?</translation>
         <translation>Plongées</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="1106"/>
+        <location filename="../build/ui_maintab.h" line="1004"/>
+        <source>Gas consumption</source>
+        <translation>Consommation de gaz</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="1148"/>
         <location filename="../build/ui_maintab.h" line="1008"/>
         <source>Photos</source>
         <translation>Photos</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.cpp" line="88"/>
-        <source>Cylinders</source>
-        <translation>Blocs</translation>
+        <location filename="../desktop-widgets/maintab.ui" line="1151"/>
+        <location filename="../build/ui_maintab.h" line="1009"/>
+        <source>All photos from the current selection</source>
+        <translation>Toutes les photos de la sélection actuelle </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.cpp" line="92"/>
-        <source>Weights</source>
-        <translation>Poids</translation>
+        <location filename="../desktop-widgets/maintab.ui" line="1177"/>
+        <location filename="../build/ui_maintab.h" line="1010"/>
+        <source>Extra data</source>
+        <translation>Données supplémentaires</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="1180"/>
+        <location filename="../build/ui_maintab.h" line="1011"/>
+        <source>Adittional data from the dive computer</source>
+        <translation>Données supplémentaires de l&apos;ordinateur de plongée</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/maintab.cpp" line="63"/>
@@ -4371,11 +4447,21 @@ cette opération. Voulez-vous vraiment continuer ?</translation>
         <translation>Annuler les modifications</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.cpp" line="88"/>
+        <source>Cylinders</source>
+        <translation>Blocs</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.cpp" line="89"/>
         <source>Add cylinder</source>
         <translation>Ajouter un bloc</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.cpp" line="92"/>
+        <source>Weights</source>
+        <translation>Poids</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.cpp" line="93"/>
         <source>Add weight system</source>
         <translation>Ajouter un système de poids</translation>
@@ -4568,659 +4654,685 @@ mélangés à partir de l&apos;air et en utilisant :
         <translation>&amp;Fichier</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="455"/>
-        <location filename="../build/ui_mainwindow.h" line="534"/>
-        <source>Export dive logs</source>
-        <translation>Exporter les plongées</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="510"/>
-        <location filename="../build/ui_mainwindow.h" line="542"/>
-        <source>Toggle pHe graph</source>
-        <translation>Commuter le graphique de la pHe</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="546"/>
-        <location filename="../build/ui_mainwindow.h" line="545"/>
-        <source>Toggle calculating all tissues</source>
-        <translation>Commuter le calcul de tous les tissus</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="522"/>
-        <location filename="../build/ui_mainwindow.h" line="543"/>
-        <source>Toggle DC reported ceiling</source>
-        <translation>Commuter le plafond rapporté par l&apos;ordinateur de plongée</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="534"/>
-        <location filename="../build/ui_mainwindow.h" line="544"/>
-        <source>Toggle calculated ceiling</source>
-        <translation>Commuter le plafond calculé</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="606"/>
-        <location filename="../build/ui_mainwindow.h" line="550"/>
-        <source>Toggle NDL, TTS</source>
-        <translation>Commuter LND, DTR</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="558"/>
-        <location filename="../build/ui_mainwindow.h" line="546"/>
-        <source>Toggle calculated ceiling with 3m increments</source>
-        <translation>Commuter le plafond calculé avec des incréments de 3m</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="463"/>
-        <location filename="../build/ui_mainwindow.h" line="537"/>
-        <source>Configure &amp;dive computer</source>
-        <translation>Configurer l&apos;&amp;ordinateur de plongée</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="570"/>
-        <location filename="../build/ui_mainwindow.h" line="547"/>
-        <source>Toggle heart rate</source>
-        <translation>Commuter le rythme cardiaque</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="582"/>
-        <location filename="../build/ui_mainwindow.h" line="548"/>
-        <source>Toggle MOD</source>
-        <translation>Commuter la MOD</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="594"/>
-        <location filename="../build/ui_mainwindow.h" line="549"/>
-        <source>Toggle EAD, END, EADD</source>
-        <translation>Commuter PEA, PEEA, PEDA</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="618"/>
-        <location filename="../build/ui_mainwindow.h" line="551"/>
-        <source>Toggle SAC rate</source>
-        <translation>Commuter la consommation d&apos;air (SAC)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="630"/>
-        <location filename="../build/ui_mainwindow.h" line="552"/>
-        <source>Toggle ruler</source>
-        <translation>Commuter la règle</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="86"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="87"/>
         <location filename="../build/ui_mainwindow.h" line="569"/>
         <source>&amp;Log</source>
         <translation>&amp;Journal</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="105"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="104"/>
         <location filename="../build/ui_mainwindow.h" line="570"/>
         <source>&amp;View</source>
         <translation>&amp;Vue</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="121"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="120"/>
         <location filename="../build/ui_mainwindow.h" line="571"/>
         <source>&amp;Help</source>
         <translation>&amp;Aide</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="130"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="129"/>
         <location filename="../build/ui_mainwindow.h" line="572"/>
         <source>&amp;Import</source>
         <translation>&amp;Importer</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="139"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="138"/>
         <location filename="../build/ui_mainwindow.h" line="573"/>
         <source>&amp;Edit</source>
         <translation>&amp;Édition</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="144"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="143"/>
         <source>Share on</source>
         <translation>Partager sur</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="158"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="157"/>
         <location filename="../build/ui_mainwindow.h" line="453"/>
         <source>&amp;New logbook</source>
         <translation>&amp;Nouveau carnet de plongée</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="161"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="160"/>
         <location filename="../build/ui_mainwindow.h" line="455"/>
         <source>New</source>
         <translation>Nouveau</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="164"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="163"/>
         <location filename="../build/ui_mainwindow.h" line="457"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="169"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="168"/>
         <location filename="../build/ui_mainwindow.h" line="458"/>
         <source>&amp;Open logbook</source>
         <translation>&amp;Ouvrir un carnet de plongée</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="172"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="171"/>
         <location filename="../build/ui_mainwindow.h" line="460"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="508"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="502"/>
         <source>Open</source>
         <translation>Ouvrir</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="175"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="174"/>
         <location filename="../build/ui_mainwindow.h" line="462"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="180"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="179"/>
         <location filename="../build/ui_mainwindow.h" line="463"/>
         <source>&amp;Save</source>
         <translation>&amp;Sauvegarder</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="183"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="182"/>
         <location filename="../build/ui_mainwindow.h" line="465"/>
         <source>Save</source>
         <translation>Sauvegarder</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="186"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="185"/>
         <location filename="../build/ui_mainwindow.h" line="467"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="191"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="190"/>
         <location filename="../build/ui_mainwindow.h" line="468"/>
         <source>Sa&amp;ve as</source>
         <translation>Enre&amp;gistrer sous</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="194"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="193"/>
         <location filename="../build/ui_mainwindow.h" line="470"/>
         <source>Save as</source>
         <translation>Enregistrer sous</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="197"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="196"/>
         <location filename="../build/ui_mainwindow.h" line="472"/>
         <source>Ctrl+Shift+S</source>
         <translation>Ctrl+Maj+S</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="202"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="201"/>
         <location filename="../build/ui_mainwindow.h" line="473"/>
         <source>&amp;Close</source>
         <translation>&amp;Fermer</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="205"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="204"/>
         <location filename="../build/ui_mainwindow.h" line="475"/>
         <source>Close</source>
         <translation>Fermer</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="208"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="207"/>
         <location filename="../build/ui_mainwindow.h" line="477"/>
         <source>Ctrl+W</source>
         <translation>Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="221"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="212"/>
+        <location filename="../build/ui_mainwindow.h" line="478"/>
+        <source>&amp;Print</source>
+        <translation>&amp;Imprimer</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="215"/>
+        <location filename="../build/ui_mainwindow.h" line="479"/>
+        <source>Ctrl+P</source>
+        <translation>Ctrl+P</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="220"/>
         <location filename="../build/ui_mainwindow.h" line="480"/>
         <source>P&amp;references</source>
         <translation>P&amp;références</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="251"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="223"/>
+        <location filename="../build/ui_mainwindow.h" line="481"/>
+        <source>Ctrl+,</source>
+        <translation>Ctrl+,</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="231"/>
+        <location filename="../build/ui_mainwindow.h" line="482"/>
+        <source>&amp;Quit</source>
+        <translation>&amp;Quitter</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="234"/>
+        <location filename="../build/ui_mainwindow.h" line="483"/>
+        <source>Ctrl+Q</source>
+        <translation>Ctrl+Q</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="242"/>
+        <location filename="../build/ui_mainwindow.h" line="484"/>
+        <source>Import from &amp;dive computer</source>
+        <translation>Importer depuis l&apos;&amp;ordinateur de plongée</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="245"/>
+        <location filename="../build/ui_mainwindow.h" line="485"/>
+        <source>Ctrl+D</source>
+        <translation>Ctrl+D</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="250"/>
         <location filename="../build/ui_mainwindow.h" line="486"/>
         <source>Import &amp;GPS data from Subsurface web service</source>
         <translation>Importer les données &amp;GPS depuis le service web Subsurface</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="259"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="253"/>
+        <location filename="../build/ui_mainwindow.h" line="487"/>
+        <source>Ctrl+G</source>
+        <translation>Ctrl+G</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="258"/>
         <location filename="../build/ui_mainwindow.h" line="488"/>
         <source>Edit device &amp;names</source>
         <translation>Éditer les &amp;noms des ordinateurs de plongée</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="272"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="263"/>
+        <location filename="../build/ui_mainwindow.h" line="489"/>
+        <source>&amp;Add dive</source>
+        <translation>&amp;Ajouter une plongée</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="266"/>
+        <location filename="../build/ui_mainwindow.h" line="490"/>
+        <source>Ctrl++</source>
+        <translation>Ctrl++</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="271"/>
         <location filename="../build/ui_mainwindow.h" line="491"/>
         <source>&amp;Edit dive</source>
         <translation>&amp;Éditer la plongée</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="277"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="276"/>
         <location filename="../build/ui_mainwindow.h" line="492"/>
         <source>&amp;Copy dive components</source>
         <translation>&amp;Copier les composants de la plongée</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="280"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="279"/>
         <location filename="../build/ui_mainwindow.h" line="493"/>
         <source>Ctrl+C</source>
         <translation>Ctrl+C</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="285"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="284"/>
         <location filename="../build/ui_mainwindow.h" line="494"/>
         <source>&amp;Paste dive components</source>
         <translation>C&amp;oller les composants de la plongée</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="288"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="287"/>
         <location filename="../build/ui_mainwindow.h" line="495"/>
         <source>Ctrl+V</source>
         <translation>Ctrl+V</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="325"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="292"/>
+        <location filename="../build/ui_mainwindow.h" line="496"/>
+        <source>&amp;Renumber</source>
+        <translation>&amp;Renuméroter</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="295"/>
+        <location filename="../build/ui_mainwindow.h" line="497"/>
+        <source>Ctrl+R</source>
+        <translation>Ctrl+R</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="303"/>
+        <location filename="../build/ui_mainwindow.h" line="498"/>
+        <source>Auto &amp;group</source>
+        <translation>&amp;Grouper automatiquement</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="308"/>
+        <location filename="../build/ui_mainwindow.h" line="499"/>
+        <source>&amp;Yearly statistics</source>
+        <translation>&amp;Statistiques annuelles</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="311"/>
+        <location filename="../build/ui_mainwindow.h" line="500"/>
+        <source>Ctrl+Y</source>
+        <translation>Ctrl+Y</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="316"/>
+        <location filename="../build/ui_mainwindow.h" line="501"/>
+        <source>&amp;Dive list</source>
+        <translation>&amp;Liste des plongées</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="319"/>
+        <location filename="../build/ui_mainwindow.h" line="502"/>
+        <source>Ctrl+2</source>
+        <translation>Ctrl+2</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="324"/>
         <location filename="../build/ui_mainwindow.h" line="503"/>
         <source>&amp;Profile</source>
         <translation>&amp;Profil</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="333"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="327"/>
+        <location filename="../build/ui_mainwindow.h" line="504"/>
+        <source>Ctrl+3</source>
+        <translation>Ctrl+3</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="332"/>
         <location filename="../build/ui_mainwindow.h" line="505"/>
         <source>&amp;Info</source>
         <translation>&amp;Info</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="341"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="335"/>
+        <location filename="../build/ui_mainwindow.h" line="506"/>
+        <source>Ctrl+4</source>
+        <translation>Ctrl+4</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="340"/>
         <location filename="../build/ui_mainwindow.h" line="507"/>
         <source>&amp;All</source>
         <translation>&amp;Tout</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="357"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="343"/>
+        <location filename="../build/ui_mainwindow.h" line="508"/>
+        <source>Ctrl+1</source>
+        <translation>Ctrl+1</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="348"/>
+        <location filename="../build/ui_mainwindow.h" line="509"/>
+        <source>P&amp;revious DC</source>
+        <translation>Ordinateur P&amp;récédent</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="351"/>
+        <location filename="../build/ui_mainwindow.h" line="510"/>
+        <source>Left</source>
+        <translation>Gauche</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="356"/>
         <location filename="../build/ui_mainwindow.h" line="511"/>
         <source>&amp;Next DC</source>
         <translation>Ordi&amp;nateur suivant</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="365"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="359"/>
+        <location filename="../build/ui_mainwindow.h" line="512"/>
+        <source>Right</source>
+        <translation>Droite</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="364"/>
         <location filename="../build/ui_mainwindow.h" line="513"/>
         <source>&amp;About Subsurface</source>
         <translation>&amp;A propos de Subsurface</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="381"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="372"/>
+        <location filename="../build/ui_mainwindow.h" line="514"/>
+        <source>User &amp;manual</source>
+        <translation>&amp;Manuel utilisateur</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="375"/>
+        <location filename="../build/ui_mainwindow.h" line="515"/>
+        <source>F1</source>
+        <translation>F1</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="380"/>
         <location filename="../build/ui_mainwindow.h" line="516"/>
         <source>&amp;Globe</source>
         <translation>&amp;Globe</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="403"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="383"/>
+        <location filename="../build/ui_mainwindow.h" line="517"/>
+        <source>Ctrl+5</source>
+        <translation>Ctrl+5</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="388"/>
+        <location filename="../build/ui_mainwindow.h" line="518"/>
+        <source>P&amp;lan dive</source>
+        <translation>P&amp;lanifier une plongée</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="391"/>
+        <location filename="../build/ui_mainwindow.h" line="519"/>
+        <source>Ctrl+L</source>
+        <translation>Ctrl+L</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="396"/>
+        <location filename="../build/ui_mainwindow.h" line="520"/>
+        <source>&amp;Import log files</source>
+        <translation>&amp;Importer des fichiers de log</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="399"/>
+        <location filename="../build/ui_mainwindow.h" line="522"/>
+        <source>Import divelog files from other applications</source>
+        <translation>Importer les fichiers de plongées depuis d&apos;autres applications</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="402"/>
         <location filename="../build/ui_mainwindow.h" line="524"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="408"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="407"/>
         <location filename="../build/ui_mainwindow.h" line="525"/>
         <source>Import &amp;from divelogs.de</source>
         <translation>Importer &amp;depuis divelogs.de</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="416"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="415"/>
         <location filename="../build/ui_mainwindow.h" line="526"/>
         <source>&amp;Full screen</source>
         <translation>&amp;Plein écran</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="419"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="418"/>
         <location filename="../build/ui_mainwindow.h" line="528"/>
         <source>Toggle full screen</source>
         <translation>Commuter en mode plein écran</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="447"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="421"/>
+        <location filename="../build/ui_mainwindow.h" line="530"/>
+        <source>F11</source>
+        <translation>F11</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="446"/>
         <location filename="../build/ui_mainwindow.h" line="531"/>
         <source>&amp;Check for updates</source>
         <translation>&amp;Vérifier les mises à jour</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="452"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="451"/>
         <location filename="../build/ui_mainwindow.h" line="532"/>
         <source>&amp;Export</source>
         <translation>&amp;Exporter</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="458"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="454"/>
+        <location filename="../build/ui_mainwindow.h" line="534"/>
+        <source>Export dive logs</source>
+        <translation>Exporter les plongées</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="457"/>
         <location filename="../build/ui_mainwindow.h" line="536"/>
         <source>Ctrl+E</source>
         <translation>Ctrl+E</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="466"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="462"/>
+        <location filename="../build/ui_mainwindow.h" line="537"/>
+        <source>Configure &amp;dive computer</source>
+        <translation>Configurer l&apos;&amp;ordinateur de plongée</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="465"/>
         <location filename="../build/ui_mainwindow.h" line="538"/>
         <source>Ctrl+Shift+C</source>
         <translation>Ctrl+Shift+C</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="474"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="473"/>
         <location filename="../build/ui_mainwindow.h" line="539"/>
         <source>Edit &amp;dive in planner</source>
         <translation>Éditer la plongée &amp;dans le planificateur</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="486"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="485"/>
         <location filename="../build/ui_mainwindow.h" line="540"/>
         <source>Toggle pO₂ graph</source>
         <translation>Commuter le graphique de la pO₂</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="498"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="497"/>
         <location filename="../build/ui_mainwindow.h" line="541"/>
         <source>Toggle pN₂ graph</source>
         <translation>Commuter le graphique de la pN₂</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="642"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="509"/>
+        <location filename="../build/ui_mainwindow.h" line="542"/>
+        <source>Toggle pHe graph</source>
+        <translation>Commuter le graphique de la pHe</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="521"/>
+        <location filename="../build/ui_mainwindow.h" line="543"/>
+        <source>Toggle DC reported ceiling</source>
+        <translation>Commuter le plafond rapporté par l&apos;ordinateur de plongée</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="533"/>
+        <location filename="../build/ui_mainwindow.h" line="544"/>
+        <source>Toggle calculated ceiling</source>
+        <translation>Commuter le plafond calculé</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="545"/>
+        <location filename="../build/ui_mainwindow.h" line="545"/>
+        <source>Toggle calculating all tissues</source>
+        <translation>Commuter le calcul de tous les tissus</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="557"/>
+        <location filename="../build/ui_mainwindow.h" line="546"/>
+        <source>Toggle calculated ceiling with 3m increments</source>
+        <translation>Commuter le plafond calculé avec des incréments de 3m</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="569"/>
+        <location filename="../build/ui_mainwindow.h" line="547"/>
+        <source>Toggle heart rate</source>
+        <translation>Commuter le rythme cardiaque</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="581"/>
+        <location filename="../build/ui_mainwindow.h" line="548"/>
+        <source>Toggle MOD</source>
+        <translation>Commuter la MOD</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="593"/>
+        <location filename="../build/ui_mainwindow.h" line="549"/>
+        <source>Toggle EAD, END, EADD</source>
+        <translation>Commuter PEA, PEEA, PEDA</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="605"/>
+        <location filename="../build/ui_mainwindow.h" line="550"/>
+        <source>Toggle NDL, TTS</source>
+        <translation>Commuter LND, DTR</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="617"/>
+        <location filename="../build/ui_mainwindow.h" line="551"/>
+        <source>Toggle SAC rate</source>
+        <translation>Commuter la consommation d&apos;air (SAC)</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="629"/>
+        <location filename="../build/ui_mainwindow.h" line="552"/>
+        <source>Toggle ruler</source>
+        <translation>Commuter la règle</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="641"/>
         <location filename="../build/ui_mainwindow.h" line="553"/>
         <source>Scale graph</source>
         <translation>Ajuster l&apos;échelle du graphique </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="654"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="653"/>
         <location filename="../build/ui_mainwindow.h" line="554"/>
         <source>Toggle pictures</source>
         <translation>Commuter l&apos;affichage des images</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="666"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="665"/>
         <location filename="../build/ui_mainwindow.h" line="555"/>
         <source>Toggle tank bar</source>
         <translation>Commuter l&apos;affichage des blocs</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="674"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="673"/>
         <location filename="../build/ui_mainwindow.h" line="556"/>
         <source>&amp;Filter divelist</source>
         <translation>&amp;Filtrer la liste des plongées</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="689"/>
-        <location filename="../build/ui_mainwindow.h" line="558"/>
-        <source>Toggle tissue graph</source>
-        <translation>Commuter le graphique des tissus</translation>
+        <location filename="../desktop-widgets/mainwindow.ui" line="676"/>
+        <location filename="../build/ui_mainwindow.h" line="557"/>
+        <source>Ctrl+F</source>
+        <translation>Ctrl+F</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="694"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="688"/>
+        <source>Toggle tissue heat-map</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="693"/>
         <location filename="../build/ui_mainwindow.h" line="559"/>
         <source>User &amp;survey</source>
         <translation>&amp;Sondage utilisateur</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="699"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="698"/>
         <location filename="../build/ui_mainwindow.h" line="560"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="238"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="231"/>
         <source>&amp;Undo</source>
         <translation>&amp;Annuler</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="702"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="701"/>
         <location filename="../build/ui_mainwindow.h" line="561"/>
         <source>Ctrl+Z</source>
         <translation>Ctrl+Z</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="707"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="706"/>
         <location filename="../build/ui_mainwindow.h" line="562"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="239"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="232"/>
         <source>&amp;Redo</source>
         <translation>&amp;Refaire</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="710"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="709"/>
         <location filename="../build/ui_mainwindow.h" line="563"/>
         <source>Ctrl+Shift+Z</source>
         <translation>Ctrl+Shift+Z</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="715"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="714"/>
         <location filename="../build/ui_mainwindow.h" line="564"/>
         <source>&amp;Find moved images</source>
         <translation>&amp;Trouver des images déplacées</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="720"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="719"/>
         <source>Open c&amp;loud storage</source>
         <translation>Ouvrir le stockage dans le c&amp;loud</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="725"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="724"/>
         <source>Save to clo&amp;ud storage</source>
         <translation>Enregistrer vers le clo&amp;ud</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="730"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="729"/>
         <location filename="../build/ui_mainwindow.h" line="567"/>
         <source>&amp;Manage dive sites</source>
         <translation>&amp;Gérer les sites de plongée</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="735"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="734"/>
         <source>Dive Site &amp;Edit</source>
         <translation>&amp;Modification des sites de plongée</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="740"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="739"/>
         <source>Facebook</source>
         <translation>Facebook</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="745"/>
-        <source>Add GPS location here</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="744"/>
+        <source>Take cloud storage online</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="677"/>
-        <location filename="../build/ui_mainwindow.h" line="557"/>
-        <source>Ctrl+F</source>
-        <translation>Ctrl+F</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="213"/>
-        <location filename="../build/ui_mainwindow.h" line="478"/>
-        <source>&amp;Print</source>
-        <translation>&amp;Imprimer</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="224"/>
-        <location filename="../build/ui_mainwindow.h" line="481"/>
-        <source>Ctrl+,</source>
-        <translation>Ctrl+,</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="232"/>
-        <location filename="../build/ui_mainwindow.h" line="482"/>
-        <source>&amp;Quit</source>
-        <translation>&amp;Quitter</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="243"/>
-        <location filename="../build/ui_mainwindow.h" line="484"/>
-        <source>Import from &amp;dive computer</source>
-        <translation>Importer depuis l&apos;&amp;ordinateur de plongée</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="254"/>
-        <location filename="../build/ui_mainwindow.h" line="487"/>
-        <source>Ctrl+G</source>
-        <translation>Ctrl+G</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="267"/>
-        <location filename="../build/ui_mainwindow.h" line="490"/>
-        <source>Ctrl++</source>
-        <translation>Ctrl++</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="293"/>
-        <location filename="../build/ui_mainwindow.h" line="496"/>
-        <source>&amp;Renumber</source>
-        <translation>&amp;Renuméroter</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="296"/>
-        <location filename="../build/ui_mainwindow.h" line="497"/>
-        <source>Ctrl+R</source>
-        <translation>Ctrl+R</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="312"/>
-        <location filename="../build/ui_mainwindow.h" line="500"/>
-        <source>Ctrl+Y</source>
-        <translation>Ctrl+Y</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="392"/>
-        <location filename="../build/ui_mainwindow.h" line="519"/>
-        <source>Ctrl+L</source>
-        <translation>Ctrl+L</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="216"/>
-        <location filename="../build/ui_mainwindow.h" line="479"/>
-        <source>Ctrl+P</source>
-        <translation>Ctrl+P</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="235"/>
-        <location filename="../build/ui_mainwindow.h" line="483"/>
-        <source>Ctrl+Q</source>
-        <translation>Ctrl+Q</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="246"/>
-        <location filename="../build/ui_mainwindow.h" line="485"/>
-        <source>Ctrl+D</source>
-        <translation>Ctrl+D</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="264"/>
-        <location filename="../build/ui_mainwindow.h" line="489"/>
-        <source>&amp;Add dive</source>
-        <translation>&amp;Ajouter une plongée</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="304"/>
-        <location filename="../build/ui_mainwindow.h" line="498"/>
-        <source>Auto &amp;group</source>
-        <translation>&amp;Grouper automatiquement</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="309"/>
-        <location filename="../build/ui_mainwindow.h" line="499"/>
-        <source>&amp;Yearly statistics</source>
-        <translation>&amp;Statistiques annuelles</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="317"/>
-        <location filename="../build/ui_mainwindow.h" line="501"/>
-        <source>&amp;Dive list</source>
-        <translation>&amp;Liste des plongées</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="320"/>
-        <location filename="../build/ui_mainwindow.h" line="502"/>
-        <source>Ctrl+2</source>
-        <translation>Ctrl+2</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="328"/>
-        <location filename="../build/ui_mainwindow.h" line="504"/>
-        <source>Ctrl+3</source>
-        <translation>Ctrl+3</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="336"/>
-        <location filename="../build/ui_mainwindow.h" line="506"/>
-        <source>Ctrl+4</source>
-        <translation>Ctrl+4</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="344"/>
-        <location filename="../build/ui_mainwindow.h" line="508"/>
-        <source>Ctrl+1</source>
-        <translation>Ctrl+1</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="349"/>
-        <location filename="../build/ui_mainwindow.h" line="509"/>
-        <source>P&amp;revious DC</source>
-        <translation>Ordinateur P&amp;récédent</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="352"/>
-        <location filename="../build/ui_mainwindow.h" line="510"/>
-        <source>Left</source>
-        <translation>Gauche</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="360"/>
-        <location filename="../build/ui_mainwindow.h" line="512"/>
-        <source>Right</source>
-        <translation>Droite</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="373"/>
-        <location filename="../build/ui_mainwindow.h" line="514"/>
-        <source>User &amp;manual</source>
-        <translation>&amp;Manuel utilisateur</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="376"/>
-        <location filename="../build/ui_mainwindow.h" line="515"/>
-        <source>F1</source>
-        <translation>F1</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="384"/>
-        <location filename="../build/ui_mainwindow.h" line="517"/>
-        <source>Ctrl+5</source>
-        <translation>Ctrl+5</translation>
+        <location filename="../build/ui_mainwindow.h" line="558"/>
+        <source>Toggle tissue graph</source>
+        <translation>Commuter le graphique des tissus</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="389"/>
-        <location filename="../build/ui_mainwindow.h" line="518"/>
-        <source>P&amp;lan dive</source>
-        <translation>P&amp;lanifier une plongée</translation>
+        <location filename="../build/ui_mainwindow.h" line="565"/>
+        <source>Open cloud storage</source>
+        <translation>Ouvrir le stockage dans le cloud</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="397"/>
-        <location filename="../build/ui_mainwindow.h" line="520"/>
-        <source>&amp;Import log files</source>
-        <translation>&amp;Importer des fichiers de log</translation>
+        <location filename="../build/ui_mainwindow.h" line="566"/>
+        <source>Save to cloud storage</source>
+        <translation>Enregistrer vers le cloud</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="400"/>
-        <location filename="../build/ui_mainwindow.h" line="522"/>
-        <source>Import divelog files from other applications</source>
-        <translation>Importer les fichiers de plongées depuis d&apos;autres applications</translation>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="331"/>
+        <source>Connect to</source>
+        <translation>Connecté à</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="422"/>
-        <location filename="../build/ui_mainwindow.h" line="530"/>
-        <source>F11</source>
-        <translation>F11</translation>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="493"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="538"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1545"/>
+        <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="../desktop-widgets/mainwindow.cpp" line="505"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="499"/>
         <source>Open file</source>
         <translation>Ouvrir un fichier</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="509"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="503"/>
         <location filename="../desktop-widgets/mainwindow.cpp" line="614"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1972"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1978"/>
         <source>Cancel</source>
         <translation>Annuler</translation>
     </message>
@@ -5240,6 +5352,16 @@ mélangés à partir de l&apos;air et en utilisant :
         <translation>Analyse des images ... (Ceci peut prendre un certain temps)</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="649"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="796"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="977"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="983"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1849"/>
+        <source>Warning</source>
+        <translation>Avertissement</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="674"/>
         <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>
@@ -5255,125 +5377,98 @@ mélangés à partir de l&apos;air et en utilisant :
         <translation>Imprimer le tableau de runtime</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="982"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
+        <source>Trying to replan a dive that&apos;s not a planned dive.</source>
+        <translation>Tentative de replanification d&apos;une plongée qui n&apos;est pas une plongée planifiée.</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="977"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1849"/>
+        <source>Please, first finish the current edition before trying to do another.</source>
+        <translation>Merci de finir l&apos;édition en cours avant d&apos;en commencer une autre.</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="983"/>
         <source>Trying to edit a dive that&apos;s not a manually added dive.</source>
         <translation>Tentative de modification d&apos;une plongée qui n&apos;a pas été ajoutée manuellement.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1243"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1030"/>
+        <source>Yearly statistics</source>
+        <translation>Statistiques annuelles</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1244"/>
         <source>Do you want to save the changes that you made in the file %1?</source>
         <translation>Voulez-vous enregistrer les modifications du fichier %1 ?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1246"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1247"/>
         <source>Do you want to save the changes that you made in the data file?</source>
         <translation>Voulez-vous enregistrer les modifications du fichier de données ?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1251"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1252"/>
         <source>Save changes?</source>
         <translation>Enregistrer les modifications ?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1587"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1253"/>
+        <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="../desktop-widgets/mainwindow.cpp" line="1572"/>
         <source>Save file as</source>
         <translation>Enregistrer le fichier sous</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1682"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1573"/>
+        <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
+        <translation>Fichiers XML Subsurface (*.ssrf *.xml *.XML)</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1670"/>
+        <source>[local cache for] %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1672"/>
         <source>[cloud storage for] %1</source>
         <translation>[stockage dans le cloud pour] %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1782"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1788"/>
         <source>Opening datafile from older version</source>
         <translation>Ouverture d&apos;un fichier de données d&apos;une version plus ancienne</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1783"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1789"/>
         <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly.
 Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source>
         <translation>Vous avez ouvert un fichier de données d&apos;une version plus ancienne de Subsurface. Nous vous recommandons de lire le manuel à propos des modifications apportées par la nouvelle version, particulièrement à propos de la gestion des sites de plongées qui a été grandement modifiée.
 Subsurface a déjà essayé de pré-remplir les données mais il est préférable que vous regardiez le nouveau système de gestion des sites de plongées pour vous assurer que tout est correct.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1794"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1800"/>
         <source>Open dive log file</source>
         <translation>Ouvrir le fichier de carnet de plongée</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1795"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1801"/>
         <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1972"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1978"/>
         <source>Contacting cloud service...</source>
         <translation>Contact du service cloud...</translation>
     </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1252"/>
-        <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="../desktop-widgets/mainwindow.cpp" line="649"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="796"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="976"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="982"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/>
-        <source>Warning</source>
-        <translation>Avertissement</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="499"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="544"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1560"/>
-        <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="../desktop-widgets/mainwindow.cpp" line="338"/>
-        <source>Connect to</source>
-        <translation>Connecté à</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
-        <source>Trying to replan a dive that&apos;s not a planned dive.</source>
-        <translation>Tentative de replanification d&apos;une plongée qui n&apos;est pas une plongée planifiée.</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1029"/>
-        <source>Yearly statistics</source>
-        <translation>Statistiques annuelles</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1588"/>
-        <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
-        <translation>Fichiers XML Subsurface (*.ssrf *.xml *.XML)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="976"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/>
-        <source>Please, first finish the current edition before trying to do another.</source>
-        <translation>Merci de finir l&apos;édition en cours avant d&apos;en commencer une autre.</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_mainwindow.h" line="565"/>
-        <source>Open cloud storage</source>
-        <translation>Ouvrir le stockage dans le cloud</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_mainwindow.h" line="566"/>
-        <source>Save to cloud storage</source>
-        <translation>Enregistrer vers le cloud</translation>
-    </message>
 </context>
 <context>
     <name>MultiFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="733"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="731"/>
         <source>Filter shows %1 (of %2) dives</source>
         <translation>Le Filtre affiche %1 (de %2) plongées</translation>
     </message>
@@ -5381,12 +5476,12 @@ Subsurface a déjà essayé de pré-remplir les données mais il est préférabl
 <context>
     <name>OstcFirmwareCheck</name>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="269"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="271"/>
         <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source>
         <translation>Vous devriez mettre à jour le firmware de votre ordinateur de plongée : vous utilisez actuellement la version %1 et la dernière version stable est la %2</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="273"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="275"/>
         <source>
 
 Please start Bluetooth on your OSTC Sport and do the same preparations as for a logbook download before continuing with the update</source>
@@ -5395,27 +5490,27 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 Veuillez démarrer le Bluetooth sur votre OSTC Sport et effectuez la même préparation que pour un téléchargement d&apos;historique avant de continuer avec la mise à jour</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="274"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="276"/>
         <source>Not now</source>
         <translation>Pas maintenant</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="275"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="277"/>
         <source>Update firmware</source>
         <translation>Mettre à jour le firmware</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="277"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="279"/>
         <source>Firmware upgrade notice</source>
         <translation>Information de mise à jour de firmware</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="295"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="297"/>
         <source>Save the downloaded firmware as</source>
         <translation>Enregistrer le firmware téléchargé sous</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="296"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="298"/>
         <source>HEX files (*.hex)</source>
         <translation>Fichiers HEX (*.hex)</translation>
     </message>
@@ -5423,79 +5518,89 @@ Veuillez démarrer le Bluetooth sur votre OSTC Sport et effectuez la même prép
 <context>
     <name>PlannerSettingsWidget</name>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="322"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="302"/>
         <source>Open circuit</source>
         <translation>Circuit ouvert</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="322"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="302"/>
         <source>CCR</source>
         <translation>CCR (Recycleur)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="322"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="302"/>
         <source>pSCR</source>
         <translation>pSCR</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="421"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="388"/>
         <source>ft/min</source>
         <translation>pieds/min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="422"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="389"/>
         <source>Last stop at 20ft</source>
         <translation>Dernier palier à 20 pieds</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="423"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="390"/>
         <source>50% avg. depth to 20ft</source>
         <translation>50% de la prof. moyenne à 20 pieds</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="424"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="391"/>
         <source>20ft to surface</source>
         <translation>20 pieds à la surface</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="426"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="392"/>
+        <source>ft</source>
+        <translation>pieds</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="394"/>
         <source>m/min</source>
         <translation>m/min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="427"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="395"/>
         <source>Last stop at 6m</source>
         <translation>Dernier palier à 6m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="428"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="396"/>
         <source>50% avg. depth to 6m</source>
         <translation>50% de la profondeur moyenne à 6m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="429"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="397"/>
         <source>6m to surface</source>
         <translation>6m à la surface</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="432"/>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="433"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="398"/>
+        <source>m</source>
+        <translation>m</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="401"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="402"/>
         <source>cuft/min</source>
         <translation>pieds³/min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="441"/>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="442"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="410"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="411"/>
         <source>ℓ/min</source>
         <translation>ℓ/min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="451"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="420"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="456"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="425"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
@@ -5645,6 +5750,11 @@ Veuillez démarrer le Bluetooth sur votre OSTC Sport et effectuez la même prép
 <context>
     <name>PreferencesDialog</name>
     <message>
+        <location filename="../build/ui_preferences.h" line="1283"/>
+        <source>Preferences</source>
+        <translation>Préférences</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1288"/>
         <source>Defaults</source>
         <translation>Valeurs par défaut</translation>
@@ -5680,6 +5790,11 @@ Veuillez démarrer le Bluetooth sur votre OSTC Sport et effectuez la même prép
         <translation>Géoréférencement</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1303"/>
+        <source>Lists and tables</source>
+        <translation>Listes et tableaux</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1304"/>
         <source>Font</source>
         <translation>Police</translation>
@@ -5695,6 +5810,11 @@ Veuillez démarrer le Bluetooth sur votre OSTC Sport et effectuez la même prép
         <translation>Plongées</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1307"/>
+        <source>Default dive log file</source>
+        <translation>Carnet de plongée par défaut</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1308"/>
         <source>No default file</source>
         <translation>Aucun fichier par défaut</translation>
@@ -5725,6 +5845,21 @@ Veuillez démarrer le Bluetooth sur votre OSTC Sport et effectuez la même prép
         <translation>...</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1314"/>
+        <source>Display invalid</source>
+        <translation>Afficher les plongées invalides</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1316"/>
+        <source>Default cylinder</source>
+        <translation>Bloc par défaut</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1317"/>
+        <source>Use default cylinder</source>
+        <translation>Utiliser le bloc par défaut</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1318"/>
         <source>Animations</source>
         <translation>Animations</translation>
@@ -5755,40 +5890,24 @@ Veuillez démarrer le Bluetooth sur votre OSTC Sport et effectuez la même prép
         <translation>Système</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1401"/>
-        <source>Dive site geo lookup</source>
-        <translation>Recherche géographique du site de plongée</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1402"/>
-        <source>Enable geocoding for dive site management</source>
-        <translation>Activer le géocodage pour la gestion des sites de plongées</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1403"/>
-        <source>Parse site without GPS data</source>
-        <translation>Analyser les sites sans données GPS</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1404"/>
-        <source>Same format for existing dives</source>
-        <translation>Même format pour les plongées existantes</translation>
+        <location filename="../build/ui_preferences.h" line="1324"/>
+        <source>&amp;Metric</source>
+        <translation>&amp;Métrique</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1405"/>
-        <source>Dive Site Layout</source>
-        <translation>Disposition des sites de plongées</translation>
+        <location filename="../build/ui_preferences.h" line="1325"/>
+        <source>Imperial</source>
+        <translation>Impérial</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1406"/>
-        <location filename="../build/ui_preferences.h" line="1407"/>
-        <source>/</source>
-        <translation>/</translation>
+        <location filename="../build/ui_preferences.h" line="1326"/>
+        <source>Personali&amp;ze</source>
+        <translation>Per&amp;sonnaliser</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1325"/>
-        <source>Imperial</source>
-        <translation>Impérial</translation>
+        <location filename="../build/ui_preferences.h" line="1327"/>
+        <source>Individual settings</source>
+        <translation>Paramètres individuels</translation>
     </message>
     <message>
         <location filename="../build/ui_preferences.h" line="1328"/>
@@ -5806,6 +5925,11 @@ Veuillez démarrer le Bluetooth sur votre OSTC Sport et effectuez la même prép
         <translation>pieds</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1331"/>
+        <source>Pressure</source>
+        <translation>Pression</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1332"/>
         <location filename="../build/ui_preferences.h" line="1366"/>
         <source>bar</source>
@@ -5817,11 +5941,26 @@ Veuillez démarrer le Bluetooth sur votre OSTC Sport et effectuez la même prép
         <translation>psi</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1334"/>
+        <source>Volume</source>
+        <translation>Volume</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1335"/>
+        <source>&amp;liter</source>
+        <translation>&amp;litre</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1336"/>
         <source>cu ft</source>
         <translation>pied³</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1337"/>
+        <source>Temperature</source>
+        <translation>Température</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1338"/>
         <source>celsius</source>
         <translation>celsius</translation>
@@ -5832,11 +5971,121 @@ Veuillez démarrer le Bluetooth sur votre OSTC Sport et effectuez la même prép
         <translation>fahrenheit</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1340"/>
+        <source>Weight</source>
+        <translation>Poids</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1341"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1342"/>
+        <source>lbs</source>
+        <translation>livre US</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1343"/>
+        <source>Time units</source>
+        <translation>Unités de temps</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1344"/>
+        <source>Ascent/descent speed denominator</source>
+        <translation>Dénominateur de vitesse de remontée/descente</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1345"/>
+        <source>Minutes</source>
+        <translation>Minutes</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1346"/>
+        <source>Seconds</source>
+        <translation>Secondes</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1347"/>
+        <source>GPS coordinates</source>
+        <translation>Coordonnées GPS</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1348"/>
+        <source>Location Display</source>
+        <translation>Affichage du lieu</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1349"/>
+        <source>traditional (dms)</source>
+        <translation>traditionnel (dms)</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1350"/>
+        <source>decimal</source>
+        <translation>décimal</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1351"/>
+        <source>Show</source>
+        <translation>Afficher</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1352"/>
+        <source>Threshold when showing pO₂</source>
+        <translation>Seuil d&apos;affichage pour la pO₂</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1353"/>
+        <source>Threshold when showing pN₂</source>
+        <translation>Seuil d&apos;affichage pour la pN₂</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1354"/>
+        <source>Threshold when showing pHe</source>
+        <translation>Seuil d&apos;affichage pour la pHe</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1355"/>
+        <source>Max pO₂ when showing MOD</source>
+        <translation>pO₂ max pour l&apos;affichage de la MOD</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1356"/>
+        <source>Draw dive computer reported ceiling red</source>
+        <translation>Afficher en rouge le plafond signalé par l&apos;ordinateur</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1357"/>
+        <source>Show unused cylinders in Equipment tab</source>
+        <translation>Afficher les blocs non utilisés dans l&apos;onglet des Équipements</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1358"/>
+        <source>Show average depth</source>
+        <translation>Afficher la profondeur moyenne</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1359"/>
+        <source>Misc</source>
+        <translation>Divers</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1360"/>
+        <source>GFLow</source>
+        <translation>GFLow</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1361"/>
+        <source>GFHigh</source>
+        <translation>GFHigh</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1362"/>
+        <source>GFLow at max depth</source>
+        <translation>GFLow à la profondeur max</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1363"/>
         <source>CCR: show setpoints when viewing pO₂</source>
         <translation>CCR : afficher les consignes lors de la visualisation de la pO₂</translation>
@@ -5882,14 +6131,19 @@ Veuillez démarrer le Bluetooth sur votre OSTC Sport et effectuez la même prép
         <translation>Paramètre système par défaut</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1374"/>
+        <source>Filter</source>
+        <translation>Filtre</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1375"/>
         <source>Proxy</source>
         <translation>Proxy</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1379"/>
-        <source>Proxy type</source>
-        <translation>Type de proxy</translation>
+        <location filename="../build/ui_preferences.h" line="1376"/>
+        <source>Port</source>
+        <translation>Port</translation>
     </message>
     <message>
         <location filename="../build/ui_preferences.h" line="1377"/>
@@ -5897,16 +6151,16 @@ Veuillez démarrer le Bluetooth sur votre OSTC Sport et effectuez la même prép
         <translation>Hôte</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1376"/>
-        <source>Port</source>
-        <translation>Port</translation>
-    </message>
-    <message>
         <location filename="../build/ui_preferences.h" line="1378"/>
         <source>Requires authentication</source>
         <translation>Requiert une authentification</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1379"/>
+        <source>Proxy type</source>
+        <translation>Type de proxy</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1380"/>
         <source>Username</source>
         <translation>Nom d&apos;utilisateur</translation>
@@ -5918,46 +6172,6 @@ Veuillez démarrer le Bluetooth sur votre OSTC Sport et effectuez la même prép
         <translation>Mot de passe</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1400"/>
-        <source>Disconnect from Facebook</source>
-        <translation>Se déconnecter de Facebook</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1374"/>
-        <source>Filter</source>
-        <translation>Filtre</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1331"/>
-        <source>Pressure</source>
-        <translation>Pression</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1303"/>
-        <source>Lists and tables</source>
-        <translation>Listes et tableaux</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1307"/>
-        <source>Default dive log file</source>
-        <translation>Carnet de plongée par défaut</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1314"/>
-        <source>Display invalid</source>
-        <translation>Afficher les plongées invalides</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1316"/>
-        <source>Default cylinder</source>
-        <translation>Bloc par défaut</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1317"/>
-        <source>Use default cylinder</source>
-        <translation>Utiliser le bloc par défaut</translation>
-    </message>
-    <message>
         <location filename="../build/ui_preferences.h" line="1382"/>
         <source>Subsurface cloud storage</source>
         <translation>Stockage Subsurface dans le cloud</translation>
@@ -5998,149 +6212,40 @@ Veuillez démarrer le Bluetooth sur votre OSTC Sport et effectuez la même prép
         <translation>Sauvegarder l&apos;ID utilisateur localement ?</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1334"/>
-        <source>Volume</source>
-        <translation>Volume</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1337"/>
-        <source>Temperature</source>
-        <translation>Température</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1340"/>
-        <source>Weight</source>
-        <translation>Poids</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1342"/>
-        <source>lbs</source>
-        <translation>livre US</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1343"/>
-        <source>Time units</source>
-        <translation>Unités de temps</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1345"/>
-        <source>Minutes</source>
-        <translation>Minutes</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1346"/>
-        <source>Seconds</source>
-        <translation>Secondes</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1351"/>
-        <source>Show</source>
-        <translation>Afficher</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1362"/>
-        <source>GFLow at max depth</source>
-        <translation>GFLow à la profondeur max</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1359"/>
-        <source>Misc</source>
-        <translation>Divers</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1283"/>
-        <source>Preferences</source>
-        <translation>Préférences</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1324"/>
-        <source>&amp;Metric</source>
-        <translation>&amp;Métrique</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1326"/>
-        <source>Personali&amp;ze</source>
-        <translation>Per&amp;sonnaliser</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1327"/>
-        <source>Individual settings</source>
-        <translation>Paramètres individuels</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1335"/>
-        <source>&amp;liter</source>
-        <translation>&amp;litre</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1344"/>
-        <source>Ascent/descent speed denominator</source>
-        <translation>Dénominateur de vitesse de remontée/descente</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1347"/>
-        <source>GPS coordinates</source>
-        <translation>Coordonnées GPS</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1348"/>
-        <source>Location Display</source>
-        <translation>Affichage du lieu</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1349"/>
-        <source>traditional (dms)</source>
-        <translation>traditionnel (dms)</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1350"/>
-        <source>decimal</source>
-        <translation>décimal</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1352"/>
-        <source>Threshold when showing pO₂</source>
-        <translation>Seuil d&apos;affichage pour la pO₂</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1353"/>
-        <source>Threshold when showing pN₂</source>
-        <translation>Seuil d&apos;affichage pour la pN₂</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1354"/>
-        <source>Threshold when showing pHe</source>
-        <translation>Seuil d&apos;affichage pour la pHe</translation>
+        <location filename="../build/ui_preferences.h" line="1400"/>
+        <source>Disconnect from Facebook</source>
+        <translation>Se déconnecter de Facebook</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1355"/>
-        <source>Max pO₂ when showing MOD</source>
-        <translation>pO₂ max pour l&apos;affichage de la MOD</translation>
+        <location filename="../build/ui_preferences.h" line="1401"/>
+        <source>Dive site geo lookup</source>
+        <translation>Recherche géographique du site de plongée</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1356"/>
-        <source>Draw dive computer reported ceiling red</source>
-        <translation>Afficher en rouge le plafond signalé par l&apos;ordinateur</translation>
+        <location filename="../build/ui_preferences.h" line="1402"/>
+        <source>Enable geocoding for dive site management</source>
+        <translation>Activer le géocodage pour la gestion des sites de plongées</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1357"/>
-        <source>Show unused cylinders in Equipment tab</source>
-        <translation>Afficher les blocs non utilisés dans l&apos;onglet des Équipements</translation>
+        <location filename="../build/ui_preferences.h" line="1403"/>
+        <source>Parse site without GPS data</source>
+        <translation>Analyser les sites sans données GPS</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1358"/>
-        <source>Show average depth</source>
-        <translation>Afficher la profondeur moyenne</translation>
+        <location filename="../build/ui_preferences.h" line="1404"/>
+        <source>Same format for existing dives</source>
+        <translation>Même format pour les plongées existantes</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1360"/>
-        <source>GFLow</source>
-        <translation>GFLow</translation>
+        <location filename="../build/ui_preferences.h" line="1405"/>
+        <source>Dive Site Layout</source>
+        <translation>Disposition des sites de plongées</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1361"/>
-        <source>GFHigh</source>
-        <translation>GFHigh</translation>
+        <location filename="../build/ui_preferences.h" line="1406"/>
+        <location filename="../build/ui_preferences.h" line="1407"/>
+        <source>/</source>
+        <translation>/</translation>
     </message>
 </context>
 <context>
@@ -6196,106 +6301,136 @@ Veuillez démarrer le Bluetooth sur votre OSTC Sport et effectuez la même prép
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="20"/>
-        <source>Show</source>
-        <translation>Afficher</translation>
+        <source>Gas pressure display setup</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="29"/>
-        <source>Threshold when showing pO₂</source>
-        <translation>Seuil d&apos;affichage pour la pO₂</translation>
+        <source>Threshold for pO₂ (bar)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="49"/>
-        <source>Threshold when showing pN₂</source>
-        <translation>Seuil d&apos;affichage pour la pN₂</translation>
+        <source>Threshold for pN₂ (bar)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="69"/>
-        <source>Threshold when showing pHe</source>
-        <translation>Seuil d&apos;affichage pour la pHe</translation>
+        <source>Threshold for pHe (bar)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="89"/>
-        <source>Max pO₂ when showing MOD</source>
-        <translation>pO₂ max pour l&apos;affichage de la MOD</translation>
+        <source>pO₂ in calculating MOD (bar)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="109"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="106"/>
+        <source>CCR options:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="113"/>
+        <source>Dive planner default setpoint (bar)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="133"/>
+        <source>Show setpoints when viewing pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="140"/>
+        <source>Show individual O₂ sensor values when viewing pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="150"/>
+        <source>Ceiling display setup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="159"/>
         <source>Draw dive computer reported ceiling red</source>
         <translation>Afficher en rouge le plafond signalé par l&apos;ordinateur</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="116"/>
-        <source>Show unused cylinders in Equipment tab</source>
-        <translation>Afficher les blocs non utilisés dans l&apos;onglet des Équipements</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="169"/>
+        <source>Algorithm for calculated ceiling:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="123"/>
-        <source>Show mean depth</source>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="176"/>
+        <source>VPM-B</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="133"/>
-        <source>Misc</source>
-        <translation>Divers</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="183"/>
+        <source>VPM-B Conservatism</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="149"/>
-        <source>bar</source>
-        <translation>bar</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="193"/>
+        <source>+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="165"/>
-        <source>Default CCR set-point for dive planning</source>
-        <translation>Consigne par défaut du CCR (recycleur circuit fermé) pour la planification de plongée</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="206"/>
+        <source>Bühlmann</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="172"/>
-        <source>pSCR O₂ metabolism rate</source>
-        <translation>Taux de métabolisation de l&apos;O₂ du pSCR</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="216"/>
+        <source>GFHigh</source>
+        <translation>GFHigh</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="179"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="236"/>
         <source>GFLow</source>
         <translation>GFLow</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="186"/>
-        <source>GFHigh</source>
-        <translation>GFHigh</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="256"/>
+        <source>GFLow at max depth</source>
+        <translation>GFLow à la profondeur max</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="203"/>
-        <source>ℓ/min</source>
-        <translation>ℓ/min</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="263"/>
+        <source>pSCR options:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="213"/>
-        <source>pSCR ratio</source>
-        <translation>Ratio pSCR</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="270"/>
+        <source>Metabolic rate (ℓ O₂/min)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="223"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="287"/>
+        <source>Dilution ratio</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="300"/>
         <source>1:</source>
         <translation>1:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="230"/>
-        <source>CCR: show individual O₂ sensor values when viewing pO₂</source>
-        <translation>CCR : afficher chaque valeur du capteur d&apos;O₂ lors de l&apos;affichage de la pO₂</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="310"/>
+        <source>Misc</source>
+        <translation>Divers</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="237"/>
-        <source>CCR: show setpoints when viewing pO₂</source>
-        <translation>CCR : afficher les consignes lors de la visualisation de la pO₂</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="316"/>
+        <source>Show unused cylinders in Equipment tab</source>
+        <translation>Afficher les blocs non utilisés dans l&apos;onglet des Équipements</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="244"/>
-        <source>GFLow at max depth</source>
-        <translation>GFLow à la profondeur max</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="323"/>
+        <source>Show mean depth in Profile</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="10"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="9"/>
         <source>Graph</source>
         <translation>Graphique</translation>
     </message>
@@ -6364,15 +6499,29 @@ Veuillez démarrer le Bluetooth sur votre OSTC Sport et effectuez la même prép
         <translation>Langue</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="57"/>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="53"/>
         <source>Restart required</source>
         <translation>Redémarrage nécessaire</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="58"/>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="54"/>
         <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="../desktop-widgets/preferences/preferences_language.cpp" line="76"/>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="82"/>
+        <source>Literal characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="77"/>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="83"/>
+        <source>Non-special character(s) in time format.
+These will be used as is. This might not be what you intended.
+See http://doc.qt.io/qt-5/qdatetime.html#toString</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PreferencesNetwork</name>
@@ -6419,7 +6568,7 @@ Veuillez démarrer le Bluetooth sur votre OSTC Sport et effectuez la même prép
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_network.ui" line="156"/>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="148"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="134"/>
         <source>Subsurface cloud storage</source>
         <translation>Stockage Subsurface dans le cloud</translation>
     </message>
@@ -6464,39 +6613,39 @@ Veuillez démarrer le Bluetooth sur votre OSTC Sport et effectuez la même prép
         <translation>Sauvegarder l&apos;ID utilisateur localement ?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="11"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="10"/>
         <source>Network</source>
         <translation>Réseau</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="15"/>
         <source>No proxy</source>
         <translation>Sans proxy</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/>
         <source>System proxy</source>
         <translation>Proxy système</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/>
         <source>HTTP proxy</source>
         <translation>Proxy HTTP</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="19"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/>
         <source>SOCKS proxy</source>
         <translation>Proxy SOCKS</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="75"/>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="97"/>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="110"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="72"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="93"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="106"/>
         <source>Cloud storage email and password can only consist of letters, numbers, and &apos;.&apos;, &apos;-&apos;, &apos;_&apos;, and &apos;+&apos;.</source>
         <translation>L&apos;e-mail et le mot de passe du stockage dans le cloud peuvent uniquement comporter des lettres, nombres et &apos;.&apos;, &apos;-&apos;, &apos;_&apos; et &apos;+&apos;.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="146"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="132"/>
         <source>Subsurface cloud storage (credentials verified)</source>
         <translation>Stockage Subsurface dans le cloud (accès vérifiés)</translation>
     </message>
@@ -6654,7 +6803,7 @@ Veuillez démarrer le Bluetooth sur votre OSTC Sport et effectuez la même prép
         <translation>décimal</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="8"/>
+        <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="7"/>
         <source>Units</source>
         <translation>Unités</translation>
     </message>
@@ -6662,17 +6811,17 @@ Veuillez démarrer le Bluetooth sur votre OSTC Sport et effectuez la même prép
 <context>
     <name>PrintDialog</name>
     <message>
-        <location filename="../desktop-widgets/printdialog.cpp" line="118"/>
-        <source>&amp;Preview</source>
-        <translation>&amp;Aperçu</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/printdialog.cpp" line="115"/>
+        <location filename="../desktop-widgets/printdialog.cpp" line="102"/>
         <source>P&amp;rint</source>
         <translation>&amp;Impression</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/printdialog.cpp" line="130"/>
+        <location filename="../desktop-widgets/printdialog.cpp" line="105"/>
+        <source>&amp;Preview</source>
+        <translation>&amp;Aperçu</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/printdialog.cpp" line="117"/>
         <source>Print</source>
         <translation>Imprimer</translation>
     </message>
@@ -6680,19 +6829,10 @@ Veuillez démarrer le Bluetooth sur votre OSTC Sport et effectuez la même prép
 <context>
     <name>PrintOptions</name>
     <message>
-        <location filename="../build/ui_printoptions.h" line="150"/>
-        <source>&amp;Table print</source>
-        <translation>Impression &amp;tableau</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_printoptions.h" line="158"/>
-        <source>One dive per page</source>
-        <translation>Une plongée par page</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_printoptions.h" line="159"/>
-        <source>Two dives per page</source>
-        <translation>Deux plongées par page</translation>
+        <location filename="../desktop-widgets/printoptions.ui" line="29"/>
+        <location filename="../build/ui_printoptions.h" line="148"/>
+        <source>Print type</source>
+        <translation>Type d&apos;impression</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/printoptions.ui" line="41"/>
@@ -6752,10 +6892,19 @@ Veuillez démarrer le Bluetooth sur votre OSTC Sport et effectuez la même prép
         <translation>Importer</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/printoptions.ui" line="29"/>
-        <location filename="../build/ui_printoptions.h" line="148"/>
-        <source>Print type</source>
-        <translation>Type d&apos;impression</translation>
+        <location filename="../build/ui_printoptions.h" line="150"/>
+        <source>&amp;Table print</source>
+        <translation>Impression &amp;tableau</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_printoptions.h" line="158"/>
+        <source>One dive per page</source>
+        <translation>Une plongée par page</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_printoptions.h" line="159"/>
+        <source>Two dives per page</source>
+        <translation>Deux plongées par page</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/printoptions.cpp" line="128"/>
@@ -6797,103 +6946,103 @@ Veuillez démarrer le Bluetooth sur votre OSTC Sport et effectuez la même prép
         <translation>Ordinateur de plongée inconnu</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="755"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="752"/>
         <source>Show NDL / TTS was disabled because of excessive processing time</source>
         <translation>L&apos;affichage de la LND/DTR est désactivée à cause d&apos;un temps de calcul excessif</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1344"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1338"/>
         <source>Make first divecomputer</source>
         <translation>Définir comme ordinateur de plongée principal</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1346"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1340"/>
         <source>Delete this divecomputer</source>
         <translation>Supprimer cet ordinateur de plongée</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1360"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1354"/>
         <source>Add gas change</source>
         <translation>Ajouter un changement de gaz</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1363"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1357"/>
         <source> (Tank %1)</source>
         <translation> (Bloc %1)</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1371"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1365"/>
         <source>Add set-point change</source>
         <translation>Ajouter une modification de consigne</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1373"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1367"/>
         <source>Add bookmark</source>
         <translation>Ajouter un signet</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1377"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1371"/>
         <source>Edit the profile</source>
         <translation>Modifier le profil</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1381"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1375"/>
         <source>Remove event</source>
         <translation>Supprimer l&apos;évènement</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1386"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1380"/>
         <source>Hide similar events</source>
         <translation>Masquer les évènements similaires</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1393"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1387"/>
         <source>Edit name</source>
         <translation>Modifier le nom</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1422"/>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1429"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1416"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1423"/>
         <source>Adjust pressure of tank %1 (currently interpolated as %2)</source>
         <translation>Ajuster la pression du bloc %1 (actuellement interpolé comme %2)</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1444"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1438"/>
         <source>Unhide all events</source>
         <translation>Afficher tous les évènements</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1479"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1473"/>
         <source>Hide events</source>
         <translation>Masquer les évènements</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1479"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1473"/>
         <source>Hide all %1 events?</source>
         <translation>Masquer tous les évènements %1 ?</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1514"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1508"/>
         <source>Remove the selected event?</source>
         <translation>Supprimer l&apos;évènement sélectionné ?</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1515"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1509"/>
         <source>%1 @ %2:%3</source>
         <translation>%1 @ %2:%3</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1638"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1632"/>
         <source>Edit name of bookmark</source>
         <translation>Modifier le nom du signet</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1639"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1633"/>
         <source>Custom name:</source>
         <translation>Nom personnalisé :</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1644"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1638"/>
         <source>Name is too long!</source>
         <translation>Le nom est trop long !</translation>
     </message>
@@ -6901,91 +7050,101 @@ Veuillez démarrer le Bluetooth sur votre OSTC Sport et effectuez la même prép
 <context>
     <name>QMLManager</name>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="95"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="97"/>
         <source>Starting...</source>
         <translation>Démarrage</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="202"/>
         <source>working in no-cloud mode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="213"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="216"/>
         <source>no cloud credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="214"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="270"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="217"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="269"/>
         <source>Please enter valid cloud credentials.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="285"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="284"/>
         <source>Attempting to open cloud storage with new credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="304"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="306"/>
         <source>Testing cloud credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="331"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="320"/>
+        <source>No response from cloud server to validate the credentials</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="329"/>
+        <source>Cannot connect to cloud storage - cloud account not verified</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="361"/>
         <source>Cloud credentials are invalid</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="344"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="374"/>
         <source>Cannot open cloud storage: Error creating https connection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="357"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="387"/>
         <source>Cannot open cloud storage: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="369"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="399"/>
         <source>Cannot connect to cloud storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="411"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="441"/>
         <source>Cloud storage error: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="501"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="531"/>
         <source>Failed to connect to cloud server, reverting to no cloud status</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="520"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="550"/>
         <source>Cloud storage open successfully. No dives in dive list.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="689"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="690"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="721"/>
         <source>h</source>
         <translation>h</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="689"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="690"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="691"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="721"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="722"/>
         <source>min</source>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="689"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/>
         <source>sec</source>
         <translation>sec</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="1041"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="1102"/>
         <source>Unknown GPS location</source>
         <translation>Location GPS inconnue</translation>
     </message>
@@ -6993,126 +7152,126 @@ Veuillez démarrer le Bluetooth sur votre OSTC Sport et effectuez la même prép
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../core/qthelper.cpp" line="866"/>
-        <location filename="../core/qthelper.cpp" line="1214"/>
-        <source>AIR</source>
-        <translation>AIR</translation>
+        <location filename="../core/gpslocation.h" line="13"/>
+        <source>Waiting to aquire GPS location</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="1214"/>
-        <source>OXYGEN</source>
-        <translation>OXYGÈNE</translation>
+        <location filename="../core/qthelper.cpp" line="766"/>
+        <location filename="../core/qthelper.cpp" line="1275"/>
+        <source>m</source>
+        <translation>m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="59"/>
-        <source>Remove this point</source>
-        <translation>Supprimer ce point</translation>
+        <location filename="../core/qthelper.cpp" line="768"/>
+        <location filename="../core/qthelper.cpp" line="1274"/>
+        <source>ft</source>
+        <translation>pieds</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="32"/>
-        <source>Average</source>
-        <translation>Moyenne</translation>
+        <location filename="../core/qthelper.cpp" line="794"/>
+        <source>C</source>
+        <translation>C</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="35"/>
-        <source>Minimum</source>
-        <translation>Minimum</translation>
+        <location filename="../core/qthelper.cpp" line="796"/>
+        <source>F</source>
+        <translation>F</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="38"/>
-        <source>Maximum</source>
-        <translation>Maximum</translation>
+        <location filename="../core/qthelper.cpp" line="821"/>
+        <location filename="../core/qthelper.cpp" line="1250"/>
+        <source>kg</source>
+        <translation>kg</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/globe.cpp" line="327"/>
-        <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>
+        <location filename="../core/qthelper.cpp" line="823"/>
+        <location filename="../core/qthelper.cpp" line="1251"/>
+        <source>lbs</source>
+        <translation>livre US</translation>
     </message>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="28"/>
-        <source>unknown</source>
-        <translation>inconnu</translation>
+        <location filename="../core/qthelper.cpp" line="848"/>
+        <location filename="../core/qthelper.cpp" line="1300"/>
+        <source>bar</source>
+        <translation>bar</translation>
     </message>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="105"/>
-        <source>h:</source>
-        <translation>h:</translation>
+        <location filename="../core/qthelper.cpp" line="850"/>
+        <location filename="../core/qthelper.cpp" line="1299"/>
+        <source>psi</source>
+        <translation>psi</translation>
     </message>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="105"/>
-        <source>min</source>
-        <translation>min</translation>
+        <location filename="../core/qthelper.cpp" line="871"/>
+        <location filename="../core/qthelper.cpp" line="1235"/>
+        <source>AIR</source>
+        <translation>AIR</translation>
     </message>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="337"/>
-        <source>Multiple</source>
-        <translation>Multiple</translation>
+        <location filename="../core/qthelper.cpp" line="873"/>
+        <source>EAN</source>
+        <translation>Nitrox</translation>
     </message>
     <message numerus="yes">
-        <location filename="../core/qthelper.cpp" line="957"/>
+        <location filename="../core/qthelper.cpp" line="962"/>
         <source>(%n dive(s))</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="816"/>
-        <location filename="../core/qthelper.cpp" line="1228"/>
-        <source>kg</source>
-        <translation>kg</translation>
+        <location filename="../core/qthelper.cpp" line="1235"/>
+        <source>OXYGEN</source>
+        <translation>OXYGÈNE</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="818"/>
-        <location filename="../core/qthelper.cpp" line="1229"/>
-        <source>lbs</source>
-        <translation>livre US</translation>
+        <location filename="../core/qthelper.cpp" line="1322"/>
+        <source>l</source>
+        <translation>l</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="763"/>
-        <location filename="../core/qthelper.cpp" line="1252"/>
-        <source>ft</source>
-        <translation>pieds</translation>
+        <location filename="../core/qthelper.cpp" line="1323"/>
+        <source>cuft</source>
+        <translation>pieds³</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="761"/>
-        <location filename="../core/qthelper.cpp" line="1253"/>
-        <source>m</source>
-        <translation>m</translation>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="29"/>
+        <source>unknown</source>
+        <translation>inconnu</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="789"/>
-        <source>C</source>
-        <translation>C</translation>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="114"/>
+        <source>h:</source>
+        <translation>h:</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="791"/>
-        <source>F</source>
-        <translation>F</translation>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="114"/>
+        <source>min</source>
+        <translation>min</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="845"/>
-        <location filename="../core/qthelper.cpp" line="1275"/>
-        <source>psi</source>
-        <translation>psi</translation>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="63"/>
+        <source>Remove this point</source>
+        <translation>Supprimer ce point</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="843"/>
-        <location filename="../core/qthelper.cpp" line="1276"/>
-        <source>bar</source>
-        <translation>bar</translation>
+        <location filename="../desktop-widgets/globe.cpp" line="327"/>
+        <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>
     <message>
-        <location filename="../core/qthelper.cpp" line="868"/>
-        <source>EAN</source>
-        <translation>Nitrox</translation>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="32"/>
+        <source>Average</source>
+        <translation>Moyenne</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="1298"/>
-        <source>l</source>
-        <translation>l</translation>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="35"/>
+        <source>Minimum</source>
+        <translation>Minimum</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="1299"/>
-        <source>cuft</source>
-        <translation>pieds³</translation>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="38"/>
+        <source>Maximum</source>
+        <translation>Maximum</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="625"/>
@@ -7134,17 +7293,12 @@ Veuillez démarrer le Bluetooth sur votre OSTC Sport et effectuez la même prép
         <source>Malformed XML response. Line %1: %2</source>
         <translation>Réponse XML mal formée. Ligne %1: %2</translation>
     </message>
-    <message>
-        <location filename="../core/gpslocation.h" line="13"/>
-        <source>Waiting to aquire GPS location</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>ReadSettingsThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1651"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1676"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1640"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1665"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Cette fonctionnalité n&apos;est pas disponible pour l&apos;ordinateur de plongé sélectionné.</translation>
     </message>
@@ -7173,7 +7327,7 @@ Veuillez démarrer le Bluetooth sur votre OSTC Sport et effectuez la même prép
 <context>
     <name>ResetSettingsThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1775"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1764"/>
         <source>Reset settings failed!</source>
         <translation>Échec lors de la réinitialisation des paramètres !</translation>
     </message>
@@ -7211,6 +7365,12 @@ Veuillez démarrer le Bluetooth sur votre OSTC Sport et effectuez la même prép
 <context>
     <name>ShiftImageTimesDialog</name>
     <message>
+        <location filename="../desktop-widgets/shiftimagetimes.ui" line="23"/>
+        <location filename="../build/ui_shiftimagetimes.h" line="184"/>
+        <source>Shift selected image times</source>
+        <translation>Décaler l&apos;heure des images sélectionnées</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/shiftimagetimes.ui" line="34"/>
         <location filename="../build/ui_shiftimagetimes.h" line="185"/>
         <source>Shift times of image(s) by</source>
@@ -7223,12 +7383,6 @@ Veuillez démarrer le Bluetooth sur votre OSTC Sport et effectuez la même prép
         <translation>h:mm</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/shiftimagetimes.ui" line="23"/>
-        <location filename="../build/ui_shiftimagetimes.h" line="184"/>
-        <source>Shift selected image times</source>
-        <translation>Décaler l&apos;heure des images sélectionnées</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/shiftimagetimes.ui" line="105"/>
         <location filename="../build/ui_shiftimagetimes.h" line="187"/>
         <source>Earlier</source>
@@ -7280,12 +7434,12 @@ de 30 minutes avant le début de la plongée et 30 minutes après la fin.</trans
         <translation>Quelle est l&apos;heure et la date affiché par l&apos;image ?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="297"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="296"/>
         <source>Open image file</source>
         <translation>Ouvrir un fichier image</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="299"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="298"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>Fichiers image (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -7443,54 +7597,54 @@ de 30 minutes avant le début de la plongée et 30 minutes après la fin.</trans
 <context>
     <name>SocialNetworkDialog</name>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="339"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="284"/>
         <source>Dive date: %1 
 </source>
         <translation>Date de plongée : %1 
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="342"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="287"/>
         <source>Duration: %1 
 </source>
         <translation>Durée : %1 
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="343"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="288"/>
         <source>h:</source>
         <comment>abbreviation for hours plus separator</comment>
         <translation>h:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="344"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="289"/>
         <source>min</source>
         <comment>abbreviation for minutes</comment>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="347"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="292"/>
         <source>Dive location: %1 
 </source>
         <translation>Lieu de plongée : %1 
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="350"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="295"/>
         <source>Buddy: %1 
 </source>
         <translation>Équipier(s) : %1 
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="353"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="298"/>
         <source>Divemaster: %1 
 </source>
         <translation>Guide/Moniteur : %1 
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="356"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="301"/>
         <source>
 %1</source>
         <translation>
@@ -7576,9 +7730,20 @@ de 30 minutes avant le début de la plongée et 30 minutes après la fin.</trans
     <name>StartPage</name>
     <message>
         <location filename="../mobile-widgets/qml/StartPage.qml" line="19"/>
-        <source>To use Subsurface-mobile with Subsurface cloud storage, please enteryour cloud credentials.
+        <source>To use Subsurface-mobile with Subsurface cloud storage, please enter your cloud credentials.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/StartPage.qml" line="20"/>
+        <source>If this is the first time you use Subsurface cloud storage, enter a valid email (all lower case) and a password of your choice (letters and numbers). The server will send a PIN to the email address provided that you will have to enter here.
 
-To use Subsurface-mobile only with local data on this device, tap on the no cloud icon below.</source>
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/StartPage.qml" line="23"/>
+        <source>To use Subsurface-mobile only with local data on this device, tap on the no cloud icon below.</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -7617,7 +7782,12 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>SubsurfaceWebServices</name>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="419"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="395"/>
+        <source>Enter User ID and click Download</source>
+        <translation>Entrez l&apos;ID utilisateur et cliquez sur télécharger</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="417"/>
         <source>Webservice</source>
         <translation>Service web</translation>
     </message>
@@ -7642,30 +7812,25 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
         <translation>Erreur de connexion : </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="557"/>
-        <source>Download successful</source>
-        <translation>Téléchargement réussi</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="551"/>
         <source>Invalid user identifier!</source>
         <translation>Identifiant utilisateur incorrect !</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="397"/>
-        <source>Enter User ID and click Download</source>
-        <translation>Entrez l&apos;ID utilisateur et cliquez sur télécharger</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="554"/>
         <source>Cannot parse response!</source>
         <translation>Impossible d&apos;analyser la réponse !</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="557"/>
+        <source>Download successful</source>
+        <translation>Téléchargement réussi</translation>
+    </message>
 </context>
 <context>
     <name>SuitFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="674"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="672"/>
         <source>Suits: </source>
         <translation>Combinaisons : </translation>
     </message>
@@ -7673,7 +7838,7 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>SuitsFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="123"/>
+        <location filename="../qt-models/filtermodels.cpp" line="128"/>
         <source>No suit set</source>
         <translation>Pas de combinaison définie</translation>
     </message>
@@ -7692,7 +7857,7 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>TagFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="595"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="593"/>
         <source>Tags: </source>
         <translation>Étiquettes : </translation>
     </message>
@@ -7700,7 +7865,7 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>TagFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="148"/>
+        <location filename="../qt-models/filtermodels.cpp" line="153"/>
         <source>Empty tags</source>
         <translation>Étiquettes vides</translation>
     </message>
@@ -7726,6 +7891,11 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>TemplateEdit</name>
     <message>
+        <location filename="../desktop-widgets/templateedit.ui" line="14"/>
+        <source>Edit template</source>
+        <translation>Modifier le modèle</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/templateedit.ui" line="37"/>
         <source>Preview</source>
         <translation>Aperçu</translation>
@@ -7771,11 +7941,6 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
         <translation>Taille de police</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/templateedit.ui" line="14"/>
-        <source>Edit template</source>
-        <translation>Modifier le modèle</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/templateedit.ui" line="165"/>
         <source>Color palette</source>
         <translation>Palette de couleur</translation>
@@ -7957,7 +8122,7 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>TextHyperlinkEventFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="817"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="815"/>
         <source>%1click to visit %2</source>
         <translation>%1cliquer pour visiter %2</translation>
     </message>
@@ -7973,102 +8138,107 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>TripItem</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="67"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="68"/>
         <source>(%1 shown)</source>
         <translation>(%1 affiché(s))</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="194"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
         <source>#</source>
         <translation>N°</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="197"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="215"/>
         <source>Date</source>
         <translation>Date</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="200"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="218"/>
         <source>Rating</source>
         <translation>Évaluation</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
         <source>Depth(%1)</source>
         <translation>Profondeur(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
         <source>ft</source>
         <translation>pieds</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="206"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="224"/>
         <source>Duration</source>
         <translation>Durée</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="209"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="227"/>
         <source>Temp(%1%2)</source>
         <translation>Température(%1%2)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
         <source>Weight(%1)</source>
         <translation>Poids(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
         <source>lbs</source>
         <translation>livre US</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="215"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="233"/>
         <source>Suit</source>
         <translation>Combinaison</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="218"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="236"/>
         <source>Cyl</source>
         <translation>Bloc</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="239"/>
         <source>Gas</source>
         <translation>Gaz</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="244"/>
         <source>SAC(%1)</source>
         <translation>Consommation d&apos;air(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="244"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="229"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="247"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="232"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="250"/>
         <source>Max CNS</source>
         <translation>SNC max</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="235"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="253"/>
+        <source>Photos before/during/after dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="256"/>
         <source>Location</source>
         <translation>Lieu</translation>
     </message>
@@ -8091,72 +8261,73 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>UpdateManager</name>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="69"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="61"/>
         <source>Check for updates.</source>
         <translation>Vérifier les mises à jour.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="70"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="62"/>
         <source>Subsurface was unable to check for updates.</source>
         <translation>Subsurface n&apos;a pas été en mesure de vérifier les mises à jour.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="75"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="67"/>
         <source>The following error occurred:</source>
         <translation>L&apos;erreur suivante est apparue :</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="76"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="68"/>
         <source>Please check your internet connection.</source>
         <translation>Vérifiez votre connexion Internet.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="86"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="78"/>
         <source>You are using the latest version of Subsurface.</source>
         <translation>Vous utilisez la dernière version de Subsurface.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="89"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="81"/>
         <source>A new version of Subsurface is available.&lt;br/&gt;Click on:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; to download it.</source>
         <translation>Une nouvelle version de Subsurface est disponible.&lt;br/&gt;Téléchargez-là sur :&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt;</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="95"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="87"/>
         <source>A new version of Subsurface is available.</source>
         <translation>Une nouvelle version de Subsurface est disponible.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="96"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="88"/>
         <source>Latest version is %1, please check %2 our download page %3 for information in how to update.</source>
         <translation>La dernière version est %1, vérifiez %2 notre page de téléchargement %3 pour savoir comment mettre à jour.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="106"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="98"/>
         <source>Newest release version is </source>
         <translation>La version la plus récente est </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="107"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="99"/>
         <source>The server returned the following information:</source>
         <translation>Le serveur a renvoyé l&apos;information suivante :</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="125"/>
-        <source>Subsurface is checking every two weeks if a new version is available. If you don&apos;t want Subsurface to continue checking, please click Decline.</source>
-        <translation>Subsurface vérifie toutes les deux semaines si une nouvelle version est disponible. Si vous ne souhaitez plus que Subsurface fasse cette vérification par lui même, cliquez sur Refuser.</translation>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="117"/>
+        <source>Subsurface is checking every two weeks if a new version is available. 
+ If you don&apos;t want Subsurface to continue checking, please click Decline.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="126"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="119"/>
         <source>Decline</source>
         <translation>Refuser</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="127"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="120"/>
         <source>Accept</source>
         <translation>Accepter</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="129"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="122"/>
         <source>Automatic check for updates</source>
         <translation>Vérification automatique des mises à jour</translation>
     </message>
@@ -8178,24 +8349,6 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>UserSurvey</name>
     <message>
-        <location filename="../desktop-widgets/usersurvey.ui" line="44"/>
-        <location filename="../build/ui_usersurvey.h" line="151"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;We would love to learn more about our users, their preferences and their usage habits. Please spare a minute to fill out this form and submit it to the Subsurface team.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Nous aimerions en connaître d&apos;avantage sur nos utilisateurs, leurs préférences et leurs habitudes d&apos;utilisation. Veuillez s&apos;il vous plait prendre une minute pour remplir ce formulaire et le soumettre à l&apos;équipe de Subsurface.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/usersurvey.ui" line="115"/>
-        <location filename="../build/ui_usersurvey.h" line="156"/>
-        <source>Other software/sources</source>
-        <translation>Autres logiciels / sources</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/usersurvey.ui" line="128"/>
-        <location filename="../build/ui_usersurvey.h" line="157"/>
-        <source>Manually entering dives</source>
-        <translation>Entrer les plongées manuellement</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="14"/>
         <location filename="../build/ui_usersurvey.h" line="149"/>
         <source>User survey</source>
@@ -8208,6 +8361,12 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
         <translation>Sondage utilisateur Subsurface</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/usersurvey.ui" line="44"/>
+        <location filename="../build/ui_usersurvey.h" line="151"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;We would love to learn more about our users, their preferences and their usage habits. Please spare a minute to fill out this form and submit it to the Subsurface team.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Nous aimerions en connaître d&apos;avantage sur nos utilisateurs, leurs préférences et leurs habitudes d&apos;utilisation. Veuillez s&apos;il vous plait prendre une minute pour remplir ce formulaire et le soumettre à l&apos;équipe de Subsurface.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="63"/>
         <location filename="../build/ui_usersurvey.h" line="152"/>
         <source>Technical diver</source>
@@ -8232,6 +8391,18 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
         <translation>Ordinateur de plongée supporté</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/usersurvey.ui" line="115"/>
+        <location filename="../build/ui_usersurvey.h" line="156"/>
+        <source>Other software/sources</source>
+        <translation>Autres logiciels / sources</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/usersurvey.ui" line="128"/>
+        <location filename="../build/ui_usersurvey.h" line="157"/>
+        <source>Manually entering dives</source>
+        <translation>Entrer les plongées manuellement</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="141"/>
         <location filename="../build/ui_usersurvey.h" line="158"/>
         <source>Android/iPhone companion app</source>
@@ -8262,6 +8433,11 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
         <translation>D&apos;où importez-vous vos données ?</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/usersurvey.cpp" line="18"/>
+        <source>Send</source>
+        <translation>Envoyer</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/usersurvey.cpp" line="43"/>
         <source>
 Operating system: %1</source>
@@ -8306,19 +8482,14 @@ Langue : %1</translation>
         <translation>Demander plus tard</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/usersurvey.cpp" line="101"/>
-        <source>Submit user survey.</source>
-        <translation>Soumettre le sondage</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/usersurvey.cpp" line="82"/>
         <source>Ask again?</source>
         <translation>Demander à nouveau ?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/usersurvey.cpp" line="18"/>
-        <source>Send</source>
-        <translation>Envoyer</translation>
+        <location filename="../desktop-widgets/usersurvey.cpp" line="101"/>
+        <source>Submit user survey.</source>
+        <translation>Soumettre le sondage</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/usersurvey.cpp" line="102"/>
@@ -8410,12 +8581,12 @@ Langue : %1</translation>
         <translation>Envoyer</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="324"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="325"/>
         <source>Operation timed out</source>
         <translation>Temps de réponse dépassé pour l&apos;opération</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="345"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="346"/>
         <source>Transferring data...</source>
         <translation>Transfert des données en cours...</translation>
     </message>
@@ -8450,18 +8621,18 @@ Langue : %1</translation>
 <context>
     <name>WriteSettingsThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1702"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1709"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1718"/>
-        <source>Failed!</source>
-        <translation>Échec !</translation>
-    </message>
-    <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1700"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1721"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1689"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1710"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Cette fonctionnalité n&apos;est pas disponible pour l&apos;ordinateur de plongé sélectionné.</translation>
     </message>
+    <message>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1691"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1698"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1707"/>
+        <source>Failed!</source>
+        <translation>Échec !</translation>
+    </message>
 </context>
 <context>
     <name>YearlyStatisticsModel</name>
@@ -8586,7 +8757,7 @@ Maximum</translation>
 <context>
     <name>getextFromC</name>
     <message>
-        <location filename="../core/libdivecomputer.c" line="674"/>
+        <location filename="../core/libdivecomputer.c" line="737"/>
         <source>Error parsing the header</source>
         <translation>Erreur d&apos;analyse de l&apos;entête</translation>
     </message>
@@ -8594,38 +8765,377 @@ Maximum</translation>
 <context>
     <name>gettextFromC</name>
     <message>
+        <location filename="../core/cochran.c" line="309"/>
+        <location filename="../core/cochran.c" line="315"/>
+        <location filename="../core/cochran.c" line="385"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>deco stop</source>
+        <translation>Palier de décompression</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="336"/>
+        <location filename="../core/cochran.c" line="390"/>
+        <location filename="../core/file.c" line="777"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>ascent</source>
+        <translation>remontée</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="342"/>
+        <location filename="../core/file.c" line="755"/>
+        <source>battery</source>
+        <translation>Batterie</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="348"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
+        <source>OLF</source>
+        <translation>OLF</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="353"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
+        <source>maxdepth</source>
+        <translation>profondeur max</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="358"/>
+        <location filename="../core/cochran.c" line="404"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
+        <source>pO₂</source>
+        <translation>pO₂</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="365"/>
+        <location filename="../core/cochran.c" line="414"/>
+        <location filename="../core/cochran.c" line="421"/>
+        <location filename="../core/file.c" line="868"/>
+        <location filename="../core/libdivecomputer.c" line="225"/>
+        <location filename="../core/libdivecomputer.c" line="228"/>
+        <source>gaschange</source>
+        <translation>Changement de gaz</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="370"/>
+        <location filename="../core/cochran.c" line="409"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>rbt</source>
+        <translation>rbt</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="379"/>
+        <location filename="../core/cochran.c" line="426"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>ceiling</source>
+        <translation>plafond</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="395"/>
+        <location filename="../core/libdivecomputer.c" line="224"/>
+        <source>transmitter</source>
+        <translation>transmetteur</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="153"/>
+        <source>Error: the file does not appear to be a DATATRAK divelog</source>
+        <translation>Erreur : le fichier ne semble pas être un carnet de plongées DATATRAK</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="286"/>
+        <source>clear</source>
+        <translation>effacer</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="289"/>
+        <source>misty</source>
+        <translation>brumeux</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="292"/>
+        <source>fog</source>
+        <translation>brouillard</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="295"/>
+        <source>rain</source>
+        <translation>pluie</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="298"/>
+        <source>storm</source>
+        <translation>tempête</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="301"/>
+        <source>snow</source>
+        <translation>neige</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="321"/>
+        <source>No suit</source>
+        <translation>Pas de combinaison</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="324"/>
+        <source>Shorty</source>
+        <translation>Shorty</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="327"/>
+        <source>Combi</source>
+        <translation>Combi</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="330"/>
+        <source>Wet suit</source>
+        <translation>Combinaison humide</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="333"/>
+        <source>Semidry suit</source>
+        <translation>Combinaison semi-étanche</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="336"/>
+        <source>Dry suit</source>
+        <translation>Combinaison étanche</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="396"/>
+        <source>no stop</source>
+        <translation>pas d&apos;arrêt</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="398"/>
+        <location filename="../core/dive.c" line="29"/>
+        <source>deco</source>
+        <translation>déco</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="400"/>
+        <source>single ascent</source>
+        <translation>remontée unique</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="402"/>
+        <source>multiple ascent</source>
+        <translation>remontées multiples</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="404"/>
+        <location filename="../core/dive.c" line="27"/>
+        <source>fresh</source>
+        <translation>eau douce</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="406"/>
+        <source>salt water</source>
+        <translation>eau salée</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="431"/>
+        <source>sight seeing</source>
+        <translation>tourisme</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="433"/>
+        <source>club dive</source>
+        <translation>plongée club</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="435"/>
+        <location filename="../core/dive.c" line="28"/>
+        <source>instructor</source>
+        <translation>instructeur</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="437"/>
+        <source>instruction</source>
+        <translation>formation</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="439"/>
+        <location filename="../core/dive.c" line="27"/>
+        <source>night</source>
+        <translation>nuit</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="441"/>
+        <location filename="../core/dive.c" line="25"/>
+        <source>cave</source>
+        <translation>grotte</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="443"/>
+        <location filename="../core/dive.c" line="24"/>
+        <source>ice</source>
+        <translation>glace</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="445"/>
+        <source>search</source>
+        <translation>rechercher</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="455"/>
+        <location filename="../core/dive.c" line="25"/>
+        <source>wreck</source>
+        <translation>épave</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="457"/>
+        <location filename="../core/dive.c" line="26"/>
+        <source>river</source>
+        <translation>rivière</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="459"/>
+        <location filename="../core/dive.c" line="23"/>
+        <source>drift</source>
+        <translation>dérive</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="461"/>
+        <location filename="../core/dive.c" line="28"/>
+        <source>photo</source>
+        <translation>photo</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="463"/>
+        <source>other</source>
+        <translation>autre</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="474"/>
+        <source>Other activities</source>
+        <translation>Autres activités</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="498"/>
+        <source>Datatrak/Wlog notes</source>
+        <translation>Notes Datatrak/Wlog</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="537"/>
+        <source>Manually entered dive</source>
+        <translation>Plongée entrée manuellement</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="588"/>
+        <source>Unknown</source>
+        <translation>Inconnu</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="674"/>
+        <source>Error: couldn&apos;t open the file %s</source>
+        <translation>Erreur : Impossible d&apos;ouvrir le fichier %s</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="687"/>
+        <source>Error: no dive</source>
+        <translation>Erreur : aucune plongée</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="23"/>
+        <source>boat</source>
+        <translation>bateau</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="23"/>
+        <source>shore</source>
+        <translation>rivage</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="24"/>
+        <source>deep</source>
+        <translation>profondeur</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="24"/>
+        <source>cavern</source>
+        <translation>caverne</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="25"/>
+        <source>altitude</source>
+        <translation>altitude</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="26"/>
+        <source>pool</source>
+        <translation>piscine</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="26"/>
+        <source>lake</source>
+        <translation>Lac</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="27"/>
+        <source>student</source>
+        <translation>étudiant</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="28"/>
+        <source>video</source>
+        <translation>vidéo</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="33"/>
+        <source>OC-gas</source>
+        <translation>Gaz OC (circuit ouvert)</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="33"/>
+        <source>diluent</source>
+        <translation>diluant</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="33"/>
+        <location filename="../core/equipment.c" line="88"/>
+        <location filename="../core/planner.c" line="1436"/>
+        <location filename="../core/planner.c" line="1439"/>
+        <source>oxygen</source>
+        <translation>oxygène</translation>
+    </message>
+    <message>
         <location filename="../core/dive.c" line="181"/>
         <source>pascal</source>
         <translation>pascal</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="186"/>
-        <location filename="../core/qthelper.cpp" line="669"/>
+        <location filename="../core/qthelper.cpp" line="674"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="190"/>
-        <location filename="../core/qthelper.cpp" line="672"/>
+        <location filename="../core/qthelper.cpp" line="677"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
+        <location filename="../core/dive.c" line="227"/>
+        <source>ℓ</source>
+        <translation>ℓ</translation>
+    </message>
+    <message>
         <location filename="../core/dive.c" line="232"/>
         <source>cuft</source>
         <translation>pieds³</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="269"/>
-        <location filename="../core/qthelper.cpp" line="590"/>
-        <location filename="../core/qthelper.cpp" line="605"/>
+        <location filename="../core/qthelper.cpp" line="595"/>
+        <location filename="../core/qthelper.cpp" line="610"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="274"/>
-        <location filename="../core/qthelper.cpp" line="593"/>
-        <location filename="../core/qthelper.cpp" line="607"/>
+        <location filename="../core/qthelper.cpp" line="598"/>
+        <location filename="../core/qthelper.cpp" line="612"/>
         <source>ft</source>
         <translation>pieds</translation>
     </message>
@@ -8651,53 +9161,58 @@ Maximum</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="325"/>
-        <location filename="../core/qthelper.cpp" line="616"/>
-        <location filename="../core/qthelper.cpp" line="626"/>
+        <location filename="../core/qthelper.cpp" line="621"/>
+        <location filename="../core/qthelper.cpp" line="631"/>
         <source>lbs</source>
         <translation>livre US</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="329"/>
-        <location filename="../core/qthelper.cpp" line="614"/>
-        <location filename="../core/qthelper.cpp" line="624"/>
+        <location filename="../core/qthelper.cpp" line="619"/>
+        <location filename="../core/qthelper.cpp" line="629"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="1772"/>
+        <location filename="../core/dive.c" line="1751"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) ou (%s)</translation>
     </message>
     <message>
-        <location filename="../core/divelist.c" line="484"/>
+        <location filename="../core/divelist.c" line="487"/>
         <location filename="../core/equipment.c" line="84"/>
-        <location filename="../core/planner.c" line="1411"/>
-        <location filename="../core/planner.c" line="1414"/>
+        <location filename="../core/planner.c" line="1432"/>
+        <location filename="../core/planner.c" line="1435"/>
         <source>air</source>
         <translation>air</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="197"/>
+        <location filename="../core/equipment.c" line="86"/>
+        <source>EAN%d</source>
+        <translation>Nitrox%d</translation>
+    </message>
+    <message>
+        <location filename="../core/equipment.c" line="198"/>
         <source>integrated</source>
         <translation>intégré</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="198"/>
+        <location filename="../core/equipment.c" line="199"/>
         <source>belt</source>
         <translation>ceinture</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="199"/>
+        <location filename="../core/equipment.c" line="200"/>
         <source>ankle</source>
         <translation>cheville</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="200"/>
+        <location filename="../core/equipment.c" line="201"/>
         <source>backplate weight</source>
         <translation>poids dorsaux</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="201"/>
+        <location filename="../core/equipment.c" line="202"/>
         <source>clip-on</source>
         <translation>clip-on</translation>
     </message>
@@ -8710,8 +9225,8 @@ Maximum</translation>
         <location filename="../core/file.c" line="121"/>
         <location filename="../core/file.c" line="512"/>
         <location filename="../core/file.c" line="597"/>
-        <location filename="../core/file.c" line="924"/>
-        <location filename="../core/file.c" line="1056"/>
+        <location filename="../core/file.c" line="909"/>
+        <location filename="../core/file.c" line="1092"/>
         <location filename="../core/ostctools.c" line="80"/>
         <source>Failed to read &apos;%s&apos;</source>
         <translation>Impossible de lire &apos;%s&apos;</translation>
@@ -8769,486 +9284,496 @@ Maximum</translation>
         <translation>Calibration O₂</translation>
     </message>
     <message>
-        <location filename="../core/file.c" line="887"/>
-        <source>No matching DC found for file &apos;%s&apos;</source>
-        <translation>Pas trouvé d&apos;ordinateur de plongée pour le fichier &apos;%s&apos;</translation>
+        <location filename="../core/git-access.c" line="134"/>
+        <source>Local cache directory %s corrupted - can&apos;t sync with Subsurface cloud storage</source>
+        <translation>Dossier de cache local %s corrompu - impossible de synchroniser avec le stockage cloud de Subsurface</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>none</source>
-        <translation>aucun</translation>
+        <location filename="../core/git-access.c" line="157"/>
+        <location filename="../core/git-access.c" line="177"/>
+        <source>Could not update local cache to newer remote data</source>
+        <translation>Impossible de mettre à jour le cache local vers les données distantes plus récentes</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="309"/>
-        <location filename="../core/cochran.c" line="315"/>
-        <location filename="../core/cochran.c" line="385"/>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>deco stop</source>
-        <translation>Palier de décompression</translation>
+        <location filename="../core/git-access.c" line="170"/>
+        <source>Subsurface cloud storage corrupted</source>
+        <translation>Stockage cloud de Subsurface corrompu</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="342"/>
-        <location filename="../core/file.c" line="755"/>
-        <source>battery</source>
-        <translation>Batterie</translation>
+        <location filename="../core/git-access.c" line="284"/>
+        <source>Could not update Subsurface cloud storage, try again later</source>
+        <translation>Impossible de mettre à jour le stockage cloud de Subsurface, réessayez plus tard</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="370"/>
-        <location filename="../core/cochran.c" line="409"/>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>rbt</source>
-        <translation>rbt</translation>
+        <location filename="../core/git-access.c" line="344"/>
+        <source>Remote storage and local data diverged. Error: merge failed (%s)</source>
+        <translation>Le stockage distant et les données locales divergent. Erreur : impossible de fusionner (%s)</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="336"/>
-        <location filename="../core/cochran.c" line="390"/>
-        <location filename="../core/file.c" line="777"/>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>ascent</source>
-        <translation>remontée</translation>
+        <location filename="../core/git-access.c" line="374"/>
+        <source>Remote storage and local data diverged. Cannot combine local and remote changes</source>
+        <translation>Les données du stockage local et du distant ont divergées. Impossible de combiner les modifications locales et distantes</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="379"/>
-        <location filename="../core/cochran.c" line="426"/>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>ceiling</source>
-        <translation>plafond</translation>
+        <location filename="../core/git-access.c" line="408"/>
+        <source>Remote storage and local data diverged</source>
+        <translation>Les données du stockage local et du distant ont divergées.</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>workload</source>
-        <translation>charge</translation>
+        <location filename="../core/git-access.c" line="411"/>
+        <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source>
+        <translation>Les données du stockage local et du distant ont divergées. Erreur : l&apos;écriture des données a échoué (%s)</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="395"/>
-        <location filename="../core/libdivecomputer.c" line="203"/>
-        <source>transmitter</source>
-        <translation>transmetteur</translation>
+        <location filename="../core/git-access.c" line="420"/>
+        <source>Problems with local cache of Subsurface cloud data</source>
+        <translation>Problèmes avec le cache local des données du cloud Subsurface</translation>
+    </message>
+    <message>
+        <location filename="../core/git-access.c" line="421"/>
+        <source>Moved cache data to %s. Please try the operation again.</source>
+        <translation>Données mises en cache déplacées vers %s. Veuillez retenter l&apos;opération.</translation>
+    </message>
+    <message>
+        <location filename="../core/git-access.c" line="743"/>
+        <source>Error connecting to Subsurface cloud storage</source>
+        <translation>Erreur lors de la connexion au stockage Subsurface dans le cloud</translation>
+    </message>
+    <message>
+        <location filename="../core/git-access.c" line="746"/>
+        <source>git clone of %s failed (%s)</source>
+        <translation>git clone de %s a échoué (%s)</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="210"/>
+        <location filename="../core/parse-xml.c" line="3317"/>
+        <location filename="../core/uemis-downloader.c" line="134"/>
+        <source>unknown</source>
+        <translation>inconnu</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="203"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>none</source>
+        <translation>aucun</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>workload</source>
+        <translation>charge</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="224"/>
         <source>violation</source>
         <translation>violation</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="203"/>
+        <location filename="../core/libdivecomputer.c" line="224"/>
         <source>bookmark</source>
         <translation>signet</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="203"/>
+        <location filename="../core/libdivecomputer.c" line="224"/>
         <source>surface</source>
         <translation>surface</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="203"/>
+        <location filename="../core/libdivecomputer.c" line="224"/>
         <source>safety stop</source>
         <translation>palier de sécurité</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="365"/>
-        <location filename="../core/cochran.c" line="414"/>
-        <location filename="../core/cochran.c" line="421"/>
-        <location filename="../core/file.c" line="868"/>
-        <location filename="../core/libdivecomputer.c" line="204"/>
-        <location filename="../core/libdivecomputer.c" line="207"/>
-        <source>gaschange</source>
-        <translation>Changement de gaz</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="204"/>
+        <location filename="../core/libdivecomputer.c" line="225"/>
         <source>safety stop (voluntary)</source>
         <translation>palier de sécurité (volontaire)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="204"/>
+        <location filename="../core/libdivecomputer.c" line="225"/>
         <source>safety stop (mandatory)</source>
         <translation>palier de sécurité (obligatoire)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="205"/>
+        <location filename="../core/libdivecomputer.c" line="226"/>
         <source>deepstop</source>
         <translation>Palier profond</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="205"/>
+        <location filename="../core/libdivecomputer.c" line="226"/>
         <source>ceiling (safety stop)</source>
         <translation>plafond (palier de sécurité)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="205"/>
-        <source>divetime</source>
-        <translation>Durée de plongée</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="205"/>
+        <location filename="../core/libdivecomputer.c" line="226"/>
         <source>below floor</source>
         <comment>event showing dive is below deco floor and adding deco time</comment>
         <translation>sous la profondeur plancher</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="353"/>
-        <location filename="../core/libdivecomputer.c" line="206"/>
-        <source>maxdepth</source>
-        <translation>profondeur max</translation>
-    </message>
-    <message>
-        <location filename="../core/cochran.c" line="348"/>
-        <location filename="../core/libdivecomputer.c" line="206"/>
-        <source>OLF</source>
-        <translation>OLF</translation>
+        <location filename="../core/libdivecomputer.c" line="226"/>
+        <source>divetime</source>
+        <translation>Durée de plongée</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="206"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
         <source>airtime</source>
         <translation>Durée à l&apos;air</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="206"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
         <source>rgbm</source>
         <translation>rgbm</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="206"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
         <source>heading</source>
         <translation>entête</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="358"/>
-        <location filename="../core/cochran.c" line="404"/>
-        <location filename="../core/libdivecomputer.c" line="206"/>
-        <source>pO₂</source>
-        <translation>pO₂</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="207"/>
+        <location filename="../core/libdivecomputer.c" line="228"/>
         <source>tissue level warning</source>
         <translation>Avertissement de niveau de tissus</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="207"/>
+        <location filename="../core/libdivecomputer.c" line="228"/>
         <source>non stop time</source>
         <translation>Durée sans arrêt</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="224"/>
+        <location filename="../core/libdivecomputer.c" line="237"/>
         <source>invalid event number</source>
         <translation>numéro d&apos;évènement non valide</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="658"/>
-        <source>Unable to create parser for %s %s</source>
-        <translation>Impossible de créer un analyseur pour %s %s</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="664"/>
-        <source>Error registering the data</source>
-        <translation>Impossible d&apos;enregistrer les données</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="495"/>
+        <location filename="../core/libdivecomputer.c" line="553"/>
         <source>Error parsing the datetime</source>
         <translation>Impossible d&apos;analyser la date</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="513"/>
+        <location filename="../core/libdivecomputer.c" line="571"/>
         <source>Dive %d: %s</source>
         <translation>Plongée %d : %s</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="519"/>
+        <location filename="../core/libdivecomputer.c" line="577"/>
         <source>Error parsing the divetime</source>
         <translation>Erreur lors de l&apos;analyse de la durée de plongée</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="529"/>
+        <location filename="../core/libdivecomputer.c" line="587"/>
         <source>Error parsing the maxdepth</source>
         <translation>Erreur d&apos;analyse de la profondeur maximale</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="548"/>
+        <location filename="../core/libdivecomputer.c" line="606"/>
         <source>Error parsing temperature</source>
         <translation>Erreur d&apos;analyse de la température</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="568"/>
+        <location filename="../core/libdivecomputer.c" line="626"/>
         <source>Error parsing the gas mix count</source>
         <translation>Erreur d&apos;analyse du nombre de mélanges gazeux</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="580"/>
+        <location filename="../core/libdivecomputer.c" line="638"/>
         <source>Error obtaining water salinity</source>
         <translation>Erreur lors de l&apos;obtention de la salinité de l&apos;eau</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="589"/>
+        <location filename="../core/libdivecomputer.c" line="647"/>
         <source>Error obtaining surface pressure</source>
         <translation>Erreur lors de l&apos;obtention de la pression en surface</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="614"/>
+        <location filename="../core/libdivecomputer.c" line="672"/>
         <source>Error obtaining divemode</source>
         <translation>Erreur lors de l&apos;obtention du mode de plongée</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="634"/>
+        <location filename="../core/libdivecomputer.c" line="692"/>
         <source>Error parsing the gas mix</source>
         <translation>Erreur d&apos;analyse du mélange gazeux</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="684"/>
+        <location filename="../core/libdivecomputer.c" line="717"/>
+        <source>Unable to create parser for %s %s</source>
+        <translation>Impossible de créer un analyseur pour %s %s</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="723"/>
+        <source>Error registering the data</source>
+        <translation>Impossible d&apos;enregistrer les données</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="744"/>
         <source>Error parsing the samples</source>
         <translation>Erreur d&apos;analyse des échantillons</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="822"/>
+        <location filename="../core/libdivecomputer.c" line="882"/>
         <source>Event: waiting for user action</source>
         <translation>Évènement : attente d&apos;une action de l&apos;utilisateur</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="830"/>
+        <location filename="../core/libdivecomputer.c" line="890"/>
         <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source>
         <translation>modèle = %u (0x%08x), firmware = %u (0x%08x), numéro de série = %u (0x%08x)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="894"/>
+        <location filename="../core/libdivecomputer.c" line="954"/>
         <source>Error registering the event handler.</source>
         <translation>Erreur d&apos;enregistrement du gestionnaire d&apos;évènements.</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="899"/>
+        <location filename="../core/libdivecomputer.c" line="959"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Erreur d&apos;enregistrement du gestionnaire d&apos;annulation.</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="920"/>
+        <location filename="../core/libdivecomputer.c" line="980"/>
         <source>Dive data import error</source>
         <translation>Erreur d&apos;import des données de plongées</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="959"/>
+        <location filename="../core/libdivecomputer.c" line="1019"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Impossible de créer un contexte libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="966"/>
+        <location filename="../core/libdivecomputer.c" line="1026"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Impossible d&apos;ouvrir %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="992"/>
+        <location filename="../core/libdivecomputer.c" line="1048"/>
         <source>Insufficient privileges to open the device %s %s (%s)</source>
         <translation>Privilèges insuffisants pour ouvrir le périphérique %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../core/parse-xml.c" line="517"/>
-        <source>Strange percentage reading %s
+        <location filename="../core/load-git.c" line="194"/>
+        <location filename="../core/parse-xml.c" line="1242"/>
+        <source>multiple GPS locations for this dive site; also %s
 </source>
-        <translation>Valeur de pourcentage étrange lue %s
+        <translation>Emplacement GPS multiples pour le site de plongée; également %s
 </translation>
     </message>
     <message>
-        <location filename="../core/load-git.c" line="194"/>
-        <location filename="../core/parse-xml.c" line="1238"/>
-        <source>multiple GPS locations for this dive site; also %s
+        <location filename="../core/load-git.c" line="222"/>
+        <location filename="../core/parse-xml.c" line="1304"/>
+        <source>additional name for site: %s
 </source>
-        <translation>Emplacement GPS multiples pour le site de plongée; également %s
+        <translation>Noms supplémentaires pour le site : %s
+</translation>
+    </message>
+    <message>
+        <location filename="../core/ostctools.c" line="120"/>
+        <location filename="../core/ostctools.c" line="152"/>
+        <source>Unknown DC in dive %d</source>
+        <translation>DC inconnu dans la plongée %d</translation>
+    </message>
+    <message>
+        <location filename="../core/ostctools.c" line="165"/>
+        <source>Error - %s - parsing dive %d</source>
+        <translation>Erreur - %s - lors de l&apos;analyse de la plongée %d</translation>
+    </message>
+    <message>
+        <location filename="../core/parse-xml.c" line="517"/>
+        <source>Strange percentage reading %s
+</source>
+        <translation>Valeur de pourcentage étrange lue %s
 </translation>
     </message>
     <message>
-        <location filename="../core/parse-xml.c" line="2044"/>
+        <location filename="../core/parse-xml.c" line="2051"/>
         <source>Failed to parse &apos;%s&apos;</source>
         <translation>Impossible d&apos;analyser &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../core/parse-xml.c" line="3741"/>
+        <location filename="../core/parse-xml.c" line="3774"/>
         <source>Can&apos;t open stylesheet %s</source>
         <translation>Impossible d&apos;ouvrir le feuille de style %s</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="86"/>
-        <source>EAN%d</source>
-        <translation>Nitrox%d</translation>
+        <location filename="../core/planner.c" line="555"/>
+        <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE %s ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source>
+        <translation>DISCLAIMER / ATTENTION : CECI EST UNE NOUVELLE IMPLÉMENTATION DE L&apos;ALGORITHME %s ET SON ADAPTATION DANS UN PLANIFICATEUR DE PLONGÉE QUI N&apos;A ÉTÉ TESTÉ QUE SOMMAIREMENT. NOUS VOUS RECOMMANDONS FORTEMENT DE NE PAS PLANIFIER VOS PLONGÉES EN NE VOUS BASANT QUE SUR LES RÉSULTATS PROPOSÉS ICI.</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="1032"/>
-        <location filename="../core/planner.c" line="1184"/>
-        <source>Can&apos;t find gas %s</source>
-        <translation>Impossible de trouver le gaz %s</translation>
+        <location filename="../core/planner.c" line="569"/>
+        <source>Decompression calculation aborted due to excessive time</source>
+        <translation>Calcul de la décompression annulé à cause d&apos;une durée excessive</translation>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="571"/>
+        <location filename="../core/planner.c" line="829"/>
+        <location filename="../core/planner.c" line="834"/>
+        <location filename="../core/planner.c" line="860"/>
+        <location filename="../core/planner.c" line="870"/>
+        <source>Warning:</source>
+        <translation>Avertissement :</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="368"/>
-        <source>Too many gas mixes</source>
-        <translation>Trop de gaz différents</translation>
+        <location filename="../core/planner.c" line="581"/>
+        <source>based on Bühlmann ZHL-16C with GFlow = %d and GFhigh = %d</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="568"/>
-        <source>Decompression calculation aborted due to excessive time</source>
-        <translation>Calcul de la décompression annulé à cause d&apos;une durée excessive</translation>
+        <location filename="../core/planner.c" line="586"/>
+        <source>based on VPM-B at nominal conservatism</source>
+        <translation>basé sur VPM-B en conservatisme nominal</translation>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="588"/>
+        <source>based on VPM-B at +%d conservatism</source>
+        <translation>basé sur VPM-B en conservatisme +%d</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="592"/>
+        <location filename="../core/planner.c" line="590"/>
+        <source>, effective GF=%d/%d</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="594"/>
+        <source>recreational mode based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source>
+        <translation>mode loisir basé sur Bühlmann ZHL-16B avec GFlow = %d et GFhigh = %d</translation>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="598"/>
         <source>Subsurface dive plan</source>
         <translation>Planification de plongée Subsurface</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="596"/>
-        <source>depth</source>
-        <translation>profondeur</translation>
+        <location filename="../core/planner.c" line="599"/>
+        <source>&lt;div&gt;Runtime: %dmin&lt;/div&gt;&lt;br&gt;</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="602"/>
-        <source>runtime</source>
-        <translation>runtime</translation>
+        <location filename="../core/planner.c" line="604"/>
+        <source>depth</source>
+        <translation>profondeur</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="599"/>
+        <location filename="../core/planner.c" line="607"/>
         <source>duration</source>
         <translation>durée</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="554"/>
-        <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE %s ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source>
-        <translation>DISCLAIMER / ATTENTION : CECI EST UNE NOUVELLE IMPLÉMENTATION DE L&apos;ALGORITHME %s ET SON ADAPTATION DANS UN PLANIFICATEUR DE PLONGÉE QUI N&apos;A ÉTÉ TESTÉ QUE SOMMAIREMENT. NOUS VOUS RECOMMANDONS FORTEMENT DE NE PAS PLANIFIER VOS PLONGÉES EN NE VOUS BASANT QUE SUR LES RÉSULTATS PROPOSÉS ICI.</translation>
+        <location filename="../core/planner.c" line="610"/>
+        <source>runtime</source>
+        <translation>runtime</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="605"/>
+        <location filename="../core/planner.c" line="613"/>
         <source>gas</source>
         <translation>gaz</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="648"/>
+        <location filename="../core/planner.c" line="656"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation>Transition de %.*f %s en %d:%02d min - runtime %d:%02u sur %s (SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="656"/>
+        <location filename="../core/planner.c" line="664"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source>
         <translation>Transition de %.*f %s en %d:%02d min - runtime %d:%02u sur %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="669"/>
+        <location filename="../core/planner.c" line="677"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation>Rester à %.*f %s pendant %d:%02d min - runtime %d:%02u sur %s (SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="676"/>
+        <location filename="../core/planner.c" line="684"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source>
         <translation>Rester à %.*f %s pendant %d:%02d min - runtime %d:%02u sur %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="721"/>
+        <location filename="../core/planner.c" line="729"/>
         <source>%3.0f%s</source>
         <translation>%3.0f%s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="724"/>
-        <location filename="../core/planner.c" line="728"/>
+        <location filename="../core/planner.c" line="732"/>
+        <location filename="../core/planner.c" line="736"/>
         <source>%3dmin</source>
         <translation>%3dmin</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="737"/>
-        <location filename="../core/planner.c" line="749"/>
+        <location filename="../core/planner.c" line="745"/>
+        <location filename="../core/planner.c" line="757"/>
         <source>(SP = %.1fbar)</source>
         <translation>(SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="772"/>
+        <location filename="../core/planner.c" line="780"/>
         <source>Switch gas to %s (SP = %.1fbar)</source>
         <translation>Changer de gaz vers %s (SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="774"/>
+        <location filename="../core/planner.c" line="782"/>
         <source>Switch gas to %s</source>
         <translation>Changer de gaz vers %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="793"/>
+        <location filename="../core/planner.c" line="801"/>
         <source>CNS</source>
         <translation>SNC</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="795"/>
+        <location filename="../core/planner.c" line="803"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="799"/>
+        <location filename="../core/planner.c" line="807"/>
         <source>Gas consumption (CCR legs excluded):</source>
         <translation>Consommation de gaz (segments CCR exclus) :</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="801"/>
+        <location filename="../core/planner.c" line="809"/>
         <source>Gas consumption:</source>
         <translation>Consommation de gaz :</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="570"/>
-        <location filename="../core/planner.c" line="821"/>
-        <location filename="../core/planner.c" line="826"/>
-        <location filename="../core/planner.c" line="851"/>
-        <location filename="../core/planner.c" line="861"/>
-        <source>Warning:</source>
-        <translation>Avertissement :</translation>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="580"/>
-        <source>based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source>
-        <translation>Basé sur Bühlmann ZHL-16B GFlow = %d et GFhigh = %d</translation>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="584"/>
-        <source>based on VPM-B at nominal conservatism</source>
-        <translation>basé sur VPM-B en conservatisme nominal</translation>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="586"/>
-        <source>based on VPM-B at +%d conservatism</source>
-        <translation>basé sur VPM-B en conservatisme +%d</translation>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="588"/>
-        <source>recreational mode based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source>
-        <translation>mode loisir basé sur Bühlmann ZHL-16B avec GFlow = %d et GFhigh = %d</translation>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="822"/>
+        <location filename="../core/planner.c" line="830"/>
         <source>this is more gas than available in the specified cylinder!</source>
         <translation>C&apos;est plus de gaz que ce qui est disponible dans le bloc spécifié !</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="827"/>
+        <location filename="../core/planner.c" line="835"/>
         <source>not enough reserve for gas sharing on ascent!</source>
         <translation>pas assez de gaz en réserve pour un échange lors de la remontée !</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="829"/>
+        <location filename="../core/planner.c" line="837"/>
         <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source>
         <translation>%.0f%s/%.0f%s de %s (%.0f%s/%.0f%s dans la remontée planifiée)</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="831"/>
+        <location filename="../core/planner.c" line="839"/>
         <source>%.0f%s (%.0f%s during planned ascent) of %s</source>
         <translation>%.0f%s (%.0f%s durant la remontée planifiée) de %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="848"/>
+        <location filename="../core/planner.c" line="857"/>
         <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
         <translation>valeur pO₂ haute %.2f à %d:%02u avec le gaz %s à la profondeur %.*f %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="858"/>
+        <location filename="../core/planner.c" line="867"/>
         <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
         <translation>valeur pO₂ basse %.2f à %d:%02u avec le gaz %s à la profondeur %.*f %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="1419"/>
+        <location filename="../core/planner.c" line="1194"/>
+        <source>Can&apos;t find gas %s</source>
+        <translation>Impossible de trouver le gaz %s</translation>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="1440"/>
         <source>ean</source>
         <translation>nitrox</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1280"/>
+        <location filename="../core/profile.c" line="1298"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
@@ -9257,70 +9782,70 @@ D: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1283"/>
+        <location filename="../core/profile.c" line="1301"/>
         <source>P: %d%s
 </source>
         <translation>P: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1287"/>
+        <location filename="../core/profile.c" line="1305"/>
         <source>T: %.1f%s
 </source>
         <translation>T: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1293"/>
+        <location filename="../core/profile.c" line="1311"/>
         <source>V: %.1f%s
 </source>
         <translation>V: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1296"/>
+        <location filename="../core/profile.c" line="1314"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation>Consommation d&apos;air en surface (SAC) : %.*f%s/min
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1298"/>
+        <location filename="../core/profile.c" line="1316"/>
         <source>CNS: %u%%
 </source>
         <translation>SNC : %u%%
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1300"/>
+        <location filename="../core/profile.c" line="1318"/>
         <source>pO%s: %.2fbar
 </source>
         <translation>pO%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1302"/>
+        <location filename="../core/profile.c" line="1320"/>
         <source>pN%s: %.2fbar
 </source>
         <translation>pN%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1304"/>
+        <location filename="../core/profile.c" line="1322"/>
         <source>pHe: %.2fbar
 </source>
         <translation>pHe: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1307"/>
+        <location filename="../core/profile.c" line="1325"/>
         <source>MOD: %d%s
 </source>
         <translation>MOD : %d%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1314"/>
+        <location filename="../core/profile.c" line="1332"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
@@ -9329,7 +9854,7 @@ PEDA : %d%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1318"/>
+        <location filename="../core/profile.c" line="1336"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
@@ -9338,70 +9863,70 @@ PEDA : %d%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1331"/>
+        <location filename="../core/profile.c" line="1349"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation>Palier de sécurité : %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1334"/>
+        <location filename="../core/profile.c" line="1352"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation>Palier de sécurité : temps inconnu @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1339"/>
+        <location filename="../core/profile.c" line="1357"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation>Déco : %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1342"/>
+        <location filename="../core/profile.c" line="1360"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation>Déco : temps inconnu @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1346"/>
+        <location filename="../core/profile.c" line="1364"/>
         <source>In deco
 </source>
         <translation>En déco
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1348"/>
+        <location filename="../core/profile.c" line="1366"/>
         <source>NDL: %umin
 </source>
         <translation>LND  : %umin
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1351"/>
+        <location filename="../core/profile.c" line="1369"/>
         <source>TTS: %umin
 </source>
         <translation>DTR : %umin
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1354"/>
+        <location filename="../core/profile.c" line="1372"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation>Déco : %umin @ %.0f%s (calc)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1362"/>
+        <location filename="../core/profile.c" line="1380"/>
         <source>In deco (calc)
 </source>
         <translation>En déco (calc)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1365"/>
+        <location filename="../core/profile.c" line="1383"/>
         <source>NDL: %umin (calc)
 </source>
         <translation>LND : %umin (calc)
@@ -9409,102 +9934,107 @@ PEDA : %d%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1367"/>
+        <location filename="../core/profile.c" line="1385"/>
         <source>NDL: &gt;2h (calc)
 </source>
         <translation>LND : &gt;2h (calc)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1371"/>
+        <location filename="../core/profile.c" line="1389"/>
         <source>TTS: %umin (calc)
 </source>
         <translation>DTR : %umin (calc)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1373"/>
+        <location filename="../core/profile.c" line="1391"/>
         <source>TTS: &gt;2h (calc)
 </source>
         <translation>DTR : &gt;2h (calc)</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1376"/>
+        <location filename="../core/profile.c" line="1394"/>
         <source>RBT: %umin
 </source>
         <translation>RBT : %umin
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1379"/>
+        <location filename="../core/profile.c" line="1397"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation>Plafond calculé %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1385"/>
+        <location filename="../core/profile.c" line="1403"/>
         <source>Tissue %.0fmin: %.1f%s
 </source>
         <translation>Tissus %.0fmin : %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1391"/>
+        <location filename="../core/profile.c" line="1409"/>
         <source>heartbeat: %d
 </source>
         <translation>rythme cardiaque : %d
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1393"/>
+        <location filename="../core/profile.c" line="1411"/>
         <source>bearing: %d
 </source>
         <translation>palier : %d
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1396"/>
+        <location filename="../core/profile.c" line="1414"/>
         <source>mean depth to here %.1f%s
 </source>
         <translation>Profondeur moyenne jusqu&apos;ici %.1f%s</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1491"/>
+        <location filename="../core/profile.c" line="1515"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1495"/>
-        <location filename="../core/profile.c" line="1499"/>
-        <location filename="../core/profile.c" line="1503"/>
+        <location filename="../core/profile.c" line="1519"/>
+        <location filename="../core/profile.c" line="1523"/>
+        <location filename="../core/profile.c" line="1527"/>
         <source>%s %sD:%.1f%s</source>
         <translation>%s %sPd:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1507"/>
+        <location filename="../core/profile.c" line="1531"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sPd:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1511"/>
+        <location filename="../core/profile.c" line="1535"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1515"/>
-        <location filename="../core/profile.c" line="1519"/>
+        <location filename="../core/profile.c" line="1539"/>
+        <location filename="../core/profile.c" line="1543"/>
         <source>%s %sV:%.2f%s</source>
         <translation>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1526"/>
+        <location filename="../core/profile.c" line="1550"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s</translation>
     </message>
     <message>
+        <location filename="../core/profile.c" line="1575"/>
+        <source>%s SAC:%.*f %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../core/qthelper.cpp" line="67"/>
         <source>%1km</source>
         <translation>%1km</translation>
@@ -9525,446 +10055,460 @@ PEDA : %d%s
         <translation>%1yd</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="635"/>
+        <location filename="../core/qthelper.cpp" line="91"/>
+        <location filename="../core/qthelper.cpp" line="226"/>
+        <source>N</source>
+        <translation>N</translation>
+    </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="91"/>
+        <location filename="../core/qthelper.cpp" line="227"/>
+        <source>S</source>
+        <translation>S</translation>
+    </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="92"/>
+        <location filename="../core/qthelper.cpp" line="228"/>
+        <source>E</source>
+        <translation>E</translation>
+    </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="92"/>
+        <location filename="../core/qthelper.cpp" line="229"/>
+        <source>W</source>
+        <translation>O</translation>
+    </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="640"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="638"/>
+        <location filename="../core/qthelper.cpp" line="643"/>
         <source>F</source>
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="23"/>
-        <source>boat</source>
-        <translation>bateau</translation>
+        <location filename="../core/save-html.c" line="469"/>
+        <location filename="../core/save-html.c" line="553"/>
+        <location filename="../core/worldmap-save.c" line="111"/>
+        <source>Can&apos;t open file %s</source>
+        <translation>Impossible d&apos;ouvrir le fichier %s</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="23"/>
-        <source>shore</source>
-        <translation>rivage</translation>
+        <location filename="../core/save-html.c" line="488"/>
+        <source>Number</source>
+        <translation>Numéro</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="459"/>
-        <location filename="../core/dive.c" line="23"/>
-        <source>drift</source>
-        <translation>dérive</translation>
+        <location filename="../core/save-html.c" line="489"/>
+        <source>Date</source>
+        <translation>Date</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="24"/>
-        <source>deep</source>
-        <translation>profondeur</translation>
+        <location filename="../core/save-html.c" line="490"/>
+        <source>Time</source>
+        <translation>Heure</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="24"/>
-        <source>cavern</source>
-        <translation>caverne</translation>
+        <location filename="../core/save-html.c" line="491"/>
+        <source>Location</source>
+        <translation>Lieu</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="443"/>
-        <location filename="../core/dive.c" line="24"/>
-        <source>ice</source>
-        <translation>glace</translation>
+        <location filename="../core/save-html.c" line="492"/>
+        <source>Air temp.</source>
+        <translation>Temp. de l&apos;air</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="445"/>
-        <source>search</source>
-        <translation>rechercher</translation>
+        <location filename="../core/save-html.c" line="493"/>
+        <source>Water temp.</source>
+        <translation>Temp. de l&apos;eau</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="455"/>
-        <location filename="../core/dive.c" line="25"/>
-        <source>wreck</source>
-        <translation>épave</translation>
+        <location filename="../core/save-html.c" line="494"/>
+        <source>Dives</source>
+        <translation>Plongées</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="441"/>
-        <location filename="../core/dive.c" line="25"/>
-        <source>cave</source>
-        <translation>grotte</translation>
+        <location filename="../core/save-html.c" line="495"/>
+        <source>Expand all</source>
+        <translation>Tout déplier</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="25"/>
-        <source>altitude</source>
-        <translation>altitude</translation>
+        <location filename="../core/save-html.c" line="496"/>
+        <source>Collapse all</source>
+        <translation>Tout replier</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="26"/>
-        <source>pool</source>
-        <translation>piscine</translation>
+        <location filename="../core/save-html.c" line="497"/>
+        <source>Trips</source>
+        <translation>Voyages</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="26"/>
-        <source>lake</source>
-        <translation>Lac</translation>
+        <location filename="../core/save-html.c" line="498"/>
+        <source>Statistics</source>
+        <translation>Statistiques</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="457"/>
-        <location filename="../core/dive.c" line="26"/>
-        <source>river</source>
-        <translation>rivière</translation>
+        <location filename="../core/save-html.c" line="499"/>
+        <source>Advanced search</source>
+        <translation>Recherche avancée</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="439"/>
-        <location filename="../core/dive.c" line="27"/>
-        <source>night</source>
-        <translation>nuit</translation>
+        <location filename="../core/save-html.c" line="502"/>
+        <source>Rating</source>
+        <translation>Évaluation</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="153"/>
-        <source>Error: the file does not appear to be a DATATRAK divelog</source>
-        <translation>Erreur : le fichier ne semble pas être un carnet de plongées DATATRAK</translation>
+        <location filename="../core/save-html.c" line="503"/>
+        <source>Visibility</source>
+        <translation>Visibilité</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="286"/>
-        <source>clear</source>
-        <translation>effacer</translation>
+        <location filename="../core/save-html.c" line="504"/>
+        <source>Duration</source>
+        <translation>Durée</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="289"/>
-        <source>misty</source>
-        <translation>brumeux</translation>
+        <location filename="../core/save-html.c" line="505"/>
+        <source>Divemaster</source>
+        <translation>Moniteur / Guide de palanquée</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="292"/>
-        <source>fog</source>
-        <translation>brouillard</translation>
+        <location filename="../core/save-html.c" line="506"/>
+        <source>Buddy</source>
+        <translation>Équipier</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="295"/>
-        <source>rain</source>
-        <translation>pluie</translation>
+        <location filename="../core/save-html.c" line="507"/>
+        <source>Suit</source>
+        <translation>Combinaison</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="298"/>
-        <source>storm</source>
-        <translation>tempête</translation>
+        <location filename="../core/save-html.c" line="508"/>
+        <source>Tags</source>
+        <translation>Étiquettes</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="301"/>
-        <source>snow</source>
-        <translation>neige</translation>
+        <location filename="../core/save-html.c" line="509"/>
+        <location filename="../smtk-import/smartrak.c" line="251"/>
+        <location filename="../smtk-import/smartrak.c" line="321"/>
+        <source>Notes</source>
+        <translation>Notes</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="321"/>
-        <source>No suit</source>
-        <translation>Pas de combinaison</translation>
+        <location filename="../core/save-html.c" line="510"/>
+        <source>Show more details</source>
+        <translation>Afficher plus de détails</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="324"/>
-        <source>Shorty</source>
-        <translation>Shorty</translation>
+        <location filename="../core/save-html.c" line="513"/>
+        <source>Yearly statistics</source>
+        <translation>Statistiques annuelles</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="327"/>
-        <source>Combi</source>
-        <translation>Combi</translation>
+        <location filename="../core/save-html.c" line="514"/>
+        <source>Year</source>
+        <translation>Année</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="330"/>
-        <source>Wet suit</source>
-        <translation>Combinaison humide</translation>
+        <location filename="../core/save-html.c" line="515"/>
+        <source>Total time</source>
+        <translation>Durée totale</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="333"/>
-        <source>Semidry suit</source>
-        <translation>Combinaison semi-étanche</translation>
+        <location filename="../core/save-html.c" line="516"/>
+        <source>Average time</source>
+        <translation>Durée moyenne</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="336"/>
-        <source>Dry suit</source>
-        <translation>Combinaison étanche</translation>
+        <location filename="../core/save-html.c" line="517"/>
+        <source>Shortest time</source>
+        <translation>Durée la plus courte</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="396"/>
-        <source>no stop</source>
-        <translation>pas d&apos;arrêt</translation>
+        <location filename="../core/save-html.c" line="518"/>
+        <source>Longest time</source>
+        <translation>Durée la plus longue</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="400"/>
-        <source>single ascent</source>
-        <translation>remontée unique</translation>
+        <location filename="../core/save-html.c" line="519"/>
+        <source>Average depth</source>
+        <translation>Profondeur moyenne</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="402"/>
-        <source>multiple ascent</source>
-        <translation>remontées multiples</translation>
+        <location filename="../core/save-html.c" line="520"/>
+        <source>Min. depth</source>
+        <translation>Profondeur min.</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="404"/>
-        <location filename="../core/dive.c" line="27"/>
-        <source>fresh</source>
-        <translation>eau douce</translation>
+        <location filename="../core/save-html.c" line="521"/>
+        <source>Max. depth</source>
+        <translation>Profondeur Max.</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="406"/>
-        <source>salt water</source>
-        <translation>eau salée</translation>
+        <location filename="../core/save-html.c" line="522"/>
+        <source>Average SAC</source>
+        <translation>Consommation d&apos;air (SAC) moyenne</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="431"/>
-        <source>sight seeing</source>
-        <translation>tourisme</translation>
+        <location filename="../core/save-html.c" line="523"/>
+        <source>Min. SAC</source>
+        <translation>Consommation d&apos;air (SAC) min.</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="433"/>
-        <source>club dive</source>
-        <translation>plongée club</translation>
+        <location filename="../core/save-html.c" line="524"/>
+        <source>Max. SAC</source>
+        <translation>Consommation d&apos;air (SAC) max.</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="437"/>
-        <source>instruction</source>
-        <translation>formation</translation>
+        <location filename="../core/save-html.c" line="525"/>
+        <source>Average temp.</source>
+        <translation>Temp. moyenne</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="463"/>
-        <source>other</source>
-        <translation>autre</translation>
+        <location filename="../core/save-html.c" line="526"/>
+        <source>Min. temp.</source>
+        <translation>Temp. min.</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="474"/>
-        <source>Other activities</source>
-        <translation>Autres activités</translation>
+        <location filename="../core/save-html.c" line="527"/>
+        <source>Max. temp.</source>
+        <translation>Temp. max.</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="498"/>
-        <source>Datatrak/Wlog notes</source>
-        <translation>Notes Datatrak/Wlog</translation>
+        <location filename="../core/save-html.c" line="528"/>
+        <source>Back to list</source>
+        <translation>Retour à la liste</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="537"/>
-        <source>Manually entered dive</source>
-        <translation>Plongée entrée manuellement</translation>
+        <location filename="../core/save-html.c" line="531"/>
+        <source>Dive No.</source>
+        <translation>Plongée n°</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="588"/>
-        <source>Unknown</source>
-        <translation>Inconnu</translation>
+        <location filename="../core/save-html.c" line="532"/>
+        <source>Dive profile</source>
+        <translation>Profil de plongée</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="674"/>
-        <source>Error: couldn&apos;t open the file %s</source>
-        <translation>Erreur : Impossible d&apos;ouvrir le fichier %s</translation>
+        <location filename="../core/save-html.c" line="533"/>
+        <source>Dive information</source>
+        <translation>Informations de plongée</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="687"/>
-        <source>Error: no dive</source>
-        <translation>Erreur : aucune plongée</translation>
+        <location filename="../core/save-html.c" line="534"/>
+        <source>Dive equipment</source>
+        <translation>Équipement de plongée</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="27"/>
-        <source>student</source>
-        <translation>étudiant</translation>
+        <location filename="../core/save-html.c" line="535"/>
+        <location filename="../core/save-html.c" line="542"/>
+        <source>Type</source>
+        <translation>Type</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="461"/>
-        <location filename="../core/dive.c" line="28"/>
-        <source>photo</source>
-        <translation>photo</translation>
+        <location filename="../core/save-html.c" line="536"/>
+        <source>Size</source>
+        <translation>Taille</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="28"/>
-        <source>video</source>
-        <translation>vidéo</translation>
+        <location filename="../core/save-html.c" line="537"/>
+        <source>Work pressure</source>
+        <translation>Pression de service</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="435"/>
-        <location filename="../core/dive.c" line="28"/>
-        <source>instructor</source>
-        <translation>instructeur</translation>
+        <location filename="../core/save-html.c" line="538"/>
+        <source>Start pressure</source>
+        <translation>Pression de départ</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="398"/>
-        <location filename="../core/dive.c" line="29"/>
-        <source>deco</source>
-        <translation>déco</translation>
+        <location filename="../core/save-html.c" line="539"/>
+        <source>End pressure</source>
+        <translation>Pression finale</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="33"/>
-        <source>OC-gas</source>
-        <translation>Gaz OC (circuit ouvert)</translation>
+        <location filename="../core/save-html.c" line="540"/>
+        <source>Gas</source>
+        <translation>Gaz</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="33"/>
-        <source>diluent</source>
-        <translation>diluant</translation>
+        <location filename="../core/save-html.c" line="541"/>
+        <source>Weight</source>
+        <translation>Poids</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="33"/>
-        <location filename="../core/equipment.c" line="88"/>
-        <location filename="../core/planner.c" line="1415"/>
-        <location filename="../core/planner.c" line="1418"/>
-        <source>oxygen</source>
-        <translation>oxygène</translation>
+        <location filename="../core/save-html.c" line="543"/>
+        <source>Events</source>
+        <translation>Évènements</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="227"/>
-        <source>ℓ</source>
-        <translation>ℓ</translation>
+        <location filename="../core/save-html.c" line="544"/>
+        <source>Name</source>
+        <translation>Nom</translation>
+    </message>
+    <message>
+        <location filename="../core/save-html.c" line="545"/>
+        <source>Value</source>
+        <translation>Valeur</translation>
+    </message>
+    <message>
+        <location filename="../core/save-html.c" line="546"/>
+        <source>Coordinates</source>
+        <translation>Coordonnées</translation>
+    </message>
+    <message>
+        <location filename="../core/save-html.c" line="547"/>
+        <source>Dive status</source>
+        <translation>État de plongée</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="239"/>
+        <location filename="../core/statistics.c" line="242"/>
         <source>more than %d days</source>
         <translation>plus de %d jours</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="246"/>
+        <location filename="../core/statistics.c" line="249"/>
         <source>%dd %dh %dmin</source>
         <translation>%dj %dh %dmin</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="249"/>
+        <location filename="../core/statistics.c" line="252"/>
         <source>%dmin %dsecs</source>
         <translation>%dmin %dsec</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="251"/>
+        <location filename="../core/statistics.c" line="254"/>
         <source>%dh %dmin</source>
         <translation>%dh %dmin</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="263"/>
+        <location filename="../core/statistics.c" line="266"/>
         <source>for dives #</source>
         <translation>pour les plongées n°</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="269"/>
+        <location filename="../core/statistics.c" line="272"/>
         <source>for selected dives</source>
         <translation>pour les plongées sélectionnées</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="304"/>
+        <location filename="../core/statistics.c" line="307"/>
         <source>for dive #%d</source>
         <translation>pour la plongée n°%d</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="306"/>
+        <location filename="../core/statistics.c" line="309"/>
         <source>for selected dive</source>
         <translation>pour la plongée sélectionnée</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="308"/>
+        <location filename="../core/statistics.c" line="311"/>
         <source>for all dives</source>
         <translation>pour toutes les plongées</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="310"/>
+        <location filename="../core/statistics.c" line="313"/>
         <source>(no dives)</source>
         <translation>(pas de plongées)</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Sun</source>
         <translation>Dim.</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Mon</source>
         <translation>Lun.</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Tue</source>
         <translation>Mar.</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Wed</source>
         <translation>Mer.</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Thu</source>
         <translation>Jeu.</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Fri</source>
         <translation>Ven.</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Sat</source>
         <translation>Sam.</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Jan</source>
         <translation>Janv.</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Feb</source>
         <translation>Fév.</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Mar</source>
         <translation>Mar.</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Apr</source>
         <translation>Avril</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>May</source>
         <translation>Mai</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Jun</source>
         <translation>Juin</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Jul</source>
         <translation>Juil.</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Aug</source>
         <translation>Août</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Sep</source>
         <translation>Sept.</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Oct</source>
         <translation>Oct.</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Nov</source>
         <translation>Nov.</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Dec</source>
         <translation>Déc.</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="191"/>
-        <location filename="../core/parse-xml.c" line="3284"/>
-        <location filename="../core/uemis-downloader.c" line="134"/>
-        <source>unknown</source>
-        <translation>inconnu</translation>
-    </message>
-    <message>
-        <location filename="../core/uemis-downloader.c" line="467"/>
-        <source>data</source>
-        <translation>données</translation>
-    </message>
-    <message>
-        <location filename="../core/uemis-downloader.c" line="447"/>
-        <source>%s %s</source>
-        <translation>%s %s</translation>
-    </message>
-    <message>
         <location filename="../core/uemis-downloader.c" line="27"/>
         <source>Uemis Zurich: the file system is almost full.
 Disconnect/reconnect the dive computer
@@ -9995,6 +10539,16 @@ Est-ce que l&apos;Uemis Zurich est branché correctement  ?</translation>
         <translation>Aucune plongée à télécharger.</translation>
     </message>
     <message>
+        <location filename="../core/uemis-downloader.c" line="447"/>
+        <source>%s %s</source>
+        <translation>%s %s</translation>
+    </message>
+    <message>
+        <location filename="../core/uemis-downloader.c" line="467"/>
+        <source>data</source>
+        <translation>données</translation>
+    </message>
+    <message>
         <location filename="../core/uemis-downloader.c" line="495"/>
         <source>divelog #</source>
         <translation>Plongée #</translation>
@@ -10165,281 +10719,6 @@ Est-ce que l&apos;Uemis Zurich est branché correctement  ?</translation>
         <translation>Alerte de batterie faible</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="469"/>
-        <location filename="../core/save-html.c" line="553"/>
-        <location filename="../core/worldmap-save.c" line="111"/>
-        <source>Can&apos;t open file %s</source>
-        <translation>Impossible d&apos;ouvrir le fichier %s</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="488"/>
-        <source>Number</source>
-        <translation>Numéro</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="489"/>
-        <source>Date</source>
-        <translation>Date</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="490"/>
-        <source>Time</source>
-        <translation>Heure</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="491"/>
-        <source>Location</source>
-        <translation>Lieu</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="492"/>
-        <source>Air temp.</source>
-        <translation>Temp. de l&apos;air</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="493"/>
-        <source>Water temp.</source>
-        <translation>Temp. de l&apos;eau</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="498"/>
-        <source>Statistics</source>
-        <translation>Statistiques</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="502"/>
-        <source>Rating</source>
-        <translation>Évaluation</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="503"/>
-        <source>Visibility</source>
-        <translation>Visibilité</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="504"/>
-        <source>Duration</source>
-        <translation>Durée</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="494"/>
-        <source>Dives</source>
-        <translation>Plongées</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="495"/>
-        <source>Expand all</source>
-        <translation>Tout déplier</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="496"/>
-        <source>Collapse all</source>
-        <translation>Tout replier</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="497"/>
-        <source>Trips</source>
-        <translation>Voyages</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="499"/>
-        <source>Advanced search</source>
-        <translation>Recherche avancée</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="505"/>
-        <source>Divemaster</source>
-        <translation>Moniteur / Guide de palanquée</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="506"/>
-        <source>Buddy</source>
-        <translation>Équipier</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="507"/>
-        <source>Suit</source>
-        <translation>Combinaison</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="508"/>
-        <source>Tags</source>
-        <translation>Étiquettes</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="509"/>
-        <location filename="../smtk-import/smartrak.c" line="251"/>
-        <location filename="../smtk-import/smartrak.c" line="321"/>
-        <source>Notes</source>
-        <translation>Notes</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="510"/>
-        <source>Show more details</source>
-        <translation>Afficher plus de détails</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="513"/>
-        <source>Yearly statistics</source>
-        <translation>Statistiques annuelles</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="514"/>
-        <source>Year</source>
-        <translation>Année</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="515"/>
-        <source>Total time</source>
-        <translation>Durée totale</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="516"/>
-        <source>Average time</source>
-        <translation>Durée moyenne</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="517"/>
-        <source>Shortest time</source>
-        <translation>Durée la plus courte</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="518"/>
-        <source>Longest time</source>
-        <translation>Durée la plus longue</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="519"/>
-        <source>Average depth</source>
-        <translation>Profondeur moyenne</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="520"/>
-        <source>Min. depth</source>
-        <translation>Profondeur min.</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="521"/>
-        <source>Max. depth</source>
-        <translation>Profondeur Max.</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="523"/>
-        <source>Min. SAC</source>
-        <translation>Consommation d&apos;air (SAC) min.</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="524"/>
-        <source>Max. SAC</source>
-        <translation>Consommation d&apos;air (SAC) max.</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="525"/>
-        <source>Average temp.</source>
-        <translation>Temp. moyenne</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="526"/>
-        <source>Min. temp.</source>
-        <translation>Temp. min.</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="527"/>
-        <source>Max. temp.</source>
-        <translation>Temp. max.</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="528"/>
-        <source>Back to list</source>
-        <translation>Retour à la liste</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="534"/>
-        <source>Dive equipment</source>
-        <translation>Équipement de plongée</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="537"/>
-        <source>Work pressure</source>
-        <translation>Pression de service</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="538"/>
-        <source>Start pressure</source>
-        <translation>Pression de départ</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="539"/>
-        <source>End pressure</source>
-        <translation>Pression finale</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="547"/>
-        <source>Dive status</source>
-        <translation>État de plongée</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="522"/>
-        <source>Average SAC</source>
-        <translation>Consommation d&apos;air (SAC) moyenne</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="531"/>
-        <source>Dive No.</source>
-        <translation>Plongée n°</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="532"/>
-        <source>Dive profile</source>
-        <translation>Profil de plongée</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="533"/>
-        <source>Dive information</source>
-        <translation>Informations de plongée</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="535"/>
-        <location filename="../core/save-html.c" line="542"/>
-        <source>Type</source>
-        <translation>Type</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="536"/>
-        <source>Size</source>
-        <translation>Taille</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="540"/>
-        <source>Gas</source>
-        <translation>Gaz</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="541"/>
-        <source>Weight</source>
-        <translation>Poids</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="543"/>
-        <source>Events</source>
-        <translation>Évènements</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="544"/>
-        <source>Name</source>
-        <translation>Nom</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="545"/>
-        <source>Value</source>
-        <translation>Valeur</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="546"/>
-        <source>Coordinates</source>
-        <translation>Coordonnées</translation>
-    </message>
-    <message>
         <location filename="../core/worldmap-save.c" line="39"/>
         <source>Date:</source>
         <translation>Date  :</translation>
@@ -10485,110 +10764,6 @@ Est-ce que l&apos;Uemis Zurich est branché correctement  ?</translation>
         <translation>Notes :</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="91"/>
-        <location filename="../core/qthelper.cpp" line="226"/>
-        <source>N</source>
-        <translation>N</translation>
-    </message>
-    <message>
-        <location filename="../core/qthelper.cpp" line="91"/>
-        <location filename="../core/qthelper.cpp" line="227"/>
-        <source>S</source>
-        <translation>S</translation>
-    </message>
-    <message>
-        <location filename="../core/qthelper.cpp" line="92"/>
-        <location filename="../core/qthelper.cpp" line="228"/>
-        <source>E</source>
-        <translation>E</translation>
-    </message>
-    <message>
-        <location filename="../core/qthelper.cpp" line="92"/>
-        <location filename="../core/qthelper.cpp" line="229"/>
-        <source>W</source>
-        <translation>O</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="341"/>
-        <source>Remote storage and local data diverged. Error: merge failed (%s)</source>
-        <translation>Le stockage distant et les données locales divergent. Erreur : impossible de fusionner (%s)</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="134"/>
-        <source>Local cache directory %s corrupted - can&apos;t sync with Subsurface cloud storage</source>
-        <translation>Dossier de cache local %s corrompu - impossible de synchroniser avec le stockage cloud de Subsurface</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="157"/>
-        <location filename="../core/git-access.c" line="177"/>
-        <source>Could not update local cache to newer remote data</source>
-        <translation>Impossible de mettre à jour le cache local vers les données distantes plus récentes</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="170"/>
-        <source>Subsurface cloud storage corrupted</source>
-        <translation>Stockage cloud de Subsurface corrompu</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="285"/>
-        <source>Could not update Subsurface cloud storage, try again later</source>
-        <translation>Impossible de mettre à jour le stockage cloud de Subsurface, réessayez plus tard</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="371"/>
-        <source>Remote storage and local data diverged. Cannot combine local and remote changes</source>
-        <translation>Les données du stockage local et du distant ont divergées. Impossible de combiner les modifications locales et distantes</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="405"/>
-        <source>Remote storage and local data diverged</source>
-        <translation>Les données du stockage local et du distant ont divergées.</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="408"/>
-        <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source>
-        <translation>Les données du stockage local et du distant ont divergées. Erreur : l&apos;écriture des données a échoué (%s)</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="417"/>
-        <source>Problems with local cache of Subsurface cloud data</source>
-        <translation>Problèmes avec le cache local des données du cloud Subsurface</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="418"/>
-        <source>Moved cache data to %s. Please try the operation again.</source>
-        <translation>Données mises en cache déplacées vers %s. Veuillez retenter l&apos;opération.</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="737"/>
-        <source>Error connecting to Subsurface cloud storage</source>
-        <translation>Erreur lors de la connexion au stockage Subsurface dans le cloud</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="740"/>
-        <source>git clone of %s failed (%s)</source>
-        <translation>git clone de %s a échoué (%s)</translation>
-    </message>
-    <message>
-        <location filename="../core/load-git.c" line="222"/>
-        <location filename="../core/parse-xml.c" line="1300"/>
-        <source>additional name for site: %s
-</source>
-        <translation>Noms supplémentaires pour le site : %s
-</translation>
-    </message>
-    <message>
-        <location filename="../core/ostctools.c" line="120"/>
-        <location filename="../core/ostctools.c" line="152"/>
-        <source>Unknown DC in dive %d</source>
-        <translation>DC inconnu dans la plongée %d</translation>
-    </message>
-    <message>
-        <location filename="../core/ostctools.c" line="165"/>
-        <source>Error - %s - parsing dive %d</source>
-        <translation>Erreur - %s - lors de l&apos;analyse de la plongée %d</translation>
-    </message>
-    <message>
         <location filename="../smtk-import/smartrak.c" line="247"/>
         <source>Built</source>
         <translation>Construire</translation>
@@ -10672,117 +10847,117 @@ Est-ce que l&apos;Uemis Zurich est branché correctement  ?</translation>
         <translation>Subsurface mobile</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="91"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="103"/>
         <source>Subsurface</source>
         <translation>Subsurface</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="97"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="110"/>
         <source>Dive list</source>
         <translation>Liste des plongées</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="112"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="125"/>
         <source>Cloud credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="126"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="139"/>
         <source>Manage dives</source>
         <translation>Gérer les plongées</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="138"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="141"/>
         <source>Add dive manually</source>
         <translation>Ajouter une plongée manuellement</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="146"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="149"/>
         <source>Manual sync with cloud</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="164"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="167"/>
         <source>Offline mode</source>
         <translation>Mode hors-ligne</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="164"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="167"/>
         <source>Enable auto cloud sync</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="182"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="187"/>
         <source>GPS</source>
         <translation>GPS</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="185"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="190"/>
         <source>GPS-tag dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="192"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="197"/>
         <source>Upload GPS data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="199"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="204"/>
         <source>Download GPS data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="206"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="211"/>
         <source>Show GPS fixes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="215"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="220"/>
         <source>Clear GPS cache</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="221"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="226"/>
         <source>Preferences</source>
         <translation>Préférences</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="230"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="237"/>
         <source>Developer</source>
         <translation>Développeur</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="232"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="239"/>
         <source>App log</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="239"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="246"/>
         <source>Theme information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="246"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="253"/>
         <source>User manual</source>
         <translation>Manuel utilisateur</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="252"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="259"/>
         <source>About</source>
         <translation>Au sujet de</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="283"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="304"/>
         <source>Run location service</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="283"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="304"/>
         <source>No GPS source available</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="295"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="316"/>
         <source>Actions</source>
         <translation>Actions</translation>
     </message>
@@ -10863,6 +11038,24 @@ p, li { white-space: pre-wrap; }
         <translation>m/min</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="121"/>
+        <location filename="../build/ui_plannerSettings.h" line="425"/>
+        <source>75% to 50% avg. depth</source>
+        <translation>75% à 50% de la prof. moyenne</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="138"/>
+        <location filename="../build/ui_plannerSettings.h" line="427"/>
+        <source>50% avg. depth to 6m</source>
+        <translation>50% de la prof. moyenne à 6m</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="155"/>
+        <location filename="../build/ui_plannerSettings.h" line="429"/>
+        <source>6m to surface</source>
+        <translation>6m à la surface</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="175"/>
         <location filename="../build/ui_plannerSettings.h" line="431"/>
         <source>Descent</source>
@@ -10886,12 +11079,35 @@ p, li { white-space: pre-wrap; }
         <translation>Déco VPM-B</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="268"/>
+        <source>Bühlmann deco</source>
+        <translation>Deco Bühlmann</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="278"/>
         <location filename="../build/ui_plannerSettings.h" line="445"/>
         <source>Reserve gas</source>
         <translation>Gaz de réserve</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="288"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="549"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="578"/>
+        <location filename="../build/ui_plannerSettings.h" line="446"/>
+        <location filename="../build/ui_plannerSettings.h" line="459"/>
+        <location filename="../build/ui_plannerSettings.h" line="461"/>
+        <source>bar</source>
+        <translation>bar</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="307"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="416"/>
+        <location filename="../build/ui_plannerSettings.h" line="437"/>
+        <location filename="../build/ui_plannerSettings.h" line="440"/>
+        <source>%</source>
+        <translation>%</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="320"/>
         <location filename="../build/ui_plannerSettings.h" line="449"/>
         <source>Postpone gas change if a stop is not required</source>
@@ -10910,12 +11126,10 @@ p, li { white-space: pre-wrap; }
         <translation>GF bas</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="307"/>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="416"/>
-        <location filename="../build/ui_plannerSettings.h" line="437"/>
-        <location filename="../build/ui_plannerSettings.h" line="440"/>
-        <source>%</source>
-        <translation>%</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="353"/>
+        <location filename="../build/ui_plannerSettings.h" line="436"/>
+        <source>Plan backgas breaks</source>
+        <translation>Planifier une pause sur le gaz de fond</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="360"/>
@@ -10924,10 +11138,10 @@ p, li { white-space: pre-wrap; }
         <translation>GF haut</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="429"/>
-        <location filename="../build/ui_plannerSettings.h" line="441"/>
-        <source>Drop to first depth</source>
-        <translation>Descendre jusqu’à la première profondeur</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="370"/>
+        <location filename="../build/ui_plannerSettings.h" line="453"/>
+        <source>min</source>
+        <translation>min</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="389"/>
@@ -10936,163 +11150,139 @@ p, li { white-space: pre-wrap; }
         <translation>Dernier palier à 6m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="353"/>
-        <location filename="../build/ui_plannerSettings.h" line="436"/>
-        <source>Plan backgas breaks</source>
-        <translation>Planifier une pause sur le gaz de fond</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="396"/>
+        <source>Maximize bottom time allowed by gas and no decompression limits</source>
+        <translation>Maximiser le temps au fond permis par les limites du gaz et de la non-décompression</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="515"/>
-        <location filename="../build/ui_plannerSettings.h" line="455"/>
-        <source>Gas options</source>
-        <translation>Option de gaz</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="399"/>
+        <location filename="../build/ui_plannerSettings.h" line="443"/>
+        <source>Recreational mode</source>
+        <translation>Mode loisir</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="594"/>
-        <location filename="../build/ui_plannerSettings.h" line="456"/>
-        <source>Bottom SAC</source>
-        <translation>Consommation d&apos;air (SAC) au fond</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="429"/>
+        <location filename="../build/ui_plannerSettings.h" line="441"/>
+        <source>Drop to first depth</source>
+        <translation>Descendre jusqu’à la première profondeur</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="692"/>
-        <location filename="../build/ui_plannerSettings.h" line="457"/>
-        <source>Deco SAC</source>
-        <translation>Consommation d&apos;air (SAC) en déco</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="436"/>
+        <location filename="../build/ui_plannerSettings.h" line="452"/>
+        <source>Min. switch duration</source>
+        <translation>Durée minimale de changement</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="601"/>
-        <location filename="../build/ui_plannerSettings.h" line="458"/>
-        <source>Bottom pO₂</source>
-        <translation>pO₂ fond</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="459"/>
+        <location filename="../build/ui_plannerSettings.h" line="444"/>
+        <source>Safety stop</source>
+        <translation>Palier de sécurité</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="685"/>
-        <location filename="../build/ui_plannerSettings.h" line="460"/>
-        <source>Deco pO₂</source>
-        <translation>pO₂ de déco</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="495"/>
+        <source>Conservatism level</source>
+        <translation>Niveau de conservatisme</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="515"/>
+        <location filename="../build/ui_plannerSettings.h" line="455"/>
+        <source>Gas options</source>
+        <translation>Option de gaz</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="565"/>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="672"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="698"/>
         <location filename="../build/ui_plannerSettings.h" line="462"/>
         <location filename="../build/ui_plannerSettings.h" line="463"/>
         <source>ℓ/min</source>
         <translation>ℓ/min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="632"/>
-        <location filename="../build/ui_plannerSettings.h" line="468"/>
-        <source>Display runtime</source>
-        <translation>Afficher le runtime</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="645"/>
-        <location filename="../build/ui_plannerSettings.h" line="472"/>
-        <source>Display segment duration</source>
-        <translation>afficher la durée du segment</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="655"/>
-        <location filename="../build/ui_plannerSettings.h" line="476"/>
-        <source>Display transitions in deco</source>
-        <translation>Afficher les transitions dans la décompression</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="662"/>
-        <location filename="../build/ui_plannerSettings.h" line="477"/>
-        <source>Verbatim dive plan</source>
-        <translation>Planification de plongée textuelle</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="288"/>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="549"/>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="578"/>
-        <location filename="../build/ui_plannerSettings.h" line="446"/>
-        <location filename="../build/ui_plannerSettings.h" line="459"/>
-        <location filename="../build/ui_plannerSettings.h" line="461"/>
-        <source>bar</source>
-        <translation>bar</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="121"/>
-        <location filename="../build/ui_plannerSettings.h" line="425"/>
-        <source>75% to 50% avg. depth</source>
-        <translation>75% à 50% de la prof. moyenne</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="138"/>
-        <location filename="../build/ui_plannerSettings.h" line="427"/>
-        <source>50% avg. depth to 6m</source>
-        <translation>50% de la prof. moyenne à 6m</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="155"/>
-        <location filename="../build/ui_plannerSettings.h" line="429"/>
-        <source>6m to surface</source>
-        <translation>6m à la surface</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="268"/>
-        <source>Bühlmann deco</source>
-        <translation>Deco Bühlmann</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="370"/>
-        <location filename="../build/ui_plannerSettings.h" line="453"/>
-        <source>min</source>
-        <translation>min</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="396"/>
-        <source>Maximize bottom time allowed by gas and no decompression limits</source>
-        <translation>Maximiser le temps au fond permis par les limites du gaz et de la non-décompression</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="594"/>
+        <source>m</source>
+        <translation>m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="399"/>
-        <location filename="../build/ui_plannerSettings.h" line="443"/>
-        <source>Recreational mode</source>
-        <translation>Mode loisir</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="606"/>
+        <source>Used to calculate best mix. Select best mix depth in &apos;Available gases&apos; table by entering gas depth, followed by &quot;B&quot; (best trimix mix) or &quot;BN&quot; (best nitrox mix)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="436"/>
-        <location filename="../build/ui_plannerSettings.h" line="452"/>
-        <source>Min. switch duration</source>
-        <translation>Durée minimale de changement</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="613"/>
+        <location filename="../build/ui_plannerSettings.h" line="456"/>
+        <source>Bottom SAC</source>
+        <translation>Consommation d&apos;air (SAC) au fond</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="459"/>
-        <location filename="../build/ui_plannerSettings.h" line="444"/>
-        <source>Safety stop</source>
-        <translation>Palier de sécurité</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="620"/>
+        <location filename="../build/ui_plannerSettings.h" line="458"/>
+        <source>Bottom pO₂</source>
+        <translation>pO₂ fond</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="495"/>
-        <source>Conservatism level</source>
-        <translation>Niveau de conservatisme</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="627"/>
+        <source>Best mix END</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="608"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="634"/>
         <location filename="../build/ui_plannerSettings.h" line="464"/>
         <source>Notes</source>
         <translation>Notes</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="629"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="655"/>
         <location filename="../build/ui_plannerSettings.h" line="466"/>
         <source>In dive plan, show runtime (absolute time) of stops</source>
         <translation>Sur la planification, afficher le runtime (durée absolue) des paliers</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="642"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="658"/>
+        <location filename="../build/ui_plannerSettings.h" line="468"/>
+        <source>Display runtime</source>
+        <translation>Afficher le runtime</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="668"/>
         <location filename="../build/ui_plannerSettings.h" line="470"/>
         <source>In dive plan, show duration (relative time) of stops</source>
         <translation>Sur la planification, afficher la durée (durée relative) des paliers</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="652"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="671"/>
+        <location filename="../build/ui_plannerSettings.h" line="472"/>
+        <source>Display segment duration</source>
+        <translation>afficher la durée du segment</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="678"/>
         <location filename="../build/ui_plannerSettings.h" line="474"/>
         <source>In diveplan, list transitions or treat them as implicit</source>
         <translation>Sur la planification, lister les transitions ou les traiter comme implicites</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="681"/>
+        <location filename="../build/ui_plannerSettings.h" line="476"/>
+        <source>Display transitions in deco</source>
+        <translation>Afficher les transitions dans la décompression</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="688"/>
+        <location filename="../build/ui_plannerSettings.h" line="477"/>
+        <source>Verbatim dive plan</source>
+        <translation>Planification de plongée textuelle</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="711"/>
+        <location filename="../build/ui_plannerSettings.h" line="460"/>
+        <source>Deco pO₂</source>
+        <translation>pO₂ de déco</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="718"/>
+        <location filename="../build/ui_plannerSettings.h" line="457"/>
+        <source>Deco SAC</source>
+        <translation>Consommation d&apos;air (SAC) en déco</translation>
+    </message>
 </context>
 </TS>
\ No newline at end of file
diff --git a/translations/subsurface_he.ts b/translations/subsurface_he.ts
index 3ce84c48d..22acdf0f9 100644
--- a/translations/subsurface_he.ts
+++ b/translations/subsurface_he.ts
@@ -5,18 +5,19 @@
         <location filename="../mobile-widgets/qml/About.qml" line="10"/>
         <location filename="../mobile-widgets/qml/About.qml" line="19"/>
         <source>About Subsurface-mobile</source>
-        <translation type="unfinished"/>
+        <translation>אודות Subsurface-mobile</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/About.qml" line="36"/>
         <source>A mobile version of the free Subsurface divelog software.
 </source>
-        <translation type="unfinished"/>
+        <translation>גרסה מובייל של יומן הצלילה החינם Subsurface.
+</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/About.qml" line="37"/>
         <source>View your dive logs while on the go.</source>
-        <translation type="unfinished"/>
+        <translation>הצג יומני הצלילה שלך תוך כדי התנועה</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/About.qml" line="48"/>
@@ -24,7 +25,10 @@
 
 © Subsurface developer team
 2011-2016</source>
-        <translation type="unfinished"/>
+        <translation>גרסה: %1
+
+© צוות פיתח של Subsurface
+2011-2016</translation>
     </message>
 </context>
 <context>
@@ -105,6 +109,11 @@
         <translation>שם:</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="56"/>
+        <source>Could not initialize Winsock version 2.2</source>
+        <translation>לא היה ניתן להתחל Winsock גרסה 2.2</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="134"/>
         <source>Trying to turn on the local Bluetooth device...</source>
         <translation>מנסה להדליק מכשיר Bluetooth מקומי...</translation>
@@ -115,6 +124,11 @@
         <translation>מנסה לכבות מכשיר Bluetooth מקומי...</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="167"/>
+        <source>Remote devices list was cleared.</source>
+        <translation>רשימת מחשירים מרוחקים נוקתה.</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="183"/>
         <source>Scanning for remote devices...</source>
         <translation>מחפש מכשירים מרוחקים...</translation>
@@ -125,6 +139,22 @@
         <translation>סרקה סיים בהצלחה.</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="208"/>
+        <source>The local Bluetooth device was %1.</source>
+        <extracomment>%1 will be replaced with &quot;turned on&quot; or &quot;turned off&quot;</extracomment>
+        <translation>מכשיר Bluetooth מקומי הייתה %1.</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
+        <source>turned on</source>
+        <translation>נדלק</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
+        <source>turned off</source>
+        <translation>נכבה</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="225"/>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="339"/>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="359"/>
@@ -143,7 +173,7 @@
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="349"/>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="358"/>
         <source>AUTHORIZED_PAIRED</source>
-        <translation>מורשה_חובר</translation>
+        <translation>מורשה חובר</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="236"/>
@@ -172,37 +202,6 @@
         <translation>חבר</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="352"/>
-        <source>Device %1 was paired and is authorized.</source>
-        <translation>מכשיר %1 מחובר ומורשה.</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="56"/>
-        <source>Could not initialize Winsock version 2.2</source>
-        <translation>לא היה ניתן להתחל Winsock גרסה 2.2</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="167"/>
-        <source>Remote devices list was cleared.</source>
-        <translation>רשימת מחשירים מרוחקים נוקתה.</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="208"/>
-        <source>The local Bluetooth device was %1.</source>
-        <extracomment>%1 will be replaced with &quot;turned on&quot; or &quot;turned off&quot;</extracomment>
-        <translation>מכשיר Bluetooth מקומי הייתה %1.</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
-        <source>turned on</source>
-        <translation>נדלק</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
-        <source>turned off</source>
-        <translation>נכבה</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="307"/>
         <source>Remove pairing</source>
         <translation>הסר חיבור</translation>
@@ -228,6 +227,11 @@
         <translation>מכשיר %1 מחובר.</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="352"/>
+        <source>Device %1 was paired and is authorized.</source>
+        <translation>מכשיר %1 מחובר ומורשה.</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="378"/>
         <source>The device %1 can now be used for connection. You can press the Save button.</source>
         <translation>אפשר להתחבר למכשיר %1. ניתן ללחוץ על שמור.</translation>
@@ -286,12 +290,12 @@
 <context>
     <name>BuddyFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="621"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="619"/>
         <source>Person: </source>
         <translation>אדם:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="622"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="620"/>
         <source>Searches for buddies and divemasters</source>
         <translation>חיפושים לבני זוג ודייבמסטרים</translation>
     </message>
@@ -299,7 +303,7 @@
 <context>
     <name>BuddyFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="243"/>
+        <location filename="../qt-models/filtermodels.cpp" line="248"/>
         <source>No buddies</source>
         <translation>אין בני זוג</translation>
     </message>
@@ -307,23 +311,28 @@
 <context>
     <name>CloudCredentials</name>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="49"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="50"/>
         <source>Cloud credentials</source>
-        <translation type="unfinished"/>
+        <translation>זיהוי לענן</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="55"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="56"/>
         <source>Email</source>
-        <translation type="unfinished"/>
+        <translation>מייל</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="67"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="68"/>
         <source>Password</source>
         <translation>סיסמא</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="90"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="92"/>
         <source>Show password</source>
+        <translation>הצג סיסמא</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="97"/>
+        <source>PIN</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -381,6 +390,16 @@
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
+        <source>Max. depth</source>
+        <translation>עומק מירבי</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
+        <source>Avg. depth</source>
+        <translation>עומק ממוצע</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
         <source>Divemaster</source>
         <translation>מדריך צלילה</translation>
     </message>
@@ -391,6 +410,11 @@
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
+        <source>Suit</source>
+        <translation>חליפה</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
         <source>Notes</source>
         <translation>הערות</translation>
     </message>
@@ -410,21 +434,6 @@
         <translation>טמפ&apos; המים</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
-        <source>Max. depth</source>
-        <translation>עומק מירבי</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
-        <source>Avg. depth</source>
-        <translation>עומק ממוצע</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
-        <source>Suit</source>
-        <translation>חליפה</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="44"/>
         <source>O₂</source>
         <translation>חמצן</translation>
@@ -538,7 +547,7 @@
         <translation>לא ניתן לייצר אובייקט של libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../core/configuredivecomputer.cpp" line="660"/>
+        <location filename="../core/configuredivecomputer.cpp" line="656"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation>לא ניתן להתחבר למחשב צלילה.</translation>
     </message>
@@ -558,11 +567,19 @@
         <translation>כונן או ספריה</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="170"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1520"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1533"/>
-        <source>...</source>
-        <translation>...</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="47"/>
+        <source>Connect via Bluetooth</source>
+        <translation>חבר ב-Bluetooth</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="54"/>
+        <source>Connect</source>
+        <translation>לחבר</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="64"/>
+        <source>Disconnect</source>
+        <translation>להתנתק</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="80"/>
@@ -571,12 +588,24 @@
         <translation>אחזר את הפרטים הקיימים</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="90"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1523"/>
+        <source>Read settings from backup file or from device before writing to the device</source>
+        <translation>קרא הגדרות מקובץ גיבוי או ממכשיר לפני הכתיבה למכשיר</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="93"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1525"/>
         <source>Save changes to device</source>
         <translation>שמור שינוים למכשיר</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="116"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1527"/>
+        <source>Read settings from backup file or from device before writing to a backup file</source>
+        <translation>קרא הגדרות מקובץ גיבוי או ממכשיר לפני הכתיבה לקובץ גיבוי</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="119"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1529"/>
         <source>Backup</source>
@@ -595,15 +624,40 @@
         <translation>עידקון קושחה</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="163"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1532"/>
+        <source>Save libdivecomputer logfile</source>
+        <translation>שמור קובץ log של libdivecomputer</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="170"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1520"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1533"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="177"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1534"/>
         <source>Cancel</source>
         <translation>בטל</translation>
     </message>
     <message>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1539"/>
-        <source>OSTC 3</source>
-        <translation>OSTC 3</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="214"/>
+        <source>OSTC 3,Sport,Cr,2</source>
+        <translation>OSTC 3,Sport,Cr,2</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="223"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1541"/>
+        <source>Suunto Vyper family</source>
+        <translation>משפחת Suunto Vyper</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="232"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1543"/>
+        <source>OSTC, Mk.2/2N/2C</source>
+        <translation>OSTC, Mk.2/2N/2C</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="253"/>
@@ -616,40 +670,56 @@
         <translation>הגדרות בסיסיות</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="326"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1656"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1943"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1546"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1726"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1766"/>
-        <source>Serial No.</source>
-        <translation>מס&apos; סידורי</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="260"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1575"/>
+        <source>Eco</source>
+        <translation>חיסכוני</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="349"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1679"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1980"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1547"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1727"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1767"/>
-        <source>Firmware version</source>
-        <translation>גירסת קושחה</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="265"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1576"/>
+        <source>Medium</source>
+        <translation>בינוני</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="538"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1713"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1990"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1548"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1729"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1768"/>
-        <source>Custom text</source>
-        <translation>טקסט חופשי</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="270"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1577"/>
+        <source>High</source>
+        <translation>גבוע</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="385"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1549"/>
-        <source>Language</source>
-        <translation>שפה</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="278"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="826"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="849"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="875"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="927"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="993"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1019"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1101"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1117"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1450"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2278"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2382"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2408"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2434"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2474"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2497"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1586"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1621"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1623"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1625"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1628"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1637"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1638"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1710"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1785"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1789"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1801"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1803"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1806"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1807"/>
+        <source>%</source>
+        <translation>%</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="289"/>
@@ -676,44 +746,36 @@
         <translation>איטלקית</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="579"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1557"/>
-        <source>Dive mode</source>
-        <translation>מוד צליצה</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="556"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1560"/>
-        <source>OC</source>
-        <translation>מעגל פתוח</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="561"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1561"/>
-        <source>CC</source>
-        <translation>מעגל סגור</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="313"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1582"/>
+        <source>m/°C</source>
+        <translation>מטר למעלות צלזיוס</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="566"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2336"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1562"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1793"/>
-        <source>Gauge</source>
-        <translation>מד עומק</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="318"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1583"/>
+        <source>ft/°F</source>
+        <translation>רגל למעלות פרנהייט</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="571"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1563"/>
-        <source>Apnea</source>
-        <translation>צלילה חופשית</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="326"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1656"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1943"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1546"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1726"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1766"/>
+        <source>Serial No.</source>
+        <translation>מס&apos; סידורי</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="395"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2063"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1565"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1780"/>
-        <source>Date format</source>
-        <translation>פורמט תאריך</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="349"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1679"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1980"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1547"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1727"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1767"/>
+        <source>Firmware version</source>
+        <translation>גירסת קושחה</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="360"/>
@@ -734,108 +796,147 @@
         <translation>YYMMDD</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1042"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2457"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1639"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1805"/>
-        <source>Saturation</source>
-        <translation>רויה</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="385"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1549"/>
+        <source>Language</source>
+        <translation>שפה</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="278"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="826"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="849"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="875"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="927"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="993"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1019"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1101"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1117"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1450"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2278"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2382"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2408"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2434"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2474"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2497"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1586"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1621"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1623"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1625"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1628"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1637"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1638"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1710"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1785"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1789"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1801"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1803"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1806"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1807"/>
-        <source>%</source>
-        <translation>%</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="395"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2063"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1565"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1780"/>
+        <source>Date format</source>
+        <translation>פורמט תאריך</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="865"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2261"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1624"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1784"/>
-        <source>Desaturation</source>
-        <translation>פירוק גזים</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="405"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1572"/>
+        <source>Brightness</source>
+        <translation>בהירות</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="983"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2398"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1636"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1800"/>
-        <source>Last deco</source>
-        <translation>דקו האחרון</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="415"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1850"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1579"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1753"/>
+        <source>Units</source>
+        <translation>יחידות</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="711"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="736"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="758"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="904"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2181"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2206"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2228"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2307"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1626"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1786"/>
-        <source> m</source>
-        <translation>מטר</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="425"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1585"/>
+        <source>Salinity (0-5%)</source>
+        <translation>מליחות (0-5%)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="405"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1572"/>
-        <source>Brightness</source>
-        <translation>בהירות</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="438"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1615"/>
+        <source>Reset device to default settings</source>
+        <translation>איפוס מכשיר להגדרות ברירת מחדל</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="260"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1575"/>
-        <source>Eco</source>
-        <translation>חיסכוני</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="452"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1590"/>
+        <source>230LSB/Gauss</source>
+        <translation>230LSB ל-גאוס</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="265"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1576"/>
-        <source>Medium</source>
-        <translation>בינוני</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="457"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1591"/>
+        <source>330LSB/Gauss</source>
+        <translation> 330LSB ל-גאוס</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="270"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1577"/>
-        <source>High</source>
-        <translation>גבוע</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="462"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1592"/>
+        <source>390LSB/Gauss</source>
+        <translation>390LSB ל-גאוס</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="603"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2034"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1599"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1779"/>
-        <source>Sampling rate</source>
-        <translation>קצב דגימה</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="467"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1593"/>
+        <source>440LSB/Gauss</source>
+        <translation>440LSB ל-גאוס</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="472"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1594"/>
+        <source>660LSB/Gauss</source>
+        <translation>660LSB ל-גאוס</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="477"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1595"/>
+        <source>820LSB/Gauss</source>
+        <translation>820LSB ל-גאוס</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="482"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1596"/>
+        <source>1090LSB/Gauss</source>
+        <translation>1090LSB ל-גאוס</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="487"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1597"/>
+        <source>1370LSB/Gauss</source>
+        <translation>1370LSB ל-גאוס</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="521"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1587"/>
+        <source>Compass gain</source>
+        <translation>כיול מצפן</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="531"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1799"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1745"/>
+        <source>Computer model</source>
+        <translation>דגם מחשב</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="538"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1713"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1990"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1548"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1729"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1768"/>
+        <source>Custom text</source>
+        <translation>טקסט חופשי</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="556"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1560"/>
+        <source>OC</source>
+        <translation>מעגל פתוח</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="561"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1561"/>
+        <source>CC</source>
+        <translation>מעגל סגור</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="566"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2336"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1562"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1793"/>
+        <source>Gauge</source>
+        <translation>מד עומק</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="571"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1563"/>
+        <source>Apnea</source>
+        <translation>צלילה חופשית</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="579"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1557"/>
+        <source>Dive mode</source>
+        <translation>מוד צליצה</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="590"/>
@@ -852,30 +953,12 @@
         <translation>10 שניות</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="415"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1850"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1579"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1753"/>
-        <source>Units</source>
-        <translation>יחידות</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="313"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1582"/>
-        <source>m/°C</source>
-        <translation>מטר למעלות צלזיוס</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="318"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1583"/>
-        <source>ft/°F</source>
-        <translation>רגל למעלות פרנהייט</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="644"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1605"/>
-        <source>Dive mode color</source>
-        <translation>צבע מוד צלילה</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="603"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2034"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1599"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1779"/>
+        <source>Sampling rate</source>
+        <translation>קצב דגימה</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="614"/>
@@ -902,12 +985,6 @@
         <translation>קחול</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="425"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1585"/>
-        <source>Salinity (0-5%)</source>
-        <translation>מליחות (0-5%)</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="637"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2092"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1613"/>
@@ -916,90 +993,80 @@
         <translation>סנכרון זמן מחשב צלילת עם מחשב</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="521"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1587"/>
-        <source>Compass gain</source>
-        <translation>כיול מצפן</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="90"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1523"/>
-        <source>Read settings from backup file or from device before writing to the device</source>
-        <translation>קרא הגדרות מקובץ גיבוי או ממכשיר לפני הכתיבה למכשיר</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="116"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1527"/>
-        <source>Read settings from backup file or from device before writing to a backup file</source>
-        <translation>קרא הגדרות מקובץ גיבוי או ממכשיר לפני הכתיבה לקובץ גיבוי</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="232"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1543"/>
-        <source>OSTC, Mk.2/2N/2C</source>
-        <translation>OSTC, Mk.2/2N/2C</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="644"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1605"/>
+        <source>Dive mode color</source>
+        <translation>צבע מוד צלילה</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="452"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1590"/>
-        <source>230LSB/Gauss</source>
-        <translation>230LSB ל-גאוס</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="654"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2020"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1614"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1771"/>
+        <source>Show safety stop</source>
+        <translation>הצג עצירת בטיחות</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="457"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1591"/>
-        <source>330LSB/Gauss</source>
-        <translation> 330LSB ל-גאוס</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="661"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2145"/>
+        <source>End Depth</source>
+        <translation>עומק בסיום</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="462"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1592"/>
-        <source>390LSB/Gauss</source>
-        <translation>390LSB ל-גאוס</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="671"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2162"/>
+        <source> s</source>
+        <translation>שניות</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="467"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1593"/>
-        <source>440LSB/Gauss</source>
-        <translation>440LSB ל-גאוס</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="687"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1953"/>
+        <source>Length</source>
+        <translation>אורך</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="472"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1594"/>
-        <source>660LSB/Gauss</source>
-        <translation>660LSB ל-גאוס</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="694"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2138"/>
+        <source>Start Depth</source>
+        <translation>עומק התחלתי</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="477"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1595"/>
-        <source>820LSB/Gauss</source>
-        <translation>820LSB ל-גאוס</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="701"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2152"/>
+        <source>Reset Depth</source>
+        <translation>איפוס עומק</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="482"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1596"/>
-        <source>1090LSB/Gauss</source>
-        <translation>1090LSB ל-גאוס</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="711"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="736"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="758"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="904"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2181"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2206"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2228"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2307"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1626"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1786"/>
+        <source> m</source>
+        <translation>מטר</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="487"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1597"/>
-        <source>1370LSB/Gauss</source>
-        <translation>1370LSB ל-גאוס</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="778"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2248"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1643"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1810"/>
+        <source>Advanced settings</source>
+        <translation>הגדרות מתקדמות</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="654"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2020"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1614"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1771"/>
-        <source>Show safety stop</source>
-        <translation>הצג עצירת בטיחות</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="784"/>
+        <source>Left button sensitivity</source>
+        <translation>רגישות לחצן שמאלית</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="438"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1615"/>
-        <source>Reset device to default settings</source>
-        <translation>איפוס מכשיר להגדרות ברירת מחדל</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="791"/>
+        <source>Always show ppO2</source>
+        <translation>הצג ppO2 תמיד</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="798"/>
@@ -1010,20 +1077,6 @@
         <translation>ניתן לבחור גרדיאנט חילופי מתחת לפני למים</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="223"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1541"/>
-        <source>Suunto Vyper family</source>
-        <translation>משפחת Suunto Vyper</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="778"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2248"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1643"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1810"/>
-        <source>Advanced settings</source>
-        <translation>הגדרות מתקדמות</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="805"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2271"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1618"/>
@@ -1054,6 +1107,14 @@
         <translation>גרדיאנט עליון</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="865"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2261"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1624"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1784"/>
+        <source>Desaturation</source>
+        <translation>פירוק גזים</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="917"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2320"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1627"/>
@@ -1068,14 +1129,6 @@
         <translation>מילי בר</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="973"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2369"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1630"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1788"/>
-        <source> min</source>
-        <translation>דקה</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="960"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2331"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1633"/>
@@ -1084,63 +1137,28 @@
         <translation>ZH-L16</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="47"/>
-        <source>Connect via Bluetooth</source>
-        <translation>חבר ב-Bluetooth</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="163"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1532"/>
-        <source>Save libdivecomputer logfile</source>
-        <translation>שמור קובץ log של libdivecomputer</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="661"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2145"/>
-        <source>End Depth</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="671"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2162"/>
-        <source> s</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="687"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1953"/>
-        <source>Length</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="694"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2138"/>
-        <source>Start Depth</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="701"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2152"/>
-        <source>Reset Depth</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="784"/>
-        <source>Left button sensitivity</source>
-        <translation>רגישות לחצן שמאלית</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="791"/>
-        <source>Always show ppO2</source>
-        <translation>הצג ppO2 תמיד</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="965"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1634"/>
         <source>ZH-L16+GF</source>
         <translation>ZH-L16+GF</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="973"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2369"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1630"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1788"/>
+        <source> min</source>
+        <translation>דקה</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="983"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2398"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1636"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1800"/>
+        <source>Last deco</source>
+        <translation>דקו האחרון</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1009"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2424"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1640"/>
@@ -1157,6 +1175,14 @@
         <translation>גרדיאנט עליון חילופי</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1042"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2457"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1639"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1805"/>
+        <source>Saturation</source>
+        <translation>רויה</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1052"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1642"/>
         <source>Flip screen</source>
@@ -1168,12 +1194,22 @@
         <translation>רגישות לחצן ימינית</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1066"/>
+        <source>MOD warning</source>
+        <translation>אזהרת עומק מקסימלי</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1073"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2513"/>
         <source>Graphical speed indicator</source>
         <translation>חיווי מהירות גרפי</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1080"/>
+        <source>Dynamic ascent rate</source>
+        <translation>קצב עלייה דינמי</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1087"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2552"/>
         <source>Bottom gas consumption</source>
@@ -1186,14 +1222,22 @@
         <translation>צריכת גז בדקו</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1133"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1149"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2520"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2536"/>
+        <source> ℓ/min</source>
+        <translation>ליטר לדקה</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1165"/>
         <source>Temperature sensor offset</source>
-        <translation type="unfinished"/>
+        <translation>קיזוז חיישן טמפרטורה</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1172"/>
         <source>°C</source>
-        <translation type="unfinished"/>
+        <translation>°C</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1192"/>
@@ -1204,6 +1248,18 @@
         <translation>הגדרות גזים</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1235"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1320"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2610"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2695"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1645"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1668"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1812"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1835"/>
+        <source>%O₂</source>
+        <translation>אחוז חמצן</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1240"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1325"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2615"/>
@@ -1322,16 +1378,10 @@
         <translation>גז ממהל 5</translation>
     </message>
     <message>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1691"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1858"/>
-        <source>Set point [cbar]</source>
-        <translation>נקודה קבוע [cbar]</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1693"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1860"/>
-        <source>Change depth [m]</source>
-        <translation>שינוי עומק [m]</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1405"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2770"/>
+        <source>Setpoint</source>
+        <translation>נקודה קבוע</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1415"/>
@@ -1370,6 +1420,12 @@
         <translation>נקודה קבוע 5</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1443"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1709"/>
+        <source>O₂ in calibration gas</source>
+        <translation>חמצן בגז כיול</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1467"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1713"/>
         <source>Fixed setpoint</source>
@@ -1400,101 +1456,6 @@
         <translation>cbar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1748"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1733"/>
-        <source>P1 (medium)</source>
-        <extracomment>Suunto safety level</extracomment>
-        <translation>P1 (בינוני)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1753"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1734"/>
-        <source>P2 (high)</source>
-        <extracomment>Suunto safety level</extracomment>
-        <translation>P2 (גבוע)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1792"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1744"/>
-        <source>Total dive time</source>
-        <translation>סה&quot;כ זמן צלילה</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2109"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1769"/>
-        <source>kg/ℓ</source>
-        <translation>קילוגרם לליטר</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2346"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1795"/>
-        <source>Apnoea</source>
-        <translation>צלילה חופשי</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1583"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1722"/>
-        <source>Safety level</source>
-        <translation>רמת בתיחות</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="54"/>
-        <source>Connect</source>
-        <translation>לחבר</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="64"/>
-        <source>Disconnect</source>
-        <translation>להתנתק</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="214"/>
-        <source>OSTC 3,Sport,Cr,2</source>
-        <translation>OSTC 3,Sport,Cr,2</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1066"/>
-        <source>MOD warning</source>
-        <translation>אזהרת עומק מקסימלי</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1080"/>
-        <source>Dynamic ascent rate</source>
-        <translation>קצב עלייה דינמי</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1133"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1149"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2520"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2536"/>
-        <source> ℓ/min</source>
-        <translation>ליטר לדקה</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1235"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1320"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2610"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2695"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1645"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1668"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1812"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1835"/>
-        <source>%O₂</source>
-        <translation>אחוז חמצן</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1405"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2770"/>
-        <source>Setpoint</source>
-        <translation>נקודה קבוע</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1443"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1709"/>
-        <source>O₂ in calibration gas</source>
-        <translation>חמצן בגז כיול</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1535"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2843"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1719"/>
@@ -1511,6 +1472,12 @@
         <translation>pO₂ מינימלי</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1583"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1722"/>
+        <source>Safety level</source>
+        <translation>רמת בתיחות</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1609"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1723"/>
         <source>Altitude range</source>
@@ -1544,6 +1511,20 @@
         <translation>P0 (בלי)</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1748"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1733"/>
+        <source>P1 (medium)</source>
+        <extracomment>Suunto safety level</extracomment>
+        <translation>P1 (בינוני)</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1753"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1734"/>
+        <source>P2 (high)</source>
+        <extracomment>Suunto safety level</extracomment>
+        <translation>P2 (גבוע)</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1761"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1736"/>
         <source>Sample rate</source>
@@ -1568,11 +1549,10 @@
         <translation>60 שניות</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="531"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1799"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1745"/>
-        <source>Computer model</source>
-        <translation>דגם מחשב</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1792"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1744"/>
+        <source>Total dive time</source>
+        <translation>סה&quot;כ זמן צלילה</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1816"/>
@@ -1637,12 +1617,6 @@
         <translation>התראת זמן</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2099"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1765"/>
-        <source>Salinity</source>
-        <translation>מליחות</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2074"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1774"/>
         <source>MM/DD/YY</source>
@@ -1661,12 +1635,30 @@
         <translation>YY/MM/DD</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2099"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1765"/>
+        <source>Salinity</source>
+        <translation>מליחות</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2109"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1769"/>
+        <source>kg/ℓ</source>
+        <translation>קילוגרם לליטר</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2341"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1794"/>
         <source>ZH-L16 CC</source>
         <translation>ZH-L16 מערכת סגורה</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2346"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1795"/>
+        <source>Apnoea</source>
+        <translation>צלילה חופשי</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2351"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1796"/>
         <source>L16-GF OC</source>
@@ -1685,87 +1677,112 @@
         <translation>מערכת חצי סגורה - גרדיאנט</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1108"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1129"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1539"/>
+        <source>OSTC 3</source>
+        <translation>OSTC 3</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1691"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1858"/>
+        <source>Set point [cbar]</source>
+        <translation>נקודה קבוע [cbar]</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1693"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1860"/>
+        <source>Change depth [m]</source>
+        <translation>שינוי עומק [m]</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1110"/>
+        <source>Backup dive computer settings</source>
+        <translation>לגבות הגדרות של מחשב צלילה</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1111"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1132"/>
         <source>Backup files (*.xml)</source>
         <translation>קבצי גיבוי (*.xml)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1113"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1115"/>
+        <source>XML backup error</source>
+        <translation>תקלה בגיבוי XML</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1116"/>
         <source>An error occurred while saving the backup file.
 %1</source>
         <translation>תקלה הרחשה בזמן שמירת קובץ גיבוי.
 %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1116"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1119"/>
         <source>Backup succeeded</source>
         <translation>גיבוי עבר בהצלחה</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1117"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1120"/>
         <source>Your settings have been saved to: %1</source>
         <translation>ההגדרות נשמרו ל: %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1107"/>
-        <source>Backup dive computer settings</source>
-        <translation>לגבות הגדרות של מחשב צלילה</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1112"/>
-        <source>XML backup error</source>
-        <translation>תקלה בגיבוי XML</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1128"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1131"/>
         <source>Restore dive computer settings</source>
         <translation>שחזר הגדרות של מחשב צלילה</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1134"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1137"/>
         <source>XML restore error</source>
         <translation>תקלה בשחזור XML</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1135"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1138"/>
         <source>An error occurred while restoring the backup file.
 %1</source>
         <translation>תקלה הרחשה בזמן שחזור קובץ גיבוי.
 %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1139"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1142"/>
         <source>Restore succeeded</source>
         <translation>שחזור עבר בהצלחה</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1140"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1143"/>
         <source>Your settings have been restored successfully.</source>
         <translation>ההגדרות שחזרו בהצלחה.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1150"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1153"/>
         <source>Select firmware file</source>
         <translation>בחר קובץ קושחה</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1151"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1154"/>
         <source>All files (*.*)</source>
         <translation>כל קבצים (*.*)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1207"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1210"/>
         <source>Choose file for divecomputer download logfile</source>
         <translation>בחור קובץ לקובץ log להורדה של libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1208"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1211"/>
         <source>Log files (*.log)</source>
         <translation>קבצי יומן (*.log)</translation>
     </message>
 </context>
 <context>
+    <name>ContextDrawer</name>
+    <message>
+        <location filename="../mobile-widgets/qml/kirigami/src/controls/ContextDrawer.qml" line="76"/>
+        <source>Actions</source>
+        <translation>פעולות</translation>
+    </message>
+</context>
+<context>
     <name>CylindersModel</name>
     <message>
         <location filename="../qt-models/cylindermodel.cpp" line="16"/>
@@ -1779,11 +1796,6 @@
     </message>
     <message>
         <location filename="../qt-models/cylindermodel.cpp" line="16"/>
-        <source>He%</source>
-        <translation>% הליום</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="16"/>
         <source>Work press.</source>
         <translation>לחץ מקסימלי</translation>
     </message>
@@ -1803,9 +1815,24 @@
         <translation>אחוז חמצן</translation>
     </message>
     <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="16"/>
+        <source>He%</source>
+        <translation>% הליום</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
+        <source>Deco switch at</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
+        <source>Bot. MOD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../qt-models/cylindermodel.cpp" line="17"/>
-        <source>Switch at</source>
-        <translation>לעבור ב-</translation>
+        <source>MND</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-models/cylindermodel.cpp" line="17"/>
@@ -1823,17 +1850,32 @@
         <translation>ליטר</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="161"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="177"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation>לחיצה פה יהסיר את המיכל הזה</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="383"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="180"/>
+        <source>Switch depth for deco gas. Calculated using Deco pO₂ preference, unless set manually.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="183"/>
+        <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to &apos;*&apos; for best O₂% for max depth.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="186"/>
+        <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to &apos;*&apos; for best He% for max depth.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="444"/>
         <source>Cylinder cannot be removed</source>
         <translation>אין יכולת להסיר את המיכל</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="384"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="445"/>
         <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source>
         <translation>הגז בשימוש. רק ניתן להסיר מיכלים שלא בשימוש בצלילה.</translation>
     </message>
@@ -1853,42 +1895,24 @@
         <translation>אילו רכיבים היית ברצונך להעתיק</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="73"/>
+        <location filename="../build/ui_divecomponentselection.h" line="141"/>
+        <source>Dive site</source>
+        <translation>אתר צלילה</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="80"/>
         <location filename="../build/ui_divecomponentselection.h" line="142"/>
         <source>Suit</source>
         <translation>חליפה</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="122"/>
-        <location filename="../build/ui_divecomponentselection.h" line="148"/>
-        <source>Divemaster</source>
-        <translation>מדריך צלילה</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="129"/>
-        <location filename="../build/ui_divecomponentselection.h" line="149"/>
-        <source>Buddy</source>
-        <translation>בן זוג</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="136"/>
-        <location filename="../build/ui_divecomponentselection.h" line="150"/>
-        <source>Rating</source>
-        <translation>דירוג</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="87"/>
         <location filename="../build/ui_divecomponentselection.h" line="143"/>
         <source>Visibility</source>
         <translation>ראות</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="73"/>
-        <location filename="../build/ui_divecomponentselection.h" line="141"/>
-        <source>Dive site</source>
-        <translation>אתר צלילה</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="94"/>
         <location filename="../build/ui_divecomponentselection.h" line="144"/>
         <source>Notes</source>
@@ -1912,10 +1936,34 @@
         <source>Cylinders</source>
         <translation>מיכלים</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="122"/>
+        <location filename="../build/ui_divecomponentselection.h" line="148"/>
+        <source>Divemaster</source>
+        <translation>מדריך צלילה</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="129"/>
+        <location filename="../build/ui_divecomponentselection.h" line="149"/>
+        <source>Buddy</source>
+        <translation>בן זוג</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="136"/>
+        <location filename="../build/ui_divecomponentselection.h" line="150"/>
+        <source>Rating</source>
+        <translation>דירוג</translation>
+    </message>
 </context>
 <context>
     <name>DiveComputerManagementDialog</name>
     <message>
+        <location filename="../desktop-widgets/divecomputermanagementdialog.ui" line="17"/>
+        <location filename="../build/ui_divecomputermanagementdialog.h" line="65"/>
+        <source>Edit dive computer nicknames</source>
+        <translation>ערוח שם מחשב</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divecomputermanagementdialog.cpp" line="49"/>
         <source>Remove the selected dive computer?</source>
         <translation>להסיר את המחשב הנבחר?</translation>
@@ -1926,12 +1974,6 @@
  remove the selected dive computer?</source>
         <translation>האם אתם בטוחים שברצונכם להסיר את המחשב הנבחר?</translation>
     </message>
-    <message>
-        <location filename="../desktop-widgets/divecomputermanagementdialog.ui" line="17"/>
-        <location filename="../build/ui_divecomputermanagementdialog.h" line="65"/>
-        <source>Edit dive computer nicknames</source>
-        <translation>ערוח שם מחשב</translation>
-    </message>
 </context>
 <context>
     <name>DiveComputerModel</name>
@@ -1959,106 +2001,112 @@
 <context>
     <name>DiveDetails</name>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="33"/>
+        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="38"/>
         <source>Dive details</source>
-        <translation type="unfinished"/>
+        <translation>פרטי צלילה</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="67"/>
+        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="72"/>
         <source>Delete dive</source>
         <translation>מחיקת צלילה</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="84"/>
+        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="89"/>
         <source>Show on map</source>
-        <translation type="unfinished"/>
+        <translation>הצג במפה</translation>
     </message>
 </context>
 <context>
     <name>DiveDetailsEdit</name>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="74"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="80"/>
         <source>Dive %1</source>
-        <translation type="unfinished"/>
+        <translation>צלילה מס&apos; %1</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="78"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="84"/>
         <source>Date:</source>
         <translation>תאריך:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="86"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="92"/>
         <source>Location:</source>
         <translation>מיקום:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="95"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="101"/>
         <source>Coordinates:</source>
-        <translation type="unfinished"/>
+        <translation>קואורדינטות:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="104"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="110"/>
         <source>Use current
 GPS location:</source>
-        <translation type="unfinished"/>
+        <translation>השתמש במיקום
+הנוכחי כנ&quot;צ:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="118"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="124"/>
         <source>Depth:</source>
         <translation>עומק:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="127"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="133"/>
         <source>Duration:</source>
         <translation>משך הצלילה:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="137"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="143"/>
         <source>Air Temp:</source>
-        <translation type="unfinished"/>
+        <translation>טמפ&apos; האוויר:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="146"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="152"/>
         <source>Water Temp:</source>
-        <translation type="unfinished"/>
+        <translation>טמפ&apos; מים:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="155"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="161"/>
         <source>Suit:</source>
         <translation>חליפה:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="164"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="176"/>
         <source>Buddy:</source>
         <translation>בן זוג:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="173"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="191"/>
         <source>Dive Master:</source>
-        <translation type="unfinished"/>
+        <translation>דייבמסטר</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="182"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="206"/>
         <source>Weight:</source>
         <translation>משקל:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="192"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="216"/>
+        <source>Cylinder:</source>
+        <translation>מיכל:</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="231"/>
         <source>Gas mix:</source>
-        <translation type="unfinished"/>
+        <translation>תערובת גז:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="203"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="241"/>
         <source>Start Pressure:</source>
-        <translation type="unfinished"/>
+        <translation>לחץ התחלתי:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="213"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="250"/>
         <source>End Pressure:</source>
-        <translation type="unfinished"/>
+        <translation>לחץ סופי:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="224"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="260"/>
         <source>Notes:</source>
         <translation>הערות:</translation>
     </message>
@@ -2068,27 +2116,27 @@ GPS location:</source>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="63"/>
         <source>Date: </source>
-        <translation type="unfinished"/>
+        <translation>תאריך:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="80"/>
         <source>Depth: </source>
-        <translation type="unfinished"/>
+        <translation>עומק:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="89"/>
         <source>Duration: </source>
-        <translation type="unfinished"/>
+        <translation>משך הצלילה:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="121"/>
         <source>No profile to show</source>
-        <translation type="unfinished"/>
+        <translation>אין פרופיל צלילי לתצוגה</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="139"/>
         <source>Dive Details</source>
-        <translation type="unfinished"/>
+        <translation>פרטי צלילה</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="144"/>
@@ -2096,42 +2144,42 @@ GPS location:</source>
         <translation>חליפה:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="159"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="158"/>
         <source>Air Temp:</source>
-        <translation type="unfinished"/>
+        <translation>טמפ&apos; האוויר:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="175"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="172"/>
         <source>Cylinder:</source>
-        <translation type="unfinished"/>
+        <translation>מיכל:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="189"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="185"/>
         <source>Water Temp:</source>
-        <translation type="unfinished"/>
+        <translation>טמפ&apos; מים:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="205"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="198"/>
         <source>Dive Master:</source>
-        <translation type="unfinished"/>
+        <translation>דייבמסטר</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="220"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="211"/>
         <source>Weight:</source>
         <translation>משקל:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="249"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="224"/>
         <source>Buddy:</source>
         <translation>בן זוג:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="263"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="237"/>
         <source>SAC:</source>
         <translation>צריכת אויר:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="280"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="252"/>
         <source>Notes</source>
         <translation>הערות</translation>
     </message>
@@ -2139,18 +2187,18 @@ GPS location:</source>
 <context>
     <name>DiveEventItem</name>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="134"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="165"/>
         <source>Manual switch to OC</source>
         <translation>מעבר ידני למערכת פתוחה</translation>
     </message>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="136"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="167"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation>להתחיל</translation>
     </message>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="137"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="168"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation>סוף</translation>
@@ -2159,27 +2207,27 @@ GPS location:</source>
 <context>
     <name>DiveImportedModel</name>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="646"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="656"/>
         <source>Date/time</source>
         <translation>תעריך/שעה</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="648"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="658"/>
         <source>Duration</source>
         <translation>משך הצלילה</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="650"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="660"/>
         <source>Depth</source>
         <translation>עומק</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="672"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="682"/>
         <source>h:</source>
         <translation>שעה:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="672"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="682"/>
         <source>min</source>
         <translation>דקה</translation>
     </message>
@@ -2188,126 +2236,131 @@ GPS location:</source>
     <name>DiveList</name>
     <message>
         <location filename="../mobile-widgets/qml/DiveList.qml" line="12"/>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="226"/>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="232"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="227"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="233"/>
         <source>Dive list</source>
-        <translation type="unfinished"/>
+        <translation>רשימת צלילות</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveList.qml" line="95"/>
         <source>Depth: </source>
-        <translation type="unfinished"/>
+        <translation>עומק:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveList.qml" line="106"/>
         <source>Duration: </source>
-        <translation type="unfinished"/>
+        <translation>משך הצלילה:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="222"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="223"/>
         <source>Cloud credentials</source>
-        <translation type="unfinished"/>
+        <translation>זיהוי לענן</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="228"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="229"/>
         <source>Please tap the &apos;+&apos; button to add a dive</source>
+        <translation>אנא הקש על הכפתור &quot;+&quot; כדי להוסיף צלילה</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="248"/>
+        <source>No dives in dive list</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DiveListView</name>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="846"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="849"/>
         <source>Expand all</source>
         <translation>הצג הכל</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="848"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="851"/>
         <source>Collapse all</source>
         <translation>הסתר הכל</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="852"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="855"/>
         <source>Collapse others</source>
         <translation>הסתר אחרים</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="856"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="859"/>
         <source>Remove dive(s) from trip</source>
         <translation>הסיר צלילה/צלילות מטיול</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="857"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="860"/>
         <source>Create new trip above</source>
         <translation>צור טיול חדש למלעה</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="871"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="874"/>
         <source>Add dive(s) to trip immediately above</source>
         <translation>להוסיף צלילה/צלילות לטיול למעלה</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="873"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="876"/>
         <source>Add dive(s) to trip immediately below</source>
         <translation>להוסיף צלילה/צלילות לטיול למטה</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="877"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="880"/>
         <source>Merge trip with trip above</source>
         <translation>לאגד את הטיל עם הטיול למלעה</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="878"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="881"/>
         <source>Merge trip with trip below</source>
         <translation>לאגד את הטיל עם הטיול למטה</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="882"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="885"/>
         <source>Delete dive(s)</source>
         <translation>מחיקת צלילה/צלילות</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="884"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="887"/>
         <source>Mark dive(s) invalid</source>
         <translation>לא להתחשב בצלילות</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="888"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="891"/>
         <source>Merge selected dives</source>
         <translation>לאגד צלילות הנבחרות</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="890"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="893"/>
         <source>Renumber dive(s)</source>
         <translation>מספר צלילה/צלילות מחדש</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="891"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="894"/>
         <source>Shift dive times</source>
         <translation>להזיז זמן צלילה</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="892"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="895"/>
         <source>Split selected dives</source>
         <translation>לפצל צלילות נבחרות</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="893"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="896"/>
         <source>Load image(s) from file(s)</source>
         <translation>טען תמונה/תמונות מ-קובץ/קבצים</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="894"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="897"/>
         <source>Load image(s) from web</source>
         <translation>טען תמונה/תמונות מהרשת</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="917"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="919"/>
         <source>Open image files</source>
         <translation>פתך קובצי תמונה</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="917"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="919"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>קבצי תמונה (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -2328,56 +2381,6 @@ GPS location:</source>
 <context>
     <name>DiveLogExportDialog</name>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="103"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="351"/>
-        <source>Export format</source>
-        <translation>פורמט יצוא</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="134"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="353"/>
-        <source>UDDF</source>
-        <translation>UDDF</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="187"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="358"/>
-        <source>Worldmap</source>
-        <translation>מפת העולם</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="197"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="359"/>
-        <source>I&amp;mage depths</source>
-        <translation>עומק של תמונות</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="243"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="360"/>
-        <source>Selection</source>
-        <translation>בחירה</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="252"/>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="346"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="361"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="372"/>
-        <source>Selected dives</source>
-        <translation>צלילות נבחרות</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="262"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="362"/>
-        <source>All dives</source>
-        <translation>כל הצלילות</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="306"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="396"/>
-        <source>HTML</source>
-        <translation>HTML</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="14"/>
         <location filename="../build/ui_divelogexportdialog.h" line="349"/>
         <source>Export dive log files</source>
@@ -2390,12 +2393,24 @@ GPS location:</source>
         <translation>יצוא כללי</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="103"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="351"/>
+        <source>Export format</source>
+        <translation>פורמט יצוא</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="115"/>
         <location filename="../build/ui_divelogexportdialog.h" line="352"/>
         <source>Subsurface &amp;XML</source>
         <translation>XML של Subsurface</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="134"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="353"/>
+        <source>UDDF</source>
+        <translation>UDDF</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="147"/>
         <location filename="../build/ui_divelogexportdialog.h" line="354"/>
         <source>di&amp;velogs.de</source>
@@ -2420,238 +2435,297 @@ GPS location:</source>
         <translation>פרטי צלילה בפורמט CSV</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="275"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="187"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="358"/>
+        <source>Worldmap</source>
+        <translation>מפת העולם</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="197"/>
+        <source>TeX</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="207"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="359"/>
+        <source>I&amp;mage depths</source>
+        <translation>עומק של תמונות</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="253"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="360"/>
+        <source>Selection</source>
+        <translation>בחירה</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="262"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="356"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="361"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="372"/>
+        <source>Selected dives</source>
+        <translation>צלילות נבחרות</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="272"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="362"/>
+        <source>All dives</source>
+        <translation>כל הצלילות</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="285"/>
         <location filename="../build/ui_divelogexportdialog.h" line="363"/>
         <source>CSV units</source>
         <translation>יחידות לפורמט CSV</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="288"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="298"/>
         <location filename="../build/ui_divelogexportdialog.h" line="366"/>
         <source>Metric</source>
         <translation>מידה</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="293"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="303"/>
         <location filename="../build/ui_divelogexportdialog.h" line="367"/>
         <source>Imperial</source>
         <translation>אמריקאית</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="324"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="316"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="396"/>
+        <source>HTML</source>
+        <translation>HTML</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="334"/>
         <location filename="../build/ui_divelogexportdialog.h" line="370"/>
         <source>General settings</source>
         <translation>הגדרות כלליות</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="330"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="340"/>
         <location filename="../build/ui_divelogexportdialog.h" line="371"/>
         <source>Subsurface numbers</source>
         <translation>מספרי Subsurface</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="359"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="369"/>
         <location filename="../build/ui_divelogexportdialog.h" line="373"/>
         <source>Export yearly statistics</source>
         <translation>יצוא סטטיסטיקות שנתית</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="375"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="385"/>
         <location filename="../build/ui_divelogexportdialog.h" line="374"/>
         <source>All di&amp;ves</source>
         <translation>כל הצלילות</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="385"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="395"/>
         <location filename="../build/ui_divelogexportdialog.h" line="375"/>
         <source>Export list only</source>
         <translation>יצוא רשימה בלבד</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="392"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="402"/>
         <location filename="../build/ui_divelogexportdialog.h" line="376"/>
         <source>Export photos</source>
         <translation>יצוא תמונות</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="408"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="418"/>
         <location filename="../build/ui_divelogexportdialog.h" line="377"/>
         <source>Style options</source>
         <translation>אפשרויות סגנון</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="423"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="433"/>
         <location filename="../build/ui_divelogexportdialog.h" line="378"/>
         <source>Font</source>
         <translation>גופן</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="433"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="443"/>
         <location filename="../build/ui_divelogexportdialog.h" line="379"/>
         <source>Font size</source>
         <translation>גודל גופן</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="444"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="454"/>
         <location filename="../build/ui_divelogexportdialog.h" line="382"/>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="449"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="459"/>
         <location filename="../build/ui_divelogexportdialog.h" line="383"/>
         <source>10</source>
         <translation>10</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="454"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="464"/>
         <location filename="../build/ui_divelogexportdialog.h" line="384"/>
         <source>12</source>
         <translation>12</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="459"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="469"/>
         <location filename="../build/ui_divelogexportdialog.h" line="385"/>
         <source>14</source>
         <translation>14</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="464"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="474"/>
         <location filename="../build/ui_divelogexportdialog.h" line="386"/>
         <source>16</source>
         <translation>16</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="469"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="479"/>
         <location filename="../build/ui_divelogexportdialog.h" line="387"/>
         <source>18</source>
         <translation>18</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="474"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="484"/>
         <location filename="../build/ui_divelogexportdialog.h" line="388"/>
         <source>20</source>
         <translation>20</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="482"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="492"/>
         <location filename="../build/ui_divelogexportdialog.h" line="390"/>
         <source>Theme</source>
         <translation>סגנון</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="493"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="503"/>
         <location filename="../build/ui_divelogexportdialog.h" line="393"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="95"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="99"/>
         <source>Light</source>
         <translation>אור</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="498"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="508"/>
         <location filename="../build/ui_divelogexportdialog.h" line="394"/>
         <source>Sand</source>
         <translation>חול</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="134"/>
-        <source>UDDF files (*.uddf *.UDDF)</source>
-        <translation>UDDF קבצי (*.uddf *.UDDF)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="142"/>
-        <source>CSV files (*.csv *.CSV)</source>
-        <translation>קבצי   (*.csv *.CSV)CSV</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="74"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="76"/>
         <source>Generic format that is used for data exchange between a variety of diving related programs.</source>
         <translation>פורמט גנרי המשמש לחילופי נתונים בין מגוון רחב של תוכניות הקשורות לצלילה .</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="76"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="78"/>
         <source>Comma separated values describing the dive profile.</source>
         <translation>ערכים מופרדים בפסיקים המתארים את פרופיל הצלילה.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="78"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="80"/>
         <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source>
         <translation>ערכים מופרדים בפסיקים המתארים את נתוני הצלילה. זה כולל את רוב פרטי הצלילה אבל לא את פרטי פרופיל.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="80"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="82"/>
         <source>Send the dive data to divelogs.de website.</source>
         <translation>שלח את נתוני צלילה לאתר divelogs.de.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="82"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="84"/>
         <source>Send the dive data to dive-share.appspot.com website</source>
         <translation>שלח את נתוני צלילה לאתר dive-share.appspot.com</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="84"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="86"/>
         <source>HTML export of the dive locations, visualized on a world map.</source>
         <translation>יצוא HTML של מקיומי הצלילות, על מפת העולם.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="86"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="88"/>
         <source>Subsurface native XML format.</source>
         <translation>פורמט XML של Subsurface.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="88"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="90"/>
         <source>Write depths of images to file.</source>
         <translation>לכתוב מעמקי תמונות לקובץ.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="133"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="92"/>
+        <source>Write dive as TeX macros to file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="137"/>
         <source>Export UDDF file as</source>
         <translation>היצוא קובץ UDDF כ-</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="137"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/>
+        <source>UDDF files (*.uddf *.UDDF)</source>
+        <translation>UDDF קבצי (*.uddf *.UDDF)</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divelogexportdialog.cpp" line="141"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="145"/>
         <source>Export CSV file as</source>
         <translation>היצוא קובץ CSV כ-</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="148"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="142"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="146"/>
+        <source>CSV files (*.csv *.CSV)</source>
+        <translation>קבצי   (*.csv *.CSV)CSV</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="152"/>
         <source>Export world map</source>
         <translation>היצוא מפת העולם</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="149"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="169"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="153"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="177"/>
         <source>HTML files (*.html)</source>
         <translation>קבצי HTML (*.html)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="153"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="157"/>
         <source>Export Subsurface XML</source>
         <translation>היצוא XML של Subsurface</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="158"/>
         <source>XML files (*.xml *.ssrf)</source>
         <translation>קבצי XML  נתמכים (*.ssrf *.xml)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="162"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="166"/>
         <source>Save image depths</source>
         <translation>שמור עומק של תמונות</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="168"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="170"/>
+        <source>Export to TeX file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="170"/>
+        <source>TeX files (*.tex)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="176"/>
         <source>Export HTML files as</source>
         <translation>היצוא קובצי HTML כ-</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="184"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="192"/>
         <source>Please wait, exporting...</source>
         <translation>אנא המתן, יצוא ...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="219"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="227"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="311"/>
         <source>Can&apos;t open file %s</source>
         <translation>לא ניתן לפתוח קובץ %s</translation>
     </message>
@@ -2665,25 +2739,6 @@ GPS location:</source>
         <translation> יבוא קובץ יומן צלילה</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="643"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="727"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="856"/>
-        <source>Time</source>
-        <translation>זמן</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.ui" line="127"/>
-        <location filename="../build/ui_divelogimportdialog.h" line="164"/>
-        <source>Metric</source>
-        <translation>מידה</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.ui" line="132"/>
-        <location filename="../build/ui_divelogimportdialog.h" line="165"/>
-        <source>Imperial</source>
-        <translation>אמריקאית</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divelogimportdialog.ui" line="89"/>
         <location filename="../build/ui_divelogimportdialog.h" line="152"/>
         <source>dd.mm.yyyy</source>
@@ -2702,74 +2757,6 @@ GPS location:</source>
         <translation>yyyy-mm-dd</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.ui" line="155"/>
-        <location filename="../build/ui_divelogimportdialog.h" line="167"/>
-        <source>Drag the tags above to each corresponding column below</source>
-        <translation>גרור את התגים מעל כל עמודה מקבילה למטה</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="641"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="729"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="852"/>
-        <source>Dive #</source>
-        <translation>צלילה מס&apos; </translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="642"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="723"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="854"/>
-        <source>Date</source>
-        <translation>תאריך</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="644"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="858"/>
-        <source>Duration</source>
-        <translation>משך הצלילה</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="655"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="862"/>
-        <source>GPS</source>
-        <translation>GPS</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="645"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="864"/>
-        <source>Max. depth</source>
-        <translation>עומק מירבי</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="646"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="866"/>
-        <source>Avg. depth</source>
-        <translation>עומק ממוצע</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="658"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="872"/>
-        <source>Suit</source>
-        <translation>חליפה</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="663"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="878"/>
-        <source>Tags</source>
-        <translation>תגיות</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="652"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="894"/>
-        <source>O₂</source>
-        <translation>חמצן</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="653"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="896"/>
-        <source>He</source>
-        <translation>הליום</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divelogimportdialog.ui" line="108"/>
         <location filename="../build/ui_divelogimportdialog.h" line="158"/>
         <source>Seconds</source>
@@ -2788,202 +2775,288 @@ GPS location:</source>
         <translation>דקות:שניות</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="654"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="860"/>
-        <source>Location</source>
-        <translation>מיקום</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.ui" line="127"/>
+        <location filename="../build/ui_divelogimportdialog.h" line="164"/>
+        <source>Metric</source>
+        <translation>מידה</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="354"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="499"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="505"/>
+        <location filename="../desktop-widgets/divelogimportdialog.ui" line="132"/>
+        <location filename="../build/ui_divelogimportdialog.h" line="165"/>
+        <source>Imperial</source>
+        <translation>אמריקאית</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.ui" line="155"/>
+        <location filename="../build/ui_divelogimportdialog.h" line="167"/>
+        <source>Drag the tags above to each corresponding column below</source>
+        <translation>גרור את התגים מעל כל עמודה מקבילה למטה</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="355"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="528"/>
         <source>Tab</source>
         <translation>Tab</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="575"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="598"/>
         <source>Some column headers were pre-populated; please drag and drop the headers so they match the column they are in.</source>
         <translation>כותרות עמודות חלקם היו מראש מאוכלסות; בבקשה לגרור ולשחרר את הכותרות כך שיתאימו לטור שבו הם נמצאים.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="613"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="731"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="782"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="848"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="636"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="761"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="857"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="925"/>
         <source>Sample time</source>
         <translation>זמן דגימה</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="615"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="733"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="784"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="638"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="763"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="859"/>
         <source>Sample depth</source>
         <translation>עומק דגימה</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="617"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="735"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="786"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="640"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="765"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="861"/>
         <source>Sample temperature</source>
         <translation>טמפ&apos; דגימה</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="621"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="739"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="790"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="642"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="767"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="863"/>
+        <source>Sample pO₂</source>
+        <translation>pO₂ של דגימה</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="644"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="769"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="865"/>
         <source>Sample sensor1 pO₂</source>
         <translation>דגימה pO₂ של חיישן 1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="623"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="741"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="792"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="646"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="771"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="867"/>
         <source>Sample sensor2 pO₂</source>
         <translation>דגימה pO₂ של חיישן 2</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="625"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="743"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="794"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="648"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="773"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="869"/>
         <source>Sample sensor3 pO₂</source>
         <translation>דגימה pO₂ של חיישן 3</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="633"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="751"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="802"/>
-        <source>Sample stopdepth</source>
-        <translation>עומק תכנת עצירה של דגימה</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="637"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="755"/>
-        <source>Sample setpoint</source>
-        <translation>נקודה קבוע של דגימה</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="619"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="737"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="788"/>
-        <source>Sample pO₂</source>
-        <translation>pO₂ של דגימה</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="627"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="745"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="796"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="650"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="775"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="871"/>
         <source>Sample CNS</source>
         <translation>CNS של דגימה</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="629"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="747"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="798"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="652"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="777"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="873"/>
         <source>Sample NDL</source>
         <translation>NDL של דגימה</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="631"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="749"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="800"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="654"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="779"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="875"/>
         <source>Sample TTS</source>
         <translation>זמן לפני המים של הדגימה</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="635"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="753"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="804"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="656"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="781"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="877"/>
+        <source>Sample stopdepth</source>
+        <translation>עומק תכנת עצירה של דגימה</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="658"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="783"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="879"/>
         <source>Sample pressure</source>
         <translation>זחץ של דגימה</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="656"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="868"/>
-        <source>Divemaster</source>
-        <translation>מדריך צלילה</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="660"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="785"/>
+        <source>Sample setpoint</source>
+        <translation>נקודה קבוע של דגימה</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="657"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="870"/>
-        <source>Buddy</source>
-        <translation>בן זוג</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="664"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="759"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="929"/>
+        <source>Dive #</source>
+        <translation>צלילה מס&apos; </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="659"/>
-        <source>Rating</source>
-        <translation>דירוג</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="665"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="753"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="931"/>
+        <source>Date</source>
+        <translation>תאריך</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="660"/>
-        <source>Visibility</source>
-        <translation>ראות</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="666"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="757"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="933"/>
+        <source>Time</source>
+        <translation>זמן</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="661"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="874"/>
-        <source>Notes</source>
-        <translation>הערות</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="667"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="935"/>
+        <source>Duration</source>
+        <translation>משך הצלילה</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="662"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="876"/>
-        <source>Weight</source>
-        <translation>משקל</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="668"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="941"/>
+        <source>Max. depth</source>
+        <translation>עומק מירבי</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="669"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="943"/>
+        <source>Avg. depth</source>
+        <translation>עומק ממוצע</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="670"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="975"/>
+        <source>Air temp.</source>
+        <translation>טמפ&apos; האוויר</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="671"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="977"/>
+        <source>Water temp.</source>
+        <translation>טמפ&apos; המים</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="649"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="888"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="672"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="965"/>
         <source>Cyl. size</source>
         <translation>נפח מיכל</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="650"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="890"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="673"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="967"/>
         <source>Start pressure</source>
         <translation>לחץ התחלתי</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="651"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="892"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="674"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="969"/>
         <source>End pressure</source>
         <translation>לחץ סופי</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="647"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="898"/>
-        <source>Air temp.</source>
-        <translation>טמפ&apos; האוויר</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="675"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="971"/>
+        <source>O₂</source>
+        <translation>חמצן</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="648"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="900"/>
-        <source>Water temp.</source>
-        <translation>טמפ&apos; המים</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="676"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="973"/>
+        <source>He</source>
+        <translation>הליום</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="677"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="937"/>
+        <source>Location</source>
+        <translation>מיקום</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="678"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="939"/>
+        <source>GPS</source>
+        <translation>GPS</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="679"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="945"/>
+        <source>Divemaster</source>
+        <translation>מדריך צלילה</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="680"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="947"/>
+        <source>Buddy</source>
+        <translation>בן זוג</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="681"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="949"/>
+        <source>Suit</source>
+        <translation>חליפה</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="682"/>
+        <source>Rating</source>
+        <translation>דירוג</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="683"/>
+        <source>Visibility</source>
+        <translation>ראות</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="684"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="951"/>
+        <source>Notes</source>
+        <translation>הערות</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="685"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="953"/>
+        <source>Weight</source>
+        <translation>משקל</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="686"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="955"/>
+        <source>Tags</source>
+        <translation>תגיות</translation>
     </message>
 </context>
 <context>
     <name>DiveObjectHelper</name>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="287"/>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="323"/>
         <source>%1 dive(s)</source>
-        <translation type="unfinished"/>
+        <translation>%1 צליצ(ה/ות)</translation>
     </message>
 </context>
 <context>
     <name>DivePlanner</name>
     <message>
-        <location filename="../desktop-widgets/diveplanner.ui" line="152"/>
-        <location filename="../build/ui_diveplanner.h" line="190"/>
-        <source>Altitude</source>
-        <translation>גובה</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/diveplanner.ui" line="109"/>
         <location filename="../build/ui_diveplanner.h" line="189"/>
         <source>Planned dive time</source>
         <translation>זמן צלילה מתוכנן</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/diveplanner.ui" line="152"/>
+        <location filename="../build/ui_diveplanner.h" line="190"/>
+        <source>Altitude</source>
+        <translation>גובה</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/diveplanner.ui" line="159"/>
         <location filename="../build/ui_diveplanner.h" line="191"/>
         <source>ATM pressure</source>
@@ -3017,32 +3090,32 @@ GPS location:</source>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="134"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="136"/>
         <source>unknown</source>
         <translation>לא ידוע</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="312"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="326"/>
         <source>Final depth</source>
         <translation>עומק מירבי</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="314"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="328"/>
         <source>Run time</source>
         <translation>זמן צלילה</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="316"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="330"/>
         <source>Duration</source>
         <translation>משך הצלילה</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="318"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="332"/>
         <source>Used gas</source>
         <translation>גז שנוצל</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="320"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="334"/>
         <source>CC setpoint</source>
         <translation>נקודה קבוע למערכת סגורה</translation>
     </message>
@@ -3050,22 +3123,22 @@ GPS location:</source>
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="108"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="112"/>
         <source>Dive planner points</source>
         <translation>נקודת מתכנן צלילה</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="112"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="116"/>
         <source>Available gases</source>
         <translation>גזים קיימים</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="137"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="143"/>
         <source>Add dive data point</source>
         <translation>הוסיף נקודת נתוני צלילה</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="146"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="152"/>
         <source>Save new</source>
         <translation>שמור חדש</translation>
     </message>
@@ -3098,11 +3171,36 @@ GPS location:</source>
         <translation>צבע</translation>
     </message>
     <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="124"/>
+        <source>User entered</source>
+        <translation>הוכנס על ידי המשתמש</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="126"/>
+        <source>Cylinder index</source>
+        <translation>מספר מיכל</translation>
+    </message>
+    <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="128"/>
         <source>Pressure S</source>
         <translation>לחץ S</translation>
     </message>
     <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="130"/>
+        <source>Pressure I</source>
+        <translation>לחץ I</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="132"/>
+        <source>Ceiling</source>
+        <translation>תקרה</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="134"/>
+        <source>SAC</source>
+        <translation>צריכת אויר</translation>
+    </message>
+    <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="136"/>
         <source>pN₂</source>
         <translation>pN₂</translation>
@@ -3138,49 +3236,24 @@ GPS location:</source>
         <translation>חיישן 3</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="152"/>
-        <source>Heart rate</source>
-        <translation>קצב לב</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="156"/>
-        <source>Mean depth @ s</source>
-        <translation>עומק ממוצע @ שניות</translation>
-    </message>
-    <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="150"/>
         <source>Ambient pressure</source>
         <translation>לחץ סביבתי</translation>
     </message>
     <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="152"/>
+        <source>Heart rate</source>
+        <translation>קצב לב</translation>
+    </message>
+    <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="154"/>
         <source>Gradient factor</source>
         <translation>גרדיאנט</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="130"/>
-        <source>Pressure I</source>
-        <translation>לחץ I</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="124"/>
-        <source>User entered</source>
-        <translation>הוכנס על ידי המשתמש</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="126"/>
-        <source>Cylinder index</source>
-        <translation>מספר מיכל</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="132"/>
-        <source>Ceiling</source>
-        <translation>תקרה</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="134"/>
-        <source>SAC</source>
-        <translation>צריכת אויר</translation>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="156"/>
+        <source>Mean depth @ s</source>
+        <translation>עומק ממוצע @ שניות</translation>
     </message>
 </context>
 <context>
@@ -3252,311 +3325,315 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="395"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="441"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="434"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="483"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="398"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="444"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="437"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="486"/>
         <source>Date</source>
         <translation>תאריך</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="401"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="447"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="440"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="489"/>
         <source>Rating</source>
         <translation>דירוג</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="404"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="443"/>
         <source>Depth</source>
         <translation>עומק</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="410"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="446"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="495"/>
+        <source>Duration</source>
+        <translation>משך הצלילה</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="449"/>
         <source>Temp</source>
         <translation>טמפ</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="413"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="452"/>
         <source>Weight</source>
         <translation>משקל</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="425"/>
-        <source>SAC</source>
-        <translation>צריכת אויר</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
-        <source>m</source>
-        <translation>מטר</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
-        <source>ft</source>
-        <translation>רגל</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
-        <source>Weight(%1)</source>
-        <translation>משקל(%1)</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="416"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="462"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="455"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="504"/>
         <source>Suit</source>
         <translation>חליפה</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="419"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="465"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="458"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="507"/>
         <source>Cyl</source>
         <translation>מיכל</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="422"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="468"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="461"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="510"/>
         <source>Gas</source>
         <translation>גז</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
-        <source>SAC(%1)</source>
-        <translation>צריכת גז (%1)</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="464"/>
+        <source>SAC</source>
+        <translation>צריכת אויר</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
-        <source>/min</source>
-        <translation>לדקה</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="467"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="518"/>
+        <source>OTU</source>
+        <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="431"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="479"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="470"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="521"/>
         <source>Max CNS</source>
         <translation>רעילות שייורית מקסימלית</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="434"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="482"/>
-        <source>Location</source>
-        <translation>מיקום</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
+        <source>Photos</source>
+        <translation>תמונות</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
-        <source>kg</source>
-        <translation>קילוגרם</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="476"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="527"/>
+        <source>Location</source>
+        <translation>מיקום</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="492"/>
         <source>Depth(%1)</source>
         <translation>עומק (%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="407"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="453"/>
-        <source>Duration</source>
-        <translation>משך הצלילה</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="492"/>
+        <source>m</source>
+        <translation>מטר</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="492"/>
+        <source>ft</source>
+        <translation>רגל</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="456"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="498"/>
         <source>Temp(%1%2)</source>
         <translation>טמפרטורה(%1%2)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="501"/>
+        <source>Weight(%1)</source>
+        <translation>משקל(%1)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="501"/>
+        <source>kg</source>
+        <translation>קילוגרם</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="501"/>
         <source>lbs</source>
         <translation>ליברה</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="428"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="476"/>
-        <source>OTU</source>
-        <translation>OTU</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="515"/>
+        <source>SAC(%1)</source>
+        <translation>צריכת גז (%1)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="515"/>
+        <source>/min</source>
+        <translation>לדקה</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="524"/>
+        <source>Photos before/during/after dive</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="164"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="165"/>
         <source>no dives were selected</source>
         <translation>שום צלילות נבחרו</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="174"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="175"/>
         <source>stylesheet to export to divelogs.de is not found</source>
         <translation>stylesheet לייצא ל-divelogs.de לא נמצא</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="184"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="185"/>
         <source>failed to create zip file for upload: %s</source>
         <translation>נכשל ביצירת קובץ zip להעלאה: %s</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="236"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="237"/>
         <source>internal error</source>
         <translation>שגיאה פנימית</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="244"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="245"/>
         <source>Conversion of dive %1 to divelogs.de format failed</source>
         <translation>המרה של צלילה %1 לפורמט של divelogs.de נכשלה</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="272"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="273"/>
         <source>error writing zip file: %s zip error %d system error %d - %s</source>
         <translation>כישלון בכתיבת קובץ zip: %s שגיאת zip %d שגיאת מערכת%d - %s</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="745"/>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="935"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="936"/>
         <source>Done</source>
         <translation>סיים</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="778"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="779"/>
         <source>Uploading dive list...</source>
         <translation>העלאת רשימת צלילות...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="810"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="811"/>
         <source>Downloading dive list...</source>
         <translation>הורדת רשימת צלילות...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="851"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="852"/>
         <source>Downloading %1 dives...</source>
         <translation>הורדת %1 צלילות...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="885"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="886"/>
         <source>Download finished - %1</source>
         <translation>ההורדה הסתיימה - %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="899"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="900"/>
         <source>Problem with download</source>
         <translation>תקלה בהורדה</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="900"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="901"/>
         <source>The archive could not be opened:
 </source>
         <translation>לא היה אפשרות לפתוח את הארכיון
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="909"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="910"/>
         <source>Corrupted download</source>
         <translation>הורדה פגומה</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="910"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="911"/>
         <source>The archive could not be opened:
 %1</source>
         <translation>לא היה אפשרות לפתוח את הארכיון:
 %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="937"/>
+        <source>Upload finished</source>
+        <translation>ההעלאה הסתיימה</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="950"/>
         <source>Upload failed</source>
         <translation>ההעלאה נכשלה</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="952"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="953"/>
         <source>Upload successful</source>
         <translation>ההעלאה הסתיימה בהצלחה</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="955"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="956"/>
         <source>Login failed</source>
         <translation>שגיאת התחברות (הזדהות)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="958"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="959"/>
         <source>Cannot parse response</source>
         <translation>תשובה לא ברורה</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="970"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="971"/>
         <source>Error: %1</source>
         <translation>שגיאה: %1</translation>
     </message>
-    <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="936"/>
-        <source>Upload finished</source>
-        <translation>ההעלאה הסתיימה</translation>
-    </message>
 </context>
 <context>
     <name>DownloadFromDCWidget</name>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="185"/>
-        <source>Error</source>
-        <translation>שגיאה</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="436"/>
-        <source>Retry</source>
-        <translation>נסה שוב</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="280"/>
-        <source>Find Uemis dive computer</source>
-        <translation>חפש מחשב צלילה Uemis</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="101"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="107"/>
         <source>Download</source>
         <translation>הורדה</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="104"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="110"/>
         <source>Choose Bluetooth download mode</source>
         <translation>בחר מוד הורדה ל-Bluetooth</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="382"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="191"/>
+        <source>Error</source>
+        <translation>שגיאה</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="286"/>
+        <source>Find Uemis dive computer</source>
+        <translation>חפש מחשב צלילה Uemis</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="392"/>
         <source>Choose file for divecomputer download logfile</source>
         <translation>בחור קובץ לקובץ log להורדה של libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="383"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="393"/>
         <source>Log files (*.log)</source>
         <translation>קבצי יומן (*.log)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="398"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="408"/>
         <source>Warning</source>
         <translation>אזהרה</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="399"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="409"/>
         <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source>
         <translation>שמירת dump של libdivecomputer לא להוריד צלילות לרשימת הצלילה.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="410"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="420"/>
         <source>Choose file for divecomputer binary dump file</source>
         <translation>בחר קובץ לקובץ dump של divecomputer</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="411"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="421"/>
         <source>Dump files (*.bin)</source>
         <translation>קבצי Dump (*.bin)</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="446"/>
+        <source>Retry</source>
+        <translation>נסה שוב</translation>
+    </message>
 </context>
 <context>
     <name>DownloadFromDiveComputer</name>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="139"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="275"/>
-        <source>Vendor</source>
-        <translation>יצרן</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="14"/>
         <location filename="../build/ui_downloadfromdivecomputer.h" line="265"/>
         <source>Download from dive computer</source>
@@ -3569,17 +3646,6 @@ p, li { white-space: pre-wrap; }
         <translation>כונן או ספריה</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="122"/>
-        <source>Choose Bluetooth download mode</source>
-        <translation>בחר מוד הורדה ל-Bluetooth</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="149"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="276"/>
-        <source>Dive computer</source>
-        <translation>מחשב צלילה</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="66"/>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="101"/>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="115"/>
@@ -3603,11 +3669,46 @@ p, li { white-space: pre-wrap; }
         <translation>תמיד העדף צלילות מורדות</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="87"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="270"/>
+        <source>Download into new trip</source>
+        <translation>ההורדה לטיול חדש</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="94"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="271"/>
+        <source>Save libdivecomputer logfile</source>
+        <translation>שמור קובץ log של libdivecomputer</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="108"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="273"/>
+        <source>Save libdivecomputer dumpfile</source>
+        <translation>שמור קובץ dump של libdivecomputer</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="122"/>
+        <source>Choose Bluetooth download mode</source>
+        <translation>בחר מוד הורדה ל-Bluetooth</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="129"/>
         <source>Select a remote Bluetooth device.</source>
         <translation>בחירת מכשירי Bluetooth מרחוק</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="139"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="275"/>
+        <source>Vendor</source>
+        <translation>יצרן</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="149"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="276"/>
+        <source>Dive computer</source>
+        <translation>מחשב צלילה</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/>
         <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="52"/>
         <location filename="../build/ui_downloadfromdivecomputer.h" line="277"/>
@@ -3615,18 +3716,6 @@ p, li { white-space: pre-wrap; }
         <translation>הורדה</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="284"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="281"/>
-        <source>OK</source>
-        <translation>אשר</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="291"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="282"/>
-        <source>Cancel</source>
-        <translation>בטל</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="226"/>
         <location filename="../build/ui_downloadfromdivecomputer.h" line="278"/>
         <source>Downloaded dives</source>
@@ -3645,22 +3734,16 @@ p, li { white-space: pre-wrap; }
         <translation>בטל בחירת הכל</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="94"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="271"/>
-        <source>Save libdivecomputer logfile</source>
-        <translation>שמור קובץ log של libdivecomputer</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="108"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="273"/>
-        <source>Save libdivecomputer dumpfile</source>
-        <translation>שמור קובץ dump של libdivecomputer</translation>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="284"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="281"/>
+        <source>OK</source>
+        <translation>אשר</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="87"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="270"/>
-        <source>Download into new trip</source>
-        <translation>ההורדה לטיול חדש</translation>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="291"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="282"/>
+        <source>Cancel</source>
+        <translation>בטל</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="16"/>
@@ -3670,12 +3753,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="38"/>
         <source> Vendor name : </source>
-        <translation type="unfinished"/>
+        <translation>שם יצרן :</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="42"/>
         <source> Dive Computer:</source>
-        <translation type="unfinished"/>
+        <translation>מחשב צלילה:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="54"/>
@@ -3691,12 +3774,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="68"/>
         <source> Downloaded dives</source>
-        <translation type="unfinished"/>
+        <translation>צלילות שהורדו</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="79"/>
         <source>Date / Time</source>
-        <translation type="unfinished"/>
+        <translation>תעריך/שעה</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="84"/>
@@ -3721,7 +3804,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="115"/>
         <source>Unselect All</source>
-        <translation type="unfinished"/>
+        <translation>בטל בחירת הכל</translation>
     </message>
 </context>
 <context>
@@ -3750,12 +3833,12 @@ p, li { white-space: pre-wrap; }
         <translation>להתחבר לפייסבוק מציין מיקום טקסט </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="297"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="242"/>
         <source>To disconnect Subsurface from your Facebook account, use the button below</source>
         <translation>כדי לנתק Subsurface מהחשבון שלך בפייסבוק, להשתמש בלחצן למטה</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="306"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="251"/>
         <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source>
         <translation>כדי להתחבר לפייסבוק, אנא התחבר. זה מאפשר Subsurface לפרסם צלילות לציר הזמן שלך</translation>
     </message>
@@ -3763,22 +3846,22 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>FacebookManager</name>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="266"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="211"/>
         <source>Photo upload sucessfull</source>
         <translation>תמונה העלאת בהצלחה</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="267"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="212"/>
         <source>Your dive profile was updated to Facebook.</source>
         <translation>פרופיל צלילה העלתה ל-Facebook.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="271"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="216"/>
         <source>Photo upload failed</source>
         <translation>ההעלאת תמונה נכשלה</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="272"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="217"/>
         <source>Your dive profile was not updated to Facebook, 
  please send the following to the developer. 
 </source>
@@ -3840,17 +3923,25 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>FirmwareUpdateThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1750"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1739"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>אפשרות זו לא קיים למחשב צלילה הנבחר</translation>
     </message>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1755"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1744"/>
         <source>Firmware update failed!</source>
         <translation>עידקון קושחה נחשלה!</translation>
     </message>
 </context>
 <context>
+    <name>GlobalDrawer</name>
+    <message>
+        <location filename="../mobile-widgets/qml/kirigami/src/controls/GlobalDrawer.qml" line="364"/>
+        <source>Back</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>GlobeGPS</name>
     <message>
         <location filename="../desktop-widgets/globe.cpp" line="124"/>
@@ -3863,32 +3954,32 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../mobile-widgets/qml/GpsList.qml" line="16"/>
         <source>GPS Fixes</source>
-        <translation type="unfinished"/>
+        <translation>נ&quot;צים שמורים</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="40"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="32"/>
         <source>Date: </source>
-        <translation type="unfinished"/>
+        <translation>תאריך:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="50"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="42"/>
         <source>Name: </source>
         <translation>שם:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="60"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="52"/>
         <source>Latitude: </source>
-        <translation type="unfinished"/>
+        <translation>קו רוחב:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="69"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="61"/>
         <source>Longitude: </source>
-        <translation type="unfinished"/>
+        <translation>קו אורך:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="113"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="105"/>
         <source>List of stored GPS fixes</source>
-        <translation type="unfinished"/>
+        <translation>רשימת נ&quot;צים שנשמרים</translation>
     </message>
 </context>
 <context>
@@ -3896,7 +3987,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../core/gpslocation.cpp" line="121"/>
         <source>Unknown GPS location</source>
-        <translation type="unfinished"/>
+        <translation>נ&quot;צ לא מוכר</translation>
     </message>
 </context>
 <context>
@@ -3915,7 +4006,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>LocationFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="648"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="646"/>
         <source>Location: </source>
         <translation>מיקום:</translation>
     </message>
@@ -3956,7 +4047,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>LocationFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="299"/>
+        <location filename="../qt-models/filtermodels.cpp" line="304"/>
         <source>No location set</source>
         <translation>מיקום לא מוגדר</translation>
     </message>
@@ -4074,24 +4165,59 @@ p, li { white-space: pre-wrap; }
         <location filename="../mobile-widgets/qml/Log.qml" line="15"/>
         <location filename="../mobile-widgets/qml/Log.qml" line="23"/>
         <source>Application Log</source>
-        <translation type="unfinished"/>
+        <translation>אירועים נשמרים של התוכנה</translation>
     </message>
 </context>
 <context>
-    <name>MainForm.ui</name>
+    <name>MainTab</name>
     <message>
-        <location filename="../packaging/ios/Subsurface-mobile/MainForm.ui.qml" line="17"/>
-        <source>Press Me 1</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/maintab.ui" line="18"/>
+        <location filename="../desktop-widgets/maintab.ui" line="439"/>
+        <location filename="../build/ui_maintab.h" line="961"/>
+        <location filename="../build/ui_maintab.h" line="963"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="539"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="571"/>
+        <source>Notes</source>
+        <translation>הערות</translation>
     </message>
     <message>
-        <location filename="../packaging/ios/Subsurface-mobile/MainForm.ui.qml" line="22"/>
-        <source>Press Me 2</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/maintab.ui" line="21"/>
+        <location filename="../build/ui_maintab.h" line="964"/>
+        <source>General notes about the current selection</source>
+        <translation>הערות כלליות על הבחירה הנוכחית</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="92"/>
+        <location filename="../desktop-widgets/maintab.ui" line="646"/>
+        <location filename="../build/ui_maintab.h" line="947"/>
+        <location filename="../build/ui_maintab.h" line="967"/>
+        <source>Date</source>
+        <translation>תאריך</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="102"/>
+        <location filename="../build/ui_maintab.h" line="948"/>
+        <source>Time</source>
+        <translation>זמן</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="112"/>
+        <location filename="../desktop-widgets/maintab.ui" line="836"/>
+        <location filename="../build/ui_maintab.h" line="949"/>
+        <location filename="../build/ui_maintab.h" line="987"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="306"/>
+        <source>Air temp.</source>
+        <translation>טמפ&apos; האוויר</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="122"/>
+        <location filename="../desktop-widgets/maintab.ui" line="855"/>
+        <location filename="../build/ui_maintab.h" line="950"/>
+        <location filename="../build/ui_maintab.h" line="989"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="307"/>
+        <source>Water temp.</source>
+        <translation>טמפ&apos; המים</translation>
     </message>
-</context>
-<context>
-    <name>MainTab</name>
     <message>
         <location filename="../desktop-widgets/maintab.ui" line="184"/>
         <location filename="../build/ui_maintab.h" line="951"/>
@@ -4100,6 +4226,17 @@ p, li { white-space: pre-wrap; }
         <translation>מיקום</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="214"/>
+        <source>Edit dive site</source>
+        <translation>עריכת אתר צלילה</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="217"/>
+        <location filename="../build/ui_maintab.h" line="953"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="252"/>
         <location filename="../build/ui_maintab.h" line="954"/>
         <source>Divemaster</source>
@@ -4112,12 +4249,6 @@ p, li { white-space: pre-wrap; }
         <translation>בן זוג</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.ui" line="387"/>
-        <location filename="../build/ui_maintab.h" line="959"/>
-        <source>Tags</source>
-        <translation>תגיות</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/maintab.ui" line="308"/>
         <location filename="../build/ui_maintab.h" line="956"/>
         <source>Rating</source>
@@ -4136,57 +4267,18 @@ p, li { white-space: pre-wrap; }
         <translation>חליפה</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="387"/>
+        <location filename="../build/ui_maintab.h" line="959"/>
+        <source>Tags</source>
+        <translation>תגיות</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="397"/>
         <location filename="../build/ui_maintab.h" line="960"/>
         <source>Dive mode</source>
         <translation>מוד צליצה</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.ui" line="112"/>
-        <location filename="../desktop-widgets/maintab.ui" line="836"/>
-        <location filename="../build/ui_maintab.h" line="949"/>
-        <location filename="../build/ui_maintab.h" line="987"/>
-        <location filename="../desktop-widgets/maintab.cpp" line="306"/>
-        <source>Air temp.</source>
-        <translation>טמפ&apos; האוויר</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="122"/>
-        <location filename="../desktop-widgets/maintab.ui" line="855"/>
-        <location filename="../build/ui_maintab.h" line="950"/>
-        <location filename="../build/ui_maintab.h" line="989"/>
-        <location filename="../desktop-widgets/maintab.cpp" line="307"/>
-        <source>Water temp.</source>
-        <translation>טמפ&apos; המים</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="18"/>
-        <location filename="../desktop-widgets/maintab.ui" line="439"/>
-        <location filename="../build/ui_maintab.h" line="961"/>
-        <location filename="../build/ui_maintab.h" line="963"/>
-        <location filename="../desktop-widgets/maintab.cpp" line="539"/>
-        <location filename="../desktop-widgets/maintab.cpp" line="571"/>
-        <source>Notes</source>
-        <translation>הערות</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="21"/>
-        <location filename="../build/ui_maintab.h" line="964"/>
-        <source>General notes about the current selection</source>
-        <translation>הערות כלליות על הבחירה הנוכחית</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="214"/>
-        <source>Edit dive site</source>
-        <translation>עריכת אתר צלילה</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="217"/>
-        <location filename="../build/ui_maintab.h" line="953"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/maintab.ui" line="491"/>
         <location filename="../build/ui_maintab.h" line="965"/>
         <source>Equipment</source>
@@ -4211,6 +4303,12 @@ p, li { white-space: pre-wrap; }
         <translation>פרטי צלילה</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="665"/>
+        <location filename="../build/ui_maintab.h" line="969"/>
+        <source>Interval</source>
+        <translation>משך</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="684"/>
         <location filename="../build/ui_maintab.h" line="971"/>
         <source>Gases used</source>
@@ -4223,18 +4321,38 @@ p, li { white-space: pre-wrap; }
         <translation>גז שנוצל</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="722"/>
+        <location filename="../desktop-widgets/maintab.ui" line="1094"/>
+        <location filename="../build/ui_maintab.h" line="975"/>
+        <location filename="../build/ui_maintab.h" line="1003"/>
+        <source>SAC</source>
+        <translation>צריכת אויר</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="741"/>
         <location filename="../build/ui_maintab.h" line="977"/>
         <source>CNS</source>
         <translation>CNS</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="760"/>
+        <location filename="../build/ui_maintab.h" line="979"/>
+        <source>OTU</source>
+        <translation>OTU</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="779"/>
         <location filename="../build/ui_maintab.h" line="981"/>
         <source>Max. depth</source>
         <translation>עומק מירבי</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="798"/>
+        <location filename="../build/ui_maintab.h" line="983"/>
+        <source>Avg. depth</source>
+        <translation>עומק ממוצע</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="817"/>
         <location filename="../build/ui_maintab.h" line="985"/>
         <source>Air pressure</source>
@@ -4247,82 +4365,6 @@ p, li { white-space: pre-wrap; }
         <translation>משך הצלילה</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.ui" line="933"/>
-        <location filename="../build/ui_maintab.h" line="1007"/>
-        <source>Simple statistics about the selection</source>
-        <translation>סטטיסטיקה פשוטה על הבחירה</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1039"/>
-        <location filename="../build/ui_maintab.h" line="999"/>
-        <source>Total time</source>
-        <translation>סה&quot;כ זמן</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1106"/>
-        <location filename="../build/ui_maintab.h" line="1004"/>
-        <source>Gas consumption</source>
-        <translation>צריכת גז</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1151"/>
-        <location filename="../build/ui_maintab.h" line="1009"/>
-        <source>All photos from the current selection</source>
-        <translation>כל התמונות מהבחירה הנוכחית</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1177"/>
-        <location filename="../build/ui_maintab.h" line="1010"/>
-        <source>Extra data</source>
-        <translation>נתונים נוספים</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1180"/>
-        <location filename="../build/ui_maintab.h" line="1011"/>
-        <source>Adittional data from the dive computer</source>
-        <translation>נתונים נוספים ממחשב צלילה</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="92"/>
-        <location filename="../desktop-widgets/maintab.ui" line="646"/>
-        <location filename="../build/ui_maintab.h" line="947"/>
-        <location filename="../build/ui_maintab.h" line="967"/>
-        <source>Date</source>
-        <translation>תאריך</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="102"/>
-        <location filename="../build/ui_maintab.h" line="948"/>
-        <source>Time</source>
-        <translation>זמן</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="665"/>
-        <location filename="../build/ui_maintab.h" line="969"/>
-        <source>Interval</source>
-        <translation>משך</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="722"/>
-        <location filename="../desktop-widgets/maintab.ui" line="1094"/>
-        <location filename="../build/ui_maintab.h" line="975"/>
-        <location filename="../build/ui_maintab.h" line="1003"/>
-        <source>SAC</source>
-        <translation>צריכת אויר</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="798"/>
-        <location filename="../build/ui_maintab.h" line="983"/>
-        <source>Avg. depth</source>
-        <translation>עומק ממוצע</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="760"/>
-        <location filename="../build/ui_maintab.h" line="979"/>
-        <source>OTU</source>
-        <translation>OTU</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/maintab.ui" line="893"/>
         <location filename="../build/ui_maintab.h" line="993"/>
         <source>Salinity</source>
@@ -4335,22 +4377,34 @@ p, li { white-space: pre-wrap; }
         <translation>סטטסטיקות</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="933"/>
+        <location filename="../build/ui_maintab.h" line="1007"/>
+        <source>Simple statistics about the selection</source>
+        <translation>סטטיסטיקה פשוטה על הבחירה</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="986"/>
         <location filename="../build/ui_maintab.h" line="996"/>
         <source>Depth</source>
         <translation>עומק</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="998"/>
+        <location filename="../build/ui_maintab.h" line="997"/>
+        <source>Duration</source>
+        <translation>משך הצלילה</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="1027"/>
         <location filename="../build/ui_maintab.h" line="998"/>
         <source>Temperature</source>
         <translation>טמפרטורה</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.ui" line="998"/>
-        <location filename="../build/ui_maintab.h" line="997"/>
-        <source>Duration</source>
-        <translation>משך הצלילה</translation>
+        <location filename="../desktop-widgets/maintab.ui" line="1039"/>
+        <location filename="../build/ui_maintab.h" line="999"/>
+        <source>Total time</source>
+        <translation>סה&quot;כ זמן</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/maintab.ui" line="1058"/>
@@ -4359,20 +4413,34 @@ p, li { white-space: pre-wrap; }
         <translation>צלילות</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="1106"/>
+        <location filename="../build/ui_maintab.h" line="1004"/>
+        <source>Gas consumption</source>
+        <translation>צריכת גז</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="1148"/>
         <location filename="../build/ui_maintab.h" line="1008"/>
         <source>Photos</source>
         <translation>תמונות</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.cpp" line="88"/>
-        <source>Cylinders</source>
-        <translation>מיכלים</translation>
+        <location filename="../desktop-widgets/maintab.ui" line="1151"/>
+        <location filename="../build/ui_maintab.h" line="1009"/>
+        <source>All photos from the current selection</source>
+        <translation>כל התמונות מהבחירה הנוכחית</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.cpp" line="92"/>
-        <source>Weights</source>
-        <translation>משקולות</translation>
+        <location filename="../desktop-widgets/maintab.ui" line="1177"/>
+        <location filename="../build/ui_maintab.h" line="1010"/>
+        <source>Extra data</source>
+        <translation>נתונים נוספים</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="1180"/>
+        <location filename="../build/ui_maintab.h" line="1011"/>
+        <source>Adittional data from the dive computer</source>
+        <translation>נתונים נוספים ממחשב צלילה</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/maintab.cpp" line="63"/>
@@ -4385,11 +4453,21 @@ p, li { white-space: pre-wrap; }
         <translation>למחוק שינוים</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.cpp" line="88"/>
+        <source>Cylinders</source>
+        <translation>מיכלים</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.cpp" line="89"/>
         <source>Add cylinder</source>
         <translation>הוסף מיכל</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.cpp" line="92"/>
+        <source>Weights</source>
+        <translation>משקולות</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.cpp" line="93"/>
         <source>Add weight system</source>
         <translation>הוסף מערכת משקולות</translation>
@@ -4545,12 +4623,12 @@ mixed from Air and using:
     <message>
         <location filename="../desktop-widgets/maintab.cpp" line="1594"/>
         <source>Deleting Images</source>
-        <translation type="unfinished"/>
+        <translation>מוחק תמונות</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/maintab.cpp" line="1594"/>
         <source>Are you sure you want to delete all images?</source>
-        <translation type="unfinished"/>
+        <translation>האם אתה באמת רוצה למחוק את כל התמונות?</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/maintab.cpp" line="1653"/>
@@ -4565,12 +4643,12 @@ mixed from Air and using:
     <message>
         <location filename="../desktop-widgets/maintab.cpp" line="1656"/>
         <source>Delete selected images</source>
-        <translation type="unfinished"/>
+        <translation>מוחק התמונות הנבחרות</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/maintab.cpp" line="1657"/>
         <source>Delete all images</source>
-        <translation type="unfinished"/>
+        <translation>מוחק כל התמונות</translation>
     </message>
 </context>
 <context>
@@ -4582,659 +4660,685 @@ mixed from Air and using:
         <translation>&amp;קובץ</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="455"/>
-        <location filename="../build/ui_mainwindow.h" line="534"/>
-        <source>Export dive logs</source>
-        <translation>יצוא יומני צלילת </translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="510"/>
-        <location filename="../build/ui_mainwindow.h" line="542"/>
-        <source>Toggle pHe graph</source>
-        <translation>הצג/הסתר גרף pHe</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="546"/>
-        <location filename="../build/ui_mainwindow.h" line="545"/>
-        <source>Toggle calculating all tissues</source>
-        <translation>הפעיל/כבה חישוב גזים ברקמות</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="522"/>
-        <location filename="../build/ui_mainwindow.h" line="543"/>
-        <source>Toggle DC reported ceiling</source>
-        <translation>הצג/הסתר תקרה לפי מחשב צלילה</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="534"/>
-        <location filename="../build/ui_mainwindow.h" line="544"/>
-        <source>Toggle calculated ceiling</source>
-        <translation>הצג/הסתר תקרה</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="606"/>
-        <location filename="../build/ui_mainwindow.h" line="550"/>
-        <source>Toggle NDL, TTS</source>
-        <translation>הצג/הסתר NDL, זמן לפני המים</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="558"/>
-        <location filename="../build/ui_mainwindow.h" line="546"/>
-        <source>Toggle calculated ceiling with 3m increments</source>
-        <translation>הפעיל/כבה תקרה מחושבת עם מרווחי</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="463"/>
-        <location filename="../build/ui_mainwindow.h" line="537"/>
-        <source>Configure &amp;dive computer</source>
-        <translation>הגדרות מחשב צלילה</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="570"/>
-        <location filename="../build/ui_mainwindow.h" line="547"/>
-        <source>Toggle heart rate</source>
-        <translation>הצג/הסתר קצב לב</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="582"/>
-        <location filename="../build/ui_mainwindow.h" line="548"/>
-        <source>Toggle MOD</source>
-        <translation>הצג/הסתר עומק מירבי</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="594"/>
-        <location filename="../build/ui_mainwindow.h" line="549"/>
-        <source>Toggle EAD, END, EADD</source>
-        <translation>הצג/הסתר EAD, END, EADD</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="618"/>
-        <location filename="../build/ui_mainwindow.h" line="551"/>
-        <source>Toggle SAC rate</source>
-        <translation>צריכת אויר</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="630"/>
-        <location filename="../build/ui_mainwindow.h" line="552"/>
-        <source>Toggle ruler</source>
-        <translation>הצג/הסתר סרגל</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="86"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="87"/>
         <location filename="../build/ui_mainwindow.h" line="569"/>
         <source>&amp;Log</source>
         <translation>&amp;יומן</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="105"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="104"/>
         <location filename="../build/ui_mainwindow.h" line="570"/>
         <source>&amp;View</source>
         <translation>תצוגה</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="121"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="120"/>
         <location filename="../build/ui_mainwindow.h" line="571"/>
         <source>&amp;Help</source>
         <translation>&amp;עזרה</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="130"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="129"/>
         <location filename="../build/ui_mainwindow.h" line="572"/>
         <source>&amp;Import</source>
         <translation>&amp;ייבא</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="139"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="138"/>
         <location filename="../build/ui_mainwindow.h" line="573"/>
         <source>&amp;Edit</source>
         <translation>ערוך</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="144"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="143"/>
         <source>Share on</source>
         <translation>תשתף ב-</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="158"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="157"/>
         <location filename="../build/ui_mainwindow.h" line="453"/>
         <source>&amp;New logbook</source>
         <translation>יומן &amp;חדש</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="161"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="160"/>
         <location filename="../build/ui_mainwindow.h" line="455"/>
         <source>New</source>
         <translation>חדש</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="164"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="163"/>
         <location filename="../build/ui_mainwindow.h" line="457"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="169"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="168"/>
         <location filename="../build/ui_mainwindow.h" line="458"/>
         <source>&amp;Open logbook</source>
         <translation>&amp;לפתוח יומן</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="172"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="171"/>
         <location filename="../build/ui_mainwindow.h" line="460"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="508"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="502"/>
         <source>Open</source>
         <translation>פתח</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="175"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="174"/>
         <location filename="../build/ui_mainwindow.h" line="462"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="180"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="179"/>
         <location filename="../build/ui_mainwindow.h" line="463"/>
         <source>&amp;Save</source>
         <translation>&amp;שמור</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="183"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="182"/>
         <location filename="../build/ui_mainwindow.h" line="465"/>
         <source>Save</source>
         <translation>שמור</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="186"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="185"/>
         <location filename="../build/ui_mainwindow.h" line="467"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="191"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="190"/>
         <location filename="../build/ui_mainwindow.h" line="468"/>
         <source>Sa&amp;ve as</source>
         <translation>שמור בשם</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="194"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="193"/>
         <location filename="../build/ui_mainwindow.h" line="470"/>
         <source>Save as</source>
         <translation>שמור בשם</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="197"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="196"/>
         <location filename="../build/ui_mainwindow.h" line="472"/>
         <source>Ctrl+Shift+S</source>
         <translation>Ctrl+Shift+S</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="202"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="201"/>
         <location filename="../build/ui_mainwindow.h" line="473"/>
         <source>&amp;Close</source>
         <translation>&amp;סגור</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="205"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="204"/>
         <location filename="../build/ui_mainwindow.h" line="475"/>
         <source>Close</source>
         <translation>סגור</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="208"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="207"/>
         <location filename="../build/ui_mainwindow.h" line="477"/>
         <source>Ctrl+W</source>
         <translation>Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="221"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="212"/>
+        <location filename="../build/ui_mainwindow.h" line="478"/>
+        <source>&amp;Print</source>
+        <translation>&amp;הדפס</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="215"/>
+        <location filename="../build/ui_mainwindow.h" line="479"/>
+        <source>Ctrl+P</source>
+        <translation>Ctrl+P</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="220"/>
         <location filename="../build/ui_mainwindow.h" line="480"/>
         <source>P&amp;references</source>
         <translation>הגדרות</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="251"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="223"/>
+        <location filename="../build/ui_mainwindow.h" line="481"/>
+        <source>Ctrl+,</source>
+        <translation>Ctrl+,</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="231"/>
+        <location filename="../build/ui_mainwindow.h" line="482"/>
+        <source>&amp;Quit</source>
+        <translation>&amp;צא</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="234"/>
+        <location filename="../build/ui_mainwindow.h" line="483"/>
+        <source>Ctrl+Q</source>
+        <translation>Ctrl+Q</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="242"/>
+        <location filename="../build/ui_mainwindow.h" line="484"/>
+        <source>Import from &amp;dive computer</source>
+        <translation>יבוא ממחשב צלילה</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="245"/>
+        <location filename="../build/ui_mainwindow.h" line="485"/>
+        <source>Ctrl+D</source>
+        <translation>Ctrl+D</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="250"/>
         <location filename="../build/ui_mainwindow.h" line="486"/>
         <source>Import &amp;GPS data from Subsurface web service</source>
         <translation>היבוא נתוני GPS משירות האינטרנט של Subsurface</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="259"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="253"/>
+        <location filename="../build/ui_mainwindow.h" line="487"/>
+        <source>Ctrl+G</source>
+        <translation>Ctrl+G</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="258"/>
         <location filename="../build/ui_mainwindow.h" line="488"/>
         <source>Edit device &amp;names</source>
         <translation>ערוך שמות של מכשירים</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="272"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="263"/>
+        <location filename="../build/ui_mainwindow.h" line="489"/>
+        <source>&amp;Add dive</source>
+        <translation>הוסף צלילה</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="266"/>
+        <location filename="../build/ui_mainwindow.h" line="490"/>
+        <source>Ctrl++</source>
+        <translation>Ctrl++</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="271"/>
         <location filename="../build/ui_mainwindow.h" line="491"/>
         <source>&amp;Edit dive</source>
         <translation>עריכת צלילה</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="277"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="276"/>
         <location filename="../build/ui_mainwindow.h" line="492"/>
         <source>&amp;Copy dive components</source>
         <translation>העתקה רכיבי צלילת</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="280"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="279"/>
         <location filename="../build/ui_mainwindow.h" line="493"/>
         <source>Ctrl+C</source>
         <translation>Ctrl+C</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="285"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="284"/>
         <location filename="../build/ui_mainwindow.h" line="494"/>
         <source>&amp;Paste dive components</source>
         <translation>הדבק רכיבי צלילה</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="288"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="287"/>
         <location filename="../build/ui_mainwindow.h" line="495"/>
         <source>Ctrl+V</source>
         <translation>Ctrl+V</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="325"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="292"/>
+        <location filename="../build/ui_mainwindow.h" line="496"/>
+        <source>&amp;Renumber</source>
+        <translation>&amp;מספר מחדש</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="295"/>
+        <location filename="../build/ui_mainwindow.h" line="497"/>
+        <source>Ctrl+R</source>
+        <translation>Ctrl+R</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="303"/>
+        <location filename="../build/ui_mainwindow.h" line="498"/>
+        <source>Auto &amp;group</source>
+        <translation>קבץ אוטומטי</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="308"/>
+        <location filename="../build/ui_mainwindow.h" line="499"/>
+        <source>&amp;Yearly statistics</source>
+        <translation>סטטיסטיקה שנתית</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="311"/>
+        <location filename="../build/ui_mainwindow.h" line="500"/>
+        <source>Ctrl+Y</source>
+        <translation>Ctrl+Y</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="316"/>
+        <location filename="../build/ui_mainwindow.h" line="501"/>
+        <source>&amp;Dive list</source>
+        <translation>רשימת צלילות</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="319"/>
+        <location filename="../build/ui_mainwindow.h" line="502"/>
+        <source>Ctrl+2</source>
+        <translation>Ctrl+2</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="324"/>
         <location filename="../build/ui_mainwindow.h" line="503"/>
         <source>&amp;Profile</source>
         <translation>פרופיל</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="333"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="327"/>
+        <location filename="../build/ui_mainwindow.h" line="504"/>
+        <source>Ctrl+3</source>
+        <translation>Ctrl+3</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="332"/>
         <location filename="../build/ui_mainwindow.h" line="505"/>
         <source>&amp;Info</source>
         <translation>פרטים</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="341"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="335"/>
+        <location filename="../build/ui_mainwindow.h" line="506"/>
+        <source>Ctrl+4</source>
+        <translation>Ctrl+4</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="340"/>
         <location filename="../build/ui_mainwindow.h" line="507"/>
         <source>&amp;All</source>
         <translation>כולם</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="357"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="343"/>
+        <location filename="../build/ui_mainwindow.h" line="508"/>
+        <source>Ctrl+1</source>
+        <translation>Ctrl+1</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="348"/>
+        <location filename="../build/ui_mainwindow.h" line="509"/>
+        <source>P&amp;revious DC</source>
+        <translation>מחשב צלילה קודם</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="351"/>
+        <location filename="../build/ui_mainwindow.h" line="510"/>
+        <source>Left</source>
+        <translation>שמאל</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="356"/>
         <location filename="../build/ui_mainwindow.h" line="511"/>
         <source>&amp;Next DC</source>
         <translation>מחשב צלילה הבא</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="365"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="359"/>
+        <location filename="../build/ui_mainwindow.h" line="512"/>
+        <source>Right</source>
+        <translation>ימין</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="364"/>
         <location filename="../build/ui_mainwindow.h" line="513"/>
         <source>&amp;About Subsurface</source>
         <translation>אודות Subsurface</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="381"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="372"/>
+        <location filename="../build/ui_mainwindow.h" line="514"/>
+        <source>User &amp;manual</source>
+        <translation>מדריך משתמש</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="375"/>
+        <location filename="../build/ui_mainwindow.h" line="515"/>
+        <source>F1</source>
+        <translation>F1</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="380"/>
         <location filename="../build/ui_mainwindow.h" line="516"/>
         <source>&amp;Globe</source>
         <translation>גלובוס</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="403"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="383"/>
+        <location filename="../build/ui_mainwindow.h" line="517"/>
+        <source>Ctrl+5</source>
+        <translation>Ctrl+5</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="388"/>
+        <location filename="../build/ui_mainwindow.h" line="518"/>
+        <source>P&amp;lan dive</source>
+        <translation>תכנן צלילה</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="391"/>
+        <location filename="../build/ui_mainwindow.h" line="519"/>
+        <source>Ctrl+L</source>
+        <translation>Ctrl+L</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="396"/>
+        <location filename="../build/ui_mainwindow.h" line="520"/>
+        <source>&amp;Import log files</source>
+        <translation>יבוא קובץ יומן צלילה</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="399"/>
+        <location filename="../build/ui_mainwindow.h" line="522"/>
+        <source>Import divelog files from other applications</source>
+        <translation>יבוא קובץ יומן צלילה מתוכנה אחרת</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="402"/>
         <location filename="../build/ui_mainwindow.h" line="524"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="408"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="407"/>
         <location filename="../build/ui_mainwindow.h" line="525"/>
         <source>Import &amp;from divelogs.de</source>
         <translation>יבוא מ- Divelogs.de</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="416"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="415"/>
         <location filename="../build/ui_mainwindow.h" line="526"/>
         <source>&amp;Full screen</source>
         <translation>מסך מלא</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="419"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="418"/>
         <location filename="../build/ui_mainwindow.h" line="528"/>
         <source>Toggle full screen</source>
         <translation>הפעיל/כבה מסך מלא</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="447"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="421"/>
+        <location filename="../build/ui_mainwindow.h" line="530"/>
+        <source>F11</source>
+        <translation>F11</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="446"/>
         <location filename="../build/ui_mainwindow.h" line="531"/>
         <source>&amp;Check for updates</source>
         <translation>בדוק לעדקונים</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="452"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="451"/>
         <location filename="../build/ui_mainwindow.h" line="532"/>
         <source>&amp;Export</source>
         <translation>יצוא</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="458"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="454"/>
+        <location filename="../build/ui_mainwindow.h" line="534"/>
+        <source>Export dive logs</source>
+        <translation>יצוא יומני צלילת </translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="457"/>
         <location filename="../build/ui_mainwindow.h" line="536"/>
         <source>Ctrl+E</source>
         <translation>Ctrl+E</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="466"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="462"/>
+        <location filename="../build/ui_mainwindow.h" line="537"/>
+        <source>Configure &amp;dive computer</source>
+        <translation>הגדרות מחשב צלילה</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="465"/>
         <location filename="../build/ui_mainwindow.h" line="538"/>
         <source>Ctrl+Shift+C</source>
         <translation>Ctrl+Shift+C</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="474"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="473"/>
         <location filename="../build/ui_mainwindow.h" line="539"/>
         <source>Edit &amp;dive in planner</source>
         <translation>עריכת צלילה במתכנן צלילות</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="486"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="485"/>
         <location filename="../build/ui_mainwindow.h" line="540"/>
         <source>Toggle pO₂ graph</source>
         <translation>הצג/הסתר גרף pO₂</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="498"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="497"/>
         <location filename="../build/ui_mainwindow.h" line="541"/>
         <source>Toggle pN₂ graph</source>
         <translation>הצג/הסתר גרף pN₂</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="642"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="509"/>
+        <location filename="../build/ui_mainwindow.h" line="542"/>
+        <source>Toggle pHe graph</source>
+        <translation>הצג/הסתר גרף pHe</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="521"/>
+        <location filename="../build/ui_mainwindow.h" line="543"/>
+        <source>Toggle DC reported ceiling</source>
+        <translation>הצג/הסתר תקרה לפי מחשב צלילה</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="533"/>
+        <location filename="../build/ui_mainwindow.h" line="544"/>
+        <source>Toggle calculated ceiling</source>
+        <translation>הצג/הסתר תקרה</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="545"/>
+        <location filename="../build/ui_mainwindow.h" line="545"/>
+        <source>Toggle calculating all tissues</source>
+        <translation>הפעיל/כבה חישוב גזים ברקמות</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="557"/>
+        <location filename="../build/ui_mainwindow.h" line="546"/>
+        <source>Toggle calculated ceiling with 3m increments</source>
+        <translation>הפעיל/כבה תקרה מחושבת עם מרווחי</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="569"/>
+        <location filename="../build/ui_mainwindow.h" line="547"/>
+        <source>Toggle heart rate</source>
+        <translation>הצג/הסתר קצב לב</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="581"/>
+        <location filename="../build/ui_mainwindow.h" line="548"/>
+        <source>Toggle MOD</source>
+        <translation>הצג/הסתר עומק מירבי</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="593"/>
+        <location filename="../build/ui_mainwindow.h" line="549"/>
+        <source>Toggle EAD, END, EADD</source>
+        <translation>הצג/הסתר EAD, END, EADD</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="605"/>
+        <location filename="../build/ui_mainwindow.h" line="550"/>
+        <source>Toggle NDL, TTS</source>
+        <translation>הצג/הסתר NDL, זמן לפני המים</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="617"/>
+        <location filename="../build/ui_mainwindow.h" line="551"/>
+        <source>Toggle SAC rate</source>
+        <translation>צריכת אויר</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="629"/>
+        <location filename="../build/ui_mainwindow.h" line="552"/>
+        <source>Toggle ruler</source>
+        <translation>הצג/הסתר סרגל</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="641"/>
         <location filename="../build/ui_mainwindow.h" line="553"/>
         <source>Scale graph</source>
         <translation>שנה קנה מידה של הגרף</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="654"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="653"/>
         <location filename="../build/ui_mainwindow.h" line="554"/>
         <source>Toggle pictures</source>
         <translation>הצג/הסתר תמונות</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="666"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="665"/>
         <location filename="../build/ui_mainwindow.h" line="555"/>
         <source>Toggle tank bar</source>
         <translation>הצג/הסתר גרף של גז פעיל</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="674"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="673"/>
         <location filename="../build/ui_mainwindow.h" line="556"/>
         <source>&amp;Filter divelist</source>
         <translation>סנן רשימת צלילות</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="689"/>
-        <location filename="../build/ui_mainwindow.h" line="558"/>
-        <source>Toggle tissue graph</source>
-        <translation>הצג/הסתר גרף רקמות</translation>
+        <location filename="../desktop-widgets/mainwindow.ui" line="676"/>
+        <location filename="../build/ui_mainwindow.h" line="557"/>
+        <source>Ctrl+F</source>
+        <translation>Ctrl+F</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="694"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="688"/>
+        <source>Toggle tissue heat-map</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="693"/>
         <location filename="../build/ui_mainwindow.h" line="559"/>
         <source>User &amp;survey</source>
         <translation>סקר משתמשים</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="699"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="698"/>
         <location filename="../build/ui_mainwindow.h" line="560"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="238"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="231"/>
         <source>&amp;Undo</source>
         <translation>לבטל שינוי</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="702"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="701"/>
         <location filename="../build/ui_mainwindow.h" line="561"/>
         <source>Ctrl+Z</source>
         <translation>Ctrl+Z</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="707"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="706"/>
         <location filename="../build/ui_mainwindow.h" line="562"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="239"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="232"/>
         <source>&amp;Redo</source>
         <translation>בצע שינוי שוב</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="710"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="709"/>
         <location filename="../build/ui_mainwindow.h" line="563"/>
         <source>Ctrl+Shift+Z</source>
         <translation>Ctrl+Shift+Z</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="715"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="714"/>
         <location filename="../build/ui_mainwindow.h" line="564"/>
         <source>&amp;Find moved images</source>
         <translation>חפש תמונות שזזו</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="720"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="719"/>
         <source>Open c&amp;loud storage</source>
         <translation>פתח אחסון בענן</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="725"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="724"/>
         <source>Save to clo&amp;ud storage</source>
         <translation>שמור לאחסון בענן</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="730"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="729"/>
         <location filename="../build/ui_mainwindow.h" line="567"/>
         <source>&amp;Manage dive sites</source>
         <translation>ניהול אתרי צלילה</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="735"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="734"/>
         <source>Dive Site &amp;Edit</source>
         <translation>ערוך אתר צלילה</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="740"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="739"/>
         <source>Facebook</source>
         <translation>Facebook</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="745"/>
-        <source>Add GPS location here</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="744"/>
+        <source>Take cloud storage online</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="677"/>
-        <location filename="../build/ui_mainwindow.h" line="557"/>
-        <source>Ctrl+F</source>
-        <translation>Ctrl+F</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="213"/>
-        <location filename="../build/ui_mainwindow.h" line="478"/>
-        <source>&amp;Print</source>
-        <translation>&amp;הדפס</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="224"/>
-        <location filename="../build/ui_mainwindow.h" line="481"/>
-        <source>Ctrl+,</source>
-        <translation>Ctrl+,</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="232"/>
-        <location filename="../build/ui_mainwindow.h" line="482"/>
-        <source>&amp;Quit</source>
-        <translation>&amp;צא</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="243"/>
-        <location filename="../build/ui_mainwindow.h" line="484"/>
-        <source>Import from &amp;dive computer</source>
-        <translation>יבוא ממחשב צלילה</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="254"/>
-        <location filename="../build/ui_mainwindow.h" line="487"/>
-        <source>Ctrl+G</source>
-        <translation>Ctrl+G</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="267"/>
-        <location filename="../build/ui_mainwindow.h" line="490"/>
-        <source>Ctrl++</source>
-        <translation>Ctrl++</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="293"/>
-        <location filename="../build/ui_mainwindow.h" line="496"/>
-        <source>&amp;Renumber</source>
-        <translation>&amp;מספר מחדש</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="296"/>
-        <location filename="../build/ui_mainwindow.h" line="497"/>
-        <source>Ctrl+R</source>
-        <translation>Ctrl+R</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="312"/>
-        <location filename="../build/ui_mainwindow.h" line="500"/>
-        <source>Ctrl+Y</source>
-        <translation>Ctrl+Y</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="392"/>
-        <location filename="../build/ui_mainwindow.h" line="519"/>
-        <source>Ctrl+L</source>
-        <translation>Ctrl+L</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="216"/>
-        <location filename="../build/ui_mainwindow.h" line="479"/>
-        <source>Ctrl+P</source>
-        <translation>Ctrl+P</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="235"/>
-        <location filename="../build/ui_mainwindow.h" line="483"/>
-        <source>Ctrl+Q</source>
-        <translation>Ctrl+Q</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="246"/>
-        <location filename="../build/ui_mainwindow.h" line="485"/>
-        <source>Ctrl+D</source>
-        <translation>Ctrl+D</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="264"/>
-        <location filename="../build/ui_mainwindow.h" line="489"/>
-        <source>&amp;Add dive</source>
-        <translation>הוסף צלילה</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="304"/>
-        <location filename="../build/ui_mainwindow.h" line="498"/>
-        <source>Auto &amp;group</source>
-        <translation>קבץ אוטומטי</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="309"/>
-        <location filename="../build/ui_mainwindow.h" line="499"/>
-        <source>&amp;Yearly statistics</source>
-        <translation>סטטיסטיקה שנתית</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="317"/>
-        <location filename="../build/ui_mainwindow.h" line="501"/>
-        <source>&amp;Dive list</source>
-        <translation>רשימת צלילות</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="320"/>
-        <location filename="../build/ui_mainwindow.h" line="502"/>
-        <source>Ctrl+2</source>
-        <translation>Ctrl+2</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="328"/>
-        <location filename="../build/ui_mainwindow.h" line="504"/>
-        <source>Ctrl+3</source>
-        <translation>Ctrl+3</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="336"/>
-        <location filename="../build/ui_mainwindow.h" line="506"/>
-        <source>Ctrl+4</source>
-        <translation>Ctrl+4</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="344"/>
-        <location filename="../build/ui_mainwindow.h" line="508"/>
-        <source>Ctrl+1</source>
-        <translation>Ctrl+1</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="349"/>
-        <location filename="../build/ui_mainwindow.h" line="509"/>
-        <source>P&amp;revious DC</source>
-        <translation>מחשב צלילה קודם</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="352"/>
-        <location filename="../build/ui_mainwindow.h" line="510"/>
-        <source>Left</source>
-        <translation>שמאל</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="360"/>
-        <location filename="../build/ui_mainwindow.h" line="512"/>
-        <source>Right</source>
-        <translation>ימין</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="373"/>
-        <location filename="../build/ui_mainwindow.h" line="514"/>
-        <source>User &amp;manual</source>
-        <translation>מדריך משתמש</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="376"/>
-        <location filename="../build/ui_mainwindow.h" line="515"/>
-        <source>F1</source>
-        <translation>F1</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="384"/>
-        <location filename="../build/ui_mainwindow.h" line="517"/>
-        <source>Ctrl+5</source>
-        <translation>Ctrl+5</translation>
+        <location filename="../build/ui_mainwindow.h" line="558"/>
+        <source>Toggle tissue graph</source>
+        <translation>הצג/הסתר גרף רקמות</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="389"/>
-        <location filename="../build/ui_mainwindow.h" line="518"/>
-        <source>P&amp;lan dive</source>
-        <translation>תכנן צלילה</translation>
+        <location filename="../build/ui_mainwindow.h" line="565"/>
+        <source>Open cloud storage</source>
+        <translation>פתח אחסון בענן</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="397"/>
-        <location filename="../build/ui_mainwindow.h" line="520"/>
-        <source>&amp;Import log files</source>
-        <translation>יבוא קובץ יומן צלילה</translation>
+        <location filename="../build/ui_mainwindow.h" line="566"/>
+        <source>Save to cloud storage</source>
+        <translation>שמור לאחסון בענן</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="400"/>
-        <location filename="../build/ui_mainwindow.h" line="522"/>
-        <source>Import divelog files from other applications</source>
-        <translation>יבוא קובץ יומן צלילה מתוכנה אחרת</translation>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="331"/>
+        <source>Connect to</source>
+        <translation>התחבר אל</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="422"/>
-        <location filename="../build/ui_mainwindow.h" line="530"/>
-        <source>F11</source>
-        <translation>F11</translation>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="493"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="538"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1545"/>
+        <source>Please save or cancel the current dive edit before opening a new file.</source>
+        <translation>נא לשמור או לבטל את עריכת הצלילה הנוכחית לפני פתיחת קובץ חדש.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="505"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="499"/>
         <source>Open file</source>
         <translation>פתך קובץ</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="509"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="503"/>
         <location filename="../desktop-widgets/mainwindow.cpp" line="614"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1972"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1978"/>
         <source>Cancel</source>
         <translation>בטל</translation>
     </message>
@@ -5254,6 +5358,16 @@ mixed from Air and using:
         <translation>סורק תמונות... (יכול להיות תהליך ערוך)</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="649"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="796"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="977"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="983"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1849"/>
+        <source>Warning</source>
+        <translation>אזהרה</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="674"/>
         <source>Please save or cancel the current dive edit before closing the file.</source>
         <translation>נא לשמור או לבטל את עריכת הצלילה הנוכחית לפני סגירת הקובץ.</translation>
@@ -5269,125 +5383,98 @@ mixed from Air and using:
         <translation>הדפס טבלת זמנים</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="982"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
+        <source>Trying to replan a dive that&apos;s not a planned dive.</source>
+        <translation>מנסה לערוך מחדש צלילה שלא צלילה ידני.</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="977"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1849"/>
+        <source>Please, first finish the current edition before trying to do another.</source>
+        <translation>ראשית תסיים את המהדורה הנוכחית לפני שאתה מנסה לעשות אחר.</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="983"/>
         <source>Trying to edit a dive that&apos;s not a manually added dive.</source>
         <translation>מנסה לערוך צלילה שלא צלילה ידני.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1243"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1030"/>
+        <source>Yearly statistics</source>
+        <translation>סטטיסטיקה שנתית</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1244"/>
         <source>Do you want to save the changes that you made in the file %1?</source>
         <translation>האם ברצונכם לשמור שינויים בקובץ %1 ?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1246"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1247"/>
         <source>Do you want to save the changes that you made in the data file?</source>
         <translation>האם לשמור שינויים בקובץ?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1251"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1252"/>
         <source>Save changes?</source>
         <translation>שמור שינוים?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1587"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1253"/>
+        <source>Changes will be lost if you don&apos;t save them.</source>
+        <translation>כל השינויים יאבדו אם לא תשמרו אותם.</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1572"/>
         <source>Save file as</source>
         <translation>שמור קובץ בשם</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1682"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1573"/>
+        <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
+        <translation>קבצי XML  נתמכים (*.ssrf *.xml *.XML)</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1670"/>
+        <source>[local cache for] %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1672"/>
         <source>[cloud storage for] %1</source>
         <translation>[אחסון בענן ל-] %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1782"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1788"/>
         <source>Opening datafile from older version</source>
         <translation>פותח קובץ מגרסה ישנה</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1783"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1789"/>
         <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly.
 Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source>
         <translation>אתה פתחת קובץ נתונים מגירסה ישנה יותר של Subsurface. אנו ממליצים לך לקרוא את המדריך כדי ללמוד על השינויים בגרסה החדשה, במיוחד על ניהול אתר צלילה שהשתנה הרבה.
 Subsurface כבר ניסתה לאכלס מראש את הנתונים אבל יכול להיות שווה לבדוק במערכת ניהול אתר צלילה החדשה ולוודא שהכל נראה תקין.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1794"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1800"/>
         <source>Open dive log file</source>
         <translation>פתך קובץ יומן צלילה</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1795"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1801"/>
         <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;All files (*)</source>
-        <translation type="unfinished"/>
+        <translation>קבצי יומני צלילה (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN*.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;קבצי Cochran (*.can *.CAN);;קבצי CSV (*.csv *.CSV);;קבצי DiveLog.de (*.dld *.DLD);;קבצי JDiveLog (*.jlb *.JLB);;קבצי Liquivision (*.lvd *.LVD);;קבצי MkVI (*.txt *.TXT);;קבצי Suunto (*.sde *.db *.SDE *.DB);;קבצי Divesoft (*.dlf *.DLF);;קבצי UDDF/UDCF (*.uddf *.udcf *.UDDF *.UDCF);;קבצי XML (*.xml *.XML);;קבצי APD (*.apd *.APD);;קבצי Datatrak/WLog (*.log *.LOG);;קבצי OSTCtools (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;כל קבצים (*)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1972"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1978"/>
         <source>Contacting cloud service...</source>
         <translation>מתחבר לאחסון בענן</translation>
     </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1252"/>
-        <source>Changes will be lost if you don&apos;t save them.</source>
-        <translation>כל השינויים יאבדו אם לא תשמרו אותם.</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="649"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="796"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="976"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="982"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/>
-        <source>Warning</source>
-        <translation>אזהרה</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="499"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="544"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1560"/>
-        <source>Please save or cancel the current dive edit before opening a new file.</source>
-        <translation>נא לשמור או לבטל את עריכת הצלילה הנוכחית לפני פתיחת קובץ חדש.</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="338"/>
-        <source>Connect to</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
-        <source>Trying to replan a dive that&apos;s not a planned dive.</source>
-        <translation>מנסה לערוך מחדש צלילה שלא צלילה ידני.</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1029"/>
-        <source>Yearly statistics</source>
-        <translation>סטטיסטיקה שנתית</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1588"/>
-        <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
-        <translation>קבצי XML  נתמכים (*.ssrf *.xml *.XML)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="976"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/>
-        <source>Please, first finish the current edition before trying to do another.</source>
-        <translation>ראשית תסיים את המהדורה הנוכחית לפני שאתה מנסה לעשות אחר.</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_mainwindow.h" line="565"/>
-        <source>Open cloud storage</source>
-        <translation>פתח אחסון בענן</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_mainwindow.h" line="566"/>
-        <source>Save to cloud storage</source>
-        <translation>שמור לאחסון בענן</translation>
-    </message>
 </context>
 <context>
     <name>MultiFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="733"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="731"/>
         <source>Filter shows %1 (of %2) dives</source>
         <translation>סינון מציג %1 (מתוך %2) צלילות</translation>
     </message>
@@ -5395,12 +5482,12 @@ Subsurface כבר ניסתה לאכלס מראש את הנתונים אבל יכ
 <context>
     <name>OstcFirmwareCheck</name>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="269"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="271"/>
         <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source>
         <translation>מומלץ לעדכן את הקושחה במחשב הצלילה: נמשה גרסה %1, אך הגרסה העדכני זה %2</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="273"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="275"/>
         <source>
 
 Please start Bluetooth on your OSTC Sport and do the same preparations as for a logbook download before continuing with the update</source>
@@ -5409,27 +5496,27 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 אנא להתחיל Bluetooth ב-OSTC הספורט שלך ולעשות את אותו הדבר בהכנות כלהורדת יומן לפני שתמשיך בעדכון</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="274"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="276"/>
         <source>Not now</source>
         <translation>לא עכשיו</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="275"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="277"/>
         <source>Update firmware</source>
         <translation>עידקון קושחה</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="277"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="279"/>
         <source>Firmware upgrade notice</source>
         <translation>הודעת שדרוג קושחה</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="295"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="297"/>
         <source>Save the downloaded firmware as</source>
         <translation>שמור את הקושחה שהורדת כ-</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="296"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="298"/>
         <source>HEX files (*.hex)</source>
         <translation>קבצי HEX (*.hex)</translation>
     </message>
@@ -5437,79 +5524,89 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PlannerSettingsWidget</name>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="322"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="302"/>
         <source>Open circuit</source>
         <translation>מערכת פתוחה</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="322"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="302"/>
         <source>CCR</source>
         <translation>מערכת סגורה</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="322"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="302"/>
         <source>pSCR</source>
         <translation>מערכת חצי סגורה</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="421"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="388"/>
         <source>ft/min</source>
         <translation>רגל לדקה</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="422"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="389"/>
         <source>Last stop at 20ft</source>
         <translation>תחנה אחרונה ב-20 רגל</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="423"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="390"/>
         <source>50% avg. depth to 20ft</source>
         <translation>50% עומק ממוצה ל-20 רגל</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="424"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="391"/>
         <source>20ft to surface</source>
         <translation>20 רגל לפני המים</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="426"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="392"/>
+        <source>ft</source>
+        <translation>רגל</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="394"/>
         <source>m/min</source>
         <translation>מטרים לדקה</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="427"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="395"/>
         <source>Last stop at 6m</source>
         <translation>עצירה אחרונה ב6 מ&apos;</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="428"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="396"/>
         <source>50% avg. depth to 6m</source>
         <translation>50% עומק ממוצע ל-6 מטר</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="429"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="397"/>
         <source>6m to surface</source>
         <translation>6 מטר לפני המים</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="432"/>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="433"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="398"/>
+        <source>m</source>
+        <translation>מטר</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="401"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="402"/>
         <source>cuft/min</source>
         <translation>רגל מעוקב לדקה</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="441"/>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="442"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="410"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="411"/>
         <source>ℓ/min</source>
         <translation>ליטר לדקה</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="451"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="420"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="456"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="425"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
@@ -5530,17 +5627,17 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     <message>
         <location filename="../mobile-widgets/qml/Preferences.qml" line="43"/>
         <source>Subsurface GPS data webservice</source>
-        <translation type="unfinished"/>
+        <translation>שרות WEB של נתוני GPS של Subsurface</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/Preferences.qml" line="51"/>
         <source>Distance threshold (meters)</source>
-        <translation type="unfinished"/>
+        <translation>סף מרחק (מטרים)</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/Preferences.qml" line="62"/>
         <source>Time threshold (minutes)</source>
-        <translation type="unfinished"/>
+        <translation>סף זמן (דקות)</translation>
     </message>
 </context>
 <context>
@@ -5659,6 +5756,11 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PreferencesDialog</name>
     <message>
+        <location filename="../build/ui_preferences.h" line="1283"/>
+        <source>Preferences</source>
+        <translation>העדפות</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1288"/>
         <source>Defaults</source>
         <translation>ברירות מחדל</translation>
@@ -5694,6 +5796,11 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>התייחסות גיאוגרפית</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1303"/>
+        <source>Lists and tables</source>
+        <translation>רשימות וטבלאות</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1304"/>
         <source>Font</source>
         <translation>גופן</translation>
@@ -5709,6 +5816,11 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>צלילות</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1307"/>
+        <source>Default dive log file</source>
+        <translation>קובץ יומן צלילה ברירת מחדל</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1308"/>
         <source>No default file</source>
         <translation>אין קובץ ברירת מחדל</translation>
@@ -5739,6 +5851,21 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>...</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1314"/>
+        <source>Display invalid</source>
+        <translation>הצגה שגויים </translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1316"/>
+        <source>Default cylinder</source>
+        <translation>מיכל ברירת מחדל</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1317"/>
+        <source>Use default cylinder</source>
+        <translation>השתמש במיכל ברית המחדל</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1318"/>
         <source>Animations</source>
         <translation>אנימציות</translation>
@@ -5769,40 +5896,24 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>מערכת</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1401"/>
-        <source>Dive site geo lookup</source>
-        <translation>בדיקה גיאו לאתר צלילה</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1402"/>
-        <source>Enable geocoding for dive site management</source>
-        <translation>אפשר קידוד גיאו לניהול אתרי צלילה</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1403"/>
-        <source>Parse site without GPS data</source>
-        <translation>לנתח אתר בלי נתוני GPS</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1404"/>
-        <source>Same format for existing dives</source>
-        <translation>אותה פורמט לצלילות קיימות</translation>
+        <location filename="../build/ui_preferences.h" line="1324"/>
+        <source>&amp;Metric</source>
+        <translation>מידה</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1405"/>
-        <source>Dive Site Layout</source>
-        <translation>פורמט אתר צלילה</translation>
+        <location filename="../build/ui_preferences.h" line="1325"/>
+        <source>Imperial</source>
+        <translation>אמריקאית</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1406"/>
-        <location filename="../build/ui_preferences.h" line="1407"/>
-        <source>/</source>
-        <translation>/</translation>
+        <location filename="../build/ui_preferences.h" line="1326"/>
+        <source>Personali&amp;ze</source>
+        <translation>התאמה אישית</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1325"/>
-        <source>Imperial</source>
-        <translation>אמריקאית</translation>
+        <location filename="../build/ui_preferences.h" line="1327"/>
+        <source>Individual settings</source>
+        <translation>הגדרות אישיים</translation>
     </message>
     <message>
         <location filename="../build/ui_preferences.h" line="1328"/>
@@ -5820,6 +5931,11 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>רגל</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1331"/>
+        <source>Pressure</source>
+        <translation>לחץ</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1332"/>
         <location filename="../build/ui_preferences.h" line="1366"/>
         <source>bar</source>
@@ -5831,11 +5947,26 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>psi</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1334"/>
+        <source>Volume</source>
+        <translation>נפח</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1335"/>
+        <source>&amp;liter</source>
+        <translation>ליטר</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1336"/>
         <source>cu ft</source>
         <translation>רגל מ&quot;ק</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1337"/>
+        <source>Temperature</source>
+        <translation>טמפרטורה</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1338"/>
         <source>celsius</source>
         <translation>צלסיוס</translation>
@@ -5846,11 +5977,121 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>פרנהייט</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1340"/>
+        <source>Weight</source>
+        <translation>משקל</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1341"/>
         <source>kg</source>
         <translation>קילוגרם</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1342"/>
+        <source>lbs</source>
+        <translation>lbs</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1343"/>
+        <source>Time units</source>
+        <translation>יחידות זמן</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1344"/>
+        <source>Ascent/descent speed denominator</source>
+        <translation>מקדם עליה וירידה</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1345"/>
+        <source>Minutes</source>
+        <translation>דקות</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1346"/>
+        <source>Seconds</source>
+        <translation>שניות</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1347"/>
+        <source>GPS coordinates</source>
+        <translation>נ&quot;צ</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1348"/>
+        <source>Location Display</source>
+        <translation>הציד מיקום</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1349"/>
+        <source>traditional (dms)</source>
+        <translation>מסורתיות (מעלות דקות שניות)</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1350"/>
+        <source>decimal</source>
+        <translation>עשרוני</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1351"/>
+        <source>Show</source>
+        <translation>הצג</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1352"/>
+        <source>Threshold when showing pO₂</source>
+        <translation>גבול להצגת pO₂</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1353"/>
+        <source>Threshold when showing pN₂</source>
+        <translation>גבול להצגת pN₂</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1354"/>
+        <source>Threshold when showing pHe</source>
+        <translation>גבול להצגת pHe</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1355"/>
+        <source>Max pO₂ when showing MOD</source>
+        <translation>pO₂ מירבי כשמציגים MOD</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1356"/>
+        <source>Draw dive computer reported ceiling red</source>
+        <translation>לצייר באדום תקרת שמדווח ממחשב צלילה</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1357"/>
+        <source>Show unused cylinders in Equipment tab</source>
+        <translation>הצג מיכלים שלא בשימוש בלשונת ציוד</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1358"/>
+        <source>Show average depth</source>
+        <translation>הצג עומק ממוצע</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1359"/>
+        <source>Misc</source>
+        <translation>שונות</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1360"/>
+        <source>GFLow</source>
+        <translation>גרדיאנט תחתון</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1361"/>
+        <source>GFHigh</source>
+        <translation>גרדיאנט עליון</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1362"/>
+        <source>GFLow at max depth</source>
+        <translation>גרדיאנט תחתון בעומק מירבי</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1363"/>
         <source>CCR: show setpoints when viewing pO₂</source>
         <translation>מערכת סגורה: הצג נקודות קבועות כשמוצג pO₂</translation>
@@ -5896,14 +6137,19 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>ברירת מחדל של המערכת</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1374"/>
+        <source>Filter</source>
+        <translation>פילטר</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1375"/>
         <source>Proxy</source>
         <translation>שרת פרוקסי</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1379"/>
-        <source>Proxy type</source>
-        <translation>סוג שרת פרוקסי</translation>
+        <location filename="../build/ui_preferences.h" line="1376"/>
+        <source>Port</source>
+        <translation>פורט</translation>
     </message>
     <message>
         <location filename="../build/ui_preferences.h" line="1377"/>
@@ -5911,16 +6157,16 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>שרת</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1376"/>
-        <source>Port</source>
-        <translation>פורט</translation>
-    </message>
-    <message>
         <location filename="../build/ui_preferences.h" line="1378"/>
         <source>Requires authentication</source>
         <translation>דורש אימות</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1379"/>
+        <source>Proxy type</source>
+        <translation>סוג שרת פרוקסי</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1380"/>
         <source>Username</source>
         <translation>שם משתמש</translation>
@@ -5932,46 +6178,6 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>סיסמא</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1400"/>
-        <source>Disconnect from Facebook</source>
-        <translation>התנתק מ-Facebook</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1374"/>
-        <source>Filter</source>
-        <translation>פילטר</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1331"/>
-        <source>Pressure</source>
-        <translation>לחץ</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1303"/>
-        <source>Lists and tables</source>
-        <translation>רשימות וטבלאות</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1307"/>
-        <source>Default dive log file</source>
-        <translation>קובץ יומן צלילה ברירת מחדל</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1314"/>
-        <source>Display invalid</source>
-        <translation>הצגה שגויים </translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1316"/>
-        <source>Default cylinder</source>
-        <translation>מיכל ברירת מחדל</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1317"/>
-        <source>Use default cylinder</source>
-        <translation>השתמש במיכל ברית המחדל</translation>
-    </message>
-    <message>
         <location filename="../build/ui_preferences.h" line="1382"/>
         <source>Subsurface cloud storage</source>
         <translation>אחסון בענן ל-Subsurface</translation>
@@ -6012,149 +6218,40 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>שמור זיהוי משתמש מקומי</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1334"/>
-        <source>Volume</source>
-        <translation>נפח</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1337"/>
-        <source>Temperature</source>
-        <translation>טמפרטורה</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1340"/>
-        <source>Weight</source>
-        <translation>משקל</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1342"/>
-        <source>lbs</source>
-        <translation>lbs</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1343"/>
-        <source>Time units</source>
-        <translation>יחידות זמן</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1345"/>
-        <source>Minutes</source>
-        <translation>דקות</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1346"/>
-        <source>Seconds</source>
-        <translation>שניות</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1351"/>
-        <source>Show</source>
-        <translation>הצג</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1362"/>
-        <source>GFLow at max depth</source>
-        <translation>גרדיאנט תחתון בעומק מירבי</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1359"/>
-        <source>Misc</source>
-        <translation>שונות</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1283"/>
-        <source>Preferences</source>
-        <translation>העדפות</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1324"/>
-        <source>&amp;Metric</source>
-        <translation>מידה</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1326"/>
-        <source>Personali&amp;ze</source>
-        <translation>התאמה אישית</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1327"/>
-        <source>Individual settings</source>
-        <translation>הגדרות אישיים</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1335"/>
-        <source>&amp;liter</source>
-        <translation>ליטר</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1344"/>
-        <source>Ascent/descent speed denominator</source>
-        <translation>מקדם עליה וירידה</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1347"/>
-        <source>GPS coordinates</source>
-        <translation>נ&quot;צ</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1348"/>
-        <source>Location Display</source>
-        <translation>הציד מיקום</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1349"/>
-        <source>traditional (dms)</source>
-        <translation>מסורתיות (מעלות דקות שניות)</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1350"/>
-        <source>decimal</source>
-        <translation>עשרוני</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1352"/>
-        <source>Threshold when showing pO₂</source>
-        <translation>גבול להצגת pO₂</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1353"/>
-        <source>Threshold when showing pN₂</source>
-        <translation>גבול להצגת pN₂</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1354"/>
-        <source>Threshold when showing pHe</source>
-        <translation>גבול להצגת pHe</translation>
+        <location filename="../build/ui_preferences.h" line="1400"/>
+        <source>Disconnect from Facebook</source>
+        <translation>התנתק מ-Facebook</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1355"/>
-        <source>Max pO₂ when showing MOD</source>
-        <translation>pO₂ מירבי כשמציגים MOD</translation>
+        <location filename="../build/ui_preferences.h" line="1401"/>
+        <source>Dive site geo lookup</source>
+        <translation>בדיקה גיאו לאתר צלילה</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1356"/>
-        <source>Draw dive computer reported ceiling red</source>
-        <translation>לצייר באדום תקרת שמדווח ממחשב צלילה</translation>
+        <location filename="../build/ui_preferences.h" line="1402"/>
+        <source>Enable geocoding for dive site management</source>
+        <translation>אפשר קידוד גיאו לניהול אתרי צלילה</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1357"/>
-        <source>Show unused cylinders in Equipment tab</source>
-        <translation>הצג מיכלים שלא בשימוש בלשונת ציוד</translation>
+        <location filename="../build/ui_preferences.h" line="1403"/>
+        <source>Parse site without GPS data</source>
+        <translation>לנתח אתר בלי נתוני GPS</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1358"/>
-        <source>Show average depth</source>
-        <translation>הצג עומק ממוצע</translation>
+        <location filename="../build/ui_preferences.h" line="1404"/>
+        <source>Same format for existing dives</source>
+        <translation>אותה פורמט לצלילות קיימות</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1360"/>
-        <source>GFLow</source>
-        <translation>גרדיאנט תחתון</translation>
+        <location filename="../build/ui_preferences.h" line="1405"/>
+        <source>Dive Site Layout</source>
+        <translation>פורמט אתר צלילה</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1361"/>
-        <source>GFHigh</source>
-        <translation>גרדיאנט עליון</translation>
+        <location filename="../build/ui_preferences.h" line="1406"/>
+        <location filename="../build/ui_preferences.h" line="1407"/>
+        <source>/</source>
+        <translation>/</translation>
     </message>
 </context>
 <context>
@@ -6210,106 +6307,136 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="20"/>
-        <source>Show</source>
-        <translation>הצג</translation>
+        <source>Gas pressure display setup</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="29"/>
-        <source>Threshold when showing pO₂</source>
-        <translation>גבול להצגת pO₂</translation>
+        <source>Threshold for pO₂ (bar)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="49"/>
-        <source>Threshold when showing pN₂</source>
-        <translation>גבול להצגת pN₂</translation>
+        <source>Threshold for pN₂ (bar)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="69"/>
-        <source>Threshold when showing pHe</source>
-        <translation>גבול להצגת pHe</translation>
+        <source>Threshold for pHe (bar)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="89"/>
-        <source>Max pO₂ when showing MOD</source>
-        <translation>pO₂ מירבי כשמציגים MOD</translation>
+        <source>pO₂ in calculating MOD (bar)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="106"/>
+        <source>CCR options:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="113"/>
+        <source>Dive planner default setpoint (bar)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="133"/>
+        <source>Show setpoints when viewing pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="140"/>
+        <source>Show individual O₂ sensor values when viewing pO₂</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="109"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="150"/>
+        <source>Ceiling display setup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="159"/>
         <source>Draw dive computer reported ceiling red</source>
         <translation>לצייר באדום תקרת שמדווח ממחשב צלילה</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="116"/>
-        <source>Show unused cylinders in Equipment tab</source>
-        <translation>הצג מיכלים שלא בשימוש בלשונת ציוד</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="169"/>
+        <source>Algorithm for calculated ceiling:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="123"/>
-        <source>Show mean depth</source>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="176"/>
+        <source>VPM-B</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="133"/>
-        <source>Misc</source>
-        <translation>שונות</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="183"/>
+        <source>VPM-B Conservatism</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="149"/>
-        <source>bar</source>
-        <translation>bar</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="193"/>
+        <source>+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="165"/>
-        <source>Default CCR set-point for dive planning</source>
-        <translation>נקודה קבוע ברירת מחדל לתכנון צלילות למערכת סגורה</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="206"/>
+        <source>Bühlmann</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="172"/>
-        <source>pSCR O₂ metabolism rate</source>
-        <translation>קצב חילוף חומרים של O₂ למערכת חצי סגורה</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="216"/>
+        <source>GFHigh</source>
+        <translation>גרדיאנט עליון</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="179"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="236"/>
         <source>GFLow</source>
         <translation>גרדיאנט תחתון</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="186"/>
-        <source>GFHigh</source>
-        <translation>גרדיאנט עליון</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="256"/>
+        <source>GFLow at max depth</source>
+        <translation>גרדיאנט תחתון בעומק מירבי</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="203"/>
-        <source>ℓ/min</source>
-        <translation>ליטר לדקה</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="263"/>
+        <source>pSCR options:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="213"/>
-        <source>pSCR ratio</source>
-        <translation>יחס מערכת חצי סגורה</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="270"/>
+        <source>Metabolic rate (ℓ O₂/min)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="223"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="287"/>
+        <source>Dilution ratio</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="300"/>
         <source>1:</source>
         <translation>1:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="230"/>
-        <source>CCR: show individual O₂ sensor values when viewing pO₂</source>
-        <translation>מערכת סגורה: הצג חיישני O₂ נפרדים כשמוצג pO₂</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="310"/>
+        <source>Misc</source>
+        <translation>שונות</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="237"/>
-        <source>CCR: show setpoints when viewing pO₂</source>
-        <translation>מערכת סגורה: הצג נקודות קבועות כשמוצג pO₂</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="316"/>
+        <source>Show unused cylinders in Equipment tab</source>
+        <translation>הצג מיכלים שלא בשימוש בלשונת ציוד</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="244"/>
-        <source>GFLow at max depth</source>
-        <translation>גרדיאנט תחתון בעומק מירבי</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="323"/>
+        <source>Show mean depth in Profile</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="10"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="9"/>
         <source>Graph</source>
         <translation>גרף</translation>
     </message>
@@ -6329,7 +6456,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     <message>
         <location filename="../desktop-widgets/preferences/prefs_language.ui" line="32"/>
         <source>Use system default</source>
-        <translation type="unfinished"/>
+        <translation>השתמש בברירת מחדל של המערכת</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/prefs_language.ui" line="55"/>
@@ -6344,23 +6471,23 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     <message>
         <location filename="../desktop-widgets/preferences/prefs_language.ui" line="80"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Preferred date format. Commonly used fields are&lt;/p&gt;&lt;p&gt;d (day of month)&lt;/p&gt;&lt;p&gt;ddd (abbr. day name)&lt;/p&gt;&lt;p&gt;M (month number)&lt;/p&gt;&lt;p&gt;MMM (abbr. month name)&lt;/p&gt;&lt;p&gt;yy/yyyy (2/4 digit year)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;פורמט תאריך מועדף. בשימוש נפוץ שדות&lt;/p&gt;&lt;p&gt;d (יום בחודש)&lt;/p&gt;&lt;p&gt;ddd ( מקוצרשם של יום)&lt;/p&gt;&lt;p&gt;M (מספר חודש)&lt;/p&gt;&lt;p&gt;MMM (שם של חודש מקוצר)&lt;/p&gt;&lt;p&gt;yy/yyyy (שנה בת 2 או 4 ספרות)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/prefs_language.ui" line="87"/>
         <location filename="../desktop-widgets/preferences/prefs_language.ui" line="135"/>
         <source>Use UI language default</source>
-        <translation type="unfinished"/>
+        <translation>השתמש בשפת ברית המחדל</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/prefs_language.ui" line="97"/>
         <source>This is used in places where there is less space to show the full date</source>
-        <translation type="unfinished"/>
+        <translation>זה משמש במקומות שבהם יש פחות מקום כדי להציג את התאריך מלא</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/prefs_language.ui" line="100"/>
         <source>Short format</source>
-        <translation type="unfinished"/>
+        <translation>פורמט מקוצר</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/prefs_language.ui" line="129"/>
@@ -6370,7 +6497,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     <message>
         <location filename="../desktop-widgets/preferences/prefs_language.ui" line="142"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Preferred time format&lt;/p&gt;&lt;p&gt;Commonly used format specifiers are&lt;/p&gt;&lt;p&gt;h (hours in 12h format)&lt;/p&gt;&lt;p&gt;H (hours in 24h format)&lt;/p&gt;&lt;p&gt;mm (2 digit minutes)&lt;/p&gt;&lt;p&gt;ss (2 digit seconds)&lt;/p&gt;&lt;p&gt;t/tt (a/p or am/pm)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;פורמט זמן מועדף&lt;/p&gt;&lt;p&gt;שימוש נפוץ שדות&lt;/p&gt;&lt;p&gt;h (שעות בפורמט 12h)&lt;/p&gt;&lt;p&gt;H (שעות בפורמט 24h)&lt;/p&gt;&lt;p&gt;mm (דקות ב-2 ספרות)&lt;/p&gt;&lt;p&gt;ss (שניות ב-2 ספרות)&lt;/p&gt;&lt;p&gt;t/tt (a/p או am/pm)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="12"/>
@@ -6378,15 +6505,29 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>שפה</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="57"/>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="53"/>
         <source>Restart required</source>
         <translation>נדרשת הפעלה מחדש</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="58"/>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="54"/>
         <source>To correctly load a new language you must restart Subsurface.</source>
         <translation>כדי לטעון שפה חדשה בצורה נכונה עליך להפעיל מחדש את Subsurface</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="76"/>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="82"/>
+        <source>Literal characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="77"/>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="83"/>
+        <source>Non-special character(s) in time format.
+These will be used as is. This might not be what you intended.
+See http://doc.qt.io/qt-5/qdatetime.html#toString</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PreferencesNetwork</name>
@@ -6433,7 +6574,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_network.ui" line="156"/>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="148"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="134"/>
         <source>Subsurface cloud storage</source>
         <translation>אחסון בענן ל-Subsurface</translation>
     </message>
@@ -6478,39 +6619,39 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>שמור זיהוי משתמש מקומי</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="11"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="10"/>
         <source>Network</source>
         <translation>רשת</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="15"/>
         <source>No proxy</source>
         <translation>אין שרת פרוקסי</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/>
         <source>System proxy</source>
         <translation>שרת פרוקסי של המערכת</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/>
         <source>HTTP proxy</source>
         <translation>שרת פרוקסי ל-HTTP</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="19"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/>
         <source>SOCKS proxy</source>
         <translation>שרת פרוקסי ל-SOCKS</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="75"/>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="97"/>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="110"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="72"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="93"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="106"/>
         <source>Cloud storage email and password can only consist of letters, numbers, and &apos;.&apos;, &apos;-&apos;, &apos;_&apos;, and &apos;+&apos;.</source>
         <translation>דואר אלקטרוני וסיסמא לאחסון בענן יכולים רק מורכבים מאותיות, מספרים, ו, &apos;.&apos; &apos;-&apos;, &apos;_&apos;, ו &apos;+&apos;.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="146"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="132"/>
         <source>Subsurface cloud storage (credentials verified)</source>
         <translation>אחסון בענן ל-Subsurface (זיהוי מאומתים)</translation>
     </message>
@@ -6668,7 +6809,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>עשרוני</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="8"/>
+        <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="7"/>
         <source>Units</source>
         <translation>יחידות</translation>
     </message>
@@ -6676,17 +6817,17 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PrintDialog</name>
     <message>
-        <location filename="../desktop-widgets/printdialog.cpp" line="118"/>
-        <source>&amp;Preview</source>
-        <translation>&amp;תצוגה מקדימה</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/printdialog.cpp" line="115"/>
+        <location filename="../desktop-widgets/printdialog.cpp" line="102"/>
         <source>P&amp;rint</source>
         <translation>ה&amp;דפס</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/printdialog.cpp" line="130"/>
+        <location filename="../desktop-widgets/printdialog.cpp" line="105"/>
+        <source>&amp;Preview</source>
+        <translation>&amp;תצוגה מקדימה</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/printdialog.cpp" line="117"/>
         <source>Print</source>
         <translation>הדפס</translation>
     </message>
@@ -6694,19 +6835,10 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PrintOptions</name>
     <message>
-        <location filename="../build/ui_printoptions.h" line="150"/>
-        <source>&amp;Table print</source>
-        <translation>הדפס טבלא</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_printoptions.h" line="158"/>
-        <source>One dive per page</source>
-        <translation>צלילה 1 לעמוד</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_printoptions.h" line="159"/>
-        <source>Two dives per page</source>
-        <translation>2 צלילות לעמוד</translation>
+        <location filename="../desktop-widgets/printoptions.ui" line="29"/>
+        <location filename="../build/ui_printoptions.h" line="148"/>
+        <source>Print type</source>
+        <translation>סוג הדפסה</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/printoptions.ui" line="41"/>
@@ -6766,10 +6898,19 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>ייבא</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/printoptions.ui" line="29"/>
-        <location filename="../build/ui_printoptions.h" line="148"/>
-        <source>Print type</source>
-        <translation>סוג הדפסה</translation>
+        <location filename="../build/ui_printoptions.h" line="150"/>
+        <source>&amp;Table print</source>
+        <translation>הדפס טבלא</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_printoptions.h" line="158"/>
+        <source>One dive per page</source>
+        <translation>צלילה 1 לעמוד</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_printoptions.h" line="159"/>
+        <source>Two dives per page</source>
+        <translation>2 צלילות לעמוד</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/printoptions.cpp" line="128"/>
@@ -6811,103 +6952,103 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>מחשב צלילה לא מוקר</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="755"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="752"/>
         <source>Show NDL / TTS was disabled because of excessive processing time</source>
         <translation>הצג NDL / TTS הושבת בגלל שימוש מעבד מוגזם</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1344"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1338"/>
         <source>Make first divecomputer</source>
         <translation>בחר כמחשב צלילה ראשי</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1346"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1340"/>
         <source>Delete this divecomputer</source>
         <translation>מחק מחשב צלילה זה</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1360"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1354"/>
         <source>Add gas change</source>
         <translation>הוסיף שינוי גז</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1363"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1357"/>
         <source> (Tank %1)</source>
         <translation>(מיכל %1)</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1371"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1365"/>
         <source>Add set-point change</source>
         <translation>הוסיף שינוי נקודה קבוע</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1373"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1367"/>
         <source>Add bookmark</source>
         <translation>הוספת סימנייה</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1377"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1371"/>
         <source>Edit the profile</source>
         <translation>ערוך פרופיל צלילה</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1381"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1375"/>
         <source>Remove event</source>
         <translation>הסר את האירוע</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1386"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1380"/>
         <source>Hide similar events</source>
         <translation>הסתר אירועים דומים</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1393"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1387"/>
         <source>Edit name</source>
         <translation>ערןך שם</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1422"/>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1429"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1416"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1423"/>
         <source>Adjust pressure of tank %1 (currently interpolated as %2)</source>
         <translation>שינוי לחץ במיכל %1 (כרגע מחושב כ-%2)</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1444"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1438"/>
         <source>Unhide all events</source>
         <translation>חשוף את כל האירועים</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1479"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1473"/>
         <source>Hide events</source>
         <translation>הסתר אירועים</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1479"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1473"/>
         <source>Hide all %1 events?</source>
         <translation>הסתר את כל %1 האירועים</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1514"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1508"/>
         <source>Remove the selected event?</source>
         <translation>הסר את האירוע שנבחרו?</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1515"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1509"/>
         <source>%1 @ %2:%3</source>
         <translation>%1 @ %2:%3</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1638"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1632"/>
         <source>Edit name of bookmark</source>
         <translation>שינוי שם סימנייה</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1639"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1633"/>
         <source>Custom name:</source>
         <translation>שם חופשי:</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1644"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1638"/>
         <source>Name is too long!</source>
         <translation>שם ערוך מדי!</translation>
     </message>
@@ -6915,218 +7056,228 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>QMLManager</name>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="95"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="97"/>
         <source>Starting...</source>
-        <translation type="unfinished"/>
+        <translation>מתחיל...</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="202"/>
         <source>working in no-cloud mode</source>
-        <translation type="unfinished"/>
+        <translation>עובד במוד של חוסר תקשורת עם הענן</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="213"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="216"/>
         <source>no cloud credentials</source>
-        <translation type="unfinished"/>
+        <translation>אין זיהוי לענן</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="214"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="270"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="217"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="269"/>
         <source>Please enter valid cloud credentials.</source>
-        <translation type="unfinished"/>
+        <translation>נא להכנס זיהוי לענן חוקי.</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="285"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="284"/>
         <source>Attempting to open cloud storage with new credentials</source>
-        <translation type="unfinished"/>
+        <translation>משתדל להתחבר לענן עם זיהוי חדש</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="304"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="306"/>
         <source>Testing cloud credentials</source>
+        <translation>בודק זיהוי לענן</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="320"/>
+        <source>No response from cloud server to validate the credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="331"/>
-        <source>Cloud credentials are invalid</source>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="329"/>
+        <source>Cannot connect to cloud storage - cloud account not verified</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="344"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="361"/>
+        <source>Cloud credentials are invalid</source>
+        <translation>זיהוי לענן לא חוקי</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="374"/>
         <source>Cannot open cloud storage: Error creating https connection</source>
-        <translation type="unfinished"/>
+        <translation>אין אפשרות להתחבר לענן: תקלה ביצירת קשר https</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="357"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="387"/>
         <source>Cannot open cloud storage: %1</source>
-        <translation type="unfinished"/>
+        <translation>אין אפשרות להתחבר לענן: %1</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="369"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="399"/>
         <source>Cannot connect to cloud storage</source>
-        <translation type="unfinished"/>
+        <translation>אין אפשרות להתחבר לענן</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="411"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="441"/>
         <source>Cloud storage error: %1</source>
-        <translation type="unfinished"/>
+        <translation>שגיאת איכסון ענן: %1</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="501"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="531"/>
         <source>Failed to connect to cloud server, reverting to no cloud status</source>
-        <translation type="unfinished"/>
+        <translation>שגיאה בחיבור לשרת ענן, חוזר למוד של עבודה מקומית</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="520"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="550"/>
         <source>Cloud storage open successfully. No dives in dive list.</source>
-        <translation type="unfinished"/>
+        <translation>חיבור לענן נוצר בהצלחה. אין צלילות ברשימת הצלילות.</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="689"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="690"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="721"/>
         <source>h</source>
-        <translation type="unfinished"/>
+        <translation>שעה</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="689"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="690"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="691"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="721"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="722"/>
         <source>min</source>
         <translation>דקה</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="689"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/>
         <source>sec</source>
-        <translation type="unfinished"/>
+        <translation>שניות</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="1041"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="1102"/>
         <source>Unknown GPS location</source>
-        <translation type="unfinished"/>
+        <translation>נ&quot;צ לא מוכר</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../core/qthelper.cpp" line="866"/>
-        <location filename="../core/qthelper.cpp" line="1214"/>
-        <source>AIR</source>
-        <translation>אוויר</translation>
+        <location filename="../core/gpslocation.h" line="13"/>
+        <source>Waiting to aquire GPS location</source>
+        <translation>ממתין לחישוב נ&quot;צ</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="1214"/>
-        <source>OXYGEN</source>
-        <translation>חמצן</translation>
+        <location filename="../core/qthelper.cpp" line="766"/>
+        <location filename="../core/qthelper.cpp" line="1275"/>
+        <source>m</source>
+        <translation>מטר</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="59"/>
-        <source>Remove this point</source>
-        <translation>הסר נקודה זו</translation>
+        <location filename="../core/qthelper.cpp" line="768"/>
+        <location filename="../core/qthelper.cpp" line="1274"/>
+        <source>ft</source>
+        <translation>רגל</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="32"/>
-        <source>Average</source>
-        <translation>ממוצע</translation>
+        <location filename="../core/qthelper.cpp" line="794"/>
+        <source>C</source>
+        <translation>C</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="35"/>
-        <source>Minimum</source>
-        <translation>מינימום</translation>
+        <location filename="../core/qthelper.cpp" line="796"/>
+        <source>F</source>
+        <translation>F</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="38"/>
-        <source>Maximum</source>
-        <translation>מקסימום</translation>
+        <location filename="../core/qthelper.cpp" line="821"/>
+        <location filename="../core/qthelper.cpp" line="1250"/>
+        <source>kg</source>
+        <translation>קילוגרם</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/globe.cpp" line="327"/>
-        <source>Move the map and double-click to set the dive location</source>
-        <translation>תזיז את המפה ולחץ לחיצה כפולה כדי לקבוע את מיקום הצלילה</translation>
+        <location filename="../core/qthelper.cpp" line="823"/>
+        <location filename="../core/qthelper.cpp" line="1251"/>
+        <source>lbs</source>
+        <translation>ליברה</translation>
     </message>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="28"/>
-        <source>unknown</source>
-        <translation>לא ידוע</translation>
+        <location filename="../core/qthelper.cpp" line="848"/>
+        <location filename="../core/qthelper.cpp" line="1300"/>
+        <source>bar</source>
+        <translation>bar</translation>
     </message>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="105"/>
-        <source>h:</source>
-        <translation>שעה:</translation>
+        <location filename="../core/qthelper.cpp" line="850"/>
+        <location filename="../core/qthelper.cpp" line="1299"/>
+        <source>psi</source>
+        <translation>psi</translation>
     </message>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="105"/>
-        <source>min</source>
-        <translation>דקה</translation>
+        <location filename="../core/qthelper.cpp" line="871"/>
+        <location filename="../core/qthelper.cpp" line="1235"/>
+        <source>AIR</source>
+        <translation>אוויר</translation>
     </message>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="337"/>
-        <source>Multiple</source>
-        <translation type="unfinished"/>
+        <location filename="../core/qthelper.cpp" line="873"/>
+        <source>EAN</source>
+        <translation>EAN</translation>
     </message>
     <message numerus="yes">
-        <location filename="../core/qthelper.cpp" line="957"/>
+        <location filename="../core/qthelper.cpp" line="962"/>
         <source>(%n dive(s))</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="816"/>
-        <location filename="../core/qthelper.cpp" line="1228"/>
-        <source>kg</source>
-        <translation>קילוגרם</translation>
+        <location filename="../core/qthelper.cpp" line="1235"/>
+        <source>OXYGEN</source>
+        <translation>חמצן</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="818"/>
-        <location filename="../core/qthelper.cpp" line="1229"/>
-        <source>lbs</source>
-        <translation>ליברה</translation>
+        <location filename="../core/qthelper.cpp" line="1322"/>
+        <source>l</source>
+        <translation>l</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="763"/>
-        <location filename="../core/qthelper.cpp" line="1252"/>
-        <source>ft</source>
-        <translation>רגל</translation>
+        <location filename="../core/qthelper.cpp" line="1323"/>
+        <source>cuft</source>
+        <translation>cuft</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="761"/>
-        <location filename="../core/qthelper.cpp" line="1253"/>
-        <source>m</source>
-        <translation>מטר</translation>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="29"/>
+        <source>unknown</source>
+        <translation>לא ידוע</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="789"/>
-        <source>C</source>
-        <translation>C</translation>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="114"/>
+        <source>h:</source>
+        <translation>שעה:</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="791"/>
-        <source>F</source>
-        <translation>F</translation>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="114"/>
+        <source>min</source>
+        <translation>דקה</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="845"/>
-        <location filename="../core/qthelper.cpp" line="1275"/>
-        <source>psi</source>
-        <translation>psi</translation>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="63"/>
+        <source>Remove this point</source>
+        <translation>הסר נקודה זו</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="843"/>
-        <location filename="../core/qthelper.cpp" line="1276"/>
-        <source>bar</source>
-        <translation>bar</translation>
+        <location filename="../desktop-widgets/globe.cpp" line="327"/>
+        <source>Move the map and double-click to set the dive location</source>
+        <translation>תזיז את המפה ולחץ לחיצה כפולה כדי לקבוע את מיקום הצלילה</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="868"/>
-        <source>EAN</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="32"/>
+        <source>Average</source>
+        <translation>ממוצע</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="1298"/>
-        <source>l</source>
-        <translation>l</translation>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="35"/>
+        <source>Minimum</source>
+        <translation>מינימום</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="1299"/>
-        <source>cuft</source>
-        <translation>cuft</translation>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="38"/>
+        <source>Maximum</source>
+        <translation>מקסימום</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="625"/>
@@ -7148,17 +7299,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <source>Malformed XML response. Line %1: %2</source>
         <translation>תגובת XML פגומה. שורה %1: %2</translation>
     </message>
-    <message>
-        <location filename="../core/gpslocation.h" line="13"/>
-        <source>Waiting to aquire GPS location</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>ReadSettingsThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1651"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1676"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1640"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1665"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>אפשרות זו לא קיים למחשב צלילה הנבחר</translation>
     </message>
@@ -7187,7 +7333,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ResetSettingsThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1775"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1764"/>
         <source>Reset settings failed!</source>
         <translation>אפס ההגדרות נכשל!</translation>
     </message>
@@ -7225,6 +7371,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ShiftImageTimesDialog</name>
     <message>
+        <location filename="../desktop-widgets/shiftimagetimes.ui" line="23"/>
+        <location filename="../build/ui_shiftimagetimes.h" line="184"/>
+        <source>Shift selected image times</source>
+        <translation>שינוי זמנים של התמונות הנבחרות</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/shiftimagetimes.ui" line="34"/>
         <location filename="../build/ui_shiftimagetimes.h" line="185"/>
         <source>Shift times of image(s) by</source>
@@ -7237,12 +7389,6 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>h:mm</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/shiftimagetimes.ui" line="23"/>
-        <location filename="../build/ui_shiftimagetimes.h" line="184"/>
-        <source>Shift selected image times</source>
-        <translation>שינוי זמנים של התמונות הנבחרות</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/shiftimagetimes.ui" line="105"/>
         <location filename="../build/ui_shiftimagetimes.h" line="187"/>
         <source>Earlier</source>
@@ -7294,12 +7440,12 @@ Not all images have timestamps in the range between
         <translation>איזה תאריך ושעה מוצגים בתמונה?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="297"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="296"/>
         <source>Open image file</source>
         <translation>פתך קובץ תמונה</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="299"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="298"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>קבצי תמונה (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -7395,28 +7541,28 @@ Not all images have timestamps in the range between
     <message>
         <location filename="../smtk-import/smrtk2ssrfc_window.ui" line="20"/>
         <source>SmartTrak files importer</source>
-        <translation type="unfinished"/>
+        <translation>יבוא קבצי SmartTrak</translation>
     </message>
     <message>
         <location filename="../smtk-import/smrtk2ssrfc_window.ui" line="79"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#6ebeb9;&quot;&gt;Subsurface divelog&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#6ebeb9;&quot;&gt;יומן צלילה Subsurface&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location filename="../smtk-import/smrtk2ssrfc_window.ui" line="111"/>
         <location filename="../smtk-import/smrtk2ssrfc_window.ui" line="177"/>
         <source>Choose</source>
-        <translation type="unfinished"/>
+        <translation>בחר</translation>
     </message>
     <message>
         <location filename="../smtk-import/smrtk2ssrfc_window.ui" line="133"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#6ebeb9;&quot;&gt;Smartrak divelog&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#6ebeb9;&quot;&gt;יומן צלילה Smartrak&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location filename="../smtk-import/smrtk2ssrfc_window.ui" line="242"/>
         <source>Exit</source>
-        <translation type="unfinished"/>
+        <translation>יציאה</translation>
     </message>
     <message>
         <location filename="../smtk-import/smrtk2ssrfc_window.ui" line="270"/>
@@ -7426,85 +7572,85 @@ Not all images have timestamps in the range between
     <message>
         <location filename="../smtk-import/smrtk2ssrfc_window.ui" line="295"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600; color:#6ebeb9;&quot;&gt;Select the .slg file(s) you want to import to Subsurface format, and the exported .xml file. It&apos;s advisable to use a new output file, as its actual content will be erased.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600; color:#6ebeb9;&quot;&gt; בחר קבצי .slg אתה רוצה לייבא לפורמט של Subsurface, ואת קובץ XML מיוצא. רצוי להשתמש בקובץ פלט חדש, כיוון שתוכן קובץ ה-XML יימחק.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location filename="../smtk-import/smrtk2ssrfc_window.ui" line="377"/>
         <source>Import messages (Errors, warnings, etc)</source>
-        <translation type="unfinished"/>
+        <translation>הודעות יבא (שגיאות, אזהרות, וכו &apos;)</translation>
     </message>
     <message>
         <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="50"/>
         <source>Open SmartTrak files</source>
-        <translation type="unfinished"/>
+        <translation>פתך קובצי SmartTrak</translation>
     </message>
     <message>
         <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="51"/>
         <source>SmartTrak files (*.slg *.SLG);;All files (*)</source>
-        <translation type="unfinished"/>
+        <translation>קבצי SmartTrak (*.slg *.SLG);;כל סוג של קבצים (*)</translation>
     </message>
     <message>
         <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="62"/>
         <source>Open Subsurface files</source>
-        <translation type="unfinished"/>
+        <translation>פתח קבצי Subsurface</translation>
     </message>
     <message>
         <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="63"/>
         <source>Subsurface files (*.ssrf *SSRF *.xml *.XML);;All files (*)</source>
-        <translation type="unfinished"/>
+        <translation>קבצי Subsurface (*.ssrf *SSRF *.xml *.XML);;כל סוג של קבצים (*)</translation>
     </message>
 </context>
 <context>
     <name>SocialNetworkDialog</name>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="339"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="284"/>
         <source>Dive date: %1 
 </source>
         <translation>תאריך צלילה: %1
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="342"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="287"/>
         <source>Duration: %1 
 </source>
         <translation>משך: %1
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="343"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="288"/>
         <source>h:</source>
         <comment>abbreviation for hours plus separator</comment>
         <translation>שעה:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="344"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="289"/>
         <source>min</source>
         <comment>abbreviation for minutes</comment>
         <translation>דקה</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="347"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="292"/>
         <source>Dive location: %1 
 </source>
         <translation>אתר צלילה: %1
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="350"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="295"/>
         <source>Buddy: %1 
 </source>
         <translation>בן זוג: %1
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="353"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="298"/>
         <source>Divemaster: %1 
 </source>
         <translation>דייבמאסטר: %1
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="356"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="301"/>
         <source>
 %1</source>
         <translation>
@@ -7590,9 +7736,20 @@ Not all images have timestamps in the range between
     <name>StartPage</name>
     <message>
         <location filename="../mobile-widgets/qml/StartPage.qml" line="19"/>
-        <source>To use Subsurface-mobile with Subsurface cloud storage, please enteryour cloud credentials.
+        <source>To use Subsurface-mobile with Subsurface cloud storage, please enter your cloud credentials.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/StartPage.qml" line="20"/>
+        <source>If this is the first time you use Subsurface cloud storage, enter a valid email (all lower case) and a password of your choice (letters and numbers). The server will send a PIN to the email address provided that you will have to enter here.
 
-To use Subsurface-mobile only with local data on this device, tap on the no cloud icon below.</source>
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/StartPage.qml" line="23"/>
+        <source>To use Subsurface-mobile only with local data on this device, tap on the no cloud icon below.</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -7625,13 +7782,18 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
     <message>
         <location filename="../desktop-widgets/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, Tomaz Canabrava, and others, 2011-2016&lt;/span&gt;</source>
-        <translation type="unfinished"/>
+        <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, Tomaz Canabrava, ואחרים, 2011-2016&lt;/span&gt;</translation>
     </message>
 </context>
 <context>
     <name>SubsurfaceWebServices</name>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="419"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="395"/>
+        <source>Enter User ID and click Download</source>
+        <translation>הזן את זיהוי משתמש ולחץ על הורדה</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="417"/>
         <source>Webservice</source>
         <translation>שרות איטרנט</translation>
     </message>
@@ -7656,30 +7818,25 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
         <translation>שגיאת חיבור:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="557"/>
-        <source>Download successful</source>
-        <translation>ההורדה הצליחה</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="551"/>
         <source>Invalid user identifier!</source>
         <translation>שם משתמש לא חוקי!</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="397"/>
-        <source>Enter User ID and click Download</source>
-        <translation>הזן את זיהוי משתמש ולחץ על הורדה</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="554"/>
         <source>Cannot parse response!</source>
         <translation>תשובה לא מובנת!</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="557"/>
+        <source>Download successful</source>
+        <translation>ההורדה הצליחה</translation>
+    </message>
 </context>
 <context>
     <name>SuitFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="674"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="672"/>
         <source>Suits: </source>
         <translation>חליפות:</translation>
     </message>
@@ -7687,7 +7844,7 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>SuitsFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="123"/>
+        <location filename="../qt-models/filtermodels.cpp" line="128"/>
         <source>No suit set</source>
         <translation>חליפה לא מוגדרה</translation>
     </message>
@@ -7706,7 +7863,7 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>TagFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="595"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="593"/>
         <source>Tags: </source>
         <translation>תגיות:</translation>
     </message>
@@ -7714,7 +7871,7 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>TagFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="148"/>
+        <location filename="../qt-models/filtermodels.cpp" line="153"/>
         <source>Empty tags</source>
         <translation>טגים רקים</translation>
     </message>
@@ -7740,6 +7897,11 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>TemplateEdit</name>
     <message>
+        <location filename="../desktop-widgets/templateedit.ui" line="14"/>
+        <source>Edit template</source>
+        <translation>ערוך תבנית</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/templateedit.ui" line="37"/>
         <source>Preview</source>
         <translation>תצוגה מקדימה</translation>
@@ -7785,11 +7947,6 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
         <translation>גודל גופן</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/templateedit.ui" line="14"/>
-        <source>Edit template</source>
-        <translation>ערוך תבנית</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/templateedit.ui" line="165"/>
         <source>Color palette</source>
         <translation>לוח צבעים</translation>
@@ -7971,82 +8128,9 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>TextHyperlinkEventFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="817"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="815"/>
         <source>%1click to visit %2</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>ThemeTest</name>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="29"/>
-        <source>Theme Information</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="33"/>
-        <source>Screen</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="42"/>
-        <source>Geometry (pixels):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="49"/>
-        <source>Geometry (gridUnits):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="56"/>
-        <source>Units.gridUnit:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="63"/>
-        <source>Units.devicePixelRatio:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="70"/>
-        <source>Font Metrics</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="76"/>
-        <source>FontMetrics pointSize:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="83"/>
-        <source>FontMetrics pixelSize:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="90"/>
-        <source>FontMetrics devicePixelRatio:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="97"/>
-        <source>Text item pixelSize:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="104"/>
-        <source>Text item pointSize:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="111"/>
-        <source>Pixel density:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="118"/>
-        <source>Height of default font:</source>
-        <translation type="unfinished"/>
+        <translation>%1 לחצ כדי להציג %2</translation>
     </message>
 </context>
 <context>
@@ -8060,102 +8144,107 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>TripItem</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="67"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="68"/>
         <source>(%1 shown)</source>
         <translation>(%1 מוצג)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="194"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="197"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="215"/>
         <source>Date</source>
         <translation>תאריך</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="200"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="218"/>
         <source>Rating</source>
         <translation>דירוג</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
         <source>Depth(%1)</source>
         <translation>עומק (%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
         <source>m</source>
         <translation>מטר</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
         <source>ft</source>
         <translation>רגל</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="206"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="224"/>
         <source>Duration</source>
         <translation>משך הצלילה</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="209"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="227"/>
         <source>Temp(%1%2)</source>
         <translation>טמפרטורה(%1%2)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
         <source>Weight(%1)</source>
         <translation>משקל(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
         <source>kg</source>
         <translation>קילוגרם</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
         <source>lbs</source>
         <translation>ליברה</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="215"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="233"/>
         <source>Suit</source>
         <translation>חליפה</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="218"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="236"/>
         <source>Cyl</source>
         <translation>מיכל</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="239"/>
         <source>Gas</source>
         <translation>גז</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="244"/>
         <source>SAC(%1)</source>
         <translation>צריכת גז (%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="244"/>
         <source>/min</source>
         <translation>לדקה</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="229"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="247"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="232"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="250"/>
         <source>Max CNS</source>
         <translation>רעילות שייורית מקסימלית</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="235"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="253"/>
+        <source>Photos before/during/after dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="256"/>
         <source>Location</source>
         <translation>מיקום</translation>
     </message>
@@ -8178,72 +8267,73 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>UpdateManager</name>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="69"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="61"/>
         <source>Check for updates.</source>
         <translation>בדוק לעדקונים.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="70"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="62"/>
         <source>Subsurface was unable to check for updates.</source>
         <translation>Subsurface לא היה מסוגל לבדוק אם יש עדכונים.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="75"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="67"/>
         <source>The following error occurred:</source>
         <translation>תקלה הבאה התרחשה:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="76"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="68"/>
         <source>Please check your internet connection.</source>
         <translation>אנא בדוק את חיבור האינטרנט שלך.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="86"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="78"/>
         <source>You are using the latest version of Subsurface.</source>
         <translation>אתה משתמש בגרסה האחרונה של Subsurface.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="89"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="81"/>
         <source>A new version of Subsurface is available.&lt;br/&gt;Click on:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; to download it.</source>
         <translation>גרסה חדשה של Subsurface זמינה.&lt;br/&gt;לחץ כאן:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; כדי להוריד.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="95"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="87"/>
         <source>A new version of Subsurface is available.</source>
         <translation>גרסה חדשה של Subsurface זמינה.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="96"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="88"/>
         <source>Latest version is %1, please check %2 our download page %3 for information in how to update.</source>
         <translation>גרסה האחרונה היא 1%, אנא בדוק %2 בדף ההורדה שלנו %3 למידע בכיצד לעדכן.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="106"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="98"/>
         <source>Newest release version is </source>
         <translation>גרסה האחרונה היא </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="107"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="99"/>
         <source>The server returned the following information:</source>
         <translation>השרת חזר את המידע הבא:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="125"/>
-        <source>Subsurface is checking every two weeks if a new version is available. If you don&apos;t want Subsurface to continue checking, please click Decline.</source>
-        <translation>Subsurface בודקת כל שבועיים אם גרסה חדשה זמינה. אם אתה לא רוצה Subsurface להמשיך לבדוק, אנא לחץ על דחה.</translation>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="117"/>
+        <source>Subsurface is checking every two weeks if a new version is available. 
+ If you don&apos;t want Subsurface to continue checking, please click Decline.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="126"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="119"/>
         <source>Decline</source>
         <translation>דחה</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="127"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="120"/>
         <source>Accept</source>
         <translation>אישור</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="129"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="122"/>
         <source>Automatic check for updates</source>
         <translation>בדיקה אוטומטית לעדכונים</translation>
     </message>
@@ -8265,24 +8355,6 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>UserSurvey</name>
     <message>
-        <location filename="../desktop-widgets/usersurvey.ui" line="44"/>
-        <location filename="../build/ui_usersurvey.h" line="151"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;We would love to learn more about our users, their preferences and their usage habits. Please spare a minute to fill out this form and submit it to the Subsurface team.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;נשמח ללמוד עוד על המשתמשים שלנו, העדפותיהם ואת הרגלי השימוש שלהם. אנא למלא את הטופס ולשלוח אותו לצוות Subsurface.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/usersurvey.ui" line="115"/>
-        <location filename="../build/ui_usersurvey.h" line="156"/>
-        <source>Other software/sources</source>
-        <translation>תוכנות/מקורות אחרות</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/usersurvey.ui" line="128"/>
-        <location filename="../build/ui_usersurvey.h" line="157"/>
-        <source>Manually entering dives</source>
-        <translation>הזנה צלילות ידנית</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="14"/>
         <location filename="../build/ui_usersurvey.h" line="149"/>
         <source>User survey</source>
@@ -8295,6 +8367,12 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
         <translation>סקר משתמשים של Subsurface</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/usersurvey.ui" line="44"/>
+        <location filename="../build/ui_usersurvey.h" line="151"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;We would love to learn more about our users, their preferences and their usage habits. Please spare a minute to fill out this form and submit it to the Subsurface team.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;נשמח ללמוד עוד על המשתמשים שלנו, העדפותיהם ואת הרגלי השימוש שלהם. אנא למלא את הטופס ולשלוח אותו לצוות Subsurface.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="63"/>
         <location filename="../build/ui_usersurvey.h" line="152"/>
         <source>Technical diver</source>
@@ -8319,6 +8397,18 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
         <translation>מחשב צלילה נתמך</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/usersurvey.ui" line="115"/>
+        <location filename="../build/ui_usersurvey.h" line="156"/>
+        <source>Other software/sources</source>
+        <translation>תוכנות/מקורות אחרות</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/usersurvey.ui" line="128"/>
+        <location filename="../build/ui_usersurvey.h" line="157"/>
+        <source>Manually entering dives</source>
+        <translation>הזנה צלילות ידנית</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="141"/>
         <location filename="../build/ui_usersurvey.h" line="158"/>
         <source>Android/iPhone companion app</source>
@@ -8349,6 +8439,11 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
         <translation>לאן אתה מייבא נתונים מ?</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/usersurvey.cpp" line="18"/>
+        <source>Send</source>
+        <translation>שלח</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/usersurvey.cpp" line="43"/>
         <source>
 Operating system: %1</source>
@@ -8392,19 +8487,14 @@ Language: %1</source>
         <translation>שאל מאוחר יותר</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/usersurvey.cpp" line="101"/>
-        <source>Submit user survey.</source>
-        <translation>שלח סקר משתמשים.</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/usersurvey.cpp" line="82"/>
         <source>Ask again?</source>
         <translation>שאל שוב?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/usersurvey.cpp" line="18"/>
-        <source>Send</source>
-        <translation>שלח</translation>
+        <location filename="../desktop-widgets/usersurvey.cpp" line="101"/>
+        <source>Submit user survey.</source>
+        <translation>שלח סקר משתמשים.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/usersurvey.cpp" line="102"/>
@@ -8496,12 +8586,12 @@ Language: %1</source>
         <translation>ההעלאה</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="324"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="325"/>
         <source>Operation timed out</source>
         <translation>הפעולה נכשלה</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="345"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="346"/>
         <source>Transferring data...</source>
         <translation>מעביר נתונים...</translation>
     </message>
@@ -8536,18 +8626,18 @@ Language: %1</source>
 <context>
     <name>WriteSettingsThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1702"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1709"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1718"/>
-        <source>Failed!</source>
-        <translation>נכשל!</translation>
-    </message>
-    <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1700"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1721"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1689"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1710"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>אפשרות זו לא קיים למחשב צלילה הנבחר</translation>
     </message>
+    <message>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1691"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1698"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1707"/>
+        <source>Failed!</source>
+        <translation>נכשל!</translation>
+    </message>
 </context>
 <context>
     <name>YearlyStatisticsModel</name>
@@ -8672,7 +8762,7 @@ Maximum</source>
 <context>
     <name>getextFromC</name>
     <message>
-        <location filename="../core/libdivecomputer.c" line="674"/>
+        <location filename="../core/libdivecomputer.c" line="737"/>
         <source>Error parsing the header</source>
         <translation>שגיאת בניתוח הכותרת</translation>
     </message>
@@ -8680,38 +8770,377 @@ Maximum</source>
 <context>
     <name>gettextFromC</name>
     <message>
+        <location filename="../core/cochran.c" line="309"/>
+        <location filename="../core/cochran.c" line="315"/>
+        <location filename="../core/cochran.c" line="385"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>deco stop</source>
+        <translation>עצירה לדיקומפרסיה</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="336"/>
+        <location filename="../core/cochran.c" line="390"/>
+        <location filename="../core/file.c" line="777"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>ascent</source>
+        <translation>עליה</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="342"/>
+        <location filename="../core/file.c" line="755"/>
+        <source>battery</source>
+        <translation>סוללה</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="348"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
+        <source>OLF</source>
+        <translation>OLF</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="353"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
+        <source>maxdepth</source>
+        <translation>עומק מקס&apos;</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="358"/>
+        <location filename="../core/cochran.c" line="404"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
+        <source>pO₂</source>
+        <translation>pO₂</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="365"/>
+        <location filename="../core/cochran.c" line="414"/>
+        <location filename="../core/cochran.c" line="421"/>
+        <location filename="../core/file.c" line="868"/>
+        <location filename="../core/libdivecomputer.c" line="225"/>
+        <location filename="../core/libdivecomputer.c" line="228"/>
+        <source>gaschange</source>
+        <translation>החלפת גז</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="370"/>
+        <location filename="../core/cochran.c" line="409"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>rbt</source>
+        <translation>זמן נותר בעומק</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="379"/>
+        <location filename="../core/cochran.c" line="426"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>ceiling</source>
+        <translation>תקרה</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="395"/>
+        <location filename="../core/libdivecomputer.c" line="224"/>
+        <source>transmitter</source>
+        <translation>משדר</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="153"/>
+        <source>Error: the file does not appear to be a DATATRAK divelog</source>
+        <translation>שגיאה: הקובץ אינו יומן צלילה של DATATRAK</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="286"/>
+        <source>clear</source>
+        <translation>שקוף</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="289"/>
+        <source>misty</source>
+        <translation>עכור</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="292"/>
+        <source>fog</source>
+        <translation>ערפל</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="295"/>
+        <source>rain</source>
+        <translation>גשם</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="298"/>
+        <source>storm</source>
+        <translation>סופה</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="301"/>
+        <source>snow</source>
+        <translation>שלג</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="321"/>
+        <source>No suit</source>
+        <translation>ללא חליפה</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="324"/>
+        <source>Shorty</source>
+        <translation>חליפה קצרה</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="327"/>
+        <source>Combi</source>
+        <translation>חליפת צלילה משולבת</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="330"/>
+        <source>Wet suit</source>
+        <translation>חליפה רטובה</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="333"/>
+        <source>Semidry suit</source>
+        <translation>חליפה חצי יבשה</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="336"/>
+        <source>Dry suit</source>
+        <translation>חליפה ישבה</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="396"/>
+        <source>no stop</source>
+        <translation>ללא תחנה</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="398"/>
+        <location filename="../core/dive.c" line="29"/>
+        <source>deco</source>
+        <translation>דקומפרסיה</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="400"/>
+        <source>single ascent</source>
+        <translation>עליה יחיד</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="402"/>
+        <source>multiple ascent</source>
+        <translation>עליה מרובה</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="404"/>
+        <location filename="../core/dive.c" line="27"/>
+        <source>fresh</source>
+        <translation>fresh</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="406"/>
+        <source>salt water</source>
+        <translation>מי מלח</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="431"/>
+        <source>sight seeing</source>
+        <translation>סיור</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="433"/>
+        <source>club dive</source>
+        <translation>צלילת מועדון</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="435"/>
+        <location filename="../core/dive.c" line="28"/>
+        <source>instructor</source>
+        <translation>מדריך</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="437"/>
+        <source>instruction</source>
+        <translation>מודרך</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="439"/>
+        <location filename="../core/dive.c" line="27"/>
+        <source>night</source>
+        <translation>לילה</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="441"/>
+        <location filename="../core/dive.c" line="25"/>
+        <source>cave</source>
+        <translation>מערה</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="443"/>
+        <location filename="../core/dive.c" line="24"/>
+        <source>ice</source>
+        <translation>קרח</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="445"/>
+        <source>search</source>
+        <translation>חיפוש</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="455"/>
+        <location filename="../core/dive.c" line="25"/>
+        <source>wreck</source>
+        <translation>ספינה טרופה</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="457"/>
+        <location filename="../core/dive.c" line="26"/>
+        <source>river</source>
+        <translation>נחל</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="459"/>
+        <location filename="../core/dive.c" line="23"/>
+        <source>drift</source>
+        <translation>סחיפה</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="461"/>
+        <location filename="../core/dive.c" line="28"/>
+        <source>photo</source>
+        <translation>תצלום</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="463"/>
+        <source>other</source>
+        <translation>אחר</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="474"/>
+        <source>Other activities</source>
+        <translation>פעילויות אחרות</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="498"/>
+        <source>Datatrak/Wlog notes</source>
+        <translation>הערות מ-</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="537"/>
+        <source>Manually entered dive</source>
+        <translation>הזנה צלילה ידנית</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="588"/>
+        <source>Unknown</source>
+        <translation>לא ידוע</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="674"/>
+        <source>Error: couldn&apos;t open the file %s</source>
+        <translation>תקלה: לא ניתן לפתוח קובץ %s</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="687"/>
+        <source>Error: no dive</source>
+        <translation>תקלה: אין צלילה</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="23"/>
+        <source>boat</source>
+        <translation>ספינה</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="23"/>
+        <source>shore</source>
+        <translation>חוף</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="24"/>
+        <source>deep</source>
+        <translation>עמוק</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="24"/>
+        <source>cavern</source>
+        <translation>מחילה</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="25"/>
+        <source>altitude</source>
+        <translation>גובה</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="26"/>
+        <source>pool</source>
+        <translation>ברכה</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="26"/>
+        <source>lake</source>
+        <translation>אגם</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="27"/>
+        <source>student</source>
+        <translation>תלמיד</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="28"/>
+        <source>video</source>
+        <translation>וידאו</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="33"/>
+        <source>OC-gas</source>
+        <translation>גז למערכת פתוחה</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="33"/>
+        <source>diluent</source>
+        <translation>מדליל</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="33"/>
+        <location filename="../core/equipment.c" line="88"/>
+        <location filename="../core/planner.c" line="1436"/>
+        <location filename="../core/planner.c" line="1439"/>
+        <source>oxygen</source>
+        <translation>חמצן</translation>
+    </message>
+    <message>
         <location filename="../core/dive.c" line="181"/>
         <source>pascal</source>
         <translation>פסקל</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="186"/>
-        <location filename="../core/qthelper.cpp" line="669"/>
+        <location filename="../core/qthelper.cpp" line="674"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="190"/>
-        <location filename="../core/qthelper.cpp" line="672"/>
+        <location filename="../core/qthelper.cpp" line="677"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
+        <location filename="../core/dive.c" line="227"/>
+        <source>ℓ</source>
+        <translation>ליטר</translation>
+    </message>
+    <message>
         <location filename="../core/dive.c" line="232"/>
         <source>cuft</source>
         <translation>cuft</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="269"/>
-        <location filename="../core/qthelper.cpp" line="590"/>
-        <location filename="../core/qthelper.cpp" line="605"/>
+        <location filename="../core/qthelper.cpp" line="595"/>
+        <location filename="../core/qthelper.cpp" line="610"/>
         <source>m</source>
         <translation>מטר</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="274"/>
-        <location filename="../core/qthelper.cpp" line="593"/>
-        <location filename="../core/qthelper.cpp" line="607"/>
+        <location filename="../core/qthelper.cpp" line="598"/>
+        <location filename="../core/qthelper.cpp" line="612"/>
         <source>ft</source>
         <translation>רגל</translation>
     </message>
@@ -8737,53 +9166,58 @@ Maximum</source>
     </message>
     <message>
         <location filename="../core/dive.c" line="325"/>
-        <location filename="../core/qthelper.cpp" line="616"/>
-        <location filename="../core/qthelper.cpp" line="626"/>
+        <location filename="../core/qthelper.cpp" line="621"/>
+        <location filename="../core/qthelper.cpp" line="631"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="329"/>
-        <location filename="../core/qthelper.cpp" line="614"/>
-        <location filename="../core/qthelper.cpp" line="624"/>
+        <location filename="../core/qthelper.cpp" line="619"/>
+        <location filename="../core/qthelper.cpp" line="629"/>
         <source>kg</source>
         <translation>קילוגרם</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="1772"/>
+        <location filename="../core/dive.c" line="1751"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) או (%s)</translation>
     </message>
     <message>
-        <location filename="../core/divelist.c" line="484"/>
+        <location filename="../core/divelist.c" line="487"/>
         <location filename="../core/equipment.c" line="84"/>
-        <location filename="../core/planner.c" line="1411"/>
-        <location filename="../core/planner.c" line="1414"/>
+        <location filename="../core/planner.c" line="1432"/>
+        <location filename="../core/planner.c" line="1435"/>
         <source>air</source>
         <translation>אוויר</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="197"/>
+        <location filename="../core/equipment.c" line="86"/>
+        <source>EAN%d</source>
+        <translation>EAN%d</translation>
+    </message>
+    <message>
+        <location filename="../core/equipment.c" line="198"/>
         <source>integrated</source>
         <translation>איטגרל</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="198"/>
+        <location filename="../core/equipment.c" line="199"/>
         <source>belt</source>
         <translation>חגורה</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="199"/>
+        <location filename="../core/equipment.c" line="200"/>
         <source>ankle</source>
         <translation>קרסול</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="200"/>
+        <location filename="../core/equipment.c" line="201"/>
         <source>backplate weight</source>
         <translation>משקל פלטת גב</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="201"/>
+        <location filename="../core/equipment.c" line="202"/>
         <source>clip-on</source>
         <translation>נצמד</translation>
     </message>
@@ -8796,8 +9230,8 @@ Maximum</source>
         <location filename="../core/file.c" line="121"/>
         <location filename="../core/file.c" line="512"/>
         <location filename="../core/file.c" line="597"/>
-        <location filename="../core/file.c" line="924"/>
-        <location filename="../core/file.c" line="1056"/>
+        <location filename="../core/file.c" line="909"/>
+        <location filename="../core/file.c" line="1092"/>
         <location filename="../core/ostctools.c" line="80"/>
         <source>Failed to read &apos;%s&apos;</source>
         <translation>קריאה מ&apos;%s&apos; נכשלה</translation>
@@ -8855,486 +9289,496 @@ Maximum</source>
         <translation>כיול חמצן</translation>
     </message>
     <message>
-        <location filename="../core/file.c" line="887"/>
-        <source>No matching DC found for file &apos;%s&apos;</source>
-        <translation>לא נמצא  מחשב צלילה מתאמה לקובץ &apos;%s&apos;</translation>
+        <location filename="../core/git-access.c" line="134"/>
+        <source>Local cache directory %s corrupted - can&apos;t sync with Subsurface cloud storage</source>
+        <translation>ספריית מטמון %s מקומית פגומות - לא לסנכרן עם אחסון ענן </translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>none</source>
-        <translation>אין</translation>
+        <location filename="../core/git-access.c" line="157"/>
+        <location filename="../core/git-access.c" line="177"/>
+        <source>Could not update local cache to newer remote data</source>
+        <translation>לא ניתן לעדכן את מטמון מקומי לנתונים מרוחקים חדשים יותר</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="309"/>
-        <location filename="../core/cochran.c" line="315"/>
-        <location filename="../core/cochran.c" line="385"/>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>deco stop</source>
-        <translation>עצירה לדיקומפרסיה</translation>
+        <location filename="../core/git-access.c" line="170"/>
+        <source>Subsurface cloud storage corrupted</source>
+        <translation>אחסון בענן של Subsurface פגומה</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="342"/>
-        <location filename="../core/file.c" line="755"/>
-        <source>battery</source>
-        <translation>סוללה</translation>
+        <location filename="../core/git-access.c" line="284"/>
+        <source>Could not update Subsurface cloud storage, try again later</source>
+        <translation>לא ניתן לעדכן אחסון ענן של Subsurface, נסה שוב מאוחר יותר</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="370"/>
-        <location filename="../core/cochran.c" line="409"/>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>rbt</source>
-        <translation>זמן נותר בעומק</translation>
+        <location filename="../core/git-access.c" line="344"/>
+        <source>Remote storage and local data diverged. Error: merge failed (%s)</source>
+        <translation>אחסון מרוחק ונתונים מקומיים התפצלו. שגיאה: מזוג נכשל (%s)</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="336"/>
-        <location filename="../core/cochran.c" line="390"/>
-        <location filename="../core/file.c" line="777"/>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>ascent</source>
-        <translation>עליה</translation>
+        <location filename="../core/git-access.c" line="374"/>
+        <source>Remote storage and local data diverged. Cannot combine local and remote changes</source>
+        <translation>אחסון מרוחק ונתונים מקומיים התפצלו. לא ניתן לשלב שינויים מקומיים ומרוחקים</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="379"/>
-        <location filename="../core/cochran.c" line="426"/>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>ceiling</source>
-        <translation>תקרה</translation>
+        <location filename="../core/git-access.c" line="408"/>
+        <source>Remote storage and local data diverged</source>
+        <translation>נתונים אחסון מקומיים ומרוחק התפצלו</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>workload</source>
-        <translation>עומס</translation>
+        <location filename="../core/git-access.c" line="411"/>
+        <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source>
+        <translation>אחסון מרוחק ונתונים מקומיים התפצלו. שגיאה: כתיבת נתונים נכשלה (%s)</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="395"/>
-        <location filename="../core/libdivecomputer.c" line="203"/>
-        <source>transmitter</source>
-        <translation>משדר</translation>
+        <location filename="../core/git-access.c" line="420"/>
+        <source>Problems with local cache of Subsurface cloud data</source>
+        <translation>בעיות עם מטמון מקומי של נתוני ענן Subsurface</translation>
+    </message>
+    <message>
+        <location filename="../core/git-access.c" line="421"/>
+        <source>Moved cache data to %s. Please try the operation again.</source>
+        <translation>נתונים מטמון מעבר ל-%s. אנא נסה שוב את הפעולה.</translation>
+    </message>
+    <message>
+        <location filename="../core/git-access.c" line="743"/>
+        <source>Error connecting to Subsurface cloud storage</source>
+        <translation>שגיאה בחיבור לאחסון בענן של Subsurface</translation>
+    </message>
+    <message>
+        <location filename="../core/git-access.c" line="746"/>
+        <source>git clone of %s failed (%s)</source>
+        <translation>שיבוט git של%s נכשל (%s)</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="210"/>
+        <location filename="../core/parse-xml.c" line="3317"/>
+        <location filename="../core/uemis-downloader.c" line="134"/>
+        <source>unknown</source>
+        <translation>לא ידוע</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>none</source>
+        <translation>אין</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="203"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>workload</source>
+        <translation>עומס</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="224"/>
         <source>violation</source>
         <translation>חריגה</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="203"/>
+        <location filename="../core/libdivecomputer.c" line="224"/>
         <source>bookmark</source>
         <translation>סימניה</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="203"/>
+        <location filename="../core/libdivecomputer.c" line="224"/>
         <source>surface</source>
         <translation>שטח</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="203"/>
+        <location filename="../core/libdivecomputer.c" line="224"/>
         <source>safety stop</source>
         <translation>עצירת בטיחות</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="365"/>
-        <location filename="../core/cochran.c" line="414"/>
-        <location filename="../core/cochran.c" line="421"/>
-        <location filename="../core/file.c" line="868"/>
-        <location filename="../core/libdivecomputer.c" line="204"/>
-        <location filename="../core/libdivecomputer.c" line="207"/>
-        <source>gaschange</source>
-        <translation>החלפת גז</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="204"/>
+        <location filename="../core/libdivecomputer.c" line="225"/>
         <source>safety stop (voluntary)</source>
         <translation>עצירת בטיחות (יזומה)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="204"/>
+        <location filename="../core/libdivecomputer.c" line="225"/>
         <source>safety stop (mandatory)</source>
         <translation>עצירת בטיחות (חובה)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="205"/>
+        <location filename="../core/libdivecomputer.c" line="226"/>
         <source>deepstop</source>
         <translation>עצירה בעומק</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="205"/>
+        <location filename="../core/libdivecomputer.c" line="226"/>
         <source>ceiling (safety stop)</source>
         <translation>תקרה (עצירת בטיחות)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="205"/>
-        <source>divetime</source>
-        <translation>זמן צלילה</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="205"/>
+        <location filename="../core/libdivecomputer.c" line="226"/>
         <source>below floor</source>
         <comment>event showing dive is below deco floor and adding deco time</comment>
         <translation>מתחת לרצפת דקו</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="353"/>
-        <location filename="../core/libdivecomputer.c" line="206"/>
-        <source>maxdepth</source>
-        <translation>עומק מקס&apos;</translation>
-    </message>
-    <message>
-        <location filename="../core/cochran.c" line="348"/>
-        <location filename="../core/libdivecomputer.c" line="206"/>
-        <source>OLF</source>
-        <translation>OLF</translation>
+        <location filename="../core/libdivecomputer.c" line="226"/>
+        <source>divetime</source>
+        <translation>זמן צלילה</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="206"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
         <source>airtime</source>
         <translation>זמן אויר</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="206"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
         <source>rgbm</source>
         <translation>rgbm</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="206"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
         <source>heading</source>
         <translation>כותרת</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="358"/>
-        <location filename="../core/cochran.c" line="404"/>
-        <location filename="../core/libdivecomputer.c" line="206"/>
-        <source>pO₂</source>
-        <translation>pO₂</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="207"/>
+        <location filename="../core/libdivecomputer.c" line="228"/>
         <source>tissue level warning</source>
         <translation>אזהרת רמות רקמות</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="207"/>
+        <location filename="../core/libdivecomputer.c" line="228"/>
         <source>non stop time</source>
         <translation>זמן ללא עצירה</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="224"/>
+        <location filename="../core/libdivecomputer.c" line="237"/>
         <source>invalid event number</source>
         <translation>מס&apos; ארוע שגוי</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="658"/>
-        <source>Unable to create parser for %s %s</source>
-        <translation>לא מצליח להבין %s %s </translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="664"/>
-        <source>Error registering the data</source>
-        <translation>שגיאה ברישום המידע</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="495"/>
+        <location filename="../core/libdivecomputer.c" line="553"/>
         <source>Error parsing the datetime</source>
         <translation>שגיאה בקריאת תאריך</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="513"/>
+        <location filename="../core/libdivecomputer.c" line="571"/>
         <source>Dive %d: %s</source>
         <translation>צלילה %d: %s</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="519"/>
+        <location filename="../core/libdivecomputer.c" line="577"/>
         <source>Error parsing the divetime</source>
         <translation>שגיאה בקריאת זמן צלילה</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="529"/>
+        <location filename="../core/libdivecomputer.c" line="587"/>
         <source>Error parsing the maxdepth</source>
         <translation>שגיאה בקריאת עומק מקסימלי</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="548"/>
+        <location filename="../core/libdivecomputer.c" line="606"/>
         <source>Error parsing temperature</source>
         <translation>שגיאה בקריאת טמפרטורה</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="568"/>
+        <location filename="../core/libdivecomputer.c" line="626"/>
         <source>Error parsing the gas mix count</source>
         <translation>שגיאה בקריאת תערובת גזים</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="580"/>
+        <location filename="../core/libdivecomputer.c" line="638"/>
         <source>Error obtaining water salinity</source>
         <translation>שגיאה בקבלת מליחות מים</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="589"/>
+        <location filename="../core/libdivecomputer.c" line="647"/>
         <source>Error obtaining surface pressure</source>
         <translation>שגיאה בקבלת לחץ על פני המים</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="614"/>
+        <location filename="../core/libdivecomputer.c" line="672"/>
         <source>Error obtaining divemode</source>
         <translation>שגיאה בקבלת מוד צלילה</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="634"/>
+        <location filename="../core/libdivecomputer.c" line="692"/>
         <source>Error parsing the gas mix</source>
         <translation>שגיאה בקריאת תערובת הגזים</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="684"/>
+        <location filename="../core/libdivecomputer.c" line="717"/>
+        <source>Unable to create parser for %s %s</source>
+        <translation>לא מצליח להבין %s %s </translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="723"/>
+        <source>Error registering the data</source>
+        <translation>שגיאה ברישום המידע</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="744"/>
         <source>Error parsing the samples</source>
         <translation>שגיאה בקריאת נקודות דגימה</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="822"/>
+        <location filename="../core/libdivecomputer.c" line="882"/>
         <source>Event: waiting for user action</source>
         <translation>אירוע: מחכה לפעולה של המשתמש</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="830"/>
+        <location filename="../core/libdivecomputer.c" line="890"/>
         <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="../core/libdivecomputer.c" line="894"/>
+        <location filename="../core/libdivecomputer.c" line="954"/>
         <source>Error registering the event handler.</source>
         <translation>שגיאה ברישום שגרת ניהול</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="899"/>
+        <location filename="../core/libdivecomputer.c" line="959"/>
         <source>Error registering the cancellation handler.</source>
         <translation>שגיאה בעת רישום שגרת הביטול.</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="920"/>
+        <location filename="../core/libdivecomputer.c" line="980"/>
         <source>Dive data import error</source>
         <translation>שגיאת יבוא נתוני צלילה</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="959"/>
+        <location filename="../core/libdivecomputer.c" line="1019"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>לא ניתן לייצר אובייקט של libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="966"/>
+        <location filename="../core/libdivecomputer.c" line="1026"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>לא ניתן לפתוח את %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="992"/>
+        <location filename="../core/libdivecomputer.c" line="1048"/>
         <source>Insufficient privileges to open the device %s %s (%s)</source>
         <translation>הרשאות לא מספיקות כדי לפתוח את המכשיר  %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../core/parse-xml.c" line="517"/>
-        <source>Strange percentage reading %s
+        <location filename="../core/load-git.c" line="194"/>
+        <location filename="../core/parse-xml.c" line="1242"/>
+        <source>multiple GPS locations for this dive site; also %s
 </source>
-        <translation>קריאת אחוז מוזרה %s
+        <translation>מיקומי GPS מרובים לאתר צלילה זה; גם %s
 </translation>
     </message>
     <message>
-        <location filename="../core/load-git.c" line="194"/>
-        <location filename="../core/parse-xml.c" line="1238"/>
-        <source>multiple GPS locations for this dive site; also %s
+        <location filename="../core/load-git.c" line="222"/>
+        <location filename="../core/parse-xml.c" line="1304"/>
+        <source>additional name for site: %s
 </source>
-        <translation>מיקומי GPS מרובים לאתר צלילה זה; גם %s
+        <translation>שם נוסף לאתר: %s
+</translation>
+    </message>
+    <message>
+        <location filename="../core/ostctools.c" line="120"/>
+        <location filename="../core/ostctools.c" line="152"/>
+        <source>Unknown DC in dive %d</source>
+        <translation>מחשב צלילה לא מוקר בצלילה %d</translation>
+    </message>
+    <message>
+        <location filename="../core/ostctools.c" line="165"/>
+        <source>Error - %s - parsing dive %d</source>
+        <translation>תקלה - %s - בקריאת צלילה %d</translation>
+    </message>
+    <message>
+        <location filename="../core/parse-xml.c" line="517"/>
+        <source>Strange percentage reading %s
+</source>
+        <translation>קריאת אחוז מוזרה %s
 </translation>
     </message>
     <message>
-        <location filename="../core/parse-xml.c" line="2044"/>
+        <location filename="../core/parse-xml.c" line="2051"/>
         <source>Failed to parse &apos;%s&apos;</source>
         <translation>נכשל ניסיון לנתח &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../core/parse-xml.c" line="3741"/>
+        <location filename="../core/parse-xml.c" line="3774"/>
         <source>Can&apos;t open stylesheet %s</source>
         <translation>לא ניתן לפתוח את גיליון העיצוב %s</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="86"/>
-        <source>EAN%d</source>
-        <translation>EAN%d</translation>
+        <location filename="../core/planner.c" line="555"/>
+        <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE %s ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source>
+        <translation>כתב ויתור / אזהרה: זה יישום חדש של אלגוריתם %s ויישום תכנן צלילה בהתבסס על כך שקיבל רק כמות מוגבלת של בדיקות. אנו ממליצים בחום לא לתכנן צלילות מבוססות רק על פי תוצאות כאן.</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="1032"/>
-        <location filename="../core/planner.c" line="1184"/>
-        <source>Can&apos;t find gas %s</source>
-        <translation>לא ניתן למצוא את הגז %s</translation>
+        <location filename="../core/planner.c" line="569"/>
+        <source>Decompression calculation aborted due to excessive time</source>
+        <translation>חישוב דקו בוטל בשל זמן מוגזם</translation>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="571"/>
+        <location filename="../core/planner.c" line="829"/>
+        <location filename="../core/planner.c" line="834"/>
+        <location filename="../core/planner.c" line="860"/>
+        <location filename="../core/planner.c" line="870"/>
+        <source>Warning:</source>
+        <translation>אזהרה:</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="368"/>
-        <source>Too many gas mixes</source>
-        <translation>תערובות גז רבות מדי</translation>
+        <location filename="../core/planner.c" line="581"/>
+        <source>based on Bühlmann ZHL-16C with GFlow = %d and GFhigh = %d</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="568"/>
-        <source>Decompression calculation aborted due to excessive time</source>
-        <translation>חישוב דקו בוטל בשל זמן מוגזם</translation>
+        <location filename="../core/planner.c" line="586"/>
+        <source>based on VPM-B at nominal conservatism</source>
+        <translation>המבוסס על VPM-B בשמרנות נומינלית</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="592"/>
+        <location filename="../core/planner.c" line="588"/>
+        <source>based on VPM-B at +%d conservatism</source>
+        <translation>המבוסס על VPM-B בשמרנות +%d</translation>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="590"/>
+        <source>, effective GF=%d/%d</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="594"/>
+        <source>recreational mode based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source>
+        <translation>מוד ספורטיבי מבוסס על Bühlmann ZHL-16B עם גרדיאנט תחתון=%d וגרדיאנט עליון =%d</translation>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="598"/>
         <source>Subsurface dive plan</source>
         <translation>תכנון צלילה של Subsurface</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="596"/>
-        <source>depth</source>
-        <translation>עומק</translation>
+        <location filename="../core/planner.c" line="599"/>
+        <source>&lt;div&gt;Runtime: %dmin&lt;/div&gt;&lt;br&gt;</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="602"/>
-        <source>runtime</source>
-        <translation>זמן צלילה</translation>
+        <location filename="../core/planner.c" line="604"/>
+        <source>depth</source>
+        <translation>עומק</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="599"/>
+        <location filename="../core/planner.c" line="607"/>
         <source>duration</source>
         <translation>משך הצלילה</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="554"/>
-        <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE %s ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source>
-        <translation>כתב ויתור / אזהרה: זה יישום חדש של אלגוריתם %s ויישום תכנן צלילה בהתבסס על כך שקיבל רק כמות מוגבלת של בדיקות. אנו ממליצים בחום לא לתכנן צלילות מבוססות רק על פי תוצאות כאן.</translation>
+        <location filename="../core/planner.c" line="610"/>
+        <source>runtime</source>
+        <translation>זמן צלילה</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="605"/>
+        <location filename="../core/planner.c" line="613"/>
         <source>gas</source>
         <translation>גז</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="648"/>
+        <location filename="../core/planner.c" line="656"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation>תעבור ל- %.*f %s ב- %d:%02d דקות - זמן בצלילה %d:%02u על %s (SP = %.1f בר)</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="656"/>
+        <location filename="../core/planner.c" line="664"/>
         <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="../core/planner.c" line="669"/>
+        <location filename="../core/planner.c" line="677"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation>תמתין ב- %.*f %s ל- %d:%02d דקות - זמן בצלילה %d:%02u על %s (SP = %.1f בר)</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="676"/>
+        <location filename="../core/planner.c" line="684"/>
         <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="../core/planner.c" line="721"/>
+        <location filename="../core/planner.c" line="729"/>
         <source>%3.0f%s</source>
         <translation>%3.0f%s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="724"/>
-        <location filename="../core/planner.c" line="728"/>
+        <location filename="../core/planner.c" line="732"/>
+        <location filename="../core/planner.c" line="736"/>
         <source>%3dmin</source>
         <translation>%3d דקות</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="737"/>
-        <location filename="../core/planner.c" line="749"/>
+        <location filename="../core/planner.c" line="745"/>
+        <location filename="../core/planner.c" line="757"/>
         <source>(SP = %.1fbar)</source>
         <translation>(SP = %.1fבר)</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="772"/>
+        <location filename="../core/planner.c" line="780"/>
         <source>Switch gas to %s (SP = %.1fbar)</source>
         <translation>מעבר גז ל- %s (SP = %.1f בר)</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="774"/>
+        <location filename="../core/planner.c" line="782"/>
         <source>Switch gas to %s</source>
         <translation>לעבור לגז s%</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="793"/>
+        <location filename="../core/planner.c" line="801"/>
         <source>CNS</source>
         <translation>CNS</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="795"/>
+        <location filename="../core/planner.c" line="803"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="799"/>
+        <location filename="../core/planner.c" line="807"/>
         <source>Gas consumption (CCR legs excluded):</source>
         <translation>צריכת דלק (לא כולל זמן במערכת סגורה):</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="801"/>
+        <location filename="../core/planner.c" line="809"/>
         <source>Gas consumption:</source>
         <translation>צריכת דלק: </translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="570"/>
-        <location filename="../core/planner.c" line="821"/>
-        <location filename="../core/planner.c" line="826"/>
-        <location filename="../core/planner.c" line="851"/>
-        <location filename="../core/planner.c" line="861"/>
-        <source>Warning:</source>
-        <translation>אזהרה:</translation>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="580"/>
-        <source>based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source>
-        <translation>מבוסס על Bühlmann ZHL-16B עם גרדיאנט תחתון=%d וגרדיאנט עליון =%d</translation>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="584"/>
-        <source>based on VPM-B at nominal conservatism</source>
-        <translation>המבוסס על VPM-B בשמרנות נומינלית</translation>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="586"/>
-        <source>based on VPM-B at +%d conservatism</source>
-        <translation>המבוסס על VPM-B בשמרנות +%d</translation>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="588"/>
-        <source>recreational mode based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source>
-        <translation>מוד ספורטיבי מבוסס על Bühlmann ZHL-16B עם גרדיאנט תחתון=%d וגרדיאנט עליון =%d</translation>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="822"/>
+        <location filename="../core/planner.c" line="830"/>
         <source>this is more gas than available in the specified cylinder!</source>
         <translation>זה יותר גז מאשר זמין במיכל הנבחר!</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="827"/>
+        <location filename="../core/planner.c" line="835"/>
         <source>not enough reserve for gas sharing on ascent!</source>
         <translation>לא מספיק עתודה לשיתוף גז בעלייה!</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="829"/>
+        <location filename="../core/planner.c" line="837"/>
         <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source>
         <translation>%.0f%s/%.0f%s מ- %s (%.0f%s/%.0f%s בעליעה מתוכנן)</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="831"/>
+        <location filename="../core/planner.c" line="839"/>
         <source>%.0f%s (%.0f%s during planned ascent) of %s</source>
         <translation>%.0f%s (%.0f%s בעליעה מתוכנן) של %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="848"/>
+        <location filename="../core/planner.c" line="857"/>
         <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
         <translation>pO₂ גבוע %.2f ב- %d:%02u עם גז %s בעומק %.*f %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="858"/>
+        <location filename="../core/planner.c" line="867"/>
         <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
         <translation>pO₂ נמוך %.2f ב- %d:%02u עם גז %s בעומק %.*f %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="1419"/>
+        <location filename="../core/planner.c" line="1194"/>
+        <source>Can&apos;t find gas %s</source>
+        <translation>לא ניתן למצוא את הגז %s</translation>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="1440"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1280"/>
+        <location filename="../core/profile.c" line="1298"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
@@ -9343,70 +9787,70 @@ D: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1283"/>
+        <location filename="../core/profile.c" line="1301"/>
         <source>P: %d%s
 </source>
         <translation>P: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1287"/>
+        <location filename="../core/profile.c" line="1305"/>
         <source>T: %.1f%s
 </source>
         <translation>T: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1293"/>
+        <location filename="../core/profile.c" line="1311"/>
         <source>V: %.1f%s
 </source>
         <translation>V: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1296"/>
+        <location filename="../core/profile.c" line="1314"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation>צריכת גז: %.*f%s/min
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1298"/>
+        <location filename="../core/profile.c" line="1316"/>
         <source>CNS: %u%%
 </source>
         <translation>רעילות שייורית מקסימלית %u%%
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1300"/>
+        <location filename="../core/profile.c" line="1318"/>
         <source>pO%s: %.2fbar
 </source>
         <translation>pO%s: %.2f בר
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1302"/>
+        <location filename="../core/profile.c" line="1320"/>
         <source>pN%s: %.2fbar
 </source>
         <translation>pN%s: %.2f בר
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1304"/>
+        <location filename="../core/profile.c" line="1322"/>
         <source>pHe: %.2fbar
 </source>
         <translation>pHe: %.2f בר
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1307"/>
+        <location filename="../core/profile.c" line="1325"/>
         <source>MOD: %d%s
 </source>
         <translation>MOD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1314"/>
+        <location filename="../core/profile.c" line="1332"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
@@ -9415,7 +9859,7 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1318"/>
+        <location filename="../core/profile.c" line="1336"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
@@ -9424,173 +9868,178 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1331"/>
+        <location filename="../core/profile.c" line="1349"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation>תחנת בטיחות: %u דקות @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1334"/>
+        <location filename="../core/profile.c" line="1352"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation>תחנת בטיחות: זמן לא ידוע @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1339"/>
+        <location filename="../core/profile.c" line="1357"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation>דקו: %u דקות @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1342"/>
+        <location filename="../core/profile.c" line="1360"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation>דקו: זמן לא ידוע @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1346"/>
+        <location filename="../core/profile.c" line="1364"/>
         <source>In deco
 </source>
         <translation>בדקו
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1348"/>
+        <location filename="../core/profile.c" line="1366"/>
         <source>NDL: %umin
 </source>
         <translation>NDL: %u דקות
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1351"/>
+        <location filename="../core/profile.c" line="1369"/>
         <source>TTS: %umin
 </source>
         <translation>TTS: %u דקות
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1354"/>
+        <location filename="../core/profile.c" line="1372"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation>דקו: %u דקות @ %.0f%s (מחושב)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1362"/>
+        <location filename="../core/profile.c" line="1380"/>
         <source>In deco (calc)
 </source>
         <translation>בדקו (חישוב)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1365"/>
+        <location filename="../core/profile.c" line="1383"/>
         <source>NDL: %umin (calc)
 </source>
         <translation>NDL: %u דקות (מחושב)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1367"/>
+        <location filename="../core/profile.c" line="1385"/>
         <source>NDL: &gt;2h (calc)
 </source>
         <translation>NDL: &gt; שעתיים (מחושב)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1371"/>
+        <location filename="../core/profile.c" line="1389"/>
         <source>TTS: %umin (calc)
 </source>
         <translation>TTS: %u דקות (מחושב)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1373"/>
+        <location filename="../core/profile.c" line="1391"/>
         <source>TTS: &gt;2h (calc)
 </source>
         <translation>TTS: &gt; שעתיים (מחושב)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1376"/>
+        <location filename="../core/profile.c" line="1394"/>
         <source>RBT: %umin
 </source>
         <translation>RBT: %u דקות
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1379"/>
+        <location filename="../core/profile.c" line="1397"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation>תקרה %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1385"/>
+        <location filename="../core/profile.c" line="1403"/>
         <source>Tissue %.0fmin: %.1f%s
 </source>
         <translation>רקמה %.0f דקות: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1391"/>
+        <location filename="../core/profile.c" line="1409"/>
         <source>heartbeat: %d
 </source>
         <translation>פעימות לב %d</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1393"/>
+        <location filename="../core/profile.c" line="1411"/>
         <source>bearing: %d
 </source>
         <translation>כיוון: %d
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1396"/>
+        <location filename="../core/profile.c" line="1414"/>
         <source>mean depth to here %.1f%s
 </source>
         <translation>עומק ממוצע לכאן %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1491"/>
+        <location filename="../core/profile.c" line="1515"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1495"/>
-        <location filename="../core/profile.c" line="1499"/>
-        <location filename="../core/profile.c" line="1503"/>
+        <location filename="../core/profile.c" line="1519"/>
+        <location filename="../core/profile.c" line="1523"/>
+        <location filename="../core/profile.c" line="1527"/>
         <source>%s %sD:%.1f%s</source>
         <translation>%s %sD:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1507"/>
+        <location filename="../core/profile.c" line="1531"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sD:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1511"/>
+        <location filename="../core/profile.c" line="1535"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1515"/>
-        <location filename="../core/profile.c" line="1519"/>
+        <location filename="../core/profile.c" line="1539"/>
+        <location filename="../core/profile.c" line="1543"/>
         <source>%s %sV:%.2f%s</source>
         <translation>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1526"/>
+        <location filename="../core/profile.c" line="1550"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s</translation>
     </message>
     <message>
+        <location filename="../core/profile.c" line="1575"/>
+        <source>%s SAC:%.*f %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../core/qthelper.cpp" line="67"/>
         <source>%1km</source>
         <translation>%1 ק&quot;מ</translation>
@@ -9611,446 +10060,460 @@ EADD: %d%s
         <translation>%1 יארד</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="635"/>
+        <location filename="../core/qthelper.cpp" line="91"/>
+        <location filename="../core/qthelper.cpp" line="226"/>
+        <source>N</source>
+        <translation>צ</translation>
+    </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="91"/>
+        <location filename="../core/qthelper.cpp" line="227"/>
+        <source>S</source>
+        <translation>ד</translation>
+    </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="92"/>
+        <location filename="../core/qthelper.cpp" line="228"/>
+        <source>E</source>
+        <translation>מז</translation>
+    </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="92"/>
+        <location filename="../core/qthelper.cpp" line="229"/>
+        <source>W</source>
+        <translation>מע</translation>
+    </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="640"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="638"/>
+        <location filename="../core/qthelper.cpp" line="643"/>
         <source>F</source>
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="23"/>
-        <source>boat</source>
-        <translation>ספינה</translation>
+        <location filename="../core/save-html.c" line="469"/>
+        <location filename="../core/save-html.c" line="553"/>
+        <location filename="../core/worldmap-save.c" line="111"/>
+        <source>Can&apos;t open file %s</source>
+        <translation>לא ניתן לפתוח קובץ %s</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="23"/>
-        <source>shore</source>
-        <translation>חוף</translation>
+        <location filename="../core/save-html.c" line="488"/>
+        <source>Number</source>
+        <translation>מספר</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="459"/>
-        <location filename="../core/dive.c" line="23"/>
-        <source>drift</source>
-        <translation>סחיפה</translation>
+        <location filename="../core/save-html.c" line="489"/>
+        <source>Date</source>
+        <translation>תאריך</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="24"/>
-        <source>deep</source>
-        <translation>עמוק</translation>
+        <location filename="../core/save-html.c" line="490"/>
+        <source>Time</source>
+        <translation>זמן</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="24"/>
-        <source>cavern</source>
-        <translation>מחילה</translation>
+        <location filename="../core/save-html.c" line="491"/>
+        <source>Location</source>
+        <translation>מיקום</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="443"/>
-        <location filename="../core/dive.c" line="24"/>
-        <source>ice</source>
-        <translation>קרח</translation>
+        <location filename="../core/save-html.c" line="492"/>
+        <source>Air temp.</source>
+        <translation>טמפ&apos; האוויר</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="445"/>
-        <source>search</source>
-        <translation>חיפוש</translation>
+        <location filename="../core/save-html.c" line="493"/>
+        <source>Water temp.</source>
+        <translation>טמפ&apos; המים</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="455"/>
-        <location filename="../core/dive.c" line="25"/>
-        <source>wreck</source>
-        <translation>ספינה טרופה</translation>
+        <location filename="../core/save-html.c" line="494"/>
+        <source>Dives</source>
+        <translation>צלילות</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="441"/>
-        <location filename="../core/dive.c" line="25"/>
-        <source>cave</source>
-        <translation>מערה</translation>
+        <location filename="../core/save-html.c" line="495"/>
+        <source>Expand all</source>
+        <translation>הצג הכל</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="25"/>
-        <source>altitude</source>
-        <translation>גובה</translation>
+        <location filename="../core/save-html.c" line="496"/>
+        <source>Collapse all</source>
+        <translation>הסתר הכל</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="26"/>
-        <source>pool</source>
-        <translation>ברכה</translation>
+        <location filename="../core/save-html.c" line="497"/>
+        <source>Trips</source>
+        <translation>טיולים</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="26"/>
-        <source>lake</source>
-        <translation>אגם</translation>
+        <location filename="../core/save-html.c" line="498"/>
+        <source>Statistics</source>
+        <translation>סטטיסטיקות</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="457"/>
-        <location filename="../core/dive.c" line="26"/>
-        <source>river</source>
-        <translation>נחל</translation>
+        <location filename="../core/save-html.c" line="499"/>
+        <source>Advanced search</source>
+        <translation>חיפוש מתקדם</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="439"/>
-        <location filename="../core/dive.c" line="27"/>
-        <source>night</source>
-        <translation>לילה</translation>
+        <location filename="../core/save-html.c" line="502"/>
+        <source>Rating</source>
+        <translation>דירוג</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="153"/>
-        <source>Error: the file does not appear to be a DATATRAK divelog</source>
-        <translation>שגיאה: הקובץ אינו יומן צלילה של DATATRAK</translation>
+        <location filename="../core/save-html.c" line="503"/>
+        <source>Visibility</source>
+        <translation>ראות</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="286"/>
-        <source>clear</source>
-        <translation>שקוף</translation>
+        <location filename="../core/save-html.c" line="504"/>
+        <source>Duration</source>
+        <translation>משך הצלילה</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="289"/>
-        <source>misty</source>
-        <translation>עכור</translation>
+        <location filename="../core/save-html.c" line="505"/>
+        <source>Divemaster</source>
+        <translation>מדריך צלילה</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="292"/>
-        <source>fog</source>
-        <translation>ערפל</translation>
+        <location filename="../core/save-html.c" line="506"/>
+        <source>Buddy</source>
+        <translation>בן זוג</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="295"/>
-        <source>rain</source>
-        <translation>גשם</translation>
+        <location filename="../core/save-html.c" line="507"/>
+        <source>Suit</source>
+        <translation>חליפה</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="298"/>
-        <source>storm</source>
-        <translation>סופה</translation>
+        <location filename="../core/save-html.c" line="508"/>
+        <source>Tags</source>
+        <translation>תגיות</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="301"/>
-        <source>snow</source>
-        <translation>שלג</translation>
+        <location filename="../core/save-html.c" line="509"/>
+        <location filename="../smtk-import/smartrak.c" line="251"/>
+        <location filename="../smtk-import/smartrak.c" line="321"/>
+        <source>Notes</source>
+        <translation>הערות</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="321"/>
-        <source>No suit</source>
-        <translation>ללא חליפה</translation>
+        <location filename="../core/save-html.c" line="510"/>
+        <source>Show more details</source>
+        <translation>הצג יותר נתונים</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="324"/>
-        <source>Shorty</source>
-        <translation>חליפה קצרה</translation>
+        <location filename="../core/save-html.c" line="513"/>
+        <source>Yearly statistics</source>
+        <translation>סטטיסטיקה שנתית</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="327"/>
-        <source>Combi</source>
-        <translation>חליפת צלילה משולבת</translation>
+        <location filename="../core/save-html.c" line="514"/>
+        <source>Year</source>
+        <translation>שנה</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="330"/>
-        <source>Wet suit</source>
-        <translation>חליפה רטובה</translation>
+        <location filename="../core/save-html.c" line="515"/>
+        <source>Total time</source>
+        <translation>סה&quot;כ זמן</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="333"/>
-        <source>Semidry suit</source>
-        <translation>חליפה חצי יבשה</translation>
+        <location filename="../core/save-html.c" line="516"/>
+        <source>Average time</source>
+        <translation>זמן ממוצע</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="336"/>
-        <source>Dry suit</source>
-        <translation>חליפה ישבה</translation>
+        <location filename="../core/save-html.c" line="517"/>
+        <source>Shortest time</source>
+        <translation>זמן מינימלי</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="396"/>
-        <source>no stop</source>
-        <translation>ללא תחנה</translation>
+        <location filename="../core/save-html.c" line="518"/>
+        <source>Longest time</source>
+        <translation>זמן מקסימלי</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="400"/>
-        <source>single ascent</source>
-        <translation>עליה יחיד</translation>
+        <location filename="../core/save-html.c" line="519"/>
+        <source>Average depth</source>
+        <translation>עומק ממוצע</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="402"/>
-        <source>multiple ascent</source>
-        <translation>עליה מרובה</translation>
+        <location filename="../core/save-html.c" line="520"/>
+        <source>Min. depth</source>
+        <translation>עומק מינימלי</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="404"/>
-        <location filename="../core/dive.c" line="27"/>
-        <source>fresh</source>
-        <translation>fresh</translation>
+        <location filename="../core/save-html.c" line="521"/>
+        <source>Max. depth</source>
+        <translation>עומק מירבי</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="406"/>
-        <source>salt water</source>
-        <translation>מי מלח</translation>
+        <location filename="../core/save-html.c" line="522"/>
+        <source>Average SAC</source>
+        <translation>צריכת גז ממוצע</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="431"/>
-        <source>sight seeing</source>
-        <translation>סיור</translation>
+        <location filename="../core/save-html.c" line="523"/>
+        <source>Min. SAC</source>
+        <translation>צריכת גז מינימלי</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="433"/>
-        <source>club dive</source>
-        <translation>צלילת מועדון</translation>
+        <location filename="../core/save-html.c" line="524"/>
+        <source>Max. SAC</source>
+        <translation>צריכת גז מירבי</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="437"/>
-        <source>instruction</source>
-        <translation>מודרך</translation>
+        <location filename="../core/save-html.c" line="525"/>
+        <source>Average temp.</source>
+        <translation>טמפרטורה ממוצע</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="463"/>
-        <source>other</source>
-        <translation>אחר</translation>
+        <location filename="../core/save-html.c" line="526"/>
+        <source>Min. temp.</source>
+        <translation>טמפ&apos; מינימלי</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="474"/>
-        <source>Other activities</source>
-        <translation>פעילויות אחרות</translation>
+        <location filename="../core/save-html.c" line="527"/>
+        <source>Max. temp.</source>
+        <translation>טמפ&apos; מקסימלי</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="498"/>
-        <source>Datatrak/Wlog notes</source>
-        <translation>הערות מ-</translation>
+        <location filename="../core/save-html.c" line="528"/>
+        <source>Back to list</source>
+        <translation>חזרה לרשימה</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="537"/>
-        <source>Manually entered dive</source>
-        <translation>הזנה צלילה ידנית</translation>
+        <location filename="../core/save-html.c" line="531"/>
+        <source>Dive No.</source>
+        <translation>צלילה מס&apos; </translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="588"/>
-        <source>Unknown</source>
-        <translation>לא ידוע</translation>
+        <location filename="../core/save-html.c" line="532"/>
+        <source>Dive profile</source>
+        <translation>פרופיל צלילה</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="674"/>
-        <source>Error: couldn&apos;t open the file %s</source>
-        <translation>תקלה: לא ניתן לפתוח קובץ %s</translation>
+        <location filename="../core/save-html.c" line="533"/>
+        <source>Dive information</source>
+        <translation>פרטי צלילה</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="687"/>
-        <source>Error: no dive</source>
-        <translation>תקלה: אין צלילה</translation>
+        <location filename="../core/save-html.c" line="534"/>
+        <source>Dive equipment</source>
+        <translation>ציוד צלילה</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="27"/>
-        <source>student</source>
-        <translation>תלמיד</translation>
+        <location filename="../core/save-html.c" line="535"/>
+        <location filename="../core/save-html.c" line="542"/>
+        <source>Type</source>
+        <translation>סוג</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="461"/>
-        <location filename="../core/dive.c" line="28"/>
-        <source>photo</source>
-        <translation>תצלום</translation>
+        <location filename="../core/save-html.c" line="536"/>
+        <source>Size</source>
+        <translation>גודל</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="28"/>
-        <source>video</source>
-        <translation>וידאו</translation>
+        <location filename="../core/save-html.c" line="537"/>
+        <source>Work pressure</source>
+        <translation>לחץ מקסימלי</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="435"/>
-        <location filename="../core/dive.c" line="28"/>
-        <source>instructor</source>
-        <translation>מדריך</translation>
+        <location filename="../core/save-html.c" line="538"/>
+        <source>Start pressure</source>
+        <translation>לחץ התחלתי</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="398"/>
-        <location filename="../core/dive.c" line="29"/>
-        <source>deco</source>
-        <translation>דקומפרסיה</translation>
+        <location filename="../core/save-html.c" line="539"/>
+        <source>End pressure</source>
+        <translation>לחץ סופי</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="33"/>
-        <source>OC-gas</source>
-        <translation>גז למערכת פתוחה</translation>
+        <location filename="../core/save-html.c" line="540"/>
+        <source>Gas</source>
+        <translation>גז</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="33"/>
-        <source>diluent</source>
-        <translation>מדליל</translation>
+        <location filename="../core/save-html.c" line="541"/>
+        <source>Weight</source>
+        <translation>משקל</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="33"/>
-        <location filename="../core/equipment.c" line="88"/>
-        <location filename="../core/planner.c" line="1415"/>
-        <location filename="../core/planner.c" line="1418"/>
-        <source>oxygen</source>
-        <translation>חמצן</translation>
+        <location filename="../core/save-html.c" line="543"/>
+        <source>Events</source>
+        <translation>אירועים</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="227"/>
-        <source>ℓ</source>
-        <translation>ליטר</translation>
+        <location filename="../core/save-html.c" line="544"/>
+        <source>Name</source>
+        <translation>שם</translation>
+    </message>
+    <message>
+        <location filename="../core/save-html.c" line="545"/>
+        <source>Value</source>
+        <translation>ערך</translation>
+    </message>
+    <message>
+        <location filename="../core/save-html.c" line="546"/>
+        <source>Coordinates</source>
+        <translation>קואורדינטות</translation>
+    </message>
+    <message>
+        <location filename="../core/save-html.c" line="547"/>
+        <source>Dive status</source>
+        <translation>סטטוס צלילה</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="239"/>
+        <location filename="../core/statistics.c" line="242"/>
         <source>more than %d days</source>
         <translation>יותר מ-%d ימים</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="246"/>
+        <location filename="../core/statistics.c" line="249"/>
         <source>%dd %dh %dmin</source>
         <translation>%dd %dh %dmin</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="249"/>
+        <location filename="../core/statistics.c" line="252"/>
         <source>%dmin %dsecs</source>
         <translation>%d דקות %d שניות</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="251"/>
+        <location filename="../core/statistics.c" line="254"/>
         <source>%dh %dmin</source>
         <translation>%dh %dmin</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="263"/>
+        <location filename="../core/statistics.c" line="266"/>
         <source>for dives #</source>
         <translation>לצלילות #</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="269"/>
+        <location filename="../core/statistics.c" line="272"/>
         <source>for selected dives</source>
         <translation>לצלילות שנבחרו</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="304"/>
+        <location filename="../core/statistics.c" line="307"/>
         <source>for dive #%d</source>
         <translation>לצלילה #%d</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="306"/>
+        <location filename="../core/statistics.c" line="309"/>
         <source>for selected dive</source>
         <translation>לצלילה שנבחרה</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="308"/>
+        <location filename="../core/statistics.c" line="311"/>
         <source>for all dives</source>
         <translation>לכל הצלילות</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="310"/>
+        <location filename="../core/statistics.c" line="313"/>
         <source>(no dives)</source>
         <translation>(שום צלילות)</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Sun</source>
         <translation>ראשון</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Mon</source>
         <translation>שני</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Tue</source>
         <translation>שלישי</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Wed</source>
         <translation>רביעי</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Thu</source>
         <translation>חמישי</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Fri</source>
         <translation>שישי</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Sat</source>
         <translation>שבת</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Jan</source>
         <translation>ינואר</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Feb</source>
         <translation>פבואר</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Mar</source>
         <translation>מרץ</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Apr</source>
         <translation>אפריל</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>May</source>
         <translation>מאי</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Jun</source>
         <translation>יוני</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Jul</source>
         <translation>יולי</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Aug</source>
         <translation>אוגוסט</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Sep</source>
         <translation>ספטמבר</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Oct</source>
         <translation>אוקטובר</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Nov</source>
         <translation>נובמבר</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Dec</source>
         <translation>דצמבר</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="191"/>
-        <location filename="../core/parse-xml.c" line="3284"/>
-        <location filename="../core/uemis-downloader.c" line="134"/>
-        <source>unknown</source>
-        <translation>לא ידוע</translation>
-    </message>
-    <message>
-        <location filename="../core/uemis-downloader.c" line="467"/>
-        <source>data</source>
-        <translation>נתונים</translation>
-    </message>
-    <message>
-        <location filename="../core/uemis-downloader.c" line="447"/>
-        <source>%s %s</source>
-        <translation>%s %s</translation>
-    </message>
-    <message>
         <location filename="../core/uemis-downloader.c" line="27"/>
         <source>Uemis Zurich: the file system is almost full.
 Disconnect/reconnect the dive computer
@@ -10081,6 +10544,16 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation>אין צוללות להורדה.</translation>
     </message>
     <message>
+        <location filename="../core/uemis-downloader.c" line="447"/>
+        <source>%s %s</source>
+        <translation>%s %s</translation>
+    </message>
+    <message>
+        <location filename="../core/uemis-downloader.c" line="467"/>
+        <source>data</source>
+        <translation>נתונים</translation>
+    </message>
+    <message>
         <location filename="../core/uemis-downloader.c" line="495"/>
         <source>divelog #</source>
         <translation>יומן צלילה #</translation>
@@ -10251,281 +10724,6 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation>התראת סוללה חלשה</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="469"/>
-        <location filename="../core/save-html.c" line="553"/>
-        <location filename="../core/worldmap-save.c" line="111"/>
-        <source>Can&apos;t open file %s</source>
-        <translation>לא ניתן לפתוח קובץ %s</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="488"/>
-        <source>Number</source>
-        <translation>מספר</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="489"/>
-        <source>Date</source>
-        <translation>תאריך</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="490"/>
-        <source>Time</source>
-        <translation>זמן</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="491"/>
-        <source>Location</source>
-        <translation>מיקום</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="492"/>
-        <source>Air temp.</source>
-        <translation>טמפ&apos; האוויר</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="493"/>
-        <source>Water temp.</source>
-        <translation>טמפ&apos; המים</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="498"/>
-        <source>Statistics</source>
-        <translation>סטטיסטיקות</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="502"/>
-        <source>Rating</source>
-        <translation>דירוג</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="503"/>
-        <source>Visibility</source>
-        <translation>ראות</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="504"/>
-        <source>Duration</source>
-        <translation>משך הצלילה</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="494"/>
-        <source>Dives</source>
-        <translation>צלילות</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="495"/>
-        <source>Expand all</source>
-        <translation>הצג הכל</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="496"/>
-        <source>Collapse all</source>
-        <translation>הסתר הכל</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="497"/>
-        <source>Trips</source>
-        <translation>טיולים</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="499"/>
-        <source>Advanced search</source>
-        <translation>חיפוש מתקדם</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="505"/>
-        <source>Divemaster</source>
-        <translation>מדריך צלילה</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="506"/>
-        <source>Buddy</source>
-        <translation>בן זוג</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="507"/>
-        <source>Suit</source>
-        <translation>חליפה</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="508"/>
-        <source>Tags</source>
-        <translation>תגיות</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="509"/>
-        <location filename="../smtk-import/smartrak.c" line="251"/>
-        <location filename="../smtk-import/smartrak.c" line="321"/>
-        <source>Notes</source>
-        <translation>הערות</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="510"/>
-        <source>Show more details</source>
-        <translation>הצג יותר נתונים</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="513"/>
-        <source>Yearly statistics</source>
-        <translation>סטטיסטיקה שנתית</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="514"/>
-        <source>Year</source>
-        <translation>שנה</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="515"/>
-        <source>Total time</source>
-        <translation>סה&quot;כ זמן</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="516"/>
-        <source>Average time</source>
-        <translation>זמן ממוצע</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="517"/>
-        <source>Shortest time</source>
-        <translation>זמן מינימלי</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="518"/>
-        <source>Longest time</source>
-        <translation>זמן מקסימלי</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="519"/>
-        <source>Average depth</source>
-        <translation>עומק ממוצע</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="520"/>
-        <source>Min. depth</source>
-        <translation>עומק מינימלי</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="521"/>
-        <source>Max. depth</source>
-        <translation>עומק מירבי</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="523"/>
-        <source>Min. SAC</source>
-        <translation>צריכת גז מינימלי</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="524"/>
-        <source>Max. SAC</source>
-        <translation>צריכת גז מירבי</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="525"/>
-        <source>Average temp.</source>
-        <translation>טמפרטורה ממוצע</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="526"/>
-        <source>Min. temp.</source>
-        <translation>טמפ&apos; מינימלי</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="527"/>
-        <source>Max. temp.</source>
-        <translation>טמפ&apos; מקסימלי</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="528"/>
-        <source>Back to list</source>
-        <translation>חזרה לרשימה</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="534"/>
-        <source>Dive equipment</source>
-        <translation>ציוד צלילה</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="537"/>
-        <source>Work pressure</source>
-        <translation>לחץ מקסימלי</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="538"/>
-        <source>Start pressure</source>
-        <translation>לחץ התחלתי</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="539"/>
-        <source>End pressure</source>
-        <translation>לחץ סופי</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="547"/>
-        <source>Dive status</source>
-        <translation>סטטוס צלילה</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="522"/>
-        <source>Average SAC</source>
-        <translation>צריכת גז ממוצע</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="531"/>
-        <source>Dive No.</source>
-        <translation>צלילה מס&apos; </translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="532"/>
-        <source>Dive profile</source>
-        <translation>פרופיל צלילה</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="533"/>
-        <source>Dive information</source>
-        <translation>פרטי צלילה</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="535"/>
-        <location filename="../core/save-html.c" line="542"/>
-        <source>Type</source>
-        <translation>סוג</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="536"/>
-        <source>Size</source>
-        <translation>גודל</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="540"/>
-        <source>Gas</source>
-        <translation>גז</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="541"/>
-        <source>Weight</source>
-        <translation>משקל</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="543"/>
-        <source>Events</source>
-        <translation>אירועים</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="544"/>
-        <source>Name</source>
-        <translation>שם</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="545"/>
-        <source>Value</source>
-        <translation>ערך</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="546"/>
-        <source>Coordinates</source>
-        <translation>קואורדינטות</translation>
-    </message>
-    <message>
         <location filename="../core/worldmap-save.c" line="39"/>
         <source>Date:</source>
         <translation>תאריך:</translation>
@@ -10571,173 +10769,69 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation>הערות:</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="91"/>
-        <location filename="../core/qthelper.cpp" line="226"/>
-        <source>N</source>
-        <translation>צ</translation>
-    </message>
-    <message>
-        <location filename="../core/qthelper.cpp" line="91"/>
-        <location filename="../core/qthelper.cpp" line="227"/>
-        <source>S</source>
-        <translation>ד</translation>
-    </message>
-    <message>
-        <location filename="../core/qthelper.cpp" line="92"/>
-        <location filename="../core/qthelper.cpp" line="228"/>
-        <source>E</source>
-        <translation>מז</translation>
-    </message>
-    <message>
-        <location filename="../core/qthelper.cpp" line="92"/>
-        <location filename="../core/qthelper.cpp" line="229"/>
-        <source>W</source>
-        <translation>מע</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="341"/>
-        <source>Remote storage and local data diverged. Error: merge failed (%s)</source>
-        <translation>אחסון מרוחק ונתונים מקומיים התפצלו. שגיאה: מזוג נכשל (%s)</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="134"/>
-        <source>Local cache directory %s corrupted - can&apos;t sync with Subsurface cloud storage</source>
-        <translation>ספריית מטמון %s מקומית פגומות - לא לסנכרן עם אחסון ענן </translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="157"/>
-        <location filename="../core/git-access.c" line="177"/>
-        <source>Could not update local cache to newer remote data</source>
-        <translation>לא ניתן לעדכן את מטמון מקומי לנתונים מרוחקים חדשים יותר</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="170"/>
-        <source>Subsurface cloud storage corrupted</source>
-        <translation>אחסון בענן של Subsurface פגומה</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="285"/>
-        <source>Could not update Subsurface cloud storage, try again later</source>
-        <translation>לא ניתן לעדכן אחסון ענן של Subsurface, נסה שוב מאוחר יותר</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="371"/>
-        <source>Remote storage and local data diverged. Cannot combine local and remote changes</source>
-        <translation>אחסון מרוחק ונתונים מקומיים התפצלו. לא ניתן לשלב שינויים מקומיים ומרוחקים</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="405"/>
-        <source>Remote storage and local data diverged</source>
-        <translation>נתונים אחסון מקומיים ומרוחק התפצלו</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="408"/>
-        <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source>
-        <translation>אחסון מרוחק ונתונים מקומיים התפצלו. שגיאה: כתיבת נתונים נכשלה (%s)</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="417"/>
-        <source>Problems with local cache of Subsurface cloud data</source>
-        <translation>בעיות עם מטמון מקומי של נתוני ענן Subsurface</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="418"/>
-        <source>Moved cache data to %s. Please try the operation again.</source>
-        <translation>נתונים מטמון מעבר ל-%s. אנא נסה שוב את הפעולה.</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="737"/>
-        <source>Error connecting to Subsurface cloud storage</source>
-        <translation>שגיאה בחיבור לאחסון בענן של Subsurface</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="740"/>
-        <source>git clone of %s failed (%s)</source>
-        <translation>שיבוט git של%s נכשל (%s)</translation>
-    </message>
-    <message>
-        <location filename="../core/load-git.c" line="222"/>
-        <location filename="../core/parse-xml.c" line="1300"/>
-        <source>additional name for site: %s
-</source>
-        <translation>שם נוסף לאתר: %s
-</translation>
-    </message>
-    <message>
-        <location filename="../core/ostctools.c" line="120"/>
-        <location filename="../core/ostctools.c" line="152"/>
-        <source>Unknown DC in dive %d</source>
-        <translation>מחשב צלילה לא מוקר בצלילה %d</translation>
-    </message>
-    <message>
-        <location filename="../core/ostctools.c" line="165"/>
-        <source>Error - %s - parsing dive %d</source>
-        <translation>תקלה - %s - בקריאת צלילה %d</translation>
-    </message>
-    <message>
         <location filename="../smtk-import/smartrak.c" line="247"/>
         <source>Built</source>
-        <translation type="unfinished"/>
+        <translation>בנוי</translation>
     </message>
     <message>
         <location filename="../smtk-import/smartrak.c" line="247"/>
         <source>Sank</source>
-        <translation type="unfinished"/>
+        <translation>שקע</translation>
     </message>
     <message>
         <location filename="../smtk-import/smartrak.c" line="247"/>
         <source>SankTime</source>
-        <translation type="unfinished"/>
+        <translation>זמן של שקיע</translation>
     </message>
     <message>
         <location filename="../smtk-import/smartrak.c" line="248"/>
         <source>Reason</source>
-        <translation type="unfinished"/>
+        <translation>סיבה</translation>
     </message>
     <message>
         <location filename="../smtk-import/smartrak.c" line="248"/>
         <source>Nationality</source>
-        <translation type="unfinished"/>
+        <translation>לאום</translation>
     </message>
     <message>
         <location filename="../smtk-import/smartrak.c" line="248"/>
         <source>Shipyard</source>
-        <translation type="unfinished"/>
+        <translation>מספנה</translation>
     </message>
     <message>
         <location filename="../smtk-import/smartrak.c" line="249"/>
         <source>ShipType</source>
-        <translation type="unfinished"/>
+        <translation>סוג של ספינה</translation>
     </message>
     <message>
         <location filename="../smtk-import/smartrak.c" line="249"/>
         <source>Length</source>
-        <translation type="unfinished"/>
+        <translation>אורך</translation>
     </message>
     <message>
         <location filename="../smtk-import/smartrak.c" line="249"/>
         <source>Beam</source>
-        <translation type="unfinished"/>
+        <translation>רוחב</translation>
     </message>
     <message>
         <location filename="../smtk-import/smartrak.c" line="250"/>
         <source>Draught</source>
-        <translation type="unfinished"/>
+        <translation>ממשך</translation>
     </message>
     <message>
         <location filename="../smtk-import/smartrak.c" line="250"/>
         <source>Displacement</source>
-        <translation type="unfinished"/>
+        <translation>תפוסה</translation>
     </message>
     <message>
         <location filename="../smtk-import/smartrak.c" line="250"/>
         <source>Cargo</source>
-        <translation type="unfinished"/>
+        <translation>מטען</translation>
     </message>
     <message>
         <location filename="../smtk-import/smartrak.c" line="263"/>
         <source>Wreck Data</source>
-        <translation type="unfinished"/>
+        <translation>נתוני ספינה טרופה</translation>
     </message>
     <message>
         <location filename="../smtk-import/smartrak.c" line="320"/>
@@ -10755,157 +10849,122 @@ Is the Uemis Zurich plugged in correctly?</source>
     <message>
         <location filename="../mobile-widgets/qml/main.qml" line="13"/>
         <source>Subsurface-mobile</source>
-        <translation type="unfinished"/>
+        <translation>Subsurface-mobile</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="91"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="103"/>
         <source>Subsurface</source>
         <translation>Subsurface</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="97"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="110"/>
         <source>Dive list</source>
-        <translation type="unfinished"/>
+        <translation>רשימת צלילות</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="112"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="125"/>
         <source>Cloud credentials</source>
-        <translation type="unfinished"/>
+        <translation>זיהוי לענן</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="126"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="139"/>
         <source>Manage dives</source>
-        <translation type="unfinished"/>
+        <translation>ניהול צלילות</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="138"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="141"/>
         <source>Add dive manually</source>
-        <translation type="unfinished"/>
+        <translation>הוסף צלילה ידני</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="146"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="149"/>
         <source>Manual sync with cloud</source>
-        <translation type="unfinished"/>
+        <translation>לסנכרן באופן ידני עם הענן</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="164"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="167"/>
         <source>Offline mode</source>
-        <translation type="unfinished"/>
+        <translation>מוד ללא חיבור לענן</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="164"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="167"/>
         <source>Enable auto cloud sync</source>
-        <translation type="unfinished"/>
+        <translation>אפשר סנכרון ענן אוטומטי</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="182"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="187"/>
         <source>GPS</source>
         <translation>GPS</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="185"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="190"/>
         <source>GPS-tag dives</source>
-        <translation type="unfinished"/>
+        <translation>הוסיף נ&quot;צ לצלילה</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="192"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="197"/>
         <source>Upload GPS data</source>
-        <translation type="unfinished"/>
+        <translation>העלאה נתוני GPS</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="199"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="204"/>
         <source>Download GPS data</source>
-        <translation type="unfinished"/>
+        <translation>הוריד נתוני GPS </translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="206"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="211"/>
         <source>Show GPS fixes</source>
-        <translation type="unfinished"/>
+        <translation>הצג נ&quot;צים שמורים</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="215"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="220"/>
         <source>Clear GPS cache</source>
-        <translation type="unfinished"/>
+        <translation>מחק מסתור נתוני GPS</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="221"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="226"/>
         <source>Preferences</source>
         <translation>העדפות</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="230"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="237"/>
         <source>Developer</source>
-        <translation type="unfinished"/>
+        <translation>מפתיח</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="232"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="239"/>
         <source>App log</source>
-        <translation type="unfinished"/>
+        <translation>אירועי תוכנה</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="239"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="246"/>
         <source>Theme information</source>
-        <translation type="unfinished"/>
+        <translation>פרטי אפיון</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="246"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="253"/>
         <source>User manual</source>
         <translation>מדריך משתמש</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="252"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="259"/>
         <source>About</source>
-        <translation type="unfinished"/>
+        <translation>אודות</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="283"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="304"/>
         <source>Run location service</source>
-        <translation type="unfinished"/>
+        <translation>הפעיל שירות מיקום</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="283"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="304"/>
         <source>No GPS source available</source>
-        <translation type="unfinished"/>
+        <translation>אין מקור נתוני GPS</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="295"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="316"/>
         <source>Actions</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="9"/>
-        <source>Hello World</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="13"/>
-        <source>File</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="15"/>
-        <source>&amp;Open</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="19"/>
-        <source>Exit</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="27"/>
-        <source>Button 1 pressed</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="28"/>
-        <source>Button 2 pressed</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="33"/>
-        <source>May I have your attention, please?</source>
-        <translation type="unfinished"/>
+        <translation>פעולות</translation>
     </message>
 </context>
 <context>
@@ -10984,6 +11043,24 @@ p, li { white-space: pre-wrap; }
         <translation>מטרים לדקה</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="121"/>
+        <location filename="../build/ui_plannerSettings.h" line="425"/>
+        <source>75% to 50% avg. depth</source>
+        <translation>בין 75% ל-50% עומק ממוצע</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="138"/>
+        <location filename="../build/ui_plannerSettings.h" line="427"/>
+        <source>50% avg. depth to 6m</source>
+        <translation>50% עומק ממוצע ל-6 מטר</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="155"/>
+        <location filename="../build/ui_plannerSettings.h" line="429"/>
+        <source>6m to surface</source>
+        <translation>6 מטר לפני המים</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="175"/>
         <location filename="../build/ui_plannerSettings.h" line="431"/>
         <source>Descent</source>
@@ -11007,12 +11084,35 @@ p, li { white-space: pre-wrap; }
         <translation>דקו VPM-B</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="268"/>
+        <source>Bühlmann deco</source>
+        <translation>דקו ע&quot;י אלגוריטם של Bühlmann</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="278"/>
         <location filename="../build/ui_plannerSettings.h" line="445"/>
         <source>Reserve gas</source>
         <translation>גז רזרבי</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="288"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="549"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="578"/>
+        <location filename="../build/ui_plannerSettings.h" line="446"/>
+        <location filename="../build/ui_plannerSettings.h" line="459"/>
+        <location filename="../build/ui_plannerSettings.h" line="461"/>
+        <source>bar</source>
+        <translation>bar</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="307"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="416"/>
+        <location filename="../build/ui_plannerSettings.h" line="437"/>
+        <location filename="../build/ui_plannerSettings.h" line="440"/>
+        <source>%</source>
+        <translation>%</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="320"/>
         <location filename="../build/ui_plannerSettings.h" line="449"/>
         <source>Postpone gas change if a stop is not required</source>
@@ -11031,12 +11131,10 @@ p, li { white-space: pre-wrap; }
         <translation>גרדיאנט תחתון</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="307"/>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="416"/>
-        <location filename="../build/ui_plannerSettings.h" line="437"/>
-        <location filename="../build/ui_plannerSettings.h" line="440"/>
-        <source>%</source>
-        <translation>%</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="353"/>
+        <location filename="../build/ui_plannerSettings.h" line="436"/>
+        <source>Plan backgas breaks</source>
+        <translation>תכנן הפסקות גזים</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="360"/>
@@ -11045,10 +11143,10 @@ p, li { white-space: pre-wrap; }
         <translation>גרדיאנט עליון</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="429"/>
-        <location filename="../build/ui_plannerSettings.h" line="441"/>
-        <source>Drop to first depth</source>
-        <translation>ירידה מהירה לעומק התחלתי</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="370"/>
+        <location filename="../build/ui_plannerSettings.h" line="453"/>
+        <source>min</source>
+        <translation>דקה</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="389"/>
@@ -11057,163 +11155,139 @@ p, li { white-space: pre-wrap; }
         <translation>עצירה אחרונה ב6 מ&apos;</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="353"/>
-        <location filename="../build/ui_plannerSettings.h" line="436"/>
-        <source>Plan backgas breaks</source>
-        <translation>תכנן הפסקות גזים</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="396"/>
+        <source>Maximize bottom time allowed by gas and no decompression limits</source>
+        <translation>למקסם את הזמן תחתי מותר על ידי גז וללא מגבלות דקו</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="515"/>
-        <location filename="../build/ui_plannerSettings.h" line="455"/>
-        <source>Gas options</source>
-        <translation>הגדרות גזים</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="399"/>
+        <location filename="../build/ui_plannerSettings.h" line="443"/>
+        <source>Recreational mode</source>
+        <translation>מוד ספורטיבי</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="594"/>
-        <location filename="../build/ui_plannerSettings.h" line="456"/>
-        <source>Bottom SAC</source>
-        <translation>צריכת גז בעומק מירבי</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="429"/>
+        <location filename="../build/ui_plannerSettings.h" line="441"/>
+        <source>Drop to first depth</source>
+        <translation>ירידה מהירה לעומק התחלתי</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="692"/>
-        <location filename="../build/ui_plannerSettings.h" line="457"/>
-        <source>Deco SAC</source>
-        <translation>צריכת גז בדקו</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="436"/>
+        <location filename="../build/ui_plannerSettings.h" line="452"/>
+        <source>Min. switch duration</source>
+        <translation>משך מעבר גז מינימאלי</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="601"/>
-        <location filename="../build/ui_plannerSettings.h" line="458"/>
-        <source>Bottom pO₂</source>
-        <translation>pO₂ה תחתית</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="459"/>
+        <location filename="../build/ui_plannerSettings.h" line="444"/>
+        <source>Safety stop</source>
+        <translation>עצירת בטיחות</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="685"/>
-        <location filename="../build/ui_plannerSettings.h" line="460"/>
-        <source>Deco pO₂</source>
-        <translation>pO₂ בדקו</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="495"/>
+        <source>Conservatism level</source>
+        <translation>רמת שומרנות</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="515"/>
+        <location filename="../build/ui_plannerSettings.h" line="455"/>
+        <source>Gas options</source>
+        <translation>הגדרות גזים</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="565"/>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="672"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="698"/>
         <location filename="../build/ui_plannerSettings.h" line="462"/>
         <location filename="../build/ui_plannerSettings.h" line="463"/>
         <source>ℓ/min</source>
         <translation>ליטר לדקה</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="632"/>
-        <location filename="../build/ui_plannerSettings.h" line="468"/>
-        <source>Display runtime</source>
-        <translation>הצג זמן צלילה</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="645"/>
-        <location filename="../build/ui_plannerSettings.h" line="472"/>
-        <source>Display segment duration</source>
-        <translation>הצג משך הקטע</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="655"/>
-        <location filename="../build/ui_plannerSettings.h" line="476"/>
-        <source>Display transitions in deco</source>
-        <translation>הצג מעברים בדקו</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="662"/>
-        <location filename="../build/ui_plannerSettings.h" line="477"/>
-        <source>Verbatim dive plan</source>
-        <translation>תכנון צלילה מפורתת</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="288"/>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="549"/>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="578"/>
-        <location filename="../build/ui_plannerSettings.h" line="446"/>
-        <location filename="../build/ui_plannerSettings.h" line="459"/>
-        <location filename="../build/ui_plannerSettings.h" line="461"/>
-        <source>bar</source>
-        <translation>bar</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="121"/>
-        <location filename="../build/ui_plannerSettings.h" line="425"/>
-        <source>75% to 50% avg. depth</source>
-        <translation>בין 75% ל-50% עומק ממוצע</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="138"/>
-        <location filename="../build/ui_plannerSettings.h" line="427"/>
-        <source>50% avg. depth to 6m</source>
-        <translation>50% עומק ממוצע ל-6 מטר</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="155"/>
-        <location filename="../build/ui_plannerSettings.h" line="429"/>
-        <source>6m to surface</source>
-        <translation>6 מטר לפני המים</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="268"/>
-        <source>Bühlmann deco</source>
-        <translation>דקו ע&quot;י אלגוריטם של Bühlmann</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="370"/>
-        <location filename="../build/ui_plannerSettings.h" line="453"/>
-        <source>min</source>
-        <translation>דקה</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="396"/>
-        <source>Maximize bottom time allowed by gas and no decompression limits</source>
-        <translation>למקסם את הזמן תחתי מותר על ידי גז וללא מגבלות דקו</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="594"/>
+        <source>m</source>
+        <translation>מטר</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="399"/>
-        <location filename="../build/ui_plannerSettings.h" line="443"/>
-        <source>Recreational mode</source>
-        <translation>מוד ספורטיבי</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="606"/>
+        <source>Used to calculate best mix. Select best mix depth in &apos;Available gases&apos; table by entering gas depth, followed by &quot;B&quot; (best trimix mix) or &quot;BN&quot; (best nitrox mix)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="436"/>
-        <location filename="../build/ui_plannerSettings.h" line="452"/>
-        <source>Min. switch duration</source>
-        <translation>משך מעבר גז מינימאלי</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="613"/>
+        <location filename="../build/ui_plannerSettings.h" line="456"/>
+        <source>Bottom SAC</source>
+        <translation>צריכת גז בעומק מירבי</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="459"/>
-        <location filename="../build/ui_plannerSettings.h" line="444"/>
-        <source>Safety stop</source>
-        <translation>עצירת בטיחות</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="620"/>
+        <location filename="../build/ui_plannerSettings.h" line="458"/>
+        <source>Bottom pO₂</source>
+        <translation>pO₂ה תחתית</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="495"/>
-        <source>Conservatism level</source>
-        <translation>רמת שומרנות</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="627"/>
+        <source>Best mix END</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="608"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="634"/>
         <location filename="../build/ui_plannerSettings.h" line="464"/>
         <source>Notes</source>
         <translation>הערות</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="629"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="655"/>
         <location filename="../build/ui_plannerSettings.h" line="466"/>
         <source>In dive plan, show runtime (absolute time) of stops</source>
         <translation>בתכנית צלילה, ריצת תכנית (זמן מוחלט) של תחנות</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="642"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="658"/>
+        <location filename="../build/ui_plannerSettings.h" line="468"/>
+        <source>Display runtime</source>
+        <translation>הצג זמן צלילה</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="668"/>
         <location filename="../build/ui_plannerSettings.h" line="470"/>
         <source>In dive plan, show duration (relative time) of stops</source>
         <translation>בתכנית צלילה, להראות משך (זמן יחסי) של תחנות</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="652"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="671"/>
+        <location filename="../build/ui_plannerSettings.h" line="472"/>
+        <source>Display segment duration</source>
+        <translation>הצג משך הקטע</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="678"/>
         <location filename="../build/ui_plannerSettings.h" line="474"/>
         <source>In diveplan, list transitions or treat them as implicit</source>
         <translation>בתכנית צלילה, לרשום מעברים או להתייחס אליהם כמובלעת</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="681"/>
+        <location filename="../build/ui_plannerSettings.h" line="476"/>
+        <source>Display transitions in deco</source>
+        <translation>הצג מעברים בדקו</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="688"/>
+        <location filename="../build/ui_plannerSettings.h" line="477"/>
+        <source>Verbatim dive plan</source>
+        <translation>תכנון צלילה מפורתת</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="711"/>
+        <location filename="../build/ui_plannerSettings.h" line="460"/>
+        <source>Deco pO₂</source>
+        <translation>pO₂ בדקו</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="718"/>
+        <location filename="../build/ui_plannerSettings.h" line="457"/>
+        <source>Deco SAC</source>
+        <translation>צריכת גז בדקו</translation>
+    </message>
 </context>
 </TS>
\ No newline at end of file
diff --git a/translations/subsurface_hr_HR.ts b/translations/subsurface_hr_HR.ts
index ad60711c6..5305b88b9 100644
--- a/translations/subsurface_hr_HR.ts
+++ b/translations/subsurface_hr_HR.ts
@@ -105,6 +105,11 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="56"/>
+        <source>Could not initialize Winsock version 2.2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="134"/>
         <source>Trying to turn on the local Bluetooth device...</source>
         <translation type="unfinished"/>
@@ -115,6 +120,11 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="167"/>
+        <source>Remote devices list was cleared.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="183"/>
         <source>Scanning for remote devices...</source>
         <translation type="unfinished"/>
@@ -125,6 +135,22 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="208"/>
+        <source>The local Bluetooth device was %1.</source>
+        <extracomment>%1 will be replaced with &quot;turned on&quot; or &quot;turned off&quot;</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
+        <source>turned on</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
+        <source>turned off</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="225"/>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="339"/>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="359"/>
@@ -172,37 +198,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="352"/>
-        <source>Device %1 was paired and is authorized.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="56"/>
-        <source>Could not initialize Winsock version 2.2</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="167"/>
-        <source>Remote devices list was cleared.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="208"/>
-        <source>The local Bluetooth device was %1.</source>
-        <extracomment>%1 will be replaced with &quot;turned on&quot; or &quot;turned off&quot;</extracomment>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
-        <source>turned on</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
-        <source>turned off</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="307"/>
         <source>Remove pairing</source>
         <translation type="unfinished"/>
@@ -228,6 +223,11 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="352"/>
+        <source>Device %1 was paired and is authorized.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="378"/>
         <source>The device %1 can now be used for connection. You can press the Save button.</source>
         <translation type="unfinished"/>
@@ -286,12 +286,12 @@
 <context>
     <name>BuddyFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="621"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="619"/>
         <source>Person: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="622"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="620"/>
         <source>Searches for buddies and divemasters</source>
         <translation type="unfinished"/>
     </message>
@@ -299,7 +299,7 @@
 <context>
     <name>BuddyFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="243"/>
+        <location filename="../qt-models/filtermodels.cpp" line="248"/>
         <source>No buddies</source>
         <translation type="unfinished"/>
     </message>
@@ -307,25 +307,30 @@
 <context>
     <name>CloudCredentials</name>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="49"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="50"/>
         <source>Cloud credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="55"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="56"/>
         <source>Email</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="67"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="68"/>
         <source>Password</source>
         <translation>Lozinka</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="90"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="92"/>
         <source>Show password</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="97"/>
+        <source>PIN</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>ColumnNameProvider</name>
@@ -381,6 +386,16 @@
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
+        <source>Max. depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
+        <source>Avg. depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
         <source>Divemaster</source>
         <translation>Voditelj</translation>
     </message>
@@ -391,6 +406,11 @@
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
+        <source>Suit</source>
+        <translation>Odijelo</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
         <source>Notes</source>
         <translation>Bilješke</translation>
     </message>
@@ -410,21 +430,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
-        <source>Max. depth</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
-        <source>Avg. depth</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
-        <source>Suit</source>
-        <translation>Odijelo</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="44"/>
         <source>O₂</source>
         <translation type="unfinished"/>
@@ -538,7 +543,7 @@
         <translation>Ne mogu kreirati libdivecomputer kontekst</translation>
     </message>
     <message>
-        <location filename="../core/configuredivecomputer.cpp" line="660"/>
+        <location filename="../core/configuredivecomputer.cpp" line="656"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation type="unfinished"/>
     </message>
@@ -558,10 +563,18 @@
         <translation>Uređaj ili mount lokacija</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="170"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1520"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1533"/>
-        <source>...</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="47"/>
+        <source>Connect via Bluetooth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="54"/>
+        <source>Connect</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="64"/>
+        <source>Disconnect</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -571,12 +584,24 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="90"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1523"/>
+        <source>Read settings from backup file or from device before writing to the device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="93"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1525"/>
         <source>Save changes to device</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="116"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1527"/>
+        <source>Read settings from backup file or from device before writing to a backup file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="119"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1529"/>
         <source>Backup</source>
@@ -595,14 +620,39 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="163"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1532"/>
+        <source>Save libdivecomputer logfile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="170"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1520"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1533"/>
+        <source>...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="177"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1534"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1539"/>
-        <source>OSTC 3</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="214"/>
+        <source>OSTC 3,Sport,Cr,2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="223"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1541"/>
+        <source>Suunto Vyper family</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="232"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1543"/>
+        <source>OSTC, Mk.2/2N/2C</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -616,39 +666,55 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="326"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1656"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1943"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1546"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1726"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1766"/>
-        <source>Serial No.</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="260"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1575"/>
+        <source>Eco</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="349"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1679"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1980"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1547"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1727"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1767"/>
-        <source>Firmware version</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="265"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1576"/>
+        <source>Medium</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="538"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1713"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1990"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1548"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1729"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1768"/>
-        <source>Custom text</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="270"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1577"/>
+        <source>High</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="385"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1549"/>
-        <source>Language</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="278"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="826"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="849"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="875"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="927"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="993"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1019"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1101"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1117"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1450"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2278"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2382"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2408"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2434"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2474"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2497"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1586"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1621"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1623"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1625"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1628"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1637"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1638"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1710"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1785"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1789"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1801"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1803"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1806"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1807"/>
+        <source>%</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -676,35 +742,59 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="579"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1557"/>
-        <source>Dive mode</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="313"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1582"/>
+        <source>m/°C</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="556"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1560"/>
-        <source>OC</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="318"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1583"/>
+        <source>ft/°F</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="561"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1561"/>
-        <source>CC</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="326"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1656"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1943"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1546"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1726"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1766"/>
+        <source>Serial No.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="566"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2336"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1562"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1793"/>
-        <source>Gauge</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="349"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1679"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1980"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1547"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1727"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1767"/>
+        <source>Firmware version</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="571"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1563"/>
-        <source>Apnea</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="360"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1568"/>
+        <source>MMDDYY</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="365"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1569"/>
+        <source>DDMMYY</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="370"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1570"/>
+        <source>YYMMDD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="385"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1549"/>
+        <source>Language</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -716,165 +806,154 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="360"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1568"/>
-        <source>MMDDYY</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="405"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1572"/>
+        <source>Brightness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="365"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1569"/>
-        <source>DDMMYY</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="415"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1850"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1579"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1753"/>
+        <source>Units</source>
+        <translation>Jedinice</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="425"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1585"/>
+        <source>Salinity (0-5%)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="370"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1570"/>
-        <source>YYMMDD</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="438"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1615"/>
+        <source>Reset device to default settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1042"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2457"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1639"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1805"/>
-        <source>Saturation</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="452"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1590"/>
+        <source>230LSB/Gauss</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="278"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="826"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="849"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="875"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="927"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="993"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1019"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1101"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1117"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1450"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2278"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2382"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2408"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2434"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2474"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2497"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1586"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1621"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1623"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1625"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1628"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1637"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1638"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1710"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1785"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1789"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1801"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1803"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1806"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1807"/>
-        <source>%</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="457"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1591"/>
+        <source>330LSB/Gauss</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="865"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2261"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1624"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1784"/>
-        <source>Desaturation</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="462"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1592"/>
+        <source>390LSB/Gauss</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="983"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2398"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1636"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1800"/>
-        <source>Last deco</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="467"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1593"/>
+        <source>440LSB/Gauss</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="711"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="736"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="758"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="904"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2181"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2206"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2228"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2307"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1626"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1786"/>
-        <source> m</source>
-        <translation>m</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="472"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1594"/>
+        <source>660LSB/Gauss</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="405"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1572"/>
-        <source>Brightness</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="477"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1595"/>
+        <source>820LSB/Gauss</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="260"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1575"/>
-        <source>Eco</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="482"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1596"/>
+        <source>1090LSB/Gauss</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="265"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1576"/>
-        <source>Medium</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="487"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1597"/>
+        <source>1370LSB/Gauss</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="270"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1577"/>
-        <source>High</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="521"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1587"/>
+        <source>Compass gain</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="603"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2034"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1599"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1779"/>
-        <source>Sampling rate</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="531"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1799"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1745"/>
+        <source>Computer model</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="590"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1602"/>
-        <source>2s</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="538"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1713"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1990"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1548"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1729"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1768"/>
+        <source>Custom text</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="595"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1769"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1603"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1739"/>
-        <source>10s</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="556"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1560"/>
+        <source>OC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="415"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1850"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1579"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1753"/>
-        <source>Units</source>
-        <translation>Jedinice</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="561"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1561"/>
+        <source>CC</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="313"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1582"/>
-        <source>m/°C</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="566"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2336"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1562"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1793"/>
+        <source>Gauge</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="318"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1583"/>
-        <source>ft/°F</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="571"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1563"/>
+        <source>Apnea</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="644"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1605"/>
-        <source>Dive mode color</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="579"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1557"/>
+        <source>Dive mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="590"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1602"/>
+        <source>2s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="595"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1769"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1603"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1739"/>
+        <source>10s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="603"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2034"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1599"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1779"/>
+        <source>Sampling rate</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -902,12 +981,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="425"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1585"/>
-        <source>Salinity (0-5%)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="637"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2092"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1613"/>
@@ -916,89 +989,79 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="521"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1587"/>
-        <source>Compass gain</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="90"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1523"/>
-        <source>Read settings from backup file or from device before writing to the device</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="116"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1527"/>
-        <source>Read settings from backup file or from device before writing to a backup file</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="232"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1543"/>
-        <source>OSTC, Mk.2/2N/2C</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="644"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1605"/>
+        <source>Dive mode color</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="452"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1590"/>
-        <source>230LSB/Gauss</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="654"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2020"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1614"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1771"/>
+        <source>Show safety stop</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="457"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1591"/>
-        <source>330LSB/Gauss</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="661"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2145"/>
+        <source>End Depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="462"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1592"/>
-        <source>390LSB/Gauss</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="671"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2162"/>
+        <source> s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="467"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1593"/>
-        <source>440LSB/Gauss</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="687"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1953"/>
+        <source>Length</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="472"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1594"/>
-        <source>660LSB/Gauss</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="694"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2138"/>
+        <source>Start Depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="477"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1595"/>
-        <source>820LSB/Gauss</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="701"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2152"/>
+        <source>Reset Depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="482"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1596"/>
-        <source>1090LSB/Gauss</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="711"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="736"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="758"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="904"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2181"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2206"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2228"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2307"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1626"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1786"/>
+        <source> m</source>
+        <translation>m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="487"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1597"/>
-        <source>1370LSB/Gauss</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="778"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2248"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1643"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1810"/>
+        <source>Advanced settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="654"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2020"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1614"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1771"/>
-        <source>Show safety stop</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="784"/>
+        <source>Left button sensitivity</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="438"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1615"/>
-        <source>Reset device to default settings</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="791"/>
+        <source>Always show ppO2</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1010,20 +1073,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="223"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1541"/>
-        <source>Suunto Vyper family</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="778"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2248"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1643"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1810"/>
-        <source>Advanced settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="805"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2271"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1618"/>
@@ -1054,6 +1103,14 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="865"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2261"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1624"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1784"/>
+        <source>Desaturation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="917"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2320"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1627"/>
@@ -1068,14 +1125,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="973"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2369"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1630"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1788"/>
-        <source> min</source>
-        <translation>min</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="960"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2331"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1633"/>
@@ -1084,60 +1133,25 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="47"/>
-        <source>Connect via Bluetooth</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="163"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1532"/>
-        <source>Save libdivecomputer logfile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="661"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2145"/>
-        <source>End Depth</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="671"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2162"/>
-        <source> s</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="687"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1953"/>
-        <source>Length</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="694"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2138"/>
-        <source>Start Depth</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="701"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2152"/>
-        <source>Reset Depth</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="784"/>
-        <source>Left button sensitivity</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="965"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1634"/>
+        <source>ZH-L16+GF</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="791"/>
-        <source>Always show ppO2</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="973"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2369"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1630"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1788"/>
+        <source> min</source>
+        <translation>min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="965"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1634"/>
-        <source>ZH-L16+GF</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="983"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2398"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1636"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1800"/>
+        <source>Last deco</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1157,6 +1171,14 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1042"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2457"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1639"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1805"/>
+        <source>Saturation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1052"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1642"/>
         <source>Flip screen</source>
@@ -1168,12 +1190,22 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1066"/>
+        <source>MOD warning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1073"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2513"/>
         <source>Graphical speed indicator</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1080"/>
+        <source>Dynamic ascent rate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1087"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2552"/>
         <source>Bottom gas consumption</source>
@@ -1186,6 +1218,14 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1133"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1149"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2520"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2536"/>
+        <source> ℓ/min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1165"/>
         <source>Temperature sensor offset</source>
         <translation type="unfinished"/>
@@ -1204,6 +1244,18 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1235"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1320"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2610"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2695"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1645"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1668"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1812"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1835"/>
+        <source>%O₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1240"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1325"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2615"/>
@@ -1322,15 +1374,9 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1691"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1858"/>
-        <source>Set point [cbar]</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1693"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1860"/>
-        <source>Change depth [m]</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1405"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2770"/>
+        <source>Setpoint</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1370,6 +1416,12 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1443"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1709"/>
+        <source>O₂ in calibration gas</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1467"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1713"/>
         <source>Fixed setpoint</source>
@@ -1400,101 +1452,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1748"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1733"/>
-        <source>P1 (medium)</source>
-        <extracomment>Suunto safety level</extracomment>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1753"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1734"/>
-        <source>P2 (high)</source>
-        <extracomment>Suunto safety level</extracomment>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1792"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1744"/>
-        <source>Total dive time</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2109"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1769"/>
-        <source>kg/ℓ</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2346"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1795"/>
-        <source>Apnoea</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1583"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1722"/>
-        <source>Safety level</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="54"/>
-        <source>Connect</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="64"/>
-        <source>Disconnect</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="214"/>
-        <source>OSTC 3,Sport,Cr,2</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1066"/>
-        <source>MOD warning</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1080"/>
-        <source>Dynamic ascent rate</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1133"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1149"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2520"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2536"/>
-        <source> ℓ/min</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1235"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1320"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2610"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2695"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1645"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1668"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1812"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1835"/>
-        <source>%O₂</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1405"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2770"/>
-        <source>Setpoint</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1443"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1709"/>
-        <source>O₂ in calibration gas</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1535"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2843"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1719"/>
@@ -1511,6 +1468,12 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1583"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1722"/>
+        <source>Safety level</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1609"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1723"/>
         <source>Altitude range</source>
@@ -1544,6 +1507,20 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1748"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1733"/>
+        <source>P1 (medium)</source>
+        <extracomment>Suunto safety level</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1753"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1734"/>
+        <source>P2 (high)</source>
+        <extracomment>Suunto safety level</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1761"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1736"/>
         <source>Sample rate</source>
@@ -1568,10 +1545,9 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="531"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1799"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1745"/>
-        <source>Computer model</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1792"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1744"/>
+        <source>Total dive time</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1637,12 +1613,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2099"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1765"/>
-        <source>Salinity</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2074"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1774"/>
         <source>MM/DD/YY</source>
@@ -1661,12 +1631,30 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2099"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1765"/>
+        <source>Salinity</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2109"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1769"/>
+        <source>kg/ℓ</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2341"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1794"/>
         <source>ZH-L16 CC</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2346"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1795"/>
+        <source>Apnoea</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2351"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1796"/>
         <source>L16-GF OC</source>
@@ -1685,85 +1673,110 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1108"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1129"/>
-        <source>Backup files (*.xml)</source>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1539"/>
+        <source>OSTC 3</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1113"/>
-        <source>An error occurred while saving the backup file.
-%1</source>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1691"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1858"/>
+        <source>Set point [cbar]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1116"/>
-        <source>Backup succeeded</source>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1693"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1860"/>
+        <source>Change depth [m]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1117"/>
-        <source>Your settings have been saved to: %1</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1110"/>
+        <source>Backup dive computer settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1107"/>
-        <source>Backup dive computer settings</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1111"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1132"/>
+        <source>Backup files (*.xml)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1112"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1115"/>
         <source>XML backup error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1128"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1116"/>
+        <source>An error occurred while saving the backup file.
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1119"/>
+        <source>Backup succeeded</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1120"/>
+        <source>Your settings have been saved to: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1131"/>
         <source>Restore dive computer settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1134"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1137"/>
         <source>XML restore error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1135"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1138"/>
         <source>An error occurred while restoring the backup file.
 %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1139"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1142"/>
         <source>Restore succeeded</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1140"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1143"/>
         <source>Your settings have been restored successfully.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1150"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1153"/>
         <source>Select firmware file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1151"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1154"/>
         <source>All files (*.*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1207"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1210"/>
         <source>Choose file for divecomputer download logfile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1208"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1211"/>
         <source>Log files (*.log)</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
+    <name>ContextDrawer</name>
+    <message>
+        <location filename="../mobile-widgets/qml/kirigami/src/controls/ContextDrawer.qml" line="76"/>
+        <source>Actions</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>CylindersModel</name>
     <message>
         <location filename="../qt-models/cylindermodel.cpp" line="16"/>
@@ -1777,11 +1790,6 @@
     </message>
     <message>
         <location filename="../qt-models/cylindermodel.cpp" line="16"/>
-        <source>He%</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="16"/>
         <source>Work press.</source>
         <translation type="unfinished"/>
     </message>
@@ -1801,8 +1809,23 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="16"/>
+        <source>He%</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
+        <source>Deco switch at</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../qt-models/cylindermodel.cpp" line="17"/>
-        <source>Switch at</source>
+        <source>Bot. MOD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
+        <source>MND</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1821,17 +1844,32 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="161"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="177"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="383"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="180"/>
+        <source>Switch depth for deco gas. Calculated using Deco pO₂ preference, unless set manually.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="183"/>
+        <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to &apos;*&apos; for best O₂% for max depth.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="186"/>
+        <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to &apos;*&apos; for best He% for max depth.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="444"/>
         <source>Cylinder cannot be removed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="384"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="445"/>
         <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source>
         <translation type="unfinished"/>
     </message>
@@ -1851,42 +1889,24 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="73"/>
+        <location filename="../build/ui_divecomponentselection.h" line="141"/>
+        <source>Dive site</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="80"/>
         <location filename="../build/ui_divecomponentselection.h" line="142"/>
         <source>Suit</source>
         <translation>Odijelo</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="122"/>
-        <location filename="../build/ui_divecomponentselection.h" line="148"/>
-        <source>Divemaster</source>
-        <translation>Voditelj</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="129"/>
-        <location filename="../build/ui_divecomponentselection.h" line="149"/>
-        <source>Buddy</source>
-        <translation>Buddy</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="136"/>
-        <location filename="../build/ui_divecomponentselection.h" line="150"/>
-        <source>Rating</source>
-        <translation>Ocjena</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="87"/>
         <location filename="../build/ui_divecomponentselection.h" line="143"/>
         <source>Visibility</source>
         <translation>Vidljivost</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="73"/>
-        <location filename="../build/ui_divecomponentselection.h" line="141"/>
-        <source>Dive site</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="94"/>
         <location filename="../build/ui_divecomponentselection.h" line="144"/>
         <source>Notes</source>
@@ -1910,10 +1930,34 @@
         <source>Cylinders</source>
         <translation>Boce</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="122"/>
+        <location filename="../build/ui_divecomponentselection.h" line="148"/>
+        <source>Divemaster</source>
+        <translation>Voditelj</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="129"/>
+        <location filename="../build/ui_divecomponentselection.h" line="149"/>
+        <source>Buddy</source>
+        <translation>Buddy</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="136"/>
+        <location filename="../build/ui_divecomponentselection.h" line="150"/>
+        <source>Rating</source>
+        <translation>Ocjena</translation>
+    </message>
 </context>
 <context>
     <name>DiveComputerManagementDialog</name>
     <message>
+        <location filename="../desktop-widgets/divecomputermanagementdialog.ui" line="17"/>
+        <location filename="../build/ui_divecomputermanagementdialog.h" line="65"/>
+        <source>Edit dive computer nicknames</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divecomputermanagementdialog.cpp" line="49"/>
         <source>Remove the selected dive computer?</source>
         <translation type="unfinished"/>
@@ -1924,12 +1968,6 @@
  remove the selected dive computer?</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../desktop-widgets/divecomputermanagementdialog.ui" line="17"/>
-        <location filename="../build/ui_divecomputermanagementdialog.h" line="65"/>
-        <source>Edit dive computer nicknames</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>DiveComputerModel</name>
@@ -1957,17 +1995,17 @@
 <context>
     <name>DiveDetails</name>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="33"/>
+        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="38"/>
         <source>Dive details</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="67"/>
+        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="72"/>
         <source>Delete dive</source>
         <translation>Obriši uron</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="84"/>
+        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="89"/>
         <source>Show on map</source>
         <translation type="unfinished"/>
     </message>
@@ -1975,88 +2013,93 @@
 <context>
     <name>DiveDetailsEdit</name>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="74"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="80"/>
         <source>Dive %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="78"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="84"/>
         <source>Date:</source>
         <translation>Datum:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="86"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="92"/>
         <source>Location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="95"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="101"/>
         <source>Coordinates:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="104"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="110"/>
         <source>Use current
 GPS location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="118"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="124"/>
         <source>Depth:</source>
         <translation>Dubina:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="127"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="133"/>
         <source>Duration:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="137"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="143"/>
         <source>Air Temp:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="146"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="152"/>
         <source>Water Temp:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="155"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="161"/>
         <source>Suit:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="164"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="176"/>
         <source>Buddy:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="173"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="191"/>
         <source>Dive Master:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="182"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="206"/>
         <source>Weight:</source>
         <translation>Težina:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="192"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="216"/>
+        <source>Cylinder:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="231"/>
         <source>Gas mix:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="203"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="241"/>
         <source>Start Pressure:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="213"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="250"/>
         <source>End Pressure:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="224"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="260"/>
         <source>Notes:</source>
         <translation type="unfinished"/>
     </message>
@@ -2094,42 +2137,42 @@ GPS location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="159"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="158"/>
         <source>Air Temp:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="175"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="172"/>
         <source>Cylinder:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="189"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="185"/>
         <source>Water Temp:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="205"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="198"/>
         <source>Dive Master:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="220"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="211"/>
         <source>Weight:</source>
         <translation>Težina:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="249"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="224"/>
         <source>Buddy:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="263"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="237"/>
         <source>SAC:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="280"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="252"/>
         <source>Notes</source>
         <translation>Bilješke</translation>
     </message>
@@ -2137,18 +2180,18 @@ GPS location:</source>
 <context>
     <name>DiveEventItem</name>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="134"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="165"/>
         <source>Manual switch to OC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="136"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="167"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation> započni</translation>
     </message>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="137"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="168"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation> završi</translation>
@@ -2157,27 +2200,27 @@ GPS location:</source>
 <context>
     <name>DiveImportedModel</name>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="646"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="656"/>
         <source>Date/time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="648"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="658"/>
         <source>Duration</source>
         <translation>Trajanje</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="650"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="660"/>
         <source>Depth</source>
         <translation>Dubina</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="672"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="682"/>
         <source>h:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="672"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="682"/>
         <source>min</source>
         <translation>min</translation>
     </message>
@@ -2186,8 +2229,8 @@ GPS location:</source>
     <name>DiveList</name>
     <message>
         <location filename="../mobile-widgets/qml/DiveList.qml" line="12"/>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="226"/>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="232"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="227"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="233"/>
         <source>Dive list</source>
         <translation type="unfinished"/>
     </message>
@@ -2202,110 +2245,115 @@ GPS location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="222"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="223"/>
         <source>Cloud credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="228"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="229"/>
         <source>Please tap the &apos;+&apos; button to add a dive</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="248"/>
+        <source>No dives in dive list</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DiveListView</name>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="846"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="849"/>
         <source>Expand all</source>
         <translation>Otvori sve</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="848"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="851"/>
         <source>Collapse all</source>
         <translation>Zatvori sve grupe</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="852"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="855"/>
         <source>Collapse others</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="856"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="859"/>
         <source>Remove dive(s) from trip</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="857"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="860"/>
         <source>Create new trip above</source>
         <translation>Kreiraj novu grupu iznad</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="871"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="874"/>
         <source>Add dive(s) to trip immediately above</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="873"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="876"/>
         <source>Add dive(s) to trip immediately below</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="877"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="880"/>
         <source>Merge trip with trip above</source>
         <translation>Spoji s grupom iznad</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="878"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="881"/>
         <source>Merge trip with trip below</source>
         <translation>Spoji s grupom ispod</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="882"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="885"/>
         <source>Delete dive(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="884"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="887"/>
         <source>Mark dive(s) invalid</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="888"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="891"/>
         <source>Merge selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="890"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="893"/>
         <source>Renumber dive(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="891"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="894"/>
         <source>Shift dive times</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="892"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="895"/>
         <source>Split selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="893"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="896"/>
         <source>Load image(s) from file(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="894"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="897"/>
         <source>Load image(s) from web</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="917"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="919"/>
         <source>Open image files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="917"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="919"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation type="unfinished"/>
     </message>
@@ -2326,330 +2374,351 @@ GPS location:</source>
 <context>
     <name>DiveLogExportDialog</name>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="103"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="351"/>
-        <source>Export format</source>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="14"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="349"/>
+        <source>Export dive log files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="134"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="353"/>
-        <source>UDDF</source>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="44"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="369"/>
+        <source>General export</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="187"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="358"/>
-        <source>Worldmap</source>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="103"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="351"/>
+        <source>Export format</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="197"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="359"/>
-        <source>I&amp;mage depths</source>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="115"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="352"/>
+        <source>Subsurface &amp;XML</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="243"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="360"/>
-        <source>Selection</source>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="134"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="353"/>
+        <source>UDDF</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="252"/>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="346"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="361"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="372"/>
-        <source>Selected dives</source>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="147"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="354"/>
+        <source>di&amp;velogs.de</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="262"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="362"/>
-        <source>All dives</source>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="157"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="355"/>
+        <source>DiveShare</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="306"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="396"/>
-        <source>HTML</source>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="167"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="356"/>
+        <source>CSV dive profile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="14"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="349"/>
-        <source>Export dive log files</source>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="177"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="357"/>
+        <source>CSV dive details</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="44"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="369"/>
-        <source>General export</source>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="187"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="358"/>
+        <source>Worldmap</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="115"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="352"/>
-        <source>Subsurface &amp;XML</source>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="197"/>
+        <source>TeX</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="147"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="354"/>
-        <source>di&amp;velogs.de</source>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="207"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="359"/>
+        <source>I&amp;mage depths</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="157"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="355"/>
-        <source>DiveShare</source>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="253"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="360"/>
+        <source>Selection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="167"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="356"/>
-        <source>CSV dive profile</source>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="262"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="356"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="361"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="372"/>
+        <source>Selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="177"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="357"/>
-        <source>CSV dive details</source>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="272"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="362"/>
+        <source>All dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="275"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="285"/>
         <location filename="../build/ui_divelogexportdialog.h" line="363"/>
         <source>CSV units</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="288"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="298"/>
         <location filename="../build/ui_divelogexportdialog.h" line="366"/>
         <source>Metric</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="293"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="303"/>
         <location filename="../build/ui_divelogexportdialog.h" line="367"/>
         <source>Imperial</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="324"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="316"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="396"/>
+        <source>HTML</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="334"/>
         <location filename="../build/ui_divelogexportdialog.h" line="370"/>
         <source>General settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="330"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="340"/>
         <location filename="../build/ui_divelogexportdialog.h" line="371"/>
         <source>Subsurface numbers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="359"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="369"/>
         <location filename="../build/ui_divelogexportdialog.h" line="373"/>
         <source>Export yearly statistics</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="375"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="385"/>
         <location filename="../build/ui_divelogexportdialog.h" line="374"/>
         <source>All di&amp;ves</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="385"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="395"/>
         <location filename="../build/ui_divelogexportdialog.h" line="375"/>
         <source>Export list only</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="392"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="402"/>
         <location filename="../build/ui_divelogexportdialog.h" line="376"/>
         <source>Export photos</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="408"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="418"/>
         <location filename="../build/ui_divelogexportdialog.h" line="377"/>
         <source>Style options</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="423"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="433"/>
         <location filename="../build/ui_divelogexportdialog.h" line="378"/>
         <source>Font</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="433"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="443"/>
         <location filename="../build/ui_divelogexportdialog.h" line="379"/>
         <source>Font size</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="444"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="454"/>
         <location filename="../build/ui_divelogexportdialog.h" line="382"/>
         <source>8</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="449"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="459"/>
         <location filename="../build/ui_divelogexportdialog.h" line="383"/>
         <source>10</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="454"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="464"/>
         <location filename="../build/ui_divelogexportdialog.h" line="384"/>
         <source>12</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="459"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="469"/>
         <location filename="../build/ui_divelogexportdialog.h" line="385"/>
         <source>14</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="464"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="474"/>
         <location filename="../build/ui_divelogexportdialog.h" line="386"/>
         <source>16</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="469"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="479"/>
         <location filename="../build/ui_divelogexportdialog.h" line="387"/>
         <source>18</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="474"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="484"/>
         <location filename="../build/ui_divelogexportdialog.h" line="388"/>
         <source>20</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="482"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="492"/>
         <location filename="../build/ui_divelogexportdialog.h" line="390"/>
         <source>Theme</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="493"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="503"/>
         <location filename="../build/ui_divelogexportdialog.h" line="393"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="95"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="99"/>
         <source>Light</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="498"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="508"/>
         <location filename="../build/ui_divelogexportdialog.h" line="394"/>
         <source>Sand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="134"/>
-        <source>UDDF files (*.uddf *.UDDF)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="142"/>
-        <source>CSV files (*.csv *.CSV)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="74"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="76"/>
         <source>Generic format that is used for data exchange between a variety of diving related programs.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="76"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="78"/>
         <source>Comma separated values describing the dive profile.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="78"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="80"/>
         <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="80"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="82"/>
         <source>Send the dive data to divelogs.de website.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="82"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="84"/>
         <source>Send the dive data to dive-share.appspot.com website</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="84"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="86"/>
         <source>HTML export of the dive locations, visualized on a world map.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="86"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="88"/>
         <source>Subsurface native XML format.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="88"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="90"/>
         <source>Write depths of images to file.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="133"/>
-        <source>Export UDDF file as</source>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="92"/>
+        <source>Write dive as TeX macros to file.</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.cpp" line="137"/>
+        <source>Export UDDF file as</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/>
+        <source>UDDF files (*.uddf *.UDDF)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divelogexportdialog.cpp" line="141"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="145"/>
         <source>Export CSV file as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="148"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="142"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="146"/>
+        <source>CSV files (*.csv *.CSV)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="152"/>
         <source>Export world map</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="149"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="169"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="153"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="177"/>
         <source>HTML files (*.html)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="153"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="157"/>
         <source>Export Subsurface XML</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="158"/>
         <source>XML files (*.xml *.ssrf)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="162"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="166"/>
         <source>Save image depths</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="168"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="170"/>
+        <source>Export to TeX file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="170"/>
+        <source>TeX files (*.tex)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="176"/>
         <source>Export HTML files as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="184"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="192"/>
         <source>Please wait, exporting...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="219"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="227"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="311"/>
         <source>Can&apos;t open file %s</source>
         <translation type="unfinished"/>
     </message>
@@ -2663,25 +2732,6 @@ GPS location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="643"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="727"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="856"/>
-        <source>Time</source>
-        <translation>Vrijeme</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.ui" line="127"/>
-        <location filename="../build/ui_divelogimportdialog.h" line="164"/>
-        <source>Metric</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.ui" line="132"/>
-        <location filename="../build/ui_divelogimportdialog.h" line="165"/>
-        <source>Imperial</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divelogimportdialog.ui" line="89"/>
         <location filename="../build/ui_divelogimportdialog.h" line="152"/>
         <source>dd.mm.yyyy</source>
@@ -2700,269 +2750,287 @@ GPS location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.ui" line="155"/>
-        <location filename="../build/ui_divelogimportdialog.h" line="167"/>
-        <source>Drag the tags above to each corresponding column below</source>
+        <location filename="../desktop-widgets/divelogimportdialog.ui" line="108"/>
+        <location filename="../build/ui_divelogimportdialog.h" line="158"/>
+        <source>Seconds</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="641"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="729"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="852"/>
-        <source>Dive #</source>
+        <location filename="../desktop-widgets/divelogimportdialog.ui" line="113"/>
+        <location filename="../build/ui_divelogimportdialog.h" line="159"/>
+        <source>Minutes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="642"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="723"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="854"/>
-        <source>Date</source>
-        <translation>Datum</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.ui" line="118"/>
+        <location filename="../build/ui_divelogimportdialog.h" line="160"/>
+        <source>Minutes:seconds</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="644"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="858"/>
-        <source>Duration</source>
-        <translation>Trajanje</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.ui" line="127"/>
+        <location filename="../build/ui_divelogimportdialog.h" line="164"/>
+        <source>Metric</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="655"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="862"/>
-        <source>GPS</source>
+        <location filename="../desktop-widgets/divelogimportdialog.ui" line="132"/>
+        <location filename="../build/ui_divelogimportdialog.h" line="165"/>
+        <source>Imperial</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="645"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="864"/>
-        <source>Max. depth</source>
+        <location filename="../desktop-widgets/divelogimportdialog.ui" line="155"/>
+        <location filename="../build/ui_divelogimportdialog.h" line="167"/>
+        <source>Drag the tags above to each corresponding column below</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="646"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="866"/>
-        <source>Avg. depth</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="355"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="528"/>
+        <source>Tab</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="658"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="872"/>
-        <source>Suit</source>
-        <translation>Odijelo</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="598"/>
+        <source>Some column headers were pre-populated; please drag and drop the headers so they match the column they are in.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="663"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="878"/>
-        <source>Tags</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="636"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="761"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="857"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="925"/>
+        <source>Sample time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="652"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="894"/>
-        <source>O₂</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="638"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="763"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="859"/>
+        <source>Sample depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="653"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="896"/>
-        <source>He</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="640"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="765"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="861"/>
+        <source>Sample temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.ui" line="108"/>
-        <location filename="../build/ui_divelogimportdialog.h" line="158"/>
-        <source>Seconds</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="642"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="767"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="863"/>
+        <source>Sample pO₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.ui" line="113"/>
-        <location filename="../build/ui_divelogimportdialog.h" line="159"/>
-        <source>Minutes</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="644"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="769"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="865"/>
+        <source>Sample sensor1 pO₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.ui" line="118"/>
-        <location filename="../build/ui_divelogimportdialog.h" line="160"/>
-        <source>Minutes:seconds</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="646"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="771"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="867"/>
+        <source>Sample sensor2 pO₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="654"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="860"/>
-        <source>Location</source>
-        <translation>Lokacija</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="648"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="773"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="869"/>
+        <source>Sample sensor3 pO₂</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="354"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="499"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="505"/>
-        <source>Tab</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="650"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="775"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="871"/>
+        <source>Sample CNS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="575"/>
-        <source>Some column headers were pre-populated; please drag and drop the headers so they match the column they are in.</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="652"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="777"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="873"/>
+        <source>Sample NDL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="613"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="731"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="782"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="848"/>
-        <source>Sample time</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="654"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="779"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="875"/>
+        <source>Sample TTS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="615"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="733"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="784"/>
-        <source>Sample depth</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="656"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="781"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="877"/>
+        <source>Sample stopdepth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="617"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="735"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="786"/>
-        <source>Sample temperature</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="658"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="783"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="879"/>
+        <source>Sample pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="621"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="739"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="790"/>
-        <source>Sample sensor1 pO₂</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="660"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="785"/>
+        <source>Sample setpoint</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="623"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="741"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="792"/>
-        <source>Sample sensor2 pO₂</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="664"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="759"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="929"/>
+        <source>Dive #</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="625"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="743"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="794"/>
-        <source>Sample sensor3 pO₂</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="665"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="753"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="931"/>
+        <source>Date</source>
+        <translation>Datum</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="666"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="757"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="933"/>
+        <source>Time</source>
+        <translation>Vrijeme</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="667"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="935"/>
+        <source>Duration</source>
+        <translation>Trajanje</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="668"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="941"/>
+        <source>Max. depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="633"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="751"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="802"/>
-        <source>Sample stopdepth</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="669"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="943"/>
+        <source>Avg. depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="637"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="755"/>
-        <source>Sample setpoint</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="670"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="975"/>
+        <source>Air temp.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="619"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="737"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="788"/>
-        <source>Sample pO₂</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="671"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="977"/>
+        <source>Water temp.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="627"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="745"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="796"/>
-        <source>Sample CNS</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="672"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="965"/>
+        <source>Cyl. size</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="629"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="747"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="798"/>
-        <source>Sample NDL</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="673"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="967"/>
+        <source>Start pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="631"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="749"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="800"/>
-        <source>Sample TTS</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="674"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="969"/>
+        <source>End pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="635"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="753"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="804"/>
-        <source>Sample pressure</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="675"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="971"/>
+        <source>O₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="656"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="868"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="676"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="973"/>
+        <source>He</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="677"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="937"/>
+        <source>Location</source>
+        <translation>Lokacija</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="678"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="939"/>
+        <source>GPS</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="679"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="945"/>
         <source>Divemaster</source>
         <translation>Voditelj</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="657"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="870"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="680"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="947"/>
         <source>Buddy</source>
         <translation>Buddy</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="659"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="681"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="949"/>
+        <source>Suit</source>
+        <translation>Odijelo</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="682"/>
         <source>Rating</source>
         <translation>Ocjena</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="660"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="683"/>
         <source>Visibility</source>
         <translation>Vidljivost</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="661"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="874"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="684"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="951"/>
         <source>Notes</source>
         <translation>Bilješke</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="662"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="876"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="685"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="953"/>
         <source>Weight</source>
         <translation>Težina</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="649"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="888"/>
-        <source>Cyl. size</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="650"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="890"/>
-        <source>Start pressure</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="651"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="892"/>
-        <source>End pressure</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="647"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="898"/>
-        <source>Air temp.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="648"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="900"/>
-        <source>Water temp.</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="686"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="955"/>
+        <source>Tags</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DiveObjectHelper</name>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="287"/>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="323"/>
         <source>%1 dive(s)</source>
         <translation type="unfinished"/>
     </message>
@@ -2970,18 +3038,18 @@ GPS location:</source>
 <context>
     <name>DivePlanner</name>
     <message>
-        <location filename="../desktop-widgets/diveplanner.ui" line="152"/>
-        <location filename="../build/ui_diveplanner.h" line="190"/>
-        <source>Altitude</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/diveplanner.ui" line="109"/>
         <location filename="../build/ui_diveplanner.h" line="189"/>
         <source>Planned dive time</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/diveplanner.ui" line="152"/>
+        <location filename="../build/ui_diveplanner.h" line="190"/>
+        <source>Altitude</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/diveplanner.ui" line="159"/>
         <location filename="../build/ui_diveplanner.h" line="191"/>
         <source>ATM pressure</source>
@@ -3015,32 +3083,32 @@ GPS location:</source>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="134"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="136"/>
         <source>unknown</source>
         <translation>nepoznato</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="312"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="326"/>
         <source>Final depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="314"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="328"/>
         <source>Run time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="316"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="330"/>
         <source>Duration</source>
         <translation>Trajanje</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="318"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="332"/>
         <source>Used gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="320"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="334"/>
         <source>CC setpoint</source>
         <translation type="unfinished"/>
     </message>
@@ -3048,22 +3116,22 @@ GPS location:</source>
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="108"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="112"/>
         <source>Dive planner points</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="112"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="116"/>
         <source>Available gases</source>
         <translation>Dostupni plinovi</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="137"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="143"/>
         <source>Add dive data point</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="146"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="152"/>
         <source>Save new</source>
         <translation type="unfinished"/>
     </message>
@@ -3096,11 +3164,36 @@ GPS location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="124"/>
+        <source>User entered</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="126"/>
+        <source>Cylinder index</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="128"/>
         <source>Pressure S</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="130"/>
+        <source>Pressure I</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="132"/>
+        <source>Ceiling</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="134"/>
+        <source>SAC</source>
+        <translation>SAC</translation>
+    </message>
+    <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="136"/>
         <source>pN₂</source>
         <translation type="unfinished"/>
@@ -3136,50 +3229,25 @@ GPS location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="152"/>
-        <source>Heart rate</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="156"/>
-        <source>Mean depth @ s</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="150"/>
         <source>Ambient pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="154"/>
-        <source>Gradient factor</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="130"/>
-        <source>Pressure I</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="124"/>
-        <source>User entered</source>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="152"/>
+        <source>Heart rate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="126"/>
-        <source>Cylinder index</source>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="154"/>
+        <source>Gradient factor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="132"/>
-        <source>Ceiling</source>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="156"/>
+        <source>Mean depth @ s</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="134"/>
-        <source>SAC</source>
-        <translation>SAC</translation>
-    </message>
 </context>
 <context>
     <name>DiveShareExportDialog</name>
@@ -3245,309 +3313,313 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="395"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="441"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="434"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="483"/>
         <source>#</source>
         <translation>Br.</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="398"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="444"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="437"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="486"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="401"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="447"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="440"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="489"/>
         <source>Rating</source>
         <translation>Ocjena</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="404"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="443"/>
         <source>Depth</source>
         <translation>Dubina</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="410"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="446"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="495"/>
+        <source>Duration</source>
+        <translation>Trajanje</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="449"/>
         <source>Temp</source>
         <translation>Temp</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="413"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="452"/>
         <source>Weight</source>
         <translation>Težina</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="425"/>
-        <source>SAC</source>
-        <translation>SAC</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
-        <source>m</source>
-        <translation>m</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
-        <source>ft</source>
-        <translation>ft</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
-        <source>Weight(%1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="416"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="462"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="455"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="504"/>
         <source>Suit</source>
         <translation>Odijelo</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="419"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="465"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="458"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="507"/>
         <source>Cyl</source>
         <translation>Boca</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="422"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="468"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="461"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="510"/>
         <source>Gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
-        <source>SAC(%1)</source>
-        <translation type="unfinished"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="464"/>
+        <source>SAC</source>
+        <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
-        <source>/min</source>
-        <translation type="unfinished"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="467"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="518"/>
+        <source>OTU</source>
+        <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="431"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="479"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="470"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="521"/>
         <source>Max CNS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="434"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="482"/>
-        <source>Location</source>
-        <translation>Lokacija</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
+        <source>Photos</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
-        <source>kg</source>
-        <translation>kg</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="476"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="527"/>
+        <source>Location</source>
+        <translation>Lokacija</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="492"/>
         <source>Depth(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="407"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="453"/>
-        <source>Duration</source>
-        <translation>Trajanje</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="492"/>
+        <source>m</source>
+        <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="456"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="492"/>
+        <source>ft</source>
+        <translation>ft</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="498"/>
         <source>Temp(%1%2)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="501"/>
+        <source>Weight(%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="501"/>
+        <source>kg</source>
+        <translation>kg</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="501"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="428"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="476"/>
-        <source>OTU</source>
-        <translation>OTU</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="515"/>
+        <source>SAC(%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="515"/>
+        <source>/min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="524"/>
+        <source>Photos before/during/after dive</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="164"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="165"/>
         <source>no dives were selected</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="174"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="175"/>
         <source>stylesheet to export to divelogs.de is not found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="184"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="185"/>
         <source>failed to create zip file for upload: %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="236"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="237"/>
         <source>internal error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="244"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="245"/>
         <source>Conversion of dive %1 to divelogs.de format failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="272"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="273"/>
         <source>error writing zip file: %s zip error %d system error %d - %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="745"/>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="935"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="936"/>
         <source>Done</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="778"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="779"/>
         <source>Uploading dive list...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="810"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="811"/>
         <source>Downloading dive list...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="851"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="852"/>
         <source>Downloading %1 dives...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="885"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="886"/>
         <source>Download finished - %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="899"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="900"/>
         <source>Problem with download</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="900"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="901"/>
         <source>The archive could not be opened:
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="909"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="910"/>
         <source>Corrupted download</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="910"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="911"/>
         <source>The archive could not be opened:
 %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="937"/>
+        <source>Upload finished</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="950"/>
         <source>Upload failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="952"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="953"/>
         <source>Upload successful</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="955"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="956"/>
         <source>Login failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="958"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="959"/>
         <source>Cannot parse response</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="970"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="971"/>
         <source>Error: %1</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="936"/>
-        <source>Upload finished</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>DownloadFromDCWidget</name>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="185"/>
-        <source>Error</source>
-        <translation>Greška</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="436"/>
-        <source>Retry</source>
-        <translation>Pokušaj ponovo</translation>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="107"/>
+        <source>Download</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="280"/>
-        <source>Find Uemis dive computer</source>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="110"/>
+        <source>Choose Bluetooth download mode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="101"/>
-        <source>Download</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="191"/>
+        <source>Error</source>
+        <translation>Greška</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="104"/>
-        <source>Choose Bluetooth download mode</source>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="286"/>
+        <source>Find Uemis dive computer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="382"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="392"/>
         <source>Choose file for divecomputer download logfile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="383"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="393"/>
         <source>Log files (*.log)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="398"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="408"/>
         <source>Warning</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="399"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="409"/>
         <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="410"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="420"/>
         <source>Choose file for divecomputer binary dump file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="411"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="421"/>
         <source>Dump files (*.bin)</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="446"/>
+        <source>Retry</source>
+        <translation>Pokušaj ponovo</translation>
+    </message>
 </context>
 <context>
     <name>DownloadFromDiveComputer</name>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="139"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="275"/>
-        <source>Vendor</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="14"/>
         <location filename="../build/ui_downloadfromdivecomputer.h" line="265"/>
         <source>Download from dive computer</source>
@@ -3560,17 +3632,6 @@ p, li { white-space: pre-wrap; }
         <translation>Uređaj ili mount lokacija</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="122"/>
-        <source>Choose Bluetooth download mode</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="149"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="276"/>
-        <source>Dive computer</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="66"/>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="101"/>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="115"/>
@@ -3594,27 +3655,50 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="87"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="270"/>
+        <source>Download into new trip</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="94"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="271"/>
+        <source>Save libdivecomputer logfile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="108"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="273"/>
+        <source>Save libdivecomputer dumpfile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="122"/>
+        <source>Choose Bluetooth download mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="129"/>
         <source>Select a remote Bluetooth device.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="52"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="277"/>
-        <source>Download</source>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="139"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="275"/>
+        <source>Vendor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="284"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="281"/>
-        <source>OK</source>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="149"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="276"/>
+        <source>Dive computer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="291"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="282"/>
-        <source>Cancel</source>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="52"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="277"/>
+        <source>Download</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -3636,21 +3720,15 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="94"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="271"/>
-        <source>Save libdivecomputer logfile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="108"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="273"/>
-        <source>Save libdivecomputer dumpfile</source>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="284"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="281"/>
+        <source>OK</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="87"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="270"/>
-        <source>Download into new trip</source>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="291"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="282"/>
+        <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -3741,12 +3819,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="297"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="242"/>
         <source>To disconnect Subsurface from your Facebook account, use the button below</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="306"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="251"/>
         <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source>
         <translation type="unfinished"/>
     </message>
@@ -3754,22 +3832,22 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>FacebookManager</name>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="266"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="211"/>
         <source>Photo upload sucessfull</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="267"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="212"/>
         <source>Your dive profile was updated to Facebook.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="271"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="216"/>
         <source>Photo upload failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="272"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="217"/>
         <source>Your dive profile was not updated to Facebook, 
  please send the following to the developer. 
 </source>
@@ -3829,17 +3907,25 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>FirmwareUpdateThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1750"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1739"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1755"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1744"/>
         <source>Firmware update failed!</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
+    <name>GlobalDrawer</name>
+    <message>
+        <location filename="../mobile-widgets/qml/kirigami/src/controls/GlobalDrawer.qml" line="364"/>
+        <source>Back</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>GlobeGPS</name>
     <message>
         <location filename="../desktop-widgets/globe.cpp" line="124"/>
@@ -3855,27 +3941,27 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="40"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="32"/>
         <source>Date: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="50"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="42"/>
         <source>Name: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="60"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="52"/>
         <source>Latitude: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="69"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="61"/>
         <source>Longitude: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="113"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="105"/>
         <source>List of stored GPS fixes</source>
         <translation type="unfinished"/>
     </message>
@@ -3904,7 +3990,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>LocationFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="648"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="646"/>
         <source>Location: </source>
         <translation type="unfinished"/>
     </message>
@@ -3945,7 +4031,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>LocationFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="299"/>
+        <location filename="../qt-models/filtermodels.cpp" line="304"/>
         <source>No location set</source>
         <translation type="unfinished"/>
     </message>
@@ -4066,20 +4152,55 @@ p, li { white-space: pre-wrap; }
     </message>
 </context>
 <context>
-    <name>MainForm.ui</name>
+    <name>MainTab</name>
     <message>
-        <location filename="../packaging/ios/Subsurface-mobile/MainForm.ui.qml" line="17"/>
-        <source>Press Me 1</source>
+        <location filename="../desktop-widgets/maintab.ui" line="18"/>
+        <location filename="../desktop-widgets/maintab.ui" line="439"/>
+        <location filename="../build/ui_maintab.h" line="961"/>
+        <location filename="../build/ui_maintab.h" line="963"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="539"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="571"/>
+        <source>Notes</source>
+        <translation>Bilješke</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="21"/>
+        <location filename="../build/ui_maintab.h" line="964"/>
+        <source>General notes about the current selection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../packaging/ios/Subsurface-mobile/MainForm.ui.qml" line="22"/>
-        <source>Press Me 2</source>
+        <location filename="../desktop-widgets/maintab.ui" line="92"/>
+        <location filename="../desktop-widgets/maintab.ui" line="646"/>
+        <location filename="../build/ui_maintab.h" line="947"/>
+        <location filename="../build/ui_maintab.h" line="967"/>
+        <source>Date</source>
+        <translation>Datum</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="102"/>
+        <location filename="../build/ui_maintab.h" line="948"/>
+        <source>Time</source>
+        <translation>Vrijeme</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="112"/>
+        <location filename="../desktop-widgets/maintab.ui" line="836"/>
+        <location filename="../build/ui_maintab.h" line="949"/>
+        <location filename="../build/ui_maintab.h" line="987"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="306"/>
+        <source>Air temp.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="122"/>
+        <location filename="../desktop-widgets/maintab.ui" line="855"/>
+        <location filename="../build/ui_maintab.h" line="950"/>
+        <location filename="../build/ui_maintab.h" line="989"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="307"/>
+        <source>Water temp.</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>MainTab</name>
     <message>
         <location filename="../desktop-widgets/maintab.ui" line="184"/>
         <location filename="../build/ui_maintab.h" line="951"/>
@@ -4088,6 +4209,17 @@ p, li { white-space: pre-wrap; }
         <translation>Lokacija</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="214"/>
+        <source>Edit dive site</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="217"/>
+        <location filename="../build/ui_maintab.h" line="953"/>
+        <source>...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="252"/>
         <location filename="../build/ui_maintab.h" line="954"/>
         <source>Divemaster</source>
@@ -4100,12 +4232,6 @@ p, li { white-space: pre-wrap; }
         <translation>Buddy</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.ui" line="387"/>
-        <location filename="../build/ui_maintab.h" line="959"/>
-        <source>Tags</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/maintab.ui" line="308"/>
         <location filename="../build/ui_maintab.h" line="956"/>
         <source>Rating</source>
@@ -4124,54 +4250,15 @@ p, li { white-space: pre-wrap; }
         <translation>Odijelo</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.ui" line="397"/>
-        <location filename="../build/ui_maintab.h" line="960"/>
-        <source>Dive mode</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="112"/>
-        <location filename="../desktop-widgets/maintab.ui" line="836"/>
-        <location filename="../build/ui_maintab.h" line="949"/>
-        <location filename="../build/ui_maintab.h" line="987"/>
-        <location filename="../desktop-widgets/maintab.cpp" line="306"/>
-        <source>Air temp.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="122"/>
-        <location filename="../desktop-widgets/maintab.ui" line="855"/>
-        <location filename="../build/ui_maintab.h" line="950"/>
-        <location filename="../build/ui_maintab.h" line="989"/>
-        <location filename="../desktop-widgets/maintab.cpp" line="307"/>
-        <source>Water temp.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="18"/>
-        <location filename="../desktop-widgets/maintab.ui" line="439"/>
-        <location filename="../build/ui_maintab.h" line="961"/>
-        <location filename="../build/ui_maintab.h" line="963"/>
-        <location filename="../desktop-widgets/maintab.cpp" line="539"/>
-        <location filename="../desktop-widgets/maintab.cpp" line="571"/>
-        <source>Notes</source>
-        <translation>Bilješke</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="21"/>
-        <location filename="../build/ui_maintab.h" line="964"/>
-        <source>General notes about the current selection</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="214"/>
-        <source>Edit dive site</source>
+        <location filename="../desktop-widgets/maintab.ui" line="387"/>
+        <location filename="../build/ui_maintab.h" line="959"/>
+        <source>Tags</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.ui" line="217"/>
-        <location filename="../build/ui_maintab.h" line="953"/>
-        <source>...</source>
+        <location filename="../desktop-widgets/maintab.ui" line="397"/>
+        <location filename="../build/ui_maintab.h" line="960"/>
+        <source>Dive mode</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -4199,6 +4286,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="665"/>
+        <location filename="../build/ui_maintab.h" line="969"/>
+        <source>Interval</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="684"/>
         <location filename="../build/ui_maintab.h" line="971"/>
         <source>Gases used</source>
@@ -4211,18 +4304,38 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="722"/>
+        <location filename="../desktop-widgets/maintab.ui" line="1094"/>
+        <location filename="../build/ui_maintab.h" line="975"/>
+        <location filename="../build/ui_maintab.h" line="1003"/>
+        <source>SAC</source>
+        <translation>SAC</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="741"/>
         <location filename="../build/ui_maintab.h" line="977"/>
         <source>CNS</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="760"/>
+        <location filename="../build/ui_maintab.h" line="979"/>
+        <source>OTU</source>
+        <translation>OTU</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="779"/>
         <location filename="../build/ui_maintab.h" line="981"/>
         <source>Max. depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="798"/>
+        <location filename="../build/ui_maintab.h" line="983"/>
+        <source>Avg. depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="817"/>
         <location filename="../build/ui_maintab.h" line="985"/>
         <source>Air pressure</source>
@@ -4235,82 +4348,6 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.ui" line="933"/>
-        <location filename="../build/ui_maintab.h" line="1007"/>
-        <source>Simple statistics about the selection</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1039"/>
-        <location filename="../build/ui_maintab.h" line="999"/>
-        <source>Total time</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1106"/>
-        <location filename="../build/ui_maintab.h" line="1004"/>
-        <source>Gas consumption</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1151"/>
-        <location filename="../build/ui_maintab.h" line="1009"/>
-        <source>All photos from the current selection</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1177"/>
-        <location filename="../build/ui_maintab.h" line="1010"/>
-        <source>Extra data</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1180"/>
-        <location filename="../build/ui_maintab.h" line="1011"/>
-        <source>Adittional data from the dive computer</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="92"/>
-        <location filename="../desktop-widgets/maintab.ui" line="646"/>
-        <location filename="../build/ui_maintab.h" line="947"/>
-        <location filename="../build/ui_maintab.h" line="967"/>
-        <source>Date</source>
-        <translation>Datum</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="102"/>
-        <location filename="../build/ui_maintab.h" line="948"/>
-        <source>Time</source>
-        <translation>Vrijeme</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="665"/>
-        <location filename="../build/ui_maintab.h" line="969"/>
-        <source>Interval</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="722"/>
-        <location filename="../desktop-widgets/maintab.ui" line="1094"/>
-        <location filename="../build/ui_maintab.h" line="975"/>
-        <location filename="../build/ui_maintab.h" line="1003"/>
-        <source>SAC</source>
-        <translation>SAC</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="798"/>
-        <location filename="../build/ui_maintab.h" line="983"/>
-        <source>Avg. depth</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="760"/>
-        <location filename="../build/ui_maintab.h" line="979"/>
-        <source>OTU</source>
-        <translation>OTU</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/maintab.ui" line="893"/>
         <location filename="../build/ui_maintab.h" line="993"/>
         <source>Salinity</source>
@@ -4323,22 +4360,34 @@ p, li { white-space: pre-wrap; }
         <translation>Statistike</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="933"/>
+        <location filename="../build/ui_maintab.h" line="1007"/>
+        <source>Simple statistics about the selection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="986"/>
         <location filename="../build/ui_maintab.h" line="996"/>
         <source>Depth</source>
         <translation>Dubina</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="998"/>
+        <location filename="../build/ui_maintab.h" line="997"/>
+        <source>Duration</source>
+        <translation>Trajanje</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="1027"/>
         <location filename="../build/ui_maintab.h" line="998"/>
         <source>Temperature</source>
         <translation>Temperatura</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.ui" line="998"/>
-        <location filename="../build/ui_maintab.h" line="997"/>
-        <source>Duration</source>
-        <translation>Trajanje</translation>
+        <location filename="../desktop-widgets/maintab.ui" line="1039"/>
+        <location filename="../build/ui_maintab.h" line="999"/>
+        <source>Total time</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/maintab.ui" line="1058"/>
@@ -4347,19 +4396,33 @@ p, li { white-space: pre-wrap; }
         <translation>Uroni</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="1106"/>
+        <location filename="../build/ui_maintab.h" line="1004"/>
+        <source>Gas consumption</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="1148"/>
         <location filename="../build/ui_maintab.h" line="1008"/>
         <source>Photos</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.cpp" line="88"/>
-        <source>Cylinders</source>
-        <translation>Boce</translation>
+        <location filename="../desktop-widgets/maintab.ui" line="1151"/>
+        <location filename="../build/ui_maintab.h" line="1009"/>
+        <source>All photos from the current selection</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.cpp" line="92"/>
-        <source>Weights</source>
+        <location filename="../desktop-widgets/maintab.ui" line="1177"/>
+        <location filename="../build/ui_maintab.h" line="1010"/>
+        <source>Extra data</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="1180"/>
+        <location filename="../build/ui_maintab.h" line="1011"/>
+        <source>Adittional data from the dive computer</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -4373,11 +4436,21 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.cpp" line="88"/>
+        <source>Cylinders</source>
+        <translation>Boce</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.cpp" line="89"/>
         <source>Add cylinder</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.cpp" line="92"/>
+        <source>Weights</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.cpp" line="93"/>
         <source>Add weight system</source>
         <translation type="unfinished"/>
@@ -4568,659 +4641,685 @@ mixed from Air and using:
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="455"/>
-        <location filename="../build/ui_mainwindow.h" line="534"/>
-        <source>Export dive logs</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="510"/>
-        <location filename="../build/ui_mainwindow.h" line="542"/>
-        <source>Toggle pHe graph</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="546"/>
-        <location filename="../build/ui_mainwindow.h" line="545"/>
-        <source>Toggle calculating all tissues</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="522"/>
-        <location filename="../build/ui_mainwindow.h" line="543"/>
-        <source>Toggle DC reported ceiling</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="534"/>
-        <location filename="../build/ui_mainwindow.h" line="544"/>
-        <source>Toggle calculated ceiling</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="606"/>
-        <location filename="../build/ui_mainwindow.h" line="550"/>
-        <source>Toggle NDL, TTS</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="558"/>
-        <location filename="../build/ui_mainwindow.h" line="546"/>
-        <source>Toggle calculated ceiling with 3m increments</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="463"/>
-        <location filename="../build/ui_mainwindow.h" line="537"/>
-        <source>Configure &amp;dive computer</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="570"/>
-        <location filename="../build/ui_mainwindow.h" line="547"/>
-        <source>Toggle heart rate</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="582"/>
-        <location filename="../build/ui_mainwindow.h" line="548"/>
-        <source>Toggle MOD</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="594"/>
-        <location filename="../build/ui_mainwindow.h" line="549"/>
-        <source>Toggle EAD, END, EADD</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="618"/>
-        <location filename="../build/ui_mainwindow.h" line="551"/>
-        <source>Toggle SAC rate</source>
-        <translation>SAC</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="630"/>
-        <location filename="../build/ui_mainwindow.h" line="552"/>
-        <source>Toggle ruler</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="86"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="87"/>
         <location filename="../build/ui_mainwindow.h" line="569"/>
         <source>&amp;Log</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="105"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="104"/>
         <location filename="../build/ui_mainwindow.h" line="570"/>
         <source>&amp;View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="121"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="120"/>
         <location filename="../build/ui_mainwindow.h" line="571"/>
         <source>&amp;Help</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="130"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="129"/>
         <location filename="../build/ui_mainwindow.h" line="572"/>
         <source>&amp;Import</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="139"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="138"/>
         <location filename="../build/ui_mainwindow.h" line="573"/>
         <source>&amp;Edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="144"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="143"/>
         <source>Share on</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="158"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="157"/>
         <location filename="../build/ui_mainwindow.h" line="453"/>
         <source>&amp;New logbook</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="161"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="160"/>
         <location filename="../build/ui_mainwindow.h" line="455"/>
         <source>New</source>
         <translation>Novi</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="164"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="163"/>
         <location filename="../build/ui_mainwindow.h" line="457"/>
         <source>Ctrl+N</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="169"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="168"/>
         <location filename="../build/ui_mainwindow.h" line="458"/>
         <source>&amp;Open logbook</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="172"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="171"/>
         <location filename="../build/ui_mainwindow.h" line="460"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="508"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="502"/>
         <source>Open</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="175"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="174"/>
         <location filename="../build/ui_mainwindow.h" line="462"/>
         <source>Ctrl+O</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="180"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="179"/>
         <location filename="../build/ui_mainwindow.h" line="463"/>
         <source>&amp;Save</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="183"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="182"/>
         <location filename="../build/ui_mainwindow.h" line="465"/>
         <source>Save</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="186"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="185"/>
         <location filename="../build/ui_mainwindow.h" line="467"/>
         <source>Ctrl+S</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="191"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="190"/>
         <location filename="../build/ui_mainwindow.h" line="468"/>
         <source>Sa&amp;ve as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="194"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="193"/>
         <location filename="../build/ui_mainwindow.h" line="470"/>
         <source>Save as</source>
         <translation>Spremi kao</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="197"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="196"/>
         <location filename="../build/ui_mainwindow.h" line="472"/>
         <source>Ctrl+Shift+S</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="202"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="201"/>
         <location filename="../build/ui_mainwindow.h" line="473"/>
         <source>&amp;Close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="205"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="204"/>
         <location filename="../build/ui_mainwindow.h" line="475"/>
         <source>Close</source>
         <translation>Zatvori</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="208"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="207"/>
         <location filename="../build/ui_mainwindow.h" line="477"/>
         <source>Ctrl+W</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="221"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="212"/>
+        <location filename="../build/ui_mainwindow.h" line="478"/>
+        <source>&amp;Print</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="215"/>
+        <location filename="../build/ui_mainwindow.h" line="479"/>
+        <source>Ctrl+P</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="220"/>
         <location filename="../build/ui_mainwindow.h" line="480"/>
         <source>P&amp;references</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="251"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="223"/>
+        <location filename="../build/ui_mainwindow.h" line="481"/>
+        <source>Ctrl+,</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="231"/>
+        <location filename="../build/ui_mainwindow.h" line="482"/>
+        <source>&amp;Quit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="234"/>
+        <location filename="../build/ui_mainwindow.h" line="483"/>
+        <source>Ctrl+Q</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="242"/>
+        <location filename="../build/ui_mainwindow.h" line="484"/>
+        <source>Import from &amp;dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="245"/>
+        <location filename="../build/ui_mainwindow.h" line="485"/>
+        <source>Ctrl+D</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="250"/>
         <location filename="../build/ui_mainwindow.h" line="486"/>
         <source>Import &amp;GPS data from Subsurface web service</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="259"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="253"/>
+        <location filename="../build/ui_mainwindow.h" line="487"/>
+        <source>Ctrl+G</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="258"/>
         <location filename="../build/ui_mainwindow.h" line="488"/>
         <source>Edit device &amp;names</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="272"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="263"/>
+        <location filename="../build/ui_mainwindow.h" line="489"/>
+        <source>&amp;Add dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="266"/>
+        <location filename="../build/ui_mainwindow.h" line="490"/>
+        <source>Ctrl++</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="271"/>
         <location filename="../build/ui_mainwindow.h" line="491"/>
         <source>&amp;Edit dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="277"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="276"/>
         <location filename="../build/ui_mainwindow.h" line="492"/>
         <source>&amp;Copy dive components</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="280"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="279"/>
         <location filename="../build/ui_mainwindow.h" line="493"/>
         <source>Ctrl+C</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="285"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="284"/>
         <location filename="../build/ui_mainwindow.h" line="494"/>
         <source>&amp;Paste dive components</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="288"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="287"/>
         <location filename="../build/ui_mainwindow.h" line="495"/>
         <source>Ctrl+V</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="325"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="292"/>
+        <location filename="../build/ui_mainwindow.h" line="496"/>
+        <source>&amp;Renumber</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="295"/>
+        <location filename="../build/ui_mainwindow.h" line="497"/>
+        <source>Ctrl+R</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="303"/>
+        <location filename="../build/ui_mainwindow.h" line="498"/>
+        <source>Auto &amp;group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="308"/>
+        <location filename="../build/ui_mainwindow.h" line="499"/>
+        <source>&amp;Yearly statistics</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="311"/>
+        <location filename="../build/ui_mainwindow.h" line="500"/>
+        <source>Ctrl+Y</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="316"/>
+        <location filename="../build/ui_mainwindow.h" line="501"/>
+        <source>&amp;Dive list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="319"/>
+        <location filename="../build/ui_mainwindow.h" line="502"/>
+        <source>Ctrl+2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="324"/>
         <location filename="../build/ui_mainwindow.h" line="503"/>
         <source>&amp;Profile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="333"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="327"/>
+        <location filename="../build/ui_mainwindow.h" line="504"/>
+        <source>Ctrl+3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="332"/>
         <location filename="../build/ui_mainwindow.h" line="505"/>
         <source>&amp;Info</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="341"/>
-        <location filename="../build/ui_mainwindow.h" line="507"/>
-        <source>&amp;All</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="335"/>
+        <location filename="../build/ui_mainwindow.h" line="506"/>
+        <source>Ctrl+4</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="357"/>
-        <location filename="../build/ui_mainwindow.h" line="511"/>
-        <source>&amp;Next DC</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="340"/>
+        <location filename="../build/ui_mainwindow.h" line="507"/>
+        <source>&amp;All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="365"/>
-        <location filename="../build/ui_mainwindow.h" line="513"/>
-        <source>&amp;About Subsurface</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="343"/>
+        <location filename="../build/ui_mainwindow.h" line="508"/>
+        <source>Ctrl+1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="381"/>
-        <location filename="../build/ui_mainwindow.h" line="516"/>
-        <source>&amp;Globe</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="348"/>
+        <location filename="../build/ui_mainwindow.h" line="509"/>
+        <source>P&amp;revious DC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="403"/>
-        <location filename="../build/ui_mainwindow.h" line="524"/>
-        <source>Ctrl+I</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="351"/>
+        <location filename="../build/ui_mainwindow.h" line="510"/>
+        <source>Left</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="408"/>
-        <location filename="../build/ui_mainwindow.h" line="525"/>
-        <source>Import &amp;from divelogs.de</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="356"/>
+        <location filename="../build/ui_mainwindow.h" line="511"/>
+        <source>&amp;Next DC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="416"/>
-        <location filename="../build/ui_mainwindow.h" line="526"/>
-        <source>&amp;Full screen</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="359"/>
+        <location filename="../build/ui_mainwindow.h" line="512"/>
+        <source>Right</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="419"/>
-        <location filename="../build/ui_mainwindow.h" line="528"/>
-        <source>Toggle full screen</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="364"/>
+        <location filename="../build/ui_mainwindow.h" line="513"/>
+        <source>&amp;About Subsurface</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="447"/>
-        <location filename="../build/ui_mainwindow.h" line="531"/>
-        <source>&amp;Check for updates</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="372"/>
+        <location filename="../build/ui_mainwindow.h" line="514"/>
+        <source>User &amp;manual</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="452"/>
-        <location filename="../build/ui_mainwindow.h" line="532"/>
-        <source>&amp;Export</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="375"/>
+        <location filename="../build/ui_mainwindow.h" line="515"/>
+        <source>F1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="458"/>
-        <location filename="../build/ui_mainwindow.h" line="536"/>
-        <source>Ctrl+E</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="380"/>
+        <location filename="../build/ui_mainwindow.h" line="516"/>
+        <source>&amp;Globe</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="466"/>
-        <location filename="../build/ui_mainwindow.h" line="538"/>
-        <source>Ctrl+Shift+C</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="383"/>
+        <location filename="../build/ui_mainwindow.h" line="517"/>
+        <source>Ctrl+5</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="474"/>
-        <location filename="../build/ui_mainwindow.h" line="539"/>
-        <source>Edit &amp;dive in planner</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="388"/>
+        <location filename="../build/ui_mainwindow.h" line="518"/>
+        <source>P&amp;lan dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="486"/>
-        <location filename="../build/ui_mainwindow.h" line="540"/>
-        <source>Toggle pO₂ graph</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="391"/>
+        <location filename="../build/ui_mainwindow.h" line="519"/>
+        <source>Ctrl+L</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="498"/>
-        <location filename="../build/ui_mainwindow.h" line="541"/>
-        <source>Toggle pN₂ graph</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="396"/>
+        <location filename="../build/ui_mainwindow.h" line="520"/>
+        <source>&amp;Import log files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="642"/>
-        <location filename="../build/ui_mainwindow.h" line="553"/>
-        <source>Scale graph</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="399"/>
+        <location filename="../build/ui_mainwindow.h" line="522"/>
+        <source>Import divelog files from other applications</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="654"/>
-        <location filename="../build/ui_mainwindow.h" line="554"/>
-        <source>Toggle pictures</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="402"/>
+        <location filename="../build/ui_mainwindow.h" line="524"/>
+        <source>Ctrl+I</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="666"/>
-        <location filename="../build/ui_mainwindow.h" line="555"/>
-        <source>Toggle tank bar</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="407"/>
+        <location filename="../build/ui_mainwindow.h" line="525"/>
+        <source>Import &amp;from divelogs.de</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="674"/>
-        <location filename="../build/ui_mainwindow.h" line="556"/>
-        <source>&amp;Filter divelist</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="415"/>
+        <location filename="../build/ui_mainwindow.h" line="526"/>
+        <source>&amp;Full screen</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="689"/>
-        <location filename="../build/ui_mainwindow.h" line="558"/>
-        <source>Toggle tissue graph</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="418"/>
+        <location filename="../build/ui_mainwindow.h" line="528"/>
+        <source>Toggle full screen</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="694"/>
-        <location filename="../build/ui_mainwindow.h" line="559"/>
-        <source>User &amp;survey</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="421"/>
+        <location filename="../build/ui_mainwindow.h" line="530"/>
+        <source>F11</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="699"/>
-        <location filename="../build/ui_mainwindow.h" line="560"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="238"/>
-        <source>&amp;Undo</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="446"/>
+        <location filename="../build/ui_mainwindow.h" line="531"/>
+        <source>&amp;Check for updates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="702"/>
-        <location filename="../build/ui_mainwindow.h" line="561"/>
-        <source>Ctrl+Z</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="451"/>
+        <location filename="../build/ui_mainwindow.h" line="532"/>
+        <source>&amp;Export</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="707"/>
-        <location filename="../build/ui_mainwindow.h" line="562"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="239"/>
-        <source>&amp;Redo</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="454"/>
+        <location filename="../build/ui_mainwindow.h" line="534"/>
+        <source>Export dive logs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="710"/>
-        <location filename="../build/ui_mainwindow.h" line="563"/>
-        <source>Ctrl+Shift+Z</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="457"/>
+        <location filename="../build/ui_mainwindow.h" line="536"/>
+        <source>Ctrl+E</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="715"/>
-        <location filename="../build/ui_mainwindow.h" line="564"/>
-        <source>&amp;Find moved images</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="462"/>
+        <location filename="../build/ui_mainwindow.h" line="537"/>
+        <source>Configure &amp;dive computer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="720"/>
-        <source>Open c&amp;loud storage</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="465"/>
+        <location filename="../build/ui_mainwindow.h" line="538"/>
+        <source>Ctrl+Shift+C</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="725"/>
-        <source>Save to clo&amp;ud storage</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="473"/>
+        <location filename="../build/ui_mainwindow.h" line="539"/>
+        <source>Edit &amp;dive in planner</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="730"/>
-        <location filename="../build/ui_mainwindow.h" line="567"/>
-        <source>&amp;Manage dive sites</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="485"/>
+        <location filename="../build/ui_mainwindow.h" line="540"/>
+        <source>Toggle pO₂ graph</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="735"/>
-        <source>Dive Site &amp;Edit</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="497"/>
+        <location filename="../build/ui_mainwindow.h" line="541"/>
+        <source>Toggle pN₂ graph</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="740"/>
-        <source>Facebook</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="509"/>
+        <location filename="../build/ui_mainwindow.h" line="542"/>
+        <source>Toggle pHe graph</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="745"/>
-        <source>Add GPS location here</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="521"/>
+        <location filename="../build/ui_mainwindow.h" line="543"/>
+        <source>Toggle DC reported ceiling</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="677"/>
-        <location filename="../build/ui_mainwindow.h" line="557"/>
-        <source>Ctrl+F</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="533"/>
+        <location filename="../build/ui_mainwindow.h" line="544"/>
+        <source>Toggle calculated ceiling</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="213"/>
-        <location filename="../build/ui_mainwindow.h" line="478"/>
-        <source>&amp;Print</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="545"/>
+        <location filename="../build/ui_mainwindow.h" line="545"/>
+        <source>Toggle calculating all tissues</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="224"/>
-        <location filename="../build/ui_mainwindow.h" line="481"/>
-        <source>Ctrl+,</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="557"/>
+        <location filename="../build/ui_mainwindow.h" line="546"/>
+        <source>Toggle calculated ceiling with 3m increments</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="232"/>
-        <location filename="../build/ui_mainwindow.h" line="482"/>
-        <source>&amp;Quit</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="569"/>
+        <location filename="../build/ui_mainwindow.h" line="547"/>
+        <source>Toggle heart rate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="243"/>
-        <location filename="../build/ui_mainwindow.h" line="484"/>
-        <source>Import from &amp;dive computer</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="581"/>
+        <location filename="../build/ui_mainwindow.h" line="548"/>
+        <source>Toggle MOD</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="254"/>
-        <location filename="../build/ui_mainwindow.h" line="487"/>
-        <source>Ctrl+G</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="593"/>
+        <location filename="../build/ui_mainwindow.h" line="549"/>
+        <source>Toggle EAD, END, EADD</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="267"/>
-        <location filename="../build/ui_mainwindow.h" line="490"/>
-        <source>Ctrl++</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="605"/>
+        <location filename="../build/ui_mainwindow.h" line="550"/>
+        <source>Toggle NDL, TTS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="293"/>
-        <location filename="../build/ui_mainwindow.h" line="496"/>
-        <source>&amp;Renumber</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="617"/>
+        <location filename="../build/ui_mainwindow.h" line="551"/>
+        <source>Toggle SAC rate</source>
+        <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="296"/>
-        <location filename="../build/ui_mainwindow.h" line="497"/>
-        <source>Ctrl+R</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="629"/>
+        <location filename="../build/ui_mainwindow.h" line="552"/>
+        <source>Toggle ruler</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="312"/>
-        <location filename="../build/ui_mainwindow.h" line="500"/>
-        <source>Ctrl+Y</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="641"/>
+        <location filename="../build/ui_mainwindow.h" line="553"/>
+        <source>Scale graph</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="392"/>
-        <location filename="../build/ui_mainwindow.h" line="519"/>
-        <source>Ctrl+L</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="653"/>
+        <location filename="../build/ui_mainwindow.h" line="554"/>
+        <source>Toggle pictures</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="216"/>
-        <location filename="../build/ui_mainwindow.h" line="479"/>
-        <source>Ctrl+P</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="665"/>
+        <location filename="../build/ui_mainwindow.h" line="555"/>
+        <source>Toggle tank bar</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="235"/>
-        <location filename="../build/ui_mainwindow.h" line="483"/>
-        <source>Ctrl+Q</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="673"/>
+        <location filename="../build/ui_mainwindow.h" line="556"/>
+        <source>&amp;Filter divelist</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="246"/>
-        <location filename="../build/ui_mainwindow.h" line="485"/>
-        <source>Ctrl+D</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="676"/>
+        <location filename="../build/ui_mainwindow.h" line="557"/>
+        <source>Ctrl+F</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="264"/>
-        <location filename="../build/ui_mainwindow.h" line="489"/>
-        <source>&amp;Add dive</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="688"/>
+        <source>Toggle tissue heat-map</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="304"/>
-        <location filename="../build/ui_mainwindow.h" line="498"/>
-        <source>Auto &amp;group</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="693"/>
+        <location filename="../build/ui_mainwindow.h" line="559"/>
+        <source>User &amp;survey</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="309"/>
-        <location filename="../build/ui_mainwindow.h" line="499"/>
-        <source>&amp;Yearly statistics</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="698"/>
+        <location filename="../build/ui_mainwindow.h" line="560"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="231"/>
+        <source>&amp;Undo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="317"/>
-        <location filename="../build/ui_mainwindow.h" line="501"/>
-        <source>&amp;Dive list</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="701"/>
+        <location filename="../build/ui_mainwindow.h" line="561"/>
+        <source>Ctrl+Z</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="320"/>
-        <location filename="../build/ui_mainwindow.h" line="502"/>
-        <source>Ctrl+2</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="706"/>
+        <location filename="../build/ui_mainwindow.h" line="562"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="232"/>
+        <source>&amp;Redo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="328"/>
-        <location filename="../build/ui_mainwindow.h" line="504"/>
-        <source>Ctrl+3</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="709"/>
+        <location filename="../build/ui_mainwindow.h" line="563"/>
+        <source>Ctrl+Shift+Z</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="336"/>
-        <location filename="../build/ui_mainwindow.h" line="506"/>
-        <source>Ctrl+4</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="714"/>
+        <location filename="../build/ui_mainwindow.h" line="564"/>
+        <source>&amp;Find moved images</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="344"/>
-        <location filename="../build/ui_mainwindow.h" line="508"/>
-        <source>Ctrl+1</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="719"/>
+        <source>Open c&amp;loud storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="349"/>
-        <location filename="../build/ui_mainwindow.h" line="509"/>
-        <source>P&amp;revious DC</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="724"/>
+        <source>Save to clo&amp;ud storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="352"/>
-        <location filename="../build/ui_mainwindow.h" line="510"/>
-        <source>Left</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="729"/>
+        <location filename="../build/ui_mainwindow.h" line="567"/>
+        <source>&amp;Manage dive sites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="360"/>
-        <location filename="../build/ui_mainwindow.h" line="512"/>
-        <source>Right</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="734"/>
+        <source>Dive Site &amp;Edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="373"/>
-        <location filename="../build/ui_mainwindow.h" line="514"/>
-        <source>User &amp;manual</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="739"/>
+        <source>Facebook</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="376"/>
-        <location filename="../build/ui_mainwindow.h" line="515"/>
-        <source>F1</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="744"/>
+        <source>Take cloud storage online</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="384"/>
-        <location filename="../build/ui_mainwindow.h" line="517"/>
-        <source>Ctrl+5</source>
+        <location filename="../build/ui_mainwindow.h" line="558"/>
+        <source>Toggle tissue graph</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="389"/>
-        <location filename="../build/ui_mainwindow.h" line="518"/>
-        <source>P&amp;lan dive</source>
+        <location filename="../build/ui_mainwindow.h" line="565"/>
+        <source>Open cloud storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="397"/>
-        <location filename="../build/ui_mainwindow.h" line="520"/>
-        <source>&amp;Import log files</source>
+        <location filename="../build/ui_mainwindow.h" line="566"/>
+        <source>Save to cloud storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="400"/>
-        <location filename="../build/ui_mainwindow.h" line="522"/>
-        <source>Import divelog files from other applications</source>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="331"/>
+        <source>Connect to</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="422"/>
-        <location filename="../build/ui_mainwindow.h" line="530"/>
-        <source>F11</source>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="493"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="538"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1545"/>
+        <source>Please save or cancel the current dive edit before opening a new file.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="505"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="499"/>
         <source>Open file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="509"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="503"/>
         <location filename="../desktop-widgets/mainwindow.cpp" line="614"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1972"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1978"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
@@ -5240,6 +5339,16 @@ mixed from Air and using:
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="649"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="796"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="977"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="983"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1849"/>
+        <source>Warning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="674"/>
         <source>Please save or cancel the current dive edit before closing the file.</source>
         <translation type="unfinished"/>
@@ -5255,124 +5364,97 @@ mixed from Air and using:
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="982"/>
-        <source>Trying to edit a dive that&apos;s not a manually added dive.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1243"/>
-        <source>Do you want to save the changes that you made in the file %1?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1246"/>
-        <source>Do you want to save the changes that you made in the data file?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1251"/>
-        <source>Save changes?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1587"/>
-        <source>Save file as</source>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
+        <source>Trying to replan a dive that&apos;s not a planned dive.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1682"/>
-        <source>[cloud storage for] %1</source>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="977"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1849"/>
+        <source>Please, first finish the current edition before trying to do another.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1782"/>
-        <source>Opening datafile from older version</source>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="983"/>
+        <source>Trying to edit a dive that&apos;s not a manually added dive.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1783"/>
-        <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly.
-Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1030"/>
+        <source>Yearly statistics</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1794"/>
-        <source>Open dive log file</source>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1244"/>
+        <source>Do you want to save the changes that you made in the file %1?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1795"/>
-        <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;All files (*)</source>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1247"/>
+        <source>Do you want to save the changes that you made in the data file?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1972"/>
-        <source>Contacting cloud service...</source>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1252"/>
+        <source>Save changes?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1252"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1253"/>
         <source>Changes will be lost if you don&apos;t save them.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="649"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="796"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="976"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="982"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/>
-        <source>Warning</source>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1572"/>
+        <source>Save file as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="499"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="544"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1560"/>
-        <source>Please save or cancel the current dive edit before opening a new file.</source>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1573"/>
+        <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="338"/>
-        <source>Connect to</source>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1670"/>
+        <source>[local cache for] %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
-        <source>Trying to replan a dive that&apos;s not a planned dive.</source>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1672"/>
+        <source>[cloud storage for] %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1029"/>
-        <source>Yearly statistics</source>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1788"/>
+        <source>Opening datafile from older version</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1588"/>
-        <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1789"/>
+        <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly.
+Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="976"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/>
-        <source>Please, first finish the current edition before trying to do another.</source>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1800"/>
+        <source>Open dive log file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_mainwindow.h" line="565"/>
-        <source>Open cloud storage</source>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1801"/>
+        <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_mainwindow.h" line="566"/>
-        <source>Save to cloud storage</source>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1978"/>
+        <source>Contacting cloud service...</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>MultiFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="733"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="731"/>
         <source>Filter shows %1 (of %2) dives</source>
         <translation type="unfinished"/>
     </message>
@@ -5380,39 +5462,39 @@ Subsurface has already tried to pre-populate the data but it might be worth whil
 <context>
     <name>OstcFirmwareCheck</name>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="269"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="271"/>
         <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="273"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="275"/>
         <source>
 
 Please start Bluetooth on your OSTC Sport and do the same preparations as for a logbook download before continuing with the update</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="274"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="276"/>
         <source>Not now</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="275"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="277"/>
         <source>Update firmware</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="277"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="279"/>
         <source>Firmware upgrade notice</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="295"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="297"/>
         <source>Save the downloaded firmware as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="296"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="298"/>
         <source>HEX files (*.hex)</source>
         <translation type="unfinished"/>
     </message>
@@ -5420,79 +5502,89 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PlannerSettingsWidget</name>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="322"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="302"/>
         <source>Open circuit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="322"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="302"/>
         <source>CCR</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="322"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="302"/>
         <source>pSCR</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="421"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="388"/>
         <source>ft/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="422"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="389"/>
         <source>Last stop at 20ft</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="423"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="390"/>
         <source>50% avg. depth to 20ft</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="424"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="391"/>
         <source>20ft to surface</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="426"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="392"/>
+        <source>ft</source>
+        <translation>ft</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="394"/>
         <source>m/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="427"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="395"/>
         <source>Last stop at 6m</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="428"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="396"/>
         <source>50% avg. depth to 6m</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="429"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="397"/>
         <source>6m to surface</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="432"/>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="433"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="398"/>
+        <source>m</source>
+        <translation>m</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="401"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="402"/>
         <source>cuft/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="441"/>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="442"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="410"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="411"/>
         <source>ℓ/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="451"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="420"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="456"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="425"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
@@ -5642,6 +5734,11 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PreferencesDialog</name>
     <message>
+        <location filename="../build/ui_preferences.h" line="1283"/>
+        <source>Preferences</source>
+        <translation>Postavke</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1288"/>
         <source>Defaults</source>
         <translation type="unfinished"/>
@@ -5677,6 +5774,11 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1303"/>
+        <source>Lists and tables</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1304"/>
         <source>Font</source>
         <translation type="unfinished"/>
@@ -5692,6 +5794,11 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>Uroni</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1307"/>
+        <source>Default dive log file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1308"/>
         <source>No default file</source>
         <translation type="unfinished"/>
@@ -5722,6 +5829,21 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1314"/>
+        <source>Display invalid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1316"/>
+        <source>Default cylinder</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1317"/>
+        <source>Use default cylinder</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1318"/>
         <source>Animations</source>
         <translation type="unfinished"/>
@@ -5752,39 +5874,23 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1401"/>
-        <source>Dive site geo lookup</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1402"/>
-        <source>Enable geocoding for dive site management</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1403"/>
-        <source>Parse site without GPS data</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1404"/>
-        <source>Same format for existing dives</source>
+        <location filename="../build/ui_preferences.h" line="1324"/>
+        <source>&amp;Metric</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1405"/>
-        <source>Dive Site Layout</source>
+        <location filename="../build/ui_preferences.h" line="1325"/>
+        <source>Imperial</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1406"/>
-        <location filename="../build/ui_preferences.h" line="1407"/>
-        <source>/</source>
+        <location filename="../build/ui_preferences.h" line="1326"/>
+        <source>Personali&amp;ze</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1325"/>
-        <source>Imperial</source>
+        <location filename="../build/ui_preferences.h" line="1327"/>
+        <source>Individual settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -5803,6 +5909,11 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1331"/>
+        <source>Pressure</source>
+        <translation>Pritisak</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1332"/>
         <location filename="../build/ui_preferences.h" line="1366"/>
         <source>bar</source>
@@ -5814,11 +5925,26 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>psi</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1334"/>
+        <source>Volume</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1335"/>
+        <source>&amp;liter</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1336"/>
         <source>cu ft</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1337"/>
+        <source>Temperature</source>
+        <translation>Temperatura</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1338"/>
         <source>celsius</source>
         <translation type="unfinished"/>
@@ -5829,314 +5955,280 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1340"/>
+        <source>Weight</source>
+        <translation>Težina</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1341"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1363"/>
-        <source>CCR: show setpoints when viewing pO₂</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1364"/>
-        <source>CCR: show individual O₂ sensor values when viewing pO₂</source>
-        <translation type="unfinished"/>
+        <location filename="../build/ui_preferences.h" line="1342"/>
+        <source>lbs</source>
+        <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1365"/>
-        <source>Default CCR set-point for dive planning</source>
+        <location filename="../build/ui_preferences.h" line="1343"/>
+        <source>Time units</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1367"/>
-        <source>pSCR O₂ metabolism rate</source>
+        <location filename="../build/ui_preferences.h" line="1344"/>
+        <source>Ascent/descent speed denominator</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1368"/>
-        <source>pSCR ratio</source>
+        <location filename="../build/ui_preferences.h" line="1345"/>
+        <source>Minutes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1369"/>
-        <source>ℓ/min</source>
+        <location filename="../build/ui_preferences.h" line="1346"/>
+        <source>Seconds</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1371"/>
-        <source>1:</source>
+        <location filename="../build/ui_preferences.h" line="1347"/>
+        <source>GPS coordinates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1372"/>
-        <source>UI language</source>
+        <location filename="../build/ui_preferences.h" line="1348"/>
+        <source>Location Display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1373"/>
-        <source>System default</source>
+        <location filename="../build/ui_preferences.h" line="1349"/>
+        <source>traditional (dms)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1375"/>
-        <source>Proxy</source>
+        <location filename="../build/ui_preferences.h" line="1350"/>
+        <source>decimal</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1379"/>
-        <source>Proxy type</source>
+        <location filename="../build/ui_preferences.h" line="1351"/>
+        <source>Show</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1377"/>
-        <source>Host</source>
+        <location filename="../build/ui_preferences.h" line="1352"/>
+        <source>Threshold when showing pO₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1376"/>
-        <source>Port</source>
+        <location filename="../build/ui_preferences.h" line="1353"/>
+        <source>Threshold when showing pN₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1378"/>
-        <source>Requires authentication</source>
+        <location filename="../build/ui_preferences.h" line="1354"/>
+        <source>Threshold when showing pHe</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1380"/>
-        <source>Username</source>
+        <location filename="../build/ui_preferences.h" line="1355"/>
+        <source>Max pO₂ when showing MOD</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1381"/>
-        <location filename="../build/ui_preferences.h" line="1387"/>
-        <source>Password</source>
-        <translation>Lozinka</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1400"/>
-        <source>Disconnect from Facebook</source>
+        <location filename="../build/ui_preferences.h" line="1356"/>
+        <source>Draw dive computer reported ceiling red</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1374"/>
-        <source>Filter</source>
-        <translation>Filter</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1331"/>
-        <source>Pressure</source>
-        <translation>Pritisak</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1303"/>
-        <source>Lists and tables</source>
+        <location filename="../build/ui_preferences.h" line="1357"/>
+        <source>Show unused cylinders in Equipment tab</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1307"/>
-        <source>Default dive log file</source>
+        <location filename="../build/ui_preferences.h" line="1358"/>
+        <source>Show average depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1314"/>
-        <source>Display invalid</source>
+        <location filename="../build/ui_preferences.h" line="1359"/>
+        <source>Misc</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1316"/>
-        <source>Default cylinder</source>
+        <location filename="../build/ui_preferences.h" line="1360"/>
+        <source>GFLow</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1317"/>
-        <source>Use default cylinder</source>
+        <location filename="../build/ui_preferences.h" line="1361"/>
+        <source>GFHigh</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1382"/>
-        <source>Subsurface cloud storage</source>
+        <location filename="../build/ui_preferences.h" line="1362"/>
+        <source>GFLow at max depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1386"/>
-        <source>Email address</source>
+        <location filename="../build/ui_preferences.h" line="1363"/>
+        <source>CCR: show setpoints when viewing pO₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1388"/>
-        <source>Verification PIN</source>
+        <location filename="../build/ui_preferences.h" line="1364"/>
+        <source>CCR: show individual O₂ sensor values when viewing pO₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1395"/>
-        <source>Sync to cloud in the background?</source>
+        <location filename="../build/ui_preferences.h" line="1365"/>
+        <source>Default CCR set-point for dive planning</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1396"/>
-        <source>Save Password locally?</source>
+        <location filename="../build/ui_preferences.h" line="1367"/>
+        <source>pSCR O₂ metabolism rate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1397"/>
-        <source>Subsurface web service</source>
+        <location filename="../build/ui_preferences.h" line="1368"/>
+        <source>pSCR ratio</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1398"/>
-        <source>Default user ID</source>
+        <location filename="../build/ui_preferences.h" line="1369"/>
+        <source>ℓ/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1399"/>
-        <source>Save user ID locally?</source>
+        <location filename="../build/ui_preferences.h" line="1371"/>
+        <source>1:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1334"/>
-        <source>Volume</source>
+        <location filename="../build/ui_preferences.h" line="1372"/>
+        <source>UI language</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1337"/>
-        <source>Temperature</source>
-        <translation>Temperatura</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1340"/>
-        <source>Weight</source>
-        <translation>Težina</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1342"/>
-        <source>lbs</source>
-        <translation>lbs</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1343"/>
-        <source>Time units</source>
+        <location filename="../build/ui_preferences.h" line="1373"/>
+        <source>System default</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1345"/>
-        <source>Minutes</source>
-        <translation type="unfinished"/>
+        <location filename="../build/ui_preferences.h" line="1374"/>
+        <source>Filter</source>
+        <translation>Filter</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1346"/>
-        <source>Seconds</source>
+        <location filename="../build/ui_preferences.h" line="1375"/>
+        <source>Proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1351"/>
-        <source>Show</source>
+        <location filename="../build/ui_preferences.h" line="1376"/>
+        <source>Port</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1362"/>
-        <source>GFLow at max depth</source>
+        <location filename="../build/ui_preferences.h" line="1377"/>
+        <source>Host</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1359"/>
-        <source>Misc</source>
+        <location filename="../build/ui_preferences.h" line="1378"/>
+        <source>Requires authentication</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1283"/>
-        <source>Preferences</source>
-        <translation>Postavke</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1324"/>
-        <source>&amp;Metric</source>
+        <location filename="../build/ui_preferences.h" line="1379"/>
+        <source>Proxy type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1326"/>
-        <source>Personali&amp;ze</source>
+        <location filename="../build/ui_preferences.h" line="1380"/>
+        <source>Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1327"/>
-        <source>Individual settings</source>
-        <translation type="unfinished"/>
+        <location filename="../build/ui_preferences.h" line="1381"/>
+        <location filename="../build/ui_preferences.h" line="1387"/>
+        <source>Password</source>
+        <translation>Lozinka</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1335"/>
-        <source>&amp;liter</source>
+        <location filename="../build/ui_preferences.h" line="1382"/>
+        <source>Subsurface cloud storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1344"/>
-        <source>Ascent/descent speed denominator</source>
+        <location filename="../build/ui_preferences.h" line="1386"/>
+        <source>Email address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1347"/>
-        <source>GPS coordinates</source>
+        <location filename="../build/ui_preferences.h" line="1388"/>
+        <source>Verification PIN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1348"/>
-        <source>Location Display</source>
+        <location filename="../build/ui_preferences.h" line="1395"/>
+        <source>Sync to cloud in the background?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1349"/>
-        <source>traditional (dms)</source>
+        <location filename="../build/ui_preferences.h" line="1396"/>
+        <source>Save Password locally?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1350"/>
-        <source>decimal</source>
+        <location filename="../build/ui_preferences.h" line="1397"/>
+        <source>Subsurface web service</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1352"/>
-        <source>Threshold when showing pO₂</source>
+        <location filename="../build/ui_preferences.h" line="1398"/>
+        <source>Default user ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1353"/>
-        <source>Threshold when showing pN₂</source>
+        <location filename="../build/ui_preferences.h" line="1399"/>
+        <source>Save user ID locally?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1354"/>
-        <source>Threshold when showing pHe</source>
+        <location filename="../build/ui_preferences.h" line="1400"/>
+        <source>Disconnect from Facebook</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1355"/>
-        <source>Max pO₂ when showing MOD</source>
+        <location filename="../build/ui_preferences.h" line="1401"/>
+        <source>Dive site geo lookup</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1356"/>
-        <source>Draw dive computer reported ceiling red</source>
+        <location filename="../build/ui_preferences.h" line="1402"/>
+        <source>Enable geocoding for dive site management</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1357"/>
-        <source>Show unused cylinders in Equipment tab</source>
+        <location filename="../build/ui_preferences.h" line="1403"/>
+        <source>Parse site without GPS data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1358"/>
-        <source>Show average depth</source>
+        <location filename="../build/ui_preferences.h" line="1404"/>
+        <source>Same format for existing dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1360"/>
-        <source>GFLow</source>
+        <location filename="../build/ui_preferences.h" line="1405"/>
+        <source>Dive Site Layout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1361"/>
-        <source>GFHigh</source>
+        <location filename="../build/ui_preferences.h" line="1406"/>
+        <location filename="../build/ui_preferences.h" line="1407"/>
+        <source>/</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -6193,106 +6285,136 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="20"/>
-        <source>Show</source>
+        <source>Gas pressure display setup</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="29"/>
-        <source>Threshold when showing pO₂</source>
+        <source>Threshold for pO₂ (bar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="49"/>
-        <source>Threshold when showing pN₂</source>
+        <source>Threshold for pN₂ (bar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="69"/>
-        <source>Threshold when showing pHe</source>
+        <source>Threshold for pHe (bar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="89"/>
-        <source>Max pO₂ when showing MOD</source>
+        <source>pO₂ in calculating MOD (bar)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="106"/>
+        <source>CCR options:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="113"/>
+        <source>Dive planner default setpoint (bar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="109"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="133"/>
+        <source>Show setpoints when viewing pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="140"/>
+        <source>Show individual O₂ sensor values when viewing pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="150"/>
+        <source>Ceiling display setup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="159"/>
         <source>Draw dive computer reported ceiling red</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="116"/>
-        <source>Show unused cylinders in Equipment tab</source>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="169"/>
+        <source>Algorithm for calculated ceiling:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="123"/>
-        <source>Show mean depth</source>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="176"/>
+        <source>VPM-B</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="133"/>
-        <source>Misc</source>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="183"/>
+        <source>VPM-B Conservatism</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="149"/>
-        <source>bar</source>
-        <translation>bar</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="193"/>
+        <source>+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="165"/>
-        <source>Default CCR set-point for dive planning</source>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="206"/>
+        <source>Bühlmann</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="172"/>
-        <source>pSCR O₂ metabolism rate</source>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="216"/>
+        <source>GFHigh</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="179"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="236"/>
         <source>GFLow</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="186"/>
-        <source>GFHigh</source>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="256"/>
+        <source>GFLow at max depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="203"/>
-        <source>ℓ/min</source>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="263"/>
+        <source>pSCR options:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="213"/>
-        <source>pSCR ratio</source>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="270"/>
+        <source>Metabolic rate (ℓ O₂/min)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="223"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="287"/>
+        <source>Dilution ratio</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="300"/>
         <source>1:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="230"/>
-        <source>CCR: show individual O₂ sensor values when viewing pO₂</source>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="310"/>
+        <source>Misc</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="237"/>
-        <source>CCR: show setpoints when viewing pO₂</source>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="316"/>
+        <source>Show unused cylinders in Equipment tab</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="244"/>
-        <source>GFLow at max depth</source>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="323"/>
+        <source>Show mean depth in Profile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="10"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="9"/>
         <source>Graph</source>
         <translation type="unfinished"/>
     </message>
@@ -6361,15 +6483,29 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="57"/>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="53"/>
         <source>Restart required</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="58"/>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="54"/>
         <source>To correctly load a new language you must restart Subsurface.</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="76"/>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="82"/>
+        <source>Literal characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="77"/>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="83"/>
+        <source>Non-special character(s) in time format.
+These will be used as is. This might not be what you intended.
+See http://doc.qt.io/qt-5/qdatetime.html#toString</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PreferencesNetwork</name>
@@ -6416,7 +6552,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_network.ui" line="156"/>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="148"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="134"/>
         <source>Subsurface cloud storage</source>
         <translation type="unfinished"/>
     </message>
@@ -6461,39 +6597,39 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="11"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="10"/>
         <source>Network</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="15"/>
         <source>No proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/>
         <source>System proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/>
         <source>HTTP proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="19"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/>
         <source>SOCKS proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="75"/>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="97"/>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="110"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="72"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="93"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="106"/>
         <source>Cloud storage email and password can only consist of letters, numbers, and &apos;.&apos;, &apos;-&apos;, &apos;_&apos;, and &apos;+&apos;.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="146"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="132"/>
         <source>Subsurface cloud storage (credentials verified)</source>
         <translation type="unfinished"/>
     </message>
@@ -6651,7 +6787,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="8"/>
+        <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="7"/>
         <source>Units</source>
         <translation>Jedinice</translation>
     </message>
@@ -6659,17 +6795,17 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PrintDialog</name>
     <message>
-        <location filename="../desktop-widgets/printdialog.cpp" line="118"/>
-        <source>&amp;Preview</source>
+        <location filename="../desktop-widgets/printdialog.cpp" line="102"/>
+        <source>P&amp;rint</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/printdialog.cpp" line="115"/>
-        <source>P&amp;rint</source>
+        <location filename="../desktop-widgets/printdialog.cpp" line="105"/>
+        <source>&amp;Preview</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/printdialog.cpp" line="130"/>
+        <location filename="../desktop-widgets/printdialog.cpp" line="117"/>
         <source>Print</source>
         <translation type="unfinished"/>
     </message>
@@ -6677,19 +6813,10 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PrintOptions</name>
     <message>
-        <location filename="../build/ui_printoptions.h" line="150"/>
-        <source>&amp;Table print</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../build/ui_printoptions.h" line="158"/>
-        <source>One dive per page</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../build/ui_printoptions.h" line="159"/>
-        <source>Two dives per page</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/printoptions.ui" line="29"/>
+        <location filename="../build/ui_printoptions.h" line="148"/>
+        <source>Print type</source>
+        <translation>Vrsta ispisa</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/printoptions.ui" line="41"/>
@@ -6749,10 +6876,19 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/printoptions.ui" line="29"/>
-        <location filename="../build/ui_printoptions.h" line="148"/>
-        <source>Print type</source>
-        <translation>Vrsta ispisa</translation>
+        <location filename="../build/ui_printoptions.h" line="150"/>
+        <source>&amp;Table print</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../build/ui_printoptions.h" line="158"/>
+        <source>One dive per page</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../build/ui_printoptions.h" line="159"/>
+        <source>Two dives per page</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/printoptions.cpp" line="128"/>
@@ -6794,103 +6930,103 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="755"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="752"/>
         <source>Show NDL / TTS was disabled because of excessive processing time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1344"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1338"/>
         <source>Make first divecomputer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1346"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1340"/>
         <source>Delete this divecomputer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1360"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1354"/>
         <source>Add gas change</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1363"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1357"/>
         <source> (Tank %1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1371"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1365"/>
         <source>Add set-point change</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1373"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1367"/>
         <source>Add bookmark</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1377"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1371"/>
         <source>Edit the profile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1381"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1375"/>
         <source>Remove event</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1386"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1380"/>
         <source>Hide similar events</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1393"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1387"/>
         <source>Edit name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1422"/>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1429"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1416"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1423"/>
         <source>Adjust pressure of tank %1 (currently interpolated as %2)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1444"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1438"/>
         <source>Unhide all events</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1479"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1473"/>
         <source>Hide events</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1479"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1473"/>
         <source>Hide all %1 events?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1514"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1508"/>
         <source>Remove the selected event?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1515"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1509"/>
         <source>%1 @ %2:%3</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1638"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1632"/>
         <source>Edit name of bookmark</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1639"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1633"/>
         <source>Custom name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1644"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1638"/>
         <source>Name is too long!</source>
         <translation type="unfinished"/>
     </message>
@@ -6898,91 +7034,101 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>QMLManager</name>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="95"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="97"/>
         <source>Starting...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="202"/>
         <source>working in no-cloud mode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="213"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="216"/>
         <source>no cloud credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="214"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="270"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="217"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="269"/>
         <source>Please enter valid cloud credentials.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="285"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="284"/>
         <source>Attempting to open cloud storage with new credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="304"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="306"/>
         <source>Testing cloud credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="331"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="320"/>
+        <source>No response from cloud server to validate the credentials</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="329"/>
+        <source>Cannot connect to cloud storage - cloud account not verified</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="361"/>
         <source>Cloud credentials are invalid</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="344"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="374"/>
         <source>Cannot open cloud storage: Error creating https connection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="357"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="387"/>
         <source>Cannot open cloud storage: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="369"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="399"/>
         <source>Cannot connect to cloud storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="411"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="441"/>
         <source>Cloud storage error: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="501"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="531"/>
         <source>Failed to connect to cloud server, reverting to no cloud status</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="520"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="550"/>
         <source>Cloud storage open successfully. No dives in dive list.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="689"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="690"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="721"/>
         <source>h</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="689"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="690"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="691"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="721"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="722"/>
         <source>min</source>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="689"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/>
         <source>sec</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="1041"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="1102"/>
         <source>Unknown GPS location</source>
         <translation type="unfinished"/>
     </message>
@@ -6990,126 +7136,126 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../core/qthelper.cpp" line="866"/>
-        <location filename="../core/qthelper.cpp" line="1214"/>
-        <source>AIR</source>
-        <translation>Zrak</translation>
+        <location filename="../core/gpslocation.h" line="13"/>
+        <source>Waiting to aquire GPS location</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="1214"/>
-        <source>OXYGEN</source>
-        <translation type="unfinished"/>
+        <location filename="../core/qthelper.cpp" line="766"/>
+        <location filename="../core/qthelper.cpp" line="1275"/>
+        <source>m</source>
+        <translation>m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="59"/>
-        <source>Remove this point</source>
-        <translation type="unfinished"/>
+        <location filename="../core/qthelper.cpp" line="768"/>
+        <location filename="../core/qthelper.cpp" line="1274"/>
+        <source>ft</source>
+        <translation>ft</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="32"/>
-        <source>Average</source>
-        <translation>Ø</translation>
+        <location filename="../core/qthelper.cpp" line="794"/>
+        <source>C</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="35"/>
-        <source>Minimum</source>
-        <translation>Min.</translation>
+        <location filename="../core/qthelper.cpp" line="796"/>
+        <source>F</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="38"/>
-        <source>Maximum</source>
-        <translation>Max.</translation>
+        <location filename="../core/qthelper.cpp" line="821"/>
+        <location filename="../core/qthelper.cpp" line="1250"/>
+        <source>kg</source>
+        <translation>kg</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/globe.cpp" line="327"/>
-        <source>Move the map and double-click to set the dive location</source>
-        <translation type="unfinished"/>
+        <location filename="../core/qthelper.cpp" line="823"/>
+        <location filename="../core/qthelper.cpp" line="1251"/>
+        <source>lbs</source>
+        <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="28"/>
-        <source>unknown</source>
-        <translation>nepoznato</translation>
+        <location filename="../core/qthelper.cpp" line="848"/>
+        <location filename="../core/qthelper.cpp" line="1300"/>
+        <source>bar</source>
+        <translation>bar</translation>
     </message>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="105"/>
-        <source>h:</source>
-        <translation type="unfinished"/>
+        <location filename="../core/qthelper.cpp" line="850"/>
+        <location filename="../core/qthelper.cpp" line="1299"/>
+        <source>psi</source>
+        <translation>psi</translation>
     </message>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="105"/>
-        <source>min</source>
-        <translation>min</translation>
+        <location filename="../core/qthelper.cpp" line="871"/>
+        <location filename="../core/qthelper.cpp" line="1235"/>
+        <source>AIR</source>
+        <translation>Zrak</translation>
     </message>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="337"/>
-        <source>Multiple</source>
+        <location filename="../core/qthelper.cpp" line="873"/>
+        <source>EAN</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="../core/qthelper.cpp" line="957"/>
+        <location filename="../core/qthelper.cpp" line="962"/>
         <source>(%n dive(s))</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="816"/>
-        <location filename="../core/qthelper.cpp" line="1228"/>
-        <source>kg</source>
-        <translation>kg</translation>
+        <location filename="../core/qthelper.cpp" line="1235"/>
+        <source>OXYGEN</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="818"/>
-        <location filename="../core/qthelper.cpp" line="1229"/>
-        <source>lbs</source>
-        <translation>lbs</translation>
+        <location filename="../core/qthelper.cpp" line="1322"/>
+        <source>l</source>
+        <translation>l</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="763"/>
-        <location filename="../core/qthelper.cpp" line="1252"/>
-        <source>ft</source>
-        <translation>ft</translation>
+        <location filename="../core/qthelper.cpp" line="1323"/>
+        <source>cuft</source>
+        <translation>cuft</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="761"/>
-        <location filename="../core/qthelper.cpp" line="1253"/>
-        <source>m</source>
-        <translation>m</translation>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="29"/>
+        <source>unknown</source>
+        <translation>nepoznato</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="789"/>
-        <source>C</source>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="114"/>
+        <source>h:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="791"/>
-        <source>F</source>
-        <translation type="unfinished"/>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="114"/>
+        <source>min</source>
+        <translation>min</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="845"/>
-        <location filename="../core/qthelper.cpp" line="1275"/>
-        <source>psi</source>
-        <translation>psi</translation>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="63"/>
+        <source>Remove this point</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="843"/>
-        <location filename="../core/qthelper.cpp" line="1276"/>
-        <source>bar</source>
-        <translation>bar</translation>
+        <location filename="../desktop-widgets/globe.cpp" line="327"/>
+        <source>Move the map and double-click to set the dive location</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="868"/>
-        <source>EAN</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="32"/>
+        <source>Average</source>
+        <translation>Ø</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="1298"/>
-        <source>l</source>
-        <translation>l</translation>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="35"/>
+        <source>Minimum</source>
+        <translation>Min.</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="1299"/>
-        <source>cuft</source>
-        <translation>cuft</translation>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="38"/>
+        <source>Maximum</source>
+        <translation>Max.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="625"/>
@@ -7131,17 +7277,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <source>Malformed XML response. Line %1: %2</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../core/gpslocation.h" line="13"/>
-        <source>Waiting to aquire GPS location</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>ReadSettingsThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1651"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1676"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1640"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1665"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation type="unfinished"/>
     </message>
@@ -7170,7 +7311,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ResetSettingsThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1775"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1764"/>
         <source>Reset settings failed!</source>
         <translation type="unfinished"/>
     </message>
@@ -7208,6 +7349,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ShiftImageTimesDialog</name>
     <message>
+        <location filename="../desktop-widgets/shiftimagetimes.ui" line="23"/>
+        <location filename="../build/ui_shiftimagetimes.h" line="184"/>
+        <source>Shift selected image times</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/shiftimagetimes.ui" line="34"/>
         <location filename="../build/ui_shiftimagetimes.h" line="185"/>
         <source>Shift times of image(s) by</source>
@@ -7220,12 +7367,6 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/shiftimagetimes.ui" line="23"/>
-        <location filename="../build/ui_shiftimagetimes.h" line="184"/>
-        <source>Shift selected image times</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/shiftimagetimes.ui" line="105"/>
         <location filename="../build/ui_shiftimagetimes.h" line="187"/>
         <source>Earlier</source>
@@ -7275,12 +7416,12 @@ Not all images have timestamps in the range between
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="297"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="296"/>
         <source>Open image file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="299"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="298"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation type="unfinished"/>
     </message>
@@ -7438,49 +7579,49 @@ Not all images have timestamps in the range between
 <context>
     <name>SocialNetworkDialog</name>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="339"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="284"/>
         <source>Dive date: %1 
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="342"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="287"/>
         <source>Duration: %1 
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="343"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="288"/>
         <source>h:</source>
         <comment>abbreviation for hours plus separator</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="344"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="289"/>
         <source>min</source>
         <comment>abbreviation for minutes</comment>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="347"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="292"/>
         <source>Dive location: %1 
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="350"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="295"/>
         <source>Buddy: %1 
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="353"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="298"/>
         <source>Divemaster: %1 
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="356"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="301"/>
         <source>
 %1</source>
         <translation type="unfinished"/>
@@ -7565,9 +7706,20 @@ Not all images have timestamps in the range between
     <name>StartPage</name>
     <message>
         <location filename="../mobile-widgets/qml/StartPage.qml" line="19"/>
-        <source>To use Subsurface-mobile with Subsurface cloud storage, please enteryour cloud credentials.
+        <source>To use Subsurface-mobile with Subsurface cloud storage, please enter your cloud credentials.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/StartPage.qml" line="20"/>
+        <source>If this is the first time you use Subsurface cloud storage, enter a valid email (all lower case) and a password of your choice (letters and numbers). The server will send a PIN to the email address provided that you will have to enter here.
 
-To use Subsurface-mobile only with local data on this device, tap on the no cloud icon below.</source>
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/StartPage.qml" line="23"/>
+        <source>To use Subsurface-mobile only with local data on this device, tap on the no cloud icon below.</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -7606,7 +7758,12 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>SubsurfaceWebServices</name>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="419"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="395"/>
+        <source>Enter User ID and click Download</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="417"/>
         <source>Webservice</source>
         <translation>Web servis</translation>
     </message>
@@ -7631,30 +7788,25 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="557"/>
-        <source>Download successful</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="551"/>
         <source>Invalid user identifier!</source>
         <translation>Neispravna korisnička oznaka</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="397"/>
-        <source>Enter User ID and click Download</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="554"/>
         <source>Cannot parse response!</source>
         <translation>Ne mogu obraditi odziv</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="557"/>
+        <source>Download successful</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>SuitFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="674"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="672"/>
         <source>Suits: </source>
         <translation type="unfinished"/>
     </message>
@@ -7662,7 +7814,7 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>SuitsFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="123"/>
+        <location filename="../qt-models/filtermodels.cpp" line="128"/>
         <source>No suit set</source>
         <translation type="unfinished"/>
     </message>
@@ -7681,7 +7833,7 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>TagFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="595"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="593"/>
         <source>Tags: </source>
         <translation type="unfinished"/>
     </message>
@@ -7689,7 +7841,7 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>TagFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="148"/>
+        <location filename="../qt-models/filtermodels.cpp" line="153"/>
         <source>Empty tags</source>
         <translation type="unfinished"/>
     </message>
@@ -7715,6 +7867,11 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>TemplateEdit</name>
     <message>
+        <location filename="../desktop-widgets/templateedit.ui" line="14"/>
+        <source>Edit template</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/templateedit.ui" line="37"/>
         <source>Preview</source>
         <translation type="unfinished"/>
@@ -7760,11 +7917,6 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/templateedit.ui" line="14"/>
-        <source>Edit template</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/templateedit.ui" line="165"/>
         <source>Color palette</source>
         <translation type="unfinished"/>
@@ -7946,85 +8098,12 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>TextHyperlinkEventFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="817"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="815"/>
         <source>%1click to visit %2</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>ThemeTest</name>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="29"/>
-        <source>Theme Information</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="33"/>
-        <source>Screen</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="42"/>
-        <source>Geometry (pixels):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="49"/>
-        <source>Geometry (gridUnits):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="56"/>
-        <source>Units.gridUnit:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="63"/>
-        <source>Units.devicePixelRatio:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="70"/>
-        <source>Font Metrics</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="76"/>
-        <source>FontMetrics pointSize:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="83"/>
-        <source>FontMetrics pixelSize:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="90"/>
-        <source>FontMetrics devicePixelRatio:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="97"/>
-        <source>Text item pixelSize:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="104"/>
-        <source>Text item pointSize:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="111"/>
-        <source>Pixel density:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="118"/>
-        <source>Height of default font:</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
     <name>ToolTipItem</name>
     <message>
         <location filename="../profile-widget/divetooltipitem.cpp" line="136"/>
@@ -8035,102 +8114,107 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>TripItem</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="67"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="68"/>
         <source>(%1 shown)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="194"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
         <source>#</source>
         <translation>Br.</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="197"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="215"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="200"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="218"/>
         <source>Rating</source>
         <translation>Ocjena</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
         <source>Depth(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="206"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="224"/>
         <source>Duration</source>
         <translation>Trajanje</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="209"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="227"/>
         <source>Temp(%1%2)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
         <source>Weight(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="215"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="233"/>
         <source>Suit</source>
         <translation>Odijelo</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="218"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="236"/>
         <source>Cyl</source>
         <translation>Boca</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="239"/>
         <source>Gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="244"/>
         <source>SAC(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="244"/>
         <source>/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="229"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="247"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="232"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="250"/>
         <source>Max CNS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="235"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="253"/>
+        <source>Photos before/during/after dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="256"/>
         <source>Location</source>
         <translation>Lokacija</translation>
     </message>
@@ -8153,72 +8237,73 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>UpdateManager</name>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="69"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="61"/>
         <source>Check for updates.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="70"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="62"/>
         <source>Subsurface was unable to check for updates.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="75"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="67"/>
         <source>The following error occurred:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="76"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="68"/>
         <source>Please check your internet connection.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="86"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="78"/>
         <source>You are using the latest version of Subsurface.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="89"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="81"/>
         <source>A new version of Subsurface is available.&lt;br/&gt;Click on:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; to download it.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="95"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="87"/>
         <source>A new version of Subsurface is available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="96"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="88"/>
         <source>Latest version is %1, please check %2 our download page %3 for information in how to update.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="106"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="98"/>
         <source>Newest release version is </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="107"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="99"/>
         <source>The server returned the following information:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="125"/>
-        <source>Subsurface is checking every two weeks if a new version is available. If you don&apos;t want Subsurface to continue checking, please click Decline.</source>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="117"/>
+        <source>Subsurface is checking every two weeks if a new version is available. 
+ If you don&apos;t want Subsurface to continue checking, please click Decline.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="126"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="119"/>
         <source>Decline</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="127"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="120"/>
         <source>Accept</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="129"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="122"/>
         <source>Automatic check for updates</source>
         <translation type="unfinished"/>
     </message>
@@ -8240,24 +8325,6 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>UserSurvey</name>
     <message>
-        <location filename="../desktop-widgets/usersurvey.ui" line="44"/>
-        <location filename="../build/ui_usersurvey.h" line="151"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;We would love to learn more about our users, their preferences and their usage habits. Please spare a minute to fill out this form and submit it to the Subsurface team.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/usersurvey.ui" line="115"/>
-        <location filename="../build/ui_usersurvey.h" line="156"/>
-        <source>Other software/sources</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/usersurvey.ui" line="128"/>
-        <location filename="../build/ui_usersurvey.h" line="157"/>
-        <source>Manually entering dives</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="14"/>
         <location filename="../build/ui_usersurvey.h" line="149"/>
         <source>User survey</source>
@@ -8270,6 +8337,12 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/usersurvey.ui" line="44"/>
+        <location filename="../build/ui_usersurvey.h" line="151"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;We would love to learn more about our users, their preferences and their usage habits. Please spare a minute to fill out this form and submit it to the Subsurface team.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="63"/>
         <location filename="../build/ui_usersurvey.h" line="152"/>
         <source>Technical diver</source>
@@ -8294,6 +8367,18 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/usersurvey.ui" line="115"/>
+        <location filename="../build/ui_usersurvey.h" line="156"/>
+        <source>Other software/sources</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/usersurvey.ui" line="128"/>
+        <location filename="../build/ui_usersurvey.h" line="157"/>
+        <source>Manually entering dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="141"/>
         <location filename="../build/ui_usersurvey.h" line="158"/>
         <source>Android/iPhone companion app</source>
@@ -8324,6 +8409,11 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/usersurvey.cpp" line="18"/>
+        <source>Send</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/usersurvey.cpp" line="43"/>
         <source>
 Operating system: %1</source>
@@ -8363,18 +8453,13 @@ Language: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/usersurvey.cpp" line="101"/>
-        <source>Submit user survey.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/usersurvey.cpp" line="82"/>
         <source>Ask again?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/usersurvey.cpp" line="18"/>
-        <source>Send</source>
+        <location filename="../desktop-widgets/usersurvey.cpp" line="101"/>
+        <source>Submit user survey.</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -8467,12 +8552,12 @@ Language: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="324"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="325"/>
         <source>Operation timed out</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="345"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="346"/>
         <source>Transferring data...</source>
         <translation type="unfinished"/>
     </message>
@@ -8507,16 +8592,16 @@ Language: %1</source>
 <context>
     <name>WriteSettingsThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1702"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1709"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1718"/>
-        <source>Failed!</source>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1689"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1710"/>
+        <source>This feature is not yet available for the selected dive computer.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1700"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1721"/>
-        <source>This feature is not yet available for the selected dive computer.</source>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1691"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1698"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1707"/>
+        <source>Failed!</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -8633,7 +8718,7 @@ Maximum</source>
 <context>
     <name>getextFromC</name>
     <message>
-        <location filename="../core/libdivecomputer.c" line="674"/>
+        <location filename="../core/libdivecomputer.c" line="737"/>
         <source>Error parsing the header</source>
         <translation type="unfinished"/>
     </message>
@@ -8641,38 +8726,377 @@ Maximum</source>
 <context>
     <name>gettextFromC</name>
     <message>
+        <location filename="../core/cochran.c" line="309"/>
+        <location filename="../core/cochran.c" line="315"/>
+        <location filename="../core/cochran.c" line="385"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>deco stop</source>
+        <translation>deko zastoj</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="336"/>
+        <location filename="../core/cochran.c" line="390"/>
+        <location filename="../core/file.c" line="777"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>ascent</source>
+        <translation>izron</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="342"/>
+        <location filename="../core/file.c" line="755"/>
+        <source>battery</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="348"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
+        <source>OLF</source>
+        <translation>OLF</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="353"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
+        <source>maxdepth</source>
+        <translation>Max dubina</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="358"/>
+        <location filename="../core/cochran.c" line="404"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
+        <source>pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="365"/>
+        <location filename="../core/cochran.c" line="414"/>
+        <location filename="../core/cochran.c" line="421"/>
+        <location filename="../core/file.c" line="868"/>
+        <location filename="../core/libdivecomputer.c" line="225"/>
+        <location filename="../core/libdivecomputer.c" line="228"/>
+        <source>gaschange</source>
+        <translation>promjena plina</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="370"/>
+        <location filename="../core/cochran.c" line="409"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>rbt</source>
+        <translation>rbt</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="379"/>
+        <location filename="../core/cochran.c" line="426"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>ceiling</source>
+        <translation>strop</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="395"/>
+        <location filename="../core/libdivecomputer.c" line="224"/>
+        <source>transmitter</source>
+        <translation>odašiljač</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="153"/>
+        <source>Error: the file does not appear to be a DATATRAK divelog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="286"/>
+        <source>clear</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="289"/>
+        <source>misty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="292"/>
+        <source>fog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="295"/>
+        <source>rain</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="298"/>
+        <source>storm</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="301"/>
+        <source>snow</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="321"/>
+        <source>No suit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="324"/>
+        <source>Shorty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="327"/>
+        <source>Combi</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="330"/>
+        <source>Wet suit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="333"/>
+        <source>Semidry suit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="336"/>
+        <source>Dry suit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="396"/>
+        <source>no stop</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="398"/>
+        <location filename="../core/dive.c" line="29"/>
+        <source>deco</source>
+        <translation>deko</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="400"/>
+        <source>single ascent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="402"/>
+        <source>multiple ascent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="404"/>
+        <location filename="../core/dive.c" line="27"/>
+        <source>fresh</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="406"/>
+        <source>salt water</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="431"/>
+        <source>sight seeing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="433"/>
+        <source>club dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="435"/>
+        <location filename="../core/dive.c" line="28"/>
+        <source>instructor</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="437"/>
+        <source>instruction</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="439"/>
+        <location filename="../core/dive.c" line="27"/>
+        <source>night</source>
+        <translation>noć</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="441"/>
+        <location filename="../core/dive.c" line="25"/>
+        <source>cave</source>
+        <translation>špilja</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="443"/>
+        <location filename="../core/dive.c" line="24"/>
+        <source>ice</source>
+        <translation>led</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="445"/>
+        <source>search</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="455"/>
+        <location filename="../core/dive.c" line="25"/>
+        <source>wreck</source>
+        <translation>olupina</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="457"/>
+        <location filename="../core/dive.c" line="26"/>
+        <source>river</source>
+        <translation>rijeka</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="459"/>
+        <location filename="../core/dive.c" line="23"/>
+        <source>drift</source>
+        <translation>drift</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="461"/>
+        <location filename="../core/dive.c" line="28"/>
+        <source>photo</source>
+        <translation>fotografija</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="463"/>
+        <source>other</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="474"/>
+        <source>Other activities</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="498"/>
+        <source>Datatrak/Wlog notes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="537"/>
+        <source>Manually entered dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="588"/>
+        <source>Unknown</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="674"/>
+        <source>Error: couldn&apos;t open the file %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="687"/>
+        <source>Error: no dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="23"/>
+        <source>boat</source>
+        <translation>brod</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="23"/>
+        <source>shore</source>
+        <translation>obala</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="24"/>
+        <source>deep</source>
+        <translation>dubok</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="24"/>
+        <source>cavern</source>
+        <translation>pećina</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="25"/>
+        <source>altitude</source>
+        <translation>nadmorska visina</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="26"/>
+        <source>pool</source>
+        <translation>bazen</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="26"/>
+        <source>lake</source>
+        <translation>jezero</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="27"/>
+        <source>student</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="28"/>
+        <source>video</source>
+        <translation>video</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="33"/>
+        <source>OC-gas</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="33"/>
+        <source>diluent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="33"/>
+        <location filename="../core/equipment.c" line="88"/>
+        <location filename="../core/planner.c" line="1436"/>
+        <location filename="../core/planner.c" line="1439"/>
+        <source>oxygen</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../core/dive.c" line="181"/>
         <source>pascal</source>
         <translation>Pa</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="186"/>
-        <location filename="../core/qthelper.cpp" line="669"/>
+        <location filename="../core/qthelper.cpp" line="674"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="190"/>
-        <location filename="../core/qthelper.cpp" line="672"/>
+        <location filename="../core/qthelper.cpp" line="677"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
+        <location filename="../core/dive.c" line="227"/>
+        <source>ℓ</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../core/dive.c" line="232"/>
         <source>cuft</source>
         <translation>cuft</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="269"/>
-        <location filename="../core/qthelper.cpp" line="590"/>
-        <location filename="../core/qthelper.cpp" line="605"/>
+        <location filename="../core/qthelper.cpp" line="595"/>
+        <location filename="../core/qthelper.cpp" line="610"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="274"/>
-        <location filename="../core/qthelper.cpp" line="593"/>
-        <location filename="../core/qthelper.cpp" line="607"/>
+        <location filename="../core/qthelper.cpp" line="598"/>
+        <location filename="../core/qthelper.cpp" line="612"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
@@ -8698,53 +9122,58 @@ Maximum</source>
     </message>
     <message>
         <location filename="../core/dive.c" line="325"/>
-        <location filename="../core/qthelper.cpp" line="616"/>
-        <location filename="../core/qthelper.cpp" line="626"/>
+        <location filename="../core/qthelper.cpp" line="621"/>
+        <location filename="../core/qthelper.cpp" line="631"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="329"/>
-        <location filename="../core/qthelper.cpp" line="614"/>
-        <location filename="../core/qthelper.cpp" line="624"/>
+        <location filename="../core/qthelper.cpp" line="619"/>
+        <location filename="../core/qthelper.cpp" line="629"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="1772"/>
+        <location filename="../core/dive.c" line="1751"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) ili (%s)</translation>
     </message>
     <message>
-        <location filename="../core/divelist.c" line="484"/>
+        <location filename="../core/divelist.c" line="487"/>
         <location filename="../core/equipment.c" line="84"/>
-        <location filename="../core/planner.c" line="1411"/>
-        <location filename="../core/planner.c" line="1414"/>
+        <location filename="../core/planner.c" line="1432"/>
+        <location filename="../core/planner.c" line="1435"/>
         <source>air</source>
         <translation>zrak</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="197"/>
+        <location filename="../core/equipment.c" line="86"/>
+        <source>EAN%d</source>
+        <translation>EAN%d</translation>
+    </message>
+    <message>
+        <location filename="../core/equipment.c" line="198"/>
         <source>integrated</source>
         <translation>integrirani</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="198"/>
+        <location filename="../core/equipment.c" line="199"/>
         <source>belt</source>
         <translation>pojas</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="199"/>
+        <location filename="../core/equipment.c" line="200"/>
         <source>ankle</source>
         <translation>gležanj</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="200"/>
+        <location filename="../core/equipment.c" line="201"/>
         <source>backplate weight</source>
         <translation>backplate olova</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="201"/>
+        <location filename="../core/equipment.c" line="202"/>
         <source>clip-on</source>
         <translation>clip-on</translation>
     </message>
@@ -8757,8 +9186,8 @@ Maximum</source>
         <location filename="../core/file.c" line="121"/>
         <location filename="../core/file.c" line="512"/>
         <location filename="../core/file.c" line="597"/>
-        <location filename="../core/file.c" line="924"/>
-        <location filename="../core/file.c" line="1056"/>
+        <location filename="../core/file.c" line="909"/>
+        <location filename="../core/file.c" line="1092"/>
         <location filename="../core/ostctools.c" line="80"/>
         <source>Failed to read &apos;%s&apos;</source>
         <translation>Nije uspjelo čitanje &apos;%s&apos;</translation>
@@ -8816,707 +9245,721 @@ Maximum</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/file.c" line="887"/>
-        <source>No matching DC found for file &apos;%s&apos;</source>
+        <location filename="../core/git-access.c" line="134"/>
+        <source>Local cache directory %s corrupted - can&apos;t sync with Subsurface cloud storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>none</source>
-        <translation>nijedan</translation>
+        <location filename="../core/git-access.c" line="157"/>
+        <location filename="../core/git-access.c" line="177"/>
+        <source>Could not update local cache to newer remote data</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="309"/>
-        <location filename="../core/cochran.c" line="315"/>
-        <location filename="../core/cochran.c" line="385"/>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>deco stop</source>
-        <translation>deko zastoj</translation>
+        <location filename="../core/git-access.c" line="170"/>
+        <source>Subsurface cloud storage corrupted</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="342"/>
-        <location filename="../core/file.c" line="755"/>
-        <source>battery</source>
+        <location filename="../core/git-access.c" line="284"/>
+        <source>Could not update Subsurface cloud storage, try again later</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="370"/>
-        <location filename="../core/cochran.c" line="409"/>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>rbt</source>
-        <translation>rbt</translation>
+        <location filename="../core/git-access.c" line="344"/>
+        <source>Remote storage and local data diverged. Error: merge failed (%s)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="336"/>
-        <location filename="../core/cochran.c" line="390"/>
-        <location filename="../core/file.c" line="777"/>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>ascent</source>
-        <translation>izron</translation>
+        <location filename="../core/git-access.c" line="374"/>
+        <source>Remote storage and local data diverged. Cannot combine local and remote changes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="379"/>
-        <location filename="../core/cochran.c" line="426"/>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>ceiling</source>
-        <translation>strop</translation>
+        <location filename="../core/git-access.c" line="408"/>
+        <source>Remote storage and local data diverged</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>workload</source>
-        <translation>opterećenje</translation>
+        <location filename="../core/git-access.c" line="411"/>
+        <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="395"/>
-        <location filename="../core/libdivecomputer.c" line="203"/>
-        <source>transmitter</source>
-        <translation>odašiljač</translation>
+        <location filename="../core/git-access.c" line="420"/>
+        <source>Problems with local cache of Subsurface cloud data</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/git-access.c" line="421"/>
+        <source>Moved cache data to %s. Please try the operation again.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="203"/>
+        <location filename="../core/git-access.c" line="743"/>
+        <source>Error connecting to Subsurface cloud storage</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/git-access.c" line="746"/>
+        <source>git clone of %s failed (%s)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="210"/>
+        <location filename="../core/parse-xml.c" line="3317"/>
+        <location filename="../core/uemis-downloader.c" line="134"/>
+        <source>unknown</source>
+        <translation>nepoznato</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>none</source>
+        <translation>nijedan</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>workload</source>
+        <translation>opterećenje</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="224"/>
         <source>violation</source>
         <translation>povreda</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="203"/>
+        <location filename="../core/libdivecomputer.c" line="224"/>
         <source>bookmark</source>
         <translation>bookmark</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="203"/>
+        <location filename="../core/libdivecomputer.c" line="224"/>
         <source>surface</source>
         <translation>površina</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="203"/>
+        <location filename="../core/libdivecomputer.c" line="224"/>
         <source>safety stop</source>
         <translation>sigurnosna stanka</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="365"/>
-        <location filename="../core/cochran.c" line="414"/>
-        <location filename="../core/cochran.c" line="421"/>
-        <location filename="../core/file.c" line="868"/>
-        <location filename="../core/libdivecomputer.c" line="204"/>
-        <location filename="../core/libdivecomputer.c" line="207"/>
-        <source>gaschange</source>
-        <translation>promjena plina</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="204"/>
+        <location filename="../core/libdivecomputer.c" line="225"/>
         <source>safety stop (voluntary)</source>
         <translation>sigurnosna stanka (opcionalna)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="204"/>
+        <location filename="../core/libdivecomputer.c" line="225"/>
         <source>safety stop (mandatory)</source>
         <translation>sigurnosna stanka (obavezna)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="205"/>
+        <location filename="../core/libdivecomputer.c" line="226"/>
         <source>deepstop</source>
         <translation>dubinska stanka</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="205"/>
+        <location filename="../core/libdivecomputer.c" line="226"/>
         <source>ceiling (safety stop)</source>
         <translation>strop (sigurnosni zastoj)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="205"/>
-        <source>divetime</source>
-        <translation>trajanje urona</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="205"/>
+        <location filename="../core/libdivecomputer.c" line="226"/>
         <source>below floor</source>
         <comment>event showing dive is below deco floor and adding deco time</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="353"/>
-        <location filename="../core/libdivecomputer.c" line="206"/>
-        <source>maxdepth</source>
-        <translation>Max dubina</translation>
-    </message>
-    <message>
-        <location filename="../core/cochran.c" line="348"/>
-        <location filename="../core/libdivecomputer.c" line="206"/>
-        <source>OLF</source>
-        <translation>OLF</translation>
+        <location filename="../core/libdivecomputer.c" line="226"/>
+        <source>divetime</source>
+        <translation>trajanje urona</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="206"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
         <source>airtime</source>
         <translation>preostalo trajanje zraka</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="206"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
         <source>rgbm</source>
         <translation>rgbm</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="206"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
         <source>heading</source>
         <translation>kurs</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="358"/>
-        <location filename="../core/cochran.c" line="404"/>
-        <location filename="../core/libdivecomputer.c" line="206"/>
-        <source>pO₂</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="207"/>
+        <location filename="../core/libdivecomputer.c" line="228"/>
         <source>tissue level warning</source>
         <translation>upozorenje tkivo</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="207"/>
+        <location filename="../core/libdivecomputer.c" line="228"/>
         <source>non stop time</source>
         <translation>non stop vrijeme</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="224"/>
+        <location filename="../core/libdivecomputer.c" line="237"/>
         <source>invalid event number</source>
         <translation>neispravan broj događaja</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="658"/>
-        <source>Unable to create parser for %s %s</source>
-        <translation>Ne mogu kreirati parser za %s %s</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="664"/>
-        <source>Error registering the data</source>
-        <translation>Greška pri registraciji podataka</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="495"/>
+        <location filename="../core/libdivecomputer.c" line="553"/>
         <source>Error parsing the datetime</source>
         <translation>Greška pri parsiranju datuma i vremena</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="513"/>
+        <location filename="../core/libdivecomputer.c" line="571"/>
         <source>Dive %d: %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="519"/>
+        <location filename="../core/libdivecomputer.c" line="577"/>
         <source>Error parsing the divetime</source>
         <translation>Greška pri parsiranju vremena urona</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="529"/>
+        <location filename="../core/libdivecomputer.c" line="587"/>
         <source>Error parsing the maxdepth</source>
         <translation>Greška pri parsiranju maksimalne dubine</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="548"/>
+        <location filename="../core/libdivecomputer.c" line="606"/>
         <source>Error parsing temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="568"/>
+        <location filename="../core/libdivecomputer.c" line="626"/>
         <source>Error parsing the gas mix count</source>
         <translation>Greška pri parsiranju broja mješavina</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="580"/>
+        <location filename="../core/libdivecomputer.c" line="638"/>
         <source>Error obtaining water salinity</source>
         <translation>Greška pri dohvaćanju saliniteta vode</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="589"/>
+        <location filename="../core/libdivecomputer.c" line="647"/>
         <source>Error obtaining surface pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="614"/>
+        <location filename="../core/libdivecomputer.c" line="672"/>
         <source>Error obtaining divemode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="634"/>
+        <location filename="../core/libdivecomputer.c" line="692"/>
         <source>Error parsing the gas mix</source>
         <translation>Greška pri parsiranju mješavine plinova</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="684"/>
+        <location filename="../core/libdivecomputer.c" line="717"/>
+        <source>Unable to create parser for %s %s</source>
+        <translation>Ne mogu kreirati parser za %s %s</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="723"/>
+        <source>Error registering the data</source>
+        <translation>Greška pri registraciji podataka</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="744"/>
         <source>Error parsing the samples</source>
         <translation>Greška pri parsiranju uzoraka</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="822"/>
+        <location filename="../core/libdivecomputer.c" line="882"/>
         <source>Event: waiting for user action</source>
         <translation>Događaj: čekanje na korisničku akciju</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="830"/>
+        <location filename="../core/libdivecomputer.c" line="890"/>
         <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="../core/libdivecomputer.c" line="894"/>
+        <location filename="../core/libdivecomputer.c" line="954"/>
         <source>Error registering the event handler.</source>
         <translation>Greška pri registraciji event handlera.</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="899"/>
+        <location filename="../core/libdivecomputer.c" line="959"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Greška pri registraciji cancellation handlera</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="920"/>
+        <location filename="../core/libdivecomputer.c" line="980"/>
         <source>Dive data import error</source>
         <translation>Greška pri uvozu podataka</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="959"/>
+        <location filename="../core/libdivecomputer.c" line="1019"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Ne mogu kreirati libdivecomputer kontekst</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="966"/>
+        <location filename="../core/libdivecomputer.c" line="1026"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Nije uspjelo otvaranje %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="992"/>
+        <location filename="../core/libdivecomputer.c" line="1048"/>
         <source>Insufficient privileges to open the device %s %s (%s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/parse-xml.c" line="517"/>
-        <source>Strange percentage reading %s
+        <location filename="../core/load-git.c" line="194"/>
+        <location filename="../core/parse-xml.c" line="1242"/>
+        <source>multiple GPS locations for this dive site; also %s
 </source>
-        <translation>Neobično očitanje postotka %s
-</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/load-git.c" line="194"/>
-        <location filename="../core/parse-xml.c" line="1238"/>
-        <source>multiple GPS locations for this dive site; also %s
+        <location filename="../core/load-git.c" line="222"/>
+        <location filename="../core/parse-xml.c" line="1304"/>
+        <source>additional name for site: %s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/parse-xml.c" line="2044"/>
+        <location filename="../core/ostctools.c" line="120"/>
+        <location filename="../core/ostctools.c" line="152"/>
+        <source>Unknown DC in dive %d</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/ostctools.c" line="165"/>
+        <source>Error - %s - parsing dive %d</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/parse-xml.c" line="517"/>
+        <source>Strange percentage reading %s
+</source>
+        <translation>Neobično očitanje postotka %s
+</translation>
+    </message>
+    <message>
+        <location filename="../core/parse-xml.c" line="2051"/>
         <source>Failed to parse &apos;%s&apos;</source>
         <translation>Nije uspjelo parsiranje &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../core/parse-xml.c" line="3741"/>
+        <location filename="../core/parse-xml.c" line="3774"/>
         <source>Can&apos;t open stylesheet %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="86"/>
-        <source>EAN%d</source>
-        <translation>EAN%d</translation>
+        <location filename="../core/planner.c" line="555"/>
+        <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE %s ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="1032"/>
-        <location filename="../core/planner.c" line="1184"/>
-        <source>Can&apos;t find gas %s</source>
+        <location filename="../core/planner.c" line="569"/>
+        <source>Decompression calculation aborted due to excessive time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="368"/>
-        <source>Too many gas mixes</source>
-        <translation>Previše mješavina plinova</translation>
+        <location filename="../core/planner.c" line="571"/>
+        <location filename="../core/planner.c" line="829"/>
+        <location filename="../core/planner.c" line="834"/>
+        <location filename="../core/planner.c" line="860"/>
+        <location filename="../core/planner.c" line="870"/>
+        <source>Warning:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="568"/>
-        <source>Decompression calculation aborted due to excessive time</source>
+        <location filename="../core/planner.c" line="581"/>
+        <source>based on Bühlmann ZHL-16C with GFlow = %d and GFhigh = %d</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="592"/>
-        <source>Subsurface dive plan</source>
+        <location filename="../core/planner.c" line="586"/>
+        <source>based on VPM-B at nominal conservatism</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="596"/>
-        <source>depth</source>
+        <location filename="../core/planner.c" line="588"/>
+        <source>based on VPM-B at +%d conservatism</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="602"/>
-        <source>runtime</source>
+        <location filename="../core/planner.c" line="590"/>
+        <source>, effective GF=%d/%d</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="594"/>
+        <source>recreational mode based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="598"/>
+        <source>Subsurface dive plan</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../core/planner.c" line="599"/>
+        <source>&lt;div&gt;Runtime: %dmin&lt;/div&gt;&lt;br&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="604"/>
+        <source>depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="607"/>
         <source>duration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="554"/>
-        <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE %s ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source>
+        <location filename="../core/planner.c" line="610"/>
+        <source>runtime</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="605"/>
+        <location filename="../core/planner.c" line="613"/>
         <source>gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="648"/>
+        <location filename="../core/planner.c" line="656"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="656"/>
+        <location filename="../core/planner.c" line="664"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="669"/>
+        <location filename="../core/planner.c" line="677"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="676"/>
+        <location filename="../core/planner.c" line="684"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="721"/>
+        <location filename="../core/planner.c" line="729"/>
         <source>%3.0f%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="724"/>
-        <location filename="../core/planner.c" line="728"/>
+        <location filename="../core/planner.c" line="732"/>
+        <location filename="../core/planner.c" line="736"/>
         <source>%3dmin</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="737"/>
-        <location filename="../core/planner.c" line="749"/>
+        <location filename="../core/planner.c" line="745"/>
+        <location filename="../core/planner.c" line="757"/>
         <source>(SP = %.1fbar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="772"/>
+        <location filename="../core/planner.c" line="780"/>
         <source>Switch gas to %s (SP = %.1fbar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="774"/>
+        <location filename="../core/planner.c" line="782"/>
         <source>Switch gas to %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="793"/>
+        <location filename="../core/planner.c" line="801"/>
         <source>CNS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="795"/>
+        <location filename="../core/planner.c" line="803"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="799"/>
+        <location filename="../core/planner.c" line="807"/>
         <source>Gas consumption (CCR legs excluded):</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="801"/>
+        <location filename="../core/planner.c" line="809"/>
         <source>Gas consumption:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="570"/>
-        <location filename="../core/planner.c" line="821"/>
-        <location filename="../core/planner.c" line="826"/>
-        <location filename="../core/planner.c" line="851"/>
-        <location filename="../core/planner.c" line="861"/>
-        <source>Warning:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="580"/>
-        <source>based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="584"/>
-        <source>based on VPM-B at nominal conservatism</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="586"/>
-        <source>based on VPM-B at +%d conservatism</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="588"/>
-        <source>recreational mode based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="822"/>
+        <location filename="../core/planner.c" line="830"/>
         <source>this is more gas than available in the specified cylinder!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="827"/>
+        <location filename="../core/planner.c" line="835"/>
         <source>not enough reserve for gas sharing on ascent!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="829"/>
+        <location filename="../core/planner.c" line="837"/>
         <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="831"/>
+        <location filename="../core/planner.c" line="839"/>
         <source>%.0f%s (%.0f%s during planned ascent) of %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="848"/>
+        <location filename="../core/planner.c" line="857"/>
         <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="858"/>
+        <location filename="../core/planner.c" line="867"/>
         <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="1419"/>
+        <location filename="../core/planner.c" line="1194"/>
+        <source>Can&apos;t find gas %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="1440"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1280"/>
+        <location filename="../core/profile.c" line="1298"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1283"/>
+        <location filename="../core/profile.c" line="1301"/>
         <source>P: %d%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1287"/>
+        <location filename="../core/profile.c" line="1305"/>
         <source>T: %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1293"/>
+        <location filename="../core/profile.c" line="1311"/>
         <source>V: %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1296"/>
+        <location filename="../core/profile.c" line="1314"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1298"/>
+        <location filename="../core/profile.c" line="1316"/>
         <source>CNS: %u%%
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1300"/>
+        <location filename="../core/profile.c" line="1318"/>
         <source>pO%s: %.2fbar
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1302"/>
+        <location filename="../core/profile.c" line="1320"/>
         <source>pN%s: %.2fbar
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1304"/>
+        <location filename="../core/profile.c" line="1322"/>
         <source>pHe: %.2fbar
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1307"/>
+        <location filename="../core/profile.c" line="1325"/>
         <source>MOD: %d%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1314"/>
+        <location filename="../core/profile.c" line="1332"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1318"/>
+        <location filename="../core/profile.c" line="1336"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1331"/>
+        <location filename="../core/profile.c" line="1349"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1334"/>
+        <location filename="../core/profile.c" line="1352"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1339"/>
+        <location filename="../core/profile.c" line="1357"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1342"/>
+        <location filename="../core/profile.c" line="1360"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1346"/>
+        <location filename="../core/profile.c" line="1364"/>
         <source>In deco
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1348"/>
+        <location filename="../core/profile.c" line="1366"/>
         <source>NDL: %umin
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1351"/>
+        <location filename="../core/profile.c" line="1369"/>
         <source>TTS: %umin
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1354"/>
+        <location filename="../core/profile.c" line="1372"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1362"/>
+        <location filename="../core/profile.c" line="1380"/>
         <source>In deco (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1365"/>
+        <location filename="../core/profile.c" line="1383"/>
         <source>NDL: %umin (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1367"/>
+        <location filename="../core/profile.c" line="1385"/>
         <source>NDL: &gt;2h (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1371"/>
+        <location filename="../core/profile.c" line="1389"/>
         <source>TTS: %umin (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1373"/>
+        <location filename="../core/profile.c" line="1391"/>
         <source>TTS: &gt;2h (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1376"/>
+        <location filename="../core/profile.c" line="1394"/>
         <source>RBT: %umin
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1379"/>
+        <location filename="../core/profile.c" line="1397"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1385"/>
+        <location filename="../core/profile.c" line="1403"/>
         <source>Tissue %.0fmin: %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1391"/>
+        <location filename="../core/profile.c" line="1409"/>
         <source>heartbeat: %d
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1393"/>
+        <location filename="../core/profile.c" line="1411"/>
         <source>bearing: %d
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1396"/>
+        <location filename="../core/profile.c" line="1414"/>
         <source>mean depth to here %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1491"/>
+        <location filename="../core/profile.c" line="1515"/>
         <source>%sT: %d:%02d min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1495"/>
-        <location filename="../core/profile.c" line="1499"/>
-        <location filename="../core/profile.c" line="1503"/>
+        <location filename="../core/profile.c" line="1519"/>
+        <location filename="../core/profile.c" line="1523"/>
+        <location filename="../core/profile.c" line="1527"/>
         <source>%s %sD:%.1f%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1507"/>
+        <location filename="../core/profile.c" line="1531"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1511"/>
+        <location filename="../core/profile.c" line="1535"/>
         <source>%s%sV:%.2f%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1515"/>
-        <location filename="../core/profile.c" line="1519"/>
+        <location filename="../core/profile.c" line="1539"/>
+        <location filename="../core/profile.c" line="1543"/>
         <source>%s %sV:%.2f%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1526"/>
+        <location filename="../core/profile.c" line="1550"/>
         <source>%s %sP:%d %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../core/profile.c" line="1575"/>
+        <source>%s SAC:%.*f %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../core/qthelper.cpp" line="67"/>
         <source>%1km</source>
         <translation type="unfinished"/>
@@ -9537,446 +9980,460 @@ EADD: %d%s
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="635"/>
+        <location filename="../core/qthelper.cpp" line="91"/>
+        <location filename="../core/qthelper.cpp" line="226"/>
+        <source>N</source>
+        <translation>N</translation>
+    </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="91"/>
+        <location filename="../core/qthelper.cpp" line="227"/>
+        <source>S</source>
+        <translation>S</translation>
+    </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="92"/>
+        <location filename="../core/qthelper.cpp" line="228"/>
+        <source>E</source>
+        <translation>E</translation>
+    </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="92"/>
+        <location filename="../core/qthelper.cpp" line="229"/>
+        <source>W</source>
+        <translation>W</translation>
+    </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="640"/>
         <source>C</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="638"/>
+        <location filename="../core/qthelper.cpp" line="643"/>
         <source>F</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/dive.c" line="23"/>
-        <source>boat</source>
-        <translation>brod</translation>
+        <location filename="../core/save-html.c" line="469"/>
+        <location filename="../core/save-html.c" line="553"/>
+        <location filename="../core/worldmap-save.c" line="111"/>
+        <source>Can&apos;t open file %s</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/dive.c" line="23"/>
-        <source>shore</source>
-        <translation>obala</translation>
+        <location filename="../core/save-html.c" line="488"/>
+        <source>Number</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="459"/>
-        <location filename="../core/dive.c" line="23"/>
-        <source>drift</source>
-        <translation>drift</translation>
+        <location filename="../core/save-html.c" line="489"/>
+        <source>Date</source>
+        <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="24"/>
-        <source>deep</source>
-        <translation>dubok</translation>
+        <location filename="../core/save-html.c" line="490"/>
+        <source>Time</source>
+        <translation>Vrijeme</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="24"/>
-        <source>cavern</source>
-        <translation>pećina</translation>
+        <location filename="../core/save-html.c" line="491"/>
+        <source>Location</source>
+        <translation>Lokacija</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="443"/>
-        <location filename="../core/dive.c" line="24"/>
-        <source>ice</source>
-        <translation>led</translation>
+        <location filename="../core/save-html.c" line="492"/>
+        <source>Air temp.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="445"/>
-        <source>search</source>
+        <location filename="../core/save-html.c" line="493"/>
+        <source>Water temp.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="455"/>
-        <location filename="../core/dive.c" line="25"/>
-        <source>wreck</source>
-        <translation>olupina</translation>
+        <location filename="../core/save-html.c" line="494"/>
+        <source>Dives</source>
+        <translation>Uroni</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="441"/>
-        <location filename="../core/dive.c" line="25"/>
-        <source>cave</source>
-        <translation>špilja</translation>
+        <location filename="../core/save-html.c" line="495"/>
+        <source>Expand all</source>
+        <translation>Otvori sve</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="25"/>
-        <source>altitude</source>
-        <translation>nadmorska visina</translation>
+        <location filename="../core/save-html.c" line="496"/>
+        <source>Collapse all</source>
+        <translation>Zatvori sve grupe</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="26"/>
-        <source>pool</source>
-        <translation>bazen</translation>
+        <location filename="../core/save-html.c" line="497"/>
+        <source>Trips</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/dive.c" line="26"/>
-        <source>lake</source>
-        <translation>jezero</translation>
+        <location filename="../core/save-html.c" line="498"/>
+        <source>Statistics</source>
+        <translation>Statistika</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="457"/>
-        <location filename="../core/dive.c" line="26"/>
-        <source>river</source>
-        <translation>rijeka</translation>
+        <location filename="../core/save-html.c" line="499"/>
+        <source>Advanced search</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="439"/>
-        <location filename="../core/dive.c" line="27"/>
-        <source>night</source>
-        <translation>noć</translation>
+        <location filename="../core/save-html.c" line="502"/>
+        <source>Rating</source>
+        <translation>Ocjena</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="153"/>
-        <source>Error: the file does not appear to be a DATATRAK divelog</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="503"/>
+        <source>Visibility</source>
+        <translation>Vidljivost</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="286"/>
-        <source>clear</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="504"/>
+        <source>Duration</source>
+        <translation>Trajanje</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="289"/>
-        <source>misty</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="505"/>
+        <source>Divemaster</source>
+        <translation>Voditelj</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="292"/>
-        <source>fog</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="506"/>
+        <source>Buddy</source>
+        <translation>Buddy</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="295"/>
-        <source>rain</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="507"/>
+        <source>Suit</source>
+        <translation>Odijelo</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="298"/>
-        <source>storm</source>
+        <location filename="../core/save-html.c" line="508"/>
+        <source>Tags</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="301"/>
-        <source>snow</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="509"/>
+        <location filename="../smtk-import/smartrak.c" line="251"/>
+        <location filename="../smtk-import/smartrak.c" line="321"/>
+        <source>Notes</source>
+        <translation>Bilješke</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="321"/>
-        <source>No suit</source>
+        <location filename="../core/save-html.c" line="510"/>
+        <source>Show more details</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="324"/>
-        <source>Shorty</source>
+        <location filename="../core/save-html.c" line="513"/>
+        <source>Yearly statistics</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="327"/>
-        <source>Combi</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="514"/>
+        <source>Year</source>
+        <translation>Godina</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="330"/>
-        <source>Wet suit</source>
+        <location filename="../core/save-html.c" line="515"/>
+        <source>Total time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="333"/>
-        <source>Semidry suit</source>
+        <location filename="../core/save-html.c" line="516"/>
+        <source>Average time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="336"/>
-        <source>Dry suit</source>
+        <location filename="../core/save-html.c" line="517"/>
+        <source>Shortest time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="396"/>
-        <source>no stop</source>
+        <location filename="../core/save-html.c" line="518"/>
+        <source>Longest time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="400"/>
-        <source>single ascent</source>
+        <location filename="../core/save-html.c" line="519"/>
+        <source>Average depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="402"/>
-        <source>multiple ascent</source>
+        <location filename="../core/save-html.c" line="520"/>
+        <source>Min. depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="404"/>
-        <location filename="../core/dive.c" line="27"/>
-        <source>fresh</source>
+        <location filename="../core/save-html.c" line="521"/>
+        <source>Max. depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="406"/>
-        <source>salt water</source>
+        <location filename="../core/save-html.c" line="522"/>
+        <source>Average SAC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="431"/>
-        <source>sight seeing</source>
+        <location filename="../core/save-html.c" line="523"/>
+        <source>Min. SAC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="433"/>
-        <source>club dive</source>
+        <location filename="../core/save-html.c" line="524"/>
+        <source>Max. SAC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="437"/>
-        <source>instruction</source>
+        <location filename="../core/save-html.c" line="525"/>
+        <source>Average temp.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="463"/>
-        <source>other</source>
+        <location filename="../core/save-html.c" line="526"/>
+        <source>Min. temp.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="474"/>
-        <source>Other activities</source>
+        <location filename="../core/save-html.c" line="527"/>
+        <source>Max. temp.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="498"/>
-        <source>Datatrak/Wlog notes</source>
+        <location filename="../core/save-html.c" line="528"/>
+        <source>Back to list</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="537"/>
-        <source>Manually entered dive</source>
+        <location filename="../core/save-html.c" line="531"/>
+        <source>Dive No.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="588"/>
-        <source>Unknown</source>
+        <location filename="../core/save-html.c" line="532"/>
+        <source>Dive profile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="674"/>
-        <source>Error: couldn&apos;t open the file %s</source>
+        <location filename="../core/save-html.c" line="533"/>
+        <source>Dive information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="687"/>
-        <source>Error: no dive</source>
+        <location filename="../core/save-html.c" line="534"/>
+        <source>Dive equipment</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/dive.c" line="27"/>
-        <source>student</source>
+        <location filename="../core/save-html.c" line="535"/>
+        <location filename="../core/save-html.c" line="542"/>
+        <source>Type</source>
+        <translation>Vrsta</translation>
+    </message>
+    <message>
+        <location filename="../core/save-html.c" line="536"/>
+        <source>Size</source>
+        <translation>Veličina</translation>
+    </message>
+    <message>
+        <location filename="../core/save-html.c" line="537"/>
+        <source>Work pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="461"/>
-        <location filename="../core/dive.c" line="28"/>
-        <source>photo</source>
-        <translation>fotografija</translation>
+        <location filename="../core/save-html.c" line="538"/>
+        <source>Start pressure</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/dive.c" line="28"/>
-        <source>video</source>
-        <translation>video</translation>
+        <location filename="../core/save-html.c" line="539"/>
+        <source>End pressure</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="435"/>
-        <location filename="../core/dive.c" line="28"/>
-        <source>instructor</source>
+        <location filename="../core/save-html.c" line="540"/>
+        <source>Gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="398"/>
-        <location filename="../core/dive.c" line="29"/>
-        <source>deco</source>
-        <translation>deko</translation>
+        <location filename="../core/save-html.c" line="541"/>
+        <source>Weight</source>
+        <translation>Težina</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="33"/>
-        <source>OC-gas</source>
+        <location filename="../core/save-html.c" line="543"/>
+        <source>Events</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/dive.c" line="33"/>
-        <source>diluent</source>
+        <location filename="../core/save-html.c" line="544"/>
+        <source>Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/dive.c" line="33"/>
-        <location filename="../core/equipment.c" line="88"/>
-        <location filename="../core/planner.c" line="1415"/>
-        <location filename="../core/planner.c" line="1418"/>
-        <source>oxygen</source>
+        <location filename="../core/save-html.c" line="545"/>
+        <source>Value</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/dive.c" line="227"/>
-        <source>ℓ</source>
+        <location filename="../core/save-html.c" line="546"/>
+        <source>Coordinates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="239"/>
+        <location filename="../core/save-html.c" line="547"/>
+        <source>Dive status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/statistics.c" line="242"/>
         <source>more than %d days</source>
         <translation>više od %d dana</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="246"/>
+        <location filename="../core/statistics.c" line="249"/>
         <source>%dd %dh %dmin</source>
         <translation>%dd %dh %dmin</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="249"/>
+        <location filename="../core/statistics.c" line="252"/>
         <source>%dmin %dsecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="251"/>
+        <location filename="../core/statistics.c" line="254"/>
         <source>%dh %dmin</source>
         <translation>%dst %dmin</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="263"/>
+        <location filename="../core/statistics.c" line="266"/>
         <source>for dives #</source>
         <translation>za urone #</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="269"/>
+        <location filename="../core/statistics.c" line="272"/>
         <source>for selected dives</source>
         <translation>za odabrane urone</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="304"/>
+        <location filename="../core/statistics.c" line="307"/>
         <source>for dive #%d</source>
         <translation>za uron #%d</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="306"/>
+        <location filename="../core/statistics.c" line="309"/>
         <source>for selected dive</source>
         <translation>za odabrani uron</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="308"/>
+        <location filename="../core/statistics.c" line="311"/>
         <source>for all dives</source>
         <translation>za sve urone</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="310"/>
+        <location filename="../core/statistics.c" line="313"/>
         <source>(no dives)</source>
         <translation>(nema urona)</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Sun</source>
         <translation>Ned</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Mon</source>
         <translation>Pon</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Tue</source>
         <translation>Uto</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Wed</source>
         <translation>Sri</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Thu</source>
         <translation>Čet</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Fri</source>
         <translation>Pet</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Sat</source>
         <translation>Sub</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Jan</source>
         <translation>Sij</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Feb</source>
         <translation>Velj</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Mar</source>
         <translation>Ožu</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Apr</source>
         <translation>Tra</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>May</source>
         <translation>Svi</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Jun</source>
         <translation>Lip</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Jul</source>
         <translation>Srp</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Aug</source>
         <translation>Kol</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Sep</source>
         <translation>Ruj</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Oct</source>
         <translation>Lis</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Nov</source>
         <translation>Stu</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Dec</source>
         <translation>Pro</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="191"/>
-        <location filename="../core/parse-xml.c" line="3284"/>
-        <location filename="../core/uemis-downloader.c" line="134"/>
-        <source>unknown</source>
-        <translation>nepoznato</translation>
-    </message>
-    <message>
-        <location filename="../core/uemis-downloader.c" line="467"/>
-        <source>data</source>
-        <translation>podaci</translation>
-    </message>
-    <message>
-        <location filename="../core/uemis-downloader.c" line="447"/>
-        <source>%s %s</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../core/uemis-downloader.c" line="27"/>
         <source>Uemis Zurich: the file system is almost full.
 Disconnect/reconnect the dive computer
@@ -10002,6 +10459,16 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../core/uemis-downloader.c" line="447"/>
+        <source>%s %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/uemis-downloader.c" line="467"/>
+        <source>data</source>
+        <translation>podaci</translation>
+    </message>
+    <message>
         <location filename="../core/uemis-downloader.c" line="495"/>
         <source>divelog #</source>
         <translation type="unfinished"/>
@@ -10172,281 +10639,6 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="469"/>
-        <location filename="../core/save-html.c" line="553"/>
-        <location filename="../core/worldmap-save.c" line="111"/>
-        <source>Can&apos;t open file %s</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="488"/>
-        <source>Number</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="489"/>
-        <source>Date</source>
-        <translation>Datum</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="490"/>
-        <source>Time</source>
-        <translation>Vrijeme</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="491"/>
-        <source>Location</source>
-        <translation>Lokacija</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="492"/>
-        <source>Air temp.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="493"/>
-        <source>Water temp.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="498"/>
-        <source>Statistics</source>
-        <translation>Statistika</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="502"/>
-        <source>Rating</source>
-        <translation>Ocjena</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="503"/>
-        <source>Visibility</source>
-        <translation>Vidljivost</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="504"/>
-        <source>Duration</source>
-        <translation>Trajanje</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="494"/>
-        <source>Dives</source>
-        <translation>Uroni</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="495"/>
-        <source>Expand all</source>
-        <translation>Otvori sve</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="496"/>
-        <source>Collapse all</source>
-        <translation>Zatvori sve grupe</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="497"/>
-        <source>Trips</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="499"/>
-        <source>Advanced search</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="505"/>
-        <source>Divemaster</source>
-        <translation>Voditelj</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="506"/>
-        <source>Buddy</source>
-        <translation>Buddy</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="507"/>
-        <source>Suit</source>
-        <translation>Odijelo</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="508"/>
-        <source>Tags</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="509"/>
-        <location filename="../smtk-import/smartrak.c" line="251"/>
-        <location filename="../smtk-import/smartrak.c" line="321"/>
-        <source>Notes</source>
-        <translation>Bilješke</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="510"/>
-        <source>Show more details</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="513"/>
-        <source>Yearly statistics</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="514"/>
-        <source>Year</source>
-        <translation>Godina</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="515"/>
-        <source>Total time</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="516"/>
-        <source>Average time</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="517"/>
-        <source>Shortest time</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="518"/>
-        <source>Longest time</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="519"/>
-        <source>Average depth</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="520"/>
-        <source>Min. depth</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="521"/>
-        <source>Max. depth</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="523"/>
-        <source>Min. SAC</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="524"/>
-        <source>Max. SAC</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="525"/>
-        <source>Average temp.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="526"/>
-        <source>Min. temp.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="527"/>
-        <source>Max. temp.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="528"/>
-        <source>Back to list</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="534"/>
-        <source>Dive equipment</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="537"/>
-        <source>Work pressure</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="538"/>
-        <source>Start pressure</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="539"/>
-        <source>End pressure</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="547"/>
-        <source>Dive status</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="522"/>
-        <source>Average SAC</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="531"/>
-        <source>Dive No.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="532"/>
-        <source>Dive profile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="533"/>
-        <source>Dive information</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="535"/>
-        <location filename="../core/save-html.c" line="542"/>
-        <source>Type</source>
-        <translation>Vrsta</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="536"/>
-        <source>Size</source>
-        <translation>Veličina</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="540"/>
-        <source>Gas</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="541"/>
-        <source>Weight</source>
-        <translation>Težina</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="543"/>
-        <source>Events</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="544"/>
-        <source>Name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="545"/>
-        <source>Value</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="546"/>
-        <source>Coordinates</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../core/worldmap-save.c" line="39"/>
         <source>Date:</source>
         <translation>Datum:</translation>
@@ -10492,109 +10684,6 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="91"/>
-        <location filename="../core/qthelper.cpp" line="226"/>
-        <source>N</source>
-        <translation>N</translation>
-    </message>
-    <message>
-        <location filename="../core/qthelper.cpp" line="91"/>
-        <location filename="../core/qthelper.cpp" line="227"/>
-        <source>S</source>
-        <translation>S</translation>
-    </message>
-    <message>
-        <location filename="../core/qthelper.cpp" line="92"/>
-        <location filename="../core/qthelper.cpp" line="228"/>
-        <source>E</source>
-        <translation>E</translation>
-    </message>
-    <message>
-        <location filename="../core/qthelper.cpp" line="92"/>
-        <location filename="../core/qthelper.cpp" line="229"/>
-        <source>W</source>
-        <translation>W</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="341"/>
-        <source>Remote storage and local data diverged. Error: merge failed (%s)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="134"/>
-        <source>Local cache directory %s corrupted - can&apos;t sync with Subsurface cloud storage</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="157"/>
-        <location filename="../core/git-access.c" line="177"/>
-        <source>Could not update local cache to newer remote data</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="170"/>
-        <source>Subsurface cloud storage corrupted</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="285"/>
-        <source>Could not update Subsurface cloud storage, try again later</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="371"/>
-        <source>Remote storage and local data diverged. Cannot combine local and remote changes</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="405"/>
-        <source>Remote storage and local data diverged</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="408"/>
-        <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="417"/>
-        <source>Problems with local cache of Subsurface cloud data</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="418"/>
-        <source>Moved cache data to %s. Please try the operation again.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="737"/>
-        <source>Error connecting to Subsurface cloud storage</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="740"/>
-        <source>git clone of %s failed (%s)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/load-git.c" line="222"/>
-        <location filename="../core/parse-xml.c" line="1300"/>
-        <source>additional name for site: %s
-</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/ostctools.c" line="120"/>
-        <location filename="../core/ostctools.c" line="152"/>
-        <source>Unknown DC in dive %d</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/ostctools.c" line="165"/>
-        <source>Error - %s - parsing dive %d</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../smtk-import/smartrak.c" line="247"/>
         <source>Built</source>
         <translation type="unfinished"/>
@@ -10678,155 +10767,120 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="91"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="103"/>
         <source>Subsurface</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="97"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="110"/>
         <source>Dive list</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="112"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="125"/>
         <source>Cloud credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="126"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="139"/>
         <source>Manage dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="138"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="141"/>
         <source>Add dive manually</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="146"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="149"/>
         <source>Manual sync with cloud</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="164"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="167"/>
         <source>Offline mode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="164"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="167"/>
         <source>Enable auto cloud sync</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="182"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="187"/>
         <source>GPS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="185"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="190"/>
         <source>GPS-tag dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="192"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="197"/>
         <source>Upload GPS data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="199"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="204"/>
         <source>Download GPS data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="206"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="211"/>
         <source>Show GPS fixes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="215"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="220"/>
         <source>Clear GPS cache</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="221"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="226"/>
         <source>Preferences</source>
         <translation>Postavke</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="230"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="237"/>
         <source>Developer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="232"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="239"/>
         <source>App log</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="239"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="246"/>
         <source>Theme information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="246"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="253"/>
         <source>User manual</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="252"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="259"/>
         <source>About</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="283"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="304"/>
         <source>Run location service</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="283"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="304"/>
         <source>No GPS source available</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="295"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="316"/>
         <source>Actions</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="9"/>
-        <source>Hello World</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="13"/>
-        <source>File</source>
-        <translation>Datoteka</translation>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="15"/>
-        <source>&amp;Open</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="19"/>
-        <source>Exit</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="27"/>
-        <source>Button 1 pressed</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="28"/>
-        <source>Button 2 pressed</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="33"/>
-        <source>May I have your attention, please?</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>plannerDetails</name>
@@ -10900,6 +10954,24 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="121"/>
+        <location filename="../build/ui_plannerSettings.h" line="425"/>
+        <source>75% to 50% avg. depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="138"/>
+        <location filename="../build/ui_plannerSettings.h" line="427"/>
+        <source>50% avg. depth to 6m</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="155"/>
+        <location filename="../build/ui_plannerSettings.h" line="429"/>
+        <source>6m to surface</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="175"/>
         <location filename="../build/ui_plannerSettings.h" line="431"/>
         <source>Descent</source>
@@ -10923,12 +10995,35 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="268"/>
+        <source>Bühlmann deco</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="278"/>
         <location filename="../build/ui_plannerSettings.h" line="445"/>
         <source>Reserve gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="288"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="549"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="578"/>
+        <location filename="../build/ui_plannerSettings.h" line="446"/>
+        <location filename="../build/ui_plannerSettings.h" line="459"/>
+        <location filename="../build/ui_plannerSettings.h" line="461"/>
+        <source>bar</source>
+        <translation>bar</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="307"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="416"/>
+        <location filename="../build/ui_plannerSettings.h" line="437"/>
+        <location filename="../build/ui_plannerSettings.h" line="440"/>
+        <source>%</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="320"/>
         <location filename="../build/ui_plannerSettings.h" line="449"/>
         <source>Postpone gas change if a stop is not required</source>
@@ -10947,11 +11042,9 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="307"/>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="416"/>
-        <location filename="../build/ui_plannerSettings.h" line="437"/>
-        <location filename="../build/ui_plannerSettings.h" line="440"/>
-        <source>%</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="353"/>
+        <location filename="../build/ui_plannerSettings.h" line="436"/>
+        <source>Plan backgas breaks</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -10961,10 +11054,10 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="429"/>
-        <location filename="../build/ui_plannerSettings.h" line="441"/>
-        <source>Drop to first depth</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="370"/>
+        <location filename="../build/ui_plannerSettings.h" line="453"/>
+        <source>min</source>
+        <translation>min</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="389"/>
@@ -10973,162 +11066,138 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="353"/>
-        <location filename="../build/ui_plannerSettings.h" line="436"/>
-        <source>Plan backgas breaks</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="396"/>
+        <source>Maximize bottom time allowed by gas and no decompression limits</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="515"/>
-        <location filename="../build/ui_plannerSettings.h" line="455"/>
-        <source>Gas options</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="399"/>
+        <location filename="../build/ui_plannerSettings.h" line="443"/>
+        <source>Recreational mode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="594"/>
-        <location filename="../build/ui_plannerSettings.h" line="456"/>
-        <source>Bottom SAC</source>
-        <translation>SAC</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="692"/>
-        <location filename="../build/ui_plannerSettings.h" line="457"/>
-        <source>Deco SAC</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="429"/>
+        <location filename="../build/ui_plannerSettings.h" line="441"/>
+        <source>Drop to first depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="601"/>
-        <location filename="../build/ui_plannerSettings.h" line="458"/>
-        <source>Bottom pO₂</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="436"/>
+        <location filename="../build/ui_plannerSettings.h" line="452"/>
+        <source>Min. switch duration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="685"/>
-        <location filename="../build/ui_plannerSettings.h" line="460"/>
-        <source>Deco pO₂</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="459"/>
+        <location filename="../build/ui_plannerSettings.h" line="444"/>
+        <source>Safety stop</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="565"/>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="672"/>
-        <location filename="../build/ui_plannerSettings.h" line="462"/>
-        <location filename="../build/ui_plannerSettings.h" line="463"/>
-        <source>ℓ/min</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="495"/>
+        <source>Conservatism level</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="632"/>
-        <location filename="../build/ui_plannerSettings.h" line="468"/>
-        <source>Display runtime</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="515"/>
+        <location filename="../build/ui_plannerSettings.h" line="455"/>
+        <source>Gas options</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="645"/>
-        <location filename="../build/ui_plannerSettings.h" line="472"/>
-        <source>Display segment duration</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="565"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="698"/>
+        <location filename="../build/ui_plannerSettings.h" line="462"/>
+        <location filename="../build/ui_plannerSettings.h" line="463"/>
+        <source>ℓ/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="655"/>
-        <location filename="../build/ui_plannerSettings.h" line="476"/>
-        <source>Display transitions in deco</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="594"/>
+        <source>m</source>
+        <translation>m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="662"/>
-        <location filename="../build/ui_plannerSettings.h" line="477"/>
-        <source>Verbatim dive plan</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="606"/>
+        <source>Used to calculate best mix. Select best mix depth in &apos;Available gases&apos; table by entering gas depth, followed by &quot;B&quot; (best trimix mix) or &quot;BN&quot; (best nitrox mix)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="288"/>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="549"/>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="578"/>
-        <location filename="../build/ui_plannerSettings.h" line="446"/>
-        <location filename="../build/ui_plannerSettings.h" line="459"/>
-        <location filename="../build/ui_plannerSettings.h" line="461"/>
-        <source>bar</source>
-        <translation>bar</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="613"/>
+        <location filename="../build/ui_plannerSettings.h" line="456"/>
+        <source>Bottom SAC</source>
+        <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="121"/>
-        <location filename="../build/ui_plannerSettings.h" line="425"/>
-        <source>75% to 50% avg. depth</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="620"/>
+        <location filename="../build/ui_plannerSettings.h" line="458"/>
+        <source>Bottom pO₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="138"/>
-        <location filename="../build/ui_plannerSettings.h" line="427"/>
-        <source>50% avg. depth to 6m</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="627"/>
+        <source>Best mix END</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="155"/>
-        <location filename="../build/ui_plannerSettings.h" line="429"/>
-        <source>6m to surface</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="634"/>
+        <location filename="../build/ui_plannerSettings.h" line="464"/>
+        <source>Notes</source>
+        <translation>Bilješke</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="268"/>
-        <source>Bühlmann deco</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="655"/>
+        <location filename="../build/ui_plannerSettings.h" line="466"/>
+        <source>In dive plan, show runtime (absolute time) of stops</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="370"/>
-        <location filename="../build/ui_plannerSettings.h" line="453"/>
-        <source>min</source>
-        <translation>min</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="396"/>
-        <source>Maximize bottom time allowed by gas and no decompression limits</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="658"/>
+        <location filename="../build/ui_plannerSettings.h" line="468"/>
+        <source>Display runtime</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="399"/>
-        <location filename="../build/ui_plannerSettings.h" line="443"/>
-        <source>Recreational mode</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="668"/>
+        <location filename="../build/ui_plannerSettings.h" line="470"/>
+        <source>In dive plan, show duration (relative time) of stops</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="436"/>
-        <location filename="../build/ui_plannerSettings.h" line="452"/>
-        <source>Min. switch duration</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="671"/>
+        <location filename="../build/ui_plannerSettings.h" line="472"/>
+        <source>Display segment duration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="459"/>
-        <location filename="../build/ui_plannerSettings.h" line="444"/>
-        <source>Safety stop</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="678"/>
+        <location filename="../build/ui_plannerSettings.h" line="474"/>
+        <source>In diveplan, list transitions or treat them as implicit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="495"/>
-        <source>Conservatism level</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="681"/>
+        <location filename="../build/ui_plannerSettings.h" line="476"/>
+        <source>Display transitions in deco</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="608"/>
-        <location filename="../build/ui_plannerSettings.h" line="464"/>
-        <source>Notes</source>
-        <translation>Bilješke</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="629"/>
-        <location filename="../build/ui_plannerSettings.h" line="466"/>
-        <source>In dive plan, show runtime (absolute time) of stops</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="688"/>
+        <location filename="../build/ui_plannerSettings.h" line="477"/>
+        <source>Verbatim dive plan</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="642"/>
-        <location filename="../build/ui_plannerSettings.h" line="470"/>
-        <source>In dive plan, show duration (relative time) of stops</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="711"/>
+        <location filename="../build/ui_plannerSettings.h" line="460"/>
+        <source>Deco pO₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="652"/>
-        <location filename="../build/ui_plannerSettings.h" line="474"/>
-        <source>In diveplan, list transitions or treat them as implicit</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="718"/>
+        <location filename="../build/ui_plannerSettings.h" line="457"/>
+        <source>Deco SAC</source>
         <translation type="unfinished"/>
     </message>
 </context>
diff --git a/translations/subsurface_hu.ts b/translations/subsurface_hu.ts
index cb7880734..526431ebe 100644
--- a/translations/subsurface_hu.ts
+++ b/translations/subsurface_hu.ts
@@ -105,6 +105,11 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="56"/>
+        <source>Could not initialize Winsock version 2.2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="134"/>
         <source>Trying to turn on the local Bluetooth device...</source>
         <translation type="unfinished"/>
@@ -115,6 +120,11 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="167"/>
+        <source>Remote devices list was cleared.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="183"/>
         <source>Scanning for remote devices...</source>
         <translation type="unfinished"/>
@@ -125,6 +135,22 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="208"/>
+        <source>The local Bluetooth device was %1.</source>
+        <extracomment>%1 will be replaced with &quot;turned on&quot; or &quot;turned off&quot;</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
+        <source>turned on</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
+        <source>turned off</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="225"/>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="339"/>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="359"/>
@@ -172,37 +198,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="352"/>
-        <source>Device %1 was paired and is authorized.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="56"/>
-        <source>Could not initialize Winsock version 2.2</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="167"/>
-        <source>Remote devices list was cleared.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="208"/>
-        <source>The local Bluetooth device was %1.</source>
-        <extracomment>%1 will be replaced with &quot;turned on&quot; or &quot;turned off&quot;</extracomment>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
-        <source>turned on</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
-        <source>turned off</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="307"/>
         <source>Remove pairing</source>
         <translation type="unfinished"/>
@@ -228,6 +223,11 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="352"/>
+        <source>Device %1 was paired and is authorized.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="378"/>
         <source>The device %1 can now be used for connection. You can press the Save button.</source>
         <translation type="unfinished"/>
@@ -286,12 +286,12 @@
 <context>
     <name>BuddyFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="621"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="619"/>
         <source>Person: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="622"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="620"/>
         <source>Searches for buddies and divemasters</source>
         <translation type="unfinished"/>
     </message>
@@ -299,7 +299,7 @@
 <context>
     <name>BuddyFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="243"/>
+        <location filename="../qt-models/filtermodels.cpp" line="248"/>
         <source>No buddies</source>
         <translation type="unfinished"/>
     </message>
@@ -307,25 +307,30 @@
 <context>
     <name>CloudCredentials</name>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="49"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="50"/>
         <source>Cloud credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="55"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="56"/>
         <source>Email</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="67"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="68"/>
         <source>Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="90"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="92"/>
         <source>Show password</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="97"/>
+        <source>PIN</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>ColumnNameProvider</name>
@@ -381,47 +386,47 @@
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
-        <source>Divemaster</source>
-        <translation>Merülés vezető</translation>
+        <source>Max. depth</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
-        <source>Buddy</source>
-        <translation>Társ</translation>
+        <source>Avg. depth</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
-        <source>Notes</source>
-        <translation type="unfinished"/>
+        <source>Divemaster</source>
+        <translation>Merülés vezető</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
-        <source>Tags</source>
-        <translation type="unfinished"/>
+        <source>Buddy</source>
+        <translation>Társ</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
-        <source>Air temp.</source>
+        <source>Suit</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
-        <source>Water temp.</source>
+        <source>Notes</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
-        <source>Max. depth</source>
+        <source>Tags</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
-        <source>Avg. depth</source>
+        <source>Air temp.</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
-        <source>Suit</source>
+        <source>Water temp.</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -538,7 +543,7 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/configuredivecomputer.cpp" line="660"/>
+        <location filename="../core/configuredivecomputer.cpp" line="656"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation type="unfinished"/>
     </message>
@@ -558,25 +563,45 @@
         <translation>Eszköz vagy csatolási pont</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="170"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1520"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1533"/>
-        <source>...</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="47"/>
+        <source>Connect via Bluetooth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="54"/>
+        <source>Connect</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="64"/>
+        <source>Disconnect</source>
+        <translation>Kapcsolat szakítás</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="80"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1521"/>
         <source>Retrieve available details</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="90"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1523"/>
+        <source>Read settings from backup file or from device before writing to the device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="93"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1525"/>
         <source>Save changes to device</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="116"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1527"/>
+        <source>Read settings from backup file or from device before writing to a backup file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="119"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1529"/>
         <source>Backup</source>
@@ -595,14 +620,39 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="163"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1532"/>
+        <source>Save libdivecomputer logfile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="170"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1520"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1533"/>
+        <source>...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="177"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1534"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1539"/>
-        <source>OSTC 3</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="214"/>
+        <source>OSTC 3,Sport,Cr,2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="223"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1541"/>
+        <source>Suunto Vyper family</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="232"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1543"/>
+        <source>OSTC, Mk.2/2N/2C</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -616,39 +666,55 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="326"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1656"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1943"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1546"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1726"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1766"/>
-        <source>Serial No.</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="260"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1575"/>
+        <source>Eco</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="349"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1679"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1980"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1547"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1727"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1767"/>
-        <source>Firmware version</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="265"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1576"/>
+        <source>Medium</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="538"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1713"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1990"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1548"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1729"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1768"/>
-        <source>Custom text</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="270"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1577"/>
+        <source>High</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="385"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1549"/>
-        <source>Language</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="278"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="826"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="849"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="875"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="927"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="993"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1019"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1101"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1117"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1450"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2278"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2382"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2408"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2434"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2474"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2497"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1586"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1621"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1623"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1625"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1628"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1637"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1638"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1710"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1785"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1789"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1801"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1803"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1806"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1807"/>
+        <source>%</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -676,35 +742,59 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="579"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1557"/>
-        <source>Dive mode</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="313"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1582"/>
+        <source>m/°C</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="556"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1560"/>
-        <source>OC</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="318"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1583"/>
+        <source>ft/°F</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="561"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1561"/>
-        <source>CC</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="326"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1656"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1943"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1546"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1726"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1766"/>
+        <source>Serial No.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="566"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2336"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1562"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1793"/>
-        <source>Gauge</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="349"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1679"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1980"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1547"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1727"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1767"/>
+        <source>Firmware version</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="571"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1563"/>
-        <source>Apnea</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="360"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1568"/>
+        <source>MMDDYY</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="365"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1569"/>
+        <source>DDMMYY</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="370"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1570"/>
+        <source>YYMMDD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="385"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1549"/>
+        <source>Language</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -716,165 +806,154 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="360"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1568"/>
-        <source>MMDDYY</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="405"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1572"/>
+        <source>Brightness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="365"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1569"/>
-        <source>DDMMYY</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="415"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1850"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1579"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1753"/>
+        <source>Units</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="370"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1570"/>
-        <source>YYMMDD</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="425"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1585"/>
+        <source>Salinity (0-5%)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1042"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2457"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1639"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1805"/>
-        <source>Saturation</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="438"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1615"/>
+        <source>Reset device to default settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="278"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="826"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="849"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="875"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="927"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="993"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1019"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1101"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1117"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1450"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2278"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2382"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2408"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2434"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2474"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2497"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1586"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1621"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1623"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1625"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1628"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1637"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1638"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1710"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1785"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1789"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1801"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1803"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1806"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1807"/>
-        <source>%</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="452"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1590"/>
+        <source>230LSB/Gauss</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="865"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2261"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1624"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1784"/>
-        <source>Desaturation</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="457"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1591"/>
+        <source>330LSB/Gauss</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="983"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2398"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1636"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1800"/>
-        <source>Last deco</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="462"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1592"/>
+        <source>390LSB/Gauss</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="711"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="736"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="758"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="904"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2181"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2206"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2228"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2307"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1626"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1786"/>
-        <source> m</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="467"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1593"/>
+        <source>440LSB/Gauss</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="405"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1572"/>
-        <source>Brightness</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="472"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1594"/>
+        <source>660LSB/Gauss</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="260"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1575"/>
-        <source>Eco</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="477"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1595"/>
+        <source>820LSB/Gauss</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="265"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1576"/>
-        <source>Medium</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="482"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1596"/>
+        <source>1090LSB/Gauss</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="270"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1577"/>
-        <source>High</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="487"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1597"/>
+        <source>1370LSB/Gauss</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="603"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2034"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1599"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1779"/>
-        <source>Sampling rate</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="521"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1587"/>
+        <source>Compass gain</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="590"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1602"/>
-        <source>2s</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="531"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1799"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1745"/>
+        <source>Computer model</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="595"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1769"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1603"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1739"/>
-        <source>10s</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="538"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1713"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1990"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1548"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1729"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1768"/>
+        <source>Custom text</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="415"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1850"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1579"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1753"/>
-        <source>Units</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="556"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1560"/>
+        <source>OC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="313"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1582"/>
-        <source>m/°C</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="561"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1561"/>
+        <source>CC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="318"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1583"/>
-        <source>ft/°F</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="566"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2336"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1562"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1793"/>
+        <source>Gauge</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="644"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1605"/>
-        <source>Dive mode color</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="571"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1563"/>
+        <source>Apnea</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="579"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1557"/>
+        <source>Dive mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="590"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1602"/>
+        <source>2s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="595"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1769"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1603"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1739"/>
+        <source>10s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="603"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2034"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1599"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1779"/>
+        <source>Sampling rate</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -902,12 +981,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="425"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1585"/>
-        <source>Salinity (0-5%)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="637"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2092"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1613"/>
@@ -916,89 +989,79 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="521"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1587"/>
-        <source>Compass gain</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="90"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1523"/>
-        <source>Read settings from backup file or from device before writing to the device</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="116"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1527"/>
-        <source>Read settings from backup file or from device before writing to a backup file</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="232"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1543"/>
-        <source>OSTC, Mk.2/2N/2C</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="644"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1605"/>
+        <source>Dive mode color</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="452"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1590"/>
-        <source>230LSB/Gauss</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="654"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2020"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1614"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1771"/>
+        <source>Show safety stop</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="457"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1591"/>
-        <source>330LSB/Gauss</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="661"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2145"/>
+        <source>End Depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="462"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1592"/>
-        <source>390LSB/Gauss</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="671"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2162"/>
+        <source> s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="467"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1593"/>
-        <source>440LSB/Gauss</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="687"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1953"/>
+        <source>Length</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="472"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1594"/>
-        <source>660LSB/Gauss</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="694"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2138"/>
+        <source>Start Depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="477"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1595"/>
-        <source>820LSB/Gauss</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="701"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2152"/>
+        <source>Reset Depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="482"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1596"/>
-        <source>1090LSB/Gauss</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="711"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="736"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="758"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="904"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2181"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2206"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2228"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2307"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1626"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1786"/>
+        <source> m</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="487"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1597"/>
-        <source>1370LSB/Gauss</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="778"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2248"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1643"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1810"/>
+        <source>Advanced settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="654"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2020"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1614"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1771"/>
-        <source>Show safety stop</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="784"/>
+        <source>Left button sensitivity</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="438"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1615"/>
-        <source>Reset device to default settings</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="791"/>
+        <source>Always show ppO2</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1010,20 +1073,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="223"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1541"/>
-        <source>Suunto Vyper family</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="778"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2248"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1643"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1810"/>
-        <source>Advanced settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="805"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2271"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1618"/>
@@ -1054,6 +1103,14 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="865"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2261"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1624"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1784"/>
+        <source>Desaturation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="917"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2320"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1627"/>
@@ -1068,14 +1125,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="973"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2369"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1630"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1788"/>
-        <source> min</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="960"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2331"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1633"/>
@@ -1084,60 +1133,25 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="47"/>
-        <source>Connect via Bluetooth</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="163"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1532"/>
-        <source>Save libdivecomputer logfile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="661"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2145"/>
-        <source>End Depth</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="671"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2162"/>
-        <source> s</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="687"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1953"/>
-        <source>Length</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="694"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2138"/>
-        <source>Start Depth</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="701"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2152"/>
-        <source>Reset Depth</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="784"/>
-        <source>Left button sensitivity</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="965"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1634"/>
+        <source>ZH-L16+GF</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="791"/>
-        <source>Always show ppO2</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="973"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2369"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1630"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1788"/>
+        <source> min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="965"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1634"/>
-        <source>ZH-L16+GF</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="983"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2398"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1636"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1800"/>
+        <source>Last deco</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1157,6 +1171,14 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1042"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2457"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1639"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1805"/>
+        <source>Saturation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1052"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1642"/>
         <source>Flip screen</source>
@@ -1168,12 +1190,22 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1066"/>
+        <source>MOD warning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1073"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2513"/>
         <source>Graphical speed indicator</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1080"/>
+        <source>Dynamic ascent rate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1087"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2552"/>
         <source>Bottom gas consumption</source>
@@ -1186,6 +1218,14 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1133"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1149"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2520"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2536"/>
+        <source> ℓ/min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1165"/>
         <source>Temperature sensor offset</source>
         <translation type="unfinished"/>
@@ -1204,6 +1244,18 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1235"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1320"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2610"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2695"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1645"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1668"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1812"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1835"/>
+        <source>%O₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1240"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1325"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2615"/>
@@ -1322,15 +1374,9 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1691"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1858"/>
-        <source>Set point [cbar]</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1693"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1860"/>
-        <source>Change depth [m]</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1405"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2770"/>
+        <source>Setpoint</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1370,6 +1416,12 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1443"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1709"/>
+        <source>O₂ in calibration gas</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1467"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1713"/>
         <source>Fixed setpoint</source>
@@ -1400,101 +1452,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1748"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1733"/>
-        <source>P1 (medium)</source>
-        <extracomment>Suunto safety level</extracomment>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1753"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1734"/>
-        <source>P2 (high)</source>
-        <extracomment>Suunto safety level</extracomment>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1792"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1744"/>
-        <source>Total dive time</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2109"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1769"/>
-        <source>kg/ℓ</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2346"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1795"/>
-        <source>Apnoea</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1583"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1722"/>
-        <source>Safety level</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="54"/>
-        <source>Connect</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="64"/>
-        <source>Disconnect</source>
-        <translation>Kapcsolat szakítás</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="214"/>
-        <source>OSTC 3,Sport,Cr,2</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1066"/>
-        <source>MOD warning</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1080"/>
-        <source>Dynamic ascent rate</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1133"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1149"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2520"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2536"/>
-        <source> ℓ/min</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1235"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1320"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2610"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2695"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1645"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1668"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1812"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1835"/>
-        <source>%O₂</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1405"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2770"/>
-        <source>Setpoint</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1443"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1709"/>
-        <source>O₂ in calibration gas</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1535"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2843"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1719"/>
@@ -1511,6 +1468,12 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1583"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1722"/>
+        <source>Safety level</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1609"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1723"/>
         <source>Altitude range</source>
@@ -1544,6 +1507,20 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1748"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1733"/>
+        <source>P1 (medium)</source>
+        <extracomment>Suunto safety level</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1753"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1734"/>
+        <source>P2 (high)</source>
+        <extracomment>Suunto safety level</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1761"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1736"/>
         <source>Sample rate</source>
@@ -1568,10 +1545,9 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="531"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1799"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1745"/>
-        <source>Computer model</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1792"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1744"/>
+        <source>Total dive time</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1637,12 +1613,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2099"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1765"/>
-        <source>Salinity</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2074"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1774"/>
         <source>MM/DD/YY</source>
@@ -1661,12 +1631,30 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2099"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1765"/>
+        <source>Salinity</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2109"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1769"/>
+        <source>kg/ℓ</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2341"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1794"/>
         <source>ZH-L16 CC</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2346"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1795"/>
+        <source>Apnoea</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2351"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1796"/>
         <source>L16-GF OC</source>
@@ -1685,99 +1673,119 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1108"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1129"/>
-        <source>Backup files (*.xml)</source>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1539"/>
+        <source>OSTC 3</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1113"/>
-        <source>An error occurred while saving the backup file.
-%1</source>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1691"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1858"/>
+        <source>Set point [cbar]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1116"/>
-        <source>Backup succeeded</source>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1693"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1860"/>
+        <source>Change depth [m]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1117"/>
-        <source>Your settings have been saved to: %1</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1110"/>
+        <source>Backup dive computer settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1107"/>
-        <source>Backup dive computer settings</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1111"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1132"/>
+        <source>Backup files (*.xml)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1112"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1115"/>
         <source>XML backup error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1128"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1116"/>
+        <source>An error occurred while saving the backup file.
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1119"/>
+        <source>Backup succeeded</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1120"/>
+        <source>Your settings have been saved to: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1131"/>
         <source>Restore dive computer settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1134"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1137"/>
         <source>XML restore error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1135"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1138"/>
         <source>An error occurred while restoring the backup file.
 %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1139"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1142"/>
         <source>Restore succeeded</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1140"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1143"/>
         <source>Your settings have been restored successfully.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1150"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1153"/>
         <source>Select firmware file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1151"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1154"/>
         <source>All files (*.*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1207"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1210"/>
         <source>Choose file for divecomputer download logfile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1208"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1211"/>
         <source>Log files (*.log)</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>CylindersModel</name>
+    <name>ContextDrawer</name>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="16"/>
-        <source>Type</source>
+        <location filename="../mobile-widgets/qml/kirigami/src/controls/ContextDrawer.qml" line="76"/>
+        <source>Actions</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>CylindersModel</name>
     <message>
         <location filename="../qt-models/cylindermodel.cpp" line="16"/>
-        <source>Size</source>
+        <source>Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-models/cylindermodel.cpp" line="16"/>
-        <source>He%</source>
+        <source>Size</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1801,8 +1809,23 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="16"/>
+        <source>He%</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../qt-models/cylindermodel.cpp" line="17"/>
-        <source>Switch at</source>
+        <source>Deco switch at</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
+        <source>Bot. MOD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
+        <source>MND</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1821,17 +1844,32 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="161"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="177"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="383"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="180"/>
+        <source>Switch depth for deco gas. Calculated using Deco pO₂ preference, unless set manually.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="183"/>
+        <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to &apos;*&apos; for best O₂% for max depth.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="186"/>
+        <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to &apos;*&apos; for best He% for max depth.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="444"/>
         <source>Cylinder cannot be removed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="384"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="445"/>
         <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source>
         <translation type="unfinished"/>
     </message>
@@ -1851,27 +1889,15 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="80"/>
-        <location filename="../build/ui_divecomponentselection.h" line="142"/>
-        <source>Suit</source>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="73"/>
+        <location filename="../build/ui_divecomponentselection.h" line="141"/>
+        <source>Dive site</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="122"/>
-        <location filename="../build/ui_divecomponentselection.h" line="148"/>
-        <source>Divemaster</source>
-        <translation>Merülés vezető</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="129"/>
-        <location filename="../build/ui_divecomponentselection.h" line="149"/>
-        <source>Buddy</source>
-        <translation>Társ</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="136"/>
-        <location filename="../build/ui_divecomponentselection.h" line="150"/>
-        <source>Rating</source>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="80"/>
+        <location filename="../build/ui_divecomponentselection.h" line="142"/>
+        <source>Suit</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1881,12 +1907,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="73"/>
-        <location filename="../build/ui_divecomponentselection.h" line="141"/>
-        <source>Dive site</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="94"/>
         <location filename="../build/ui_divecomponentselection.h" line="144"/>
         <source>Notes</source>
@@ -1910,10 +1930,34 @@
         <source>Cylinders</source>
         <translation>Palackok</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="122"/>
+        <location filename="../build/ui_divecomponentselection.h" line="148"/>
+        <source>Divemaster</source>
+        <translation>Merülés vezető</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="129"/>
+        <location filename="../build/ui_divecomponentselection.h" line="149"/>
+        <source>Buddy</source>
+        <translation>Társ</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="136"/>
+        <location filename="../build/ui_divecomponentselection.h" line="150"/>
+        <source>Rating</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DiveComputerManagementDialog</name>
     <message>
+        <location filename="../desktop-widgets/divecomputermanagementdialog.ui" line="17"/>
+        <location filename="../build/ui_divecomputermanagementdialog.h" line="65"/>
+        <source>Edit dive computer nicknames</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divecomputermanagementdialog.cpp" line="49"/>
         <source>Remove the selected dive computer?</source>
         <translation type="unfinished"/>
@@ -1924,12 +1968,6 @@
  remove the selected dive computer?</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../desktop-widgets/divecomputermanagementdialog.ui" line="17"/>
-        <location filename="../build/ui_divecomputermanagementdialog.h" line="65"/>
-        <source>Edit dive computer nicknames</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>DiveComputerModel</name>
@@ -1957,17 +1995,17 @@
 <context>
     <name>DiveDetails</name>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="33"/>
+        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="38"/>
         <source>Dive details</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="67"/>
+        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="72"/>
         <source>Delete dive</source>
         <translation>Merülés törélse</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="84"/>
+        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="89"/>
         <source>Show on map</source>
         <translation type="unfinished"/>
     </message>
@@ -1975,88 +2013,93 @@
 <context>
     <name>DiveDetailsEdit</name>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="74"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="80"/>
         <source>Dive %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="78"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="84"/>
         <source>Date:</source>
         <translation>Dátum:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="86"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="92"/>
         <source>Location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="95"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="101"/>
         <source>Coordinates:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="104"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="110"/>
         <source>Use current
 GPS location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="118"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="124"/>
         <source>Depth:</source>
         <translation>Mélység:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="127"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="133"/>
         <source>Duration:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="137"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="143"/>
         <source>Air Temp:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="146"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="152"/>
         <source>Water Temp:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="155"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="161"/>
         <source>Suit:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="164"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="176"/>
         <source>Buddy:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="173"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="191"/>
         <source>Dive Master:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="182"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="206"/>
         <source>Weight:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="192"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="216"/>
+        <source>Cylinder:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="231"/>
         <source>Gas mix:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="203"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="241"/>
         <source>Start Pressure:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="213"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="250"/>
         <source>End Pressure:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="224"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="260"/>
         <source>Notes:</source>
         <translation type="unfinished"/>
     </message>
@@ -2094,42 +2137,42 @@ GPS location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="159"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="158"/>
         <source>Air Temp:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="175"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="172"/>
         <source>Cylinder:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="189"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="185"/>
         <source>Water Temp:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="205"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="198"/>
         <source>Dive Master:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="220"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="211"/>
         <source>Weight:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="249"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="224"/>
         <source>Buddy:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="263"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="237"/>
         <source>SAC:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="280"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="252"/>
         <source>Notes</source>
         <translation type="unfinished"/>
     </message>
@@ -2137,18 +2180,18 @@ GPS location:</source>
 <context>
     <name>DiveEventItem</name>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="134"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="165"/>
         <source>Manual switch to OC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="136"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="167"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation>kezdés</translation>
     </message>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="137"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="168"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation>befejezés</translation>
@@ -2157,27 +2200,27 @@ GPS location:</source>
 <context>
     <name>DiveImportedModel</name>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="646"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="656"/>
         <source>Date/time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="648"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="658"/>
         <source>Duration</source>
         <translation>Tartam</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="650"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="660"/>
         <source>Depth</source>
         <translation>Mélység</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="672"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="682"/>
         <source>h:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="672"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="682"/>
         <source>min</source>
         <translation type="unfinished"/>
     </message>
@@ -2186,8 +2229,8 @@ GPS location:</source>
     <name>DiveList</name>
     <message>
         <location filename="../mobile-widgets/qml/DiveList.qml" line="12"/>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="226"/>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="232"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="227"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="233"/>
         <source>Dive list</source>
         <translation type="unfinished"/>
     </message>
@@ -2202,110 +2245,115 @@ GPS location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="222"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="223"/>
         <source>Cloud credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="228"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="229"/>
         <source>Please tap the &apos;+&apos; button to add a dive</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="248"/>
+        <source>No dives in dive list</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DiveListView</name>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="846"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="849"/>
         <source>Expand all</source>
         <translation>Mind kinyit</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="848"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="851"/>
         <source>Collapse all</source>
         <translation>Összes összecsukása</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="852"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="855"/>
         <source>Collapse others</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="856"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="859"/>
         <source>Remove dive(s) from trip</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="857"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="860"/>
         <source>Create new trip above</source>
         <translation>Túra létrehozása fentebb</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="871"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="874"/>
         <source>Add dive(s) to trip immediately above</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="873"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="876"/>
         <source>Add dive(s) to trip immediately below</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="877"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="880"/>
         <source>Merge trip with trip above</source>
         <translation>Túra egyesítése a fentivel</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="878"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="881"/>
         <source>Merge trip with trip below</source>
         <translation>Túra egyesítése a lentivel</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="882"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="885"/>
         <source>Delete dive(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="884"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="887"/>
         <source>Mark dive(s) invalid</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="888"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="891"/>
         <source>Merge selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="890"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="893"/>
         <source>Renumber dive(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="891"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="894"/>
         <source>Shift dive times</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="892"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="895"/>
         <source>Split selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="893"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="896"/>
         <source>Load image(s) from file(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="894"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="897"/>
         <source>Load image(s) from web</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="917"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="919"/>
         <source>Open image files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="917"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="919"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation type="unfinished"/>
     </message>
@@ -2326,330 +2374,351 @@ GPS location:</source>
 <context>
     <name>DiveLogExportDialog</name>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="103"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="351"/>
-        <source>Export format</source>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="14"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="349"/>
+        <source>Export dive log files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="134"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="353"/>
-        <source>UDDF</source>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="44"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="369"/>
+        <source>General export</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="187"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="358"/>
-        <source>Worldmap</source>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="103"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="351"/>
+        <source>Export format</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="197"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="359"/>
-        <source>I&amp;mage depths</source>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="115"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="352"/>
+        <source>Subsurface &amp;XML</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="243"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="360"/>
-        <source>Selection</source>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="134"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="353"/>
+        <source>UDDF</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="252"/>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="346"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="361"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="372"/>
-        <source>Selected dives</source>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="147"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="354"/>
+        <source>di&amp;velogs.de</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="262"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="362"/>
-        <source>All dives</source>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="157"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="355"/>
+        <source>DiveShare</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="306"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="396"/>
-        <source>HTML</source>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="167"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="356"/>
+        <source>CSV dive profile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="14"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="349"/>
-        <source>Export dive log files</source>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="177"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="357"/>
+        <source>CSV dive details</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="44"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="369"/>
-        <source>General export</source>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="187"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="358"/>
+        <source>Worldmap</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="115"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="352"/>
-        <source>Subsurface &amp;XML</source>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="197"/>
+        <source>TeX</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="147"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="354"/>
-        <source>di&amp;velogs.de</source>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="207"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="359"/>
+        <source>I&amp;mage depths</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="157"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="355"/>
-        <source>DiveShare</source>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="253"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="360"/>
+        <source>Selection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="167"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="356"/>
-        <source>CSV dive profile</source>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="262"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="356"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="361"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="372"/>
+        <source>Selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="177"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="357"/>
-        <source>CSV dive details</source>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="272"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="362"/>
+        <source>All dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="275"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="285"/>
         <location filename="../build/ui_divelogexportdialog.h" line="363"/>
         <source>CSV units</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="288"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="298"/>
         <location filename="../build/ui_divelogexportdialog.h" line="366"/>
         <source>Metric</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="293"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="303"/>
         <location filename="../build/ui_divelogexportdialog.h" line="367"/>
         <source>Imperial</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="324"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="316"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="396"/>
+        <source>HTML</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="334"/>
         <location filename="../build/ui_divelogexportdialog.h" line="370"/>
         <source>General settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="330"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="340"/>
         <location filename="../build/ui_divelogexportdialog.h" line="371"/>
         <source>Subsurface numbers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="359"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="369"/>
         <location filename="../build/ui_divelogexportdialog.h" line="373"/>
         <source>Export yearly statistics</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="375"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="385"/>
         <location filename="../build/ui_divelogexportdialog.h" line="374"/>
         <source>All di&amp;ves</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="385"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="395"/>
         <location filename="../build/ui_divelogexportdialog.h" line="375"/>
         <source>Export list only</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="392"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="402"/>
         <location filename="../build/ui_divelogexportdialog.h" line="376"/>
         <source>Export photos</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="408"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="418"/>
         <location filename="../build/ui_divelogexportdialog.h" line="377"/>
         <source>Style options</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="423"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="433"/>
         <location filename="../build/ui_divelogexportdialog.h" line="378"/>
         <source>Font</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="433"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="443"/>
         <location filename="../build/ui_divelogexportdialog.h" line="379"/>
         <source>Font size</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="444"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="454"/>
         <location filename="../build/ui_divelogexportdialog.h" line="382"/>
         <source>8</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="449"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="459"/>
         <location filename="../build/ui_divelogexportdialog.h" line="383"/>
         <source>10</source>
         <translation>10</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="454"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="464"/>
         <location filename="../build/ui_divelogexportdialog.h" line="384"/>
         <source>12</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="459"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="469"/>
         <location filename="../build/ui_divelogexportdialog.h" line="385"/>
         <source>14</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="464"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="474"/>
         <location filename="../build/ui_divelogexportdialog.h" line="386"/>
         <source>16</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="469"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="479"/>
         <location filename="../build/ui_divelogexportdialog.h" line="387"/>
         <source>18</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="474"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="484"/>
         <location filename="../build/ui_divelogexportdialog.h" line="388"/>
         <source>20</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="482"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="492"/>
         <location filename="../build/ui_divelogexportdialog.h" line="390"/>
         <source>Theme</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="493"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="503"/>
         <location filename="../build/ui_divelogexportdialog.h" line="393"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="95"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="99"/>
         <source>Light</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="498"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="508"/>
         <location filename="../build/ui_divelogexportdialog.h" line="394"/>
         <source>Sand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="134"/>
-        <source>UDDF files (*.uddf *.UDDF)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="142"/>
-        <source>CSV files (*.csv *.CSV)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="74"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="76"/>
         <source>Generic format that is used for data exchange between a variety of diving related programs.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="76"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="78"/>
         <source>Comma separated values describing the dive profile.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="78"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="80"/>
         <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="80"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="82"/>
         <source>Send the dive data to divelogs.de website.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="82"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="84"/>
         <source>Send the dive data to dive-share.appspot.com website</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="84"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="86"/>
         <source>HTML export of the dive locations, visualized on a world map.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="86"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="88"/>
         <source>Subsurface native XML format.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="88"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="90"/>
         <source>Write depths of images to file.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="133"/>
-        <source>Export UDDF file as</source>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="92"/>
+        <source>Write dive as TeX macros to file.</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.cpp" line="137"/>
+        <source>Export UDDF file as</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/>
+        <source>UDDF files (*.uddf *.UDDF)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divelogexportdialog.cpp" line="141"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="145"/>
         <source>Export CSV file as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="148"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="142"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="146"/>
+        <source>CSV files (*.csv *.CSV)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="152"/>
         <source>Export world map</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="149"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="169"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="153"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="177"/>
         <source>HTML files (*.html)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="153"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="157"/>
         <source>Export Subsurface XML</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="158"/>
         <source>XML files (*.xml *.ssrf)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="162"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="166"/>
         <source>Save image depths</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="168"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="170"/>
+        <source>Export to TeX file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="170"/>
+        <source>TeX files (*.tex)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="176"/>
         <source>Export HTML files as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="184"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="192"/>
         <source>Please wait, exporting...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="219"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="227"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="311"/>
         <source>Can&apos;t open file %s</source>
         <translation type="unfinished"/>
     </message>
@@ -2663,25 +2732,6 @@ GPS location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="643"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="727"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="856"/>
-        <source>Time</source>
-        <translation>Idő</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.ui" line="127"/>
-        <location filename="../build/ui_divelogimportdialog.h" line="164"/>
-        <source>Metric</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.ui" line="132"/>
-        <location filename="../build/ui_divelogimportdialog.h" line="165"/>
-        <source>Imperial</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divelogimportdialog.ui" line="89"/>
         <location filename="../build/ui_divelogimportdialog.h" line="152"/>
         <source>dd.mm.yyyy</source>
@@ -2700,269 +2750,287 @@ GPS location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.ui" line="155"/>
-        <location filename="../build/ui_divelogimportdialog.h" line="167"/>
-        <source>Drag the tags above to each corresponding column below</source>
+        <location filename="../desktop-widgets/divelogimportdialog.ui" line="108"/>
+        <location filename="../build/ui_divelogimportdialog.h" line="158"/>
+        <source>Seconds</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="641"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="729"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="852"/>
-        <source>Dive #</source>
+        <location filename="../desktop-widgets/divelogimportdialog.ui" line="113"/>
+        <location filename="../build/ui_divelogimportdialog.h" line="159"/>
+        <source>Minutes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="642"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="723"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="854"/>
-        <source>Date</source>
-        <translation>Dátum</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.ui" line="118"/>
+        <location filename="../build/ui_divelogimportdialog.h" line="160"/>
+        <source>Minutes:seconds</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="644"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="858"/>
-        <source>Duration</source>
-        <translation>Tartam</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.ui" line="127"/>
+        <location filename="../build/ui_divelogimportdialog.h" line="164"/>
+        <source>Metric</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="655"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="862"/>
-        <source>GPS</source>
+        <location filename="../desktop-widgets/divelogimportdialog.ui" line="132"/>
+        <location filename="../build/ui_divelogimportdialog.h" line="165"/>
+        <source>Imperial</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="645"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="864"/>
-        <source>Max. depth</source>
+        <location filename="../desktop-widgets/divelogimportdialog.ui" line="155"/>
+        <location filename="../build/ui_divelogimportdialog.h" line="167"/>
+        <source>Drag the tags above to each corresponding column below</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="646"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="866"/>
-        <source>Avg. depth</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="355"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="528"/>
+        <source>Tab</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="658"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="872"/>
-        <source>Suit</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="598"/>
+        <source>Some column headers were pre-populated; please drag and drop the headers so they match the column they are in.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="663"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="878"/>
-        <source>Tags</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="636"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="761"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="857"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="925"/>
+        <source>Sample time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="652"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="894"/>
-        <source>O₂</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="638"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="763"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="859"/>
+        <source>Sample depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="653"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="896"/>
-        <source>He</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="640"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="765"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="861"/>
+        <source>Sample temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.ui" line="108"/>
-        <location filename="../build/ui_divelogimportdialog.h" line="158"/>
-        <source>Seconds</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="642"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="767"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="863"/>
+        <source>Sample pO₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.ui" line="113"/>
-        <location filename="../build/ui_divelogimportdialog.h" line="159"/>
-        <source>Minutes</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="644"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="769"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="865"/>
+        <source>Sample sensor1 pO₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.ui" line="118"/>
-        <location filename="../build/ui_divelogimportdialog.h" line="160"/>
-        <source>Minutes:seconds</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="646"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="771"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="867"/>
+        <source>Sample sensor2 pO₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="654"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="860"/>
-        <source>Location</source>
-        <translation>Hely</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="648"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="773"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="869"/>
+        <source>Sample sensor3 pO₂</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="354"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="499"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="505"/>
-        <source>Tab</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="650"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="775"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="871"/>
+        <source>Sample CNS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="575"/>
-        <source>Some column headers were pre-populated; please drag and drop the headers so they match the column they are in.</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="652"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="777"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="873"/>
+        <source>Sample NDL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="613"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="731"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="782"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="848"/>
-        <source>Sample time</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="654"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="779"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="875"/>
+        <source>Sample TTS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="615"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="733"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="784"/>
-        <source>Sample depth</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="656"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="781"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="877"/>
+        <source>Sample stopdepth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="617"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="735"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="786"/>
-        <source>Sample temperature</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="658"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="783"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="879"/>
+        <source>Sample pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="621"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="739"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="790"/>
-        <source>Sample sensor1 pO₂</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="660"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="785"/>
+        <source>Sample setpoint</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="623"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="741"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="792"/>
-        <source>Sample sensor2 pO₂</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="664"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="759"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="929"/>
+        <source>Dive #</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="625"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="743"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="794"/>
-        <source>Sample sensor3 pO₂</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="665"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="753"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="931"/>
+        <source>Date</source>
+        <translation>Dátum</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="666"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="757"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="933"/>
+        <source>Time</source>
+        <translation>Idő</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="667"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="935"/>
+        <source>Duration</source>
+        <translation>Tartam</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="668"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="941"/>
+        <source>Max. depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="633"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="751"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="802"/>
-        <source>Sample stopdepth</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="669"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="943"/>
+        <source>Avg. depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="637"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="755"/>
-        <source>Sample setpoint</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="670"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="975"/>
+        <source>Air temp.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="619"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="737"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="788"/>
-        <source>Sample pO₂</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="671"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="977"/>
+        <source>Water temp.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="627"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="745"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="796"/>
-        <source>Sample CNS</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="672"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="965"/>
+        <source>Cyl. size</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="629"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="747"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="798"/>
-        <source>Sample NDL</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="673"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="967"/>
+        <source>Start pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="631"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="749"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="800"/>
-        <source>Sample TTS</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="674"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="969"/>
+        <source>End pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="635"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="753"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="804"/>
-        <source>Sample pressure</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="675"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="971"/>
+        <source>O₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="656"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="868"/>
-        <source>Divemaster</source>
-        <translation>Merülés vezető</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="676"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="973"/>
+        <source>He</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="657"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="870"/>
-        <source>Buddy</source>
-        <translation>Társ</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="677"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="937"/>
+        <source>Location</source>
+        <translation>Hely</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="659"/>
-        <source>Rating</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="678"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="939"/>
+        <source>GPS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="660"/>
-        <source>Visibility</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="679"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="945"/>
+        <source>Divemaster</source>
+        <translation>Merülés vezető</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="661"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="874"/>
-        <source>Notes</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="680"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="947"/>
+        <source>Buddy</source>
+        <translation>Társ</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="662"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="876"/>
-        <source>Weight</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="681"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="949"/>
+        <source>Suit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="649"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="888"/>
-        <source>Cyl. size</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="682"/>
+        <source>Rating</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="650"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="890"/>
-        <source>Start pressure</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="683"/>
+        <source>Visibility</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="651"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="892"/>
-        <source>End pressure</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="684"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="951"/>
+        <source>Notes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="647"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="898"/>
-        <source>Air temp.</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="685"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="953"/>
+        <source>Weight</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="648"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="900"/>
-        <source>Water temp.</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="686"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="955"/>
+        <source>Tags</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DiveObjectHelper</name>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="287"/>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="323"/>
         <source>%1 dive(s)</source>
         <translation type="unfinished"/>
     </message>
@@ -2970,18 +3038,18 @@ GPS location:</source>
 <context>
     <name>DivePlanner</name>
     <message>
-        <location filename="../desktop-widgets/diveplanner.ui" line="152"/>
-        <location filename="../build/ui_diveplanner.h" line="190"/>
-        <source>Altitude</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/diveplanner.ui" line="109"/>
         <location filename="../build/ui_diveplanner.h" line="189"/>
         <source>Planned dive time</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/diveplanner.ui" line="152"/>
+        <location filename="../build/ui_diveplanner.h" line="190"/>
+        <source>Altitude</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/diveplanner.ui" line="159"/>
         <location filename="../build/ui_diveplanner.h" line="191"/>
         <source>ATM pressure</source>
@@ -3015,32 +3083,32 @@ GPS location:</source>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="134"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="136"/>
         <source>unknown</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="312"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="326"/>
         <source>Final depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="314"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="328"/>
         <source>Run time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="316"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="330"/>
         <source>Duration</source>
         <translation>Tartam</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="318"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="332"/>
         <source>Used gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="320"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="334"/>
         <source>CC setpoint</source>
         <translation type="unfinished"/>
     </message>
@@ -3048,22 +3116,22 @@ GPS location:</source>
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="108"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="112"/>
         <source>Dive planner points</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="112"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="116"/>
         <source>Available gases</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="137"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="143"/>
         <source>Add dive data point</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="146"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="152"/>
         <source>Save new</source>
         <translation type="unfinished"/>
     </message>
@@ -3096,11 +3164,36 @@ GPS location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="124"/>
+        <source>User entered</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="126"/>
+        <source>Cylinder index</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="128"/>
         <source>Pressure S</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="130"/>
+        <source>Pressure I</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="132"/>
+        <source>Ceiling</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="134"/>
+        <source>SAC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="136"/>
         <source>pN₂</source>
         <translation type="unfinished"/>
@@ -3136,48 +3229,23 @@ GPS location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="152"/>
-        <source>Heart rate</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="156"/>
-        <source>Mean depth @ s</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="150"/>
         <source>Ambient pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="154"/>
-        <source>Gradient factor</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="130"/>
-        <source>Pressure I</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="124"/>
-        <source>User entered</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="126"/>
-        <source>Cylinder index</source>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="152"/>
+        <source>Heart rate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="132"/>
-        <source>Ceiling</source>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="154"/>
+        <source>Gradient factor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="134"/>
-        <source>SAC</source>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="156"/>
+        <source>Mean depth @ s</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -3245,308 +3313,312 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="395"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="441"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="434"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="483"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="398"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="444"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="437"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="486"/>
         <source>Date</source>
         <translation>Dátum</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="401"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="447"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="440"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="489"/>
         <source>Rating</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="404"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="443"/>
         <source>Depth</source>
         <translation>Mélység</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="410"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="446"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="495"/>
+        <source>Duration</source>
+        <translation>Tartam</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="449"/>
         <source>Temp</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="413"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="452"/>
         <source>Weight</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="425"/>
-        <source>SAC</source>
+        <location filename="../qt-models/divetripmodel.cpp" line="455"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="504"/>
+        <source>Suit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
-        <source>m</source>
-        <translation type="unfinished"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="458"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="507"/>
+        <source>Cyl</source>
+        <translation>Pal</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
-        <source>ft</source>
+        <location filename="../qt-models/divetripmodel.cpp" line="461"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="510"/>
+        <source>Gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
-        <source>Weight(%1)</source>
+        <location filename="../qt-models/divetripmodel.cpp" line="464"/>
+        <source>SAC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="416"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="462"/>
-        <source>Suit</source>
+        <location filename="../qt-models/divetripmodel.cpp" line="467"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="518"/>
+        <source>OTU</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="419"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="465"/>
-        <source>Cyl</source>
-        <translation>Pal</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="470"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="521"/>
+        <source>Max CNS</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="422"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="468"/>
-        <source>Gas</source>
+        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
+        <source>Photos</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
-        <source>SAC(%1)</source>
+        <location filename="../qt-models/divetripmodel.cpp" line="476"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="527"/>
+        <source>Location</source>
+        <translation>Hely</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="492"/>
+        <source>Depth(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
-        <source>/min</source>
+        <location filename="../qt-models/divetripmodel.cpp" line="492"/>
+        <source>m</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="431"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="479"/>
-        <source>Max CNS</source>
+        <location filename="../qt-models/divetripmodel.cpp" line="492"/>
+        <source>ft</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="434"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="482"/>
-        <source>Location</source>
-        <translation>Hely</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="498"/>
+        <source>Temp(%1%2)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
-        <source>kg</source>
+        <location filename="../qt-models/divetripmodel.cpp" line="501"/>
+        <source>Weight(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
-        <source>Depth(%1)</source>
+        <location filename="../qt-models/divetripmodel.cpp" line="501"/>
+        <source>kg</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="407"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="453"/>
-        <source>Duration</source>
-        <translation>Tartam</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="501"/>
+        <source>lbs</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="456"/>
-        <source>Temp(%1%2)</source>
+        <location filename="../qt-models/divetripmodel.cpp" line="515"/>
+        <source>SAC(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
-        <source>lbs</source>
+        <location filename="../qt-models/divetripmodel.cpp" line="515"/>
+        <source>/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="428"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="476"/>
-        <source>OTU</source>
+        <location filename="../qt-models/divetripmodel.cpp" line="524"/>
+        <source>Photos before/during/after dive</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="164"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="165"/>
         <source>no dives were selected</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="174"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="175"/>
         <source>stylesheet to export to divelogs.de is not found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="184"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="185"/>
         <source>failed to create zip file for upload: %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="236"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="237"/>
         <source>internal error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="244"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="245"/>
         <source>Conversion of dive %1 to divelogs.de format failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="272"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="273"/>
         <source>error writing zip file: %s zip error %d system error %d - %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="745"/>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="935"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="936"/>
         <source>Done</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="778"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="779"/>
         <source>Uploading dive list...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="810"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="811"/>
         <source>Downloading dive list...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="851"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="852"/>
         <source>Downloading %1 dives...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="885"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="886"/>
         <source>Download finished - %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="899"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="900"/>
         <source>Problem with download</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="900"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="901"/>
         <source>The archive could not be opened:
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="909"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="910"/>
         <source>Corrupted download</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="910"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="911"/>
         <source>The archive could not be opened:
 %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="937"/>
+        <source>Upload finished</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="950"/>
         <source>Upload failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="952"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="953"/>
         <source>Upload successful</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="955"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="956"/>
         <source>Login failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="958"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="959"/>
         <source>Cannot parse response</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="970"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="971"/>
         <source>Error: %1</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="936"/>
-        <source>Upload finished</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>DownloadFromDCWidget</name>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="185"/>
-        <source>Error</source>
-        <translation>Hiba</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="436"/>
-        <source>Retry</source>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="107"/>
+        <source>Download</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="280"/>
-        <source>Find Uemis dive computer</source>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="110"/>
+        <source>Choose Bluetooth download mode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="101"/>
-        <source>Download</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="191"/>
+        <source>Error</source>
+        <translation>Hiba</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="104"/>
-        <source>Choose Bluetooth download mode</source>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="286"/>
+        <source>Find Uemis dive computer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="382"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="392"/>
         <source>Choose file for divecomputer download logfile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="383"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="393"/>
         <source>Log files (*.log)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="398"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="408"/>
         <source>Warning</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="399"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="409"/>
         <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="410"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="420"/>
         <source>Choose file for divecomputer binary dump file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="411"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="421"/>
         <source>Dump files (*.bin)</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>DownloadFromDiveComputer</name>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="139"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="275"/>
-        <source>Vendor</source>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="446"/>
+        <source>Retry</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>DownloadFromDiveComputer</name>
     <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="14"/>
         <location filename="../build/ui_downloadfromdivecomputer.h" line="265"/>
@@ -3560,17 +3632,6 @@ p, li { white-space: pre-wrap; }
         <translation>Eszköz vagy csatolási pont</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="122"/>
-        <source>Choose Bluetooth download mode</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="149"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="276"/>
-        <source>Dive computer</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="66"/>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="101"/>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="115"/>
@@ -3594,27 +3655,50 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="87"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="270"/>
+        <source>Download into new trip</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="94"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="271"/>
+        <source>Save libdivecomputer logfile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="108"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="273"/>
+        <source>Save libdivecomputer dumpfile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="122"/>
+        <source>Choose Bluetooth download mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="129"/>
         <source>Select a remote Bluetooth device.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="52"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="277"/>
-        <source>Download</source>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="139"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="275"/>
+        <source>Vendor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="284"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="281"/>
-        <source>OK</source>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="149"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="276"/>
+        <source>Dive computer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="291"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="282"/>
-        <source>Cancel</source>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="52"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="277"/>
+        <source>Download</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -3636,21 +3720,15 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="94"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="271"/>
-        <source>Save libdivecomputer logfile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="108"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="273"/>
-        <source>Save libdivecomputer dumpfile</source>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="284"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="281"/>
+        <source>OK</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="87"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="270"/>
-        <source>Download into new trip</source>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="291"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="282"/>
+        <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -3741,12 +3819,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="297"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="242"/>
         <source>To disconnect Subsurface from your Facebook account, use the button below</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="306"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="251"/>
         <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source>
         <translation type="unfinished"/>
     </message>
@@ -3754,22 +3832,22 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>FacebookManager</name>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="266"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="211"/>
         <source>Photo upload sucessfull</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="267"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="212"/>
         <source>Your dive profile was updated to Facebook.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="271"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="216"/>
         <source>Photo upload failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="272"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="217"/>
         <source>Your dive profile was not updated to Facebook, 
  please send the following to the developer. 
 </source>
@@ -3829,17 +3907,25 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>FirmwareUpdateThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1750"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1739"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1755"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1744"/>
         <source>Firmware update failed!</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
+    <name>GlobalDrawer</name>
+    <message>
+        <location filename="../mobile-widgets/qml/kirigami/src/controls/GlobalDrawer.qml" line="364"/>
+        <source>Back</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>GlobeGPS</name>
     <message>
         <location filename="../desktop-widgets/globe.cpp" line="124"/>
@@ -3855,27 +3941,27 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="40"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="32"/>
         <source>Date: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="50"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="42"/>
         <source>Name: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="60"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="52"/>
         <source>Latitude: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="69"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="61"/>
         <source>Longitude: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="113"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="105"/>
         <source>List of stored GPS fixes</source>
         <translation type="unfinished"/>
     </message>
@@ -3904,7 +3990,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>LocationFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="648"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="646"/>
         <source>Location: </source>
         <translation type="unfinished"/>
     </message>
@@ -3945,7 +4031,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>LocationFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="299"/>
+        <location filename="../qt-models/filtermodels.cpp" line="304"/>
         <source>No location set</source>
         <translation type="unfinished"/>
     </message>
@@ -4066,20 +4152,55 @@ p, li { white-space: pre-wrap; }
     </message>
 </context>
 <context>
-    <name>MainForm.ui</name>
+    <name>MainTab</name>
     <message>
-        <location filename="../packaging/ios/Subsurface-mobile/MainForm.ui.qml" line="17"/>
-        <source>Press Me 1</source>
+        <location filename="../desktop-widgets/maintab.ui" line="18"/>
+        <location filename="../desktop-widgets/maintab.ui" line="439"/>
+        <location filename="../build/ui_maintab.h" line="961"/>
+        <location filename="../build/ui_maintab.h" line="963"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="539"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="571"/>
+        <source>Notes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../packaging/ios/Subsurface-mobile/MainForm.ui.qml" line="22"/>
-        <source>Press Me 2</source>
+        <location filename="../desktop-widgets/maintab.ui" line="21"/>
+        <location filename="../build/ui_maintab.h" line="964"/>
+        <source>General notes about the current selection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="92"/>
+        <location filename="../desktop-widgets/maintab.ui" line="646"/>
+        <location filename="../build/ui_maintab.h" line="947"/>
+        <location filename="../build/ui_maintab.h" line="967"/>
+        <source>Date</source>
+        <translation>Dátum</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="102"/>
+        <location filename="../build/ui_maintab.h" line="948"/>
+        <source>Time</source>
+        <translation>Idő</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="112"/>
+        <location filename="../desktop-widgets/maintab.ui" line="836"/>
+        <location filename="../build/ui_maintab.h" line="949"/>
+        <location filename="../build/ui_maintab.h" line="987"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="306"/>
+        <source>Air temp.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="122"/>
+        <location filename="../desktop-widgets/maintab.ui" line="855"/>
+        <location filename="../build/ui_maintab.h" line="950"/>
+        <location filename="../build/ui_maintab.h" line="989"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="307"/>
+        <source>Water temp.</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>MainTab</name>
     <message>
         <location filename="../desktop-widgets/maintab.ui" line="184"/>
         <location filename="../build/ui_maintab.h" line="951"/>
@@ -4088,6 +4209,17 @@ p, li { white-space: pre-wrap; }
         <translation>Hely</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="214"/>
+        <source>Edit dive site</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="217"/>
+        <location filename="../build/ui_maintab.h" line="953"/>
+        <source>...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="252"/>
         <location filename="../build/ui_maintab.h" line="954"/>
         <source>Divemaster</source>
@@ -4100,12 +4232,6 @@ p, li { white-space: pre-wrap; }
         <translation>Társ</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.ui" line="387"/>
-        <location filename="../build/ui_maintab.h" line="959"/>
-        <source>Tags</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/maintab.ui" line="308"/>
         <location filename="../build/ui_maintab.h" line="956"/>
         <source>Rating</source>
@@ -4124,54 +4250,15 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.ui" line="397"/>
-        <location filename="../build/ui_maintab.h" line="960"/>
-        <source>Dive mode</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="112"/>
-        <location filename="../desktop-widgets/maintab.ui" line="836"/>
-        <location filename="../build/ui_maintab.h" line="949"/>
-        <location filename="../build/ui_maintab.h" line="987"/>
-        <location filename="../desktop-widgets/maintab.cpp" line="306"/>
-        <source>Air temp.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="122"/>
-        <location filename="../desktop-widgets/maintab.ui" line="855"/>
-        <location filename="../build/ui_maintab.h" line="950"/>
-        <location filename="../build/ui_maintab.h" line="989"/>
-        <location filename="../desktop-widgets/maintab.cpp" line="307"/>
-        <source>Water temp.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="18"/>
-        <location filename="../desktop-widgets/maintab.ui" line="439"/>
-        <location filename="../build/ui_maintab.h" line="961"/>
-        <location filename="../build/ui_maintab.h" line="963"/>
-        <location filename="../desktop-widgets/maintab.cpp" line="539"/>
-        <location filename="../desktop-widgets/maintab.cpp" line="571"/>
-        <source>Notes</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="21"/>
-        <location filename="../build/ui_maintab.h" line="964"/>
-        <source>General notes about the current selection</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="214"/>
-        <source>Edit dive site</source>
+        <location filename="../desktop-widgets/maintab.ui" line="387"/>
+        <location filename="../build/ui_maintab.h" line="959"/>
+        <source>Tags</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.ui" line="217"/>
-        <location filename="../build/ui_maintab.h" line="953"/>
-        <source>...</source>
+        <location filename="../desktop-widgets/maintab.ui" line="397"/>
+        <location filename="../build/ui_maintab.h" line="960"/>
+        <source>Dive mode</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -4199,6 +4286,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="665"/>
+        <location filename="../build/ui_maintab.h" line="969"/>
+        <source>Interval</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="684"/>
         <location filename="../build/ui_maintab.h" line="971"/>
         <source>Gases used</source>
@@ -4211,18 +4304,38 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="722"/>
+        <location filename="../desktop-widgets/maintab.ui" line="1094"/>
+        <location filename="../build/ui_maintab.h" line="975"/>
+        <location filename="../build/ui_maintab.h" line="1003"/>
+        <source>SAC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="741"/>
         <location filename="../build/ui_maintab.h" line="977"/>
         <source>CNS</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="760"/>
+        <location filename="../build/ui_maintab.h" line="979"/>
+        <source>OTU</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="779"/>
         <location filename="../build/ui_maintab.h" line="981"/>
         <source>Max. depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="798"/>
+        <location filename="../build/ui_maintab.h" line="983"/>
+        <source>Avg. depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="817"/>
         <location filename="../build/ui_maintab.h" line="985"/>
         <source>Air pressure</source>
@@ -4235,82 +4348,6 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.ui" line="933"/>
-        <location filename="../build/ui_maintab.h" line="1007"/>
-        <source>Simple statistics about the selection</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1039"/>
-        <location filename="../build/ui_maintab.h" line="999"/>
-        <source>Total time</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1106"/>
-        <location filename="../build/ui_maintab.h" line="1004"/>
-        <source>Gas consumption</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1151"/>
-        <location filename="../build/ui_maintab.h" line="1009"/>
-        <source>All photos from the current selection</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1177"/>
-        <location filename="../build/ui_maintab.h" line="1010"/>
-        <source>Extra data</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1180"/>
-        <location filename="../build/ui_maintab.h" line="1011"/>
-        <source>Adittional data from the dive computer</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="92"/>
-        <location filename="../desktop-widgets/maintab.ui" line="646"/>
-        <location filename="../build/ui_maintab.h" line="947"/>
-        <location filename="../build/ui_maintab.h" line="967"/>
-        <source>Date</source>
-        <translation>Dátum</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="102"/>
-        <location filename="../build/ui_maintab.h" line="948"/>
-        <source>Time</source>
-        <translation>Idő</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="665"/>
-        <location filename="../build/ui_maintab.h" line="969"/>
-        <source>Interval</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="722"/>
-        <location filename="../desktop-widgets/maintab.ui" line="1094"/>
-        <location filename="../build/ui_maintab.h" line="975"/>
-        <location filename="../build/ui_maintab.h" line="1003"/>
-        <source>SAC</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="798"/>
-        <location filename="../build/ui_maintab.h" line="983"/>
-        <source>Avg. depth</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="760"/>
-        <location filename="../build/ui_maintab.h" line="979"/>
-        <source>OTU</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/maintab.ui" line="893"/>
         <location filename="../build/ui_maintab.h" line="993"/>
         <source>Salinity</source>
@@ -4323,22 +4360,34 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="933"/>
+        <location filename="../build/ui_maintab.h" line="1007"/>
+        <source>Simple statistics about the selection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="986"/>
         <location filename="../build/ui_maintab.h" line="996"/>
         <source>Depth</source>
         <translation>Mélység</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="998"/>
+        <location filename="../build/ui_maintab.h" line="997"/>
+        <source>Duration</source>
+        <translation>Tartam</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="1027"/>
         <location filename="../build/ui_maintab.h" line="998"/>
         <source>Temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.ui" line="998"/>
-        <location filename="../build/ui_maintab.h" line="997"/>
-        <source>Duration</source>
-        <translation>Tartam</translation>
+        <location filename="../desktop-widgets/maintab.ui" line="1039"/>
+        <location filename="../build/ui_maintab.h" line="999"/>
+        <source>Total time</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/maintab.ui" line="1058"/>
@@ -4347,19 +4396,33 @@ p, li { white-space: pre-wrap; }
         <translation>Merülések</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="1106"/>
+        <location filename="../build/ui_maintab.h" line="1004"/>
+        <source>Gas consumption</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="1148"/>
         <location filename="../build/ui_maintab.h" line="1008"/>
         <source>Photos</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.cpp" line="88"/>
-        <source>Cylinders</source>
-        <translation>Palackok</translation>
+        <location filename="../desktop-widgets/maintab.ui" line="1151"/>
+        <location filename="../build/ui_maintab.h" line="1009"/>
+        <source>All photos from the current selection</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.cpp" line="92"/>
-        <source>Weights</source>
+        <location filename="../desktop-widgets/maintab.ui" line="1177"/>
+        <location filename="../build/ui_maintab.h" line="1010"/>
+        <source>Extra data</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="1180"/>
+        <location filename="../build/ui_maintab.h" line="1011"/>
+        <source>Adittional data from the dive computer</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -4373,11 +4436,21 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.cpp" line="88"/>
+        <source>Cylinders</source>
+        <translation>Palackok</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.cpp" line="89"/>
         <source>Add cylinder</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.cpp" line="92"/>
+        <source>Weights</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.cpp" line="93"/>
         <source>Add weight system</source>
         <translation type="unfinished"/>
@@ -4568,659 +4641,685 @@ mixed from Air and using:
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="455"/>
-        <location filename="../build/ui_mainwindow.h" line="534"/>
-        <source>Export dive logs</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="510"/>
-        <location filename="../build/ui_mainwindow.h" line="542"/>
-        <source>Toggle pHe graph</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="546"/>
-        <location filename="../build/ui_mainwindow.h" line="545"/>
-        <source>Toggle calculating all tissues</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="522"/>
-        <location filename="../build/ui_mainwindow.h" line="543"/>
-        <source>Toggle DC reported ceiling</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="534"/>
-        <location filename="../build/ui_mainwindow.h" line="544"/>
-        <source>Toggle calculated ceiling</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="606"/>
-        <location filename="../build/ui_mainwindow.h" line="550"/>
-        <source>Toggle NDL, TTS</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="558"/>
-        <location filename="../build/ui_mainwindow.h" line="546"/>
-        <source>Toggle calculated ceiling with 3m increments</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="463"/>
-        <location filename="../build/ui_mainwindow.h" line="537"/>
-        <source>Configure &amp;dive computer</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="570"/>
-        <location filename="../build/ui_mainwindow.h" line="547"/>
-        <source>Toggle heart rate</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="582"/>
-        <location filename="../build/ui_mainwindow.h" line="548"/>
-        <source>Toggle MOD</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="594"/>
-        <location filename="../build/ui_mainwindow.h" line="549"/>
-        <source>Toggle EAD, END, EADD</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="618"/>
-        <location filename="../build/ui_mainwindow.h" line="551"/>
-        <source>Toggle SAC rate</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="630"/>
-        <location filename="../build/ui_mainwindow.h" line="552"/>
-        <source>Toggle ruler</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="86"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="87"/>
         <location filename="../build/ui_mainwindow.h" line="569"/>
         <source>&amp;Log</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="105"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="104"/>
         <location filename="../build/ui_mainwindow.h" line="570"/>
         <source>&amp;View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="121"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="120"/>
         <location filename="../build/ui_mainwindow.h" line="571"/>
         <source>&amp;Help</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="130"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="129"/>
         <location filename="../build/ui_mainwindow.h" line="572"/>
         <source>&amp;Import</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="139"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="138"/>
         <location filename="../build/ui_mainwindow.h" line="573"/>
         <source>&amp;Edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="144"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="143"/>
         <source>Share on</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="158"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="157"/>
         <location filename="../build/ui_mainwindow.h" line="453"/>
         <source>&amp;New logbook</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="161"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="160"/>
         <location filename="../build/ui_mainwindow.h" line="455"/>
         <source>New</source>
         <translation>Új</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="164"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="163"/>
         <location filename="../build/ui_mainwindow.h" line="457"/>
         <source>Ctrl+N</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="169"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="168"/>
         <location filename="../build/ui_mainwindow.h" line="458"/>
         <source>&amp;Open logbook</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="172"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="171"/>
         <location filename="../build/ui_mainwindow.h" line="460"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="508"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="502"/>
         <source>Open</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="175"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="174"/>
         <location filename="../build/ui_mainwindow.h" line="462"/>
         <source>Ctrl+O</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="180"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="179"/>
         <location filename="../build/ui_mainwindow.h" line="463"/>
         <source>&amp;Save</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="183"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="182"/>
         <location filename="../build/ui_mainwindow.h" line="465"/>
         <source>Save</source>
         <translation>Ment</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="186"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="185"/>
         <location filename="../build/ui_mainwindow.h" line="467"/>
         <source>Ctrl+S</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="191"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="190"/>
         <location filename="../build/ui_mainwindow.h" line="468"/>
         <source>Sa&amp;ve as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="194"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="193"/>
         <location filename="../build/ui_mainwindow.h" line="470"/>
         <source>Save as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="197"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="196"/>
         <location filename="../build/ui_mainwindow.h" line="472"/>
         <source>Ctrl+Shift+S</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="202"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="201"/>
         <location filename="../build/ui_mainwindow.h" line="473"/>
         <source>&amp;Close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="205"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="204"/>
         <location filename="../build/ui_mainwindow.h" line="475"/>
         <source>Close</source>
         <translation>Bezárás</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="208"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="207"/>
         <location filename="../build/ui_mainwindow.h" line="477"/>
         <source>Ctrl+W</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="221"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="212"/>
+        <location filename="../build/ui_mainwindow.h" line="478"/>
+        <source>&amp;Print</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="215"/>
+        <location filename="../build/ui_mainwindow.h" line="479"/>
+        <source>Ctrl+P</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="220"/>
         <location filename="../build/ui_mainwindow.h" line="480"/>
         <source>P&amp;references</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="251"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="223"/>
+        <location filename="../build/ui_mainwindow.h" line="481"/>
+        <source>Ctrl+,</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="231"/>
+        <location filename="../build/ui_mainwindow.h" line="482"/>
+        <source>&amp;Quit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="234"/>
+        <location filename="../build/ui_mainwindow.h" line="483"/>
+        <source>Ctrl+Q</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="242"/>
+        <location filename="../build/ui_mainwindow.h" line="484"/>
+        <source>Import from &amp;dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="245"/>
+        <location filename="../build/ui_mainwindow.h" line="485"/>
+        <source>Ctrl+D</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="250"/>
         <location filename="../build/ui_mainwindow.h" line="486"/>
         <source>Import &amp;GPS data from Subsurface web service</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="259"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="253"/>
+        <location filename="../build/ui_mainwindow.h" line="487"/>
+        <source>Ctrl+G</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="258"/>
         <location filename="../build/ui_mainwindow.h" line="488"/>
         <source>Edit device &amp;names</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="272"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="263"/>
+        <location filename="../build/ui_mainwindow.h" line="489"/>
+        <source>&amp;Add dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="266"/>
+        <location filename="../build/ui_mainwindow.h" line="490"/>
+        <source>Ctrl++</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="271"/>
         <location filename="../build/ui_mainwindow.h" line="491"/>
         <source>&amp;Edit dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="277"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="276"/>
         <location filename="../build/ui_mainwindow.h" line="492"/>
         <source>&amp;Copy dive components</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="280"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="279"/>
         <location filename="../build/ui_mainwindow.h" line="493"/>
         <source>Ctrl+C</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="285"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="284"/>
         <location filename="../build/ui_mainwindow.h" line="494"/>
         <source>&amp;Paste dive components</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="288"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="287"/>
         <location filename="../build/ui_mainwindow.h" line="495"/>
         <source>Ctrl+V</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="325"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="292"/>
+        <location filename="../build/ui_mainwindow.h" line="496"/>
+        <source>&amp;Renumber</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="295"/>
+        <location filename="../build/ui_mainwindow.h" line="497"/>
+        <source>Ctrl+R</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="303"/>
+        <location filename="../build/ui_mainwindow.h" line="498"/>
+        <source>Auto &amp;group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="308"/>
+        <location filename="../build/ui_mainwindow.h" line="499"/>
+        <source>&amp;Yearly statistics</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="311"/>
+        <location filename="../build/ui_mainwindow.h" line="500"/>
+        <source>Ctrl+Y</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="316"/>
+        <location filename="../build/ui_mainwindow.h" line="501"/>
+        <source>&amp;Dive list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="319"/>
+        <location filename="../build/ui_mainwindow.h" line="502"/>
+        <source>Ctrl+2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="324"/>
         <location filename="../build/ui_mainwindow.h" line="503"/>
         <source>&amp;Profile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="333"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="327"/>
+        <location filename="../build/ui_mainwindow.h" line="504"/>
+        <source>Ctrl+3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="332"/>
         <location filename="../build/ui_mainwindow.h" line="505"/>
         <source>&amp;Info</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="341"/>
-        <location filename="../build/ui_mainwindow.h" line="507"/>
-        <source>&amp;All</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="335"/>
+        <location filename="../build/ui_mainwindow.h" line="506"/>
+        <source>Ctrl+4</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="357"/>
-        <location filename="../build/ui_mainwindow.h" line="511"/>
-        <source>&amp;Next DC</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="340"/>
+        <location filename="../build/ui_mainwindow.h" line="507"/>
+        <source>&amp;All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="365"/>
-        <location filename="../build/ui_mainwindow.h" line="513"/>
-        <source>&amp;About Subsurface</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="343"/>
+        <location filename="../build/ui_mainwindow.h" line="508"/>
+        <source>Ctrl+1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="381"/>
-        <location filename="../build/ui_mainwindow.h" line="516"/>
-        <source>&amp;Globe</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="348"/>
+        <location filename="../build/ui_mainwindow.h" line="509"/>
+        <source>P&amp;revious DC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="403"/>
-        <location filename="../build/ui_mainwindow.h" line="524"/>
-        <source>Ctrl+I</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="351"/>
+        <location filename="../build/ui_mainwindow.h" line="510"/>
+        <source>Left</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="408"/>
-        <location filename="../build/ui_mainwindow.h" line="525"/>
-        <source>Import &amp;from divelogs.de</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="356"/>
+        <location filename="../build/ui_mainwindow.h" line="511"/>
+        <source>&amp;Next DC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="416"/>
-        <location filename="../build/ui_mainwindow.h" line="526"/>
-        <source>&amp;Full screen</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="359"/>
+        <location filename="../build/ui_mainwindow.h" line="512"/>
+        <source>Right</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="419"/>
-        <location filename="../build/ui_mainwindow.h" line="528"/>
-        <source>Toggle full screen</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="364"/>
+        <location filename="../build/ui_mainwindow.h" line="513"/>
+        <source>&amp;About Subsurface</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="447"/>
-        <location filename="../build/ui_mainwindow.h" line="531"/>
-        <source>&amp;Check for updates</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="372"/>
+        <location filename="../build/ui_mainwindow.h" line="514"/>
+        <source>User &amp;manual</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="452"/>
-        <location filename="../build/ui_mainwindow.h" line="532"/>
-        <source>&amp;Export</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="375"/>
+        <location filename="../build/ui_mainwindow.h" line="515"/>
+        <source>F1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="458"/>
-        <location filename="../build/ui_mainwindow.h" line="536"/>
-        <source>Ctrl+E</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="380"/>
+        <location filename="../build/ui_mainwindow.h" line="516"/>
+        <source>&amp;Globe</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="466"/>
-        <location filename="../build/ui_mainwindow.h" line="538"/>
-        <source>Ctrl+Shift+C</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="383"/>
+        <location filename="../build/ui_mainwindow.h" line="517"/>
+        <source>Ctrl+5</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="474"/>
-        <location filename="../build/ui_mainwindow.h" line="539"/>
-        <source>Edit &amp;dive in planner</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="388"/>
+        <location filename="../build/ui_mainwindow.h" line="518"/>
+        <source>P&amp;lan dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="486"/>
-        <location filename="../build/ui_mainwindow.h" line="540"/>
-        <source>Toggle pO₂ graph</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="391"/>
+        <location filename="../build/ui_mainwindow.h" line="519"/>
+        <source>Ctrl+L</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="498"/>
-        <location filename="../build/ui_mainwindow.h" line="541"/>
-        <source>Toggle pN₂ graph</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="396"/>
+        <location filename="../build/ui_mainwindow.h" line="520"/>
+        <source>&amp;Import log files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="642"/>
-        <location filename="../build/ui_mainwindow.h" line="553"/>
-        <source>Scale graph</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="399"/>
+        <location filename="../build/ui_mainwindow.h" line="522"/>
+        <source>Import divelog files from other applications</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="654"/>
-        <location filename="../build/ui_mainwindow.h" line="554"/>
-        <source>Toggle pictures</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="402"/>
+        <location filename="../build/ui_mainwindow.h" line="524"/>
+        <source>Ctrl+I</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="666"/>
-        <location filename="../build/ui_mainwindow.h" line="555"/>
-        <source>Toggle tank bar</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="407"/>
+        <location filename="../build/ui_mainwindow.h" line="525"/>
+        <source>Import &amp;from divelogs.de</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="674"/>
-        <location filename="../build/ui_mainwindow.h" line="556"/>
-        <source>&amp;Filter divelist</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="415"/>
+        <location filename="../build/ui_mainwindow.h" line="526"/>
+        <source>&amp;Full screen</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="689"/>
-        <location filename="../build/ui_mainwindow.h" line="558"/>
-        <source>Toggle tissue graph</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="418"/>
+        <location filename="../build/ui_mainwindow.h" line="528"/>
+        <source>Toggle full screen</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="694"/>
-        <location filename="../build/ui_mainwindow.h" line="559"/>
-        <source>User &amp;survey</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="421"/>
+        <location filename="../build/ui_mainwindow.h" line="530"/>
+        <source>F11</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="699"/>
-        <location filename="../build/ui_mainwindow.h" line="560"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="238"/>
-        <source>&amp;Undo</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="446"/>
+        <location filename="../build/ui_mainwindow.h" line="531"/>
+        <source>&amp;Check for updates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="702"/>
-        <location filename="../build/ui_mainwindow.h" line="561"/>
-        <source>Ctrl+Z</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="451"/>
+        <location filename="../build/ui_mainwindow.h" line="532"/>
+        <source>&amp;Export</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="707"/>
-        <location filename="../build/ui_mainwindow.h" line="562"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="239"/>
-        <source>&amp;Redo</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="454"/>
+        <location filename="../build/ui_mainwindow.h" line="534"/>
+        <source>Export dive logs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="710"/>
-        <location filename="../build/ui_mainwindow.h" line="563"/>
-        <source>Ctrl+Shift+Z</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="457"/>
+        <location filename="../build/ui_mainwindow.h" line="536"/>
+        <source>Ctrl+E</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="715"/>
-        <location filename="../build/ui_mainwindow.h" line="564"/>
-        <source>&amp;Find moved images</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="462"/>
+        <location filename="../build/ui_mainwindow.h" line="537"/>
+        <source>Configure &amp;dive computer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="720"/>
-        <source>Open c&amp;loud storage</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="465"/>
+        <location filename="../build/ui_mainwindow.h" line="538"/>
+        <source>Ctrl+Shift+C</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="725"/>
-        <source>Save to clo&amp;ud storage</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="473"/>
+        <location filename="../build/ui_mainwindow.h" line="539"/>
+        <source>Edit &amp;dive in planner</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="730"/>
-        <location filename="../build/ui_mainwindow.h" line="567"/>
-        <source>&amp;Manage dive sites</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="485"/>
+        <location filename="../build/ui_mainwindow.h" line="540"/>
+        <source>Toggle pO₂ graph</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="735"/>
-        <source>Dive Site &amp;Edit</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="497"/>
+        <location filename="../build/ui_mainwindow.h" line="541"/>
+        <source>Toggle pN₂ graph</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="740"/>
-        <source>Facebook</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="509"/>
+        <location filename="../build/ui_mainwindow.h" line="542"/>
+        <source>Toggle pHe graph</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="745"/>
-        <source>Add GPS location here</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="521"/>
+        <location filename="../build/ui_mainwindow.h" line="543"/>
+        <source>Toggle DC reported ceiling</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="677"/>
-        <location filename="../build/ui_mainwindow.h" line="557"/>
-        <source>Ctrl+F</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="533"/>
+        <location filename="../build/ui_mainwindow.h" line="544"/>
+        <source>Toggle calculated ceiling</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="213"/>
-        <location filename="../build/ui_mainwindow.h" line="478"/>
-        <source>&amp;Print</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="545"/>
+        <location filename="../build/ui_mainwindow.h" line="545"/>
+        <source>Toggle calculating all tissues</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="224"/>
-        <location filename="../build/ui_mainwindow.h" line="481"/>
-        <source>Ctrl+,</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="557"/>
+        <location filename="../build/ui_mainwindow.h" line="546"/>
+        <source>Toggle calculated ceiling with 3m increments</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="232"/>
-        <location filename="../build/ui_mainwindow.h" line="482"/>
-        <source>&amp;Quit</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="569"/>
+        <location filename="../build/ui_mainwindow.h" line="547"/>
+        <source>Toggle heart rate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="243"/>
-        <location filename="../build/ui_mainwindow.h" line="484"/>
-        <source>Import from &amp;dive computer</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="581"/>
+        <location filename="../build/ui_mainwindow.h" line="548"/>
+        <source>Toggle MOD</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="254"/>
-        <location filename="../build/ui_mainwindow.h" line="487"/>
-        <source>Ctrl+G</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="593"/>
+        <location filename="../build/ui_mainwindow.h" line="549"/>
+        <source>Toggle EAD, END, EADD</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="267"/>
-        <location filename="../build/ui_mainwindow.h" line="490"/>
-        <source>Ctrl++</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="605"/>
+        <location filename="../build/ui_mainwindow.h" line="550"/>
+        <source>Toggle NDL, TTS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="293"/>
-        <location filename="../build/ui_mainwindow.h" line="496"/>
-        <source>&amp;Renumber</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="617"/>
+        <location filename="../build/ui_mainwindow.h" line="551"/>
+        <source>Toggle SAC rate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="296"/>
-        <location filename="../build/ui_mainwindow.h" line="497"/>
-        <source>Ctrl+R</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="629"/>
+        <location filename="../build/ui_mainwindow.h" line="552"/>
+        <source>Toggle ruler</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="312"/>
-        <location filename="../build/ui_mainwindow.h" line="500"/>
-        <source>Ctrl+Y</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="641"/>
+        <location filename="../build/ui_mainwindow.h" line="553"/>
+        <source>Scale graph</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="392"/>
-        <location filename="../build/ui_mainwindow.h" line="519"/>
-        <source>Ctrl+L</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="653"/>
+        <location filename="../build/ui_mainwindow.h" line="554"/>
+        <source>Toggle pictures</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="216"/>
-        <location filename="../build/ui_mainwindow.h" line="479"/>
-        <source>Ctrl+P</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="665"/>
+        <location filename="../build/ui_mainwindow.h" line="555"/>
+        <source>Toggle tank bar</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="235"/>
-        <location filename="../build/ui_mainwindow.h" line="483"/>
-        <source>Ctrl+Q</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="673"/>
+        <location filename="../build/ui_mainwindow.h" line="556"/>
+        <source>&amp;Filter divelist</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="246"/>
-        <location filename="../build/ui_mainwindow.h" line="485"/>
-        <source>Ctrl+D</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="676"/>
+        <location filename="../build/ui_mainwindow.h" line="557"/>
+        <source>Ctrl+F</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="264"/>
-        <location filename="../build/ui_mainwindow.h" line="489"/>
-        <source>&amp;Add dive</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="688"/>
+        <source>Toggle tissue heat-map</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="304"/>
-        <location filename="../build/ui_mainwindow.h" line="498"/>
-        <source>Auto &amp;group</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="693"/>
+        <location filename="../build/ui_mainwindow.h" line="559"/>
+        <source>User &amp;survey</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="309"/>
-        <location filename="../build/ui_mainwindow.h" line="499"/>
-        <source>&amp;Yearly statistics</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="698"/>
+        <location filename="../build/ui_mainwindow.h" line="560"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="231"/>
+        <source>&amp;Undo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="317"/>
-        <location filename="../build/ui_mainwindow.h" line="501"/>
-        <source>&amp;Dive list</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="701"/>
+        <location filename="../build/ui_mainwindow.h" line="561"/>
+        <source>Ctrl+Z</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="320"/>
-        <location filename="../build/ui_mainwindow.h" line="502"/>
-        <source>Ctrl+2</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="706"/>
+        <location filename="../build/ui_mainwindow.h" line="562"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="232"/>
+        <source>&amp;Redo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="328"/>
-        <location filename="../build/ui_mainwindow.h" line="504"/>
-        <source>Ctrl+3</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="709"/>
+        <location filename="../build/ui_mainwindow.h" line="563"/>
+        <source>Ctrl+Shift+Z</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="336"/>
-        <location filename="../build/ui_mainwindow.h" line="506"/>
-        <source>Ctrl+4</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="714"/>
+        <location filename="../build/ui_mainwindow.h" line="564"/>
+        <source>&amp;Find moved images</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="344"/>
-        <location filename="../build/ui_mainwindow.h" line="508"/>
-        <source>Ctrl+1</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="719"/>
+        <source>Open c&amp;loud storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="349"/>
-        <location filename="../build/ui_mainwindow.h" line="509"/>
-        <source>P&amp;revious DC</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="724"/>
+        <source>Save to clo&amp;ud storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="352"/>
-        <location filename="../build/ui_mainwindow.h" line="510"/>
-        <source>Left</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="729"/>
+        <location filename="../build/ui_mainwindow.h" line="567"/>
+        <source>&amp;Manage dive sites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="360"/>
-        <location filename="../build/ui_mainwindow.h" line="512"/>
-        <source>Right</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="734"/>
+        <source>Dive Site &amp;Edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="373"/>
-        <location filename="../build/ui_mainwindow.h" line="514"/>
-        <source>User &amp;manual</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="739"/>
+        <source>Facebook</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="376"/>
-        <location filename="../build/ui_mainwindow.h" line="515"/>
-        <source>F1</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="744"/>
+        <source>Take cloud storage online</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="384"/>
-        <location filename="../build/ui_mainwindow.h" line="517"/>
-        <source>Ctrl+5</source>
+        <location filename="../build/ui_mainwindow.h" line="558"/>
+        <source>Toggle tissue graph</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="389"/>
-        <location filename="../build/ui_mainwindow.h" line="518"/>
-        <source>P&amp;lan dive</source>
+        <location filename="../build/ui_mainwindow.h" line="565"/>
+        <source>Open cloud storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="397"/>
-        <location filename="../build/ui_mainwindow.h" line="520"/>
-        <source>&amp;Import log files</source>
+        <location filename="../build/ui_mainwindow.h" line="566"/>
+        <source>Save to cloud storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="400"/>
-        <location filename="../build/ui_mainwindow.h" line="522"/>
-        <source>Import divelog files from other applications</source>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="331"/>
+        <source>Connect to</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="422"/>
-        <location filename="../build/ui_mainwindow.h" line="530"/>
-        <source>F11</source>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="493"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="538"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1545"/>
+        <source>Please save or cancel the current dive edit before opening a new file.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="505"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="499"/>
         <source>Open file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="509"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="503"/>
         <location filename="../desktop-widgets/mainwindow.cpp" line="614"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1972"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1978"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
@@ -5240,6 +5339,16 @@ mixed from Air and using:
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="649"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="796"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="977"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="983"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1849"/>
+        <source>Warning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="674"/>
         <source>Please save or cancel the current dive edit before closing the file.</source>
         <translation type="unfinished"/>
@@ -5255,124 +5364,97 @@ mixed from Air and using:
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="982"/>
-        <source>Trying to edit a dive that&apos;s not a manually added dive.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1243"/>
-        <source>Do you want to save the changes that you made in the file %1?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1246"/>
-        <source>Do you want to save the changes that you made in the data file?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1251"/>
-        <source>Save changes?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1587"/>
-        <source>Save file as</source>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
+        <source>Trying to replan a dive that&apos;s not a planned dive.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1682"/>
-        <source>[cloud storage for] %1</source>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="977"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1849"/>
+        <source>Please, first finish the current edition before trying to do another.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1782"/>
-        <source>Opening datafile from older version</source>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="983"/>
+        <source>Trying to edit a dive that&apos;s not a manually added dive.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1783"/>
-        <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly.
-Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1030"/>
+        <source>Yearly statistics</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1794"/>
-        <source>Open dive log file</source>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1244"/>
+        <source>Do you want to save the changes that you made in the file %1?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1795"/>
-        <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;All files (*)</source>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1247"/>
+        <source>Do you want to save the changes that you made in the data file?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1972"/>
-        <source>Contacting cloud service...</source>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1252"/>
+        <source>Save changes?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1252"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1253"/>
         <source>Changes will be lost if you don&apos;t save them.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="649"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="796"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="976"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="982"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/>
-        <source>Warning</source>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1572"/>
+        <source>Save file as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="499"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="544"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1560"/>
-        <source>Please save or cancel the current dive edit before opening a new file.</source>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1573"/>
+        <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="338"/>
-        <source>Connect to</source>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1670"/>
+        <source>[local cache for] %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
-        <source>Trying to replan a dive that&apos;s not a planned dive.</source>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1672"/>
+        <source>[cloud storage for] %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1029"/>
-        <source>Yearly statistics</source>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1788"/>
+        <source>Opening datafile from older version</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1588"/>
-        <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1789"/>
+        <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly.
+Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="976"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/>
-        <source>Please, first finish the current edition before trying to do another.</source>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1800"/>
+        <source>Open dive log file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_mainwindow.h" line="565"/>
-        <source>Open cloud storage</source>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1801"/>
+        <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_mainwindow.h" line="566"/>
-        <source>Save to cloud storage</source>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1978"/>
+        <source>Contacting cloud service...</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>MultiFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="733"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="731"/>
         <source>Filter shows %1 (of %2) dives</source>
         <translation type="unfinished"/>
     </message>
@@ -5380,39 +5462,39 @@ Subsurface has already tried to pre-populate the data but it might be worth whil
 <context>
     <name>OstcFirmwareCheck</name>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="269"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="271"/>
         <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="273"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="275"/>
         <source>
 
 Please start Bluetooth on your OSTC Sport and do the same preparations as for a logbook download before continuing with the update</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="274"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="276"/>
         <source>Not now</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="275"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="277"/>
         <source>Update firmware</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="277"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="279"/>
         <source>Firmware upgrade notice</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="295"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="297"/>
         <source>Save the downloaded firmware as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="296"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="298"/>
         <source>HEX files (*.hex)</source>
         <translation type="unfinished"/>
     </message>
@@ -5420,79 +5502,89 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PlannerSettingsWidget</name>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="322"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="302"/>
         <source>Open circuit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="322"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="302"/>
         <source>CCR</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="322"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="302"/>
         <source>pSCR</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="421"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="388"/>
         <source>ft/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="422"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="389"/>
         <source>Last stop at 20ft</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="423"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="390"/>
         <source>50% avg. depth to 20ft</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="424"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="391"/>
         <source>20ft to surface</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="426"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="392"/>
+        <source>ft</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="394"/>
         <source>m/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="427"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="395"/>
         <source>Last stop at 6m</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="428"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="396"/>
         <source>50% avg. depth to 6m</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="429"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="397"/>
         <source>6m to surface</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="432"/>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="433"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="398"/>
+        <source>m</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="401"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="402"/>
         <source>cuft/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="441"/>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="442"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="410"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="411"/>
         <source>ℓ/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="451"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="420"/>
         <source>bar</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="456"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="425"/>
         <source>psi</source>
         <translation type="unfinished"/>
     </message>
@@ -5642,6 +5734,11 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PreferencesDialog</name>
     <message>
+        <location filename="../build/ui_preferences.h" line="1283"/>
+        <source>Preferences</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1288"/>
         <source>Defaults</source>
         <translation type="unfinished"/>
@@ -5677,6 +5774,11 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1303"/>
+        <source>Lists and tables</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1304"/>
         <source>Font</source>
         <translation type="unfinished"/>
@@ -5692,6 +5794,11 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>Merülések</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1307"/>
+        <source>Default dive log file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1308"/>
         <source>No default file</source>
         <translation type="unfinished"/>
@@ -5722,6 +5829,21 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1314"/>
+        <source>Display invalid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1316"/>
+        <source>Default cylinder</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1317"/>
+        <source>Use default cylinder</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1318"/>
         <source>Animations</source>
         <translation type="unfinished"/>
@@ -5752,39 +5874,23 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1401"/>
-        <source>Dive site geo lookup</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1402"/>
-        <source>Enable geocoding for dive site management</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1403"/>
-        <source>Parse site without GPS data</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1404"/>
-        <source>Same format for existing dives</source>
+        <location filename="../build/ui_preferences.h" line="1324"/>
+        <source>&amp;Metric</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1405"/>
-        <source>Dive Site Layout</source>
+        <location filename="../build/ui_preferences.h" line="1325"/>
+        <source>Imperial</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1406"/>
-        <location filename="../build/ui_preferences.h" line="1407"/>
-        <source>/</source>
+        <location filename="../build/ui_preferences.h" line="1326"/>
+        <source>Personali&amp;ze</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1325"/>
-        <source>Imperial</source>
+        <location filename="../build/ui_preferences.h" line="1327"/>
+        <source>Individual settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -5803,6 +5909,11 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1331"/>
+        <source>Pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1332"/>
         <location filename="../build/ui_preferences.h" line="1366"/>
         <source>bar</source>
@@ -5814,329 +5925,310 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1336"/>
-        <source>cu ft</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1338"/>
-        <source>celsius</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1339"/>
-        <source>fahrenheit</source>
+        <location filename="../build/ui_preferences.h" line="1334"/>
+        <source>Volume</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1341"/>
-        <source>kg</source>
+        <location filename="../build/ui_preferences.h" line="1335"/>
+        <source>&amp;liter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1363"/>
-        <source>CCR: show setpoints when viewing pO₂</source>
+        <location filename="../build/ui_preferences.h" line="1336"/>
+        <source>cu ft</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1364"/>
-        <source>CCR: show individual O₂ sensor values when viewing pO₂</source>
+        <location filename="../build/ui_preferences.h" line="1337"/>
+        <source>Temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1365"/>
-        <source>Default CCR set-point for dive planning</source>
+        <location filename="../build/ui_preferences.h" line="1338"/>
+        <source>celsius</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1367"/>
-        <source>pSCR O₂ metabolism rate</source>
+        <location filename="../build/ui_preferences.h" line="1339"/>
+        <source>fahrenheit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1368"/>
-        <source>pSCR ratio</source>
+        <location filename="../build/ui_preferences.h" line="1340"/>
+        <source>Weight</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1369"/>
-        <source>ℓ/min</source>
+        <location filename="../build/ui_preferences.h" line="1341"/>
+        <source>kg</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1371"/>
-        <source>1:</source>
+        <location filename="../build/ui_preferences.h" line="1342"/>
+        <source>lbs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1372"/>
-        <source>UI language</source>
+        <location filename="../build/ui_preferences.h" line="1343"/>
+        <source>Time units</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1373"/>
-        <source>System default</source>
+        <location filename="../build/ui_preferences.h" line="1344"/>
+        <source>Ascent/descent speed denominator</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1375"/>
-        <source>Proxy</source>
+        <location filename="../build/ui_preferences.h" line="1345"/>
+        <source>Minutes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1379"/>
-        <source>Proxy type</source>
+        <location filename="../build/ui_preferences.h" line="1346"/>
+        <source>Seconds</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1377"/>
-        <source>Host</source>
+        <location filename="../build/ui_preferences.h" line="1347"/>
+        <source>GPS coordinates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1376"/>
-        <source>Port</source>
+        <location filename="../build/ui_preferences.h" line="1348"/>
+        <source>Location Display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1378"/>
-        <source>Requires authentication</source>
+        <location filename="../build/ui_preferences.h" line="1349"/>
+        <source>traditional (dms)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1380"/>
-        <source>Username</source>
+        <location filename="../build/ui_preferences.h" line="1350"/>
+        <source>decimal</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1381"/>
-        <location filename="../build/ui_preferences.h" line="1387"/>
-        <source>Password</source>
+        <location filename="../build/ui_preferences.h" line="1351"/>
+        <source>Show</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1400"/>
-        <source>Disconnect from Facebook</source>
+        <location filename="../build/ui_preferences.h" line="1352"/>
+        <source>Threshold when showing pO₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1374"/>
-        <source>Filter</source>
-        <translation>Szűrő</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1331"/>
-        <source>Pressure</source>
+        <location filename="../build/ui_preferences.h" line="1353"/>
+        <source>Threshold when showing pN₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1303"/>
-        <source>Lists and tables</source>
+        <location filename="../build/ui_preferences.h" line="1354"/>
+        <source>Threshold when showing pHe</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1307"/>
-        <source>Default dive log file</source>
+        <location filename="../build/ui_preferences.h" line="1355"/>
+        <source>Max pO₂ when showing MOD</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1314"/>
-        <source>Display invalid</source>
+        <location filename="../build/ui_preferences.h" line="1356"/>
+        <source>Draw dive computer reported ceiling red</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1316"/>
-        <source>Default cylinder</source>
+        <location filename="../build/ui_preferences.h" line="1357"/>
+        <source>Show unused cylinders in Equipment tab</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1317"/>
-        <source>Use default cylinder</source>
+        <location filename="../build/ui_preferences.h" line="1358"/>
+        <source>Show average depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1382"/>
-        <source>Subsurface cloud storage</source>
+        <location filename="../build/ui_preferences.h" line="1359"/>
+        <source>Misc</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1386"/>
-        <source>Email address</source>
-        <translation>Email cím</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1388"/>
-        <source>Verification PIN</source>
+        <location filename="../build/ui_preferences.h" line="1360"/>
+        <source>GFLow</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1395"/>
-        <source>Sync to cloud in the background?</source>
+        <location filename="../build/ui_preferences.h" line="1361"/>
+        <source>GFHigh</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1396"/>
-        <source>Save Password locally?</source>
+        <location filename="../build/ui_preferences.h" line="1362"/>
+        <source>GFLow at max depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1397"/>
-        <source>Subsurface web service</source>
+        <location filename="../build/ui_preferences.h" line="1363"/>
+        <source>CCR: show setpoints when viewing pO₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1398"/>
-        <source>Default user ID</source>
+        <location filename="../build/ui_preferences.h" line="1364"/>
+        <source>CCR: show individual O₂ sensor values when viewing pO₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1399"/>
-        <source>Save user ID locally?</source>
+        <location filename="../build/ui_preferences.h" line="1365"/>
+        <source>Default CCR set-point for dive planning</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1334"/>
-        <source>Volume</source>
+        <location filename="../build/ui_preferences.h" line="1367"/>
+        <source>pSCR O₂ metabolism rate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1337"/>
-        <source>Temperature</source>
+        <location filename="../build/ui_preferences.h" line="1368"/>
+        <source>pSCR ratio</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1340"/>
-        <source>Weight</source>
+        <location filename="../build/ui_preferences.h" line="1369"/>
+        <source>ℓ/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1342"/>
-        <source>lbs</source>
+        <location filename="../build/ui_preferences.h" line="1371"/>
+        <source>1:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1343"/>
-        <source>Time units</source>
+        <location filename="../build/ui_preferences.h" line="1372"/>
+        <source>UI language</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1345"/>
-        <source>Minutes</source>
+        <location filename="../build/ui_preferences.h" line="1373"/>
+        <source>System default</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1346"/>
-        <source>Seconds</source>
-        <translation type="unfinished"/>
+        <location filename="../build/ui_preferences.h" line="1374"/>
+        <source>Filter</source>
+        <translation>Szűrő</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1351"/>
-        <source>Show</source>
+        <location filename="../build/ui_preferences.h" line="1375"/>
+        <source>Proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1362"/>
-        <source>GFLow at max depth</source>
+        <location filename="../build/ui_preferences.h" line="1376"/>
+        <source>Port</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1359"/>
-        <source>Misc</source>
+        <location filename="../build/ui_preferences.h" line="1377"/>
+        <source>Host</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1283"/>
-        <source>Preferences</source>
+        <location filename="../build/ui_preferences.h" line="1378"/>
+        <source>Requires authentication</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1324"/>
-        <source>&amp;Metric</source>
+        <location filename="../build/ui_preferences.h" line="1379"/>
+        <source>Proxy type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1326"/>
-        <source>Personali&amp;ze</source>
+        <location filename="../build/ui_preferences.h" line="1380"/>
+        <source>Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1327"/>
-        <source>Individual settings</source>
+        <location filename="../build/ui_preferences.h" line="1381"/>
+        <location filename="../build/ui_preferences.h" line="1387"/>
+        <source>Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1335"/>
-        <source>&amp;liter</source>
+        <location filename="../build/ui_preferences.h" line="1382"/>
+        <source>Subsurface cloud storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1344"/>
-        <source>Ascent/descent speed denominator</source>
-        <translation type="unfinished"/>
+        <location filename="../build/ui_preferences.h" line="1386"/>
+        <source>Email address</source>
+        <translation>Email cím</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1347"/>
-        <source>GPS coordinates</source>
+        <location filename="../build/ui_preferences.h" line="1388"/>
+        <source>Verification PIN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1348"/>
-        <source>Location Display</source>
+        <location filename="../build/ui_preferences.h" line="1395"/>
+        <source>Sync to cloud in the background?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1349"/>
-        <source>traditional (dms)</source>
+        <location filename="../build/ui_preferences.h" line="1396"/>
+        <source>Save Password locally?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1350"/>
-        <source>decimal</source>
+        <location filename="../build/ui_preferences.h" line="1397"/>
+        <source>Subsurface web service</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1352"/>
-        <source>Threshold when showing pO₂</source>
+        <location filename="../build/ui_preferences.h" line="1398"/>
+        <source>Default user ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1353"/>
-        <source>Threshold when showing pN₂</source>
+        <location filename="../build/ui_preferences.h" line="1399"/>
+        <source>Save user ID locally?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1354"/>
-        <source>Threshold when showing pHe</source>
+        <location filename="../build/ui_preferences.h" line="1400"/>
+        <source>Disconnect from Facebook</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1355"/>
-        <source>Max pO₂ when showing MOD</source>
+        <location filename="../build/ui_preferences.h" line="1401"/>
+        <source>Dive site geo lookup</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1356"/>
-        <source>Draw dive computer reported ceiling red</source>
+        <location filename="../build/ui_preferences.h" line="1402"/>
+        <source>Enable geocoding for dive site management</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1357"/>
-        <source>Show unused cylinders in Equipment tab</source>
+        <location filename="../build/ui_preferences.h" line="1403"/>
+        <source>Parse site without GPS data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1358"/>
-        <source>Show average depth</source>
+        <location filename="../build/ui_preferences.h" line="1404"/>
+        <source>Same format for existing dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1360"/>
-        <source>GFLow</source>
+        <location filename="../build/ui_preferences.h" line="1405"/>
+        <source>Dive Site Layout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1361"/>
-        <source>GFHigh</source>
+        <location filename="../build/ui_preferences.h" line="1406"/>
+        <location filename="../build/ui_preferences.h" line="1407"/>
+        <source>/</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -6193,106 +6285,136 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="20"/>
-        <source>Show</source>
+        <source>Gas pressure display setup</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="29"/>
-        <source>Threshold when showing pO₂</source>
+        <source>Threshold for pO₂ (bar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="49"/>
-        <source>Threshold when showing pN₂</source>
+        <source>Threshold for pN₂ (bar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="69"/>
-        <source>Threshold when showing pHe</source>
+        <source>Threshold for pHe (bar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="89"/>
-        <source>Max pO₂ when showing MOD</source>
+        <source>pO₂ in calculating MOD (bar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="109"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="106"/>
+        <source>CCR options:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="113"/>
+        <source>Dive planner default setpoint (bar)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="133"/>
+        <source>Show setpoints when viewing pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="140"/>
+        <source>Show individual O₂ sensor values when viewing pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="150"/>
+        <source>Ceiling display setup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="159"/>
         <source>Draw dive computer reported ceiling red</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="116"/>
-        <source>Show unused cylinders in Equipment tab</source>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="169"/>
+        <source>Algorithm for calculated ceiling:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="123"/>
-        <source>Show mean depth</source>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="176"/>
+        <source>VPM-B</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="133"/>
-        <source>Misc</source>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="183"/>
+        <source>VPM-B Conservatism</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="149"/>
-        <source>bar</source>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="193"/>
+        <source>+</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="165"/>
-        <source>Default CCR set-point for dive planning</source>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="206"/>
+        <source>Bühlmann</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="172"/>
-        <source>pSCR O₂ metabolism rate</source>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="216"/>
+        <source>GFHigh</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="179"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="236"/>
         <source>GFLow</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="186"/>
-        <source>GFHigh</source>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="256"/>
+        <source>GFLow at max depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="203"/>
-        <source>ℓ/min</source>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="263"/>
+        <source>pSCR options:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="213"/>
-        <source>pSCR ratio</source>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="270"/>
+        <source>Metabolic rate (ℓ O₂/min)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="223"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="287"/>
+        <source>Dilution ratio</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="300"/>
         <source>1:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="230"/>
-        <source>CCR: show individual O₂ sensor values when viewing pO₂</source>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="310"/>
+        <source>Misc</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="237"/>
-        <source>CCR: show setpoints when viewing pO₂</source>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="316"/>
+        <source>Show unused cylinders in Equipment tab</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="244"/>
-        <source>GFLow at max depth</source>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="323"/>
+        <source>Show mean depth in Profile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="10"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="9"/>
         <source>Graph</source>
         <translation type="unfinished"/>
     </message>
@@ -6361,15 +6483,29 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="57"/>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="53"/>
         <source>Restart required</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="58"/>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="54"/>
         <source>To correctly load a new language you must restart Subsurface.</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="76"/>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="82"/>
+        <source>Literal characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="77"/>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="83"/>
+        <source>Non-special character(s) in time format.
+These will be used as is. This might not be what you intended.
+See http://doc.qt.io/qt-5/qdatetime.html#toString</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PreferencesNetwork</name>
@@ -6416,7 +6552,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_network.ui" line="156"/>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="148"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="134"/>
         <source>Subsurface cloud storage</source>
         <translation type="unfinished"/>
     </message>
@@ -6461,39 +6597,39 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="11"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="10"/>
         <source>Network</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="15"/>
         <source>No proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/>
         <source>System proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/>
         <source>HTTP proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="19"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/>
         <source>SOCKS proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="75"/>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="97"/>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="110"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="72"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="93"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="106"/>
         <source>Cloud storage email and password can only consist of letters, numbers, and &apos;.&apos;, &apos;-&apos;, &apos;_&apos;, and &apos;+&apos;.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="146"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="132"/>
         <source>Subsurface cloud storage (credentials verified)</source>
         <translation type="unfinished"/>
     </message>
@@ -6651,7 +6787,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="8"/>
+        <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="7"/>
         <source>Units</source>
         <translation type="unfinished"/>
     </message>
@@ -6659,17 +6795,17 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PrintDialog</name>
     <message>
-        <location filename="../desktop-widgets/printdialog.cpp" line="118"/>
-        <source>&amp;Preview</source>
+        <location filename="../desktop-widgets/printdialog.cpp" line="102"/>
+        <source>P&amp;rint</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/printdialog.cpp" line="115"/>
-        <source>P&amp;rint</source>
+        <location filename="../desktop-widgets/printdialog.cpp" line="105"/>
+        <source>&amp;Preview</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/printdialog.cpp" line="130"/>
+        <location filename="../desktop-widgets/printdialog.cpp" line="117"/>
         <source>Print</source>
         <translation type="unfinished"/>
     </message>
@@ -6677,18 +6813,9 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PrintOptions</name>
     <message>
-        <location filename="../build/ui_printoptions.h" line="150"/>
-        <source>&amp;Table print</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../build/ui_printoptions.h" line="158"/>
-        <source>One dive per page</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../build/ui_printoptions.h" line="159"/>
-        <source>Two dives per page</source>
+        <location filename="../desktop-widgets/printoptions.ui" line="29"/>
+        <location filename="../build/ui_printoptions.h" line="148"/>
+        <source>Print type</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -6749,9 +6876,18 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/printoptions.ui" line="29"/>
-        <location filename="../build/ui_printoptions.h" line="148"/>
-        <source>Print type</source>
+        <location filename="../build/ui_printoptions.h" line="150"/>
+        <source>&amp;Table print</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../build/ui_printoptions.h" line="158"/>
+        <source>One dive per page</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../build/ui_printoptions.h" line="159"/>
+        <source>Two dives per page</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -6794,103 +6930,103 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="755"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="752"/>
         <source>Show NDL / TTS was disabled because of excessive processing time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1344"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1338"/>
         <source>Make first divecomputer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1346"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1340"/>
         <source>Delete this divecomputer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1360"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1354"/>
         <source>Add gas change</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1363"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1357"/>
         <source> (Tank %1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1371"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1365"/>
         <source>Add set-point change</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1373"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1367"/>
         <source>Add bookmark</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1377"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1371"/>
         <source>Edit the profile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1381"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1375"/>
         <source>Remove event</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1386"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1380"/>
         <source>Hide similar events</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1393"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1387"/>
         <source>Edit name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1422"/>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1429"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1416"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1423"/>
         <source>Adjust pressure of tank %1 (currently interpolated as %2)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1444"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1438"/>
         <source>Unhide all events</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1479"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1473"/>
         <source>Hide events</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1479"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1473"/>
         <source>Hide all %1 events?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1514"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1508"/>
         <source>Remove the selected event?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1515"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1509"/>
         <source>%1 @ %2:%3</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1638"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1632"/>
         <source>Edit name of bookmark</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1639"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1633"/>
         <source>Custom name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1644"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1638"/>
         <source>Name is too long!</source>
         <translation type="unfinished"/>
     </message>
@@ -6898,91 +7034,101 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>QMLManager</name>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="95"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="97"/>
         <source>Starting...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="202"/>
         <source>working in no-cloud mode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="213"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="216"/>
         <source>no cloud credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="214"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="270"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="217"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="269"/>
         <source>Please enter valid cloud credentials.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="285"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="284"/>
         <source>Attempting to open cloud storage with new credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="304"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="306"/>
         <source>Testing cloud credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="331"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="320"/>
+        <source>No response from cloud server to validate the credentials</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="329"/>
+        <source>Cannot connect to cloud storage - cloud account not verified</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="361"/>
         <source>Cloud credentials are invalid</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="344"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="374"/>
         <source>Cannot open cloud storage: Error creating https connection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="357"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="387"/>
         <source>Cannot open cloud storage: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="369"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="399"/>
         <source>Cannot connect to cloud storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="411"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="441"/>
         <source>Cloud storage error: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="501"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="531"/>
         <source>Failed to connect to cloud server, reverting to no cloud status</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="520"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="550"/>
         <source>Cloud storage open successfully. No dives in dive list.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="689"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="690"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="721"/>
         <source>h</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="689"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="690"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="691"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="721"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="722"/>
         <source>min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="689"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/>
         <source>sec</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="1041"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="1102"/>
         <source>Unknown GPS location</source>
         <translation type="unfinished"/>
     </message>
@@ -6990,126 +7136,126 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../core/qthelper.cpp" line="866"/>
-        <location filename="../core/qthelper.cpp" line="1214"/>
-        <source>AIR</source>
-        <translation>LÉG</translation>
+        <location filename="../core/gpslocation.h" line="13"/>
+        <source>Waiting to aquire GPS location</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="1214"/>
-        <source>OXYGEN</source>
+        <location filename="../core/qthelper.cpp" line="766"/>
+        <location filename="../core/qthelper.cpp" line="1275"/>
+        <source>m</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="59"/>
-        <source>Remove this point</source>
+        <location filename="../core/qthelper.cpp" line="768"/>
+        <location filename="../core/qthelper.cpp" line="1274"/>
+        <source>ft</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="32"/>
-        <source>Average</source>
-        <translation>Átlag</translation>
+        <location filename="../core/qthelper.cpp" line="794"/>
+        <source>C</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="35"/>
-        <source>Minimum</source>
-        <translation>Minimum</translation>
+        <location filename="../core/qthelper.cpp" line="796"/>
+        <source>F</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="38"/>
-        <source>Maximum</source>
-        <translation>Maximum</translation>
+        <location filename="../core/qthelper.cpp" line="821"/>
+        <location filename="../core/qthelper.cpp" line="1250"/>
+        <source>kg</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/globe.cpp" line="327"/>
-        <source>Move the map and double-click to set the dive location</source>
+        <location filename="../core/qthelper.cpp" line="823"/>
+        <location filename="../core/qthelper.cpp" line="1251"/>
+        <source>lbs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="28"/>
-        <source>unknown</source>
+        <location filename="../core/qthelper.cpp" line="848"/>
+        <location filename="../core/qthelper.cpp" line="1300"/>
+        <source>bar</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="105"/>
-        <source>h:</source>
+        <location filename="../core/qthelper.cpp" line="850"/>
+        <location filename="../core/qthelper.cpp" line="1299"/>
+        <source>psi</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="105"/>
-        <source>min</source>
-        <translation type="unfinished"/>
+        <location filename="../core/qthelper.cpp" line="871"/>
+        <location filename="../core/qthelper.cpp" line="1235"/>
+        <source>AIR</source>
+        <translation>LÉG</translation>
     </message>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="337"/>
-        <source>Multiple</source>
+        <location filename="../core/qthelper.cpp" line="873"/>
+        <source>EAN</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="../core/qthelper.cpp" line="957"/>
+        <location filename="../core/qthelper.cpp" line="962"/>
         <source>(%n dive(s))</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="816"/>
-        <location filename="../core/qthelper.cpp" line="1228"/>
-        <source>kg</source>
+        <location filename="../core/qthelper.cpp" line="1235"/>
+        <source>OXYGEN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="818"/>
-        <location filename="../core/qthelper.cpp" line="1229"/>
-        <source>lbs</source>
+        <location filename="../core/qthelper.cpp" line="1322"/>
+        <source>l</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="763"/>
-        <location filename="../core/qthelper.cpp" line="1252"/>
-        <source>ft</source>
+        <location filename="../core/qthelper.cpp" line="1323"/>
+        <source>cuft</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="761"/>
-        <location filename="../core/qthelper.cpp" line="1253"/>
-        <source>m</source>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="29"/>
+        <source>unknown</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="789"/>
-        <source>C</source>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="114"/>
+        <source>h:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="791"/>
-        <source>F</source>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="114"/>
+        <source>min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="845"/>
-        <location filename="../core/qthelper.cpp" line="1275"/>
-        <source>psi</source>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="63"/>
+        <source>Remove this point</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="843"/>
-        <location filename="../core/qthelper.cpp" line="1276"/>
-        <source>bar</source>
+        <location filename="../desktop-widgets/globe.cpp" line="327"/>
+        <source>Move the map and double-click to set the dive location</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="868"/>
-        <source>EAN</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="32"/>
+        <source>Average</source>
+        <translation>Átlag</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="1298"/>
-        <source>l</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="35"/>
+        <source>Minimum</source>
+        <translation>Minimum</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="1299"/>
-        <source>cuft</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="38"/>
+        <source>Maximum</source>
+        <translation>Maximum</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="625"/>
@@ -7131,17 +7277,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <source>Malformed XML response. Line %1: %2</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../core/gpslocation.h" line="13"/>
-        <source>Waiting to aquire GPS location</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>ReadSettingsThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1651"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1676"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1640"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1665"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation type="unfinished"/>
     </message>
@@ -7170,7 +7311,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ResetSettingsThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1775"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1764"/>
         <source>Reset settings failed!</source>
         <translation type="unfinished"/>
     </message>
@@ -7208,6 +7349,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ShiftImageTimesDialog</name>
     <message>
+        <location filename="../desktop-widgets/shiftimagetimes.ui" line="23"/>
+        <location filename="../build/ui_shiftimagetimes.h" line="184"/>
+        <source>Shift selected image times</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/shiftimagetimes.ui" line="34"/>
         <location filename="../build/ui_shiftimagetimes.h" line="185"/>
         <source>Shift times of image(s) by</source>
@@ -7220,12 +7367,6 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/shiftimagetimes.ui" line="23"/>
-        <location filename="../build/ui_shiftimagetimes.h" line="184"/>
-        <source>Shift selected image times</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/shiftimagetimes.ui" line="105"/>
         <location filename="../build/ui_shiftimagetimes.h" line="187"/>
         <source>Earlier</source>
@@ -7275,12 +7416,12 @@ Not all images have timestamps in the range between
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="297"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="296"/>
         <source>Open image file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="299"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="298"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation type="unfinished"/>
     </message>
@@ -7438,49 +7579,49 @@ Not all images have timestamps in the range between
 <context>
     <name>SocialNetworkDialog</name>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="339"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="284"/>
         <source>Dive date: %1 
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="342"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="287"/>
         <source>Duration: %1 
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="343"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="288"/>
         <source>h:</source>
         <comment>abbreviation for hours plus separator</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="344"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="289"/>
         <source>min</source>
         <comment>abbreviation for minutes</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="347"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="292"/>
         <source>Dive location: %1 
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="350"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="295"/>
         <source>Buddy: %1 
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="353"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="298"/>
         <source>Divemaster: %1 
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="356"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="301"/>
         <source>
 %1</source>
         <translation type="unfinished"/>
@@ -7565,9 +7706,20 @@ Not all images have timestamps in the range between
     <name>StartPage</name>
     <message>
         <location filename="../mobile-widgets/qml/StartPage.qml" line="19"/>
-        <source>To use Subsurface-mobile with Subsurface cloud storage, please enteryour cloud credentials.
+        <source>To use Subsurface-mobile with Subsurface cloud storage, please enter your cloud credentials.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/StartPage.qml" line="20"/>
+        <source>If this is the first time you use Subsurface cloud storage, enter a valid email (all lower case) and a password of your choice (letters and numbers). The server will send a PIN to the email address provided that you will have to enter here.
 
-To use Subsurface-mobile only with local data on this device, tap on the no cloud icon below.</source>
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/StartPage.qml" line="23"/>
+        <source>To use Subsurface-mobile only with local data on this device, tap on the no cloud icon below.</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -7606,7 +7758,12 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>SubsurfaceWebServices</name>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="419"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="395"/>
+        <source>Enter User ID and click Download</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="417"/>
         <source>Webservice</source>
         <translation type="unfinished"/>
     </message>
@@ -7631,30 +7788,25 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="557"/>
-        <source>Download successful</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="551"/>
         <source>Invalid user identifier!</source>
         <translation>Érvénytelen felhasználó azonosító</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="397"/>
-        <source>Enter User ID and click Download</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="554"/>
         <source>Cannot parse response!</source>
         <translation>Nem lehet feldolgozni választ!</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="557"/>
+        <source>Download successful</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>SuitFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="674"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="672"/>
         <source>Suits: </source>
         <translation type="unfinished"/>
     </message>
@@ -7662,7 +7814,7 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>SuitsFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="123"/>
+        <location filename="../qt-models/filtermodels.cpp" line="128"/>
         <source>No suit set</source>
         <translation type="unfinished"/>
     </message>
@@ -7681,7 +7833,7 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>TagFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="595"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="593"/>
         <source>Tags: </source>
         <translation type="unfinished"/>
     </message>
@@ -7689,7 +7841,7 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>TagFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="148"/>
+        <location filename="../qt-models/filtermodels.cpp" line="153"/>
         <source>Empty tags</source>
         <translation type="unfinished"/>
     </message>
@@ -7715,6 +7867,11 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>TemplateEdit</name>
     <message>
+        <location filename="../desktop-widgets/templateedit.ui" line="14"/>
+        <source>Edit template</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/templateedit.ui" line="37"/>
         <source>Preview</source>
         <translation type="unfinished"/>
@@ -7760,11 +7917,6 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/templateedit.ui" line="14"/>
-        <source>Edit template</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/templateedit.ui" line="165"/>
         <source>Color palette</source>
         <translation type="unfinished"/>
@@ -7946,85 +8098,12 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>TextHyperlinkEventFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="817"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="815"/>
         <source>%1click to visit %2</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>ThemeTest</name>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="29"/>
-        <source>Theme Information</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="33"/>
-        <source>Screen</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="42"/>
-        <source>Geometry (pixels):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="49"/>
-        <source>Geometry (gridUnits):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="56"/>
-        <source>Units.gridUnit:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="63"/>
-        <source>Units.devicePixelRatio:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="70"/>
-        <source>Font Metrics</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="76"/>
-        <source>FontMetrics pointSize:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="83"/>
-        <source>FontMetrics pixelSize:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="90"/>
-        <source>FontMetrics devicePixelRatio:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="97"/>
-        <source>Text item pixelSize:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="104"/>
-        <source>Text item pointSize:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="111"/>
-        <source>Pixel density:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="118"/>
-        <source>Height of default font:</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
     <name>ToolTipItem</name>
     <message>
         <location filename="../profile-widget/divetooltipitem.cpp" line="136"/>
@@ -8035,102 +8114,107 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>TripItem</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="67"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="68"/>
         <source>(%1 shown)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="194"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="197"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="215"/>
         <source>Date</source>
         <translation>Dátum</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="200"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="218"/>
         <source>Rating</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
         <source>Depth(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
         <source>m</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
         <source>ft</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="206"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="224"/>
         <source>Duration</source>
         <translation>Tartam</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="209"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="227"/>
         <source>Temp(%1%2)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
         <source>Weight(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
         <source>kg</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
         <source>lbs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="215"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="233"/>
         <source>Suit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="218"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="236"/>
         <source>Cyl</source>
         <translation>Pal</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="239"/>
         <source>Gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="244"/>
         <source>SAC(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="244"/>
         <source>/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="229"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="247"/>
         <source>OTU</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="232"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="250"/>
         <source>Max CNS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="235"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="253"/>
+        <source>Photos before/during/after dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="256"/>
         <source>Location</source>
         <translation>Hely</translation>
     </message>
@@ -8153,72 +8237,73 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>UpdateManager</name>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="69"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="61"/>
         <source>Check for updates.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="70"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="62"/>
         <source>Subsurface was unable to check for updates.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="75"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="67"/>
         <source>The following error occurred:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="76"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="68"/>
         <source>Please check your internet connection.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="86"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="78"/>
         <source>You are using the latest version of Subsurface.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="89"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="81"/>
         <source>A new version of Subsurface is available.&lt;br/&gt;Click on:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; to download it.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="95"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="87"/>
         <source>A new version of Subsurface is available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="96"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="88"/>
         <source>Latest version is %1, please check %2 our download page %3 for information in how to update.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="106"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="98"/>
         <source>Newest release version is </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="107"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="99"/>
         <source>The server returned the following information:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="125"/>
-        <source>Subsurface is checking every two weeks if a new version is available. If you don&apos;t want Subsurface to continue checking, please click Decline.</source>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="117"/>
+        <source>Subsurface is checking every two weeks if a new version is available. 
+ If you don&apos;t want Subsurface to continue checking, please click Decline.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="126"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="119"/>
         <source>Decline</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="127"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="120"/>
         <source>Accept</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="129"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="122"/>
         <source>Automatic check for updates</source>
         <translation type="unfinished"/>
     </message>
@@ -8240,24 +8325,6 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>UserSurvey</name>
     <message>
-        <location filename="../desktop-widgets/usersurvey.ui" line="44"/>
-        <location filename="../build/ui_usersurvey.h" line="151"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;We would love to learn more about our users, their preferences and their usage habits. Please spare a minute to fill out this form and submit it to the Subsurface team.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/usersurvey.ui" line="115"/>
-        <location filename="../build/ui_usersurvey.h" line="156"/>
-        <source>Other software/sources</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/usersurvey.ui" line="128"/>
-        <location filename="../build/ui_usersurvey.h" line="157"/>
-        <source>Manually entering dives</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="14"/>
         <location filename="../build/ui_usersurvey.h" line="149"/>
         <source>User survey</source>
@@ -8270,6 +8337,12 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/usersurvey.ui" line="44"/>
+        <location filename="../build/ui_usersurvey.h" line="151"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;We would love to learn more about our users, their preferences and their usage habits. Please spare a minute to fill out this form and submit it to the Subsurface team.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="63"/>
         <location filename="../build/ui_usersurvey.h" line="152"/>
         <source>Technical diver</source>
@@ -8294,6 +8367,18 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/usersurvey.ui" line="115"/>
+        <location filename="../build/ui_usersurvey.h" line="156"/>
+        <source>Other software/sources</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/usersurvey.ui" line="128"/>
+        <location filename="../build/ui_usersurvey.h" line="157"/>
+        <source>Manually entering dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="141"/>
         <location filename="../build/ui_usersurvey.h" line="158"/>
         <source>Android/iPhone companion app</source>
@@ -8324,6 +8409,11 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/usersurvey.cpp" line="18"/>
+        <source>Send</source>
+        <translation>Küldés</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/usersurvey.cpp" line="43"/>
         <source>
 Operating system: %1</source>
@@ -8363,19 +8453,14 @@ Language: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/usersurvey.cpp" line="101"/>
-        <source>Submit user survey.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/usersurvey.cpp" line="82"/>
         <source>Ask again?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/usersurvey.cpp" line="18"/>
-        <source>Send</source>
-        <translation>Küldés</translation>
+        <location filename="../desktop-widgets/usersurvey.cpp" line="101"/>
+        <source>Submit user survey.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/usersurvey.cpp" line="102"/>
@@ -8467,12 +8552,12 @@ Language: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="324"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="325"/>
         <source>Operation timed out</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="345"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="346"/>
         <source>Transferring data...</source>
         <translation type="unfinished"/>
     </message>
@@ -8507,16 +8592,16 @@ Language: %1</source>
 <context>
     <name>WriteSettingsThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1702"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1709"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1718"/>
-        <source>Failed!</source>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1689"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1710"/>
+        <source>This feature is not yet available for the selected dive computer.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1700"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1721"/>
-        <source>This feature is not yet available for the selected dive computer.</source>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1691"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1698"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1707"/>
+        <source>Failed!</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -8633,7 +8718,7 @@ Maximum</source>
 <context>
     <name>getextFromC</name>
     <message>
-        <location filename="../core/libdivecomputer.c" line="674"/>
+        <location filename="../core/libdivecomputer.c" line="737"/>
         <source>Error parsing the header</source>
         <translation type="unfinished"/>
     </message>
@@ -8641,38 +8726,377 @@ Maximum</source>
 <context>
     <name>gettextFromC</name>
     <message>
+        <location filename="../core/cochran.c" line="309"/>
+        <location filename="../core/cochran.c" line="315"/>
+        <location filename="../core/cochran.c" line="385"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>deco stop</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="336"/>
+        <location filename="../core/cochran.c" line="390"/>
+        <location filename="../core/file.c" line="777"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>ascent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="342"/>
+        <location filename="../core/file.c" line="755"/>
+        <source>battery</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="348"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
+        <source>OLF</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="353"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
+        <source>maxdepth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="358"/>
+        <location filename="../core/cochran.c" line="404"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
+        <source>pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="365"/>
+        <location filename="../core/cochran.c" line="414"/>
+        <location filename="../core/cochran.c" line="421"/>
+        <location filename="../core/file.c" line="868"/>
+        <location filename="../core/libdivecomputer.c" line="225"/>
+        <location filename="../core/libdivecomputer.c" line="228"/>
+        <source>gaschange</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="370"/>
+        <location filename="../core/cochran.c" line="409"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>rbt</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="379"/>
+        <location filename="../core/cochran.c" line="426"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>ceiling</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="395"/>
+        <location filename="../core/libdivecomputer.c" line="224"/>
+        <source>transmitter</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="153"/>
+        <source>Error: the file does not appear to be a DATATRAK divelog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="286"/>
+        <source>clear</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="289"/>
+        <source>misty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="292"/>
+        <source>fog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="295"/>
+        <source>rain</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="298"/>
+        <source>storm</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="301"/>
+        <source>snow</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="321"/>
+        <source>No suit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="324"/>
+        <source>Shorty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="327"/>
+        <source>Combi</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="330"/>
+        <source>Wet suit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="333"/>
+        <source>Semidry suit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="336"/>
+        <source>Dry suit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="396"/>
+        <source>no stop</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="398"/>
+        <location filename="../core/dive.c" line="29"/>
+        <source>deco</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="400"/>
+        <source>single ascent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="402"/>
+        <source>multiple ascent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="404"/>
+        <location filename="../core/dive.c" line="27"/>
+        <source>fresh</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="406"/>
+        <source>salt water</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="431"/>
+        <source>sight seeing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="433"/>
+        <source>club dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="435"/>
+        <location filename="../core/dive.c" line="28"/>
+        <source>instructor</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="437"/>
+        <source>instruction</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="439"/>
+        <location filename="../core/dive.c" line="27"/>
+        <source>night</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="441"/>
+        <location filename="../core/dive.c" line="25"/>
+        <source>cave</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="443"/>
+        <location filename="../core/dive.c" line="24"/>
+        <source>ice</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="445"/>
+        <source>search</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="455"/>
+        <location filename="../core/dive.c" line="25"/>
+        <source>wreck</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="457"/>
+        <location filename="../core/dive.c" line="26"/>
+        <source>river</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="459"/>
+        <location filename="../core/dive.c" line="23"/>
+        <source>drift</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="461"/>
+        <location filename="../core/dive.c" line="28"/>
+        <source>photo</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="463"/>
+        <source>other</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="474"/>
+        <source>Other activities</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="498"/>
+        <source>Datatrak/Wlog notes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="537"/>
+        <source>Manually entered dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="588"/>
+        <source>Unknown</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="674"/>
+        <source>Error: couldn&apos;t open the file %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="687"/>
+        <source>Error: no dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="23"/>
+        <source>boat</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="23"/>
+        <source>shore</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="24"/>
+        <source>deep</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="24"/>
+        <source>cavern</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="25"/>
+        <source>altitude</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="26"/>
+        <source>pool</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="26"/>
+        <source>lake</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="27"/>
+        <source>student</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="28"/>
+        <source>video</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="33"/>
+        <source>OC-gas</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="33"/>
+        <source>diluent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="33"/>
+        <location filename="../core/equipment.c" line="88"/>
+        <location filename="../core/planner.c" line="1436"/>
+        <location filename="../core/planner.c" line="1439"/>
+        <source>oxygen</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../core/dive.c" line="181"/>
         <source>pascal</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../core/dive.c" line="186"/>
-        <location filename="../core/qthelper.cpp" line="669"/>
+        <location filename="../core/qthelper.cpp" line="674"/>
         <source>bar</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../core/dive.c" line="190"/>
-        <location filename="../core/qthelper.cpp" line="672"/>
+        <location filename="../core/qthelper.cpp" line="677"/>
         <source>psi</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../core/dive.c" line="227"/>
+        <source>ℓ</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../core/dive.c" line="232"/>
         <source>cuft</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../core/dive.c" line="269"/>
-        <location filename="../core/qthelper.cpp" line="590"/>
-        <location filename="../core/qthelper.cpp" line="605"/>
+        <location filename="../core/qthelper.cpp" line="595"/>
+        <location filename="../core/qthelper.cpp" line="610"/>
         <source>m</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../core/dive.c" line="274"/>
-        <location filename="../core/qthelper.cpp" line="593"/>
-        <location filename="../core/qthelper.cpp" line="607"/>
+        <location filename="../core/qthelper.cpp" line="598"/>
+        <location filename="../core/qthelper.cpp" line="612"/>
         <source>ft</source>
         <translation type="unfinished"/>
     </message>
@@ -8698,53 +9122,58 @@ Maximum</source>
     </message>
     <message>
         <location filename="../core/dive.c" line="325"/>
-        <location filename="../core/qthelper.cpp" line="616"/>
-        <location filename="../core/qthelper.cpp" line="626"/>
+        <location filename="../core/qthelper.cpp" line="621"/>
+        <location filename="../core/qthelper.cpp" line="631"/>
         <source>lbs</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../core/dive.c" line="329"/>
-        <location filename="../core/qthelper.cpp" line="614"/>
-        <location filename="../core/qthelper.cpp" line="624"/>
+        <location filename="../core/qthelper.cpp" line="619"/>
+        <location filename="../core/qthelper.cpp" line="629"/>
         <source>kg</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/dive.c" line="1772"/>
+        <location filename="../core/dive.c" line="1751"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) vagy (%s)</translation>
     </message>
     <message>
-        <location filename="../core/divelist.c" line="484"/>
+        <location filename="../core/divelist.c" line="487"/>
         <location filename="../core/equipment.c" line="84"/>
-        <location filename="../core/planner.c" line="1411"/>
-        <location filename="../core/planner.c" line="1414"/>
+        <location filename="../core/planner.c" line="1432"/>
+        <location filename="../core/planner.c" line="1435"/>
         <source>air</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="197"/>
+        <location filename="../core/equipment.c" line="86"/>
+        <source>EAN%d</source>
+        <translation>EAN%d</translation>
+    </message>
+    <message>
+        <location filename="../core/equipment.c" line="198"/>
         <source>integrated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="198"/>
+        <location filename="../core/equipment.c" line="199"/>
         <source>belt</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="199"/>
+        <location filename="../core/equipment.c" line="200"/>
         <source>ankle</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="200"/>
+        <location filename="../core/equipment.c" line="201"/>
         <source>backplate weight</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="201"/>
+        <location filename="../core/equipment.c" line="202"/>
         <source>clip-on</source>
         <translation type="unfinished"/>
     </message>
@@ -8757,8 +9186,8 @@ Maximum</source>
         <location filename="../core/file.c" line="121"/>
         <location filename="../core/file.c" line="512"/>
         <location filename="../core/file.c" line="597"/>
-        <location filename="../core/file.c" line="924"/>
-        <location filename="../core/file.c" line="1056"/>
+        <location filename="../core/file.c" line="909"/>
+        <location filename="../core/file.c" line="1092"/>
         <location filename="../core/ostctools.c" line="80"/>
         <source>Failed to read &apos;%s&apos;</source>
         <translation>&apos;%s&apos; olvasása meghiúsult.</translation>
@@ -8816,706 +9245,720 @@ Maximum</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/file.c" line="887"/>
-        <source>No matching DC found for file &apos;%s&apos;</source>
+        <location filename="../core/git-access.c" line="134"/>
+        <source>Local cache directory %s corrupted - can&apos;t sync with Subsurface cloud storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>none</source>
+        <location filename="../core/git-access.c" line="157"/>
+        <location filename="../core/git-access.c" line="177"/>
+        <source>Could not update local cache to newer remote data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="309"/>
-        <location filename="../core/cochran.c" line="315"/>
-        <location filename="../core/cochran.c" line="385"/>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>deco stop</source>
+        <location filename="../core/git-access.c" line="170"/>
+        <source>Subsurface cloud storage corrupted</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="342"/>
-        <location filename="../core/file.c" line="755"/>
-        <source>battery</source>
+        <location filename="../core/git-access.c" line="284"/>
+        <source>Could not update Subsurface cloud storage, try again later</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="370"/>
-        <location filename="../core/cochran.c" line="409"/>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>rbt</source>
+        <location filename="../core/git-access.c" line="344"/>
+        <source>Remote storage and local data diverged. Error: merge failed (%s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="336"/>
-        <location filename="../core/cochran.c" line="390"/>
-        <location filename="../core/file.c" line="777"/>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>ascent</source>
+        <location filename="../core/git-access.c" line="374"/>
+        <source>Remote storage and local data diverged. Cannot combine local and remote changes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="379"/>
-        <location filename="../core/cochran.c" line="426"/>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>ceiling</source>
+        <location filename="../core/git-access.c" line="408"/>
+        <source>Remote storage and local data diverged</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>workload</source>
+        <location filename="../core/git-access.c" line="411"/>
+        <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="395"/>
-        <location filename="../core/libdivecomputer.c" line="203"/>
-        <source>transmitter</source>
+        <location filename="../core/git-access.c" line="420"/>
+        <source>Problems with local cache of Subsurface cloud data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="203"/>
-        <source>violation</source>
+        <location filename="../core/git-access.c" line="421"/>
+        <source>Moved cache data to %s. Please try the operation again.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="203"/>
-        <source>bookmark</source>
+        <location filename="../core/git-access.c" line="743"/>
+        <source>Error connecting to Subsurface cloud storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="203"/>
-        <source>surface</source>
+        <location filename="../core/git-access.c" line="746"/>
+        <source>git clone of %s failed (%s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="203"/>
-        <source>safety stop</source>
+        <location filename="../core/libdivecomputer.c" line="210"/>
+        <location filename="../core/parse-xml.c" line="3317"/>
+        <location filename="../core/uemis-downloader.c" line="134"/>
+        <source>unknown</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="365"/>
-        <location filename="../core/cochran.c" line="414"/>
-        <location filename="../core/cochran.c" line="421"/>
-        <location filename="../core/file.c" line="868"/>
-        <location filename="../core/libdivecomputer.c" line="204"/>
-        <location filename="../core/libdivecomputer.c" line="207"/>
-        <source>gaschange</source>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>none</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="204"/>
-        <source>safety stop (voluntary)</source>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>workload</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="204"/>
-        <source>safety stop (mandatory)</source>
+        <location filename="../core/libdivecomputer.c" line="224"/>
+        <source>violation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="205"/>
-        <source>deepstop</source>
+        <location filename="../core/libdivecomputer.c" line="224"/>
+        <source>bookmark</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="205"/>
-        <source>ceiling (safety stop)</source>
+        <location filename="../core/libdivecomputer.c" line="224"/>
+        <source>surface</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="205"/>
-        <source>divetime</source>
+        <location filename="../core/libdivecomputer.c" line="224"/>
+        <source>safety stop</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="205"/>
-        <source>below floor</source>
-        <comment>event showing dive is below deco floor and adding deco time</comment>
+        <location filename="../core/libdivecomputer.c" line="225"/>
+        <source>safety stop (voluntary)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="353"/>
-        <location filename="../core/libdivecomputer.c" line="206"/>
-        <source>maxdepth</source>
+        <location filename="../core/libdivecomputer.c" line="225"/>
+        <source>safety stop (mandatory)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="348"/>
-        <location filename="../core/libdivecomputer.c" line="206"/>
-        <source>OLF</source>
+        <location filename="../core/libdivecomputer.c" line="226"/>
+        <source>deepstop</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="206"/>
-        <source>airtime</source>
+        <location filename="../core/libdivecomputer.c" line="226"/>
+        <source>ceiling (safety stop)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="206"/>
-        <source>rgbm</source>
+        <location filename="../core/libdivecomputer.c" line="226"/>
+        <source>below floor</source>
+        <comment>event showing dive is below deco floor and adding deco time</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="206"/>
-        <source>heading</source>
+        <location filename="../core/libdivecomputer.c" line="226"/>
+        <source>divetime</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="358"/>
-        <location filename="../core/cochran.c" line="404"/>
-        <location filename="../core/libdivecomputer.c" line="206"/>
-        <source>pO₂</source>
+        <location filename="../core/libdivecomputer.c" line="227"/>
+        <source>airtime</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="207"/>
-        <source>tissue level warning</source>
+        <location filename="../core/libdivecomputer.c" line="227"/>
+        <source>rgbm</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="207"/>
-        <source>non stop time</source>
+        <location filename="../core/libdivecomputer.c" line="227"/>
+        <source>heading</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="224"/>
-        <source>invalid event number</source>
+        <location filename="../core/libdivecomputer.c" line="228"/>
+        <source>tissue level warning</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="658"/>
-        <source>Unable to create parser for %s %s</source>
+        <location filename="../core/libdivecomputer.c" line="228"/>
+        <source>non stop time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="664"/>
-        <source>Error registering the data</source>
-        <translation>Hiba az adat regisztrálása alatt</translation>
+        <location filename="../core/libdivecomputer.c" line="237"/>
+        <source>invalid event number</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="495"/>
+        <location filename="../core/libdivecomputer.c" line="553"/>
         <source>Error parsing the datetime</source>
         <translation>Hiba a dátumidő feldolgozása alatt</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="513"/>
+        <location filename="../core/libdivecomputer.c" line="571"/>
         <source>Dive %d: %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="519"/>
+        <location filename="../core/libdivecomputer.c" line="577"/>
         <source>Error parsing the divetime</source>
         <translation>Hiba a merülési idő feldolgozása alatt</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="529"/>
+        <location filename="../core/libdivecomputer.c" line="587"/>
         <source>Error parsing the maxdepth</source>
         <translation>Hiba a max mélység feldolgozása alatt</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="548"/>
+        <location filename="../core/libdivecomputer.c" line="606"/>
         <source>Error parsing temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="568"/>
+        <location filename="../core/libdivecomputer.c" line="626"/>
         <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="../core/libdivecomputer.c" line="580"/>
+        <location filename="../core/libdivecomputer.c" line="638"/>
         <source>Error obtaining water salinity</source>
         <translation>Hiba a víz sótartalmának lekérdezésekor</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="589"/>
+        <location filename="../core/libdivecomputer.c" line="647"/>
         <source>Error obtaining surface pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="614"/>
+        <location filename="../core/libdivecomputer.c" line="672"/>
         <source>Error obtaining divemode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="634"/>
+        <location filename="../core/libdivecomputer.c" line="692"/>
         <source>Error parsing the gas mix</source>
         <translation>Hiba a gáz keverék feldolgozása alatt</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="684"/>
+        <location filename="../core/libdivecomputer.c" line="717"/>
+        <source>Unable to create parser for %s %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="723"/>
+        <source>Error registering the data</source>
+        <translation>Hiba az adat regisztrálása alatt</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="744"/>
         <source>Error parsing the samples</source>
         <translation>Hiba a minták feldolgozása alatt</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="822"/>
+        <location filename="../core/libdivecomputer.c" line="882"/>
         <source>Event: waiting for user action</source>
         <translation>Esemény: várakozás a felhasználóra</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="830"/>
+        <location filename="../core/libdivecomputer.c" line="890"/>
         <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="894"/>
+        <location filename="../core/libdivecomputer.c" line="954"/>
         <source>Error registering the event handler.</source>
         <translation>Hiba az esemény kezelő regisztrálása alatt</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="899"/>
+        <location filename="../core/libdivecomputer.c" line="959"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Hiba a visszavonás kezelő regisztrálása alatt</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="920"/>
+        <location filename="../core/libdivecomputer.c" line="980"/>
         <source>Dive data import error</source>
         <translation>Merülési adat importálási hiba</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="959"/>
+        <location filename="../core/libdivecomputer.c" line="1019"/>
         <source>Unable to create libdivecomputer context</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="966"/>
+        <location filename="../core/libdivecomputer.c" line="1026"/>
         <source>Unable to open %s %s (%s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="992"/>
+        <location filename="../core/libdivecomputer.c" line="1048"/>
         <source>Insufficient privileges to open the device %s %s (%s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/parse-xml.c" line="517"/>
-        <source>Strange percentage reading %s
+        <location filename="../core/load-git.c" line="194"/>
+        <location filename="../core/parse-xml.c" line="1242"/>
+        <source>multiple GPS locations for this dive site; also %s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/load-git.c" line="194"/>
-        <location filename="../core/parse-xml.c" line="1238"/>
-        <source>multiple GPS locations for this dive site; also %s
+        <location filename="../core/load-git.c" line="222"/>
+        <location filename="../core/parse-xml.c" line="1304"/>
+        <source>additional name for site: %s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/ostctools.c" line="120"/>
+        <location filename="../core/ostctools.c" line="152"/>
+        <source>Unknown DC in dive %d</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/ostctools.c" line="165"/>
+        <source>Error - %s - parsing dive %d</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/parse-xml.c" line="517"/>
+        <source>Strange percentage reading %s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/parse-xml.c" line="2044"/>
+        <location filename="../core/parse-xml.c" line="2051"/>
         <source>Failed to parse &apos;%s&apos;</source>
         <translation>&apos;%s&apos; értelmezése meghiúsult.</translation>
     </message>
     <message>
-        <location filename="../core/parse-xml.c" line="3741"/>
+        <location filename="../core/parse-xml.c" line="3774"/>
         <source>Can&apos;t open stylesheet %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="86"/>
-        <source>EAN%d</source>
-        <translation>EAN%d</translation>
+        <location filename="../core/planner.c" line="555"/>
+        <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE %s ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="1032"/>
-        <location filename="../core/planner.c" line="1184"/>
-        <source>Can&apos;t find gas %s</source>
+        <location filename="../core/planner.c" line="569"/>
+        <source>Decompression calculation aborted due to excessive time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="368"/>
-        <source>Too many gas mixes</source>
+        <location filename="../core/planner.c" line="571"/>
+        <location filename="../core/planner.c" line="829"/>
+        <location filename="../core/planner.c" line="834"/>
+        <location filename="../core/planner.c" line="860"/>
+        <location filename="../core/planner.c" line="870"/>
+        <source>Warning:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="568"/>
-        <source>Decompression calculation aborted due to excessive time</source>
+        <location filename="../core/planner.c" line="581"/>
+        <source>based on Bühlmann ZHL-16C with GFlow = %d and GFhigh = %d</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="592"/>
-        <source>Subsurface dive plan</source>
+        <location filename="../core/planner.c" line="586"/>
+        <source>based on VPM-B at nominal conservatism</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="596"/>
-        <source>depth</source>
+        <location filename="../core/planner.c" line="588"/>
+        <source>based on VPM-B at +%d conservatism</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="602"/>
-        <source>runtime</source>
+        <location filename="../core/planner.c" line="590"/>
+        <source>, effective GF=%d/%d</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="594"/>
+        <source>recreational mode based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="598"/>
+        <source>Subsurface dive plan</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../core/planner.c" line="599"/>
+        <source>&lt;div&gt;Runtime: %dmin&lt;/div&gt;&lt;br&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="604"/>
+        <source>depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="607"/>
         <source>duration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="554"/>
-        <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE %s ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source>
+        <location filename="../core/planner.c" line="610"/>
+        <source>runtime</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="605"/>
+        <location filename="../core/planner.c" line="613"/>
         <source>gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="648"/>
+        <location filename="../core/planner.c" line="656"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="656"/>
+        <location filename="../core/planner.c" line="664"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="669"/>
+        <location filename="../core/planner.c" line="677"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="676"/>
+        <location filename="../core/planner.c" line="684"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="721"/>
+        <location filename="../core/planner.c" line="729"/>
         <source>%3.0f%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="724"/>
-        <location filename="../core/planner.c" line="728"/>
+        <location filename="../core/planner.c" line="732"/>
+        <location filename="../core/planner.c" line="736"/>
         <source>%3dmin</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="737"/>
-        <location filename="../core/planner.c" line="749"/>
+        <location filename="../core/planner.c" line="745"/>
+        <location filename="../core/planner.c" line="757"/>
         <source>(SP = %.1fbar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="772"/>
+        <location filename="../core/planner.c" line="780"/>
         <source>Switch gas to %s (SP = %.1fbar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="774"/>
+        <location filename="../core/planner.c" line="782"/>
         <source>Switch gas to %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="793"/>
+        <location filename="../core/planner.c" line="801"/>
         <source>CNS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="795"/>
+        <location filename="../core/planner.c" line="803"/>
         <source>OTU</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="799"/>
+        <location filename="../core/planner.c" line="807"/>
         <source>Gas consumption (CCR legs excluded):</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="801"/>
+        <location filename="../core/planner.c" line="809"/>
         <source>Gas consumption:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="570"/>
-        <location filename="../core/planner.c" line="821"/>
-        <location filename="../core/planner.c" line="826"/>
-        <location filename="../core/planner.c" line="851"/>
-        <location filename="../core/planner.c" line="861"/>
-        <source>Warning:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="580"/>
-        <source>based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="584"/>
-        <source>based on VPM-B at nominal conservatism</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="586"/>
-        <source>based on VPM-B at +%d conservatism</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="588"/>
-        <source>recreational mode based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="822"/>
+        <location filename="../core/planner.c" line="830"/>
         <source>this is more gas than available in the specified cylinder!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="827"/>
+        <location filename="../core/planner.c" line="835"/>
         <source>not enough reserve for gas sharing on ascent!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="829"/>
+        <location filename="../core/planner.c" line="837"/>
         <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="831"/>
+        <location filename="../core/planner.c" line="839"/>
         <source>%.0f%s (%.0f%s during planned ascent) of %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="848"/>
+        <location filename="../core/planner.c" line="857"/>
         <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="858"/>
+        <location filename="../core/planner.c" line="867"/>
         <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="1419"/>
+        <location filename="../core/planner.c" line="1194"/>
+        <source>Can&apos;t find gas %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="1440"/>
         <source>ean</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1280"/>
+        <location filename="../core/profile.c" line="1298"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1283"/>
+        <location filename="../core/profile.c" line="1301"/>
         <source>P: %d%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1287"/>
+        <location filename="../core/profile.c" line="1305"/>
         <source>T: %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1293"/>
+        <location filename="../core/profile.c" line="1311"/>
         <source>V: %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1296"/>
+        <location filename="../core/profile.c" line="1314"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1298"/>
+        <location filename="../core/profile.c" line="1316"/>
         <source>CNS: %u%%
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1300"/>
+        <location filename="../core/profile.c" line="1318"/>
         <source>pO%s: %.2fbar
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1302"/>
+        <location filename="../core/profile.c" line="1320"/>
         <source>pN%s: %.2fbar
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1304"/>
+        <location filename="../core/profile.c" line="1322"/>
         <source>pHe: %.2fbar
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1307"/>
+        <location filename="../core/profile.c" line="1325"/>
         <source>MOD: %d%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1314"/>
+        <location filename="../core/profile.c" line="1332"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1318"/>
+        <location filename="../core/profile.c" line="1336"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1331"/>
+        <location filename="../core/profile.c" line="1349"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1334"/>
+        <location filename="../core/profile.c" line="1352"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1339"/>
+        <location filename="../core/profile.c" line="1357"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1342"/>
+        <location filename="../core/profile.c" line="1360"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1346"/>
+        <location filename="../core/profile.c" line="1364"/>
         <source>In deco
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1348"/>
+        <location filename="../core/profile.c" line="1366"/>
         <source>NDL: %umin
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1351"/>
+        <location filename="../core/profile.c" line="1369"/>
         <source>TTS: %umin
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1354"/>
+        <location filename="../core/profile.c" line="1372"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1362"/>
+        <location filename="../core/profile.c" line="1380"/>
         <source>In deco (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1365"/>
+        <location filename="../core/profile.c" line="1383"/>
         <source>NDL: %umin (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1367"/>
+        <location filename="../core/profile.c" line="1385"/>
         <source>NDL: &gt;2h (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1371"/>
+        <location filename="../core/profile.c" line="1389"/>
         <source>TTS: %umin (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1373"/>
+        <location filename="../core/profile.c" line="1391"/>
         <source>TTS: &gt;2h (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1376"/>
+        <location filename="../core/profile.c" line="1394"/>
         <source>RBT: %umin
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1379"/>
+        <location filename="../core/profile.c" line="1397"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1385"/>
+        <location filename="../core/profile.c" line="1403"/>
         <source>Tissue %.0fmin: %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1391"/>
+        <location filename="../core/profile.c" line="1409"/>
         <source>heartbeat: %d
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1393"/>
+        <location filename="../core/profile.c" line="1411"/>
         <source>bearing: %d
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1396"/>
+        <location filename="../core/profile.c" line="1414"/>
         <source>mean depth to here %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1491"/>
+        <location filename="../core/profile.c" line="1515"/>
         <source>%sT: %d:%02d min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1495"/>
-        <location filename="../core/profile.c" line="1499"/>
-        <location filename="../core/profile.c" line="1503"/>
+        <location filename="../core/profile.c" line="1519"/>
+        <location filename="../core/profile.c" line="1523"/>
+        <location filename="../core/profile.c" line="1527"/>
         <source>%s %sD:%.1f%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1507"/>
+        <location filename="../core/profile.c" line="1531"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1511"/>
+        <location filename="../core/profile.c" line="1535"/>
         <source>%s%sV:%.2f%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1515"/>
-        <location filename="../core/profile.c" line="1519"/>
+        <location filename="../core/profile.c" line="1539"/>
+        <location filename="../core/profile.c" line="1543"/>
         <source>%s %sV:%.2f%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1526"/>
+        <location filename="../core/profile.c" line="1550"/>
         <source>%s %sP:%d %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../core/profile.c" line="1575"/>
+        <source>%s SAC:%.*f %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../core/qthelper.cpp" line="67"/>
         <source>%1km</source>
         <translation type="unfinished"/>
@@ -9536,446 +9979,460 @@ EADD: %d%s
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="635"/>
-        <source>C</source>
-        <translation type="unfinished"/>
+        <location filename="../core/qthelper.cpp" line="91"/>
+        <location filename="../core/qthelper.cpp" line="226"/>
+        <source>N</source>
+        <translation>N</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="638"/>
-        <source>F</source>
+        <location filename="../core/qthelper.cpp" line="91"/>
+        <location filename="../core/qthelper.cpp" line="227"/>
+        <source>S</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/dive.c" line="23"/>
-        <source>boat</source>
+        <location filename="../core/qthelper.cpp" line="92"/>
+        <location filename="../core/qthelper.cpp" line="228"/>
+        <source>E</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/dive.c" line="23"/>
-        <source>shore</source>
+        <location filename="../core/qthelper.cpp" line="92"/>
+        <location filename="../core/qthelper.cpp" line="229"/>
+        <source>W</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="459"/>
-        <location filename="../core/dive.c" line="23"/>
-        <source>drift</source>
+        <location filename="../core/qthelper.cpp" line="640"/>
+        <source>C</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/dive.c" line="24"/>
-        <source>deep</source>
+        <location filename="../core/qthelper.cpp" line="643"/>
+        <source>F</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/dive.c" line="24"/>
-        <source>cavern</source>
+        <location filename="../core/save-html.c" line="469"/>
+        <location filename="../core/save-html.c" line="553"/>
+        <location filename="../core/worldmap-save.c" line="111"/>
+        <source>Can&apos;t open file %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="443"/>
-        <location filename="../core/dive.c" line="24"/>
-        <source>ice</source>
+        <location filename="../core/save-html.c" line="488"/>
+        <source>Number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="445"/>
-        <source>search</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="489"/>
+        <source>Date</source>
+        <translation>Dátum</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="455"/>
-        <location filename="../core/dive.c" line="25"/>
-        <source>wreck</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="490"/>
+        <source>Time</source>
+        <translation>Idő</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="441"/>
-        <location filename="../core/dive.c" line="25"/>
-        <source>cave</source>
+        <location filename="../core/save-html.c" line="491"/>
+        <source>Location</source>
+        <translation>Hely</translation>
+    </message>
+    <message>
+        <location filename="../core/save-html.c" line="492"/>
+        <source>Air temp.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/dive.c" line="25"/>
-        <source>altitude</source>
+        <location filename="../core/save-html.c" line="493"/>
+        <source>Water temp.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/dive.c" line="26"/>
-        <source>pool</source>
+        <location filename="../core/save-html.c" line="494"/>
+        <source>Dives</source>
+        <translation>Merülések</translation>
+    </message>
+    <message>
+        <location filename="../core/save-html.c" line="495"/>
+        <source>Expand all</source>
+        <translation>Mind kinyit</translation>
+    </message>
+    <message>
+        <location filename="../core/save-html.c" line="496"/>
+        <source>Collapse all</source>
+        <translation>Összes összecsukása</translation>
+    </message>
+    <message>
+        <location filename="../core/save-html.c" line="497"/>
+        <source>Trips</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/dive.c" line="26"/>
-        <source>lake</source>
+        <location filename="../core/save-html.c" line="498"/>
+        <source>Statistics</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="457"/>
-        <location filename="../core/dive.c" line="26"/>
-        <source>river</source>
+        <location filename="../core/save-html.c" line="499"/>
+        <source>Advanced search</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="439"/>
-        <location filename="../core/dive.c" line="27"/>
-        <source>night</source>
+        <location filename="../core/save-html.c" line="502"/>
+        <source>Rating</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="153"/>
-        <source>Error: the file does not appear to be a DATATRAK divelog</source>
+        <location filename="../core/save-html.c" line="503"/>
+        <source>Visibility</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="286"/>
-        <source>clear</source>
+        <location filename="../core/save-html.c" line="504"/>
+        <source>Duration</source>
+        <translation>Tartam</translation>
+    </message>
+    <message>
+        <location filename="../core/save-html.c" line="505"/>
+        <source>Divemaster</source>
+        <translation>Merülés vezető</translation>
+    </message>
+    <message>
+        <location filename="../core/save-html.c" line="506"/>
+        <source>Buddy</source>
+        <translation>Társ</translation>
+    </message>
+    <message>
+        <location filename="../core/save-html.c" line="507"/>
+        <source>Suit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="289"/>
-        <source>misty</source>
+        <location filename="../core/save-html.c" line="508"/>
+        <source>Tags</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="292"/>
-        <source>fog</source>
+        <location filename="../core/save-html.c" line="509"/>
+        <location filename="../smtk-import/smartrak.c" line="251"/>
+        <location filename="../smtk-import/smartrak.c" line="321"/>
+        <source>Notes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="295"/>
-        <source>rain</source>
+        <location filename="../core/save-html.c" line="510"/>
+        <source>Show more details</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="298"/>
-        <source>storm</source>
+        <location filename="../core/save-html.c" line="513"/>
+        <source>Yearly statistics</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="301"/>
-        <source>snow</source>
+        <location filename="../core/save-html.c" line="514"/>
+        <source>Year</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="321"/>
-        <source>No suit</source>
+        <location filename="../core/save-html.c" line="515"/>
+        <source>Total time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="324"/>
-        <source>Shorty</source>
+        <location filename="../core/save-html.c" line="516"/>
+        <source>Average time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="327"/>
-        <source>Combi</source>
+        <location filename="../core/save-html.c" line="517"/>
+        <source>Shortest time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="330"/>
-        <source>Wet suit</source>
+        <location filename="../core/save-html.c" line="518"/>
+        <source>Longest time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="333"/>
-        <source>Semidry suit</source>
+        <location filename="../core/save-html.c" line="519"/>
+        <source>Average depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="336"/>
-        <source>Dry suit</source>
+        <location filename="../core/save-html.c" line="520"/>
+        <source>Min. depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="396"/>
-        <source>no stop</source>
+        <location filename="../core/save-html.c" line="521"/>
+        <source>Max. depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="400"/>
-        <source>single ascent</source>
+        <location filename="../core/save-html.c" line="522"/>
+        <source>Average SAC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="402"/>
-        <source>multiple ascent</source>
+        <location filename="../core/save-html.c" line="523"/>
+        <source>Min. SAC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="404"/>
-        <location filename="../core/dive.c" line="27"/>
-        <source>fresh</source>
+        <location filename="../core/save-html.c" line="524"/>
+        <source>Max. SAC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="406"/>
-        <source>salt water</source>
+        <location filename="../core/save-html.c" line="525"/>
+        <source>Average temp.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="431"/>
-        <source>sight seeing</source>
+        <location filename="../core/save-html.c" line="526"/>
+        <source>Min. temp.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="433"/>
-        <source>club dive</source>
+        <location filename="../core/save-html.c" line="527"/>
+        <source>Max. temp.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="437"/>
-        <source>instruction</source>
+        <location filename="../core/save-html.c" line="528"/>
+        <source>Back to list</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="463"/>
-        <source>other</source>
+        <location filename="../core/save-html.c" line="531"/>
+        <source>Dive No.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="474"/>
-        <source>Other activities</source>
+        <location filename="../core/save-html.c" line="532"/>
+        <source>Dive profile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="498"/>
-        <source>Datatrak/Wlog notes</source>
+        <location filename="../core/save-html.c" line="533"/>
+        <source>Dive information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="537"/>
-        <source>Manually entered dive</source>
+        <location filename="../core/save-html.c" line="534"/>
+        <source>Dive equipment</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="588"/>
-        <source>Unknown</source>
+        <location filename="../core/save-html.c" line="535"/>
+        <location filename="../core/save-html.c" line="542"/>
+        <source>Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="674"/>
-        <source>Error: couldn&apos;t open the file %s</source>
+        <location filename="../core/save-html.c" line="536"/>
+        <source>Size</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="687"/>
-        <source>Error: no dive</source>
+        <location filename="../core/save-html.c" line="537"/>
+        <source>Work pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/dive.c" line="27"/>
-        <source>student</source>
+        <location filename="../core/save-html.c" line="538"/>
+        <source>Start pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="461"/>
-        <location filename="../core/dive.c" line="28"/>
-        <source>photo</source>
+        <location filename="../core/save-html.c" line="539"/>
+        <source>End pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/dive.c" line="28"/>
-        <source>video</source>
+        <location filename="../core/save-html.c" line="540"/>
+        <source>Gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="435"/>
-        <location filename="../core/dive.c" line="28"/>
-        <source>instructor</source>
+        <location filename="../core/save-html.c" line="541"/>
+        <source>Weight</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="398"/>
-        <location filename="../core/dive.c" line="29"/>
-        <source>deco</source>
+        <location filename="../core/save-html.c" line="543"/>
+        <source>Events</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/dive.c" line="33"/>
-        <source>OC-gas</source>
+        <location filename="../core/save-html.c" line="544"/>
+        <source>Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/dive.c" line="33"/>
-        <source>diluent</source>
+        <location filename="../core/save-html.c" line="545"/>
+        <source>Value</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/dive.c" line="33"/>
-        <location filename="../core/equipment.c" line="88"/>
-        <location filename="../core/planner.c" line="1415"/>
-        <location filename="../core/planner.c" line="1418"/>
-        <source>oxygen</source>
+        <location filename="../core/save-html.c" line="546"/>
+        <source>Coordinates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/dive.c" line="227"/>
-        <source>ℓ</source>
+        <location filename="../core/save-html.c" line="547"/>
+        <source>Dive status</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="239"/>
+        <location filename="../core/statistics.c" line="242"/>
         <source>more than %d days</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="246"/>
+        <location filename="../core/statistics.c" line="249"/>
         <source>%dd %dh %dmin</source>
         <translation>%dn %dó %dp</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="249"/>
+        <location filename="../core/statistics.c" line="252"/>
         <source>%dmin %dsecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="251"/>
+        <location filename="../core/statistics.c" line="254"/>
         <source>%dh %dmin</source>
         <translation>%dó %dp</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="263"/>
+        <location filename="../core/statistics.c" line="266"/>
         <source>for dives #</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="269"/>
+        <location filename="../core/statistics.c" line="272"/>
         <source>for selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="304"/>
+        <location filename="../core/statistics.c" line="307"/>
         <source>for dive #%d</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="306"/>
+        <location filename="../core/statistics.c" line="309"/>
         <source>for selected dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="308"/>
+        <location filename="../core/statistics.c" line="311"/>
         <source>for all dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="310"/>
+        <location filename="../core/statistics.c" line="313"/>
         <source>(no dives)</source>
         <translation>(nincs merülés)</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Sun</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Mon</source>
         <translation>H</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Tue</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Wed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Thu</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Fri</source>
         <translation>P</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Sat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Jan</source>
         <translation>Jan</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Feb</source>
         <translation>Feb</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Mar</source>
         <translation>Már</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Apr</source>
         <translation>Ápr</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>May</source>
         <translation>Máj</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Jun</source>
         <translation>Jún</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Jul</source>
         <translation>Júl</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Aug</source>
         <translation>Aug</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Sep</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Oct</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Nov</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Dec</source>
         <translation>Dec</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="191"/>
-        <location filename="../core/parse-xml.c" line="3284"/>
-        <location filename="../core/uemis-downloader.c" line="134"/>
-        <source>unknown</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/uemis-downloader.c" line="467"/>
-        <source>data</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/uemis-downloader.c" line="447"/>
-        <source>%s %s</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../core/uemis-downloader.c" line="27"/>
         <source>Uemis Zurich: the file system is almost full.
 Disconnect/reconnect the dive computer
@@ -10001,6 +10458,16 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../core/uemis-downloader.c" line="447"/>
+        <source>%s %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/uemis-downloader.c" line="467"/>
+        <source>data</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../core/uemis-downloader.c" line="495"/>
         <source>divelog #</source>
         <translation type="unfinished"/>
@@ -10171,281 +10638,6 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="469"/>
-        <location filename="../core/save-html.c" line="553"/>
-        <location filename="../core/worldmap-save.c" line="111"/>
-        <source>Can&apos;t open file %s</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="488"/>
-        <source>Number</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="489"/>
-        <source>Date</source>
-        <translation>Dátum</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="490"/>
-        <source>Time</source>
-        <translation>Idő</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="491"/>
-        <source>Location</source>
-        <translation>Hely</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="492"/>
-        <source>Air temp.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="493"/>
-        <source>Water temp.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="498"/>
-        <source>Statistics</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="502"/>
-        <source>Rating</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="503"/>
-        <source>Visibility</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="504"/>
-        <source>Duration</source>
-        <translation>Tartam</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="494"/>
-        <source>Dives</source>
-        <translation>Merülések</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="495"/>
-        <source>Expand all</source>
-        <translation>Mind kinyit</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="496"/>
-        <source>Collapse all</source>
-        <translation>Összes összecsukása</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="497"/>
-        <source>Trips</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="499"/>
-        <source>Advanced search</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="505"/>
-        <source>Divemaster</source>
-        <translation>Merülés vezető</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="506"/>
-        <source>Buddy</source>
-        <translation>Társ</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="507"/>
-        <source>Suit</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="508"/>
-        <source>Tags</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="509"/>
-        <location filename="../smtk-import/smartrak.c" line="251"/>
-        <location filename="../smtk-import/smartrak.c" line="321"/>
-        <source>Notes</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="510"/>
-        <source>Show more details</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="513"/>
-        <source>Yearly statistics</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="514"/>
-        <source>Year</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="515"/>
-        <source>Total time</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="516"/>
-        <source>Average time</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="517"/>
-        <source>Shortest time</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="518"/>
-        <source>Longest time</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="519"/>
-        <source>Average depth</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="520"/>
-        <source>Min. depth</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="521"/>
-        <source>Max. depth</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="523"/>
-        <source>Min. SAC</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="524"/>
-        <source>Max. SAC</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="525"/>
-        <source>Average temp.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="526"/>
-        <source>Min. temp.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="527"/>
-        <source>Max. temp.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="528"/>
-        <source>Back to list</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="534"/>
-        <source>Dive equipment</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="537"/>
-        <source>Work pressure</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="538"/>
-        <source>Start pressure</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="539"/>
-        <source>End pressure</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="547"/>
-        <source>Dive status</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="522"/>
-        <source>Average SAC</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="531"/>
-        <source>Dive No.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="532"/>
-        <source>Dive profile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="533"/>
-        <source>Dive information</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="535"/>
-        <location filename="../core/save-html.c" line="542"/>
-        <source>Type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="536"/>
-        <source>Size</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="540"/>
-        <source>Gas</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="541"/>
-        <source>Weight</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="543"/>
-        <source>Events</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="544"/>
-        <source>Name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="545"/>
-        <source>Value</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="546"/>
-        <source>Coordinates</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../core/worldmap-save.c" line="39"/>
         <source>Date:</source>
         <translation>Dátum:</translation>
@@ -10491,109 +10683,6 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="91"/>
-        <location filename="../core/qthelper.cpp" line="226"/>
-        <source>N</source>
-        <translation>N</translation>
-    </message>
-    <message>
-        <location filename="../core/qthelper.cpp" line="91"/>
-        <location filename="../core/qthelper.cpp" line="227"/>
-        <source>S</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/qthelper.cpp" line="92"/>
-        <location filename="../core/qthelper.cpp" line="228"/>
-        <source>E</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/qthelper.cpp" line="92"/>
-        <location filename="../core/qthelper.cpp" line="229"/>
-        <source>W</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="341"/>
-        <source>Remote storage and local data diverged. Error: merge failed (%s)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="134"/>
-        <source>Local cache directory %s corrupted - can&apos;t sync with Subsurface cloud storage</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="157"/>
-        <location filename="../core/git-access.c" line="177"/>
-        <source>Could not update local cache to newer remote data</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="170"/>
-        <source>Subsurface cloud storage corrupted</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="285"/>
-        <source>Could not update Subsurface cloud storage, try again later</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="371"/>
-        <source>Remote storage and local data diverged. Cannot combine local and remote changes</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="405"/>
-        <source>Remote storage and local data diverged</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="408"/>
-        <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="417"/>
-        <source>Problems with local cache of Subsurface cloud data</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="418"/>
-        <source>Moved cache data to %s. Please try the operation again.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="737"/>
-        <source>Error connecting to Subsurface cloud storage</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="740"/>
-        <source>git clone of %s failed (%s)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/load-git.c" line="222"/>
-        <location filename="../core/parse-xml.c" line="1300"/>
-        <source>additional name for site: %s
-</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/ostctools.c" line="120"/>
-        <location filename="../core/ostctools.c" line="152"/>
-        <source>Unknown DC in dive %d</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/ostctools.c" line="165"/>
-        <source>Error - %s - parsing dive %d</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../smtk-import/smartrak.c" line="247"/>
         <source>Built</source>
         <translation type="unfinished"/>
@@ -10677,155 +10766,120 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="91"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="103"/>
         <source>Subsurface</source>
         <translation>Subsurface</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="97"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="110"/>
         <source>Dive list</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="112"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="125"/>
         <source>Cloud credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="126"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="139"/>
         <source>Manage dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="138"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="141"/>
         <source>Add dive manually</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="146"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="149"/>
         <source>Manual sync with cloud</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="164"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="167"/>
         <source>Offline mode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="164"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="167"/>
         <source>Enable auto cloud sync</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="182"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="187"/>
         <source>GPS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="185"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="190"/>
         <source>GPS-tag dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="192"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="197"/>
         <source>Upload GPS data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="199"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="204"/>
         <source>Download GPS data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="206"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="211"/>
         <source>Show GPS fixes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="215"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="220"/>
         <source>Clear GPS cache</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="221"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="226"/>
         <source>Preferences</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="230"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="237"/>
         <source>Developer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="232"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="239"/>
         <source>App log</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="239"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="246"/>
         <source>Theme information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="246"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="253"/>
         <source>User manual</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="252"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="259"/>
         <source>About</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="283"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="304"/>
         <source>Run location service</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="283"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="304"/>
         <source>No GPS source available</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="295"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="316"/>
         <source>Actions</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="9"/>
-        <source>Hello World</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="13"/>
-        <source>File</source>
-        <translation>Fájl</translation>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="15"/>
-        <source>&amp;Open</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="19"/>
-        <source>Exit</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="27"/>
-        <source>Button 1 pressed</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="28"/>
-        <source>Button 2 pressed</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="33"/>
-        <source>May I have your attention, please?</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>plannerDetails</name>
@@ -10899,6 +10953,24 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="121"/>
+        <location filename="../build/ui_plannerSettings.h" line="425"/>
+        <source>75% to 50% avg. depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="138"/>
+        <location filename="../build/ui_plannerSettings.h" line="427"/>
+        <source>50% avg. depth to 6m</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="155"/>
+        <location filename="../build/ui_plannerSettings.h" line="429"/>
+        <source>6m to surface</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="175"/>
         <location filename="../build/ui_plannerSettings.h" line="431"/>
         <source>Descent</source>
@@ -10922,12 +10994,35 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="268"/>
+        <source>Bühlmann deco</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="278"/>
         <location filename="../build/ui_plannerSettings.h" line="445"/>
         <source>Reserve gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="288"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="549"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="578"/>
+        <location filename="../build/ui_plannerSettings.h" line="446"/>
+        <location filename="../build/ui_plannerSettings.h" line="459"/>
+        <location filename="../build/ui_plannerSettings.h" line="461"/>
+        <source>bar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="307"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="416"/>
+        <location filename="../build/ui_plannerSettings.h" line="437"/>
+        <location filename="../build/ui_plannerSettings.h" line="440"/>
+        <source>%</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="320"/>
         <location filename="../build/ui_plannerSettings.h" line="449"/>
         <source>Postpone gas change if a stop is not required</source>
@@ -10946,11 +11041,9 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="307"/>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="416"/>
-        <location filename="../build/ui_plannerSettings.h" line="437"/>
-        <location filename="../build/ui_plannerSettings.h" line="440"/>
-        <source>%</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="353"/>
+        <location filename="../build/ui_plannerSettings.h" line="436"/>
+        <source>Plan backgas breaks</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -10960,9 +11053,9 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="429"/>
-        <location filename="../build/ui_plannerSettings.h" line="441"/>
-        <source>Drop to first depth</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="370"/>
+        <location filename="../build/ui_plannerSettings.h" line="453"/>
+        <source>min</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -10972,162 +11065,138 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="353"/>
-        <location filename="../build/ui_plannerSettings.h" line="436"/>
-        <source>Plan backgas breaks</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="396"/>
+        <source>Maximize bottom time allowed by gas and no decompression limits</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="515"/>
-        <location filename="../build/ui_plannerSettings.h" line="455"/>
-        <source>Gas options</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="399"/>
+        <location filename="../build/ui_plannerSettings.h" line="443"/>
+        <source>Recreational mode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="594"/>
-        <location filename="../build/ui_plannerSettings.h" line="456"/>
-        <source>Bottom SAC</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="429"/>
+        <location filename="../build/ui_plannerSettings.h" line="441"/>
+        <source>Drop to first depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="692"/>
-        <location filename="../build/ui_plannerSettings.h" line="457"/>
-        <source>Deco SAC</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="436"/>
+        <location filename="../build/ui_plannerSettings.h" line="452"/>
+        <source>Min. switch duration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="601"/>
-        <location filename="../build/ui_plannerSettings.h" line="458"/>
-        <source>Bottom pO₂</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="459"/>
+        <location filename="../build/ui_plannerSettings.h" line="444"/>
+        <source>Safety stop</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="685"/>
-        <location filename="../build/ui_plannerSettings.h" line="460"/>
-        <source>Deco pO₂</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="495"/>
+        <source>Conservatism level</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="515"/>
+        <location filename="../build/ui_plannerSettings.h" line="455"/>
+        <source>Gas options</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="565"/>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="672"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="698"/>
         <location filename="../build/ui_plannerSettings.h" line="462"/>
         <location filename="../build/ui_plannerSettings.h" line="463"/>
         <source>ℓ/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="632"/>
-        <location filename="../build/ui_plannerSettings.h" line="468"/>
-        <source>Display runtime</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="645"/>
-        <location filename="../build/ui_plannerSettings.h" line="472"/>
-        <source>Display segment duration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="655"/>
-        <location filename="../build/ui_plannerSettings.h" line="476"/>
-        <source>Display transitions in deco</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="662"/>
-        <location filename="../build/ui_plannerSettings.h" line="477"/>
-        <source>Verbatim dive plan</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="288"/>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="549"/>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="578"/>
-        <location filename="../build/ui_plannerSettings.h" line="446"/>
-        <location filename="../build/ui_plannerSettings.h" line="459"/>
-        <location filename="../build/ui_plannerSettings.h" line="461"/>
-        <source>bar</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="594"/>
+        <source>m</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="121"/>
-        <location filename="../build/ui_plannerSettings.h" line="425"/>
-        <source>75% to 50% avg. depth</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="606"/>
+        <source>Used to calculate best mix. Select best mix depth in &apos;Available gases&apos; table by entering gas depth, followed by &quot;B&quot; (best trimix mix) or &quot;BN&quot; (best nitrox mix)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="138"/>
-        <location filename="../build/ui_plannerSettings.h" line="427"/>
-        <source>50% avg. depth to 6m</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="613"/>
+        <location filename="../build/ui_plannerSettings.h" line="456"/>
+        <source>Bottom SAC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="155"/>
-        <location filename="../build/ui_plannerSettings.h" line="429"/>
-        <source>6m to surface</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="620"/>
+        <location filename="../build/ui_plannerSettings.h" line="458"/>
+        <source>Bottom pO₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="268"/>
-        <source>Bühlmann deco</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="627"/>
+        <source>Best mix END</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="370"/>
-        <location filename="../build/ui_plannerSettings.h" line="453"/>
-        <source>min</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="634"/>
+        <location filename="../build/ui_plannerSettings.h" line="464"/>
+        <source>Notes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="396"/>
-        <source>Maximize bottom time allowed by gas and no decompression limits</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="655"/>
+        <location filename="../build/ui_plannerSettings.h" line="466"/>
+        <source>In dive plan, show runtime (absolute time) of stops</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="399"/>
-        <location filename="../build/ui_plannerSettings.h" line="443"/>
-        <source>Recreational mode</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="658"/>
+        <location filename="../build/ui_plannerSettings.h" line="468"/>
+        <source>Display runtime</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="436"/>
-        <location filename="../build/ui_plannerSettings.h" line="452"/>
-        <source>Min. switch duration</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="668"/>
+        <location filename="../build/ui_plannerSettings.h" line="470"/>
+        <source>In dive plan, show duration (relative time) of stops</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="459"/>
-        <location filename="../build/ui_plannerSettings.h" line="444"/>
-        <source>Safety stop</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="671"/>
+        <location filename="../build/ui_plannerSettings.h" line="472"/>
+        <source>Display segment duration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="495"/>
-        <source>Conservatism level</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="678"/>
+        <location filename="../build/ui_plannerSettings.h" line="474"/>
+        <source>In diveplan, list transitions or treat them as implicit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="608"/>
-        <location filename="../build/ui_plannerSettings.h" line="464"/>
-        <source>Notes</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="681"/>
+        <location filename="../build/ui_plannerSettings.h" line="476"/>
+        <source>Display transitions in deco</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="629"/>
-        <location filename="../build/ui_plannerSettings.h" line="466"/>
-        <source>In dive plan, show runtime (absolute time) of stops</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="688"/>
+        <location filename="../build/ui_plannerSettings.h" line="477"/>
+        <source>Verbatim dive plan</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="642"/>
-        <location filename="../build/ui_plannerSettings.h" line="470"/>
-        <source>In dive plan, show duration (relative time) of stops</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="711"/>
+        <location filename="../build/ui_plannerSettings.h" line="460"/>
+        <source>Deco pO₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="652"/>
-        <location filename="../build/ui_plannerSettings.h" line="474"/>
-        <source>In diveplan, list transitions or treat them as implicit</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="718"/>
+        <location filename="../build/ui_plannerSettings.h" line="457"/>
+        <source>Deco SAC</source>
         <translation type="unfinished"/>
     </message>
 </context>
diff --git a/translations/subsurface_id.ts b/translations/subsurface_id.ts
index 8ab45871f..9cf3aa92a 100644
--- a/translations/subsurface_id.ts
+++ b/translations/subsurface_id.ts
@@ -105,6 +105,11 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="56"/>
+        <source>Could not initialize Winsock version 2.2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="134"/>
         <source>Trying to turn on the local Bluetooth device...</source>
         <translation type="unfinished"/>
@@ -115,6 +120,11 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="167"/>
+        <source>Remote devices list was cleared.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="183"/>
         <source>Scanning for remote devices...</source>
         <translation type="unfinished"/>
@@ -125,6 +135,22 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="208"/>
+        <source>The local Bluetooth device was %1.</source>
+        <extracomment>%1 will be replaced with &quot;turned on&quot; or &quot;turned off&quot;</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
+        <source>turned on</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
+        <source>turned off</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="225"/>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="339"/>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="359"/>
@@ -172,37 +198,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="352"/>
-        <source>Device %1 was paired and is authorized.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="56"/>
-        <source>Could not initialize Winsock version 2.2</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="167"/>
-        <source>Remote devices list was cleared.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="208"/>
-        <source>The local Bluetooth device was %1.</source>
-        <extracomment>%1 will be replaced with &quot;turned on&quot; or &quot;turned off&quot;</extracomment>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
-        <source>turned on</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
-        <source>turned off</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="307"/>
         <source>Remove pairing</source>
         <translation type="unfinished"/>
@@ -228,6 +223,11 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="352"/>
+        <source>Device %1 was paired and is authorized.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="378"/>
         <source>The device %1 can now be used for connection. You can press the Save button.</source>
         <translation type="unfinished"/>
@@ -286,12 +286,12 @@
 <context>
     <name>BuddyFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="621"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="619"/>
         <source>Person: </source>
         <translation>Personil:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="622"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="620"/>
         <source>Searches for buddies and divemasters</source>
         <translation>Cari teman dan divemaster</translation>
     </message>
@@ -299,7 +299,7 @@
 <context>
     <name>BuddyFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="243"/>
+        <location filename="../qt-models/filtermodels.cpp" line="248"/>
         <source>No buddies</source>
         <translation>Tidak ada teman</translation>
     </message>
@@ -307,25 +307,30 @@
 <context>
     <name>CloudCredentials</name>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="49"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="50"/>
         <source>Cloud credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="55"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="56"/>
         <source>Email</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="67"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="68"/>
         <source>Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="90"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="92"/>
         <source>Show password</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="97"/>
+        <source>PIN</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>ColumnNameProvider</name>
@@ -381,6 +386,16 @@
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
+        <source>Max. depth</source>
+        <translation>Kedalaman Maks.</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
+        <source>Avg. depth</source>
+        <translation>Kedalaman rata-rata</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
         <source>Divemaster</source>
         <translation>Divemaster</translation>
     </message>
@@ -391,6 +406,11 @@
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
+        <source>Suit</source>
+        <translation>Pakaian</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
         <source>Notes</source>
         <translation>Catatan</translation>
     </message>
@@ -410,21 +430,6 @@
         <translation>Temperatur air</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
-        <source>Max. depth</source>
-        <translation>Kedalaman Maks.</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
-        <source>Avg. depth</source>
-        <translation>Kedalaman rata-rata</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
-        <source>Suit</source>
-        <translation>Pakaian</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="44"/>
         <source>O₂</source>
         <translation>O₂</translation>
@@ -538,7 +543,7 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/configuredivecomputer.cpp" line="660"/>
+        <location filename="../core/configuredivecomputer.cpp" line="656"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation type="unfinished"/>
     </message>
@@ -558,11 +563,19 @@
         <translation>Perangkat atau letak penempelan</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="170"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1520"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1533"/>
-        <source>...</source>
-        <translation>...</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="47"/>
+        <source>Connect via Bluetooth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="54"/>
+        <source>Connect</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="64"/>
+        <source>Disconnect</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="80"/>
@@ -571,12 +584,24 @@
         <translation>Mendapatkan detil yang tersedia</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="90"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1523"/>
+        <source>Read settings from backup file or from device before writing to the device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="93"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1525"/>
         <source>Save changes to device</source>
         <translation>Simpan perubahan ke perangkat</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="116"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1527"/>
+        <source>Read settings from backup file or from device before writing to a backup file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="119"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1529"/>
         <source>Backup</source>
@@ -595,14 +620,39 @@
         <translation>pemutakhiran peranti tegar</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="163"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1532"/>
+        <source>Save libdivecomputer logfile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="170"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1520"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1533"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="177"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1534"/>
         <source>Cancel</source>
         <translation>Batal</translation>
     </message>
     <message>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1539"/>
-        <source>OSTC 3</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="214"/>
+        <source>OSTC 3,Sport,Cr,2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="223"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1541"/>
+        <source>Suunto Vyper family</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="232"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1543"/>
+        <source>OSTC, Mk.2/2N/2C</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -616,39 +666,55 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="326"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1656"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1943"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1546"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1726"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1766"/>
-        <source>Serial No.</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="260"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1575"/>
+        <source>Eco</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="349"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1679"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1980"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1547"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1727"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1767"/>
-        <source>Firmware version</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="265"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1576"/>
+        <source>Medium</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="538"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1713"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1990"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1548"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1729"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1768"/>
-        <source>Custom text</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="270"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1577"/>
+        <source>High</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="385"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1549"/>
-        <source>Language</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="278"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="826"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="849"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="875"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="927"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="993"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1019"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1101"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1117"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1450"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2278"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2382"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2408"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2434"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2474"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2497"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1586"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1621"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1623"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1625"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1628"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1637"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1638"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1710"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1785"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1789"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1801"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1803"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1806"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1807"/>
+        <source>%</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -676,35 +742,59 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="579"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1557"/>
-        <source>Dive mode</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="313"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1582"/>
+        <source>m/°C</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="556"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1560"/>
-        <source>OC</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="318"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1583"/>
+        <source>ft/°F</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="561"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1561"/>
-        <source>CC</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="326"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1656"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1943"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1546"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1726"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1766"/>
+        <source>Serial No.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="566"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2336"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1562"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1793"/>
-        <source>Gauge</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="349"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1679"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1980"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1547"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1727"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1767"/>
+        <source>Firmware version</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="571"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1563"/>
-        <source>Apnea</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="360"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1568"/>
+        <source>MMDDYY</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="365"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1569"/>
+        <source>DDMMYY</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="370"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1570"/>
+        <source>YYMMDD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="385"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1549"/>
+        <source>Language</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -716,165 +806,154 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="360"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1568"/>
-        <source>MMDDYY</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="405"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1572"/>
+        <source>Brightness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="365"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1569"/>
-        <source>DDMMYY</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="415"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1850"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1579"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1753"/>
+        <source>Units</source>
+        <translation>Satuan</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="425"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1585"/>
+        <source>Salinity (0-5%)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="370"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1570"/>
-        <source>YYMMDD</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="438"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1615"/>
+        <source>Reset device to default settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1042"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2457"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1639"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1805"/>
-        <source>Saturation</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="452"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1590"/>
+        <source>230LSB/Gauss</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="278"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="826"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="849"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="875"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="927"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="993"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1019"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1101"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1117"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1450"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2278"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2382"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2408"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2434"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2474"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2497"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1586"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1621"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1623"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1625"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1628"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1637"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1638"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1710"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1785"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1789"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1801"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1803"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1806"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1807"/>
-        <source>%</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="457"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1591"/>
+        <source>330LSB/Gauss</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="865"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2261"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1624"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1784"/>
-        <source>Desaturation</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="462"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1592"/>
+        <source>390LSB/Gauss</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="983"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2398"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1636"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1800"/>
-        <source>Last deco</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="467"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1593"/>
+        <source>440LSB/Gauss</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="711"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="736"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="758"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="904"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2181"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2206"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2228"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2307"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1626"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1786"/>
-        <source> m</source>
-        <translation>m</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="472"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1594"/>
+        <source>660LSB/Gauss</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="405"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1572"/>
-        <source>Brightness</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="477"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1595"/>
+        <source>820LSB/Gauss</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="260"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1575"/>
-        <source>Eco</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="482"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1596"/>
+        <source>1090LSB/Gauss</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="265"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1576"/>
-        <source>Medium</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="487"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1597"/>
+        <source>1370LSB/Gauss</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="270"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1577"/>
-        <source>High</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="521"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1587"/>
+        <source>Compass gain</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="603"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2034"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1599"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1779"/>
-        <source>Sampling rate</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="531"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1799"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1745"/>
+        <source>Computer model</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="590"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1602"/>
-        <source>2s</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="538"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1713"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1990"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1548"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1729"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1768"/>
+        <source>Custom text</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="595"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1769"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1603"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1739"/>
-        <source>10s</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="556"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1560"/>
+        <source>OC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="415"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1850"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1579"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1753"/>
-        <source>Units</source>
-        <translation>Satuan</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="561"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1561"/>
+        <source>CC</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="313"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1582"/>
-        <source>m/°C</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="566"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2336"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1562"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1793"/>
+        <source>Gauge</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="318"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1583"/>
-        <source>ft/°F</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="571"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1563"/>
+        <source>Apnea</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="644"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1605"/>
-        <source>Dive mode color</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="579"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1557"/>
+        <source>Dive mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="590"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1602"/>
+        <source>2s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="595"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1769"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1603"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1739"/>
+        <source>10s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="603"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2034"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1599"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1779"/>
+        <source>Sampling rate</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -902,12 +981,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="425"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1585"/>
-        <source>Salinity (0-5%)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="637"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2092"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1613"/>
@@ -916,89 +989,79 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="521"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1587"/>
-        <source>Compass gain</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="90"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1523"/>
-        <source>Read settings from backup file or from device before writing to the device</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="116"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1527"/>
-        <source>Read settings from backup file or from device before writing to a backup file</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="232"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1543"/>
-        <source>OSTC, Mk.2/2N/2C</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="644"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1605"/>
+        <source>Dive mode color</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="452"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1590"/>
-        <source>230LSB/Gauss</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="654"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2020"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1614"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1771"/>
+        <source>Show safety stop</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="457"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1591"/>
-        <source>330LSB/Gauss</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="661"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2145"/>
+        <source>End Depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="462"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1592"/>
-        <source>390LSB/Gauss</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="671"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2162"/>
+        <source> s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="467"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1593"/>
-        <source>440LSB/Gauss</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="687"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1953"/>
+        <source>Length</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="472"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1594"/>
-        <source>660LSB/Gauss</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="694"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2138"/>
+        <source>Start Depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="477"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1595"/>
-        <source>820LSB/Gauss</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="701"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2152"/>
+        <source>Reset Depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="482"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1596"/>
-        <source>1090LSB/Gauss</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="711"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="736"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="758"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="904"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2181"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2206"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2228"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2307"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1626"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1786"/>
+        <source> m</source>
+        <translation>m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="487"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1597"/>
-        <source>1370LSB/Gauss</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="778"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2248"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1643"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1810"/>
+        <source>Advanced settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="654"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2020"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1614"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1771"/>
-        <source>Show safety stop</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="784"/>
+        <source>Left button sensitivity</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="438"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1615"/>
-        <source>Reset device to default settings</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="791"/>
+        <source>Always show ppO2</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1010,20 +1073,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="223"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1541"/>
-        <source>Suunto Vyper family</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="778"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2248"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1643"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1810"/>
-        <source>Advanced settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="805"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2271"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1618"/>
@@ -1054,6 +1103,14 @@
         <translation>GFHigh</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="865"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2261"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1624"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1784"/>
+        <source>Desaturation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="917"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2320"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1627"/>
@@ -1068,14 +1125,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="973"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2369"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1630"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1788"/>
-        <source> min</source>
-        <translation>menit</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="960"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2331"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1633"/>
@@ -1084,60 +1133,25 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="47"/>
-        <source>Connect via Bluetooth</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="163"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1532"/>
-        <source>Save libdivecomputer logfile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="661"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2145"/>
-        <source>End Depth</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="671"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2162"/>
-        <source> s</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="687"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1953"/>
-        <source>Length</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="694"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2138"/>
-        <source>Start Depth</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="701"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2152"/>
-        <source>Reset Depth</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="784"/>
-        <source>Left button sensitivity</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="965"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1634"/>
+        <source>ZH-L16+GF</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="791"/>
-        <source>Always show ppO2</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="973"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2369"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1630"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1788"/>
+        <source> min</source>
+        <translation>menit</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="965"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1634"/>
-        <source>ZH-L16+GF</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="983"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2398"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1636"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1800"/>
+        <source>Last deco</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1157,6 +1171,14 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1042"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2457"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1639"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1805"/>
+        <source>Saturation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1052"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1642"/>
         <source>Flip screen</source>
@@ -1168,12 +1190,22 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1066"/>
+        <source>MOD warning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1073"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2513"/>
         <source>Graphical speed indicator</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1080"/>
+        <source>Dynamic ascent rate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1087"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2552"/>
         <source>Bottom gas consumption</source>
@@ -1186,6 +1218,14 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1133"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1149"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2520"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2536"/>
+        <source> ℓ/min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1165"/>
         <source>Temperature sensor offset</source>
         <translation type="unfinished"/>
@@ -1204,6 +1244,18 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1235"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1320"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2610"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2695"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1645"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1668"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1812"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1835"/>
+        <source>%O₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1240"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1325"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2615"/>
@@ -1322,15 +1374,9 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1691"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1858"/>
-        <source>Set point [cbar]</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1693"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1860"/>
-        <source>Change depth [m]</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1405"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2770"/>
+        <source>Setpoint</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1370,6 +1416,12 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1443"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1709"/>
+        <source>O₂ in calibration gas</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1467"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1713"/>
         <source>Fixed setpoint</source>
@@ -1400,101 +1452,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1748"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1733"/>
-        <source>P1 (medium)</source>
-        <extracomment>Suunto safety level</extracomment>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1753"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1734"/>
-        <source>P2 (high)</source>
-        <extracomment>Suunto safety level</extracomment>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1792"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1744"/>
-        <source>Total dive time</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2109"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1769"/>
-        <source>kg/ℓ</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2346"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1795"/>
-        <source>Apnoea</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1583"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1722"/>
-        <source>Safety level</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="54"/>
-        <source>Connect</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="64"/>
-        <source>Disconnect</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="214"/>
-        <source>OSTC 3,Sport,Cr,2</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1066"/>
-        <source>MOD warning</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1080"/>
-        <source>Dynamic ascent rate</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1133"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1149"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2520"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2536"/>
-        <source> ℓ/min</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1235"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1320"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2610"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2695"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1645"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1668"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1812"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1835"/>
-        <source>%O₂</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1405"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2770"/>
-        <source>Setpoint</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1443"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1709"/>
-        <source>O₂ in calibration gas</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1535"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2843"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1719"/>
@@ -1511,6 +1468,12 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1583"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1722"/>
+        <source>Safety level</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1609"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1723"/>
         <source>Altitude range</source>
@@ -1544,6 +1507,20 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1748"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1733"/>
+        <source>P1 (medium)</source>
+        <extracomment>Suunto safety level</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1753"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1734"/>
+        <source>P2 (high)</source>
+        <extracomment>Suunto safety level</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1761"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1736"/>
         <source>Sample rate</source>
@@ -1568,10 +1545,9 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="531"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1799"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1745"/>
-        <source>Computer model</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1792"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1744"/>
+        <source>Total dive time</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1637,12 +1613,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2099"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1765"/>
-        <source>Salinity</source>
-        <translation>Kadar Garam</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2074"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1774"/>
         <source>MM/DD/YY</source>
@@ -1661,12 +1631,30 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2099"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1765"/>
+        <source>Salinity</source>
+        <translation>Kadar Garam</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2109"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1769"/>
+        <source>kg/ℓ</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2341"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1794"/>
         <source>ZH-L16 CC</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2346"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1795"/>
+        <source>Apnoea</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2351"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1796"/>
         <source>L16-GF OC</source>
@@ -1685,85 +1673,110 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1108"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1129"/>
-        <source>Backup files (*.xml)</source>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1539"/>
+        <source>OSTC 3</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1113"/>
-        <source>An error occurred while saving the backup file.
-%1</source>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1691"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1858"/>
+        <source>Set point [cbar]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1116"/>
-        <source>Backup succeeded</source>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1693"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1860"/>
+        <source>Change depth [m]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1117"/>
-        <source>Your settings have been saved to: %1</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1110"/>
+        <source>Backup dive computer settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1107"/>
-        <source>Backup dive computer settings</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1111"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1132"/>
+        <source>Backup files (*.xml)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1112"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1115"/>
         <source>XML backup error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1128"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1116"/>
+        <source>An error occurred while saving the backup file.
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1119"/>
+        <source>Backup succeeded</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1120"/>
+        <source>Your settings have been saved to: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1131"/>
         <source>Restore dive computer settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1134"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1137"/>
         <source>XML restore error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1135"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1138"/>
         <source>An error occurred while restoring the backup file.
 %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1139"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1142"/>
         <source>Restore succeeded</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1140"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1143"/>
         <source>Your settings have been restored successfully.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1150"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1153"/>
         <source>Select firmware file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1151"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1154"/>
         <source>All files (*.*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1207"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1210"/>
         <source>Choose file for divecomputer download logfile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1208"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1211"/>
         <source>Log files (*.log)</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
+    <name>ContextDrawer</name>
+    <message>
+        <location filename="../mobile-widgets/qml/kirigami/src/controls/ContextDrawer.qml" line="76"/>
+        <source>Actions</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>CylindersModel</name>
     <message>
         <location filename="../qt-models/cylindermodel.cpp" line="16"/>
@@ -1777,11 +1790,6 @@
     </message>
     <message>
         <location filename="../qt-models/cylindermodel.cpp" line="16"/>
-        <source>He%</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="16"/>
         <source>Work press.</source>
         <translation type="unfinished"/>
     </message>
@@ -1801,8 +1809,23 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="16"/>
+        <source>He%</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
+        <source>Deco switch at</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
+        <source>Bot. MOD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../qt-models/cylindermodel.cpp" line="17"/>
-        <source>Switch at</source>
+        <source>MND</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1821,17 +1844,32 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="161"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="177"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="383"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="180"/>
+        <source>Switch depth for deco gas. Calculated using Deco pO₂ preference, unless set manually.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="183"/>
+        <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to &apos;*&apos; for best O₂% for max depth.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="186"/>
+        <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to &apos;*&apos; for best He% for max depth.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="444"/>
         <source>Cylinder cannot be removed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="384"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="445"/>
         <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source>
         <translation type="unfinished"/>
     </message>
@@ -1851,42 +1889,24 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="73"/>
+        <location filename="../build/ui_divecomponentselection.h" line="141"/>
+        <source>Dive site</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="80"/>
         <location filename="../build/ui_divecomponentselection.h" line="142"/>
         <source>Suit</source>
         <translation>Pakaian</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="122"/>
-        <location filename="../build/ui_divecomponentselection.h" line="148"/>
-        <source>Divemaster</source>
-        <translation>Divemaster</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="129"/>
-        <location filename="../build/ui_divecomponentselection.h" line="149"/>
-        <source>Buddy</source>
-        <translation>Rekan</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="136"/>
-        <location filename="../build/ui_divecomponentselection.h" line="150"/>
-        <source>Rating</source>
-        <translation>Peringkat</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="87"/>
         <location filename="../build/ui_divecomponentselection.h" line="143"/>
         <source>Visibility</source>
         <translation>Jarak Lihat</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="73"/>
-        <location filename="../build/ui_divecomponentselection.h" line="141"/>
-        <source>Dive site</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="94"/>
         <location filename="../build/ui_divecomponentselection.h" line="144"/>
         <source>Notes</source>
@@ -1910,10 +1930,34 @@
         <source>Cylinders</source>
         <translation>Tabung</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="122"/>
+        <location filename="../build/ui_divecomponentselection.h" line="148"/>
+        <source>Divemaster</source>
+        <translation>Divemaster</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="129"/>
+        <location filename="../build/ui_divecomponentselection.h" line="149"/>
+        <source>Buddy</source>
+        <translation>Rekan</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="136"/>
+        <location filename="../build/ui_divecomponentselection.h" line="150"/>
+        <source>Rating</source>
+        <translation>Peringkat</translation>
+    </message>
 </context>
 <context>
     <name>DiveComputerManagementDialog</name>
     <message>
+        <location filename="../desktop-widgets/divecomputermanagementdialog.ui" line="17"/>
+        <location filename="../build/ui_divecomputermanagementdialog.h" line="65"/>
+        <source>Edit dive computer nicknames</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divecomputermanagementdialog.cpp" line="49"/>
         <source>Remove the selected dive computer?</source>
         <translation type="unfinished"/>
@@ -1924,12 +1968,6 @@
  remove the selected dive computer?</source>
         <translation>Anda yakin ingin melepas Perangkat berikut?</translation>
     </message>
-    <message>
-        <location filename="../desktop-widgets/divecomputermanagementdialog.ui" line="17"/>
-        <location filename="../build/ui_divecomputermanagementdialog.h" line="65"/>
-        <source>Edit dive computer nicknames</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>DiveComputerModel</name>
@@ -1957,17 +1995,17 @@
 <context>
     <name>DiveDetails</name>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="33"/>
+        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="38"/>
         <source>Dive details</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="67"/>
+        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="72"/>
         <source>Delete dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="84"/>
+        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="89"/>
         <source>Show on map</source>
         <translation type="unfinished"/>
     </message>
@@ -1975,88 +2013,93 @@
 <context>
     <name>DiveDetailsEdit</name>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="74"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="80"/>
         <source>Dive %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="78"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="84"/>
         <source>Date:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="86"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="92"/>
         <source>Location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="95"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="101"/>
         <source>Coordinates:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="104"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="110"/>
         <source>Use current
 GPS location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="118"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="124"/>
         <source>Depth:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="127"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="133"/>
         <source>Duration:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="137"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="143"/>
         <source>Air Temp:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="146"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="152"/>
         <source>Water Temp:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="155"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="161"/>
         <source>Suit:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="164"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="176"/>
         <source>Buddy:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="173"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="191"/>
         <source>Dive Master:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="182"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="206"/>
         <source>Weight:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="192"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="216"/>
+        <source>Cylinder:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="231"/>
         <source>Gas mix:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="203"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="241"/>
         <source>Start Pressure:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="213"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="250"/>
         <source>End Pressure:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="224"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="260"/>
         <source>Notes:</source>
         <translation type="unfinished"/>
     </message>
@@ -2094,42 +2137,42 @@ GPS location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="159"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="158"/>
         <source>Air Temp:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="175"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="172"/>
         <source>Cylinder:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="189"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="185"/>
         <source>Water Temp:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="205"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="198"/>
         <source>Dive Master:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="220"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="211"/>
         <source>Weight:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="249"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="224"/>
         <source>Buddy:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="263"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="237"/>
         <source>SAC:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="280"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="252"/>
         <source>Notes</source>
         <translation>Catatan</translation>
     </message>
@@ -2137,18 +2180,18 @@ GPS location:</source>
 <context>
     <name>DiveEventItem</name>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="134"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="165"/>
         <source>Manual switch to OC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="136"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="167"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation>Mulai</translation>
     </message>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="137"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="168"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation>Akhir</translation>
@@ -2157,27 +2200,27 @@ GPS location:</source>
 <context>
     <name>DiveImportedModel</name>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="646"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="656"/>
         <source>Date/time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="648"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="658"/>
         <source>Duration</source>
         <translation>Durasi</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="650"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="660"/>
         <source>Depth</source>
         <translation>edalaman</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="672"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="682"/>
         <source>h:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="672"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="682"/>
         <source>min</source>
         <translation>menit</translation>
     </message>
@@ -2186,8 +2229,8 @@ GPS location:</source>
     <name>DiveList</name>
     <message>
         <location filename="../mobile-widgets/qml/DiveList.qml" line="12"/>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="226"/>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="232"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="227"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="233"/>
         <source>Dive list</source>
         <translation type="unfinished"/>
     </message>
@@ -2202,110 +2245,115 @@ GPS location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="222"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="223"/>
         <source>Cloud credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="228"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="229"/>
         <source>Please tap the &apos;+&apos; button to add a dive</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="248"/>
+        <source>No dives in dive list</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DiveListView</name>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="846"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="849"/>
         <source>Expand all</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="848"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="851"/>
         <source>Collapse all</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="852"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="855"/>
         <source>Collapse others</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="856"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="859"/>
         <source>Remove dive(s) from trip</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="857"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="860"/>
         <source>Create new trip above</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="871"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="874"/>
         <source>Add dive(s) to trip immediately above</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="873"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="876"/>
         <source>Add dive(s) to trip immediately below</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="877"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="880"/>
         <source>Merge trip with trip above</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="878"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="881"/>
         <source>Merge trip with trip below</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="882"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="885"/>
         <source>Delete dive(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="884"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="887"/>
         <source>Mark dive(s) invalid</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="888"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="891"/>
         <source>Merge selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="890"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="893"/>
         <source>Renumber dive(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="891"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="894"/>
         <source>Shift dive times</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="892"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="895"/>
         <source>Split selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="893"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="896"/>
         <source>Load image(s) from file(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="894"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="897"/>
         <source>Load image(s) from web</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="917"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="919"/>
         <source>Open image files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="917"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="919"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation type="unfinished"/>
     </message>
@@ -2326,330 +2374,351 @@ GPS location:</source>
 <context>
     <name>DiveLogExportDialog</name>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="103"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="351"/>
-        <source>Export format</source>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="14"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="349"/>
+        <source>Export dive log files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="134"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="353"/>
-        <source>UDDF</source>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="44"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="369"/>
+        <source>General export</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="187"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="358"/>
-        <source>Worldmap</source>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="103"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="351"/>
+        <source>Export format</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="197"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="359"/>
-        <source>I&amp;mage depths</source>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="115"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="352"/>
+        <source>Subsurface &amp;XML</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="243"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="360"/>
-        <source>Selection</source>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="134"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="353"/>
+        <source>UDDF</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="252"/>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="346"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="361"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="372"/>
-        <source>Selected dives</source>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="147"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="354"/>
+        <source>di&amp;velogs.de</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="262"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="362"/>
-        <source>All dives</source>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="157"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="355"/>
+        <source>DiveShare</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="306"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="396"/>
-        <source>HTML</source>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="167"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="356"/>
+        <source>CSV dive profile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="14"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="349"/>
-        <source>Export dive log files</source>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="177"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="357"/>
+        <source>CSV dive details</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="44"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="369"/>
-        <source>General export</source>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="187"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="358"/>
+        <source>Worldmap</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="115"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="352"/>
-        <source>Subsurface &amp;XML</source>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="197"/>
+        <source>TeX</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="147"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="354"/>
-        <source>di&amp;velogs.de</source>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="207"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="359"/>
+        <source>I&amp;mage depths</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="157"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="355"/>
-        <source>DiveShare</source>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="253"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="360"/>
+        <source>Selection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="167"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="356"/>
-        <source>CSV dive profile</source>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="262"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="356"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="361"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="372"/>
+        <source>Selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="177"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="357"/>
-        <source>CSV dive details</source>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="272"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="362"/>
+        <source>All dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="275"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="285"/>
         <location filename="../build/ui_divelogexportdialog.h" line="363"/>
         <source>CSV units</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="288"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="298"/>
         <location filename="../build/ui_divelogexportdialog.h" line="366"/>
         <source>Metric</source>
         <translation>Metrik</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="293"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="303"/>
         <location filename="../build/ui_divelogexportdialog.h" line="367"/>
         <source>Imperial</source>
         <translation>Imperial</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="324"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="316"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="396"/>
+        <source>HTML</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="334"/>
         <location filename="../build/ui_divelogexportdialog.h" line="370"/>
         <source>General settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="330"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="340"/>
         <location filename="../build/ui_divelogexportdialog.h" line="371"/>
         <source>Subsurface numbers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="359"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="369"/>
         <location filename="../build/ui_divelogexportdialog.h" line="373"/>
         <source>Export yearly statistics</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="375"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="385"/>
         <location filename="../build/ui_divelogexportdialog.h" line="374"/>
         <source>All di&amp;ves</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="385"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="395"/>
         <location filename="../build/ui_divelogexportdialog.h" line="375"/>
         <source>Export list only</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="392"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="402"/>
         <location filename="../build/ui_divelogexportdialog.h" line="376"/>
         <source>Export photos</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="408"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="418"/>
         <location filename="../build/ui_divelogexportdialog.h" line="377"/>
         <source>Style options</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="423"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="433"/>
         <location filename="../build/ui_divelogexportdialog.h" line="378"/>
         <source>Font</source>
         <translation>Huruf</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="433"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="443"/>
         <location filename="../build/ui_divelogexportdialog.h" line="379"/>
         <source>Font size</source>
         <translation>Ukuran Huruf</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="444"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="454"/>
         <location filename="../build/ui_divelogexportdialog.h" line="382"/>
         <source>8</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="449"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="459"/>
         <location filename="../build/ui_divelogexportdialog.h" line="383"/>
         <source>10</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="454"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="464"/>
         <location filename="../build/ui_divelogexportdialog.h" line="384"/>
         <source>12</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="459"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="469"/>
         <location filename="../build/ui_divelogexportdialog.h" line="385"/>
         <source>14</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="464"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="474"/>
         <location filename="../build/ui_divelogexportdialog.h" line="386"/>
         <source>16</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="469"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="479"/>
         <location filename="../build/ui_divelogexportdialog.h" line="387"/>
         <source>18</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="474"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="484"/>
         <location filename="../build/ui_divelogexportdialog.h" line="388"/>
         <source>20</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="482"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="492"/>
         <location filename="../build/ui_divelogexportdialog.h" line="390"/>
         <source>Theme</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="493"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="503"/>
         <location filename="../build/ui_divelogexportdialog.h" line="393"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="95"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="99"/>
         <source>Light</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="498"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="508"/>
         <location filename="../build/ui_divelogexportdialog.h" line="394"/>
         <source>Sand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="134"/>
-        <source>UDDF files (*.uddf *.UDDF)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="142"/>
-        <source>CSV files (*.csv *.CSV)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="74"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="76"/>
         <source>Generic format that is used for data exchange between a variety of diving related programs.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="76"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="78"/>
         <source>Comma separated values describing the dive profile.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="78"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="80"/>
         <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="80"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="82"/>
         <source>Send the dive data to divelogs.de website.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="82"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="84"/>
         <source>Send the dive data to dive-share.appspot.com website</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="84"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="86"/>
         <source>HTML export of the dive locations, visualized on a world map.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="86"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="88"/>
         <source>Subsurface native XML format.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="88"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="90"/>
         <source>Write depths of images to file.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="133"/>
-        <source>Export UDDF file as</source>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="92"/>
+        <source>Write dive as TeX macros to file.</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.cpp" line="137"/>
+        <source>Export UDDF file as</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/>
+        <source>UDDF files (*.uddf *.UDDF)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divelogexportdialog.cpp" line="141"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="145"/>
         <source>Export CSV file as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="148"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="142"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="146"/>
+        <source>CSV files (*.csv *.CSV)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="152"/>
         <source>Export world map</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="149"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="169"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="153"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="177"/>
         <source>HTML files (*.html)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="153"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="157"/>
         <source>Export Subsurface XML</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="158"/>
         <source>XML files (*.xml *.ssrf)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="162"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="166"/>
         <source>Save image depths</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="168"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="170"/>
+        <source>Export to TeX file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="170"/>
+        <source>TeX files (*.tex)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="176"/>
         <source>Export HTML files as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="184"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="192"/>
         <source>Please wait, exporting...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="219"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="227"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="311"/>
         <source>Can&apos;t open file %s</source>
         <translation type="unfinished"/>
     </message>
@@ -2663,25 +2732,6 @@ GPS location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="643"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="727"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="856"/>
-        <source>Time</source>
-        <translation>Waktu</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.ui" line="127"/>
-        <location filename="../build/ui_divelogimportdialog.h" line="164"/>
-        <source>Metric</source>
-        <translation>Metrik</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.ui" line="132"/>
-        <location filename="../build/ui_divelogimportdialog.h" line="165"/>
-        <source>Imperial</source>
-        <translation>Imperial</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divelogimportdialog.ui" line="89"/>
         <location filename="../build/ui_divelogimportdialog.h" line="152"/>
         <source>dd.mm.yyyy</source>
@@ -2700,74 +2750,6 @@ GPS location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.ui" line="155"/>
-        <location filename="../build/ui_divelogimportdialog.h" line="167"/>
-        <source>Drag the tags above to each corresponding column below</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="641"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="729"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="852"/>
-        <source>Dive #</source>
-        <translation>Selam#</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="642"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="723"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="854"/>
-        <source>Date</source>
-        <translation>Tanggal</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="644"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="858"/>
-        <source>Duration</source>
-        <translation>Durasi</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="655"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="862"/>
-        <source>GPS</source>
-        <translation>GPS</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="645"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="864"/>
-        <source>Max. depth</source>
-        <translation>Kedalaman Maks.</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="646"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="866"/>
-        <source>Avg. depth</source>
-        <translation>Kedalaman rata-rata</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="658"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="872"/>
-        <source>Suit</source>
-        <translation>Pakaian</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="663"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="878"/>
-        <source>Tags</source>
-        <translation>Tag</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="652"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="894"/>
-        <source>O₂</source>
-        <translation>O₂</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="653"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="896"/>
-        <source>He</source>
-        <translation>He</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divelogimportdialog.ui" line="108"/>
         <location filename="../build/ui_divelogimportdialog.h" line="158"/>
         <source>Seconds</source>
@@ -2786,183 +2768,269 @@ GPS location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="654"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="860"/>
-        <source>Location</source>
-        <translation>Lokasi</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.ui" line="127"/>
+        <location filename="../build/ui_divelogimportdialog.h" line="164"/>
+        <source>Metric</source>
+        <translation>Metrik</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.ui" line="132"/>
+        <location filename="../build/ui_divelogimportdialog.h" line="165"/>
+        <source>Imperial</source>
+        <translation>Imperial</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.ui" line="155"/>
+        <location filename="../build/ui_divelogimportdialog.h" line="167"/>
+        <source>Drag the tags above to each corresponding column below</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="354"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="499"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="505"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="355"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="528"/>
         <source>Tab</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="575"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="598"/>
         <source>Some column headers were pre-populated; please drag and drop the headers so they match the column they are in.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="613"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="731"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="782"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="848"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="636"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="761"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="857"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="925"/>
         <source>Sample time</source>
         <translation>Waktu sampel</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="615"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="733"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="784"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="638"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="763"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="859"/>
         <source>Sample depth</source>
         <translation>Sampel Kedalaman</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="617"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="735"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="786"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="640"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="765"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="861"/>
         <source>Sample temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="621"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="739"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="790"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="642"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="767"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="863"/>
+        <source>Sample pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="644"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="769"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="865"/>
         <source>Sample sensor1 pO₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="623"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="741"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="792"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="646"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="771"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="867"/>
         <source>Sample sensor2 pO₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="625"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="743"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="794"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="648"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="773"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="869"/>
         <source>Sample sensor3 pO₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="633"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="751"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="802"/>
-        <source>Sample stopdepth</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="650"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="775"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="871"/>
+        <source>Sample CNS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="637"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="755"/>
-        <source>Sample setpoint</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="652"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="777"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="873"/>
+        <source>Sample NDL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="619"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="737"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="788"/>
-        <source>Sample pO₂</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="654"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="779"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="875"/>
+        <source>Sample TTS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="627"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="745"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="796"/>
-        <source>Sample CNS</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="656"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="781"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="877"/>
+        <source>Sample stopdepth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="629"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="747"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="798"/>
-        <source>Sample NDL</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="658"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="783"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="879"/>
+        <source>Sample pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="631"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="749"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="800"/>
-        <source>Sample TTS</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="660"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="785"/>
+        <source>Sample setpoint</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="635"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="664"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="759"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="929"/>
+        <source>Dive #</source>
+        <translation>Selam#</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="665"/>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="753"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="804"/>
-        <source>Sample pressure</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="931"/>
+        <source>Date</source>
+        <translation>Tanggal</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="656"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="868"/>
-        <source>Divemaster</source>
-        <translation>Divemaster</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="666"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="757"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="933"/>
+        <source>Time</source>
+        <translation>Waktu</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="657"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="870"/>
-        <source>Buddy</source>
-        <translation>Rekan</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="667"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="935"/>
+        <source>Duration</source>
+        <translation>Durasi</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="659"/>
-        <source>Rating</source>
-        <translation>Peringkat</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="668"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="941"/>
+        <source>Max. depth</source>
+        <translation>Kedalaman Maks.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="660"/>
-        <source>Visibility</source>
-        <translation>Jarak Lihat</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="669"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="943"/>
+        <source>Avg. depth</source>
+        <translation>Kedalaman rata-rata</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="661"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="874"/>
-        <source>Notes</source>
-        <translation>Catatan</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="670"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="975"/>
+        <source>Air temp.</source>
+        <translation>Temperatur Udara</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="662"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="876"/>
-        <source>Weight</source>
-        <translation>Berat</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="671"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="977"/>
+        <source>Water temp.</source>
+        <translation>Temperatur air</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="649"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="888"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="672"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="965"/>
         <source>Cyl. size</source>
         <translation>Ukuran sIlinder</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="650"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="890"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="673"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="967"/>
         <source>Start pressure</source>
         <translation>Tekanan awal</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="651"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="892"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="674"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="969"/>
         <source>End pressure</source>
         <translation>Tekanan akhir</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="647"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="898"/>
-        <source>Air temp.</source>
-        <translation>Temperatur Udara</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="675"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="971"/>
+        <source>O₂</source>
+        <translation>O₂</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="648"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="900"/>
-        <source>Water temp.</source>
-        <translation>Temperatur air</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="676"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="973"/>
+        <source>He</source>
+        <translation>He</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="677"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="937"/>
+        <source>Location</source>
+        <translation>Lokasi</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="678"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="939"/>
+        <source>GPS</source>
+        <translation>GPS</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="679"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="945"/>
+        <source>Divemaster</source>
+        <translation>Divemaster</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="680"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="947"/>
+        <source>Buddy</source>
+        <translation>Rekan</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="681"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="949"/>
+        <source>Suit</source>
+        <translation>Pakaian</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="682"/>
+        <source>Rating</source>
+        <translation>Peringkat</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="683"/>
+        <source>Visibility</source>
+        <translation>Jarak Lihat</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="684"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="951"/>
+        <source>Notes</source>
+        <translation>Catatan</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="685"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="953"/>
+        <source>Weight</source>
+        <translation>Berat</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="686"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="955"/>
+        <source>Tags</source>
+        <translation>Tag</translation>
     </message>
 </context>
 <context>
     <name>DiveObjectHelper</name>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="287"/>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="323"/>
         <source>%1 dive(s)</source>
         <translation type="unfinished"/>
     </message>
@@ -2970,18 +3038,18 @@ GPS location:</source>
 <context>
     <name>DivePlanner</name>
     <message>
-        <location filename="../desktop-widgets/diveplanner.ui" line="152"/>
-        <location filename="../build/ui_diveplanner.h" line="190"/>
-        <source>Altitude</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/diveplanner.ui" line="109"/>
         <location filename="../build/ui_diveplanner.h" line="189"/>
         <source>Planned dive time</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/diveplanner.ui" line="152"/>
+        <location filename="../build/ui_diveplanner.h" line="190"/>
+        <source>Altitude</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/diveplanner.ui" line="159"/>
         <location filename="../build/ui_diveplanner.h" line="191"/>
         <source>ATM pressure</source>
@@ -3015,32 +3083,32 @@ GPS location:</source>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="134"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="136"/>
         <source>unknown</source>
         <translation>Tak dikenal</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="312"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="326"/>
         <source>Final depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="314"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="328"/>
         <source>Run time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="316"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="330"/>
         <source>Duration</source>
         <translation>Durasi</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="318"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="332"/>
         <source>Used gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="320"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="334"/>
         <source>CC setpoint</source>
         <translation type="unfinished"/>
     </message>
@@ -3048,22 +3116,22 @@ GPS location:</source>
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="108"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="112"/>
         <source>Dive planner points</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="112"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="116"/>
         <source>Available gases</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="137"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="143"/>
         <source>Add dive data point</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="146"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="152"/>
         <source>Save new</source>
         <translation type="unfinished"/>
     </message>
@@ -3096,11 +3164,36 @@ GPS location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="124"/>
+        <source>User entered</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="126"/>
+        <source>Cylinder index</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="128"/>
         <source>Pressure S</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="130"/>
+        <source>Pressure I</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="132"/>
+        <source>Ceiling</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="134"/>
+        <source>SAC</source>
+        <translation>SAC</translation>
+    </message>
+    <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="136"/>
         <source>pN₂</source>
         <translation type="unfinished"/>
@@ -3136,50 +3229,25 @@ GPS location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="152"/>
-        <source>Heart rate</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="156"/>
-        <source>Mean depth @ s</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="150"/>
         <source>Ambient pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="154"/>
-        <source>Gradient factor</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="130"/>
-        <source>Pressure I</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="124"/>
-        <source>User entered</source>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="152"/>
+        <source>Heart rate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="126"/>
-        <source>Cylinder index</source>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="154"/>
+        <source>Gradient factor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="132"/>
-        <source>Ceiling</source>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="156"/>
+        <source>Mean depth @ s</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="134"/>
-        <source>SAC</source>
-        <translation>SAC</translation>
-    </message>
 </context>
 <context>
     <name>DiveShareExportDialog</name>
@@ -3245,309 +3313,313 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="395"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="441"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="434"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="483"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="398"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="444"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="437"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="486"/>
         <source>Date</source>
         <translation>Tanggal</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="401"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="447"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="440"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="489"/>
         <source>Rating</source>
         <translation>Peringkat</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="404"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="443"/>
         <source>Depth</source>
         <translation>edalaman</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="410"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="446"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="495"/>
+        <source>Duration</source>
+        <translation>Durasi</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="449"/>
         <source>Temp</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="413"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="452"/>
         <source>Weight</source>
         <translation>Berat</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="425"/>
-        <source>SAC</source>
-        <translation>SAC</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
-        <source>m</source>
-        <translation>m</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
-        <source>ft</source>
-        <translation>ft</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
-        <source>Weight(%1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="416"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="462"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="455"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="504"/>
         <source>Suit</source>
         <translation>Pakaian</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="419"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="465"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="458"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="507"/>
         <source>Cyl</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="422"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="468"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="461"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="510"/>
         <source>Gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
-        <source>SAC(%1)</source>
-        <translation type="unfinished"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="464"/>
+        <source>SAC</source>
+        <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
-        <source>/min</source>
-        <translation>/menit</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="467"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="518"/>
+        <source>OTU</source>
+        <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="431"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="479"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="470"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="521"/>
         <source>Max CNS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="434"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="482"/>
-        <source>Location</source>
-        <translation>Lokasi</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
+        <source>Photos</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
-        <source>kg</source>
-        <translation>kg</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="476"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="527"/>
+        <source>Location</source>
+        <translation>Lokasi</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="492"/>
         <source>Depth(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="407"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="453"/>
-        <source>Duration</source>
-        <translation>Durasi</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="492"/>
+        <source>m</source>
+        <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="456"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="492"/>
+        <source>ft</source>
+        <translation>ft</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="498"/>
         <source>Temp(%1%2)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="501"/>
+        <source>Weight(%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="501"/>
+        <source>kg</source>
+        <translation>kg</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="501"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="428"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="476"/>
-        <source>OTU</source>
-        <translation>OTU</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="515"/>
+        <source>SAC(%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="515"/>
+        <source>/min</source>
+        <translation>/menit</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="524"/>
+        <source>Photos before/during/after dive</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="164"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="165"/>
         <source>no dives were selected</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="174"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="175"/>
         <source>stylesheet to export to divelogs.de is not found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="184"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="185"/>
         <source>failed to create zip file for upload: %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="236"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="237"/>
         <source>internal error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="244"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="245"/>
         <source>Conversion of dive %1 to divelogs.de format failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="272"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="273"/>
         <source>error writing zip file: %s zip error %d system error %d - %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="745"/>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="935"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="936"/>
         <source>Done</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="778"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="779"/>
         <source>Uploading dive list...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="810"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="811"/>
         <source>Downloading dive list...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="851"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="852"/>
         <source>Downloading %1 dives...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="885"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="886"/>
         <source>Download finished - %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="899"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="900"/>
         <source>Problem with download</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="900"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="901"/>
         <source>The archive could not be opened:
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="909"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="910"/>
         <source>Corrupted download</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="910"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="911"/>
         <source>The archive could not be opened:
 %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="937"/>
+        <source>Upload finished</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="950"/>
         <source>Upload failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="952"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="953"/>
         <source>Upload successful</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="955"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="956"/>
         <source>Login failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="958"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="959"/>
         <source>Cannot parse response</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="970"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="971"/>
         <source>Error: %1</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="936"/>
-        <source>Upload finished</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>DownloadFromDCWidget</name>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="185"/>
-        <source>Error</source>
-        <translation>Kesalahan</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="436"/>
-        <source>Retry</source>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="107"/>
+        <source>Download</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="280"/>
-        <source>Find Uemis dive computer</source>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="110"/>
+        <source>Choose Bluetooth download mode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="101"/>
-        <source>Download</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="191"/>
+        <source>Error</source>
+        <translation>Kesalahan</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="104"/>
-        <source>Choose Bluetooth download mode</source>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="286"/>
+        <source>Find Uemis dive computer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="382"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="392"/>
         <source>Choose file for divecomputer download logfile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="383"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="393"/>
         <source>Log files (*.log)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="398"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="408"/>
         <source>Warning</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="399"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="409"/>
         <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="410"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="420"/>
         <source>Choose file for divecomputer binary dump file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="411"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="421"/>
         <source>Dump files (*.bin)</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="446"/>
+        <source>Retry</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DownloadFromDiveComputer</name>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="139"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="275"/>
-        <source>Vendor</source>
-        <translation>Vendor</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="14"/>
         <location filename="../build/ui_downloadfromdivecomputer.h" line="265"/>
         <source>Download from dive computer</source>
@@ -3560,17 +3632,6 @@ p, li { white-space: pre-wrap; }
         <translation>Perangkat atau letak penempelan</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="122"/>
-        <source>Choose Bluetooth download mode</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="149"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="276"/>
-        <source>Dive computer</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="66"/>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="101"/>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="115"/>
@@ -3594,11 +3655,46 @@ p, li { white-space: pre-wrap; }
         <translation>Selalu pilih selam yang sudah diunduh</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="87"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="270"/>
+        <source>Download into new trip</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="94"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="271"/>
+        <source>Save libdivecomputer logfile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="108"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="273"/>
+        <source>Save libdivecomputer dumpfile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="122"/>
+        <source>Choose Bluetooth download mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="129"/>
         <source>Select a remote Bluetooth device.</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="139"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="275"/>
+        <source>Vendor</source>
+        <translation>Vendor</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="149"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="276"/>
+        <source>Dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/>
         <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="52"/>
         <location filename="../build/ui_downloadfromdivecomputer.h" line="277"/>
@@ -3606,18 +3702,6 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="284"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="281"/>
-        <source>OK</source>
-        <translation>OK</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="291"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="282"/>
-        <source>Cancel</source>
-        <translation>Batal</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="226"/>
         <location filename="../build/ui_downloadfromdivecomputer.h" line="278"/>
         <source>Downloaded dives</source>
@@ -3636,22 +3720,16 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="94"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="271"/>
-        <source>Save libdivecomputer logfile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="108"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="273"/>
-        <source>Save libdivecomputer dumpfile</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="284"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="281"/>
+        <source>OK</source>
+        <translation>OK</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="87"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="270"/>
-        <source>Download into new trip</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="291"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="282"/>
+        <source>Cancel</source>
+        <translation>Batal</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="16"/>
@@ -3741,12 +3819,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="297"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="242"/>
         <source>To disconnect Subsurface from your Facebook account, use the button below</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="306"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="251"/>
         <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source>
         <translation type="unfinished"/>
     </message>
@@ -3754,22 +3832,22 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>FacebookManager</name>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="266"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="211"/>
         <source>Photo upload sucessfull</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="267"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="212"/>
         <source>Your dive profile was updated to Facebook.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="271"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="216"/>
         <source>Photo upload failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="272"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="217"/>
         <source>Your dive profile was not updated to Facebook, 
  please send the following to the developer. 
 </source>
@@ -3829,17 +3907,25 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>FirmwareUpdateThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1750"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1739"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1755"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1744"/>
         <source>Firmware update failed!</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
+    <name>GlobalDrawer</name>
+    <message>
+        <location filename="../mobile-widgets/qml/kirigami/src/controls/GlobalDrawer.qml" line="364"/>
+        <source>Back</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>GlobeGPS</name>
     <message>
         <location filename="../desktop-widgets/globe.cpp" line="124"/>
@@ -3855,27 +3941,27 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="40"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="32"/>
         <source>Date: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="50"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="42"/>
         <source>Name: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="60"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="52"/>
         <source>Latitude: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="69"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="61"/>
         <source>Longitude: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="113"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="105"/>
         <source>List of stored GPS fixes</source>
         <translation type="unfinished"/>
     </message>
@@ -3904,7 +3990,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>LocationFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="648"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="646"/>
         <source>Location: </source>
         <translation type="unfinished"/>
     </message>
@@ -3945,7 +4031,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>LocationFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="299"/>
+        <location filename="../qt-models/filtermodels.cpp" line="304"/>
         <source>No location set</source>
         <translation type="unfinished"/>
     </message>
@@ -4066,20 +4152,55 @@ p, li { white-space: pre-wrap; }
     </message>
 </context>
 <context>
-    <name>MainForm.ui</name>
+    <name>MainTab</name>
     <message>
-        <location filename="../packaging/ios/Subsurface-mobile/MainForm.ui.qml" line="17"/>
-        <source>Press Me 1</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/maintab.ui" line="18"/>
+        <location filename="../desktop-widgets/maintab.ui" line="439"/>
+        <location filename="../build/ui_maintab.h" line="961"/>
+        <location filename="../build/ui_maintab.h" line="963"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="539"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="571"/>
+        <source>Notes</source>
+        <translation>Catatan</translation>
     </message>
     <message>
-        <location filename="../packaging/ios/Subsurface-mobile/MainForm.ui.qml" line="22"/>
-        <source>Press Me 2</source>
+        <location filename="../desktop-widgets/maintab.ui" line="21"/>
+        <location filename="../build/ui_maintab.h" line="964"/>
+        <source>General notes about the current selection</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>MainTab</name>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="92"/>
+        <location filename="../desktop-widgets/maintab.ui" line="646"/>
+        <location filename="../build/ui_maintab.h" line="947"/>
+        <location filename="../build/ui_maintab.h" line="967"/>
+        <source>Date</source>
+        <translation>Tanggal</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="102"/>
+        <location filename="../build/ui_maintab.h" line="948"/>
+        <source>Time</source>
+        <translation>Waktu</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="112"/>
+        <location filename="../desktop-widgets/maintab.ui" line="836"/>
+        <location filename="../build/ui_maintab.h" line="949"/>
+        <location filename="../build/ui_maintab.h" line="987"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="306"/>
+        <source>Air temp.</source>
+        <translation>Temperatur Udara</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="122"/>
+        <location filename="../desktop-widgets/maintab.ui" line="855"/>
+        <location filename="../build/ui_maintab.h" line="950"/>
+        <location filename="../build/ui_maintab.h" line="989"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="307"/>
+        <source>Water temp.</source>
+        <translation>Temperatur air</translation>
+    </message>
     <message>
         <location filename="../desktop-widgets/maintab.ui" line="184"/>
         <location filename="../build/ui_maintab.h" line="951"/>
@@ -4088,6 +4209,17 @@ p, li { white-space: pre-wrap; }
         <translation>Lokasi</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="214"/>
+        <source>Edit dive site</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="217"/>
+        <location filename="../build/ui_maintab.h" line="953"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="252"/>
         <location filename="../build/ui_maintab.h" line="954"/>
         <source>Divemaster</source>
@@ -4100,12 +4232,6 @@ p, li { white-space: pre-wrap; }
         <translation>Rekan</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.ui" line="387"/>
-        <location filename="../build/ui_maintab.h" line="959"/>
-        <source>Tags</source>
-        <translation>Tag</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/maintab.ui" line="308"/>
         <location filename="../build/ui_maintab.h" line="956"/>
         <source>Rating</source>
@@ -4124,57 +4250,18 @@ p, li { white-space: pre-wrap; }
         <translation>Pakaian</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="387"/>
+        <location filename="../build/ui_maintab.h" line="959"/>
+        <source>Tags</source>
+        <translation>Tag</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="397"/>
         <location filename="../build/ui_maintab.h" line="960"/>
         <source>Dive mode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.ui" line="112"/>
-        <location filename="../desktop-widgets/maintab.ui" line="836"/>
-        <location filename="../build/ui_maintab.h" line="949"/>
-        <location filename="../build/ui_maintab.h" line="987"/>
-        <location filename="../desktop-widgets/maintab.cpp" line="306"/>
-        <source>Air temp.</source>
-        <translation>Temperatur Udara</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="122"/>
-        <location filename="../desktop-widgets/maintab.ui" line="855"/>
-        <location filename="../build/ui_maintab.h" line="950"/>
-        <location filename="../build/ui_maintab.h" line="989"/>
-        <location filename="../desktop-widgets/maintab.cpp" line="307"/>
-        <source>Water temp.</source>
-        <translation>Temperatur air</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="18"/>
-        <location filename="../desktop-widgets/maintab.ui" line="439"/>
-        <location filename="../build/ui_maintab.h" line="961"/>
-        <location filename="../build/ui_maintab.h" line="963"/>
-        <location filename="../desktop-widgets/maintab.cpp" line="539"/>
-        <location filename="../desktop-widgets/maintab.cpp" line="571"/>
-        <source>Notes</source>
-        <translation>Catatan</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="21"/>
-        <location filename="../build/ui_maintab.h" line="964"/>
-        <source>General notes about the current selection</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="214"/>
-        <source>Edit dive site</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="217"/>
-        <location filename="../build/ui_maintab.h" line="953"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/maintab.ui" line="491"/>
         <location filename="../build/ui_maintab.h" line="965"/>
         <source>Equipment</source>
@@ -4199,6 +4286,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="665"/>
+        <location filename="../build/ui_maintab.h" line="969"/>
+        <source>Interval</source>
+        <translation>Rentang  Waktu</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="684"/>
         <location filename="../build/ui_maintab.h" line="971"/>
         <source>Gases used</source>
@@ -4211,18 +4304,38 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="722"/>
+        <location filename="../desktop-widgets/maintab.ui" line="1094"/>
+        <location filename="../build/ui_maintab.h" line="975"/>
+        <location filename="../build/ui_maintab.h" line="1003"/>
+        <source>SAC</source>
+        <translation>SAC</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="741"/>
         <location filename="../build/ui_maintab.h" line="977"/>
         <source>CNS</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="760"/>
+        <location filename="../build/ui_maintab.h" line="979"/>
+        <source>OTU</source>
+        <translation>OTU</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="779"/>
         <location filename="../build/ui_maintab.h" line="981"/>
         <source>Max. depth</source>
         <translation>Kedalaman Maks.</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="798"/>
+        <location filename="../build/ui_maintab.h" line="983"/>
+        <source>Avg. depth</source>
+        <translation>Kedalaman rata-rata</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="817"/>
         <location filename="../build/ui_maintab.h" line="985"/>
         <source>Air pressure</source>
@@ -4235,82 +4348,6 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.ui" line="933"/>
-        <location filename="../build/ui_maintab.h" line="1007"/>
-        <source>Simple statistics about the selection</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1039"/>
-        <location filename="../build/ui_maintab.h" line="999"/>
-        <source>Total time</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1106"/>
-        <location filename="../build/ui_maintab.h" line="1004"/>
-        <source>Gas consumption</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1151"/>
-        <location filename="../build/ui_maintab.h" line="1009"/>
-        <source>All photos from the current selection</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1177"/>
-        <location filename="../build/ui_maintab.h" line="1010"/>
-        <source>Extra data</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1180"/>
-        <location filename="../build/ui_maintab.h" line="1011"/>
-        <source>Adittional data from the dive computer</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="92"/>
-        <location filename="../desktop-widgets/maintab.ui" line="646"/>
-        <location filename="../build/ui_maintab.h" line="947"/>
-        <location filename="../build/ui_maintab.h" line="967"/>
-        <source>Date</source>
-        <translation>Tanggal</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="102"/>
-        <location filename="../build/ui_maintab.h" line="948"/>
-        <source>Time</source>
-        <translation>Waktu</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="665"/>
-        <location filename="../build/ui_maintab.h" line="969"/>
-        <source>Interval</source>
-        <translation>Rentang  Waktu</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="722"/>
-        <location filename="../desktop-widgets/maintab.ui" line="1094"/>
-        <location filename="../build/ui_maintab.h" line="975"/>
-        <location filename="../build/ui_maintab.h" line="1003"/>
-        <source>SAC</source>
-        <translation>SAC</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="798"/>
-        <location filename="../build/ui_maintab.h" line="983"/>
-        <source>Avg. depth</source>
-        <translation>Kedalaman rata-rata</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="760"/>
-        <location filename="../build/ui_maintab.h" line="979"/>
-        <source>OTU</source>
-        <translation>OTU</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/maintab.ui" line="893"/>
         <location filename="../build/ui_maintab.h" line="993"/>
         <source>Salinity</source>
@@ -4323,22 +4360,34 @@ p, li { white-space: pre-wrap; }
         <translation>Statisktik</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="933"/>
+        <location filename="../build/ui_maintab.h" line="1007"/>
+        <source>Simple statistics about the selection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="986"/>
         <location filename="../build/ui_maintab.h" line="996"/>
         <source>Depth</source>
         <translation>Kedalaman</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="998"/>
+        <location filename="../build/ui_maintab.h" line="997"/>
+        <source>Duration</source>
+        <translation>Rentang Waktu</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="1027"/>
         <location filename="../build/ui_maintab.h" line="998"/>
         <source>Temperature</source>
         <translation>Suhu</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.ui" line="998"/>
-        <location filename="../build/ui_maintab.h" line="997"/>
-        <source>Duration</source>
-        <translation>Rentang Waktu</translation>
+        <location filename="../desktop-widgets/maintab.ui" line="1039"/>
+        <location filename="../build/ui_maintab.h" line="999"/>
+        <source>Total time</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/maintab.ui" line="1058"/>
@@ -4347,20 +4396,34 @@ p, li { white-space: pre-wrap; }
         <translation>Selam</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="1106"/>
+        <location filename="../build/ui_maintab.h" line="1004"/>
+        <source>Gas consumption</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="1148"/>
         <location filename="../build/ui_maintab.h" line="1008"/>
         <source>Photos</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.cpp" line="88"/>
-        <source>Cylinders</source>
-        <translation>Tabung</translation>
+        <location filename="../desktop-widgets/maintab.ui" line="1151"/>
+        <location filename="../build/ui_maintab.h" line="1009"/>
+        <source>All photos from the current selection</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.cpp" line="92"/>
-        <source>Weights</source>
-        <translation>Berat</translation>
+        <location filename="../desktop-widgets/maintab.ui" line="1177"/>
+        <location filename="../build/ui_maintab.h" line="1010"/>
+        <source>Extra data</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="1180"/>
+        <location filename="../build/ui_maintab.h" line="1011"/>
+        <source>Adittional data from the dive computer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/maintab.cpp" line="63"/>
@@ -4373,11 +4436,21 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.cpp" line="88"/>
+        <source>Cylinders</source>
+        <translation>Tabung</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.cpp" line="89"/>
         <source>Add cylinder</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.cpp" line="92"/>
+        <source>Weights</source>
+        <translation>Berat</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.cpp" line="93"/>
         <source>Add weight system</source>
         <translation type="unfinished"/>
@@ -4568,659 +4641,685 @@ mixed from Air and using:
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="455"/>
-        <location filename="../build/ui_mainwindow.h" line="534"/>
-        <source>Export dive logs</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="510"/>
-        <location filename="../build/ui_mainwindow.h" line="542"/>
-        <source>Toggle pHe graph</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="546"/>
-        <location filename="../build/ui_mainwindow.h" line="545"/>
-        <source>Toggle calculating all tissues</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="522"/>
-        <location filename="../build/ui_mainwindow.h" line="543"/>
-        <source>Toggle DC reported ceiling</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="534"/>
-        <location filename="../build/ui_mainwindow.h" line="544"/>
-        <source>Toggle calculated ceiling</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="606"/>
-        <location filename="../build/ui_mainwindow.h" line="550"/>
-        <source>Toggle NDL, TTS</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="558"/>
-        <location filename="../build/ui_mainwindow.h" line="546"/>
-        <source>Toggle calculated ceiling with 3m increments</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="463"/>
-        <location filename="../build/ui_mainwindow.h" line="537"/>
-        <source>Configure &amp;dive computer</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="570"/>
-        <location filename="../build/ui_mainwindow.h" line="547"/>
-        <source>Toggle heart rate</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="582"/>
-        <location filename="../build/ui_mainwindow.h" line="548"/>
-        <source>Toggle MOD</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="594"/>
-        <location filename="../build/ui_mainwindow.h" line="549"/>
-        <source>Toggle EAD, END, EADD</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="618"/>
-        <location filename="../build/ui_mainwindow.h" line="551"/>
-        <source>Toggle SAC rate</source>
-        <translation>SAC</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="630"/>
-        <location filename="../build/ui_mainwindow.h" line="552"/>
-        <source>Toggle ruler</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="86"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="87"/>
         <location filename="../build/ui_mainwindow.h" line="569"/>
         <source>&amp;Log</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="105"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="104"/>
         <location filename="../build/ui_mainwindow.h" line="570"/>
         <source>&amp;View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="121"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="120"/>
         <location filename="../build/ui_mainwindow.h" line="571"/>
         <source>&amp;Help</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="130"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="129"/>
         <location filename="../build/ui_mainwindow.h" line="572"/>
         <source>&amp;Import</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="139"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="138"/>
         <location filename="../build/ui_mainwindow.h" line="573"/>
         <source>&amp;Edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="144"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="143"/>
         <source>Share on</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="158"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="157"/>
         <location filename="../build/ui_mainwindow.h" line="453"/>
         <source>&amp;New logbook</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="161"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="160"/>
         <location filename="../build/ui_mainwindow.h" line="455"/>
         <source>New</source>
         <translation>Baru</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="164"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="163"/>
         <location filename="../build/ui_mainwindow.h" line="457"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="169"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="168"/>
         <location filename="../build/ui_mainwindow.h" line="458"/>
         <source>&amp;Open logbook</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="172"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="171"/>
         <location filename="../build/ui_mainwindow.h" line="460"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="508"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="502"/>
         <source>Open</source>
         <translation>Buka</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="175"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="174"/>
         <location filename="../build/ui_mainwindow.h" line="462"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="180"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="179"/>
         <location filename="../build/ui_mainwindow.h" line="463"/>
         <source>&amp;Save</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="183"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="182"/>
         <location filename="../build/ui_mainwindow.h" line="465"/>
         <source>Save</source>
         <translation>Simpan</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="186"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="185"/>
         <location filename="../build/ui_mainwindow.h" line="467"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="191"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="190"/>
         <location filename="../build/ui_mainwindow.h" line="468"/>
         <source>Sa&amp;ve as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="194"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="193"/>
         <location filename="../build/ui_mainwindow.h" line="470"/>
         <source>Save as</source>
         <translation>Simpan sebagai</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="197"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="196"/>
         <location filename="../build/ui_mainwindow.h" line="472"/>
         <source>Ctrl+Shift+S</source>
         <translation>Ctrl+Shift+S</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="202"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="201"/>
         <location filename="../build/ui_mainwindow.h" line="473"/>
         <source>&amp;Close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="205"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="204"/>
         <location filename="../build/ui_mainwindow.h" line="475"/>
         <source>Close</source>
         <translation>Tutup</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="208"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="207"/>
         <location filename="../build/ui_mainwindow.h" line="477"/>
         <source>Ctrl+W</source>
         <translation>Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="221"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="212"/>
+        <location filename="../build/ui_mainwindow.h" line="478"/>
+        <source>&amp;Print</source>
+        <translation>&amp;Print</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="215"/>
+        <location filename="../build/ui_mainwindow.h" line="479"/>
+        <source>Ctrl+P</source>
+        <translation>Ctrl+P</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="220"/>
         <location filename="../build/ui_mainwindow.h" line="480"/>
         <source>P&amp;references</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="251"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="223"/>
+        <location filename="../build/ui_mainwindow.h" line="481"/>
+        <source>Ctrl+,</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="231"/>
+        <location filename="../build/ui_mainwindow.h" line="482"/>
+        <source>&amp;Quit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="234"/>
+        <location filename="../build/ui_mainwindow.h" line="483"/>
+        <source>Ctrl+Q</source>
+        <translation>Ctrl+Q</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="242"/>
+        <location filename="../build/ui_mainwindow.h" line="484"/>
+        <source>Import from &amp;dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="245"/>
+        <location filename="../build/ui_mainwindow.h" line="485"/>
+        <source>Ctrl+D</source>
+        <translation>Ctrl+D</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="250"/>
         <location filename="../build/ui_mainwindow.h" line="486"/>
         <source>Import &amp;GPS data from Subsurface web service</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="259"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="253"/>
+        <location filename="../build/ui_mainwindow.h" line="487"/>
+        <source>Ctrl+G</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="258"/>
         <location filename="../build/ui_mainwindow.h" line="488"/>
         <source>Edit device &amp;names</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="272"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="263"/>
+        <location filename="../build/ui_mainwindow.h" line="489"/>
+        <source>&amp;Add dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="266"/>
+        <location filename="../build/ui_mainwindow.h" line="490"/>
+        <source>Ctrl++</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="271"/>
         <location filename="../build/ui_mainwindow.h" line="491"/>
         <source>&amp;Edit dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="277"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="276"/>
         <location filename="../build/ui_mainwindow.h" line="492"/>
         <source>&amp;Copy dive components</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="280"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="279"/>
         <location filename="../build/ui_mainwindow.h" line="493"/>
         <source>Ctrl+C</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="285"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="284"/>
         <location filename="../build/ui_mainwindow.h" line="494"/>
         <source>&amp;Paste dive components</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="288"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="287"/>
         <location filename="../build/ui_mainwindow.h" line="495"/>
         <source>Ctrl+V</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="325"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="292"/>
+        <location filename="../build/ui_mainwindow.h" line="496"/>
+        <source>&amp;Renumber</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="295"/>
+        <location filename="../build/ui_mainwindow.h" line="497"/>
+        <source>Ctrl+R</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="303"/>
+        <location filename="../build/ui_mainwindow.h" line="498"/>
+        <source>Auto &amp;group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="308"/>
+        <location filename="../build/ui_mainwindow.h" line="499"/>
+        <source>&amp;Yearly statistics</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="311"/>
+        <location filename="../build/ui_mainwindow.h" line="500"/>
+        <source>Ctrl+Y</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="316"/>
+        <location filename="../build/ui_mainwindow.h" line="501"/>
+        <source>&amp;Dive list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="319"/>
+        <location filename="../build/ui_mainwindow.h" line="502"/>
+        <source>Ctrl+2</source>
+        <translation>Ctrl+2</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="324"/>
         <location filename="../build/ui_mainwindow.h" line="503"/>
         <source>&amp;Profile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="333"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="327"/>
+        <location filename="../build/ui_mainwindow.h" line="504"/>
+        <source>Ctrl+3</source>
+        <translation>Ctrl+3</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="332"/>
         <location filename="../build/ui_mainwindow.h" line="505"/>
         <source>&amp;Info</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="341"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="335"/>
+        <location filename="../build/ui_mainwindow.h" line="506"/>
+        <source>Ctrl+4</source>
+        <translation>Ctrl+4</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="340"/>
         <location filename="../build/ui_mainwindow.h" line="507"/>
         <source>&amp;All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="357"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="343"/>
+        <location filename="../build/ui_mainwindow.h" line="508"/>
+        <source>Ctrl+1</source>
+        <translation>Cltrl+1</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="348"/>
+        <location filename="../build/ui_mainwindow.h" line="509"/>
+        <source>P&amp;revious DC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="351"/>
+        <location filename="../build/ui_mainwindow.h" line="510"/>
+        <source>Left</source>
+        <translation>Kiri</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="356"/>
         <location filename="../build/ui_mainwindow.h" line="511"/>
         <source>&amp;Next DC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="365"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="359"/>
+        <location filename="../build/ui_mainwindow.h" line="512"/>
+        <source>Right</source>
+        <translation>Kanan</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="364"/>
         <location filename="../build/ui_mainwindow.h" line="513"/>
         <source>&amp;About Subsurface</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="381"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="372"/>
+        <location filename="../build/ui_mainwindow.h" line="514"/>
+        <source>User &amp;manual</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="375"/>
+        <location filename="../build/ui_mainwindow.h" line="515"/>
+        <source>F1</source>
+        <translation>F1</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="380"/>
         <location filename="../build/ui_mainwindow.h" line="516"/>
         <source>&amp;Globe</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="403"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="383"/>
+        <location filename="../build/ui_mainwindow.h" line="517"/>
+        <source>Ctrl+5</source>
+        <translation>Ctrl+5</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="388"/>
+        <location filename="../build/ui_mainwindow.h" line="518"/>
+        <source>P&amp;lan dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="391"/>
+        <location filename="../build/ui_mainwindow.h" line="519"/>
+        <source>Ctrl+L</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="396"/>
+        <location filename="../build/ui_mainwindow.h" line="520"/>
+        <source>&amp;Import log files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="399"/>
+        <location filename="../build/ui_mainwindow.h" line="522"/>
+        <source>Import divelog files from other applications</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="402"/>
         <location filename="../build/ui_mainwindow.h" line="524"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="408"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="407"/>
         <location filename="../build/ui_mainwindow.h" line="525"/>
         <source>Import &amp;from divelogs.de</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="416"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="415"/>
         <location filename="../build/ui_mainwindow.h" line="526"/>
         <source>&amp;Full screen</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="419"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="418"/>
         <location filename="../build/ui_mainwindow.h" line="528"/>
         <source>Toggle full screen</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="447"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="421"/>
+        <location filename="../build/ui_mainwindow.h" line="530"/>
+        <source>F11</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="446"/>
         <location filename="../build/ui_mainwindow.h" line="531"/>
         <source>&amp;Check for updates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="452"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="451"/>
         <location filename="../build/ui_mainwindow.h" line="532"/>
         <source>&amp;Export</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="458"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="454"/>
+        <location filename="../build/ui_mainwindow.h" line="534"/>
+        <source>Export dive logs</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="457"/>
         <location filename="../build/ui_mainwindow.h" line="536"/>
         <source>Ctrl+E</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="466"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="462"/>
+        <location filename="../build/ui_mainwindow.h" line="537"/>
+        <source>Configure &amp;dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="465"/>
         <location filename="../build/ui_mainwindow.h" line="538"/>
         <source>Ctrl+Shift+C</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="474"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="473"/>
         <location filename="../build/ui_mainwindow.h" line="539"/>
         <source>Edit &amp;dive in planner</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="486"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="485"/>
         <location filename="../build/ui_mainwindow.h" line="540"/>
         <source>Toggle pO₂ graph</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="498"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="497"/>
         <location filename="../build/ui_mainwindow.h" line="541"/>
         <source>Toggle pN₂ graph</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="642"/>
-        <location filename="../build/ui_mainwindow.h" line="553"/>
-        <source>Scale graph</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="654"/>
-        <location filename="../build/ui_mainwindow.h" line="554"/>
-        <source>Toggle pictures</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="666"/>
-        <location filename="../build/ui_mainwindow.h" line="555"/>
-        <source>Toggle tank bar</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="509"/>
+        <location filename="../build/ui_mainwindow.h" line="542"/>
+        <source>Toggle pHe graph</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="674"/>
-        <location filename="../build/ui_mainwindow.h" line="556"/>
-        <source>&amp;Filter divelist</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="521"/>
+        <location filename="../build/ui_mainwindow.h" line="543"/>
+        <source>Toggle DC reported ceiling</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="689"/>
-        <location filename="../build/ui_mainwindow.h" line="558"/>
-        <source>Toggle tissue graph</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="533"/>
+        <location filename="../build/ui_mainwindow.h" line="544"/>
+        <source>Toggle calculated ceiling</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="694"/>
-        <location filename="../build/ui_mainwindow.h" line="559"/>
-        <source>User &amp;survey</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="545"/>
+        <location filename="../build/ui_mainwindow.h" line="545"/>
+        <source>Toggle calculating all tissues</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="699"/>
-        <location filename="../build/ui_mainwindow.h" line="560"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="238"/>
-        <source>&amp;Undo</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="557"/>
+        <location filename="../build/ui_mainwindow.h" line="546"/>
+        <source>Toggle calculated ceiling with 3m increments</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="702"/>
-        <location filename="../build/ui_mainwindow.h" line="561"/>
-        <source>Ctrl+Z</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="569"/>
+        <location filename="../build/ui_mainwindow.h" line="547"/>
+        <source>Toggle heart rate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="707"/>
-        <location filename="../build/ui_mainwindow.h" line="562"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="239"/>
-        <source>&amp;Redo</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="581"/>
+        <location filename="../build/ui_mainwindow.h" line="548"/>
+        <source>Toggle MOD</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="710"/>
-        <location filename="../build/ui_mainwindow.h" line="563"/>
-        <source>Ctrl+Shift+Z</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="593"/>
+        <location filename="../build/ui_mainwindow.h" line="549"/>
+        <source>Toggle EAD, END, EADD</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="715"/>
-        <location filename="../build/ui_mainwindow.h" line="564"/>
-        <source>&amp;Find moved images</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="605"/>
+        <location filename="../build/ui_mainwindow.h" line="550"/>
+        <source>Toggle NDL, TTS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="720"/>
-        <source>Open c&amp;loud storage</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="617"/>
+        <location filename="../build/ui_mainwindow.h" line="551"/>
+        <source>Toggle SAC rate</source>
+        <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="725"/>
-        <source>Save to clo&amp;ud storage</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="629"/>
+        <location filename="../build/ui_mainwindow.h" line="552"/>
+        <source>Toggle ruler</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="730"/>
-        <location filename="../build/ui_mainwindow.h" line="567"/>
-        <source>&amp;Manage dive sites</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="641"/>
+        <location filename="../build/ui_mainwindow.h" line="553"/>
+        <source>Scale graph</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="735"/>
-        <source>Dive Site &amp;Edit</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="653"/>
+        <location filename="../build/ui_mainwindow.h" line="554"/>
+        <source>Toggle pictures</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="740"/>
-        <source>Facebook</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="665"/>
+        <location filename="../build/ui_mainwindow.h" line="555"/>
+        <source>Toggle tank bar</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="745"/>
-        <source>Add GPS location here</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="673"/>
+        <location filename="../build/ui_mainwindow.h" line="556"/>
+        <source>&amp;Filter divelist</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="677"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="676"/>
         <location filename="../build/ui_mainwindow.h" line="557"/>
         <source>Ctrl+F</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="213"/>
-        <location filename="../build/ui_mainwindow.h" line="478"/>
-        <source>&amp;Print</source>
-        <translation>&amp;Print</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="224"/>
-        <location filename="../build/ui_mainwindow.h" line="481"/>
-        <source>Ctrl+,</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="232"/>
-        <location filename="../build/ui_mainwindow.h" line="482"/>
-        <source>&amp;Quit</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="688"/>
+        <source>Toggle tissue heat-map</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="243"/>
-        <location filename="../build/ui_mainwindow.h" line="484"/>
-        <source>Import from &amp;dive computer</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="693"/>
+        <location filename="../build/ui_mainwindow.h" line="559"/>
+        <source>User &amp;survey</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="254"/>
-        <location filename="../build/ui_mainwindow.h" line="487"/>
-        <source>Ctrl+G</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="698"/>
+        <location filename="../build/ui_mainwindow.h" line="560"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="231"/>
+        <source>&amp;Undo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="267"/>
-        <location filename="../build/ui_mainwindow.h" line="490"/>
-        <source>Ctrl++</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="701"/>
+        <location filename="../build/ui_mainwindow.h" line="561"/>
+        <source>Ctrl+Z</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="293"/>
-        <location filename="../build/ui_mainwindow.h" line="496"/>
-        <source>&amp;Renumber</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="706"/>
+        <location filename="../build/ui_mainwindow.h" line="562"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="232"/>
+        <source>&amp;Redo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="296"/>
-        <location filename="../build/ui_mainwindow.h" line="497"/>
-        <source>Ctrl+R</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="709"/>
+        <location filename="../build/ui_mainwindow.h" line="563"/>
+        <source>Ctrl+Shift+Z</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="312"/>
-        <location filename="../build/ui_mainwindow.h" line="500"/>
-        <source>Ctrl+Y</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="714"/>
+        <location filename="../build/ui_mainwindow.h" line="564"/>
+        <source>&amp;Find moved images</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="392"/>
-        <location filename="../build/ui_mainwindow.h" line="519"/>
-        <source>Ctrl+L</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="719"/>
+        <source>Open c&amp;loud storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="216"/>
-        <location filename="../build/ui_mainwindow.h" line="479"/>
-        <source>Ctrl+P</source>
-        <translation>Ctrl+P</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="235"/>
-        <location filename="../build/ui_mainwindow.h" line="483"/>
-        <source>Ctrl+Q</source>
-        <translation>Ctrl+Q</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="246"/>
-        <location filename="../build/ui_mainwindow.h" line="485"/>
-        <source>Ctrl+D</source>
-        <translation>Ctrl+D</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="264"/>
-        <location filename="../build/ui_mainwindow.h" line="489"/>
-        <source>&amp;Add dive</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="724"/>
+        <source>Save to clo&amp;ud storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="304"/>
-        <location filename="../build/ui_mainwindow.h" line="498"/>
-        <source>Auto &amp;group</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="729"/>
+        <location filename="../build/ui_mainwindow.h" line="567"/>
+        <source>&amp;Manage dive sites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="309"/>
-        <location filename="../build/ui_mainwindow.h" line="499"/>
-        <source>&amp;Yearly statistics</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="734"/>
+        <source>Dive Site &amp;Edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="317"/>
-        <location filename="../build/ui_mainwindow.h" line="501"/>
-        <source>&amp;Dive list</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="739"/>
+        <source>Facebook</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="320"/>
-        <location filename="../build/ui_mainwindow.h" line="502"/>
-        <source>Ctrl+2</source>
-        <translation>Ctrl+2</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="328"/>
-        <location filename="../build/ui_mainwindow.h" line="504"/>
-        <source>Ctrl+3</source>
-        <translation>Ctrl+3</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="336"/>
-        <location filename="../build/ui_mainwindow.h" line="506"/>
-        <source>Ctrl+4</source>
-        <translation>Ctrl+4</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="344"/>
-        <location filename="../build/ui_mainwindow.h" line="508"/>
-        <source>Ctrl+1</source>
-        <translation>Cltrl+1</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="349"/>
-        <location filename="../build/ui_mainwindow.h" line="509"/>
-        <source>P&amp;revious DC</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="744"/>
+        <source>Take cloud storage online</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="352"/>
-        <location filename="../build/ui_mainwindow.h" line="510"/>
-        <source>Left</source>
-        <translation>Kiri</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="360"/>
-        <location filename="../build/ui_mainwindow.h" line="512"/>
-        <source>Right</source>
-        <translation>Kanan</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="373"/>
-        <location filename="../build/ui_mainwindow.h" line="514"/>
-        <source>User &amp;manual</source>
+        <location filename="../build/ui_mainwindow.h" line="558"/>
+        <source>Toggle tissue graph</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="376"/>
-        <location filename="../build/ui_mainwindow.h" line="515"/>
-        <source>F1</source>
-        <translation>F1</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="384"/>
-        <location filename="../build/ui_mainwindow.h" line="517"/>
-        <source>Ctrl+5</source>
-        <translation>Ctrl+5</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="389"/>
-        <location filename="../build/ui_mainwindow.h" line="518"/>
-        <source>P&amp;lan dive</source>
+        <location filename="../build/ui_mainwindow.h" line="565"/>
+        <source>Open cloud storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="397"/>
-        <location filename="../build/ui_mainwindow.h" line="520"/>
-        <source>&amp;Import log files</source>
+        <location filename="../build/ui_mainwindow.h" line="566"/>
+        <source>Save to cloud storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="400"/>
-        <location filename="../build/ui_mainwindow.h" line="522"/>
-        <source>Import divelog files from other applications</source>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="331"/>
+        <source>Connect to</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="422"/>
-        <location filename="../build/ui_mainwindow.h" line="530"/>
-        <source>F11</source>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="493"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="538"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1545"/>
+        <source>Please save or cancel the current dive edit before opening a new file.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="505"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="499"/>
         <source>Open file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="509"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="503"/>
         <location filename="../desktop-widgets/mainwindow.cpp" line="614"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1972"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1978"/>
         <source>Cancel</source>
         <translation>Batal</translation>
     </message>
@@ -5240,6 +5339,16 @@ mixed from Air and using:
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="649"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="796"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="977"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="983"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1849"/>
+        <source>Warning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="674"/>
         <source>Please save or cancel the current dive edit before closing the file.</source>
         <translation type="unfinished"/>
@@ -5255,124 +5364,97 @@ mixed from Air and using:
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="982"/>
-        <source>Trying to edit a dive that&apos;s not a manually added dive.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1243"/>
-        <source>Do you want to save the changes that you made in the file %1?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1246"/>
-        <source>Do you want to save the changes that you made in the data file?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1251"/>
-        <source>Save changes?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1587"/>
-        <source>Save file as</source>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
+        <source>Trying to replan a dive that&apos;s not a planned dive.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1682"/>
-        <source>[cloud storage for] %1</source>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="977"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1849"/>
+        <source>Please, first finish the current edition before trying to do another.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1782"/>
-        <source>Opening datafile from older version</source>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="983"/>
+        <source>Trying to edit a dive that&apos;s not a manually added dive.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1783"/>
-        <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly.
-Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1030"/>
+        <source>Yearly statistics</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1794"/>
-        <source>Open dive log file</source>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1244"/>
+        <source>Do you want to save the changes that you made in the file %1?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1795"/>
-        <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;All files (*)</source>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1247"/>
+        <source>Do you want to save the changes that you made in the data file?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1972"/>
-        <source>Contacting cloud service...</source>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1252"/>
+        <source>Save changes?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1252"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1253"/>
         <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="../desktop-widgets/mainwindow.cpp" line="649"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="796"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="976"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="982"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/>
-        <source>Warning</source>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1572"/>
+        <source>Save file as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="499"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="544"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1560"/>
-        <source>Please save or cancel the current dive edit before opening a new file.</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1573"/>
+        <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
+        <translation>Subsurface XML files (*.ssrf *.xml *.XML)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="338"/>
-        <source>Connect to</source>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1670"/>
+        <source>[local cache for] %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
-        <source>Trying to replan a dive that&apos;s not a planned dive.</source>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1672"/>
+        <source>[cloud storage for] %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1029"/>
-        <source>Yearly statistics</source>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1788"/>
+        <source>Opening datafile from older version</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1588"/>
-        <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
-        <translation>Subsurface XML files (*.ssrf *.xml *.XML)</translation>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1789"/>
+        <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly.
+Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="976"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/>
-        <source>Please, first finish the current edition before trying to do another.</source>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1800"/>
+        <source>Open dive log file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_mainwindow.h" line="565"/>
-        <source>Open cloud storage</source>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1801"/>
+        <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_mainwindow.h" line="566"/>
-        <source>Save to cloud storage</source>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1978"/>
+        <source>Contacting cloud service...</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>MultiFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="733"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="731"/>
         <source>Filter shows %1 (of %2) dives</source>
         <translation type="unfinished"/>
     </message>
@@ -5380,39 +5462,39 @@ Subsurface has already tried to pre-populate the data but it might be worth whil
 <context>
     <name>OstcFirmwareCheck</name>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="269"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="271"/>
         <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="273"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="275"/>
         <source>
 
 Please start Bluetooth on your OSTC Sport and do the same preparations as for a logbook download before continuing with the update</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="274"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="276"/>
         <source>Not now</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="275"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="277"/>
         <source>Update firmware</source>
         <translation>pemutakhiran peranti tegar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="277"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="279"/>
         <source>Firmware upgrade notice</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="295"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="297"/>
         <source>Save the downloaded firmware as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="296"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="298"/>
         <source>HEX files (*.hex)</source>
         <translation type="unfinished"/>
     </message>
@@ -5420,79 +5502,89 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PlannerSettingsWidget</name>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="322"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="302"/>
         <source>Open circuit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="322"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="302"/>
         <source>CCR</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="322"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="302"/>
         <source>pSCR</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="421"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="388"/>
         <source>ft/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="422"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="389"/>
         <source>Last stop at 20ft</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="423"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="390"/>
         <source>50% avg. depth to 20ft</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="424"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="391"/>
         <source>20ft to surface</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="426"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="392"/>
+        <source>ft</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="394"/>
         <source>m/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="427"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="395"/>
         <source>Last stop at 6m</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="428"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="396"/>
         <source>50% avg. depth to 6m</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="429"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="397"/>
         <source>6m to surface</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="432"/>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="433"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="398"/>
+        <source>m</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="401"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="402"/>
         <source>cuft/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="441"/>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="442"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="410"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="411"/>
         <source>ℓ/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="451"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="420"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="456"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="425"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
@@ -5642,6 +5734,11 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PreferencesDialog</name>
     <message>
+        <location filename="../build/ui_preferences.h" line="1283"/>
+        <source>Preferences</source>
+        <translation>Preferensi</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1288"/>
         <source>Defaults</source>
         <translation>Acuan</translation>
@@ -5677,6 +5774,11 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1303"/>
+        <source>Lists and tables</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1304"/>
         <source>Font</source>
         <translation>Huruf</translation>
@@ -5692,6 +5794,11 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>Selam</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1307"/>
+        <source>Default dive log file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1308"/>
         <source>No default file</source>
         <translation type="unfinished"/>
@@ -5722,6 +5829,21 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>...</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1314"/>
+        <source>Display invalid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1316"/>
+        <source>Default cylinder</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1317"/>
+        <source>Use default cylinder</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1318"/>
         <source>Animations</source>
         <translation type="unfinished"/>
@@ -5752,42 +5874,26 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>Sistem</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1401"/>
-        <source>Dive site geo lookup</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1402"/>
-        <source>Enable geocoding for dive site management</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1403"/>
-        <source>Parse site without GPS data</source>
+        <location filename="../build/ui_preferences.h" line="1324"/>
+        <source>&amp;Metric</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1404"/>
-        <source>Same format for existing dives</source>
-        <translation type="unfinished"/>
+        <location filename="../build/ui_preferences.h" line="1325"/>
+        <source>Imperial</source>
+        <translation>Imperial</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1405"/>
-        <source>Dive Site Layout</source>
+        <location filename="../build/ui_preferences.h" line="1326"/>
+        <source>Personali&amp;ze</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1406"/>
-        <location filename="../build/ui_preferences.h" line="1407"/>
-        <source>/</source>
+        <location filename="../build/ui_preferences.h" line="1327"/>
+        <source>Individual settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1325"/>
-        <source>Imperial</source>
-        <translation>Imperial</translation>
-    </message>
-    <message>
         <location filename="../build/ui_preferences.h" line="1328"/>
         <source>Depth</source>
         <translation>edalaman</translation>
@@ -5803,6 +5909,11 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1331"/>
+        <source>Pressure</source>
+        <translation>Tekanan</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1332"/>
         <location filename="../build/ui_preferences.h" line="1366"/>
         <source>bar</source>
@@ -5814,11 +5925,26 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>psi</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1334"/>
+        <source>Volume</source>
+        <translation>Volume</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1335"/>
+        <source>&amp;liter</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1336"/>
         <source>cu ft</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1337"/>
+        <source>Temperature</source>
+        <translation>Suhu</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1338"/>
         <source>celsius</source>
         <translation type="unfinished"/>
@@ -5829,315 +5955,281 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1340"/>
+        <source>Weight</source>
+        <translation>Berat</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1341"/>
         <source>kg</source>
         <translation>kgkg</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1363"/>
-        <source>CCR: show setpoints when viewing pO₂</source>
-        <translation type="unfinished"/>
+        <location filename="../build/ui_preferences.h" line="1342"/>
+        <source>lbs</source>
+        <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1364"/>
-        <source>CCR: show individual O₂ sensor values when viewing pO₂</source>
-        <translation type="unfinished"/>
+        <location filename="../build/ui_preferences.h" line="1343"/>
+        <source>Time units</source>
+        <translation>Satuan Waktu</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1365"/>
-        <source>Default CCR set-point for dive planning</source>
+        <location filename="../build/ui_preferences.h" line="1344"/>
+        <source>Ascent/descent speed denominator</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1367"/>
-        <source>pSCR O₂ metabolism rate</source>
-        <translation type="unfinished"/>
+        <location filename="../build/ui_preferences.h" line="1345"/>
+        <source>Minutes</source>
+        <translation>Menit</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1368"/>
-        <source>pSCR ratio</source>
-        <translation type="unfinished"/>
+        <location filename="../build/ui_preferences.h" line="1346"/>
+        <source>Seconds</source>
+        <translation>Detik</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1369"/>
-        <source>ℓ/min</source>
+        <location filename="../build/ui_preferences.h" line="1347"/>
+        <source>GPS coordinates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1371"/>
-        <source>1:</source>
+        <location filename="../build/ui_preferences.h" line="1348"/>
+        <source>Location Display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1372"/>
-        <source>UI language</source>
+        <location filename="../build/ui_preferences.h" line="1349"/>
+        <source>traditional (dms)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1373"/>
-        <source>System default</source>
+        <location filename="../build/ui_preferences.h" line="1350"/>
+        <source>decimal</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1375"/>
-        <source>Proxy</source>
-        <translation type="unfinished"/>
+        <location filename="../build/ui_preferences.h" line="1351"/>
+        <source>Show</source>
+        <translation>Tampilkan</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1379"/>
-        <source>Proxy type</source>
+        <location filename="../build/ui_preferences.h" line="1352"/>
+        <source>Threshold when showing pO₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1377"/>
-        <source>Host</source>
+        <location filename="../build/ui_preferences.h" line="1353"/>
+        <source>Threshold when showing pN₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1376"/>
-        <source>Port</source>
+        <location filename="../build/ui_preferences.h" line="1354"/>
+        <source>Threshold when showing pHe</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1378"/>
-        <source>Requires authentication</source>
+        <location filename="../build/ui_preferences.h" line="1355"/>
+        <source>Max pO₂ when showing MOD</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1380"/>
-        <source>Username</source>
+        <location filename="../build/ui_preferences.h" line="1356"/>
+        <source>Draw dive computer reported ceiling red</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1381"/>
-        <location filename="../build/ui_preferences.h" line="1387"/>
-        <source>Password</source>
+        <location filename="../build/ui_preferences.h" line="1357"/>
+        <source>Show unused cylinders in Equipment tab</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1400"/>
-        <source>Disconnect from Facebook</source>
+        <location filename="../build/ui_preferences.h" line="1358"/>
+        <source>Show average depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1374"/>
-        <source>Filter</source>
-        <translation>Saring</translation>
+        <location filename="../build/ui_preferences.h" line="1359"/>
+        <source>Misc</source>
+        <translation>Lain-lain</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1331"/>
-        <source>Pressure</source>
-        <translation>Tekanan</translation>
+        <location filename="../build/ui_preferences.h" line="1360"/>
+        <source>GFLow</source>
+        <translation>GFlow</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1303"/>
-        <source>Lists and tables</source>
-        <translation type="unfinished"/>
+        <location filename="../build/ui_preferences.h" line="1361"/>
+        <source>GFHigh</source>
+        <translation>GFHigh</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1307"/>
-        <source>Default dive log file</source>
+        <location filename="../build/ui_preferences.h" line="1362"/>
+        <source>GFLow at max depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1314"/>
-        <source>Display invalid</source>
+        <location filename="../build/ui_preferences.h" line="1363"/>
+        <source>CCR: show setpoints when viewing pO₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1316"/>
-        <source>Default cylinder</source>
+        <location filename="../build/ui_preferences.h" line="1364"/>
+        <source>CCR: show individual O₂ sensor values when viewing pO₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1317"/>
-        <source>Use default cylinder</source>
+        <location filename="../build/ui_preferences.h" line="1365"/>
+        <source>Default CCR set-point for dive planning</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1382"/>
-        <source>Subsurface cloud storage</source>
+        <location filename="../build/ui_preferences.h" line="1367"/>
+        <source>pSCR O₂ metabolism rate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1386"/>
-        <source>Email address</source>
+        <location filename="../build/ui_preferences.h" line="1368"/>
+        <source>pSCR ratio</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1388"/>
-        <source>Verification PIN</source>
+        <location filename="../build/ui_preferences.h" line="1369"/>
+        <source>ℓ/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1395"/>
-        <source>Sync to cloud in the background?</source>
+        <location filename="../build/ui_preferences.h" line="1371"/>
+        <source>1:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1396"/>
-        <source>Save Password locally?</source>
+        <location filename="../build/ui_preferences.h" line="1372"/>
+        <source>UI language</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1397"/>
-        <source>Subsurface web service</source>
+        <location filename="../build/ui_preferences.h" line="1373"/>
+        <source>System default</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1398"/>
-        <source>Default user ID</source>
-        <translation type="unfinished"/>
+        <location filename="../build/ui_preferences.h" line="1374"/>
+        <source>Filter</source>
+        <translation>Saring</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1399"/>
-        <source>Save user ID locally?</source>
+        <location filename="../build/ui_preferences.h" line="1375"/>
+        <source>Proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1334"/>
-        <source>Volume</source>
-        <translation>Volume</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1337"/>
-        <source>Temperature</source>
-        <translation>Suhu</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1340"/>
-        <source>Weight</source>
-        <translation>Berat</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1342"/>
-        <source>lbs</source>
-        <translation>lbs</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1343"/>
-        <source>Time units</source>
-        <translation>Satuan Waktu</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1345"/>
-        <source>Minutes</source>
-        <translation>Menit</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1346"/>
-        <source>Seconds</source>
-        <translation>Detik</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1351"/>
-        <source>Show</source>
-        <translation>Tampilkan</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1362"/>
-        <source>GFLow at max depth</source>
+        <location filename="../build/ui_preferences.h" line="1376"/>
+        <source>Port</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1359"/>
-        <source>Misc</source>
-        <translation>Lain-lain</translation>
+        <location filename="../build/ui_preferences.h" line="1377"/>
+        <source>Host</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1283"/>
-        <source>Preferences</source>
-        <translation>Preferensi</translation>
+        <location filename="../build/ui_preferences.h" line="1378"/>
+        <source>Requires authentication</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1324"/>
-        <source>&amp;Metric</source>
+        <location filename="../build/ui_preferences.h" line="1379"/>
+        <source>Proxy type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1326"/>
-        <source>Personali&amp;ze</source>
+        <location filename="../build/ui_preferences.h" line="1380"/>
+        <source>Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1327"/>
-        <source>Individual settings</source>
+        <location filename="../build/ui_preferences.h" line="1381"/>
+        <location filename="../build/ui_preferences.h" line="1387"/>
+        <source>Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1335"/>
-        <source>&amp;liter</source>
+        <location filename="../build/ui_preferences.h" line="1382"/>
+        <source>Subsurface cloud storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1344"/>
-        <source>Ascent/descent speed denominator</source>
+        <location filename="../build/ui_preferences.h" line="1386"/>
+        <source>Email address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1347"/>
-        <source>GPS coordinates</source>
+        <location filename="../build/ui_preferences.h" line="1388"/>
+        <source>Verification PIN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1348"/>
-        <source>Location Display</source>
+        <location filename="../build/ui_preferences.h" line="1395"/>
+        <source>Sync to cloud in the background?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1349"/>
-        <source>traditional (dms)</source>
+        <location filename="../build/ui_preferences.h" line="1396"/>
+        <source>Save Password locally?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1350"/>
-        <source>decimal</source>
+        <location filename="../build/ui_preferences.h" line="1397"/>
+        <source>Subsurface web service</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1352"/>
-        <source>Threshold when showing pO₂</source>
+        <location filename="../build/ui_preferences.h" line="1398"/>
+        <source>Default user ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1353"/>
-        <source>Threshold when showing pN₂</source>
+        <location filename="../build/ui_preferences.h" line="1399"/>
+        <source>Save user ID locally?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1354"/>
-        <source>Threshold when showing pHe</source>
+        <location filename="../build/ui_preferences.h" line="1400"/>
+        <source>Disconnect from Facebook</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1355"/>
-        <source>Max pO₂ when showing MOD</source>
+        <location filename="../build/ui_preferences.h" line="1401"/>
+        <source>Dive site geo lookup</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1356"/>
-        <source>Draw dive computer reported ceiling red</source>
+        <location filename="../build/ui_preferences.h" line="1402"/>
+        <source>Enable geocoding for dive site management</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1357"/>
-        <source>Show unused cylinders in Equipment tab</source>
+        <location filename="../build/ui_preferences.h" line="1403"/>
+        <source>Parse site without GPS data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1358"/>
-        <source>Show average depth</source>
+        <location filename="../build/ui_preferences.h" line="1404"/>
+        <source>Same format for existing dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1360"/>
-        <source>GFLow</source>
-        <translation>GFlow</translation>
+        <location filename="../build/ui_preferences.h" line="1405"/>
+        <source>Dive Site Layout</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1361"/>
-        <source>GFHigh</source>
-        <translation>GFHigh</translation>
+        <location filename="../build/ui_preferences.h" line="1406"/>
+        <location filename="../build/ui_preferences.h" line="1407"/>
+        <source>/</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -6193,106 +6285,136 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="20"/>
-        <source>Show</source>
-        <translation>Tampilkan</translation>
+        <source>Gas pressure display setup</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="29"/>
-        <source>Threshold when showing pO₂</source>
+        <source>Threshold for pO₂ (bar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="49"/>
-        <source>Threshold when showing pN₂</source>
+        <source>Threshold for pN₂ (bar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="69"/>
-        <source>Threshold when showing pHe</source>
+        <source>Threshold for pHe (bar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="89"/>
-        <source>Max pO₂ when showing MOD</source>
+        <source>pO₂ in calculating MOD (bar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="109"/>
-        <source>Draw dive computer reported ceiling red</source>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="106"/>
+        <source>CCR options:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="116"/>
-        <source>Show unused cylinders in Equipment tab</source>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="113"/>
+        <source>Dive planner default setpoint (bar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="123"/>
-        <source>Show mean depth</source>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="133"/>
+        <source>Show setpoints when viewing pO₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="133"/>
-        <source>Misc</source>
-        <translation>Lain-lain</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="140"/>
+        <source>Show individual O₂ sensor values when viewing pO₂</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="149"/>
-        <source>bar</source>
-        <translation>bar</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="150"/>
+        <source>Ceiling display setup</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="165"/>
-        <source>Default CCR set-point for dive planning</source>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="159"/>
+        <source>Draw dive computer reported ceiling red</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="172"/>
-        <source>pSCR O₂ metabolism rate</source>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="169"/>
+        <source>Algorithm for calculated ceiling:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="179"/>
-        <source>GFLow</source>
-        <translation>GFlow</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="176"/>
+        <source>VPM-B</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="183"/>
+        <source>VPM-B Conservatism</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="186"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="193"/>
+        <source>+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="206"/>
+        <source>Bühlmann</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="216"/>
         <source>GFHigh</source>
         <translation>GFHigh</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="203"/>
-        <source>ℓ/min</source>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="236"/>
+        <source>GFLow</source>
+        <translation>GFlow</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="256"/>
+        <source>GFLow at max depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="213"/>
-        <source>pSCR ratio</source>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="263"/>
+        <source>pSCR options:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="223"/>
-        <source>1:</source>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="270"/>
+        <source>Metabolic rate (ℓ O₂/min)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="230"/>
-        <source>CCR: show individual O₂ sensor values when viewing pO₂</source>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="287"/>
+        <source>Dilution ratio</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="237"/>
-        <source>CCR: show setpoints when viewing pO₂</source>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="300"/>
+        <source>1:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="244"/>
-        <source>GFLow at max depth</source>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="310"/>
+        <source>Misc</source>
+        <translation>Lain-lain</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="316"/>
+        <source>Show unused cylinders in Equipment tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="323"/>
+        <source>Show mean depth in Profile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="10"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="9"/>
         <source>Graph</source>
         <translation>Grafik</translation>
     </message>
@@ -6361,15 +6483,29 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="57"/>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="53"/>
         <source>Restart required</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="58"/>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="54"/>
         <source>To correctly load a new language you must restart Subsurface.</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="76"/>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="82"/>
+        <source>Literal characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="77"/>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="83"/>
+        <source>Non-special character(s) in time format.
+These will be used as is. This might not be what you intended.
+See http://doc.qt.io/qt-5/qdatetime.html#toString</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PreferencesNetwork</name>
@@ -6416,7 +6552,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_network.ui" line="156"/>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="148"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="134"/>
         <source>Subsurface cloud storage</source>
         <translation type="unfinished"/>
     </message>
@@ -6461,39 +6597,39 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="11"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="10"/>
         <source>Network</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="15"/>
         <source>No proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/>
         <source>System proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/>
         <source>HTTP proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="19"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/>
         <source>SOCKS proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="75"/>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="97"/>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="110"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="72"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="93"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="106"/>
         <source>Cloud storage email and password can only consist of letters, numbers, and &apos;.&apos;, &apos;-&apos;, &apos;_&apos;, and &apos;+&apos;.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="146"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="132"/>
         <source>Subsurface cloud storage (credentials verified)</source>
         <translation type="unfinished"/>
     </message>
@@ -6651,7 +6787,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="8"/>
+        <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="7"/>
         <source>Units</source>
         <translation>Satuan</translation>
     </message>
@@ -6659,17 +6795,17 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PrintDialog</name>
     <message>
-        <location filename="../desktop-widgets/printdialog.cpp" line="118"/>
-        <source>&amp;Preview</source>
+        <location filename="../desktop-widgets/printdialog.cpp" line="102"/>
+        <source>P&amp;rint</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/printdialog.cpp" line="115"/>
-        <source>P&amp;rint</source>
+        <location filename="../desktop-widgets/printdialog.cpp" line="105"/>
+        <source>&amp;Preview</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/printdialog.cpp" line="130"/>
+        <location filename="../desktop-widgets/printdialog.cpp" line="117"/>
         <source>Print</source>
         <translation type="unfinished"/>
     </message>
@@ -6677,19 +6813,10 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PrintOptions</name>
     <message>
-        <location filename="../build/ui_printoptions.h" line="150"/>
-        <source>&amp;Table print</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../build/ui_printoptions.h" line="158"/>
-        <source>One dive per page</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../build/ui_printoptions.h" line="159"/>
-        <source>Two dives per page</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/printoptions.ui" line="29"/>
+        <location filename="../build/ui_printoptions.h" line="148"/>
+        <source>Print type</source>
+        <translation>Tipe Cetakan</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/printoptions.ui" line="41"/>
@@ -6749,10 +6876,19 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/printoptions.ui" line="29"/>
-        <location filename="../build/ui_printoptions.h" line="148"/>
-        <source>Print type</source>
-        <translation>Tipe Cetakan</translation>
+        <location filename="../build/ui_printoptions.h" line="150"/>
+        <source>&amp;Table print</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../build/ui_printoptions.h" line="158"/>
+        <source>One dive per page</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../build/ui_printoptions.h" line="159"/>
+        <source>Two dives per page</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/printoptions.cpp" line="128"/>
@@ -6794,103 +6930,103 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="755"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="752"/>
         <source>Show NDL / TTS was disabled because of excessive processing time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1344"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1338"/>
         <source>Make first divecomputer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1346"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1340"/>
         <source>Delete this divecomputer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1360"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1354"/>
         <source>Add gas change</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1363"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1357"/>
         <source> (Tank %1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1371"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1365"/>
         <source>Add set-point change</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1373"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1367"/>
         <source>Add bookmark</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1377"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1371"/>
         <source>Edit the profile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1381"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1375"/>
         <source>Remove event</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1386"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1380"/>
         <source>Hide similar events</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1393"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1387"/>
         <source>Edit name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1422"/>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1429"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1416"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1423"/>
         <source>Adjust pressure of tank %1 (currently interpolated as %2)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1444"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1438"/>
         <source>Unhide all events</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1479"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1473"/>
         <source>Hide events</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1479"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1473"/>
         <source>Hide all %1 events?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1514"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1508"/>
         <source>Remove the selected event?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1515"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1509"/>
         <source>%1 @ %2:%3</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1638"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1632"/>
         <source>Edit name of bookmark</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1639"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1633"/>
         <source>Custom name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1644"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1638"/>
         <source>Name is too long!</source>
         <translation type="unfinished"/>
     </message>
@@ -6898,91 +7034,101 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>QMLManager</name>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="95"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="97"/>
         <source>Starting...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="202"/>
         <source>working in no-cloud mode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="213"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="216"/>
         <source>no cloud credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="214"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="270"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="217"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="269"/>
         <source>Please enter valid cloud credentials.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="285"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="284"/>
         <source>Attempting to open cloud storage with new credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="304"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="306"/>
         <source>Testing cloud credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="331"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="320"/>
+        <source>No response from cloud server to validate the credentials</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="329"/>
+        <source>Cannot connect to cloud storage - cloud account not verified</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="361"/>
         <source>Cloud credentials are invalid</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="344"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="374"/>
         <source>Cannot open cloud storage: Error creating https connection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="357"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="387"/>
         <source>Cannot open cloud storage: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="369"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="399"/>
         <source>Cannot connect to cloud storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="411"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="441"/>
         <source>Cloud storage error: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="501"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="531"/>
         <source>Failed to connect to cloud server, reverting to no cloud status</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="520"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="550"/>
         <source>Cloud storage open successfully. No dives in dive list.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="689"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="690"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="721"/>
         <source>h</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="689"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="690"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="691"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="721"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="722"/>
         <source>min</source>
         <translation>menit</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="689"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/>
         <source>sec</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="1041"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="1102"/>
         <source>Unknown GPS location</source>
         <translation type="unfinished"/>
     </message>
@@ -6990,126 +7136,126 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../core/qthelper.cpp" line="866"/>
-        <location filename="../core/qthelper.cpp" line="1214"/>
-        <source>AIR</source>
-        <translation>UDARA</translation>
+        <location filename="../core/gpslocation.h" line="13"/>
+        <source>Waiting to aquire GPS location</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="1214"/>
-        <source>OXYGEN</source>
-        <translation type="unfinished"/>
+        <location filename="../core/qthelper.cpp" line="766"/>
+        <location filename="../core/qthelper.cpp" line="1275"/>
+        <source>m</source>
+        <translation>m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="59"/>
-        <source>Remove this point</source>
-        <translation type="unfinished"/>
+        <location filename="../core/qthelper.cpp" line="768"/>
+        <location filename="../core/qthelper.cpp" line="1274"/>
+        <source>ft</source>
+        <translation>ft</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="32"/>
-        <source>Average</source>
-        <translation>Rata-rata</translation>
+        <location filename="../core/qthelper.cpp" line="794"/>
+        <source>C</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="35"/>
-        <source>Minimum</source>
-        <translation>Minimal</translation>
+        <location filename="../core/qthelper.cpp" line="796"/>
+        <source>F</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="38"/>
-        <source>Maximum</source>
-        <translation>Maksimal</translation>
+        <location filename="../core/qthelper.cpp" line="821"/>
+        <location filename="../core/qthelper.cpp" line="1250"/>
+        <source>kg</source>
+        <translation>kgkg</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/globe.cpp" line="327"/>
-        <source>Move the map and double-click to set the dive location</source>
-        <translation type="unfinished"/>
+        <location filename="../core/qthelper.cpp" line="823"/>
+        <location filename="../core/qthelper.cpp" line="1251"/>
+        <source>lbs</source>
+        <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="28"/>
-        <source>unknown</source>
-        <translation>Tak dikenal</translation>
+        <location filename="../core/qthelper.cpp" line="848"/>
+        <location filename="../core/qthelper.cpp" line="1300"/>
+        <source>bar</source>
+        <translation>bar</translation>
     </message>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="105"/>
-        <source>h:</source>
-        <translation type="unfinished"/>
+        <location filename="../core/qthelper.cpp" line="850"/>
+        <location filename="../core/qthelper.cpp" line="1299"/>
+        <source>psi</source>
+        <translation>psi</translation>
     </message>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="105"/>
-        <source>min</source>
-        <translation>menit</translation>
+        <location filename="../core/qthelper.cpp" line="871"/>
+        <location filename="../core/qthelper.cpp" line="1235"/>
+        <source>AIR</source>
+        <translation>UDARA</translation>
     </message>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="337"/>
-        <source>Multiple</source>
+        <location filename="../core/qthelper.cpp" line="873"/>
+        <source>EAN</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="../core/qthelper.cpp" line="957"/>
+        <location filename="../core/qthelper.cpp" line="962"/>
         <source>(%n dive(s))</source>
         <translation type="unfinished"><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="816"/>
-        <location filename="../core/qthelper.cpp" line="1228"/>
-        <source>kg</source>
-        <translation>kgkg</translation>
+        <location filename="../core/qthelper.cpp" line="1235"/>
+        <source>OXYGEN</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="818"/>
-        <location filename="../core/qthelper.cpp" line="1229"/>
-        <source>lbs</source>
-        <translation>lbs</translation>
+        <location filename="../core/qthelper.cpp" line="1322"/>
+        <source>l</source>
+        <translation>I</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="763"/>
-        <location filename="../core/qthelper.cpp" line="1252"/>
-        <source>ft</source>
-        <translation>ft</translation>
+        <location filename="../core/qthelper.cpp" line="1323"/>
+        <source>cuft</source>
+        <translation>cuft</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="761"/>
-        <location filename="../core/qthelper.cpp" line="1253"/>
-        <source>m</source>
-        <translation>m</translation>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="29"/>
+        <source>unknown</source>
+        <translation>Tak dikenal</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="789"/>
-        <source>C</source>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="114"/>
+        <source>h:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="791"/>
-        <source>F</source>
-        <translation type="unfinished"/>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="114"/>
+        <source>min</source>
+        <translation>menit</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="845"/>
-        <location filename="../core/qthelper.cpp" line="1275"/>
-        <source>psi</source>
-        <translation>psi</translation>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="63"/>
+        <source>Remove this point</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="843"/>
-        <location filename="../core/qthelper.cpp" line="1276"/>
-        <source>bar</source>
-        <translation>bar</translation>
+        <location filename="../desktop-widgets/globe.cpp" line="327"/>
+        <source>Move the map and double-click to set the dive location</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="868"/>
-        <source>EAN</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="32"/>
+        <source>Average</source>
+        <translation>Rata-rata</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="1298"/>
-        <source>l</source>
-        <translation>I</translation>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="35"/>
+        <source>Minimum</source>
+        <translation>Minimal</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="1299"/>
-        <source>cuft</source>
-        <translation>cuft</translation>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="38"/>
+        <source>Maximum</source>
+        <translation>Maksimal</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="625"/>
@@ -7131,17 +7277,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <source>Malformed XML response. Line %1: %2</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../core/gpslocation.h" line="13"/>
-        <source>Waiting to aquire GPS location</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>ReadSettingsThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1651"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1676"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1640"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1665"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation type="unfinished"/>
     </message>
@@ -7170,7 +7311,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ResetSettingsThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1775"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1764"/>
         <source>Reset settings failed!</source>
         <translation type="unfinished"/>
     </message>
@@ -7208,6 +7349,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ShiftImageTimesDialog</name>
     <message>
+        <location filename="../desktop-widgets/shiftimagetimes.ui" line="23"/>
+        <location filename="../build/ui_shiftimagetimes.h" line="184"/>
+        <source>Shift selected image times</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/shiftimagetimes.ui" line="34"/>
         <location filename="../build/ui_shiftimagetimes.h" line="185"/>
         <source>Shift times of image(s) by</source>
@@ -7220,12 +7367,6 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/shiftimagetimes.ui" line="23"/>
-        <location filename="../build/ui_shiftimagetimes.h" line="184"/>
-        <source>Shift selected image times</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/shiftimagetimes.ui" line="105"/>
         <location filename="../build/ui_shiftimagetimes.h" line="187"/>
         <source>Earlier</source>
@@ -7275,12 +7416,12 @@ Not all images have timestamps in the range between
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="297"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="296"/>
         <source>Open image file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="299"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="298"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation type="unfinished"/>
     </message>
@@ -7438,49 +7579,49 @@ Not all images have timestamps in the range between
 <context>
     <name>SocialNetworkDialog</name>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="339"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="284"/>
         <source>Dive date: %1 
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="342"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="287"/>
         <source>Duration: %1 
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="343"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="288"/>
         <source>h:</source>
         <comment>abbreviation for hours plus separator</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="344"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="289"/>
         <source>min</source>
         <comment>abbreviation for minutes</comment>
         <translation>menit</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="347"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="292"/>
         <source>Dive location: %1 
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="350"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="295"/>
         <source>Buddy: %1 
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="353"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="298"/>
         <source>Divemaster: %1 
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="356"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="301"/>
         <source>
 %1</source>
         <translation type="unfinished"/>
@@ -7565,9 +7706,20 @@ Not all images have timestamps in the range between
     <name>StartPage</name>
     <message>
         <location filename="../mobile-widgets/qml/StartPage.qml" line="19"/>
-        <source>To use Subsurface-mobile with Subsurface cloud storage, please enteryour cloud credentials.
+        <source>To use Subsurface-mobile with Subsurface cloud storage, please enter your cloud credentials.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/StartPage.qml" line="20"/>
+        <source>If this is the first time you use Subsurface cloud storage, enter a valid email (all lower case) and a password of your choice (letters and numbers). The server will send a PIN to the email address provided that you will have to enter here.
 
-To use Subsurface-mobile only with local data on this device, tap on the no cloud icon below.</source>
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/StartPage.qml" line="23"/>
+        <source>To use Subsurface-mobile only with local data on this device, tap on the no cloud icon below.</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -7606,7 +7758,12 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>SubsurfaceWebServices</name>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="419"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="395"/>
+        <source>Enter User ID and click Download</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="417"/>
         <source>Webservice</source>
         <translation>Webservice</translation>
     </message>
@@ -7631,30 +7788,25 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="557"/>
-        <source>Download successful</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="551"/>
         <source>Invalid user identifier!</source>
         <translation>identifikasi pengguna tidak cocok!</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="397"/>
-        <source>Enter User ID and click Download</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="554"/>
         <source>Cannot parse response!</source>
         <translation>Respon gagal di telaah!</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="557"/>
+        <source>Download successful</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>SuitFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="674"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="672"/>
         <source>Suits: </source>
         <translation type="unfinished"/>
     </message>
@@ -7662,7 +7814,7 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>SuitsFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="123"/>
+        <location filename="../qt-models/filtermodels.cpp" line="128"/>
         <source>No suit set</source>
         <translation type="unfinished"/>
     </message>
@@ -7681,7 +7833,7 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>TagFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="595"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="593"/>
         <source>Tags: </source>
         <translation type="unfinished"/>
     </message>
@@ -7689,7 +7841,7 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>TagFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="148"/>
+        <location filename="../qt-models/filtermodels.cpp" line="153"/>
         <source>Empty tags</source>
         <translation type="unfinished"/>
     </message>
@@ -7715,6 +7867,11 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>TemplateEdit</name>
     <message>
+        <location filename="../desktop-widgets/templateedit.ui" line="14"/>
+        <source>Edit template</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/templateedit.ui" line="37"/>
         <source>Preview</source>
         <translation type="unfinished"/>
@@ -7760,11 +7917,6 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
         <translation>Ukuran Huruf</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/templateedit.ui" line="14"/>
-        <source>Edit template</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/templateedit.ui" line="165"/>
         <source>Color palette</source>
         <translation type="unfinished"/>
@@ -7946,85 +8098,12 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>TextHyperlinkEventFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="817"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="815"/>
         <source>%1click to visit %2</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>ThemeTest</name>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="29"/>
-        <source>Theme Information</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="33"/>
-        <source>Screen</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="42"/>
-        <source>Geometry (pixels):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="49"/>
-        <source>Geometry (gridUnits):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="56"/>
-        <source>Units.gridUnit:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="63"/>
-        <source>Units.devicePixelRatio:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="70"/>
-        <source>Font Metrics</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="76"/>
-        <source>FontMetrics pointSize:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="83"/>
-        <source>FontMetrics pixelSize:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="90"/>
-        <source>FontMetrics devicePixelRatio:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="97"/>
-        <source>Text item pixelSize:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="104"/>
-        <source>Text item pointSize:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="111"/>
-        <source>Pixel density:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="118"/>
-        <source>Height of default font:</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
     <name>ToolTipItem</name>
     <message>
         <location filename="../profile-widget/divetooltipitem.cpp" line="136"/>
@@ -8035,102 +8114,107 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>TripItem</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="67"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="68"/>
         <source>(%1 shown)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="194"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="197"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="215"/>
         <source>Date</source>
         <translation>Tanggal</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="200"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="218"/>
         <source>Rating</source>
         <translation>Peringkat</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
         <source>Depth(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="206"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="224"/>
         <source>Duration</source>
         <translation>Durasi</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="209"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="227"/>
         <source>Temp(%1%2)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
         <source>Weight(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
         <source>kg</source>
         <translation>kgkg</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="215"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="233"/>
         <source>Suit</source>
         <translation>Pakaian</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="218"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="236"/>
         <source>Cyl</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="239"/>
         <source>Gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="244"/>
         <source>SAC(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="244"/>
         <source>/min</source>
         <translation>/menit</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="229"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="247"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="232"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="250"/>
         <source>Max CNS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="235"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="253"/>
+        <source>Photos before/during/after dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="256"/>
         <source>Location</source>
         <translation>Lokasi</translation>
     </message>
@@ -8153,72 +8237,73 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>UpdateManager</name>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="69"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="61"/>
         <source>Check for updates.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="70"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="62"/>
         <source>Subsurface was unable to check for updates.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="75"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="67"/>
         <source>The following error occurred:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="76"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="68"/>
         <source>Please check your internet connection.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="86"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="78"/>
         <source>You are using the latest version of Subsurface.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="89"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="81"/>
         <source>A new version of Subsurface is available.&lt;br/&gt;Click on:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; to download it.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="95"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="87"/>
         <source>A new version of Subsurface is available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="96"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="88"/>
         <source>Latest version is %1, please check %2 our download page %3 for information in how to update.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="106"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="98"/>
         <source>Newest release version is </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="107"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="99"/>
         <source>The server returned the following information:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="125"/>
-        <source>Subsurface is checking every two weeks if a new version is available. If you don&apos;t want Subsurface to continue checking, please click Decline.</source>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="117"/>
+        <source>Subsurface is checking every two weeks if a new version is available. 
+ If you don&apos;t want Subsurface to continue checking, please click Decline.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="126"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="119"/>
         <source>Decline</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="127"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="120"/>
         <source>Accept</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="129"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="122"/>
         <source>Automatic check for updates</source>
         <translation type="unfinished"/>
     </message>
@@ -8240,24 +8325,6 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>UserSurvey</name>
     <message>
-        <location filename="../desktop-widgets/usersurvey.ui" line="44"/>
-        <location filename="../build/ui_usersurvey.h" line="151"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;We would love to learn more about our users, their preferences and their usage habits. Please spare a minute to fill out this form and submit it to the Subsurface team.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/usersurvey.ui" line="115"/>
-        <location filename="../build/ui_usersurvey.h" line="156"/>
-        <source>Other software/sources</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/usersurvey.ui" line="128"/>
-        <location filename="../build/ui_usersurvey.h" line="157"/>
-        <source>Manually entering dives</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="14"/>
         <location filename="../build/ui_usersurvey.h" line="149"/>
         <source>User survey</source>
@@ -8270,6 +8337,12 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/usersurvey.ui" line="44"/>
+        <location filename="../build/ui_usersurvey.h" line="151"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;We would love to learn more about our users, their preferences and their usage habits. Please spare a minute to fill out this form and submit it to the Subsurface team.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="63"/>
         <location filename="../build/ui_usersurvey.h" line="152"/>
         <source>Technical diver</source>
@@ -8294,6 +8367,18 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/usersurvey.ui" line="115"/>
+        <location filename="../build/ui_usersurvey.h" line="156"/>
+        <source>Other software/sources</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/usersurvey.ui" line="128"/>
+        <location filename="../build/ui_usersurvey.h" line="157"/>
+        <source>Manually entering dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="141"/>
         <location filename="../build/ui_usersurvey.h" line="158"/>
         <source>Android/iPhone companion app</source>
@@ -8324,6 +8409,11 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/usersurvey.cpp" line="18"/>
+        <source>Send</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/usersurvey.cpp" line="43"/>
         <source>
 Operating system: %1</source>
@@ -8363,18 +8453,13 @@ Language: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/usersurvey.cpp" line="101"/>
-        <source>Submit user survey.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/usersurvey.cpp" line="82"/>
         <source>Ask again?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/usersurvey.cpp" line="18"/>
-        <source>Send</source>
+        <location filename="../desktop-widgets/usersurvey.cpp" line="101"/>
+        <source>Submit user survey.</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -8467,12 +8552,12 @@ Language: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="324"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="325"/>
         <source>Operation timed out</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="345"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="346"/>
         <source>Transferring data...</source>
         <translation type="unfinished"/>
     </message>
@@ -8507,16 +8592,16 @@ Language: %1</source>
 <context>
     <name>WriteSettingsThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1702"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1709"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1718"/>
-        <source>Failed!</source>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1689"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1710"/>
+        <source>This feature is not yet available for the selected dive computer.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1700"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1721"/>
-        <source>This feature is not yet available for the selected dive computer.</source>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1691"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1698"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1707"/>
+        <source>Failed!</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -8641,7 +8726,7 @@ Rata-rata</translation>
 <context>
     <name>getextFromC</name>
     <message>
-        <location filename="../core/libdivecomputer.c" line="674"/>
+        <location filename="../core/libdivecomputer.c" line="737"/>
         <source>Error parsing the header</source>
         <translation type="unfinished"/>
     </message>
@@ -8649,38 +8734,377 @@ Rata-rata</translation>
 <context>
     <name>gettextFromC</name>
     <message>
+        <location filename="../core/cochran.c" line="309"/>
+        <location filename="../core/cochran.c" line="315"/>
+        <location filename="../core/cochran.c" line="385"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>deco stop</source>
+        <translation>pemberhentian deco</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="336"/>
+        <location filename="../core/cochran.c" line="390"/>
+        <location filename="../core/file.c" line="777"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>ascent</source>
+        <translation>nai</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="342"/>
+        <location filename="../core/file.c" line="755"/>
+        <source>battery</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="348"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
+        <source>OLF</source>
+        <translation>OLF</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="353"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
+        <source>maxdepth</source>
+        <translation>dalam maks</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="358"/>
+        <location filename="../core/cochran.c" line="404"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
+        <source>pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="365"/>
+        <location filename="../core/cochran.c" line="414"/>
+        <location filename="../core/cochran.c" line="421"/>
+        <location filename="../core/file.c" line="868"/>
+        <location filename="../core/libdivecomputer.c" line="225"/>
+        <location filename="../core/libdivecomputer.c" line="228"/>
+        <source>gaschange</source>
+        <translation>ganti gas</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="370"/>
+        <location filename="../core/cochran.c" line="409"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>rbt</source>
+        <translation>rbt</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="379"/>
+        <location filename="../core/cochran.c" line="426"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>ceiling</source>
+        <translation>batas</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="395"/>
+        <location filename="../core/libdivecomputer.c" line="224"/>
+        <source>transmitter</source>
+        <translation>pemancar</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="153"/>
+        <source>Error: the file does not appear to be a DATATRAK divelog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="286"/>
+        <source>clear</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="289"/>
+        <source>misty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="292"/>
+        <source>fog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="295"/>
+        <source>rain</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="298"/>
+        <source>storm</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="301"/>
+        <source>snow</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="321"/>
+        <source>No suit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="324"/>
+        <source>Shorty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="327"/>
+        <source>Combi</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="330"/>
+        <source>Wet suit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="333"/>
+        <source>Semidry suit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="336"/>
+        <source>Dry suit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="396"/>
+        <source>no stop</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="398"/>
+        <location filename="../core/dive.c" line="29"/>
+        <source>deco</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="400"/>
+        <source>single ascent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="402"/>
+        <source>multiple ascent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="404"/>
+        <location filename="../core/dive.c" line="27"/>
+        <source>fresh</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="406"/>
+        <source>salt water</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="431"/>
+        <source>sight seeing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="433"/>
+        <source>club dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="435"/>
+        <location filename="../core/dive.c" line="28"/>
+        <source>instructor</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="437"/>
+        <source>instruction</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="439"/>
+        <location filename="../core/dive.c" line="27"/>
+        <source>night</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="441"/>
+        <location filename="../core/dive.c" line="25"/>
+        <source>cave</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="443"/>
+        <location filename="../core/dive.c" line="24"/>
+        <source>ice</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="445"/>
+        <source>search</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="455"/>
+        <location filename="../core/dive.c" line="25"/>
+        <source>wreck</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="457"/>
+        <location filename="../core/dive.c" line="26"/>
+        <source>river</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="459"/>
+        <location filename="../core/dive.c" line="23"/>
+        <source>drift</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="461"/>
+        <location filename="../core/dive.c" line="28"/>
+        <source>photo</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="463"/>
+        <source>other</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="474"/>
+        <source>Other activities</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="498"/>
+        <source>Datatrak/Wlog notes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="537"/>
+        <source>Manually entered dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="588"/>
+        <source>Unknown</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="674"/>
+        <source>Error: couldn&apos;t open the file %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="687"/>
+        <source>Error: no dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="23"/>
+        <source>boat</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="23"/>
+        <source>shore</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="24"/>
+        <source>deep</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="24"/>
+        <source>cavern</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="25"/>
+        <source>altitude</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="26"/>
+        <source>pool</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="26"/>
+        <source>lake</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="27"/>
+        <source>student</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="28"/>
+        <source>video</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="33"/>
+        <source>OC-gas</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="33"/>
+        <source>diluent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="33"/>
+        <location filename="../core/equipment.c" line="88"/>
+        <location filename="../core/planner.c" line="1436"/>
+        <location filename="../core/planner.c" line="1439"/>
+        <source>oxygen</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../core/dive.c" line="181"/>
         <source>pascal</source>
         <translation>Pascal</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="186"/>
-        <location filename="../core/qthelper.cpp" line="669"/>
+        <location filename="../core/qthelper.cpp" line="674"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="190"/>
-        <location filename="../core/qthelper.cpp" line="672"/>
+        <location filename="../core/qthelper.cpp" line="677"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
+        <location filename="../core/dive.c" line="227"/>
+        <source>ℓ</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../core/dive.c" line="232"/>
         <source>cuft</source>
         <translation>cuft</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="269"/>
-        <location filename="../core/qthelper.cpp" line="590"/>
-        <location filename="../core/qthelper.cpp" line="605"/>
+        <location filename="../core/qthelper.cpp" line="595"/>
+        <location filename="../core/qthelper.cpp" line="610"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="274"/>
-        <location filename="../core/qthelper.cpp" line="593"/>
-        <location filename="../core/qthelper.cpp" line="607"/>
+        <location filename="../core/qthelper.cpp" line="598"/>
+        <location filename="../core/qthelper.cpp" line="612"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
@@ -8706,53 +9130,58 @@ Rata-rata</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="325"/>
-        <location filename="../core/qthelper.cpp" line="616"/>
-        <location filename="../core/qthelper.cpp" line="626"/>
+        <location filename="../core/qthelper.cpp" line="621"/>
+        <location filename="../core/qthelper.cpp" line="631"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="329"/>
-        <location filename="../core/qthelper.cpp" line="614"/>
-        <location filename="../core/qthelper.cpp" line="624"/>
+        <location filename="../core/qthelper.cpp" line="619"/>
+        <location filename="../core/qthelper.cpp" line="629"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="1772"/>
+        <location filename="../core/dive.c" line="1751"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) or (%s)</translation>
     </message>
     <message>
-        <location filename="../core/divelist.c" line="484"/>
+        <location filename="../core/divelist.c" line="487"/>
         <location filename="../core/equipment.c" line="84"/>
-        <location filename="../core/planner.c" line="1411"/>
-        <location filename="../core/planner.c" line="1414"/>
+        <location filename="../core/planner.c" line="1432"/>
+        <location filename="../core/planner.c" line="1435"/>
         <source>air</source>
         <translation>udara</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="197"/>
+        <location filename="../core/equipment.c" line="86"/>
+        <source>EAN%d</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/equipment.c" line="198"/>
         <source>integrated</source>
         <translation>terintegrasi</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="198"/>
+        <location filename="../core/equipment.c" line="199"/>
         <source>belt</source>
         <translation>sabuk</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="199"/>
+        <location filename="../core/equipment.c" line="200"/>
         <source>ankle</source>
         <translation>Pergelangan kaki</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="200"/>
+        <location filename="../core/equipment.c" line="201"/>
         <source>backplate weight</source>
         <translation>berat plat-punggung</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="201"/>
+        <location filename="../core/equipment.c" line="202"/>
         <source>clip-on</source>
         <translation>clip-on</translation>
     </message>
@@ -8765,8 +9194,8 @@ Rata-rata</translation>
         <location filename="../core/file.c" line="121"/>
         <location filename="../core/file.c" line="512"/>
         <location filename="../core/file.c" line="597"/>
-        <location filename="../core/file.c" line="924"/>
-        <location filename="../core/file.c" line="1056"/>
+        <location filename="../core/file.c" line="909"/>
+        <location filename="../core/file.c" line="1092"/>
         <location filename="../core/ostctools.c" line="80"/>
         <source>Failed to read &apos;%s&apos;</source>
         <translation>Gagal baca &apos;%s&apos;</translation>
@@ -8824,706 +9253,720 @@ Rata-rata</translation>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/file.c" line="887"/>
-        <source>No matching DC found for file &apos;%s&apos;</source>
+        <location filename="../core/git-access.c" line="134"/>
+        <source>Local cache directory %s corrupted - can&apos;t sync with Subsurface cloud storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>none</source>
-        <translation>kosong</translation>
+        <location filename="../core/git-access.c" line="157"/>
+        <location filename="../core/git-access.c" line="177"/>
+        <source>Could not update local cache to newer remote data</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="309"/>
-        <location filename="../core/cochran.c" line="315"/>
-        <location filename="../core/cochran.c" line="385"/>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>deco stop</source>
-        <translation>pemberhentian deco</translation>
+        <location filename="../core/git-access.c" line="170"/>
+        <source>Subsurface cloud storage corrupted</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="342"/>
-        <location filename="../core/file.c" line="755"/>
-        <source>battery</source>
+        <location filename="../core/git-access.c" line="284"/>
+        <source>Could not update Subsurface cloud storage, try again later</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="370"/>
-        <location filename="../core/cochran.c" line="409"/>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>rbt</source>
-        <translation>rbt</translation>
+        <location filename="../core/git-access.c" line="344"/>
+        <source>Remote storage and local data diverged. Error: merge failed (%s)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="336"/>
-        <location filename="../core/cochran.c" line="390"/>
-        <location filename="../core/file.c" line="777"/>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>ascent</source>
-        <translation>nai</translation>
+        <location filename="../core/git-access.c" line="374"/>
+        <source>Remote storage and local data diverged. Cannot combine local and remote changes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="379"/>
-        <location filename="../core/cochran.c" line="426"/>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>ceiling</source>
-        <translation>batas</translation>
+        <location filename="../core/git-access.c" line="408"/>
+        <source>Remote storage and local data diverged</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>workload</source>
-        <translation>beban kerja</translation>
+        <location filename="../core/git-access.c" line="411"/>
+        <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="395"/>
-        <location filename="../core/libdivecomputer.c" line="203"/>
-        <source>transmitter</source>
-        <translation>pemancar</translation>
+        <location filename="../core/git-access.c" line="420"/>
+        <source>Problems with local cache of Subsurface cloud data</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="203"/>
+        <location filename="../core/git-access.c" line="421"/>
+        <source>Moved cache data to %s. Please try the operation again.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/git-access.c" line="743"/>
+        <source>Error connecting to Subsurface cloud storage</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/git-access.c" line="746"/>
+        <source>git clone of %s failed (%s)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="210"/>
+        <location filename="../core/parse-xml.c" line="3317"/>
+        <location filename="../core/uemis-downloader.c" line="134"/>
+        <source>unknown</source>
+        <translation>Tak dikenal</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>none</source>
+        <translation>kosong</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>workload</source>
+        <translation>beban kerja</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="224"/>
         <source>violation</source>
         <translation>gangguan</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="203"/>
+        <location filename="../core/libdivecomputer.c" line="224"/>
         <source>bookmark</source>
         <translation>tandai</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="203"/>
+        <location filename="../core/libdivecomputer.c" line="224"/>
         <source>surface</source>
         <translation>permuakaan</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="203"/>
+        <location filename="../core/libdivecomputer.c" line="224"/>
         <source>safety stop</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="365"/>
-        <location filename="../core/cochran.c" line="414"/>
-        <location filename="../core/cochran.c" line="421"/>
-        <location filename="../core/file.c" line="868"/>
-        <location filename="../core/libdivecomputer.c" line="204"/>
-        <location filename="../core/libdivecomputer.c" line="207"/>
-        <source>gaschange</source>
-        <translation>ganti gas</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="204"/>
+        <location filename="../core/libdivecomputer.c" line="225"/>
         <source>safety stop (voluntary)</source>
         <translation>safety stop (bebas)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="204"/>
+        <location filename="../core/libdivecomputer.c" line="225"/>
         <source>safety stop (mandatory)</source>
         <translation>safety stop (wajib)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="205"/>
+        <location filename="../core/libdivecomputer.c" line="226"/>
         <source>deepstop</source>
         <translation>deepstop</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="205"/>
+        <location filename="../core/libdivecomputer.c" line="226"/>
         <source>ceiling (safety stop)</source>
         <translation>batas (safety stop)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="205"/>
-        <source>divetime</source>
-        <translation>waktu selam</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="205"/>
+        <location filename="../core/libdivecomputer.c" line="226"/>
         <source>below floor</source>
         <comment>event showing dive is below deco floor and adding deco time</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="353"/>
-        <location filename="../core/libdivecomputer.c" line="206"/>
-        <source>maxdepth</source>
-        <translation>dalam maks</translation>
-    </message>
-    <message>
-        <location filename="../core/cochran.c" line="348"/>
-        <location filename="../core/libdivecomputer.c" line="206"/>
-        <source>OLF</source>
-        <translation>OLF</translation>
+        <location filename="../core/libdivecomputer.c" line="226"/>
+        <source>divetime</source>
+        <translation>waktu selam</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="206"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
         <source>airtime</source>
         <translation>waktu mengudara</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="206"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
         <source>rgbm</source>
         <translation>rgbm</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="206"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
         <source>heading</source>
         <translation>judul</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="358"/>
-        <location filename="../core/cochran.c" line="404"/>
-        <location filename="../core/libdivecomputer.c" line="206"/>
-        <source>pO₂</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="207"/>
+        <location filename="../core/libdivecomputer.c" line="228"/>
         <source>tissue level warning</source>
         <translation>peringatan tingkat jaringan</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="207"/>
+        <location filename="../core/libdivecomputer.c" line="228"/>
         <source>non stop time</source>
         <translation>waktu non stop</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="224"/>
+        <location filename="../core/libdivecomputer.c" line="237"/>
         <source>invalid event number</source>
         <translation>nomor kejadian tidak sesuai</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="658"/>
-        <source>Unable to create parser for %s %s</source>
-        <translation>tidak dapat membuat pengurai untuk %s %s</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="664"/>
-        <source>Error registering the data</source>
-        <translation>Gagal mendaftarkan data</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="495"/>
+        <location filename="../core/libdivecomputer.c" line="553"/>
         <source>Error parsing the datetime</source>
         <translation>Gagal mengurai tanggal</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="513"/>
+        <location filename="../core/libdivecomputer.c" line="571"/>
         <source>Dive %d: %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="519"/>
+        <location filename="../core/libdivecomputer.c" line="577"/>
         <source>Error parsing the divetime</source>
         <translation>Gagal mengurai waktu selam</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="529"/>
+        <location filename="../core/libdivecomputer.c" line="587"/>
         <source>Error parsing the maxdepth</source>
         <translation>Gagal mengurai kedalamn maks</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="548"/>
+        <location filename="../core/libdivecomputer.c" line="606"/>
         <source>Error parsing temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="568"/>
+        <location filename="../core/libdivecomputer.c" line="626"/>
         <source>Error parsing the gas mix count</source>
         <translation>Gagal mengurai perhitungan campuran gas</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="580"/>
+        <location filename="../core/libdivecomputer.c" line="638"/>
         <source>Error obtaining water salinity</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="589"/>
+        <location filename="../core/libdivecomputer.c" line="647"/>
         <source>Error obtaining surface pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="614"/>
+        <location filename="../core/libdivecomputer.c" line="672"/>
         <source>Error obtaining divemode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="634"/>
+        <location filename="../core/libdivecomputer.c" line="692"/>
         <source>Error parsing the gas mix</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="684"/>
+        <location filename="../core/libdivecomputer.c" line="717"/>
+        <source>Unable to create parser for %s %s</source>
+        <translation>tidak dapat membuat pengurai untuk %s %s</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="723"/>
+        <source>Error registering the data</source>
+        <translation>Gagal mendaftarkan data</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="744"/>
         <source>Error parsing the samples</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="822"/>
+        <location filename="../core/libdivecomputer.c" line="882"/>
         <source>Event: waiting for user action</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="830"/>
+        <location filename="../core/libdivecomputer.c" line="890"/>
         <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="894"/>
+        <location filename="../core/libdivecomputer.c" line="954"/>
         <source>Error registering the event handler.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="899"/>
+        <location filename="../core/libdivecomputer.c" line="959"/>
         <source>Error registering the cancellation handler.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="920"/>
+        <location filename="../core/libdivecomputer.c" line="980"/>
         <source>Dive data import error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="959"/>
+        <location filename="../core/libdivecomputer.c" line="1019"/>
         <source>Unable to create libdivecomputer context</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="966"/>
+        <location filename="../core/libdivecomputer.c" line="1026"/>
         <source>Unable to open %s %s (%s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="992"/>
+        <location filename="../core/libdivecomputer.c" line="1048"/>
         <source>Insufficient privileges to open the device %s %s (%s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/parse-xml.c" line="517"/>
-        <source>Strange percentage reading %s
+        <location filename="../core/load-git.c" line="194"/>
+        <location filename="../core/parse-xml.c" line="1242"/>
+        <source>multiple GPS locations for this dive site; also %s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/load-git.c" line="194"/>
-        <location filename="../core/parse-xml.c" line="1238"/>
-        <source>multiple GPS locations for this dive site; also %s
+        <location filename="../core/load-git.c" line="222"/>
+        <location filename="../core/parse-xml.c" line="1304"/>
+        <source>additional name for site: %s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/parse-xml.c" line="2044"/>
+        <location filename="../core/ostctools.c" line="120"/>
+        <location filename="../core/ostctools.c" line="152"/>
+        <source>Unknown DC in dive %d</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/ostctools.c" line="165"/>
+        <source>Error - %s - parsing dive %d</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/parse-xml.c" line="517"/>
+        <source>Strange percentage reading %s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/parse-xml.c" line="2051"/>
         <source>Failed to parse &apos;%s&apos;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/parse-xml.c" line="3741"/>
+        <location filename="../core/parse-xml.c" line="3774"/>
         <source>Can&apos;t open stylesheet %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="86"/>
-        <source>EAN%d</source>
+        <location filename="../core/planner.c" line="555"/>
+        <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE %s ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="1032"/>
-        <location filename="../core/planner.c" line="1184"/>
-        <source>Can&apos;t find gas %s</source>
+        <location filename="../core/planner.c" line="569"/>
+        <source>Decompression calculation aborted due to excessive time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="368"/>
-        <source>Too many gas mixes</source>
+        <location filename="../core/planner.c" line="571"/>
+        <location filename="../core/planner.c" line="829"/>
+        <location filename="../core/planner.c" line="834"/>
+        <location filename="../core/planner.c" line="860"/>
+        <location filename="../core/planner.c" line="870"/>
+        <source>Warning:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="568"/>
-        <source>Decompression calculation aborted due to excessive time</source>
+        <location filename="../core/planner.c" line="581"/>
+        <source>based on Bühlmann ZHL-16C with GFlow = %d and GFhigh = %d</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="592"/>
-        <source>Subsurface dive plan</source>
+        <location filename="../core/planner.c" line="586"/>
+        <source>based on VPM-B at nominal conservatism</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="596"/>
-        <source>depth</source>
+        <location filename="../core/planner.c" line="588"/>
+        <source>based on VPM-B at +%d conservatism</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="602"/>
-        <source>runtime</source>
+        <location filename="../core/planner.c" line="590"/>
+        <source>, effective GF=%d/%d</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="594"/>
+        <source>recreational mode based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="598"/>
+        <source>Subsurface dive plan</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../core/planner.c" line="599"/>
+        <source>&lt;div&gt;Runtime: %dmin&lt;/div&gt;&lt;br&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="604"/>
+        <source>depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="607"/>
         <source>duration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="554"/>
-        <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE %s ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source>
+        <location filename="../core/planner.c" line="610"/>
+        <source>runtime</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="605"/>
+        <location filename="../core/planner.c" line="613"/>
         <source>gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="648"/>
+        <location filename="../core/planner.c" line="656"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="656"/>
+        <location filename="../core/planner.c" line="664"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="669"/>
+        <location filename="../core/planner.c" line="677"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="676"/>
+        <location filename="../core/planner.c" line="684"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="721"/>
+        <location filename="../core/planner.c" line="729"/>
         <source>%3.0f%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="724"/>
-        <location filename="../core/planner.c" line="728"/>
+        <location filename="../core/planner.c" line="732"/>
+        <location filename="../core/planner.c" line="736"/>
         <source>%3dmin</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="737"/>
-        <location filename="../core/planner.c" line="749"/>
+        <location filename="../core/planner.c" line="745"/>
+        <location filename="../core/planner.c" line="757"/>
         <source>(SP = %.1fbar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="772"/>
+        <location filename="../core/planner.c" line="780"/>
         <source>Switch gas to %s (SP = %.1fbar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="774"/>
+        <location filename="../core/planner.c" line="782"/>
         <source>Switch gas to %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="793"/>
+        <location filename="../core/planner.c" line="801"/>
         <source>CNS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="795"/>
+        <location filename="../core/planner.c" line="803"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="799"/>
+        <location filename="../core/planner.c" line="807"/>
         <source>Gas consumption (CCR legs excluded):</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="801"/>
+        <location filename="../core/planner.c" line="809"/>
         <source>Gas consumption:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="570"/>
-        <location filename="../core/planner.c" line="821"/>
-        <location filename="../core/planner.c" line="826"/>
-        <location filename="../core/planner.c" line="851"/>
-        <location filename="../core/planner.c" line="861"/>
-        <source>Warning:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="580"/>
-        <source>based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="584"/>
-        <source>based on VPM-B at nominal conservatism</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="586"/>
-        <source>based on VPM-B at +%d conservatism</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="588"/>
-        <source>recreational mode based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="822"/>
+        <location filename="../core/planner.c" line="830"/>
         <source>this is more gas than available in the specified cylinder!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="827"/>
+        <location filename="../core/planner.c" line="835"/>
         <source>not enough reserve for gas sharing on ascent!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="829"/>
+        <location filename="../core/planner.c" line="837"/>
         <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="831"/>
+        <location filename="../core/planner.c" line="839"/>
         <source>%.0f%s (%.0f%s during planned ascent) of %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="848"/>
+        <location filename="../core/planner.c" line="857"/>
         <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="858"/>
+        <location filename="../core/planner.c" line="867"/>
         <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="1419"/>
+        <location filename="../core/planner.c" line="1194"/>
+        <source>Can&apos;t find gas %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="1440"/>
         <source>ean</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1280"/>
+        <location filename="../core/profile.c" line="1298"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1283"/>
+        <location filename="../core/profile.c" line="1301"/>
         <source>P: %d%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1287"/>
+        <location filename="../core/profile.c" line="1305"/>
         <source>T: %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1293"/>
+        <location filename="../core/profile.c" line="1311"/>
         <source>V: %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1296"/>
+        <location filename="../core/profile.c" line="1314"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1298"/>
+        <location filename="../core/profile.c" line="1316"/>
         <source>CNS: %u%%
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1300"/>
+        <location filename="../core/profile.c" line="1318"/>
         <source>pO%s: %.2fbar
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1302"/>
+        <location filename="../core/profile.c" line="1320"/>
         <source>pN%s: %.2fbar
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1304"/>
+        <location filename="../core/profile.c" line="1322"/>
         <source>pHe: %.2fbar
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1307"/>
+        <location filename="../core/profile.c" line="1325"/>
         <source>MOD: %d%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1314"/>
+        <location filename="../core/profile.c" line="1332"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1318"/>
+        <location filename="../core/profile.c" line="1336"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1331"/>
+        <location filename="../core/profile.c" line="1349"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1334"/>
+        <location filename="../core/profile.c" line="1352"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1339"/>
+        <location filename="../core/profile.c" line="1357"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1342"/>
+        <location filename="../core/profile.c" line="1360"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1346"/>
+        <location filename="../core/profile.c" line="1364"/>
         <source>In deco
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1348"/>
+        <location filename="../core/profile.c" line="1366"/>
         <source>NDL: %umin
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1351"/>
+        <location filename="../core/profile.c" line="1369"/>
         <source>TTS: %umin
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1354"/>
+        <location filename="../core/profile.c" line="1372"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1362"/>
+        <location filename="../core/profile.c" line="1380"/>
         <source>In deco (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1365"/>
+        <location filename="../core/profile.c" line="1383"/>
         <source>NDL: %umin (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1367"/>
+        <location filename="../core/profile.c" line="1385"/>
         <source>NDL: &gt;2h (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1371"/>
+        <location filename="../core/profile.c" line="1389"/>
         <source>TTS: %umin (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1373"/>
+        <location filename="../core/profile.c" line="1391"/>
         <source>TTS: &gt;2h (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1376"/>
+        <location filename="../core/profile.c" line="1394"/>
         <source>RBT: %umin
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1379"/>
+        <location filename="../core/profile.c" line="1397"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1385"/>
+        <location filename="../core/profile.c" line="1403"/>
         <source>Tissue %.0fmin: %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1391"/>
+        <location filename="../core/profile.c" line="1409"/>
         <source>heartbeat: %d
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1393"/>
+        <location filename="../core/profile.c" line="1411"/>
         <source>bearing: %d
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1396"/>
+        <location filename="../core/profile.c" line="1414"/>
         <source>mean depth to here %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1491"/>
+        <location filename="../core/profile.c" line="1515"/>
         <source>%sT: %d:%02d min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1495"/>
-        <location filename="../core/profile.c" line="1499"/>
-        <location filename="../core/profile.c" line="1503"/>
+        <location filename="../core/profile.c" line="1519"/>
+        <location filename="../core/profile.c" line="1523"/>
+        <location filename="../core/profile.c" line="1527"/>
         <source>%s %sD:%.1f%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1507"/>
+        <location filename="../core/profile.c" line="1531"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1511"/>
+        <location filename="../core/profile.c" line="1535"/>
         <source>%s%sV:%.2f%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1515"/>
-        <location filename="../core/profile.c" line="1519"/>
+        <location filename="../core/profile.c" line="1539"/>
+        <location filename="../core/profile.c" line="1543"/>
         <source>%s %sV:%.2f%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1526"/>
+        <location filename="../core/profile.c" line="1550"/>
         <source>%s %sP:%d %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../core/profile.c" line="1575"/>
+        <source>%s SAC:%.*f %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../core/qthelper.cpp" line="67"/>
         <source>%1km</source>
         <translation type="unfinished"/>
@@ -9544,446 +9987,460 @@ EADD: %d%s
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="635"/>
+        <location filename="../core/qthelper.cpp" line="91"/>
+        <location filename="../core/qthelper.cpp" line="226"/>
+        <source>N</source>
+        <translation>U</translation>
+    </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="91"/>
+        <location filename="../core/qthelper.cpp" line="227"/>
+        <source>S</source>
+        <translation>S</translation>
+    </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="92"/>
+        <location filename="../core/qthelper.cpp" line="228"/>
+        <source>E</source>
+        <translation>T</translation>
+    </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="92"/>
+        <location filename="../core/qthelper.cpp" line="229"/>
+        <source>W</source>
+        <translation>B</translation>
+    </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="640"/>
         <source>C</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="638"/>
+        <location filename="../core/qthelper.cpp" line="643"/>
         <source>F</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/dive.c" line="23"/>
-        <source>boat</source>
+        <location filename="../core/save-html.c" line="469"/>
+        <location filename="../core/save-html.c" line="553"/>
+        <location filename="../core/worldmap-save.c" line="111"/>
+        <source>Can&apos;t open file %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/dive.c" line="23"/>
-        <source>shore</source>
+        <location filename="../core/save-html.c" line="488"/>
+        <source>Number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="459"/>
-        <location filename="../core/dive.c" line="23"/>
-        <source>drift</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="489"/>
+        <source>Date</source>
+        <translation>Tanggal</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="24"/>
-        <source>deep</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="490"/>
+        <source>Time</source>
+        <translation>Waktu</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="24"/>
-        <source>cavern</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="491"/>
+        <source>Location</source>
+        <translation>Lokasi</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="443"/>
-        <location filename="../core/dive.c" line="24"/>
-        <source>ice</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="492"/>
+        <source>Air temp.</source>
+        <translation>Temperatur Udara</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="445"/>
-        <source>search</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="493"/>
+        <source>Water temp.</source>
+        <translation>Temperatur air</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="455"/>
-        <location filename="../core/dive.c" line="25"/>
-        <source>wreck</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="494"/>
+        <source>Dives</source>
+        <translation>Selam</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="441"/>
-        <location filename="../core/dive.c" line="25"/>
-        <source>cave</source>
+        <location filename="../core/save-html.c" line="495"/>
+        <source>Expand all</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/dive.c" line="25"/>
-        <source>altitude</source>
+        <location filename="../core/save-html.c" line="496"/>
+        <source>Collapse all</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/dive.c" line="26"/>
-        <source>pool</source>
+        <location filename="../core/save-html.c" line="497"/>
+        <source>Trips</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/dive.c" line="26"/>
-        <source>lake</source>
+        <location filename="../core/save-html.c" line="498"/>
+        <source>Statistics</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="457"/>
-        <location filename="../core/dive.c" line="26"/>
-        <source>river</source>
+        <location filename="../core/save-html.c" line="499"/>
+        <source>Advanced search</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="439"/>
-        <location filename="../core/dive.c" line="27"/>
-        <source>night</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="502"/>
+        <source>Rating</source>
+        <translation>Peringkat</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="153"/>
-        <source>Error: the file does not appear to be a DATATRAK divelog</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="503"/>
+        <source>Visibility</source>
+        <translation>Jarak Lihat</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="286"/>
-        <source>clear</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="504"/>
+        <source>Duration</source>
+        <translation>Durasi</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="289"/>
-        <source>misty</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="505"/>
+        <source>Divemaster</source>
+        <translation>Divemaster</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="292"/>
-        <source>fog</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="506"/>
+        <source>Buddy</source>
+        <translation>Rekan</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="295"/>
-        <source>rain</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="507"/>
+        <source>Suit</source>
+        <translation>Pakaian</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="298"/>
-        <source>storm</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="508"/>
+        <source>Tags</source>
+        <translation>Tag</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="301"/>
-        <source>snow</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="509"/>
+        <location filename="../smtk-import/smartrak.c" line="251"/>
+        <location filename="../smtk-import/smartrak.c" line="321"/>
+        <source>Notes</source>
+        <translation>Catatan</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="321"/>
-        <source>No suit</source>
+        <location filename="../core/save-html.c" line="510"/>
+        <source>Show more details</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="324"/>
-        <source>Shorty</source>
+        <location filename="../core/save-html.c" line="513"/>
+        <source>Yearly statistics</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="327"/>
-        <source>Combi</source>
+        <location filename="../core/save-html.c" line="514"/>
+        <source>Year</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="330"/>
-        <source>Wet suit</source>
+        <location filename="../core/save-html.c" line="515"/>
+        <source>Total time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="333"/>
-        <source>Semidry suit</source>
+        <location filename="../core/save-html.c" line="516"/>
+        <source>Average time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="336"/>
-        <source>Dry suit</source>
+        <location filename="../core/save-html.c" line="517"/>
+        <source>Shortest time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="396"/>
-        <source>no stop</source>
+        <location filename="../core/save-html.c" line="518"/>
+        <source>Longest time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="400"/>
-        <source>single ascent</source>
+        <location filename="../core/save-html.c" line="519"/>
+        <source>Average depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="402"/>
-        <source>multiple ascent</source>
+        <location filename="../core/save-html.c" line="520"/>
+        <source>Min. depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="404"/>
-        <location filename="../core/dive.c" line="27"/>
-        <source>fresh</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="521"/>
+        <source>Max. depth</source>
+        <translation>Kedalaman Maks.</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="406"/>
-        <source>salt water</source>
+        <location filename="../core/save-html.c" line="522"/>
+        <source>Average SAC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="431"/>
-        <source>sight seeing</source>
+        <location filename="../core/save-html.c" line="523"/>
+        <source>Min. SAC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="433"/>
-        <source>club dive</source>
+        <location filename="../core/save-html.c" line="524"/>
+        <source>Max. SAC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="437"/>
-        <source>instruction</source>
+        <location filename="../core/save-html.c" line="525"/>
+        <source>Average temp.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="463"/>
-        <source>other</source>
+        <location filename="../core/save-html.c" line="526"/>
+        <source>Min. temp.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="474"/>
-        <source>Other activities</source>
+        <location filename="../core/save-html.c" line="527"/>
+        <source>Max. temp.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="498"/>
-        <source>Datatrak/Wlog notes</source>
+        <location filename="../core/save-html.c" line="528"/>
+        <source>Back to list</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="537"/>
-        <source>Manually entered dive</source>
+        <location filename="../core/save-html.c" line="531"/>
+        <source>Dive No.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="588"/>
-        <source>Unknown</source>
+        <location filename="../core/save-html.c" line="532"/>
+        <source>Dive profile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="674"/>
-        <source>Error: couldn&apos;t open the file %s</source>
+        <location filename="../core/save-html.c" line="533"/>
+        <source>Dive information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="687"/>
-        <source>Error: no dive</source>
+        <location filename="../core/save-html.c" line="534"/>
+        <source>Dive equipment</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/dive.c" line="27"/>
-        <source>student</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="535"/>
+        <location filename="../core/save-html.c" line="542"/>
+        <source>Type</source>
+        <translation>Tipe</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="461"/>
-        <location filename="../core/dive.c" line="28"/>
-        <source>photo</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="536"/>
+        <source>Size</source>
+        <translation>Ukuran</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="28"/>
-        <source>video</source>
+        <location filename="../core/save-html.c" line="537"/>
+        <source>Work pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="435"/>
-        <location filename="../core/dive.c" line="28"/>
-        <source>instructor</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="538"/>
+        <source>Start pressure</source>
+        <translation>Tekanan awal</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="398"/>
-        <location filename="../core/dive.c" line="29"/>
-        <source>deco</source>
+        <location filename="../core/save-html.c" line="539"/>
+        <source>End pressure</source>
+        <translation>Tekanan akhir</translation>
+    </message>
+    <message>
+        <location filename="../core/save-html.c" line="540"/>
+        <source>Gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/dive.c" line="33"/>
-        <source>OC-gas</source>
+        <location filename="../core/save-html.c" line="541"/>
+        <source>Weight</source>
+        <translation>Berat</translation>
+    </message>
+    <message>
+        <location filename="../core/save-html.c" line="543"/>
+        <source>Events</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/dive.c" line="33"/>
-        <source>diluent</source>
+        <location filename="../core/save-html.c" line="544"/>
+        <source>Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/dive.c" line="33"/>
-        <location filename="../core/equipment.c" line="88"/>
-        <location filename="../core/planner.c" line="1415"/>
-        <location filename="../core/planner.c" line="1418"/>
-        <source>oxygen</source>
+        <location filename="../core/save-html.c" line="545"/>
+        <source>Value</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/dive.c" line="227"/>
-        <source>ℓ</source>
+        <location filename="../core/save-html.c" line="546"/>
+        <source>Coordinates</source>
+        <translation>Koordinat</translation>
+    </message>
+    <message>
+        <location filename="../core/save-html.c" line="547"/>
+        <source>Dive status</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="239"/>
+        <location filename="../core/statistics.c" line="242"/>
         <source>more than %d days</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="246"/>
+        <location filename="../core/statistics.c" line="249"/>
         <source>%dd %dh %dmin</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="249"/>
+        <location filename="../core/statistics.c" line="252"/>
         <source>%dmin %dsecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="251"/>
+        <location filename="../core/statistics.c" line="254"/>
         <source>%dh %dmin</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="263"/>
+        <location filename="../core/statistics.c" line="266"/>
         <source>for dives #</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="269"/>
+        <location filename="../core/statistics.c" line="272"/>
         <source>for selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="304"/>
+        <location filename="../core/statistics.c" line="307"/>
         <source>for dive #%d</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="306"/>
+        <location filename="../core/statistics.c" line="309"/>
         <source>for selected dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="308"/>
+        <location filename="../core/statistics.c" line="311"/>
         <source>for all dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="310"/>
+        <location filename="../core/statistics.c" line="313"/>
         <source>(no dives)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Sun</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Mon</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Tue</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Wed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Thu</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Fri</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Sat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Jan</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Feb</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Mar</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Apr</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>May</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Jun</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Jul</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Aug</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Sep</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Oct</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Nov</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Dec</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="191"/>
-        <location filename="../core/parse-xml.c" line="3284"/>
-        <location filename="../core/uemis-downloader.c" line="134"/>
-        <source>unknown</source>
-        <translation>Tak dikenal</translation>
-    </message>
-    <message>
-        <location filename="../core/uemis-downloader.c" line="467"/>
-        <source>data</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/uemis-downloader.c" line="447"/>
-        <source>%s %s</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../core/uemis-downloader.c" line="27"/>
         <source>Uemis Zurich: the file system is almost full.
 Disconnect/reconnect the dive computer
@@ -10009,6 +10466,16 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../core/uemis-downloader.c" line="447"/>
+        <source>%s %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/uemis-downloader.c" line="467"/>
+        <source>data</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../core/uemis-downloader.c" line="495"/>
         <source>divelog #</source>
         <translation type="unfinished"/>
@@ -10179,281 +10646,6 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="469"/>
-        <location filename="../core/save-html.c" line="553"/>
-        <location filename="../core/worldmap-save.c" line="111"/>
-        <source>Can&apos;t open file %s</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="488"/>
-        <source>Number</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="489"/>
-        <source>Date</source>
-        <translation>Tanggal</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="490"/>
-        <source>Time</source>
-        <translation>Waktu</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="491"/>
-        <source>Location</source>
-        <translation>Lokasi</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="492"/>
-        <source>Air temp.</source>
-        <translation>Temperatur Udara</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="493"/>
-        <source>Water temp.</source>
-        <translation>Temperatur air</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="498"/>
-        <source>Statistics</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="502"/>
-        <source>Rating</source>
-        <translation>Peringkat</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="503"/>
-        <source>Visibility</source>
-        <translation>Jarak Lihat</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="504"/>
-        <source>Duration</source>
-        <translation>Durasi</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="494"/>
-        <source>Dives</source>
-        <translation>Selam</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="495"/>
-        <source>Expand all</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="496"/>
-        <source>Collapse all</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="497"/>
-        <source>Trips</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="499"/>
-        <source>Advanced search</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="505"/>
-        <source>Divemaster</source>
-        <translation>Divemaster</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="506"/>
-        <source>Buddy</source>
-        <translation>Rekan</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="507"/>
-        <source>Suit</source>
-        <translation>Pakaian</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="508"/>
-        <source>Tags</source>
-        <translation>Tag</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="509"/>
-        <location filename="../smtk-import/smartrak.c" line="251"/>
-        <location filename="../smtk-import/smartrak.c" line="321"/>
-        <source>Notes</source>
-        <translation>Catatan</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="510"/>
-        <source>Show more details</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="513"/>
-        <source>Yearly statistics</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="514"/>
-        <source>Year</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="515"/>
-        <source>Total time</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="516"/>
-        <source>Average time</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="517"/>
-        <source>Shortest time</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="518"/>
-        <source>Longest time</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="519"/>
-        <source>Average depth</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="520"/>
-        <source>Min. depth</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="521"/>
-        <source>Max. depth</source>
-        <translation>Kedalaman Maks.</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="523"/>
-        <source>Min. SAC</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="524"/>
-        <source>Max. SAC</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="525"/>
-        <source>Average temp.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="526"/>
-        <source>Min. temp.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="527"/>
-        <source>Max. temp.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="528"/>
-        <source>Back to list</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="534"/>
-        <source>Dive equipment</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="537"/>
-        <source>Work pressure</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="538"/>
-        <source>Start pressure</source>
-        <translation>Tekanan awal</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="539"/>
-        <source>End pressure</source>
-        <translation>Tekanan akhir</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="547"/>
-        <source>Dive status</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="522"/>
-        <source>Average SAC</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="531"/>
-        <source>Dive No.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="532"/>
-        <source>Dive profile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="533"/>
-        <source>Dive information</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="535"/>
-        <location filename="../core/save-html.c" line="542"/>
-        <source>Type</source>
-        <translation>Tipe</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="536"/>
-        <source>Size</source>
-        <translation>Ukuran</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="540"/>
-        <source>Gas</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="541"/>
-        <source>Weight</source>
-        <translation>Berat</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="543"/>
-        <source>Events</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="544"/>
-        <source>Name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="545"/>
-        <source>Value</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="546"/>
-        <source>Coordinates</source>
-        <translation>Koordinat</translation>
-    </message>
-    <message>
         <location filename="../core/worldmap-save.c" line="39"/>
         <source>Date:</source>
         <translation type="unfinished"/>
@@ -10499,109 +10691,6 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="91"/>
-        <location filename="../core/qthelper.cpp" line="226"/>
-        <source>N</source>
-        <translation>U</translation>
-    </message>
-    <message>
-        <location filename="../core/qthelper.cpp" line="91"/>
-        <location filename="../core/qthelper.cpp" line="227"/>
-        <source>S</source>
-        <translation>S</translation>
-    </message>
-    <message>
-        <location filename="../core/qthelper.cpp" line="92"/>
-        <location filename="../core/qthelper.cpp" line="228"/>
-        <source>E</source>
-        <translation>T</translation>
-    </message>
-    <message>
-        <location filename="../core/qthelper.cpp" line="92"/>
-        <location filename="../core/qthelper.cpp" line="229"/>
-        <source>W</source>
-        <translation>B</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="341"/>
-        <source>Remote storage and local data diverged. Error: merge failed (%s)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="134"/>
-        <source>Local cache directory %s corrupted - can&apos;t sync with Subsurface cloud storage</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="157"/>
-        <location filename="../core/git-access.c" line="177"/>
-        <source>Could not update local cache to newer remote data</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="170"/>
-        <source>Subsurface cloud storage corrupted</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="285"/>
-        <source>Could not update Subsurface cloud storage, try again later</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="371"/>
-        <source>Remote storage and local data diverged. Cannot combine local and remote changes</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="405"/>
-        <source>Remote storage and local data diverged</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="408"/>
-        <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="417"/>
-        <source>Problems with local cache of Subsurface cloud data</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="418"/>
-        <source>Moved cache data to %s. Please try the operation again.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="737"/>
-        <source>Error connecting to Subsurface cloud storage</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="740"/>
-        <source>git clone of %s failed (%s)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/load-git.c" line="222"/>
-        <location filename="../core/parse-xml.c" line="1300"/>
-        <source>additional name for site: %s
-</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/ostctools.c" line="120"/>
-        <location filename="../core/ostctools.c" line="152"/>
-        <source>Unknown DC in dive %d</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/ostctools.c" line="165"/>
-        <source>Error - %s - parsing dive %d</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../smtk-import/smartrak.c" line="247"/>
         <source>Built</source>
         <translation type="unfinished"/>
@@ -10685,155 +10774,120 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="91"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="103"/>
         <source>Subsurface</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="97"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="110"/>
         <source>Dive list</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="112"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="125"/>
         <source>Cloud credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="126"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="139"/>
         <source>Manage dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="138"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="141"/>
         <source>Add dive manually</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="146"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="149"/>
         <source>Manual sync with cloud</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="164"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="167"/>
         <source>Offline mode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="164"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="167"/>
         <source>Enable auto cloud sync</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="182"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="187"/>
         <source>GPS</source>
         <translation>GPS</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="185"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="190"/>
         <source>GPS-tag dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="192"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="197"/>
         <source>Upload GPS data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="199"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="204"/>
         <source>Download GPS data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="206"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="211"/>
         <source>Show GPS fixes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="215"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="220"/>
         <source>Clear GPS cache</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="221"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="226"/>
         <source>Preferences</source>
         <translation>Preferensi</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="230"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="237"/>
         <source>Developer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="232"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="239"/>
         <source>App log</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="239"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="246"/>
         <source>Theme information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="246"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="253"/>
         <source>User manual</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="252"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="259"/>
         <source>About</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="283"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="304"/>
         <source>Run location service</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="283"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="304"/>
         <source>No GPS source available</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="295"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="316"/>
         <source>Actions</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="9"/>
-        <source>Hello World</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="13"/>
-        <source>File</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="15"/>
-        <source>&amp;Open</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="19"/>
-        <source>Exit</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="27"/>
-        <source>Button 1 pressed</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="28"/>
-        <source>Button 2 pressed</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="33"/>
-        <source>May I have your attention, please?</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>plannerDetails</name>
@@ -10907,6 +10961,24 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="121"/>
+        <location filename="../build/ui_plannerSettings.h" line="425"/>
+        <source>75% to 50% avg. depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="138"/>
+        <location filename="../build/ui_plannerSettings.h" line="427"/>
+        <source>50% avg. depth to 6m</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="155"/>
+        <location filename="../build/ui_plannerSettings.h" line="429"/>
+        <source>6m to surface</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="175"/>
         <location filename="../build/ui_plannerSettings.h" line="431"/>
         <source>Descent</source>
@@ -10930,12 +11002,35 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="268"/>
+        <source>Bühlmann deco</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="278"/>
         <location filename="../build/ui_plannerSettings.h" line="445"/>
         <source>Reserve gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="288"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="549"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="578"/>
+        <location filename="../build/ui_plannerSettings.h" line="446"/>
+        <location filename="../build/ui_plannerSettings.h" line="459"/>
+        <location filename="../build/ui_plannerSettings.h" line="461"/>
+        <source>bar</source>
+        <translation>bar</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="307"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="416"/>
+        <location filename="../build/ui_plannerSettings.h" line="437"/>
+        <location filename="../build/ui_plannerSettings.h" line="440"/>
+        <source>%</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="320"/>
         <location filename="../build/ui_plannerSettings.h" line="449"/>
         <source>Postpone gas change if a stop is not required</source>
@@ -10954,11 +11049,9 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="307"/>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="416"/>
-        <location filename="../build/ui_plannerSettings.h" line="437"/>
-        <location filename="../build/ui_plannerSettings.h" line="440"/>
-        <source>%</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="353"/>
+        <location filename="../build/ui_plannerSettings.h" line="436"/>
+        <source>Plan backgas breaks</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -10968,10 +11061,10 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="429"/>
-        <location filename="../build/ui_plannerSettings.h" line="441"/>
-        <source>Drop to first depth</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="370"/>
+        <location filename="../build/ui_plannerSettings.h" line="453"/>
+        <source>min</source>
+        <translation>menit</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="389"/>
@@ -10980,162 +11073,138 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="353"/>
-        <location filename="../build/ui_plannerSettings.h" line="436"/>
-        <source>Plan backgas breaks</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="396"/>
+        <source>Maximize bottom time allowed by gas and no decompression limits</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="515"/>
-        <location filename="../build/ui_plannerSettings.h" line="455"/>
-        <source>Gas options</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="399"/>
+        <location filename="../build/ui_plannerSettings.h" line="443"/>
+        <source>Recreational mode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="594"/>
-        <location filename="../build/ui_plannerSettings.h" line="456"/>
-        <source>Bottom SAC</source>
-        <translation>SAC  bawah</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="692"/>
-        <location filename="../build/ui_plannerSettings.h" line="457"/>
-        <source>Deco SAC</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="429"/>
+        <location filename="../build/ui_plannerSettings.h" line="441"/>
+        <source>Drop to first depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="601"/>
-        <location filename="../build/ui_plannerSettings.h" line="458"/>
-        <source>Bottom pO₂</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="436"/>
+        <location filename="../build/ui_plannerSettings.h" line="452"/>
+        <source>Min. switch duration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="685"/>
-        <location filename="../build/ui_plannerSettings.h" line="460"/>
-        <source>Deco pO₂</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="459"/>
+        <location filename="../build/ui_plannerSettings.h" line="444"/>
+        <source>Safety stop</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="565"/>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="672"/>
-        <location filename="../build/ui_plannerSettings.h" line="462"/>
-        <location filename="../build/ui_plannerSettings.h" line="463"/>
-        <source>ℓ/min</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="495"/>
+        <source>Conservatism level</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="632"/>
-        <location filename="../build/ui_plannerSettings.h" line="468"/>
-        <source>Display runtime</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="515"/>
+        <location filename="../build/ui_plannerSettings.h" line="455"/>
+        <source>Gas options</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="645"/>
-        <location filename="../build/ui_plannerSettings.h" line="472"/>
-        <source>Display segment duration</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="565"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="698"/>
+        <location filename="../build/ui_plannerSettings.h" line="462"/>
+        <location filename="../build/ui_plannerSettings.h" line="463"/>
+        <source>ℓ/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="655"/>
-        <location filename="../build/ui_plannerSettings.h" line="476"/>
-        <source>Display transitions in deco</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="594"/>
+        <source>m</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="662"/>
-        <location filename="../build/ui_plannerSettings.h" line="477"/>
-        <source>Verbatim dive plan</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="606"/>
+        <source>Used to calculate best mix. Select best mix depth in &apos;Available gases&apos; table by entering gas depth, followed by &quot;B&quot; (best trimix mix) or &quot;BN&quot; (best nitrox mix)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="288"/>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="549"/>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="578"/>
-        <location filename="../build/ui_plannerSettings.h" line="446"/>
-        <location filename="../build/ui_plannerSettings.h" line="459"/>
-        <location filename="../build/ui_plannerSettings.h" line="461"/>
-        <source>bar</source>
-        <translation>bar</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="613"/>
+        <location filename="../build/ui_plannerSettings.h" line="456"/>
+        <source>Bottom SAC</source>
+        <translation>SAC  bawah</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="121"/>
-        <location filename="../build/ui_plannerSettings.h" line="425"/>
-        <source>75% to 50% avg. depth</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="620"/>
+        <location filename="../build/ui_plannerSettings.h" line="458"/>
+        <source>Bottom pO₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="138"/>
-        <location filename="../build/ui_plannerSettings.h" line="427"/>
-        <source>50% avg. depth to 6m</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="627"/>
+        <source>Best mix END</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="155"/>
-        <location filename="../build/ui_plannerSettings.h" line="429"/>
-        <source>6m to surface</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="634"/>
+        <location filename="../build/ui_plannerSettings.h" line="464"/>
+        <source>Notes</source>
+        <translation>Catatan</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="268"/>
-        <source>Bühlmann deco</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="655"/>
+        <location filename="../build/ui_plannerSettings.h" line="466"/>
+        <source>In dive plan, show runtime (absolute time) of stops</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="370"/>
-        <location filename="../build/ui_plannerSettings.h" line="453"/>
-        <source>min</source>
-        <translation>menit</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="396"/>
-        <source>Maximize bottom time allowed by gas and no decompression limits</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="658"/>
+        <location filename="../build/ui_plannerSettings.h" line="468"/>
+        <source>Display runtime</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="399"/>
-        <location filename="../build/ui_plannerSettings.h" line="443"/>
-        <source>Recreational mode</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="668"/>
+        <location filename="../build/ui_plannerSettings.h" line="470"/>
+        <source>In dive plan, show duration (relative time) of stops</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="436"/>
-        <location filename="../build/ui_plannerSettings.h" line="452"/>
-        <source>Min. switch duration</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="671"/>
+        <location filename="../build/ui_plannerSettings.h" line="472"/>
+        <source>Display segment duration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="459"/>
-        <location filename="../build/ui_plannerSettings.h" line="444"/>
-        <source>Safety stop</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="678"/>
+        <location filename="../build/ui_plannerSettings.h" line="474"/>
+        <source>In diveplan, list transitions or treat them as implicit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="495"/>
-        <source>Conservatism level</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="681"/>
+        <location filename="../build/ui_plannerSettings.h" line="476"/>
+        <source>Display transitions in deco</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="608"/>
-        <location filename="../build/ui_plannerSettings.h" line="464"/>
-        <source>Notes</source>
-        <translation>Catatan</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="629"/>
-        <location filename="../build/ui_plannerSettings.h" line="466"/>
-        <source>In dive plan, show runtime (absolute time) of stops</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="688"/>
+        <location filename="../build/ui_plannerSettings.h" line="477"/>
+        <source>Verbatim dive plan</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="642"/>
-        <location filename="../build/ui_plannerSettings.h" line="470"/>
-        <source>In dive plan, show duration (relative time) of stops</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="711"/>
+        <location filename="../build/ui_plannerSettings.h" line="460"/>
+        <source>Deco pO₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="652"/>
-        <location filename="../build/ui_plannerSettings.h" line="474"/>
-        <source>In diveplan, list transitions or treat them as implicit</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="718"/>
+        <location filename="../build/ui_plannerSettings.h" line="457"/>
+        <source>Deco SAC</source>
         <translation type="unfinished"/>
     </message>
 </context>
diff --git a/translations/subsurface_it_IT.ts b/translations/subsurface_it_IT.ts
index 3faceeea5..50a379e54 100644
--- a/translations/subsurface_it_IT.ts
+++ b/translations/subsurface_it_IT.ts
@@ -109,6 +109,11 @@
         <translation>Nome:</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="56"/>
+        <source>Could not initialize Winsock version 2.2</source>
+        <translation>Impossibile inizializzare libreria Winsock 2.2</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="134"/>
         <source>Trying to turn on the local Bluetooth device...</source>
         <translation>Tentativo di accensione del dispositivo Bluetooth...</translation>
@@ -119,6 +124,11 @@
         <translation>Tentativo di spegnimento del dispositivo Bluetooth...</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="167"/>
+        <source>Remote devices list was cleared.</source>
+        <translation>La lista dei dispositivi remoti è stata cancellata.</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="183"/>
         <source>Scanning for remote devices...</source>
         <translation>Scansione dei dispositivi remoti...</translation>
@@ -129,6 +139,22 @@
         <translation>Scansione finita correttamente.</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="208"/>
+        <source>The local Bluetooth device was %1.</source>
+        <extracomment>%1 will be replaced with &quot;turned on&quot; or &quot;turned off&quot;</extracomment>
+        <translation>Il dispositivo locale Bluetooth era %1.</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
+        <source>turned on</source>
+        <translation>acceso</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
+        <source>turned off</source>
+        <translation>spento</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="225"/>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="339"/>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="359"/>
@@ -176,37 +202,6 @@
         <translation>Accoppiamento</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="352"/>
-        <source>Device %1 was paired and is authorized.</source>
-        <translation>Dispositivo %1 è stato accoppiato e autorizzato.</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="56"/>
-        <source>Could not initialize Winsock version 2.2</source>
-        <translation>Impossibile inizializzare libreria Winsock 2.2</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="167"/>
-        <source>Remote devices list was cleared.</source>
-        <translation>La lista dei dispositivi remoti è stata cancellata.</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="208"/>
-        <source>The local Bluetooth device was %1.</source>
-        <extracomment>%1 will be replaced with &quot;turned on&quot; or &quot;turned off&quot;</extracomment>
-        <translation>Il dispositivo locale Bluetooth era %1.</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
-        <source>turned on</source>
-        <translation>acceso</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
-        <source>turned off</source>
-        <translation>spento</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="307"/>
         <source>Remove pairing</source>
         <translation>Rimuovi accoppiamento</translation>
@@ -232,6 +227,11 @@
         <translation>Dispositivo %1 era accoppiato.</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="352"/>
+        <source>Device %1 was paired and is authorized.</source>
+        <translation>Dispositivo %1 è stato accoppiato e autorizzato.</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="378"/>
         <source>The device %1 can now be used for connection. You can press the Save button.</source>
         <translation>Il dispositivo %1 può essere usato per la connessione. Premere il tasto salva.</translation>
@@ -290,12 +290,12 @@
 <context>
     <name>BuddyFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="621"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="619"/>
         <source>Person: </source>
         <translation>Persona:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="622"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="620"/>
         <source>Searches for buddies and divemasters</source>
         <translation>Ricerca compagni di immersione e Divemaster</translation>
     </message>
@@ -303,7 +303,7 @@
 <context>
     <name>BuddyFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="243"/>
+        <location filename="../qt-models/filtermodels.cpp" line="248"/>
         <source>No buddies</source>
         <translation>Nessun compagno di immersione</translation>
     </message>
@@ -311,25 +311,30 @@
 <context>
     <name>CloudCredentials</name>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="49"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="50"/>
         <source>Cloud credentials</source>
         <translation>Credenziali per il cloud</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="55"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="56"/>
         <source>Email</source>
         <translation>Email</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="67"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="68"/>
         <source>Password</source>
         <translation>Password</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="90"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="92"/>
         <source>Show password</source>
         <translation>Mostra password</translation>
     </message>
+    <message>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="97"/>
+        <source>PIN</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>ColumnNameProvider</name>
@@ -385,6 +390,16 @@
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
+        <source>Max. depth</source>
+        <translation>Profondità massima</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
+        <source>Avg. depth</source>
+        <translation>Profondità media</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
         <source>Divemaster</source>
         <translation>Divemaster</translation>
     </message>
@@ -395,6 +410,11 @@
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
+        <source>Suit</source>
+        <translation>Muta</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
         <source>Notes</source>
         <translation>Note</translation>
     </message>
@@ -414,21 +434,6 @@
         <translation>Temperatura dell&apos;acqua</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
-        <source>Max. depth</source>
-        <translation>Profondità massima</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
-        <source>Avg. depth</source>
-        <translation>Profondità media</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
-        <source>Suit</source>
-        <translation>Muta</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="44"/>
         <source>O₂</source>
         <translation>O₂</translation>
@@ -542,7 +547,7 @@
         <translation>Impossibile creare un contesto libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../core/configuredivecomputer.cpp" line="660"/>
+        <location filename="../core/configuredivecomputer.cpp" line="656"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation>Non è stato possibile connettersi al computer subacqueo.</translation>
     </message>
@@ -562,11 +567,19 @@
         <translation>Periferica o punto di mount</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="170"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1520"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1533"/>
-        <source>...</source>
-        <translation>...</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="47"/>
+        <source>Connect via Bluetooth</source>
+        <translation>Connetti vi Bluetooth</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="54"/>
+        <source>Connect</source>
+        <translation>Connetti</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="64"/>
+        <source>Disconnect</source>
+        <translation>Disconnetti</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="80"/>
@@ -575,12 +588,24 @@
         <translation>Ottieni i dettagli disponibili</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="90"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1523"/>
+        <source>Read settings from backup file or from device before writing to the device</source>
+        <translation>Legge le impostazioni dal dispositivo o dal file di backup prima di scrivere sul dispositivo</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="93"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1525"/>
         <source>Save changes to device</source>
         <translation>Salva le modifiche sullo strumento</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="116"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1527"/>
+        <source>Read settings from backup file or from device before writing to a backup file</source>
+        <translation>Legge le impostazioni dal dispositivo o dal file di backup prima di scrivere sul file di backup</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="119"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1529"/>
         <source>Backup</source>
@@ -599,15 +624,40 @@
         <translation>Aggiorna il firmware</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="163"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1532"/>
+        <source>Save libdivecomputer logfile</source>
+        <translation>Salva il file di log di libdivecomputer</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="170"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1520"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1533"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="177"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1534"/>
         <source>Cancel</source>
         <translation>Annulla</translation>
     </message>
     <message>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1539"/>
-        <source>OSTC 3</source>
-        <translation>OSTC 3</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="214"/>
+        <source>OSTC 3,Sport,Cr,2</source>
+        <translation>OSTC 3,Sport,Cr,2</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="223"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1541"/>
+        <source>Suunto Vyper family</source>
+        <translation>Famiglia Suunto Vyper</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="232"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1543"/>
+        <source>OSTC, Mk.2/2N/2C</source>
+        <translation>OSTC, Mk.2/2N/2C</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="253"/>
@@ -620,40 +670,56 @@
         <translation>Impostazioni di base</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="326"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1656"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1943"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1546"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1726"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1766"/>
-        <source>Serial No.</source>
-        <translation>Numero seriale</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="260"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1575"/>
+        <source>Eco</source>
+        <translation>Eco</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="349"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1679"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1980"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1547"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1727"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1767"/>
-        <source>Firmware version</source>
-        <translation>Versione del firmware</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="265"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1576"/>
+        <source>Medium</source>
+        <translation>Medium</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="538"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1713"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1990"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1548"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1729"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1768"/>
-        <source>Custom text</source>
-        <translation>Testo personalizzato</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="270"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1577"/>
+        <source>High</source>
+        <translation>Alto</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="385"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1549"/>
-        <source>Language</source>
-        <translation>Lingua</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="278"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="826"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="849"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="875"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="927"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="993"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1019"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1101"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1117"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1450"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2278"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2382"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2408"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2434"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2474"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2497"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1586"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1621"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1623"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1625"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1628"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1637"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1638"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1710"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1785"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1789"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1801"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1803"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1806"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1807"/>
+        <source>%</source>
+        <translation>%</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="289"/>
@@ -680,44 +746,36 @@
         <translation>Italiano</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="579"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1557"/>
-        <source>Dive mode</source>
-        <translation>Modalità immersione</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="556"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1560"/>
-        <source>OC</source>
-        <translation>OC</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="561"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1561"/>
-        <source>CC</source>
-        <translation>CC</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="313"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1582"/>
+        <source>m/°C</source>
+        <translation>m/°C</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="566"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2336"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1562"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1793"/>
-        <source>Gauge</source>
-        <translation>Gauge</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="318"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1583"/>
+        <source>ft/°F</source>
+        <translation>ft/°F</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="571"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1563"/>
-        <source>Apnea</source>
-        <translation>Apnea</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="326"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1656"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1943"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1546"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1726"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1766"/>
+        <source>Serial No.</source>
+        <translation>Numero seriale</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="395"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2063"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1565"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1780"/>
-        <source>Date format</source>
-        <translation>Formato della data</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="349"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1679"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1980"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1547"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1727"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1767"/>
+        <source>Firmware version</source>
+        <translation>Versione del firmware</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="360"/>
@@ -738,108 +796,147 @@
         <translation>YYMMDD</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1042"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2457"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1639"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1805"/>
-        <source>Saturation</source>
-        <translation>Saturazione</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="385"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1549"/>
+        <source>Language</source>
+        <translation>Lingua</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="278"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="826"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="849"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="875"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="927"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="993"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1019"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1101"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1117"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1450"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2278"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2382"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2408"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2434"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2474"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2497"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1586"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1621"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1623"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1625"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1628"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1637"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1638"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1710"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1785"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1789"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1801"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1803"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1806"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1807"/>
-        <source>%</source>
-        <translation>%</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="395"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2063"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1565"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1780"/>
+        <source>Date format</source>
+        <translation>Formato della data</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="865"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2261"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1624"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1784"/>
-        <source>Desaturation</source>
-        <translation>Desaturazione</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="405"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1572"/>
+        <source>Brightness</source>
+        <translation>Luminosità</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="983"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2398"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1636"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1800"/>
-        <source>Last deco</source>
-        <translation>Ultima deco</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="415"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1850"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1579"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1753"/>
+        <source>Units</source>
+        <translation>Unità</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="711"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="736"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="758"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="904"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2181"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2206"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2228"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2307"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1626"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1786"/>
-        <source> m</source>
-        <translation> m</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="425"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1585"/>
+        <source>Salinity (0-5%)</source>
+        <translation>Salinità (0-5%)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="405"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1572"/>
-        <source>Brightness</source>
-        <translation>Luminosità</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="438"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1615"/>
+        <source>Reset device to default settings</source>
+        <translation>Reimposta il dispositivo alle impostazioni di fabbrica</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="260"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1575"/>
-        <source>Eco</source>
-        <translation>Eco</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="452"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1590"/>
+        <source>230LSB/Gauss</source>
+        <translation>230LSB/Gauss</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="265"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1576"/>
-        <source>Medium</source>
-        <translation>Medium</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="457"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1591"/>
+        <source>330LSB/Gauss</source>
+        <translation>330LSB/Gauss</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="270"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1577"/>
-        <source>High</source>
-        <translation>Alto</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="462"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1592"/>
+        <source>390LSB/Gauss</source>
+        <translation>390LSB/Gauss</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="603"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2034"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1599"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1779"/>
-        <source>Sampling rate</source>
-        <translation>Intervallo di campionamento</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="467"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1593"/>
+        <source>440LSB/Gauss</source>
+        <translation>440LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="472"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1594"/>
+        <source>660LSB/Gauss</source>
+        <translation>660LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="477"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1595"/>
+        <source>820LSB/Gauss</source>
+        <translation>820LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="482"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1596"/>
+        <source>1090LSB/Gauss</source>
+        <translation>1090LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="487"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1597"/>
+        <source>1370LSB/Gauss</source>
+        <translation>1370LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="521"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1587"/>
+        <source>Compass gain</source>
+        <translation>Guadagno della bussola</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="531"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1799"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1745"/>
+        <source>Computer model</source>
+        <translation>Modello di computer</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="538"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1713"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1990"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1548"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1729"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1768"/>
+        <source>Custom text</source>
+        <translation>Testo personalizzato</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="556"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1560"/>
+        <source>OC</source>
+        <translation>OC</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="561"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1561"/>
+        <source>CC</source>
+        <translation>CC</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="566"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2336"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1562"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1793"/>
+        <source>Gauge</source>
+        <translation>Gauge</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="571"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1563"/>
+        <source>Apnea</source>
+        <translation>Apnea</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="579"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1557"/>
+        <source>Dive mode</source>
+        <translation>Modalità immersione</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="590"/>
@@ -856,30 +953,12 @@
         <translation>10s</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="415"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1850"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1579"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1753"/>
-        <source>Units</source>
-        <translation>Unità</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="313"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1582"/>
-        <source>m/°C</source>
-        <translation>m/°C</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="318"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1583"/>
-        <source>ft/°F</source>
-        <translation>ft/°F</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="644"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1605"/>
-        <source>Dive mode color</source>
-        <translation>Colore della modalità immersione</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="603"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2034"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1599"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1779"/>
+        <source>Sampling rate</source>
+        <translation>Intervallo di campionamento</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="614"/>
@@ -906,12 +985,6 @@
         <translation>Blu</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="425"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1585"/>
-        <source>Salinity (0-5%)</source>
-        <translation>Salinità (0-5%)</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="637"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2092"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1613"/>
@@ -920,90 +993,80 @@
         <translation>Sincronizza l&apos;ora del computer con il PC</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="521"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1587"/>
-        <source>Compass gain</source>
-        <translation>Guadagno della bussola</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="90"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1523"/>
-        <source>Read settings from backup file or from device before writing to the device</source>
-        <translation>Legge le impostazioni dal dispositivo o dal file di backup prima di scrivere sul dispositivo</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="116"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1527"/>
-        <source>Read settings from backup file or from device before writing to a backup file</source>
-        <translation>Legge le impostazioni dal dispositivo o dal file di backup prima di scrivere sul file di backup</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="232"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1543"/>
-        <source>OSTC, Mk.2/2N/2C</source>
-        <translation>OSTC, Mk.2/2N/2C</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="644"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1605"/>
+        <source>Dive mode color</source>
+        <translation>Colore della modalità immersione</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="452"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1590"/>
-        <source>230LSB/Gauss</source>
-        <translation>230LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="654"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2020"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1614"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1771"/>
+        <source>Show safety stop</source>
+        <translation>Mostra fermata di sicurezza</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="457"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1591"/>
-        <source>330LSB/Gauss</source>
-        <translation>330LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="661"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2145"/>
+        <source>End Depth</source>
+        <translation>Profondità finale</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="462"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1592"/>
-        <source>390LSB/Gauss</source>
-        <translation>390LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="671"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2162"/>
+        <source> s</source>
+        <translation>s</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="467"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1593"/>
-        <source>440LSB/Gauss</source>
-        <translation>440LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="687"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1953"/>
+        <source>Length</source>
+        <translation>Lunghezza</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="472"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1594"/>
-        <source>660LSB/Gauss</source>
-        <translation>660LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="694"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2138"/>
+        <source>Start Depth</source>
+        <translation>Profondità iniziale</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="477"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1595"/>
-        <source>820LSB/Gauss</source>
-        <translation>820LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="701"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2152"/>
+        <source>Reset Depth</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="482"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1596"/>
-        <source>1090LSB/Gauss</source>
-        <translation>1090LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="711"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="736"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="758"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="904"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2181"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2206"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2228"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2307"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1626"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1786"/>
+        <source> m</source>
+        <translation> m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="487"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1597"/>
-        <source>1370LSB/Gauss</source>
-        <translation>1370LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="778"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2248"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1643"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1810"/>
+        <source>Advanced settings</source>
+        <translation>Impostazioni avanzate</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="654"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2020"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1614"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1771"/>
-        <source>Show safety stop</source>
-        <translation>Mostra fermata di sicurezza</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="784"/>
+        <source>Left button sensitivity</source>
+        <translation>Sensibilità del bottone sinistro</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="438"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1615"/>
-        <source>Reset device to default settings</source>
-        <translation>Reimposta il dispositivo alle impostazioni di fabbrica</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="791"/>
+        <source>Always show ppO2</source>
+        <translation>Mostra sempre la ppO2</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="798"/>
@@ -1014,20 +1077,6 @@
         <translation>Alt GF può essere selezionato sott&apos;acqua</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="223"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1541"/>
-        <source>Suunto Vyper family</source>
-        <translation>Famiglia Suunto Vyper</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="778"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2248"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1643"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1810"/>
-        <source>Advanced settings</source>
-        <translation>Impostazioni avanzate</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="805"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2271"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1618"/>
@@ -1058,6 +1107,14 @@
         <translation>GFHigh</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="865"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2261"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1624"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1784"/>
+        <source>Desaturation</source>
+        <translation>Desaturazione</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="917"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2320"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1627"/>
@@ -1072,14 +1129,6 @@
         <translation> mbar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="973"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2369"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1630"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1788"/>
-        <source> min</source>
-        <translation>min</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="960"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2331"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1633"/>
@@ -1088,63 +1137,28 @@
         <translation>ZH-L16</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="47"/>
-        <source>Connect via Bluetooth</source>
-        <translation>Connetti vi Bluetooth</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="163"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1532"/>
-        <source>Save libdivecomputer logfile</source>
-        <translation>Salva il file di log di libdivecomputer</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="661"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2145"/>
-        <source>End Depth</source>
-        <translation>Profondità finale</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="671"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2162"/>
-        <source> s</source>
-        <translation>s</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="687"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1953"/>
-        <source>Length</source>
-        <translation>Lunghezza</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="694"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2138"/>
-        <source>Start Depth</source>
-        <translation>Profondità iniziale</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="701"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2152"/>
-        <source>Reset Depth</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="784"/>
-        <source>Left button sensitivity</source>
-        <translation>Sensibilità del bottone sinistro</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="791"/>
-        <source>Always show ppO2</source>
-        <translation>Mostra sempre la ppO2</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="965"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1634"/>
         <source>ZH-L16+GF</source>
         <translation>ZH-L16+GF</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="973"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2369"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1630"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1788"/>
+        <source> min</source>
+        <translation>min</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="983"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2398"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1636"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1800"/>
+        <source>Last deco</source>
+        <translation>Ultima deco</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1009"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2424"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1640"/>
@@ -1161,6 +1175,14 @@
         <translation>Alt GFHigh</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1042"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2457"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1639"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1805"/>
+        <source>Saturation</source>
+        <translation>Saturazione</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1052"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1642"/>
         <source>Flip screen</source>
@@ -1172,12 +1194,22 @@
         <translation>Sensibilità del bottone destro</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1066"/>
+        <source>MOD warning</source>
+        <translation>MOD warning</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1073"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2513"/>
         <source>Graphical speed indicator</source>
         <translation>Indicatore grafico di velocità</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1080"/>
+        <source>Dynamic ascent rate</source>
+        <translation>Velocità di risalita dinamica</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1087"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2552"/>
         <source>Bottom gas consumption</source>
@@ -1190,6 +1222,14 @@
         <translation>consumo del gas decompressivo</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1133"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1149"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2520"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2536"/>
+        <source> ℓ/min</source>
+        <translation> ℓ/min</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1165"/>
         <source>Temperature sensor offset</source>
         <translation type="unfinished"/>
@@ -1208,6 +1248,18 @@
         <translation>Impostazioni dei gas</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1235"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1320"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2610"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2695"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1645"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1668"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1812"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1835"/>
+        <source>%O₂</source>
+        <translation>%O₂</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1240"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1325"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2615"/>
@@ -1326,16 +1378,10 @@
         <translation>Dil 5</translation>
     </message>
     <message>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1691"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1858"/>
-        <source>Set point [cbar]</source>
-        <translation>Set Point [cbar]</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1693"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1860"/>
-        <source>Change depth [m]</source>
-        <translation>Cambia profondità [m]</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1405"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2770"/>
+        <source>Setpoint</source>
+        <translation>Setpoint</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1415"/>
@@ -1374,6 +1420,12 @@
         <translation>SP 5</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1443"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1709"/>
+        <source>O₂ in calibration gas</source>
+        <translation>O₂ nel gas di calibrazione</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1467"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1713"/>
         <source>Fixed setpoint</source>
@@ -1404,101 +1456,6 @@
         <translation> cbar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1748"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1733"/>
-        <source>P1 (medium)</source>
-        <extracomment>Suunto safety level</extracomment>
-        <translation>P1 (medio)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1753"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1734"/>
-        <source>P2 (high)</source>
-        <extracomment>Suunto safety level</extracomment>
-        <translation>P2 (alto)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1792"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1744"/>
-        <source>Total dive time</source>
-        <translation>Tempo totale d&apos;immersione</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2109"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1769"/>
-        <source>kg/ℓ</source>
-        <translation>kg/ℓ</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2346"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1795"/>
-        <source>Apnoea</source>
-        <translation>Apnea</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1583"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1722"/>
-        <source>Safety level</source>
-        <translation>Livello di sicurezza</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="54"/>
-        <source>Connect</source>
-        <translation>Connetti</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="64"/>
-        <source>Disconnect</source>
-        <translation>Disconnetti</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="214"/>
-        <source>OSTC 3,Sport,Cr,2</source>
-        <translation>OSTC 3,Sport,Cr,2</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1066"/>
-        <source>MOD warning</source>
-        <translation>MOD warning</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1080"/>
-        <source>Dynamic ascent rate</source>
-        <translation>Velocità di risalita dinamica</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1133"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1149"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2520"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2536"/>
-        <source> ℓ/min</source>
-        <translation> ℓ/min</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1235"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1320"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2610"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2695"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1645"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1668"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1812"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1835"/>
-        <source>%O₂</source>
-        <translation>%O₂</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1405"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2770"/>
-        <source>Setpoint</source>
-        <translation>Setpoint</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1443"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1709"/>
-        <source>O₂ in calibration gas</source>
-        <translation>O₂ nel gas di calibrazione</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1535"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2843"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1719"/>
@@ -1515,6 +1472,12 @@
         <translation>pO₂ min</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1583"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1722"/>
+        <source>Safety level</source>
+        <translation>Livello di sicurezza</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1609"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1723"/>
         <source>Altitude range</source>
@@ -1548,6 +1511,20 @@
         <translation>P0 (nessuno)</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1748"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1733"/>
+        <source>P1 (medium)</source>
+        <extracomment>Suunto safety level</extracomment>
+        <translation>P1 (medio)</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1753"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1734"/>
+        <source>P2 (high)</source>
+        <extracomment>Suunto safety level</extracomment>
+        <translation>P2 (alto)</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1761"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1736"/>
         <source>Sample rate</source>
@@ -1572,11 +1549,10 @@
         <translation>60s</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="531"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1799"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1745"/>
-        <source>Computer model</source>
-        <translation>Modello di computer</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1792"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1744"/>
+        <source>Total dive time</source>
+        <translation>Tempo totale d&apos;immersione</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1816"/>
@@ -1641,12 +1617,6 @@
         <translation>Allarme temporale</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2099"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1765"/>
-        <source>Salinity</source>
-        <translation>Salinità</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2074"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1774"/>
         <source>MM/DD/YY</source>
@@ -1665,12 +1635,30 @@
         <translation>AA/MM/GG</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2099"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1765"/>
+        <source>Salinity</source>
+        <translation>Salinità</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2109"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1769"/>
+        <source>kg/ℓ</source>
+        <translation>kg/ℓ</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2341"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1794"/>
         <source>ZH-L16 CC</source>
         <translation>ZH-L16 CC</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2346"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1795"/>
+        <source>Apnoea</source>
+        <translation>Apnea</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2351"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1796"/>
         <source>L16-GF OC</source>
@@ -1689,87 +1677,112 @@
         <translation>PSCR-GF</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1108"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1129"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1539"/>
+        <source>OSTC 3</source>
+        <translation>OSTC 3</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1691"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1858"/>
+        <source>Set point [cbar]</source>
+        <translation>Set Point [cbar]</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1693"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1860"/>
+        <source>Change depth [m]</source>
+        <translation>Cambia profondità [m]</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1110"/>
+        <source>Backup dive computer settings</source>
+        <translation>Backup delle impostazioni del computer</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1111"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1132"/>
         <source>Backup files (*.xml)</source>
         <translation>Backup files (*.xml)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1113"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1115"/>
+        <source>XML backup error</source>
+        <translation>Errore backup XML</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1116"/>
         <source>An error occurred while saving the backup file.
 %1</source>
         <translation>Si è verificato un errore nel salvataggio del file di backup.
 %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1116"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1119"/>
         <source>Backup succeeded</source>
         <translation>Backup eseguito con successo</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1117"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1120"/>
         <source>Your settings have been saved to: %1</source>
         <translation>Le tue impostazioni sono state salvate in: %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1107"/>
-        <source>Backup dive computer settings</source>
-        <translation>Backup delle impostazioni del computer</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1112"/>
-        <source>XML backup error</source>
-        <translation>Errore backup XML</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1128"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1131"/>
         <source>Restore dive computer settings</source>
         <translation>Ripristina le impostazioni del computer</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1134"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1137"/>
         <source>XML restore error</source>
         <translation>Errore ripristino XML</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1135"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1138"/>
         <source>An error occurred while restoring the backup file.
 %1</source>
         <translation>Si è verificato un errore nel ripristino del file di backup.
 %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1139"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1142"/>
         <source>Restore succeeded</source>
         <translation>Ripristino avvenuto con successo</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1140"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1143"/>
         <source>Your settings have been restored successfully.</source>
         <translation>Le tue impostazioni sono state ripristinate correttamente.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1150"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1153"/>
         <source>Select firmware file</source>
         <translation>Seleziona il file del firmware</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1151"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1154"/>
         <source>All files (*.*)</source>
         <translation>Tutti i file (*.*)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1207"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1210"/>
         <source>Choose file for divecomputer download logfile</source>
         <translation>Scegli il file per scaricare il log dal computer subacqueo</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1208"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1211"/>
         <source>Log files (*.log)</source>
         <translation>Files di Log (*.log)</translation>
     </message>
 </context>
 <context>
+    <name>ContextDrawer</name>
+    <message>
+        <location filename="../mobile-widgets/qml/kirigami/src/controls/ContextDrawer.qml" line="76"/>
+        <source>Actions</source>
+        <translation>Azioni</translation>
+    </message>
+</context>
+<context>
     <name>CylindersModel</name>
     <message>
         <location filename="../qt-models/cylindermodel.cpp" line="16"/>
@@ -1783,11 +1796,6 @@
     </message>
     <message>
         <location filename="../qt-models/cylindermodel.cpp" line="16"/>
-        <source>He%</source>
-        <translation>He%</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="16"/>
         <source>Work press.</source>
         <translation>Pressione eser.</translation>
     </message>
@@ -1807,9 +1815,24 @@
         <translation>O₂%</translation>
     </message>
     <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="16"/>
+        <source>He%</source>
+        <translation>He%</translation>
+    </message>
+    <message>
         <location filename="../qt-models/cylindermodel.cpp" line="17"/>
-        <source>Switch at</source>
-        <translation>Cambia a</translation>
+        <source>Deco switch at</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
+        <source>Bot. MOD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
+        <source>MND</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-models/cylindermodel.cpp" line="17"/>
@@ -1827,17 +1850,32 @@
         <translation>ℓ</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="161"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="177"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation>Cliccando qui si rimuove la bombola.</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="383"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="180"/>
+        <source>Switch depth for deco gas. Calculated using Deco pO₂ preference, unless set manually.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="183"/>
+        <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to &apos;*&apos; for best O₂% for max depth.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="186"/>
+        <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to &apos;*&apos; for best He% for max depth.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="444"/>
         <source>Cylinder cannot be removed</source>
         <translation>La bombola non può essere rimossa</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="384"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="445"/>
         <source>This gas is 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 in uso nell&apos;immersione possono essere rimosse.</translation>
     </message>
@@ -1857,42 +1895,24 @@
         <translation>Quali dettagli vorresti copiare</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="73"/>
+        <location filename="../build/ui_divecomponentselection.h" line="141"/>
+        <source>Dive site</source>
+        <translation>Luogo immersione</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="80"/>
         <location filename="../build/ui_divecomponentselection.h" line="142"/>
         <source>Suit</source>
         <translation>Muta</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="122"/>
-        <location filename="../build/ui_divecomponentselection.h" line="148"/>
-        <source>Divemaster</source>
-        <translation>Divemaster</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="129"/>
-        <location filename="../build/ui_divecomponentselection.h" line="149"/>
-        <source>Buddy</source>
-        <translation>Compagno</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="136"/>
-        <location filename="../build/ui_divecomponentselection.h" line="150"/>
-        <source>Rating</source>
-        <translation>Valutazione</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="87"/>
         <location filename="../build/ui_divecomponentselection.h" line="143"/>
         <source>Visibility</source>
         <translation>Visibilità</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="73"/>
-        <location filename="../build/ui_divecomponentselection.h" line="141"/>
-        <source>Dive site</source>
-        <translation>Luogo immersione</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="94"/>
         <location filename="../build/ui_divecomponentselection.h" line="144"/>
         <source>Notes</source>
@@ -1916,10 +1936,34 @@
         <source>Cylinders</source>
         <translation>Bombole</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="122"/>
+        <location filename="../build/ui_divecomponentselection.h" line="148"/>
+        <source>Divemaster</source>
+        <translation>Divemaster</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="129"/>
+        <location filename="../build/ui_divecomponentselection.h" line="149"/>
+        <source>Buddy</source>
+        <translation>Compagno</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="136"/>
+        <location filename="../build/ui_divecomponentselection.h" line="150"/>
+        <source>Rating</source>
+        <translation>Valutazione</translation>
+    </message>
 </context>
 <context>
     <name>DiveComputerManagementDialog</name>
     <message>
+        <location filename="../desktop-widgets/divecomputermanagementdialog.ui" line="17"/>
+        <location filename="../build/ui_divecomputermanagementdialog.h" line="65"/>
+        <source>Edit dive computer nicknames</source>
+        <translation>Modifica gli alias dei computer</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divecomputermanagementdialog.cpp" line="49"/>
         <source>Remove the selected dive computer?</source>
         <translation>Rimuovere il computer selezionato?</translation>
@@ -1931,12 +1975,6 @@
         <translation>Sei sicuro di volere cancellare
 il computer selezionato?</translation>
     </message>
-    <message>
-        <location filename="../desktop-widgets/divecomputermanagementdialog.ui" line="17"/>
-        <location filename="../build/ui_divecomputermanagementdialog.h" line="65"/>
-        <source>Edit dive computer nicknames</source>
-        <translation>Modifica gli alias dei computer</translation>
-    </message>
 </context>
 <context>
     <name>DiveComputerModel</name>
@@ -1964,17 +2002,17 @@ il computer selezionato?</translation>
 <context>
     <name>DiveDetails</name>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="33"/>
+        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="38"/>
         <source>Dive details</source>
         <translation>Dettagli di immersione</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="67"/>
+        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="72"/>
         <source>Delete dive</source>
         <translation>Cancella immersione</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="84"/>
+        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="89"/>
         <source>Show on map</source>
         <translation>Mostra nella mappa</translation>
     </message>
@@ -1982,89 +2020,94 @@ il computer selezionato?</translation>
 <context>
     <name>DiveDetailsEdit</name>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="74"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="80"/>
         <source>Dive %1</source>
         <translation>Immersione %1</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="78"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="84"/>
         <source>Date:</source>
         <translation>Data:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="86"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="92"/>
         <source>Location:</source>
         <translation>Luogo:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="95"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="101"/>
         <source>Coordinates:</source>
         <translation>Coordinate</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="104"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="110"/>
         <source>Use current
 GPS location:</source>
         <translation>Usa la posizione
 del GPS:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="118"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="124"/>
         <source>Depth:</source>
         <translation>Profondità:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="127"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="133"/>
         <source>Duration:</source>
         <translation>Durata:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="137"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="143"/>
         <source>Air Temp:</source>
         <translation>Temp. aria:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="146"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="152"/>
         <source>Water Temp:</source>
         <translation>Temp. acqua:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="155"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="161"/>
         <source>Suit:</source>
         <translation>Muta:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="164"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="176"/>
         <source>Buddy:</source>
         <translation>Compagno:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="173"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="191"/>
         <source>Dive Master:</source>
         <translation>Dive Master:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="182"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="206"/>
         <source>Weight:</source>
         <translation>Peso:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="192"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="216"/>
+        <source>Cylinder:</source>
+        <translation>Bombola:</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="231"/>
         <source>Gas mix:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="203"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="241"/>
         <source>Start Pressure:</source>
         <translation>Pressione iniziale:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="213"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="250"/>
         <source>End Pressure:</source>
         <translation>Pressione finale:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="224"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="260"/>
         <source>Notes:</source>
         <translation>Note:</translation>
     </message>
@@ -2117,27 +2160,27 @@ del GPS:</translation>
         <translation>Temp. acqua:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="199"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="198"/>
         <source>Dive Master:</source>
         <translation>Dive Master:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="213"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="211"/>
         <source>Weight:</source>
         <translation>Peso:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="226"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="224"/>
         <source>Buddy:</source>
         <translation>Compagno:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="239"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="237"/>
         <source>SAC:</source>
         <translation>CAS:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="254"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="252"/>
         <source>Notes</source>
         <translation>Note</translation>
     </message>
@@ -2145,18 +2188,18 @@ del GPS:</translation>
 <context>
     <name>DiveEventItem</name>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="134"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="165"/>
         <source>Manual switch to OC</source>
         <translation>Switch manuale a OC</translation>
     </message>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="136"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="167"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation>inizio</translation>
     </message>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="137"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="168"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation>fine</translation>
@@ -2165,27 +2208,27 @@ del GPS:</translation>
 <context>
     <name>DiveImportedModel</name>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="646"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="656"/>
         <source>Date/time</source>
         <translation>Data/ora</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="648"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="658"/>
         <source>Duration</source>
         <translation>Durata</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="650"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="660"/>
         <source>Depth</source>
         <translation>Profondità</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="672"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="682"/>
         <source>h:</source>
         <translation>h:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="672"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="682"/>
         <source>min</source>
         <translation>min</translation>
     </message>
@@ -2194,8 +2237,8 @@ del GPS:</translation>
     <name>DiveList</name>
     <message>
         <location filename="../mobile-widgets/qml/DiveList.qml" line="12"/>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="226"/>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="232"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="227"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="233"/>
         <source>Dive list</source>
         <translation>Lista immersioni</translation>
     </message>
@@ -2210,110 +2253,115 @@ del GPS:</translation>
         <translation>Durata:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="222"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="223"/>
         <source>Cloud credentials</source>
         <translation>Credenziali per il cloud</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="228"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="229"/>
         <source>Please tap the &apos;+&apos; button to add a dive</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="248"/>
+        <source>No dives in dive list</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DiveListView</name>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="846"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="849"/>
         <source>Expand all</source>
         <translation>Espandi tutto</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="848"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="851"/>
         <source>Collapse all</source>
         <translation>Minimizza tutto</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="852"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="855"/>
         <source>Collapse others</source>
         <translation>Collassa altri</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="856"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="859"/>
         <source>Remove dive(s) from trip</source>
         <translation>Rimuove immersione(i) dal viaggio</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="857"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="860"/>
         <source>Create new trip above</source>
         <translation>Crea un nuovo viaggio sopra</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="871"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="874"/>
         <source>Add dive(s) to trip immediately above</source>
         <translation>Aggiungi l&apos;immersione(i) al viaggio subito sopra</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="873"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="876"/>
         <source>Add dive(s) to trip immediately below</source>
         <translation>Aggiungi l&apos;immersione(i) al viaggio subito sotto</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="877"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="880"/>
         <source>Merge trip with trip above</source>
         <translation>Raggruppa il viaggio con il viaggio sopra</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="878"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="881"/>
         <source>Merge trip with trip below</source>
         <translation>Raggruppa il viaggio con il viaggio sotto</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="882"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="885"/>
         <source>Delete dive(s)</source>
         <translation>Cancella immersione(i)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="884"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="887"/>
         <source>Mark dive(s) invalid</source>
         <translation>Marca l&apos;immersione(i) come non valide</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="888"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="891"/>
         <source>Merge selected dives</source>
         <translation>Fondi le immersioni selezionate</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="890"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="893"/>
         <source>Renumber dive(s)</source>
         <translation>Rinumera le immersioni</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="891"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="894"/>
         <source>Shift dive times</source>
         <translation>Sposta i tempi di immersione</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="892"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="895"/>
         <source>Split selected dives</source>
         <translation>Dividi le immersioni selezionate</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="893"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="896"/>
         <source>Load image(s) from file(s)</source>
         <translation>Carica immagine(i) da file(s)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="894"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="897"/>
         <source>Load image(s) from web</source>
         <translation>Carica immagine(i) dal web</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="917"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="919"/>
         <source>Open image files</source>
         <translation>Apri files di immagine</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="917"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="919"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>Files immagine (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -2334,56 +2382,6 @@ del GPS:</translation>
 <context>
     <name>DiveLogExportDialog</name>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="103"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="351"/>
-        <source>Export format</source>
-        <translation>Esporta il formato</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="134"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="353"/>
-        <source>UDDF</source>
-        <translation>UDDF</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="187"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="358"/>
-        <source>Worldmap</source>
-        <translation>Mappa mondiale</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="197"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="359"/>
-        <source>I&amp;mage depths</source>
-        <translation>Profondità delle i&amp;mmagini</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="243"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="360"/>
-        <source>Selection</source>
-        <translation>Selezione</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="252"/>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="346"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="361"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="372"/>
-        <source>Selected dives</source>
-        <translation>Immersioni selezionate</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="262"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="362"/>
-        <source>All dives</source>
-        <translation>Tutte le immersioni</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="306"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="396"/>
-        <source>HTML</source>
-        <translation>HTML</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="14"/>
         <location filename="../build/ui_divelogexportdialog.h" line="349"/>
         <source>Export dive log files</source>
@@ -2396,12 +2394,24 @@ del GPS:</translation>
         <translation>Esportazione generale</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="103"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="351"/>
+        <source>Export format</source>
+        <translation>Esporta il formato</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="115"/>
         <location filename="../build/ui_divelogexportdialog.h" line="352"/>
         <source>Subsurface &amp;XML</source>
         <translation>Subsurface &amp;XML</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="134"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="353"/>
+        <source>UDDF</source>
+        <translation>UDDF</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="147"/>
         <location filename="../build/ui_divelogexportdialog.h" line="354"/>
         <source>di&amp;velogs.de</source>
@@ -2426,238 +2436,297 @@ del GPS:</translation>
         <translation>Dettagli di immersione CSV</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="275"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="187"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="358"/>
+        <source>Worldmap</source>
+        <translation>Mappa mondiale</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="197"/>
+        <source>TeX</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="207"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="359"/>
+        <source>I&amp;mage depths</source>
+        <translation>Profondità delle i&amp;mmagini</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="253"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="360"/>
+        <source>Selection</source>
+        <translation>Selezione</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="262"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="356"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="361"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="372"/>
+        <source>Selected dives</source>
+        <translation>Immersioni selezionate</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="272"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="362"/>
+        <source>All dives</source>
+        <translation>Tutte le immersioni</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="285"/>
         <location filename="../build/ui_divelogexportdialog.h" line="363"/>
         <source>CSV units</source>
         <translation>unità di misura CSV</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="288"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="298"/>
         <location filename="../build/ui_divelogexportdialog.h" line="366"/>
         <source>Metric</source>
         <translation>Metrico</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="293"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="303"/>
         <location filename="../build/ui_divelogexportdialog.h" line="367"/>
         <source>Imperial</source>
         <translation>Imperiale</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="324"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="316"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="396"/>
+        <source>HTML</source>
+        <translation>HTML</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="334"/>
         <location filename="../build/ui_divelogexportdialog.h" line="370"/>
         <source>General settings</source>
         <translation>Preferenze generali</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="330"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="340"/>
         <location filename="../build/ui_divelogexportdialog.h" line="371"/>
         <source>Subsurface numbers</source>
         <translation>Numerazione di Subsurface</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="359"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="369"/>
         <location filename="../build/ui_divelogexportdialog.h" line="373"/>
         <source>Export yearly statistics</source>
         <translation>Esporta le statistiche annuali</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="375"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="385"/>
         <location filename="../build/ui_divelogexportdialog.h" line="374"/>
         <source>All di&amp;ves</source>
         <translation>Tutte le imme&amp;rsioni</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="385"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="395"/>
         <location filename="../build/ui_divelogexportdialog.h" line="375"/>
         <source>Export list only</source>
         <translation>Esporta solo la lista</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="392"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="402"/>
         <location filename="../build/ui_divelogexportdialog.h" line="376"/>
         <source>Export photos</source>
         <translation>Esporta foto</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="408"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="418"/>
         <location filename="../build/ui_divelogexportdialog.h" line="377"/>
         <source>Style options</source>
         <translation>Opzioni stile</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="423"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="433"/>
         <location filename="../build/ui_divelogexportdialog.h" line="378"/>
         <source>Font</source>
         <translation>Font</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="433"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="443"/>
         <location filename="../build/ui_divelogexportdialog.h" line="379"/>
         <source>Font size</source>
         <translation>Grandezza font</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="444"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="454"/>
         <location filename="../build/ui_divelogexportdialog.h" line="382"/>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="449"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="459"/>
         <location filename="../build/ui_divelogexportdialog.h" line="383"/>
         <source>10</source>
         <translation>10</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="454"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="464"/>
         <location filename="../build/ui_divelogexportdialog.h" line="384"/>
         <source>12</source>
         <translation>12</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="459"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="469"/>
         <location filename="../build/ui_divelogexportdialog.h" line="385"/>
         <source>14</source>
         <translation>14</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="464"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="474"/>
         <location filename="../build/ui_divelogexportdialog.h" line="386"/>
         <source>16</source>
         <translation>16</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="469"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="479"/>
         <location filename="../build/ui_divelogexportdialog.h" line="387"/>
         <source>18</source>
         <translation>18</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="474"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="484"/>
         <location filename="../build/ui_divelogexportdialog.h" line="388"/>
         <source>20</source>
         <translation>20</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="482"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="492"/>
         <location filename="../build/ui_divelogexportdialog.h" line="390"/>
         <source>Theme</source>
         <translation>Tema</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="493"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="503"/>
         <location filename="../build/ui_divelogexportdialog.h" line="393"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="95"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="99"/>
         <source>Light</source>
         <translation>Luce</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="498"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="508"/>
         <location filename="../build/ui_divelogexportdialog.h" line="394"/>
         <source>Sand</source>
         <translation>Sabbia</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="134"/>
-        <source>UDDF files (*.uddf *.UDDF)</source>
-        <translation>File UDDF (*.uddf *.UDDF)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="142"/>
-        <source>CSV files (*.csv *.CSV)</source>
-        <translation>CSV files (*.csv *.CSV)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="74"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="76"/>
         <source>Generic format that is used for data exchange between a variety of diving related programs.</source>
         <translation>Formato generico usato per lo scambio di informazioni tra diverse applicazioni in campo subacqueo.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="76"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="78"/>
         <source>Comma separated values describing the dive profile.</source>
         <translation>Valori separati da virgola che descrivono il profilo di immersione</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="78"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="80"/>
         <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source>
         <translation>Valori separati da virgole che includono la maggior parte delle informazioni di immersione ma non include il profilo di immersione.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="80"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="82"/>
         <source>Send the dive data to divelogs.de website.</source>
         <translation>Invia i dati di immersione al sito divelogs.de.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="82"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="84"/>
         <source>Send the dive data to dive-share.appspot.com website</source>
         <translation>Invia i dati di immersione al sito dive-share.appspot.com</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="84"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="86"/>
         <source>HTML export of the dive locations, visualized on a world map.</source>
         <translation>Esportazione HTML dei luoghi di immersione, visualizzati su un mappamondo</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="86"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="88"/>
         <source>Subsurface native XML format.</source>
         <translation>Formato XML nativo di Subsurface</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="88"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="90"/>
         <source>Write depths of images to file.</source>
         <translation>Esporta la profondità a cui sono state scattate le foto.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="133"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="92"/>
+        <source>Write dive as TeX macros to file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="137"/>
         <source>Export UDDF file as</source>
         <translation>Esporta file UDDF come</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="137"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/>
+        <source>UDDF files (*.uddf *.UDDF)</source>
+        <translation>File UDDF (*.uddf *.UDDF)</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divelogexportdialog.cpp" line="141"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="145"/>
         <source>Export CSV file as</source>
         <translation>Esporta file CSV come</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="148"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="142"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="146"/>
+        <source>CSV files (*.csv *.CSV)</source>
+        <translation>CSV files (*.csv *.CSV)</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="152"/>
         <source>Export world map</source>
         <translation>Esporta il mappamondo</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="149"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="169"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="153"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="177"/>
         <source>HTML files (*.html)</source>
         <translation>File HTML (*.html)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="153"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="157"/>
         <source>Export Subsurface XML</source>
         <translation>Esporta Subsurface XML</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="158"/>
         <source>XML files (*.xml *.ssrf)</source>
         <translation>XML files (*.xml *.ssrf)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="162"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="166"/>
         <source>Save image depths</source>
         <translation>Salva la profondità a cui sono state scattate le foto</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="168"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="170"/>
+        <source>Export to TeX file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="170"/>
+        <source>TeX files (*.tex)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="176"/>
         <source>Export HTML files as</source>
         <translation>Esporta file HTML come</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="184"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="192"/>
         <source>Please wait, exporting...</source>
         <translation>Prego attendere, esportazione in corso...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="219"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="227"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="311"/>
         <source>Can&apos;t open file %s</source>
         <translation>Non posso aprire il file %s</translation>
     </message>
@@ -2671,25 +2740,6 @@ del GPS:</translation>
         <translation>Importa log delle immersioni da file</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="643"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="727"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="856"/>
-        <source>Time</source>
-        <translation>Ora</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.ui" line="127"/>
-        <location filename="../build/ui_divelogimportdialog.h" line="164"/>
-        <source>Metric</source>
-        <translation>Metrico</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.ui" line="132"/>
-        <location filename="../build/ui_divelogimportdialog.h" line="165"/>
-        <source>Imperial</source>
-        <translation>Imperiale</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divelogimportdialog.ui" line="89"/>
         <location filename="../build/ui_divelogimportdialog.h" line="152"/>
         <source>dd.mm.yyyy</source>
@@ -2708,74 +2758,6 @@ del GPS:</translation>
         <translation>yyyy-mm-dd</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.ui" line="155"/>
-        <location filename="../build/ui_divelogimportdialog.h" line="167"/>
-        <source>Drag the tags above to each corresponding column below</source>
-        <translation>Trascina le etichette sulle colonne corrispondenti in basso</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="641"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="729"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="852"/>
-        <source>Dive #</source>
-        <translation>Immersione nº</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="642"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="723"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="854"/>
-        <source>Date</source>
-        <translation>Data</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="644"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="858"/>
-        <source>Duration</source>
-        <translation>Durata</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="655"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="862"/>
-        <source>GPS</source>
-        <translation>GPS</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="645"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="864"/>
-        <source>Max. depth</source>
-        <translation>Profondità massima</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="646"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="866"/>
-        <source>Avg. depth</source>
-        <translation>Profondità media</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="658"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="872"/>
-        <source>Suit</source>
-        <translation>Muta</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="663"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="878"/>
-        <source>Tags</source>
-        <translation>Tags</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="652"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="894"/>
-        <source>O₂</source>
-        <translation>O₂</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="653"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="896"/>
-        <source>He</source>
-        <translation>He</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divelogimportdialog.ui" line="108"/>
         <location filename="../build/ui_divelogimportdialog.h" line="158"/>
         <source>Seconds</source>
@@ -2794,183 +2776,269 @@ del GPS:</translation>
         <translation>Minuti:secondi</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="654"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="860"/>
-        <source>Location</source>
-        <translation>Luogo</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.ui" line="127"/>
+        <location filename="../build/ui_divelogimportdialog.h" line="164"/>
+        <source>Metric</source>
+        <translation>Metrico</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.ui" line="132"/>
+        <location filename="../build/ui_divelogimportdialog.h" line="165"/>
+        <source>Imperial</source>
+        <translation>Imperiale</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="354"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="499"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="505"/>
+        <location filename="../desktop-widgets/divelogimportdialog.ui" line="155"/>
+        <location filename="../build/ui_divelogimportdialog.h" line="167"/>
+        <source>Drag the tags above to each corresponding column below</source>
+        <translation>Trascina le etichette sulle colonne corrispondenti in basso</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="355"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="528"/>
         <source>Tab</source>
         <translation>Tabulazione</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="575"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="598"/>
         <source>Some column headers were pre-populated; please drag and drop the headers so they match the column they are in.</source>
         <translation>Alcune intestazioni delle colonne sono state riempite; trascina le intestazioni in modo che riflettano il contenuto delle colonne.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="613"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="731"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="782"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="848"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="636"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="761"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="857"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="925"/>
         <source>Sample time</source>
         <translation>Tempo</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="615"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="733"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="784"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="638"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="763"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="859"/>
         <source>Sample depth</source>
         <translation>Profondità</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="617"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="735"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="786"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="640"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="765"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="861"/>
         <source>Sample temperature</source>
         <translation>Temperatura</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="621"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="739"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="790"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="642"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="767"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="863"/>
+        <source>Sample pO₂</source>
+        <translation>pO₂</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="644"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="769"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="865"/>
         <source>Sample sensor1 pO₂</source>
         <translation>Valore campione sensore1 pO2</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="623"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="741"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="792"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="646"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="771"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="867"/>
         <source>Sample sensor2 pO₂</source>
         <translation>Valore campione sensore2 pO2</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="625"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="743"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="794"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="648"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="773"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="869"/>
         <source>Sample sensor3 pO₂</source>
         <translation>Valore campione sensore3 pO2</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="633"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="751"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="802"/>
-        <source>Sample stopdepth</source>
-        <translation>Profondità della sosta</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="637"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="755"/>
-        <source>Sample setpoint</source>
-        <translation>Sample setpoint</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="619"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="737"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="788"/>
-        <source>Sample pO₂</source>
-        <translation>pO₂</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="627"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="745"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="796"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="650"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="775"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="871"/>
         <source>Sample CNS</source>
         <translation>CNS</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="629"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="747"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="798"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="652"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="777"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="873"/>
         <source>Sample NDL</source>
         <translation>NDL</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="631"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="749"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="800"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="654"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="779"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="875"/>
         <source>Sample TTS</source>
         <translation>TTS</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="635"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="753"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="804"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="656"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="781"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="877"/>
+        <source>Sample stopdepth</source>
+        <translation>Profondità della sosta</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="658"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="783"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="879"/>
         <source>Sample pressure</source>
         <translation>Pressione</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="656"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="868"/>
-        <source>Divemaster</source>
-        <translation>Divemaster</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="660"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="785"/>
+        <source>Sample setpoint</source>
+        <translation>Sample setpoint</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="657"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="870"/>
-        <source>Buddy</source>
-        <translation>Compagno</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="664"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="759"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="929"/>
+        <source>Dive #</source>
+        <translation>Immersione nº</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="659"/>
-        <source>Rating</source>
-        <translation>Valutazione</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="665"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="753"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="931"/>
+        <source>Date</source>
+        <translation>Data</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="660"/>
-        <source>Visibility</source>
-        <translation>Visibilità</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="666"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="757"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="933"/>
+        <source>Time</source>
+        <translation>Ora</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="661"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="874"/>
-        <source>Notes</source>
-        <translation>Note</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="667"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="935"/>
+        <source>Duration</source>
+        <translation>Durata</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="662"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="876"/>
-        <source>Weight</source>
-        <translation>Peso</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="668"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="941"/>
+        <source>Max. depth</source>
+        <translation>Profondità massima</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="669"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="943"/>
+        <source>Avg. depth</source>
+        <translation>Profondità media</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="670"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="975"/>
+        <source>Air temp.</source>
+        <translation>Temperatura atmosferica</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="649"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="888"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="671"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="977"/>
+        <source>Water temp.</source>
+        <translation>Temperatura dell&apos;acqua</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="672"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="965"/>
         <source>Cyl. size</source>
         <translation>Capacità bombola</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="650"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="890"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="673"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="967"/>
         <source>Start pressure</source>
         <translation>Pressione iniziale</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="651"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="892"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="674"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="969"/>
         <source>End pressure</source>
         <translation>Pressione finale</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="647"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="898"/>
-        <source>Air temp.</source>
-        <translation>Temperatura atmosferica</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="675"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="971"/>
+        <source>O₂</source>
+        <translation>O₂</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="648"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="900"/>
-        <source>Water temp.</source>
-        <translation>Temperatura dell&apos;acqua</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="676"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="973"/>
+        <source>He</source>
+        <translation>He</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="677"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="937"/>
+        <source>Location</source>
+        <translation>Luogo</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="678"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="939"/>
+        <source>GPS</source>
+        <translation>GPS</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="679"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="945"/>
+        <source>Divemaster</source>
+        <translation>Divemaster</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="680"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="947"/>
+        <source>Buddy</source>
+        <translation>Compagno</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="681"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="949"/>
+        <source>Suit</source>
+        <translation>Muta</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="682"/>
+        <source>Rating</source>
+        <translation>Valutazione</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="683"/>
+        <source>Visibility</source>
+        <translation>Visibilità</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="684"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="951"/>
+        <source>Notes</source>
+        <translation>Note</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="685"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="953"/>
+        <source>Weight</source>
+        <translation>Peso</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="686"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="955"/>
+        <source>Tags</source>
+        <translation>Tags</translation>
     </message>
 </context>
 <context>
     <name>DiveObjectHelper</name>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="287"/>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="323"/>
         <source>%1 dive(s)</source>
         <translation type="unfinished"/>
     </message>
@@ -2978,18 +3046,18 @@ del GPS:</translation>
 <context>
     <name>DivePlanner</name>
     <message>
-        <location filename="../desktop-widgets/diveplanner.ui" line="152"/>
-        <location filename="../build/ui_diveplanner.h" line="190"/>
-        <source>Altitude</source>
-        <translation>Altitudine</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/diveplanner.ui" line="109"/>
         <location filename="../build/ui_diveplanner.h" line="189"/>
         <source>Planned dive time</source>
         <translation>Tempo di immersione pianificato</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/diveplanner.ui" line="152"/>
+        <location filename="../build/ui_diveplanner.h" line="190"/>
+        <source>Altitude</source>
+        <translation>Altitudine</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/diveplanner.ui" line="159"/>
         <location filename="../build/ui_diveplanner.h" line="191"/>
         <source>ATM pressure</source>
@@ -3023,32 +3091,32 @@ del GPS:</translation>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="134"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="136"/>
         <source>unknown</source>
         <translation>sconosciuto</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="312"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="326"/>
         <source>Final depth</source>
         <translation>Profondità finale</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="314"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="328"/>
         <source>Run time</source>
         <translation>Run Time</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="316"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="330"/>
         <source>Duration</source>
         <translation>Durata</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="318"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="332"/>
         <source>Used gas</source>
         <translation>Gas utilizzato</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="320"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="334"/>
         <source>CC setpoint</source>
         <translation>CC setpoint</translation>
     </message>
@@ -3056,22 +3124,22 @@ del GPS:</translation>
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="108"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="112"/>
         <source>Dive planner points</source>
         <translation>Punti del pianificatore di immersione</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="112"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="116"/>
         <source>Available gases</source>
         <translation>Miscele disponibili</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="137"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="143"/>
         <source>Add dive data point</source>
         <translation>Aggiungi punto del profilo di immersione</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="146"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="152"/>
         <source>Save new</source>
         <translation>Salva nuovo</translation>
     </message>
@@ -3104,11 +3172,36 @@ del GPS:</translation>
         <translation>Colore</translation>
     </message>
     <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="124"/>
+        <source>User entered</source>
+        <translation>Inserito dall&apos;utente</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="126"/>
+        <source>Cylinder index</source>
+        <translation>Indice della bombola</translation>
+    </message>
+    <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="128"/>
         <source>Pressure S</source>
         <translation>Pressione S</translation>
     </message>
     <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="130"/>
+        <source>Pressure I</source>
+        <translation>Pressione I</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="132"/>
+        <source>Ceiling</source>
+        <translation>Ceiling</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="134"/>
+        <source>SAC</source>
+        <translation>CAS</translation>
+    </message>
+    <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="136"/>
         <source>pN₂</source>
         <translation>pN₂</translation>
@@ -3144,49 +3237,24 @@ del GPS:</translation>
         <translation>Sensore 3</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="152"/>
-        <source>Heart rate</source>
-        <translation>Battito cardiaco</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="156"/>
-        <source>Mean depth @ s</source>
-        <translation>Profondità media/e</translation>
-    </message>
-    <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="150"/>
         <source>Ambient pressure</source>
         <translation>Pressione ambiente</translation>
     </message>
     <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="152"/>
+        <source>Heart rate</source>
+        <translation>Battito cardiaco</translation>
+    </message>
+    <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="154"/>
         <source>Gradient factor</source>
         <translation>Gradient factor</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="130"/>
-        <source>Pressure I</source>
-        <translation>Pressione I</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="124"/>
-        <source>User entered</source>
-        <translation>Inserito dall&apos;utente</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="126"/>
-        <source>Cylinder index</source>
-        <translation>Indice della bombola</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="132"/>
-        <source>Ceiling</source>
-        <translation>Ceiling</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="134"/>
-        <source>SAC</source>
-        <translation>CAS</translation>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="156"/>
+        <source>Mean depth @ s</source>
+        <translation>Profondità media/e</translation>
     </message>
 </context>
 <context>
@@ -3257,311 +3325,315 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="395"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="441"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="434"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="483"/>
         <source>#</source>
         <translation>nº</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="398"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="444"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="437"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="486"/>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="401"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="447"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="440"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="489"/>
         <source>Rating</source>
         <translation>Valutazione</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="404"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="443"/>
         <source>Depth</source>
         <translation>Profondità</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="410"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="446"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="495"/>
+        <source>Duration</source>
+        <translation>Durata</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="449"/>
         <source>Temp</source>
         <translation>Temperatura</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="413"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="452"/>
         <source>Weight</source>
         <translation>Peso</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="425"/>
-        <source>SAC</source>
-        <translation>CAS</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
-        <source>m</source>
-        <translation>m</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
-        <source>ft</source>
-        <translation>ft</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
-        <source>Weight(%1)</source>
-        <translation>Peso(%1)</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="416"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="462"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="455"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="504"/>
         <source>Suit</source>
         <translation>Muta</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="419"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="465"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="458"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="507"/>
         <source>Cyl</source>
         <translation>Bombola</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="422"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="468"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="461"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="510"/>
         <source>Gas</source>
         <translation>Gas</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
-        <source>SAC(%1)</source>
-        <translation>CAS(%1)</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="464"/>
+        <source>SAC</source>
+        <translation>CAS</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
-        <source>/min</source>
-        <translation>/min</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="467"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="518"/>
+        <source>OTU</source>
+        <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="431"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="479"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="470"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="521"/>
         <source>Max CNS</source>
         <translation>CNS massimo</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="434"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="482"/>
-        <source>Location</source>
-        <translation>Luogo</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
+        <source>Photos</source>
+        <translation>Foto</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
-        <source>kg</source>
-        <translation>kg</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="476"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="527"/>
+        <source>Location</source>
+        <translation>Luogo</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="492"/>
         <source>Depth(%1)</source>
         <translation>Prof. (%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="407"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="453"/>
-        <source>Duration</source>
-        <translation>Durata</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="492"/>
+        <source>m</source>
+        <translation>m</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="492"/>
+        <source>ft</source>
+        <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="456"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="498"/>
         <source>Temp(%1%2)</source>
         <translation>Temp (%1%2)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="501"/>
+        <source>Weight(%1)</source>
+        <translation>Peso(%1)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="501"/>
+        <source>kg</source>
+        <translation>kg</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="501"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="428"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="476"/>
-        <source>OTU</source>
-        <translation>OTU</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="515"/>
+        <source>SAC(%1)</source>
+        <translation>CAS(%1)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="515"/>
+        <source>/min</source>
+        <translation>/min</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="524"/>
+        <source>Photos before/during/after dive</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="164"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="165"/>
         <source>no dives were selected</source>
         <translation>nessuna immersione è selezionata</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="174"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="175"/>
         <source>stylesheet to export to divelogs.de is not found</source>
         <translation>Non ho trovato il foglio di stile da esportare su divelogs.de</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="184"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="185"/>
         <source>failed to create zip file for upload: %s</source>
         <translation>Creazione del file zip per il caricamento fallita: %s</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="236"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="237"/>
         <source>internal error</source>
         <translation>errore interno</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="244"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="245"/>
         <source>Conversion of dive %1 to divelogs.de format failed</source>
         <translation>La conversione dell&apos;immersione %1 al formato di divelogs.de  è fallita</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="272"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="273"/>
         <source>error writing zip file: %s zip error %d system error %d - %s</source>
         <translation>errore nella scrittura del file zip: %s zip error %d system error %d - %s</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="745"/>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="935"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="936"/>
         <source>Done</source>
         <translation>Fatto</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="778"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="779"/>
         <source>Uploading dive list...</source>
         <translation>Sto caricando la lista immersioni...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="810"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="811"/>
         <source>Downloading dive list...</source>
         <translation>Sto scaricando la lista immersioni...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="851"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="852"/>
         <source>Downloading %1 dives...</source>
         <translation>Sto scaricando %1 immersioni...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="885"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="886"/>
         <source>Download finished - %1</source>
         <translation>Scaricamento finito - %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="899"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="900"/>
         <source>Problem with download</source>
         <translation>Problemi con il download</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="900"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="901"/>
         <source>The archive could not be opened:
 </source>
         <translation>L&apos;archivio non può essere aperto:
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="909"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="910"/>
         <source>Corrupted download</source>
         <translation>Scaricamento corrotto</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="910"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="911"/>
         <source>The archive could not be opened:
 %1</source>
         <translation>L&apos;archivio non può essere aperto:
 %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="937"/>
+        <source>Upload finished</source>
+        <translation>Caricamento finito</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="950"/>
         <source>Upload failed</source>
         <translation>Caricamento fallito</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="952"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="953"/>
         <source>Upload successful</source>
         <translation>Caricamento eseguito</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="955"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="956"/>
         <source>Login failed</source>
         <translation>Accesso fallito</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="958"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="959"/>
         <source>Cannot parse response</source>
         <translation>Non riesco ad analizzare la risposta</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="970"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="971"/>
         <source>Error: %1</source>
         <translation>Errore: %1</translation>
     </message>
-    <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="936"/>
-        <source>Upload finished</source>
-        <translation>Caricamento finito</translation>
-    </message>
 </context>
 <context>
     <name>DownloadFromDCWidget</name>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="185"/>
-        <source>Error</source>
-        <translation>Errore</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="436"/>
-        <source>Retry</source>
-        <translation>Riprova</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="280"/>
-        <source>Find Uemis dive computer</source>
-        <translation>Cerca computer Uemis</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="101"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="107"/>
         <source>Download</source>
         <translation>Download</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="104"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="110"/>
         <source>Choose Bluetooth download mode</source>
         <translation>Scegli la modalità di download per il Bluetooth</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="382"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="191"/>
+        <source>Error</source>
+        <translation>Errore</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="286"/>
+        <source>Find Uemis dive computer</source>
+        <translation>Cerca computer Uemis</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="392"/>
         <source>Choose file for divecomputer download logfile</source>
         <translation>Scegli il file per scaricare il log dal computer subacqueo</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="383"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="393"/>
         <source>Log files (*.log)</source>
         <translation>Files di Log (*.log)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="398"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="408"/>
         <source>Warning</source>
         <translation>Avviso</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="399"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="409"/>
         <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source>
         <translation>Il salvataggio del dump di libdivecomputer NON inserirà le immersioni nella lista delle immersioni.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="410"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="420"/>
         <source>Choose file for divecomputer binary dump file</source>
         <translation>Scegli il file di dump per il computer subacqueo</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="411"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="421"/>
         <source>Dump files (*.bin)</source>
         <translation>File di dump (*.bin)</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="446"/>
+        <source>Retry</source>
+        <translation>Riprova</translation>
+    </message>
 </context>
 <context>
     <name>DownloadFromDiveComputer</name>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="139"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="275"/>
-        <source>Vendor</source>
-        <translation>Venditore</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="14"/>
         <location filename="../build/ui_downloadfromdivecomputer.h" line="265"/>
         <source>Download from dive computer</source>
@@ -3574,17 +3646,6 @@ p, li { white-space: pre-wrap; }
         <translation>Periferica o punto di mount</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="122"/>
-        <source>Choose Bluetooth download mode</source>
-        <translation>Scegli la modalità di download per il Bluetooth</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="149"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="276"/>
-        <source>Dive computer</source>
-        <translation>Computer subacqueo</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="66"/>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="101"/>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="115"/>
@@ -3608,11 +3669,46 @@ p, li { white-space: pre-wrap; }
         <translation>Preferisci sempre le immersioni scaricate</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="87"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="270"/>
+        <source>Download into new trip</source>
+        <translation>Scarica in un nuovo viaggio</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="94"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="271"/>
+        <source>Save libdivecomputer logfile</source>
+        <translation>Salva il file di log di libdivecomputer</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="108"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="273"/>
+        <source>Save libdivecomputer dumpfile</source>
+        <translation>Salva il file di dump di libdivecomputer</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="122"/>
+        <source>Choose Bluetooth download mode</source>
+        <translation>Scegli la modalità di download per il Bluetooth</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="129"/>
         <source>Select a remote Bluetooth device.</source>
         <translation>Seleziona un dispositivo Bluetooth remoto.</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="139"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="275"/>
+        <source>Vendor</source>
+        <translation>Venditore</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="149"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="276"/>
+        <source>Dive computer</source>
+        <translation>Computer subacqueo</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/>
         <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="52"/>
         <location filename="../build/ui_downloadfromdivecomputer.h" line="277"/>
@@ -3620,18 +3716,6 @@ p, li { white-space: pre-wrap; }
         <translation>Download</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="284"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="281"/>
-        <source>OK</source>
-        <translation>OK</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="291"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="282"/>
-        <source>Cancel</source>
-        <translation>Annulla</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="226"/>
         <location filename="../build/ui_downloadfromdivecomputer.h" line="278"/>
         <source>Downloaded dives</source>
@@ -3650,22 +3734,16 @@ p, li { white-space: pre-wrap; }
         <translation>Deseleziona tutto</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="94"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="271"/>
-        <source>Save libdivecomputer logfile</source>
-        <translation>Salva il file di log di libdivecomputer</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="108"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="273"/>
-        <source>Save libdivecomputer dumpfile</source>
-        <translation>Salva il file di dump di libdivecomputer</translation>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="284"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="281"/>
+        <source>OK</source>
+        <translation>OK</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="87"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="270"/>
-        <source>Download into new trip</source>
-        <translation>Scarica in un nuovo viaggio</translation>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="291"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="282"/>
+        <source>Cancel</source>
+        <translation>Annulla</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="16"/>
@@ -3755,12 +3833,12 @@ p, li { white-space: pre-wrap; }
         <translation>Testo della connessione a Facebook</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="297"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="242"/>
         <source>To disconnect Subsurface from your Facebook account, use the button below</source>
         <translation>Per disconnettere Subsurface dal tuo account Facebook, usa il bottone in basso</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="306"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="251"/>
         <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source>
         <translation>Per connetterti a Facebook, per favere inserisci le tue credenziali. Questo permette a Subsurface di pubblicare le immersioni sulla tua bacheca</translation>
     </message>
@@ -3768,22 +3846,22 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>FacebookManager</name>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="266"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="211"/>
         <source>Photo upload sucessfull</source>
         <translation>Caricamento delle foto eseguito con successo</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="267"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="212"/>
         <source>Your dive profile was updated to Facebook.</source>
         <translation>Il profilo della tua immersione è stato aggiornato su Facebook.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="271"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="216"/>
         <source>Photo upload failed</source>
         <translation>Upload delle foto fallito</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="272"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="217"/>
         <source>Your dive profile was not updated to Facebook, 
  please send the following to the developer. 
 </source>
@@ -3845,17 +3923,25 @@ invia il testo che segue ai programmatori.
 <context>
     <name>FirmwareUpdateThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1750"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1739"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Questa funzionalità non è ancora disponibile per il computer selezionato.</translation>
     </message>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1755"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1744"/>
         <source>Firmware update failed!</source>
         <translation>Aggiornamento del firmware fallito!</translation>
     </message>
 </context>
 <context>
+    <name>GlobalDrawer</name>
+    <message>
+        <location filename="../mobile-widgets/qml/kirigami/src/controls/GlobalDrawer.qml" line="364"/>
+        <source>Back</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>GlobeGPS</name>
     <message>
         <location filename="../desktop-widgets/globe.cpp" line="124"/>
@@ -3871,27 +3957,27 @@ invia il testo che segue ai programmatori.
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="40"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="32"/>
         <source>Date: </source>
         <translation>Data:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="50"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="42"/>
         <source>Name: </source>
         <translation>Nome:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="60"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="52"/>
         <source>Latitude: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="69"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="61"/>
         <source>Longitude: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="113"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="105"/>
         <source>List of stored GPS fixes</source>
         <translation type="unfinished"/>
     </message>
@@ -3920,7 +4006,7 @@ invia il testo che segue ai programmatori.
 <context>
     <name>LocationFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="648"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="646"/>
         <source>Location: </source>
         <translation>Luogo:</translation>
     </message>
@@ -3961,7 +4047,7 @@ invia il testo che segue ai programmatori.
 <context>
     <name>LocationFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="299"/>
+        <location filename="../qt-models/filtermodels.cpp" line="304"/>
         <source>No location set</source>
         <translation>Nessun luogo impostato</translation>
     </message>
@@ -4085,6 +4171,54 @@ Sei sicuro di voler continuare?</translation>
 <context>
     <name>MainTab</name>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="18"/>
+        <location filename="../desktop-widgets/maintab.ui" line="439"/>
+        <location filename="../build/ui_maintab.h" line="961"/>
+        <location filename="../build/ui_maintab.h" line="963"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="539"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="571"/>
+        <source>Notes</source>
+        <translation>Note</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="21"/>
+        <location filename="../build/ui_maintab.h" line="964"/>
+        <source>General notes about the current selection</source>
+        <translation>Note generali sulla selezione corrente</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="92"/>
+        <location filename="../desktop-widgets/maintab.ui" line="646"/>
+        <location filename="../build/ui_maintab.h" line="947"/>
+        <location filename="../build/ui_maintab.h" line="967"/>
+        <source>Date</source>
+        <translation>Data</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="102"/>
+        <location filename="../build/ui_maintab.h" line="948"/>
+        <source>Time</source>
+        <translation>Ora</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="112"/>
+        <location filename="../desktop-widgets/maintab.ui" line="836"/>
+        <location filename="../build/ui_maintab.h" line="949"/>
+        <location filename="../build/ui_maintab.h" line="987"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="306"/>
+        <source>Air temp.</source>
+        <translation>Temperatura atmosferica</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="122"/>
+        <location filename="../desktop-widgets/maintab.ui" line="855"/>
+        <location filename="../build/ui_maintab.h" line="950"/>
+        <location filename="../build/ui_maintab.h" line="989"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="307"/>
+        <source>Water temp.</source>
+        <translation>Temperatura dell&apos;acqua</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="184"/>
         <location filename="../build/ui_maintab.h" line="951"/>
         <location filename="../desktop-widgets/maintab.cpp" line="570"/>
@@ -4092,6 +4226,17 @@ Sei sicuro di voler continuare?</translation>
         <translation>Luogo</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="214"/>
+        <source>Edit dive site</source>
+        <translation>Modifica il luogo di immersione</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="217"/>
+        <location filename="../build/ui_maintab.h" line="953"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="252"/>
         <location filename="../build/ui_maintab.h" line="954"/>
         <source>Divemaster</source>
@@ -4104,12 +4249,6 @@ Sei sicuro di voler continuare?</translation>
         <translation>Compagno</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.ui" line="387"/>
-        <location filename="../build/ui_maintab.h" line="959"/>
-        <source>Tags</source>
-        <translation>Tags</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/maintab.ui" line="308"/>
         <location filename="../build/ui_maintab.h" line="956"/>
         <source>Rating</source>
@@ -4128,57 +4267,18 @@ Sei sicuro di voler continuare?</translation>
         <translation>Muta</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="387"/>
+        <location filename="../build/ui_maintab.h" line="959"/>
+        <source>Tags</source>
+        <translation>Tags</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="397"/>
         <location filename="../build/ui_maintab.h" line="960"/>
         <source>Dive mode</source>
         <translation>Modalità immersione</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.ui" line="112"/>
-        <location filename="../desktop-widgets/maintab.ui" line="836"/>
-        <location filename="../build/ui_maintab.h" line="949"/>
-        <location filename="../build/ui_maintab.h" line="987"/>
-        <location filename="../desktop-widgets/maintab.cpp" line="306"/>
-        <source>Air temp.</source>
-        <translation>Temperatura atmosferica</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="122"/>
-        <location filename="../desktop-widgets/maintab.ui" line="855"/>
-        <location filename="../build/ui_maintab.h" line="950"/>
-        <location filename="../build/ui_maintab.h" line="989"/>
-        <location filename="../desktop-widgets/maintab.cpp" line="307"/>
-        <source>Water temp.</source>
-        <translation>Temperatura dell&apos;acqua</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="18"/>
-        <location filename="../desktop-widgets/maintab.ui" line="439"/>
-        <location filename="../build/ui_maintab.h" line="961"/>
-        <location filename="../build/ui_maintab.h" line="963"/>
-        <location filename="../desktop-widgets/maintab.cpp" line="539"/>
-        <location filename="../desktop-widgets/maintab.cpp" line="571"/>
-        <source>Notes</source>
-        <translation>Note</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="21"/>
-        <location filename="../build/ui_maintab.h" line="964"/>
-        <source>General notes about the current selection</source>
-        <translation>Note generali sulla selezione corrente</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="214"/>
-        <source>Edit dive site</source>
-        <translation>Modifica il luogo di immersione</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="217"/>
-        <location filename="../build/ui_maintab.h" line="953"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/maintab.ui" line="491"/>
         <location filename="../build/ui_maintab.h" line="965"/>
         <source>Equipment</source>
@@ -4203,6 +4303,12 @@ Sei sicuro di voler continuare?</translation>
         <translation>informazioni dell&apos;immersione</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="665"/>
+        <location filename="../build/ui_maintab.h" line="969"/>
+        <source>Interval</source>
+        <translation>Intervallo</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="684"/>
         <location filename="../build/ui_maintab.h" line="971"/>
         <source>Gases used</source>
@@ -4215,18 +4321,38 @@ Sei sicuro di voler continuare?</translation>
         <translation>Gas consumati</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="722"/>
+        <location filename="../desktop-widgets/maintab.ui" line="1094"/>
+        <location filename="../build/ui_maintab.h" line="975"/>
+        <location filename="../build/ui_maintab.h" line="1003"/>
+        <source>SAC</source>
+        <translation>CAS</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="741"/>
         <location filename="../build/ui_maintab.h" line="977"/>
         <source>CNS</source>
         <translation>CNS</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="760"/>
+        <location filename="../build/ui_maintab.h" line="979"/>
+        <source>OTU</source>
+        <translation>OTU</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="779"/>
         <location filename="../build/ui_maintab.h" line="981"/>
         <source>Max. depth</source>
         <translation>Profondità massima</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="798"/>
+        <location filename="../build/ui_maintab.h" line="983"/>
+        <source>Avg. depth</source>
+        <translation>Profondità media</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="817"/>
         <location filename="../build/ui_maintab.h" line="985"/>
         <source>Air pressure</source>
@@ -4239,82 +4365,6 @@ Sei sicuro di voler continuare?</translation>
         <translation>Tempo di immersione</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.ui" line="933"/>
-        <location filename="../build/ui_maintab.h" line="1007"/>
-        <source>Simple statistics about the selection</source>
-        <translation>Statistiche semplici sulla selezione corrente</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1039"/>
-        <location filename="../build/ui_maintab.h" line="999"/>
-        <source>Total time</source>
-        <translation>Tempo totale</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1106"/>
-        <location filename="../build/ui_maintab.h" line="1004"/>
-        <source>Gas consumption</source>
-        <translation>Consumo gas </translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1151"/>
-        <location filename="../build/ui_maintab.h" line="1009"/>
-        <source>All photos from the current selection</source>
-        <translation>Tutte l foto della selezione corrente</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1177"/>
-        <location filename="../build/ui_maintab.h" line="1010"/>
-        <source>Extra data</source>
-        <translation>Dati extra</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1180"/>
-        <location filename="../build/ui_maintab.h" line="1011"/>
-        <source>Adittional data from the dive computer</source>
-        <translation>Dati aggiuntivi dal computer subacqueo</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="92"/>
-        <location filename="../desktop-widgets/maintab.ui" line="646"/>
-        <location filename="../build/ui_maintab.h" line="947"/>
-        <location filename="../build/ui_maintab.h" line="967"/>
-        <source>Date</source>
-        <translation>Data</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="102"/>
-        <location filename="../build/ui_maintab.h" line="948"/>
-        <source>Time</source>
-        <translation>Ora</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="665"/>
-        <location filename="../build/ui_maintab.h" line="969"/>
-        <source>Interval</source>
-        <translation>Intervallo</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="722"/>
-        <location filename="../desktop-widgets/maintab.ui" line="1094"/>
-        <location filename="../build/ui_maintab.h" line="975"/>
-        <location filename="../build/ui_maintab.h" line="1003"/>
-        <source>SAC</source>
-        <translation>CAS</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="798"/>
-        <location filename="../build/ui_maintab.h" line="983"/>
-        <source>Avg. depth</source>
-        <translation>Profondità media</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="760"/>
-        <location filename="../build/ui_maintab.h" line="979"/>
-        <source>OTU</source>
-        <translation>OTU</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/maintab.ui" line="893"/>
         <location filename="../build/ui_maintab.h" line="993"/>
         <source>Salinity</source>
@@ -4327,22 +4377,34 @@ Sei sicuro di voler continuare?</translation>
         <translation>Statistiche</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="933"/>
+        <location filename="../build/ui_maintab.h" line="1007"/>
+        <source>Simple statistics about the selection</source>
+        <translation>Statistiche semplici sulla selezione corrente</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="986"/>
         <location filename="../build/ui_maintab.h" line="996"/>
         <source>Depth</source>
         <translation>Profondità</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="998"/>
+        <location filename="../build/ui_maintab.h" line="997"/>
+        <source>Duration</source>
+        <translation>Durata</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="1027"/>
         <location filename="../build/ui_maintab.h" line="998"/>
         <source>Temperature</source>
         <translation>Temperatura</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.ui" line="998"/>
-        <location filename="../build/ui_maintab.h" line="997"/>
-        <source>Duration</source>
-        <translation>Durata</translation>
+        <location filename="../desktop-widgets/maintab.ui" line="1039"/>
+        <location filename="../build/ui_maintab.h" line="999"/>
+        <source>Total time</source>
+        <translation>Tempo totale</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/maintab.ui" line="1058"/>
@@ -4351,20 +4413,34 @@ Sei sicuro di voler continuare?</translation>
         <translation>Immersioni</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="1106"/>
+        <location filename="../build/ui_maintab.h" line="1004"/>
+        <source>Gas consumption</source>
+        <translation>Consumo gas </translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="1148"/>
         <location filename="../build/ui_maintab.h" line="1008"/>
         <source>Photos</source>
         <translation>Foto</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.cpp" line="88"/>
-        <source>Cylinders</source>
-        <translation>Bombole</translation>
+        <location filename="../desktop-widgets/maintab.ui" line="1151"/>
+        <location filename="../build/ui_maintab.h" line="1009"/>
+        <source>All photos from the current selection</source>
+        <translation>Tutte l foto della selezione corrente</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.cpp" line="92"/>
-        <source>Weights</source>
-        <translation>Pesi</translation>
+        <location filename="../desktop-widgets/maintab.ui" line="1177"/>
+        <location filename="../build/ui_maintab.h" line="1010"/>
+        <source>Extra data</source>
+        <translation>Dati extra</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="1180"/>
+        <location filename="../build/ui_maintab.h" line="1011"/>
+        <source>Adittional data from the dive computer</source>
+        <translation>Dati aggiuntivi dal computer subacqueo</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/maintab.cpp" line="63"/>
@@ -4377,11 +4453,21 @@ Sei sicuro di voler continuare?</translation>
         <translation>Elimina le modifiche</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.cpp" line="88"/>
+        <source>Cylinders</source>
+        <translation>Bombole</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.cpp" line="89"/>
         <source>Add cylinder</source>
         <translation>Aggiungi bombola</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.cpp" line="92"/>
+        <source>Weights</source>
+        <translation>Pesi</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.cpp" line="93"/>
         <source>Add weight system</source>
         <translation>Aggiungi la tipologia della pesata</translation>
@@ -4574,659 +4660,685 @@ mixati con aria e usando:
         <translation>&amp;File</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="455"/>
-        <location filename="../build/ui_mainwindow.h" line="534"/>
-        <source>Export dive logs</source>
-        <translation>Esporta il libretto di immersioni</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="510"/>
-        <location filename="../build/ui_mainwindow.h" line="542"/>
-        <source>Toggle pHe graph</source>
-        <translation>Visualizza il grafico pHe</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="546"/>
-        <location filename="../build/ui_mainwindow.h" line="545"/>
-        <source>Toggle calculating all tissues</source>
-        <translation>Attiva/disattiva il calcolo su tutti i tessuti</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="522"/>
-        <location filename="../build/ui_mainwindow.h" line="543"/>
-        <source>Toggle DC reported ceiling</source>
-        <translation>Visualizza il ceiling calcolato dal computer subacqueo</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="534"/>
-        <location filename="../build/ui_mainwindow.h" line="544"/>
-        <source>Toggle calculated ceiling</source>
-        <translation>Visualizza il ceiling calcolato</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="606"/>
-        <location filename="../build/ui_mainwindow.h" line="550"/>
-        <source>Toggle NDL, TTS</source>
-        <translation>Visualizza NDL, TTS</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="558"/>
-        <location filename="../build/ui_mainwindow.h" line="546"/>
-        <source>Toggle calculated ceiling with 3m increments</source>
-        <translation>Visualizza il ceiling calcolato con incrementi di 3m</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="463"/>
-        <location filename="../build/ui_mainwindow.h" line="537"/>
-        <source>Configure &amp;dive computer</source>
-        <translation>Configura &amp;Computer subacqueo</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="570"/>
-        <location filename="../build/ui_mainwindow.h" line="547"/>
-        <source>Toggle heart rate</source>
-        <translation>Visualizza il battito cardiaco</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="582"/>
-        <location filename="../build/ui_mainwindow.h" line="548"/>
-        <source>Toggle MOD</source>
-        <translation>Visualizza la MOD</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="594"/>
-        <location filename="../build/ui_mainwindow.h" line="549"/>
-        <source>Toggle EAD, END, EADD</source>
-        <translation>Visualizza EAD, END, EADD</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="618"/>
-        <location filename="../build/ui_mainwindow.h" line="551"/>
-        <source>Toggle SAC rate</source>
-        <translation>Visualizza il CAS</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="630"/>
-        <location filename="../build/ui_mainwindow.h" line="552"/>
-        <source>Toggle ruler</source>
-        <translation>Visualizza il righello</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="86"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="87"/>
         <location filename="../build/ui_mainwindow.h" line="569"/>
         <source>&amp;Log</source>
         <translation>&amp;Log</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="105"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="104"/>
         <location filename="../build/ui_mainwindow.h" line="570"/>
         <source>&amp;View</source>
         <translation>&amp;Vista</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="121"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="120"/>
         <location filename="../build/ui_mainwindow.h" line="571"/>
         <source>&amp;Help</source>
         <translation>&amp;Aiuto</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="130"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="129"/>
         <location filename="../build/ui_mainwindow.h" line="572"/>
         <source>&amp;Import</source>
         <translation>&amp;Importa</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="139"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="138"/>
         <location filename="../build/ui_mainwindow.h" line="573"/>
         <source>&amp;Edit</source>
         <translation>&amp;Modifica</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="144"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="143"/>
         <source>Share on</source>
         <translation>Condividi su</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="158"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="157"/>
         <location filename="../build/ui_mainwindow.h" line="453"/>
         <source>&amp;New logbook</source>
         <translation>&amp;Nuovo logbook</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="161"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="160"/>
         <location filename="../build/ui_mainwindow.h" line="455"/>
         <source>New</source>
         <translation>Nuovo</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="164"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="163"/>
         <location filename="../build/ui_mainwindow.h" line="457"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="169"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="168"/>
         <location filename="../build/ui_mainwindow.h" line="458"/>
         <source>&amp;Open logbook</source>
         <translation>&amp;Apri logbook</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="172"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="171"/>
         <location filename="../build/ui_mainwindow.h" line="460"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="508"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="502"/>
         <source>Open</source>
         <translation>Apri</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="175"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="174"/>
         <location filename="../build/ui_mainwindow.h" line="462"/>
         <source>Ctrl+O</source>
         <translation>Ctrl-O</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="180"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="179"/>
         <location filename="../build/ui_mainwindow.h" line="463"/>
         <source>&amp;Save</source>
         <translation>&amp;Salva</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="183"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="182"/>
         <location filename="../build/ui_mainwindow.h" line="465"/>
         <source>Save</source>
         <translation>Salva</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="186"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="185"/>
         <location filename="../build/ui_mainwindow.h" line="467"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="191"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="190"/>
         <location filename="../build/ui_mainwindow.h" line="468"/>
         <source>Sa&amp;ve as</source>
         <translation>Sal&amp;va come</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="194"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="193"/>
         <location filename="../build/ui_mainwindow.h" line="470"/>
         <source>Save as</source>
         <translation>Salva come</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="197"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="196"/>
         <location filename="../build/ui_mainwindow.h" line="472"/>
         <source>Ctrl+Shift+S</source>
         <translation>Ctrl+Shift+S</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="202"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="201"/>
         <location filename="../build/ui_mainwindow.h" line="473"/>
         <source>&amp;Close</source>
         <translation>&amp;Chiudi</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="205"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="204"/>
         <location filename="../build/ui_mainwindow.h" line="475"/>
         <source>Close</source>
         <translation>Chiudi</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="208"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="207"/>
         <location filename="../build/ui_mainwindow.h" line="477"/>
         <source>Ctrl+W</source>
         <translation>Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="221"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="212"/>
+        <location filename="../build/ui_mainwindow.h" line="478"/>
+        <source>&amp;Print</source>
+        <translation>&amp;Stampa</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="215"/>
+        <location filename="../build/ui_mainwindow.h" line="479"/>
+        <source>Ctrl+P</source>
+        <translation>Ctrl+P</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="220"/>
         <location filename="../build/ui_mainwindow.h" line="480"/>
         <source>P&amp;references</source>
         <translation>P&amp;referenze</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="251"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="223"/>
+        <location filename="../build/ui_mainwindow.h" line="481"/>
+        <source>Ctrl+,</source>
+        <translation>Ctrl+,</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="231"/>
+        <location filename="../build/ui_mainwindow.h" line="482"/>
+        <source>&amp;Quit</source>
+        <translation>&amp;Esci</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="234"/>
+        <location filename="../build/ui_mainwindow.h" line="483"/>
+        <source>Ctrl+Q</source>
+        <translation>Ctrl+Q</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="242"/>
+        <location filename="../build/ui_mainwindow.h" line="484"/>
+        <source>Import from &amp;dive computer</source>
+        <translation>Importa &amp;dal computer</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="245"/>
+        <location filename="../build/ui_mainwindow.h" line="485"/>
+        <source>Ctrl+D</source>
+        <translation>Ctrl+D</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="250"/>
         <location filename="../build/ui_mainwindow.h" line="486"/>
         <source>Import &amp;GPS data from Subsurface web service</source>
         <translation>Importa dati &amp;GPS dal web service Subsurface</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="259"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="253"/>
+        <location filename="../build/ui_mainwindow.h" line="487"/>
+        <source>Ctrl+G</source>
+        <translation>Ctrl+G</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="258"/>
         <location filename="../build/ui_mainwindow.h" line="488"/>
         <source>Edit device &amp;names</source>
         <translation>Modifica &amp;nomi del dispositivo</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="272"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="263"/>
+        <location filename="../build/ui_mainwindow.h" line="489"/>
+        <source>&amp;Add dive</source>
+        <translation>&amp;Aggiungi immersione</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="266"/>
+        <location filename="../build/ui_mainwindow.h" line="490"/>
+        <source>Ctrl++</source>
+        <translation>Ctrl++</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="271"/>
         <location filename="../build/ui_mainwindow.h" line="491"/>
         <source>&amp;Edit dive</source>
         <translation>&amp;Modifica immersione</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="277"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="276"/>
         <location filename="../build/ui_mainwindow.h" line="492"/>
         <source>&amp;Copy dive components</source>
         <translation>&amp;Copia dettagli immersione</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="280"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="279"/>
         <location filename="../build/ui_mainwindow.h" line="493"/>
         <source>Ctrl+C</source>
         <translation>Ctrl+C</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="285"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="284"/>
         <location filename="../build/ui_mainwindow.h" line="494"/>
         <source>&amp;Paste dive components</source>
         <translation>&amp;Incolla dettagli immersione</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="288"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="287"/>
         <location filename="../build/ui_mainwindow.h" line="495"/>
         <source>Ctrl+V</source>
         <translation>Ctrl+V</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="325"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="292"/>
+        <location filename="../build/ui_mainwindow.h" line="496"/>
+        <source>&amp;Renumber</source>
+        <translation>&amp;Rinumera</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="295"/>
+        <location filename="../build/ui_mainwindow.h" line="497"/>
+        <source>Ctrl+R</source>
+        <translation>Ctrl+R</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="303"/>
+        <location filename="../build/ui_mainwindow.h" line="498"/>
+        <source>Auto &amp;group</source>
+        <translation>Raggruppamento Automatico</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="308"/>
+        <location filename="../build/ui_mainwindow.h" line="499"/>
+        <source>&amp;Yearly statistics</source>
+        <translation>&amp;Statistiche Annuali</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="311"/>
+        <location filename="../build/ui_mainwindow.h" line="500"/>
+        <source>Ctrl+Y</source>
+        <translation>Ctrl+Y</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="316"/>
+        <location filename="../build/ui_mainwindow.h" line="501"/>
+        <source>&amp;Dive list</source>
+        <translation>Lista immersioni</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="319"/>
+        <location filename="../build/ui_mainwindow.h" line="502"/>
+        <source>Ctrl+2</source>
+        <translation>Ctrl+2</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="324"/>
         <location filename="../build/ui_mainwindow.h" line="503"/>
         <source>&amp;Profile</source>
         <translation>&amp;Profilo</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="333"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="327"/>
+        <location filename="../build/ui_mainwindow.h" line="504"/>
+        <source>Ctrl+3</source>
+        <translation>Ctrl+3</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="332"/>
         <location filename="../build/ui_mainwindow.h" line="505"/>
         <source>&amp;Info</source>
         <translation>&amp;Info</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="341"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="335"/>
+        <location filename="../build/ui_mainwindow.h" line="506"/>
+        <source>Ctrl+4</source>
+        <translation>Ctrl+4</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="340"/>
         <location filename="../build/ui_mainwindow.h" line="507"/>
         <source>&amp;All</source>
         <translation>&amp;Tutti</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="357"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="343"/>
+        <location filename="../build/ui_mainwindow.h" line="508"/>
+        <source>Ctrl+1</source>
+        <translation>Ctrl+1</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="348"/>
+        <location filename="../build/ui_mainwindow.h" line="509"/>
+        <source>P&amp;revious DC</source>
+        <translation>Computer precedente</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="351"/>
+        <location filename="../build/ui_mainwindow.h" line="510"/>
+        <source>Left</source>
+        <translation>Sinistra</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="356"/>
         <location filename="../build/ui_mainwindow.h" line="511"/>
         <source>&amp;Next DC</source>
         <translation>&amp;Prossimo computer</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="365"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="359"/>
+        <location filename="../build/ui_mainwindow.h" line="512"/>
+        <source>Right</source>
+        <translation>Destra</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="364"/>
         <location filename="../build/ui_mainwindow.h" line="513"/>
         <source>&amp;About Subsurface</source>
         <translation>Informazioni su &amp;Subsurface</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="381"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="372"/>
+        <location filename="../build/ui_mainwindow.h" line="514"/>
+        <source>User &amp;manual</source>
+        <translation>&amp;Manuale utente</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="375"/>
+        <location filename="../build/ui_mainwindow.h" line="515"/>
+        <source>F1</source>
+        <translation>F1</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="380"/>
         <location filename="../build/ui_mainwindow.h" line="516"/>
         <source>&amp;Globe</source>
         <translation>&amp;Globo</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="403"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="383"/>
+        <location filename="../build/ui_mainwindow.h" line="517"/>
+        <source>Ctrl+5</source>
+        <translation>Ctrl+5</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="388"/>
+        <location filename="../build/ui_mainwindow.h" line="518"/>
+        <source>P&amp;lan dive</source>
+        <translation>Pianifica immersione</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="391"/>
+        <location filename="../build/ui_mainwindow.h" line="519"/>
+        <source>Ctrl+L</source>
+        <translation>Ctrl+L</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="396"/>
+        <location filename="../build/ui_mainwindow.h" line="520"/>
+        <source>&amp;Import log files</source>
+        <translation>&amp;Importa logbook da file</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="399"/>
+        <location filename="../build/ui_mainwindow.h" line="522"/>
+        <source>Import divelog files from other applications</source>
+        <translation>Importa log delle immersioni da altra applicazioni</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="402"/>
         <location filename="../build/ui_mainwindow.h" line="524"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="408"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="407"/>
         <location filename="../build/ui_mainwindow.h" line="525"/>
         <source>Import &amp;from divelogs.de</source>
         <translation>Importa da Divelogs.de</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="416"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="415"/>
         <location filename="../build/ui_mainwindow.h" line="526"/>
         <source>&amp;Full screen</source>
         <translation>&amp;Tutto Schermo</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="419"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="418"/>
         <location filename="../build/ui_mainwindow.h" line="528"/>
         <source>Toggle full screen</source>
         <translation>Abilita Modalità Tutto Schermo</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="447"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="421"/>
+        <location filename="../build/ui_mainwindow.h" line="530"/>
+        <source>F11</source>
+        <translation>F11</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="446"/>
         <location filename="../build/ui_mainwindow.h" line="531"/>
         <source>&amp;Check for updates</source>
         <translation>&amp;Controlla aggiornamenti</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="452"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="451"/>
         <location filename="../build/ui_mainwindow.h" line="532"/>
         <source>&amp;Export</source>
         <translation>&amp;Esporta</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="458"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="454"/>
+        <location filename="../build/ui_mainwindow.h" line="534"/>
+        <source>Export dive logs</source>
+        <translation>Esporta il libretto di immersioni</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="457"/>
         <location filename="../build/ui_mainwindow.h" line="536"/>
         <source>Ctrl+E</source>
         <translation>Ctrl+E</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="466"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="462"/>
+        <location filename="../build/ui_mainwindow.h" line="537"/>
+        <source>Configure &amp;dive computer</source>
+        <translation>Configura &amp;Computer subacqueo</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="465"/>
         <location filename="../build/ui_mainwindow.h" line="538"/>
         <source>Ctrl+Shift+C</source>
         <translation>Ctrl+Shift+C</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="474"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="473"/>
         <location filename="../build/ui_mainwindow.h" line="539"/>
         <source>Edit &amp;dive in planner</source>
         <translation>Modifica &amp;immersione nel pianificatore</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="486"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="485"/>
         <location filename="../build/ui_mainwindow.h" line="540"/>
         <source>Toggle pO₂ graph</source>
         <translation>Visualizza il grafico della  pO₂</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="498"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="497"/>
         <location filename="../build/ui_mainwindow.h" line="541"/>
         <source>Toggle pN₂ graph</source>
         <translation>Visualizza il grafico della pN₂</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="642"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="509"/>
+        <location filename="../build/ui_mainwindow.h" line="542"/>
+        <source>Toggle pHe graph</source>
+        <translation>Visualizza il grafico pHe</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="521"/>
+        <location filename="../build/ui_mainwindow.h" line="543"/>
+        <source>Toggle DC reported ceiling</source>
+        <translation>Visualizza il ceiling calcolato dal computer subacqueo</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="533"/>
+        <location filename="../build/ui_mainwindow.h" line="544"/>
+        <source>Toggle calculated ceiling</source>
+        <translation>Visualizza il ceiling calcolato</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="545"/>
+        <location filename="../build/ui_mainwindow.h" line="545"/>
+        <source>Toggle calculating all tissues</source>
+        <translation>Attiva/disattiva il calcolo su tutti i tessuti</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="557"/>
+        <location filename="../build/ui_mainwindow.h" line="546"/>
+        <source>Toggle calculated ceiling with 3m increments</source>
+        <translation>Visualizza il ceiling calcolato con incrementi di 3m</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="569"/>
+        <location filename="../build/ui_mainwindow.h" line="547"/>
+        <source>Toggle heart rate</source>
+        <translation>Visualizza il battito cardiaco</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="581"/>
+        <location filename="../build/ui_mainwindow.h" line="548"/>
+        <source>Toggle MOD</source>
+        <translation>Visualizza la MOD</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="593"/>
+        <location filename="../build/ui_mainwindow.h" line="549"/>
+        <source>Toggle EAD, END, EADD</source>
+        <translation>Visualizza EAD, END, EADD</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="605"/>
+        <location filename="../build/ui_mainwindow.h" line="550"/>
+        <source>Toggle NDL, TTS</source>
+        <translation>Visualizza NDL, TTS</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="617"/>
+        <location filename="../build/ui_mainwindow.h" line="551"/>
+        <source>Toggle SAC rate</source>
+        <translation>Visualizza il CAS</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="629"/>
+        <location filename="../build/ui_mainwindow.h" line="552"/>
+        <source>Toggle ruler</source>
+        <translation>Visualizza il righello</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="641"/>
         <location filename="../build/ui_mainwindow.h" line="553"/>
         <source>Scale graph</source>
         <translation>Scala grafico</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="654"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="653"/>
         <location filename="../build/ui_mainwindow.h" line="554"/>
         <source>Toggle pictures</source>
         <translation>Visualizza immagini</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="666"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="665"/>
         <location filename="../build/ui_mainwindow.h" line="555"/>
         <source>Toggle tank bar</source>
         <translation>Visualizza barra delle bombole</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="674"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="673"/>
         <location filename="../build/ui_mainwindow.h" line="556"/>
         <source>&amp;Filter divelist</source>
         <translation>&amp;Filtra la lista delle immersioni</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="689"/>
-        <location filename="../build/ui_mainwindow.h" line="558"/>
-        <source>Toggle tissue graph</source>
-        <translation>Visualizza il grafico dei tessuti</translation>
+        <location filename="../desktop-widgets/mainwindow.ui" line="676"/>
+        <location filename="../build/ui_mainwindow.h" line="557"/>
+        <source>Ctrl+F</source>
+        <translation>Ctrl+F</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="694"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="688"/>
+        <source>Toggle tissue heat-map</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="693"/>
         <location filename="../build/ui_mainwindow.h" line="559"/>
         <source>User &amp;survey</source>
         <translation>&amp;Sondaggio</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="699"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="698"/>
         <location filename="../build/ui_mainwindow.h" line="560"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="238"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="231"/>
         <source>&amp;Undo</source>
         <translation>&amp;Annulla</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="702"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="701"/>
         <location filename="../build/ui_mainwindow.h" line="561"/>
         <source>Ctrl+Z</source>
         <translation>Ctrl+Z</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="707"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="706"/>
         <location filename="../build/ui_mainwindow.h" line="562"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="239"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="232"/>
         <source>&amp;Redo</source>
         <translation>&amp;Ripeti</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="710"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="709"/>
         <location filename="../build/ui_mainwindow.h" line="563"/>
         <source>Ctrl+Shift+Z</source>
         <translation>Ctrl+Shift+Z</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="715"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="714"/>
         <location filename="../build/ui_mainwindow.h" line="564"/>
         <source>&amp;Find moved images</source>
         <translation>&amp;Trova immagini spostate</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="720"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="719"/>
         <source>Open c&amp;loud storage</source>
         <translation>Apri memoria c&amp;loud </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="725"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="724"/>
         <source>Save to clo&amp;ud storage</source>
         <translation>Salva nella memoria clo&amp;ud</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="730"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="729"/>
         <location filename="../build/ui_mainwindow.h" line="567"/>
         <source>&amp;Manage dive sites</source>
         <translation>&amp;Gestisti i siti di immersione</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="735"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="734"/>
         <source>Dive Site &amp;Edit</source>
         <translation>&amp;Modifica il sito di immersione</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="740"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="739"/>
         <source>Facebook</source>
         <translation>Facebook</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="745"/>
-        <source>Add GPS location here</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="744"/>
+        <source>Take cloud storage online</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="677"/>
-        <location filename="../build/ui_mainwindow.h" line="557"/>
-        <source>Ctrl+F</source>
-        <translation>Ctrl+F</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="213"/>
-        <location filename="../build/ui_mainwindow.h" line="478"/>
-        <source>&amp;Print</source>
-        <translation>&amp;Stampa</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="224"/>
-        <location filename="../build/ui_mainwindow.h" line="481"/>
-        <source>Ctrl+,</source>
-        <translation>Ctrl+,</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="232"/>
-        <location filename="../build/ui_mainwindow.h" line="482"/>
-        <source>&amp;Quit</source>
-        <translation>&amp;Esci</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="243"/>
-        <location filename="../build/ui_mainwindow.h" line="484"/>
-        <source>Import from &amp;dive computer</source>
-        <translation>Importa &amp;dal computer</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="254"/>
-        <location filename="../build/ui_mainwindow.h" line="487"/>
-        <source>Ctrl+G</source>
-        <translation>Ctrl+G</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="267"/>
-        <location filename="../build/ui_mainwindow.h" line="490"/>
-        <source>Ctrl++</source>
-        <translation>Ctrl++</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="293"/>
-        <location filename="../build/ui_mainwindow.h" line="496"/>
-        <source>&amp;Renumber</source>
-        <translation>&amp;Rinumera</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="296"/>
-        <location filename="../build/ui_mainwindow.h" line="497"/>
-        <source>Ctrl+R</source>
-        <translation>Ctrl+R</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="312"/>
-        <location filename="../build/ui_mainwindow.h" line="500"/>
-        <source>Ctrl+Y</source>
-        <translation>Ctrl+Y</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="392"/>
-        <location filename="../build/ui_mainwindow.h" line="519"/>
-        <source>Ctrl+L</source>
-        <translation>Ctrl+L</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="216"/>
-        <location filename="../build/ui_mainwindow.h" line="479"/>
-        <source>Ctrl+P</source>
-        <translation>Ctrl+P</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="235"/>
-        <location filename="../build/ui_mainwindow.h" line="483"/>
-        <source>Ctrl+Q</source>
-        <translation>Ctrl+Q</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="246"/>
-        <location filename="../build/ui_mainwindow.h" line="485"/>
-        <source>Ctrl+D</source>
-        <translation>Ctrl+D</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="264"/>
-        <location filename="../build/ui_mainwindow.h" line="489"/>
-        <source>&amp;Add dive</source>
-        <translation>&amp;Aggiungi immersione</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="304"/>
-        <location filename="../build/ui_mainwindow.h" line="498"/>
-        <source>Auto &amp;group</source>
-        <translation>Raggruppamento Automatico</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="309"/>
-        <location filename="../build/ui_mainwindow.h" line="499"/>
-        <source>&amp;Yearly statistics</source>
-        <translation>&amp;Statistiche Annuali</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="317"/>
-        <location filename="../build/ui_mainwindow.h" line="501"/>
-        <source>&amp;Dive list</source>
-        <translation>Lista immersioni</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="320"/>
-        <location filename="../build/ui_mainwindow.h" line="502"/>
-        <source>Ctrl+2</source>
-        <translation>Ctrl+2</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="328"/>
-        <location filename="../build/ui_mainwindow.h" line="504"/>
-        <source>Ctrl+3</source>
-        <translation>Ctrl+3</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="336"/>
-        <location filename="../build/ui_mainwindow.h" line="506"/>
-        <source>Ctrl+4</source>
-        <translation>Ctrl+4</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="344"/>
-        <location filename="../build/ui_mainwindow.h" line="508"/>
-        <source>Ctrl+1</source>
-        <translation>Ctrl+1</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="349"/>
-        <location filename="../build/ui_mainwindow.h" line="509"/>
-        <source>P&amp;revious DC</source>
-        <translation>Computer precedente</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="352"/>
-        <location filename="../build/ui_mainwindow.h" line="510"/>
-        <source>Left</source>
-        <translation>Sinistra</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="360"/>
-        <location filename="../build/ui_mainwindow.h" line="512"/>
-        <source>Right</source>
-        <translation>Destra</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="373"/>
-        <location filename="../build/ui_mainwindow.h" line="514"/>
-        <source>User &amp;manual</source>
-        <translation>&amp;Manuale utente</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="376"/>
-        <location filename="../build/ui_mainwindow.h" line="515"/>
-        <source>F1</source>
-        <translation>F1</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="384"/>
-        <location filename="../build/ui_mainwindow.h" line="517"/>
-        <source>Ctrl+5</source>
-        <translation>Ctrl+5</translation>
+        <location filename="../build/ui_mainwindow.h" line="558"/>
+        <source>Toggle tissue graph</source>
+        <translation>Visualizza il grafico dei tessuti</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="389"/>
-        <location filename="../build/ui_mainwindow.h" line="518"/>
-        <source>P&amp;lan dive</source>
-        <translation>Pianifica immersione</translation>
+        <location filename="../build/ui_mainwindow.h" line="565"/>
+        <source>Open cloud storage</source>
+        <translation>Apri la memoria cloud</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="397"/>
-        <location filename="../build/ui_mainwindow.h" line="520"/>
-        <source>&amp;Import log files</source>
-        <translation>&amp;Importa logbook da file</translation>
+        <location filename="../build/ui_mainwindow.h" line="566"/>
+        <source>Save to cloud storage</source>
+        <translation>Salva nella memoria cloud</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="400"/>
-        <location filename="../build/ui_mainwindow.h" line="522"/>
-        <source>Import divelog files from other applications</source>
-        <translation>Importa log delle immersioni da altra applicazioni</translation>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="331"/>
+        <source>Connect to</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="422"/>
-        <location filename="../build/ui_mainwindow.h" line="530"/>
-        <source>F11</source>
-        <translation>F11</translation>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="493"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="538"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1545"/>
+        <source>Please save or cancel the current dive edit before opening a new file.</source>
+        <translation>Per favore, salva o cancella le modifiche all&apos;immersione prima di aprire un nuovo file.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="505"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="499"/>
         <source>Open file</source>
         <translation>Apri file</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="509"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="503"/>
         <location filename="../desktop-widgets/mainwindow.cpp" line="614"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1972"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1978"/>
         <source>Cancel</source>
         <translation>Annulla</translation>
     </message>
@@ -5246,6 +5358,16 @@ mixati con aria e usando:
         <translation>Lettura delle immagine (può impiegarci parecchio)</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="649"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="796"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="977"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="983"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1849"/>
+        <source>Warning</source>
+        <translation>Avviso</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="674"/>
         <source>Please save or cancel the current dive edit before closing the file.</source>
         <translation>Per favore, salva o cancella le modifiche all&apos;immersione prima di chiudere il file.</translation>
@@ -5261,125 +5383,98 @@ mixati con aria e usando:
         <translation>Stampa la tabella con il runtime</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="982"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
+        <source>Trying to replan a dive that&apos;s not a planned dive.</source>
+        <translation>Si sta cercando di ripianificare una immersione che non è una immersione pianificata.</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="977"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1849"/>
+        <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>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="983"/>
         <source>Trying to edit a dive that&apos;s not a manually added dive.</source>
         <translation>Sto cercando di modificare una immersione che non è stata creata manualmente.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1243"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1030"/>
+        <source>Yearly statistics</source>
+        <translation>Statistiche Annuali</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1244"/>
         <source>Do you want to save the changes that you made in the file %1?</source>
         <translation>Vuoi salvare le modifiche fatte nel file %1?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1246"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1247"/>
         <source>Do you want to save the changes that you made in the data file?</source>
         <translation>Vuoi salvare le modifiche fatte nel file di dati?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1251"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1252"/>
         <source>Save changes?</source>
         <translation>Salvo le modifiche?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1587"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1253"/>
+        <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="../desktop-widgets/mainwindow.cpp" line="1572"/>
         <source>Save file as</source>
         <translation>Apri file come</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1682"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1573"/>
+        <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
+        <translation>File XML Subsurface (*.ssrf *.xml *.XML)</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1670"/>
+        <source>[local cache for] %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1672"/>
         <source>[cloud storage for] %1</source>
         <translation>[memoria cloud per] %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1782"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1788"/>
         <source>Opening datafile from older version</source>
         <translation>Apertura di un file di dati da una vecchia versione</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1783"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1789"/>
         <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly.
 Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source>
         <translation>Hai aperto un file di dati da una vecchia versione di Subsurface. Ti consigliamo di leggere il manuale per approfondire le modifiche apportate alla nuova versione, con particolare riguardo alla gestione dei siti di immersione che è cambiata in modo significativo.
 Subsurface ha già cercato di convertire i dati in maniera automatica ma sarebbe il caso di dare un&apos;occhiata alla gestione dei siti di immersione per controllare che tutto sia a posto.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1794"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1800"/>
         <source>Open dive log file</source>
         <translation>Apri file di log immersioni</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1795"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1801"/>
         <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1972"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1978"/>
         <source>Contacting cloud service...</source>
         <translation>Sto contattando il servizio cloud...</translation>
     </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1252"/>
-        <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="../desktop-widgets/mainwindow.cpp" line="649"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="796"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="976"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="982"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/>
-        <source>Warning</source>
-        <translation>Avviso</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="499"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="544"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1560"/>
-        <source>Please save or cancel the current dive edit before opening a new file.</source>
-        <translation>Per favore, salva o cancella le modifiche all&apos;immersione prima di aprire un nuovo file.</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="338"/>
-        <source>Connect to</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
-        <source>Trying to replan a dive that&apos;s not a planned dive.</source>
-        <translation>Si sta cercando di ripianificare una immersione che non è una immersione pianificata.</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1029"/>
-        <source>Yearly statistics</source>
-        <translation>Statistiche Annuali</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1588"/>
-        <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
-        <translation>File XML Subsurface (*.ssrf *.xml *.XML)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="976"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/>
-        <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>
-    <message>
-        <location filename="../build/ui_mainwindow.h" line="565"/>
-        <source>Open cloud storage</source>
-        <translation>Apri la memoria cloud</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_mainwindow.h" line="566"/>
-        <source>Save to cloud storage</source>
-        <translation>Salva nella memoria cloud</translation>
-    </message>
 </context>
 <context>
     <name>MultiFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="733"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="731"/>
         <source>Filter shows %1 (of %2) dives</source>
         <translation>I Filtri mostrano %1 (di %2) immersioni</translation>
     </message>
@@ -5387,12 +5482,12 @@ Subsurface ha già cercato di convertire i dati in maniera automatica ma sarebbe
 <context>
     <name>OstcFirmwareCheck</name>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="269"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="271"/>
         <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source>
         <translation>Dovresti aggiornare il firmware sul tuo computer: hai la versione %1 ma la versione stabile più recente è %2</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="273"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="275"/>
         <source>
 
 Please start Bluetooth on your OSTC Sport and do the same preparations as for a logbook download before continuing with the update</source>
@@ -5401,27 +5496,27 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 Avvia il Bluetooth sul tuo OSTC Sport e, prima di continuare con l&apos;aggiornamento, esegui le stesse operazioni che fai per scaricare il logbook</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="274"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="276"/>
         <source>Not now</source>
         <translation>Non adesso</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="275"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="277"/>
         <source>Update firmware</source>
         <translation>Aggiorna il firmware</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="277"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="279"/>
         <source>Firmware upgrade notice</source>
         <translation>Avviso di aggiornamento del firmware</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="295"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="297"/>
         <source>Save the downloaded firmware as</source>
         <translation>Salva il firmware scaricato come</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="296"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="298"/>
         <source>HEX files (*.hex)</source>
         <translation>HEX files (*.hex)</translation>
     </message>
@@ -5429,79 +5524,89 @@ Avvia il Bluetooth sul tuo OSTC Sport e, prima di continuare con l&apos;aggiorna
 <context>
     <name>PlannerSettingsWidget</name>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="322"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="302"/>
         <source>Open circuit</source>
         <translation>Circuito aperto</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="322"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="302"/>
         <source>CCR</source>
         <translation>CCR</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="322"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="302"/>
         <source>pSCR</source>
         <translation>pSCR</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="421"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="388"/>
         <source>ft/min</source>
         <translation>piedi/min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="422"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="389"/>
         <source>Last stop at 20ft</source>
         <translation>Ultima sosta a 20 piedi</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="423"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="390"/>
         <source>50% avg. depth to 20ft</source>
         <translation>Dal 50% della prof. media a 20ft</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="424"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="391"/>
         <source>20ft to surface</source>
         <translation>20 piedi alla superficie</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="426"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="392"/>
+        <source>ft</source>
+        <translation>ft</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="394"/>
         <source>m/min</source>
         <translation>m/min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="427"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="395"/>
         <source>Last stop at 6m</source>
         <translation>Ultima sosta a 6m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="428"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="396"/>
         <source>50% avg. depth to 6m</source>
         <translation>Dal 50% della prof. media a 6m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="429"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="397"/>
         <source>6m to surface</source>
         <translation>6m alla superficie</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="432"/>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="433"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="398"/>
+        <source>m</source>
+        <translation>m</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="401"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="402"/>
         <source>cuft/min</source>
         <translation>cuft/min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="441"/>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="442"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="410"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="411"/>
         <source>ℓ/min</source>
         <translation>ℓ/min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="451"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="420"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="456"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="425"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
@@ -5651,6 +5756,11 @@ Avvia il Bluetooth sul tuo OSTC Sport e, prima di continuare con l&apos;aggiorna
 <context>
     <name>PreferencesDialog</name>
     <message>
+        <location filename="../build/ui_preferences.h" line="1283"/>
+        <source>Preferences</source>
+        <translation>Preferenze</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1288"/>
         <source>Defaults</source>
         <translation>Default</translation>
@@ -5686,6 +5796,11 @@ Avvia il Bluetooth sul tuo OSTC Sport e, prima di continuare con l&apos;aggiorna
         <translation>Georeferenza</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1303"/>
+        <source>Lists and tables</source>
+        <translation>Liste e tabelle</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1304"/>
         <source>Font</source>
         <translation>Font</translation>
@@ -5701,6 +5816,11 @@ Avvia il Bluetooth sul tuo OSTC Sport e, prima di continuare con l&apos;aggiorna
         <translation>Immersioni</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1307"/>
+        <source>Default dive log file</source>
+        <translation>File del log delle immersioni di default</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1308"/>
         <source>No default file</source>
         <translation>nessun file di default</translation>
@@ -5731,6 +5851,21 @@ Avvia il Bluetooth sul tuo OSTC Sport e, prima di continuare con l&apos;aggiorna
         <translation>...</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1314"/>
+        <source>Display invalid</source>
+        <translation>Visualizza le immersioni non valide</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1316"/>
+        <source>Default cylinder</source>
+        <translation>Bombola di default</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1317"/>
+        <source>Use default cylinder</source>
+        <translation>Usa la bombola di default</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1318"/>
         <source>Animations</source>
         <translation>Animazioni</translation>
@@ -5761,40 +5896,24 @@ Avvia il Bluetooth sul tuo OSTC Sport e, prima di continuare con l&apos;aggiorna
         <translation>Sistema</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1401"/>
-        <source>Dive site geo lookup</source>
-        <translation>Ricerca geografica dei siti di immersione</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1402"/>
-        <source>Enable geocoding for dive site management</source>
-        <translation>Abilita georeferenzazione per la gestione di siti di immersione</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1403"/>
-        <source>Parse site without GPS data</source>
-        <translation>Analizza i siti senza coordinate GPS</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1404"/>
-        <source>Same format for existing dives</source>
-        <translation>Stesso formato per le immersioni esistenti</translation>
+        <location filename="../build/ui_preferences.h" line="1324"/>
+        <source>&amp;Metric</source>
+        <translation>&amp;Metrico</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1405"/>
-        <source>Dive Site Layout</source>
-        <translation>Layout del sito di immersione</translation>
+        <location filename="../build/ui_preferences.h" line="1325"/>
+        <source>Imperial</source>
+        <translation>Imperiale</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1406"/>
-        <location filename="../build/ui_preferences.h" line="1407"/>
-        <source>/</source>
-        <translation>/</translation>
+        <location filename="../build/ui_preferences.h" line="1326"/>
+        <source>Personali&amp;ze</source>
+        <translation>Personali&amp;zza</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1325"/>
-        <source>Imperial</source>
-        <translation>Imperiale</translation>
+        <location filename="../build/ui_preferences.h" line="1327"/>
+        <source>Individual settings</source>
+        <translation>Impostazioni individuali</translation>
     </message>
     <message>
         <location filename="../build/ui_preferences.h" line="1328"/>
@@ -5812,6 +5931,11 @@ Avvia il Bluetooth sul tuo OSTC Sport e, prima di continuare con l&apos;aggiorna
         <translation>piedi</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1331"/>
+        <source>Pressure</source>
+        <translation>Pressione</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1332"/>
         <location filename="../build/ui_preferences.h" line="1366"/>
         <source>bar</source>
@@ -5823,11 +5947,26 @@ Avvia il Bluetooth sul tuo OSTC Sport e, prima di continuare con l&apos;aggiorna
         <translation>psi</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1334"/>
+        <source>Volume</source>
+        <translation>Volume</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1335"/>
+        <source>&amp;liter</source>
+        <translation>&amp;litri</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1336"/>
         <source>cu ft</source>
         <translation>piedi cubici</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1337"/>
+        <source>Temperature</source>
+        <translation>Temperatura</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1338"/>
         <source>celsius</source>
         <translation>celsius</translation>
@@ -5838,11 +5977,121 @@ Avvia il Bluetooth sul tuo OSTC Sport e, prima di continuare con l&apos;aggiorna
         <translation>fahrenheit</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1340"/>
+        <source>Weight</source>
+        <translation>Peso</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1341"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1342"/>
+        <source>lbs</source>
+        <translation>lbs</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1343"/>
+        <source>Time units</source>
+        <translation>Unità di Tempo</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1344"/>
+        <source>Ascent/descent speed denominator</source>
+        <translation>Denominatore della risalita/discesa </translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1345"/>
+        <source>Minutes</source>
+        <translation>Minuti</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1346"/>
+        <source>Seconds</source>
+        <translation>Secondi</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1347"/>
+        <source>GPS coordinates</source>
+        <translation>Coordinate GPS</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1348"/>
+        <source>Location Display</source>
+        <translation>Visualizzazione del luogo</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1349"/>
+        <source>traditional (dms)</source>
+        <translation>tradizionale (gms)</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1350"/>
+        <source>decimal</source>
+        <translation>decimale</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1351"/>
+        <source>Show</source>
+        <translation>Mostra</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1352"/>
+        <source>Threshold when showing pO₂</source>
+        <translation>Soglia quando è visibile la pO₂</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1353"/>
+        <source>Threshold when showing pN₂</source>
+        <translation>Soglia quando è visibile la pN₂</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1354"/>
+        <source>Threshold when showing pHe</source>
+        <translation>Soglia quando è visibile la pHe</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1355"/>
+        <source>Max pO₂ when showing MOD</source>
+        <translation>Massima pO₂ a cui mostrare la MOD</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1356"/>
+        <source>Draw dive computer reported ceiling red</source>
+        <translation>Colora di rosso il ceiling riportato dal computer</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1357"/>
+        <source>Show unused cylinders in Equipment tab</source>
+        <translation>Mostra bombole non utilizzate nel pannello dell&apos;attrezzatura</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1358"/>
+        <source>Show average depth</source>
+        <translation>Mostra profondità media</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1359"/>
+        <source>Misc</source>
+        <translation>Varie</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1360"/>
+        <source>GFLow</source>
+        <translation>GFLow</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1361"/>
+        <source>GFHigh</source>
+        <translation>GFHigh</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1362"/>
+        <source>GFLow at max depth</source>
+        <translation>GFLow alla massima profondità</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1363"/>
         <source>CCR: show setpoints when viewing pO₂</source>
         <translation>CCR: mostra i setpoints quando osservi la pO₂</translation>
@@ -5888,14 +6137,19 @@ Avvia il Bluetooth sul tuo OSTC Sport e, prima di continuare con l&apos;aggiorna
         <translation>Impostazione di sistema predefinita</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1374"/>
+        <source>Filter</source>
+        <translation>Filtro</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1375"/>
         <source>Proxy</source>
         <translation>Proxy</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1379"/>
-        <source>Proxy type</source>
-        <translation>Tipo di proxy</translation>
+        <location filename="../build/ui_preferences.h" line="1376"/>
+        <source>Port</source>
+        <translation>Porta</translation>
     </message>
     <message>
         <location filename="../build/ui_preferences.h" line="1377"/>
@@ -5903,16 +6157,16 @@ Avvia il Bluetooth sul tuo OSTC Sport e, prima di continuare con l&apos;aggiorna
         <translation>Host</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1376"/>
-        <source>Port</source>
-        <translation>Porta</translation>
-    </message>
-    <message>
         <location filename="../build/ui_preferences.h" line="1378"/>
         <source>Requires authentication</source>
         <translation>Richiede autenticazione</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1379"/>
+        <source>Proxy type</source>
+        <translation>Tipo di proxy</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1380"/>
         <source>Username</source>
         <translation>Nome utente</translation>
@@ -5924,46 +6178,6 @@ Avvia il Bluetooth sul tuo OSTC Sport e, prima di continuare con l&apos;aggiorna
         <translation>Password</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1400"/>
-        <source>Disconnect from Facebook</source>
-        <translation>Disconnetti da Facebook</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1374"/>
-        <source>Filter</source>
-        <translation>Filtro</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1331"/>
-        <source>Pressure</source>
-        <translation>Pressione</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1303"/>
-        <source>Lists and tables</source>
-        <translation>Liste e tabelle</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1307"/>
-        <source>Default dive log file</source>
-        <translation>File del log delle immersioni di default</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1314"/>
-        <source>Display invalid</source>
-        <translation>Visualizza le immersioni non valide</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1316"/>
-        <source>Default cylinder</source>
-        <translation>Bombola di default</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1317"/>
-        <source>Use default cylinder</source>
-        <translation>Usa la bombola di default</translation>
-    </message>
-    <message>
         <location filename="../build/ui_preferences.h" line="1382"/>
         <source>Subsurface cloud storage</source>
         <translation>Memoria cloud di Subsurface</translation>
@@ -6004,149 +6218,40 @@ Avvia il Bluetooth sul tuo OSTC Sport e, prima di continuare con l&apos;aggiorna
         <translation>Salvare ID utente localmente?</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1334"/>
-        <source>Volume</source>
-        <translation>Volume</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1337"/>
-        <source>Temperature</source>
-        <translation>Temperatura</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1340"/>
-        <source>Weight</source>
-        <translation>Peso</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1342"/>
-        <source>lbs</source>
-        <translation>lbs</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1343"/>
-        <source>Time units</source>
-        <translation>Unità di Tempo</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1345"/>
-        <source>Minutes</source>
-        <translation>Minuti</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1346"/>
-        <source>Seconds</source>
-        <translation>Secondi</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1351"/>
-        <source>Show</source>
-        <translation>Mostra</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1362"/>
-        <source>GFLow at max depth</source>
-        <translation>GFLow alla massima profondità</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1359"/>
-        <source>Misc</source>
-        <translation>Varie</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1283"/>
-        <source>Preferences</source>
-        <translation>Preferenze</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1324"/>
-        <source>&amp;Metric</source>
-        <translation>&amp;Metrico</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1326"/>
-        <source>Personali&amp;ze</source>
-        <translation>Personali&amp;zza</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1327"/>
-        <source>Individual settings</source>
-        <translation>Impostazioni individuali</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1335"/>
-        <source>&amp;liter</source>
-        <translation>&amp;litri</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1344"/>
-        <source>Ascent/descent speed denominator</source>
-        <translation>Denominatore della risalita/discesa </translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1347"/>
-        <source>GPS coordinates</source>
-        <translation>Coordinate GPS</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1348"/>
-        <source>Location Display</source>
-        <translation>Visualizzazione del luogo</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1349"/>
-        <source>traditional (dms)</source>
-        <translation>tradizionale (gms)</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1350"/>
-        <source>decimal</source>
-        <translation>decimale</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1352"/>
-        <source>Threshold when showing pO₂</source>
-        <translation>Soglia quando è visibile la pO₂</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1353"/>
-        <source>Threshold when showing pN₂</source>
-        <translation>Soglia quando è visibile la pN₂</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1354"/>
-        <source>Threshold when showing pHe</source>
-        <translation>Soglia quando è visibile la pHe</translation>
+        <location filename="../build/ui_preferences.h" line="1400"/>
+        <source>Disconnect from Facebook</source>
+        <translation>Disconnetti da Facebook</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1355"/>
-        <source>Max pO₂ when showing MOD</source>
-        <translation>Massima pO₂ a cui mostrare la MOD</translation>
+        <location filename="../build/ui_preferences.h" line="1401"/>
+        <source>Dive site geo lookup</source>
+        <translation>Ricerca geografica dei siti di immersione</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1356"/>
-        <source>Draw dive computer reported ceiling red</source>
-        <translation>Colora di rosso il ceiling riportato dal computer</translation>
+        <location filename="../build/ui_preferences.h" line="1402"/>
+        <source>Enable geocoding for dive site management</source>
+        <translation>Abilita georeferenzazione per la gestione di siti di immersione</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1357"/>
-        <source>Show unused cylinders in Equipment tab</source>
-        <translation>Mostra bombole non utilizzate nel pannello dell&apos;attrezzatura</translation>
+        <location filename="../build/ui_preferences.h" line="1403"/>
+        <source>Parse site without GPS data</source>
+        <translation>Analizza i siti senza coordinate GPS</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1358"/>
-        <source>Show average depth</source>
-        <translation>Mostra profondità media</translation>
+        <location filename="../build/ui_preferences.h" line="1404"/>
+        <source>Same format for existing dives</source>
+        <translation>Stesso formato per le immersioni esistenti</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1360"/>
-        <source>GFLow</source>
-        <translation>GFLow</translation>
+        <location filename="../build/ui_preferences.h" line="1405"/>
+        <source>Dive Site Layout</source>
+        <translation>Layout del sito di immersione</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1361"/>
-        <source>GFHigh</source>
-        <translation>GFHigh</translation>
+        <location filename="../build/ui_preferences.h" line="1406"/>
+        <location filename="../build/ui_preferences.h" line="1407"/>
+        <source>/</source>
+        <translation>/</translation>
     </message>
 </context>
 <context>
@@ -6202,106 +6307,136 @@ Avvia il Bluetooth sul tuo OSTC Sport e, prima di continuare con l&apos;aggiorna
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="20"/>
-        <source>Show</source>
-        <translation>Mostra</translation>
+        <source>Gas pressure display setup</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="29"/>
-        <source>Threshold when showing pO₂</source>
-        <translation>Soglia quando è visibile la pO₂</translation>
+        <source>Threshold for pO₂ (bar)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="49"/>
-        <source>Threshold when showing pN₂</source>
-        <translation>Soglia quando è visibile la pN₂</translation>
+        <source>Threshold for pN₂ (bar)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="69"/>
-        <source>Threshold when showing pHe</source>
-        <translation>Soglia quando è visibile la pHe</translation>
+        <source>Threshold for pHe (bar)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="89"/>
-        <source>Max pO₂ when showing MOD</source>
-        <translation>Massima pO₂ a cui mostrare la MOD</translation>
+        <source>pO₂ in calculating MOD (bar)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="106"/>
+        <source>CCR options:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="109"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="113"/>
+        <source>Dive planner default setpoint (bar)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="133"/>
+        <source>Show setpoints when viewing pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="140"/>
+        <source>Show individual O₂ sensor values when viewing pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="150"/>
+        <source>Ceiling display setup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="159"/>
         <source>Draw dive computer reported ceiling red</source>
         <translation>Colora di rosso il ceiling riportato dal computer</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="116"/>
-        <source>Show unused cylinders in Equipment tab</source>
-        <translation>Mostra bombole non utilizzate nel pannello dell&apos;attrezzatura</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="169"/>
+        <source>Algorithm for calculated ceiling:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="123"/>
-        <source>Show mean depth</source>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="176"/>
+        <source>VPM-B</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="133"/>
-        <source>Misc</source>
-        <translation>Varie</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="183"/>
+        <source>VPM-B Conservatism</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="149"/>
-        <source>bar</source>
-        <translation>bar</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="193"/>
+        <source>+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="165"/>
-        <source>Default CCR set-point for dive planning</source>
-        <translation>set-point CCR di default per la pianificazione dell&apos;immersione</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="206"/>
+        <source>Bühlmann</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="172"/>
-        <source>pSCR O₂ metabolism rate</source>
-        <translation>pSCR consumo metabolico O₂</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="216"/>
+        <source>GFHigh</source>
+        <translation>GFHigh</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="179"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="236"/>
         <source>GFLow</source>
         <translation>GFLow</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="186"/>
-        <source>GFHigh</source>
-        <translation>GFHigh</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="256"/>
+        <source>GFLow at max depth</source>
+        <translation>GFLow alla massima profondità</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="203"/>
-        <source>ℓ/min</source>
-        <translation>ℓ/min</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="263"/>
+        <source>pSCR options:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="213"/>
-        <source>pSCR ratio</source>
-        <translation>pSCR ratio</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="270"/>
+        <source>Metabolic rate (ℓ O₂/min)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="287"/>
+        <source>Dilution ratio</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="223"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="300"/>
         <source>1:</source>
         <translation>1:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="230"/>
-        <source>CCR: show individual O₂ sensor values when viewing pO₂</source>
-        <translation>CCR: mostra i valori dei singoli sensori O₂ when osservi la pO₂</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="310"/>
+        <source>Misc</source>
+        <translation>Varie</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="237"/>
-        <source>CCR: show setpoints when viewing pO₂</source>
-        <translation>CCR: mostra i setpoints quando osservi la pO₂</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="316"/>
+        <source>Show unused cylinders in Equipment tab</source>
+        <translation>Mostra bombole non utilizzate nel pannello dell&apos;attrezzatura</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="244"/>
-        <source>GFLow at max depth</source>
-        <translation>GFLow alla massima profondità</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="323"/>
+        <source>Show mean depth in Profile</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="10"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="9"/>
         <source>Graph</source>
         <translation>Grafico</translation>
     </message>
@@ -6370,15 +6505,29 @@ Avvia il Bluetooth sul tuo OSTC Sport e, prima di continuare con l&apos;aggiorna
         <translation>Lingua</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="57"/>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="53"/>
         <source>Restart required</source>
         <translation>Richiesto riavvio</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="58"/>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="54"/>
         <source>To correctly load a new language you must restart Subsurface.</source>
         <translation>Per caricare correttamente la nuova lingua è richiesto il riavvio di Subsurface.</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="76"/>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="82"/>
+        <source>Literal characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="77"/>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="83"/>
+        <source>Non-special character(s) in time format.
+These will be used as is. This might not be what you intended.
+See http://doc.qt.io/qt-5/qdatetime.html#toString</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PreferencesNetwork</name>
@@ -6425,7 +6574,7 @@ Avvia il Bluetooth sul tuo OSTC Sport e, prima di continuare con l&apos;aggiorna
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_network.ui" line="156"/>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="148"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="134"/>
         <source>Subsurface cloud storage</source>
         <translation>Memoria cloud di Subsurface</translation>
     </message>
@@ -6470,39 +6619,39 @@ Avvia il Bluetooth sul tuo OSTC Sport e, prima di continuare con l&apos;aggiorna
         <translation>Salvare ID utente localmente?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="11"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="10"/>
         <source>Network</source>
         <translation>Rete</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="15"/>
         <source>No proxy</source>
         <translation>Nessun proxy</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/>
         <source>System proxy</source>
         <translation>Proxy di sistema</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/>
         <source>HTTP proxy</source>
         <translation>Proxy HTTP</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="19"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/>
         <source>SOCKS proxy</source>
         <translation>Proxy SOCKS</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="75"/>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="97"/>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="110"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="72"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="93"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="106"/>
         <source>Cloud storage email and password can only consist of letters, numbers, and &apos;.&apos;, &apos;-&apos;, &apos;_&apos;, and &apos;+&apos;.</source>
         <translation>Email e password per la memoria cloud possono contenere solo lettere, numeri, &apos;.&apos;, &apos;-&apos;, &apos;_&apos;, e &apos;+&apos;.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="146"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="132"/>
         <source>Subsurface cloud storage (credentials verified)</source>
         <translation>Memoria cloud di Subsurface (credenziali verificate)</translation>
     </message>
@@ -6660,7 +6809,7 @@ Avvia il Bluetooth sul tuo OSTC Sport e, prima di continuare con l&apos;aggiorna
         <translation>decimale</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="8"/>
+        <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="7"/>
         <source>Units</source>
         <translation>Unità</translation>
     </message>
@@ -6668,17 +6817,17 @@ Avvia il Bluetooth sul tuo OSTC Sport e, prima di continuare con l&apos;aggiorna
 <context>
     <name>PrintDialog</name>
     <message>
-        <location filename="../desktop-widgets/printdialog.cpp" line="118"/>
-        <source>&amp;Preview</source>
-        <translation>&amp;Anteprima</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/printdialog.cpp" line="115"/>
+        <location filename="../desktop-widgets/printdialog.cpp" line="102"/>
         <source>P&amp;rint</source>
         <translation>&amp;Stampa</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/printdialog.cpp" line="130"/>
+        <location filename="../desktop-widgets/printdialog.cpp" line="105"/>
+        <source>&amp;Preview</source>
+        <translation>&amp;Anteprima</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/printdialog.cpp" line="117"/>
         <source>Print</source>
         <translation>Stampa</translation>
     </message>
@@ -6686,19 +6835,10 @@ Avvia il Bluetooth sul tuo OSTC Sport e, prima di continuare con l&apos;aggiorna
 <context>
     <name>PrintOptions</name>
     <message>
-        <location filename="../build/ui_printoptions.h" line="150"/>
-        <source>&amp;Table print</source>
-        <translation>&amp;Stampa tabella</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_printoptions.h" line="158"/>
-        <source>One dive per page</source>
-        <translation>Una immersione per pagina</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_printoptions.h" line="159"/>
-        <source>Two dives per page</source>
-        <translation>Due immersioni per pagina</translation>
+        <location filename="../desktop-widgets/printoptions.ui" line="29"/>
+        <location filename="../build/ui_printoptions.h" line="148"/>
+        <source>Print type</source>
+        <translation>Stampa tipo</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/printoptions.ui" line="41"/>
@@ -6758,10 +6898,19 @@ Avvia il Bluetooth sul tuo OSTC Sport e, prima di continuare con l&apos;aggiorna
         <translation>Importa</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/printoptions.ui" line="29"/>
-        <location filename="../build/ui_printoptions.h" line="148"/>
-        <source>Print type</source>
-        <translation>Stampa tipo</translation>
+        <location filename="../build/ui_printoptions.h" line="150"/>
+        <source>&amp;Table print</source>
+        <translation>&amp;Stampa tabella</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_printoptions.h" line="158"/>
+        <source>One dive per page</source>
+        <translation>Una immersione per pagina</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_printoptions.h" line="159"/>
+        <source>Two dives per page</source>
+        <translation>Due immersioni per pagina</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/printoptions.cpp" line="128"/>
@@ -6803,103 +6952,103 @@ Avvia il Bluetooth sul tuo OSTC Sport e, prima di continuare con l&apos;aggiorna
         <translation>Computer sconosciuto</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="755"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="752"/>
         <source>Show NDL / TTS was disabled because of excessive processing time</source>
         <translation>La visualizzazione NDL / TTS è stata disabilitata perchè i calcoli richiedono troppo tempo</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1344"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1338"/>
         <source>Make first divecomputer</source>
         <translation>Rendilo computer principale</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1346"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1340"/>
         <source>Delete this divecomputer</source>
         <translation>Cancella questo computer subacqueo</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1360"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1354"/>
         <source>Add gas change</source>
         <translation>Aggiungi un cambio gas</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1363"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1357"/>
         <source> (Tank %1)</source>
         <translation>(Bombola %1)</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1371"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1365"/>
         <source>Add set-point change</source>
         <translation>Aggiungi un cambio di set-point</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1373"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1367"/>
         <source>Add bookmark</source>
         <translation>Aggiungi un segnalibro</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1377"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1371"/>
         <source>Edit the profile</source>
         <translation>Modifica il profilo</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1381"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1375"/>
         <source>Remove event</source>
         <translation>Rimuovi evento</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1386"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1380"/>
         <source>Hide similar events</source>
         <translation>Nascondi eventi simili</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1393"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1387"/>
         <source>Edit name</source>
         <translation>Modifica il nome</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1422"/>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1429"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1416"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1423"/>
         <source>Adjust pressure of tank %1 (currently interpolated as %2)</source>
         <translation>Corregge la pressione della bombola %1 (attualmente interpolata come %2)</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1444"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1438"/>
         <source>Unhide all events</source>
         <translation>Mostra tutti gli eventi</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1479"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1473"/>
         <source>Hide events</source>
         <translation>Nascondi gli eventi</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1479"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1473"/>
         <source>Hide all %1 events?</source>
         <translation>Nascondi tutti gli eventi %1?</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1514"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1508"/>
         <source>Remove the selected event?</source>
         <translation>Rimuovere l&apos;evento selezionato?</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1515"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1509"/>
         <source>%1 @ %2:%3</source>
         <translation>%1 @ %2:%3</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1638"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1632"/>
         <source>Edit name of bookmark</source>
         <translation>Modifica il nome del bookmark</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1639"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1633"/>
         <source>Custom name:</source>
         <translation>Nome personalizzato:</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1644"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1638"/>
         <source>Name is too long!</source>
         <translation>Il nome è troppo lungo</translation>
     </message>
@@ -6907,91 +7056,101 @@ Avvia il Bluetooth sul tuo OSTC Sport e, prima di continuare con l&apos;aggiorna
 <context>
     <name>QMLManager</name>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="95"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="97"/>
         <source>Starting...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="202"/>
         <source>working in no-cloud mode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="213"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="216"/>
         <source>no cloud credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="214"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="270"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="217"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="269"/>
         <source>Please enter valid cloud credentials.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="285"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="284"/>
         <source>Attempting to open cloud storage with new credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="304"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="306"/>
         <source>Testing cloud credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="331"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="320"/>
+        <source>No response from cloud server to validate the credentials</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="329"/>
+        <source>Cannot connect to cloud storage - cloud account not verified</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="361"/>
         <source>Cloud credentials are invalid</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="344"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="374"/>
         <source>Cannot open cloud storage: Error creating https connection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="357"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="387"/>
         <source>Cannot open cloud storage: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="369"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="399"/>
         <source>Cannot connect to cloud storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="411"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="441"/>
         <source>Cloud storage error: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="501"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="531"/>
         <source>Failed to connect to cloud server, reverting to no cloud status</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="520"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="550"/>
         <source>Cloud storage open successfully. No dives in dive list.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="689"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="690"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="721"/>
         <source>h</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="689"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="690"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="691"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="721"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="722"/>
         <source>min</source>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="689"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/>
         <source>sec</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="1041"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="1102"/>
         <source>Unknown GPS location</source>
         <translation type="unfinished"/>
     </message>
@@ -6999,126 +7158,126 @@ Avvia il Bluetooth sul tuo OSTC Sport e, prima di continuare con l&apos;aggiorna
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../core/qthelper.cpp" line="866"/>
-        <location filename="../core/qthelper.cpp" line="1214"/>
-        <source>AIR</source>
-        <translation>ARIA</translation>
+        <location filename="../core/gpslocation.h" line="13"/>
+        <source>Waiting to aquire GPS location</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="1214"/>
-        <source>OXYGEN</source>
-        <translation>OSSIGENO</translation>
+        <location filename="../core/qthelper.cpp" line="766"/>
+        <location filename="../core/qthelper.cpp" line="1275"/>
+        <source>m</source>
+        <translation>m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="59"/>
-        <source>Remove this point</source>
-        <translation>Rimuovi questo punto</translation>
+        <location filename="../core/qthelper.cpp" line="768"/>
+        <location filename="../core/qthelper.cpp" line="1274"/>
+        <source>ft</source>
+        <translation>ft</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="32"/>
-        <source>Average</source>
-        <translation>Media</translation>
+        <location filename="../core/qthelper.cpp" line="794"/>
+        <source>C</source>
+        <translation>C</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="35"/>
-        <source>Minimum</source>
-        <translation>Minimo</translation>
+        <location filename="../core/qthelper.cpp" line="796"/>
+        <source>F</source>
+        <translation>F</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="38"/>
-        <source>Maximum</source>
-        <translation>Massimo</translation>
+        <location filename="../core/qthelper.cpp" line="821"/>
+        <location filename="../core/qthelper.cpp" line="1250"/>
+        <source>kg</source>
+        <translation>kg</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/globe.cpp" line="327"/>
-        <source>Move the map and double-click to set the dive location</source>
-        <translation>Spostare la mappa e fare doppio-click per definire la posizione dell&apos;immersione</translation>
+        <location filename="../core/qthelper.cpp" line="823"/>
+        <location filename="../core/qthelper.cpp" line="1251"/>
+        <source>lbs</source>
+        <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="28"/>
-        <source>unknown</source>
-        <translation>sconosciuto</translation>
+        <location filename="../core/qthelper.cpp" line="848"/>
+        <location filename="../core/qthelper.cpp" line="1300"/>
+        <source>bar</source>
+        <translation>bar</translation>
     </message>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="105"/>
-        <source>h:</source>
-        <translation>h:</translation>
+        <location filename="../core/qthelper.cpp" line="850"/>
+        <location filename="../core/qthelper.cpp" line="1299"/>
+        <source>psi</source>
+        <translation>psi</translation>
     </message>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="105"/>
-        <source>min</source>
-        <translation>min</translation>
+        <location filename="../core/qthelper.cpp" line="871"/>
+        <location filename="../core/qthelper.cpp" line="1235"/>
+        <source>AIR</source>
+        <translation>ARIA</translation>
     </message>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="337"/>
-        <source>Multiple</source>
+        <location filename="../core/qthelper.cpp" line="873"/>
+        <source>EAN</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="../core/qthelper.cpp" line="957"/>
+        <location filename="../core/qthelper.cpp" line="962"/>
         <source>(%n dive(s))</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="816"/>
-        <location filename="../core/qthelper.cpp" line="1228"/>
-        <source>kg</source>
-        <translation>kg</translation>
+        <location filename="../core/qthelper.cpp" line="1235"/>
+        <source>OXYGEN</source>
+        <translation>OSSIGENO</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="818"/>
-        <location filename="../core/qthelper.cpp" line="1229"/>
-        <source>lbs</source>
-        <translation>lbs</translation>
+        <location filename="../core/qthelper.cpp" line="1322"/>
+        <source>l</source>
+        <translation>l</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="763"/>
-        <location filename="../core/qthelper.cpp" line="1252"/>
-        <source>ft</source>
-        <translation>ft</translation>
+        <location filename="../core/qthelper.cpp" line="1323"/>
+        <source>cuft</source>
+        <translation>piedi cubi</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="761"/>
-        <location filename="../core/qthelper.cpp" line="1253"/>
-        <source>m</source>
-        <translation>m</translation>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="29"/>
+        <source>unknown</source>
+        <translation>sconosciuto</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="789"/>
-        <source>C</source>
-        <translation>C</translation>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="114"/>
+        <source>h:</source>
+        <translation>h:</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="791"/>
-        <source>F</source>
-        <translation>F</translation>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="114"/>
+        <source>min</source>
+        <translation>min</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="845"/>
-        <location filename="../core/qthelper.cpp" line="1275"/>
-        <source>psi</source>
-        <translation>psi</translation>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="63"/>
+        <source>Remove this point</source>
+        <translation>Rimuovi questo punto</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="843"/>
-        <location filename="../core/qthelper.cpp" line="1276"/>
-        <source>bar</source>
-        <translation>bar</translation>
+        <location filename="../desktop-widgets/globe.cpp" line="327"/>
+        <source>Move the map and double-click to set the dive location</source>
+        <translation>Spostare la mappa e fare doppio-click per definire la posizione dell&apos;immersione</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="868"/>
-        <source>EAN</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="32"/>
+        <source>Average</source>
+        <translation>Media</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="1298"/>
-        <source>l</source>
-        <translation>l</translation>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="35"/>
+        <source>Minimum</source>
+        <translation>Minimo</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="1299"/>
-        <source>cuft</source>
-        <translation>piedi cubi</translation>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="38"/>
+        <source>Maximum</source>
+        <translation>Massimo</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="625"/>
@@ -7140,17 +7299,12 @@ Avvia il Bluetooth sul tuo OSTC Sport e, prima di continuare con l&apos;aggiorna
         <source>Malformed XML response. Line %1: %2</source>
         <translation>Risposta XML malformata. Linea %1: %2</translation>
     </message>
-    <message>
-        <location filename="../core/gpslocation.h" line="13"/>
-        <source>Waiting to aquire GPS location</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>ReadSettingsThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1651"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1676"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1640"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1665"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Questa funzionalità non è ancora disponibile per questo computer.</translation>
     </message>
@@ -7179,7 +7333,7 @@ Avvia il Bluetooth sul tuo OSTC Sport e, prima di continuare con l&apos;aggiorna
 <context>
     <name>ResetSettingsThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1775"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1764"/>
         <source>Reset settings failed!</source>
         <translation>Reset delle impostazioni fallito!</translation>
     </message>
@@ -7217,6 +7371,12 @@ Avvia il Bluetooth sul tuo OSTC Sport e, prima di continuare con l&apos;aggiorna
 <context>
     <name>ShiftImageTimesDialog</name>
     <message>
+        <location filename="../desktop-widgets/shiftimagetimes.ui" line="23"/>
+        <location filename="../build/ui_shiftimagetimes.h" line="184"/>
+        <source>Shift selected image times</source>
+        <translation>Cambia l&apos;orario delle immagini selezionate</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/shiftimagetimes.ui" line="34"/>
         <location filename="../build/ui_shiftimagetimes.h" line="185"/>
         <source>Shift times of image(s) by</source>
@@ -7229,12 +7389,6 @@ Avvia il Bluetooth sul tuo OSTC Sport e, prima di continuare con l&apos;aggiorna
         <translation>h:mm</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/shiftimagetimes.ui" line="23"/>
-        <location filename="../build/ui_shiftimagetimes.h" line="184"/>
-        <source>Shift selected image times</source>
-        <translation>Cambia l&apos;orario delle immagini selezionate</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/shiftimagetimes.ui" line="105"/>
         <location filename="../build/ui_shiftimagetimes.h" line="187"/>
         <source>Earlier</source>
@@ -7287,12 +7441,12 @@ selezionate.</translation>
         <translation>Quale data ed orario sono mostrati nell&apos;immagine?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="297"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="296"/>
         <source>Open image file</source>
         <translation>Apri il file dell&apos;immagine</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="299"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="298"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>Files immagine (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -7450,54 +7604,54 @@ selezionate.</translation>
 <context>
     <name>SocialNetworkDialog</name>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="339"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="284"/>
         <source>Dive date: %1 
 </source>
         <translation>Data dell&apos;immersione: %1 
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="342"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="287"/>
         <source>Duration: %1 
 </source>
         <translation>Durata: %1 
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="343"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="288"/>
         <source>h:</source>
         <comment>abbreviation for hours plus separator</comment>
         <translation>h:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="344"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="289"/>
         <source>min</source>
         <comment>abbreviation for minutes</comment>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="347"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="292"/>
         <source>Dive location: %1 
 </source>
         <translation>Luogo immersione: %1
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="350"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="295"/>
         <source>Buddy: %1 
 </source>
         <translation>Compagno: %1 
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="353"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="298"/>
         <source>Divemaster: %1 
 </source>
         <translation>Divemaster: %1 
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="356"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="301"/>
         <source>
 %1</source>
         <translation>
@@ -7583,9 +7737,20 @@ selezionate.</translation>
     <name>StartPage</name>
     <message>
         <location filename="../mobile-widgets/qml/StartPage.qml" line="19"/>
-        <source>To use Subsurface-mobile with Subsurface cloud storage, please enteryour cloud credentials.
+        <source>To use Subsurface-mobile with Subsurface cloud storage, please enter your cloud credentials.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/StartPage.qml" line="20"/>
+        <source>If this is the first time you use Subsurface cloud storage, enter a valid email (all lower case) and a password of your choice (letters and numbers). The server will send a PIN to the email address provided that you will have to enter here.
 
-To use Subsurface-mobile only with local data on this device, tap on the no cloud icon below.</source>
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/StartPage.qml" line="23"/>
+        <source>To use Subsurface-mobile only with local data on this device, tap on the no cloud icon below.</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -7624,7 +7789,12 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>SubsurfaceWebServices</name>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="419"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="395"/>
+        <source>Enter User ID and click Download</source>
+        <translation>Inserisci la User ID e click Download</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="417"/>
         <source>Webservice</source>
         <translation>Webservice</translation>
     </message>
@@ -7649,30 +7819,25 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
         <translation>Errore di connessione:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="557"/>
-        <source>Download successful</source>
-        <translation>Scaricamento eseguito</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="551"/>
         <source>Invalid user identifier!</source>
         <translation>Identificatore dell&apos;utente non valido!</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="397"/>
-        <source>Enter User ID and click Download</source>
-        <translation>Inserisci la User ID e click Download</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="554"/>
         <source>Cannot parse response!</source>
         <translation>Non posso analizzare la risposta!</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="557"/>
+        <source>Download successful</source>
+        <translation>Scaricamento eseguito</translation>
+    </message>
 </context>
 <context>
     <name>SuitFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="674"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="672"/>
         <source>Suits: </source>
         <translation>Mute:</translation>
     </message>
@@ -7680,7 +7845,7 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>SuitsFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="123"/>
+        <location filename="../qt-models/filtermodels.cpp" line="128"/>
         <source>No suit set</source>
         <translation>Nessun set di mute</translation>
     </message>
@@ -7699,7 +7864,7 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>TagFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="595"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="593"/>
         <source>Tags: </source>
         <translation>Tag:</translation>
     </message>
@@ -7707,7 +7872,7 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>TagFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="148"/>
+        <location filename="../qt-models/filtermodels.cpp" line="153"/>
         <source>Empty tags</source>
         <translation>Tag vuoti</translation>
     </message>
@@ -7733,6 +7898,11 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>TemplateEdit</name>
     <message>
+        <location filename="../desktop-widgets/templateedit.ui" line="14"/>
+        <source>Edit template</source>
+        <translation>Modifica modello</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/templateedit.ui" line="37"/>
         <source>Preview</source>
         <translation>Anteprima</translation>
@@ -7778,11 +7948,6 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
         <translation>Grandezza font</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/templateedit.ui" line="14"/>
-        <source>Edit template</source>
-        <translation>Modifica modello</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/templateedit.ui" line="165"/>
         <source>Color palette</source>
         <translation>Tavolozza dei colori</translation>
@@ -7964,7 +8129,7 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>TextHyperlinkEventFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="817"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="815"/>
         <source>%1click to visit %2</source>
         <translation type="unfinished"/>
     </message>
@@ -7980,102 +8145,107 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>TripItem</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="67"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="68"/>
         <source>(%1 shown)</source>
         <translation> (%1 mostrati)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="194"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
         <source>#</source>
         <translation>n</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="197"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="215"/>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="200"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="218"/>
         <source>Rating</source>
         <translation>Valutazione</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
         <source>Depth(%1)</source>
         <translation>Prof. (%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="206"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="224"/>
         <source>Duration</source>
         <translation>Durata</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="209"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="227"/>
         <source>Temp(%1%2)</source>
         <translation>Temp (%1%2)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
         <source>Weight(%1)</source>
         <translation>Peso(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="215"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="233"/>
         <source>Suit</source>
         <translation>Muta</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="218"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="236"/>
         <source>Cyl</source>
         <translation>Bombola</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="239"/>
         <source>Gas</source>
         <translation>Gas</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="244"/>
         <source>SAC(%1)</source>
         <translation>CAS(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="244"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="229"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="247"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="232"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="250"/>
         <source>Max CNS</source>
         <translation>CNS massimo</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="235"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="253"/>
+        <source>Photos before/during/after dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="256"/>
         <source>Location</source>
         <translation>Luogo</translation>
     </message>
@@ -8098,72 +8268,73 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>UpdateManager</name>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="69"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="61"/>
         <source>Check for updates.</source>
         <translation>Controlla gli aggiornamenti.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="70"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="62"/>
         <source>Subsurface was unable to check for updates.</source>
         <translation>Subsurface non è riuscito a controllare gli aggiornamenti.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="75"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="67"/>
         <source>The following error occurred:</source>
         <translation>Si è verificato il seguente errore:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="76"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="68"/>
         <source>Please check your internet connection.</source>
         <translation>Per favore controlla la tua connessione Internet</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="86"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="78"/>
         <source>You are using the latest version of Subsurface.</source>
         <translation>Stai usando la versione più recente di Subsurface</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="89"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="81"/>
         <source>A new version of Subsurface is available.&lt;br/&gt;Click on:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; to download it.</source>
         <translation>E&apos; disponibile una nuova versione di Subsurface.&lt;br/&gt;Clicca su:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; per scaricarla.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="95"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="87"/>
         <source>A new version of Subsurface is available.</source>
         <translation>E&apos; disponibile una nuova versione di Subsurface</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="96"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="88"/>
         <source>Latest version is %1, please check %2 our download page %3 for information in how to update.</source>
         <translation>La versione più recente è %1, per favore controlla %2 la nostra pagina di download %3 per le informazioni su come aggiornare.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="106"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="98"/>
         <source>Newest release version is </source>
         <translation>La versione più recente è</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="107"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="99"/>
         <source>The server returned the following information:</source>
         <translation>Il server ha restituito le seguenti informazioni:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="125"/>
-        <source>Subsurface is checking every two weeks if a new version is available. If you don&apos;t want Subsurface to continue checking, please click Decline.</source>
-        <translation>Subsurface controlla la disponibilità di una nuova versione ogni due settimane. Se non vuoi che Subsurface continui a controllare, per favore fai clic su Rifiuta</translation>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="117"/>
+        <source>Subsurface is checking every two weeks if a new version is available. 
+ If you don&apos;t want Subsurface to continue checking, please click Decline.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="126"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="119"/>
         <source>Decline</source>
         <translation>Rifiuta</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="127"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="120"/>
         <source>Accept</source>
         <translation>Accetta</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="129"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="122"/>
         <source>Automatic check for updates</source>
         <translation>Controllo automatico degli aggiornamenti</translation>
     </message>
@@ -8185,24 +8356,6 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>UserSurvey</name>
     <message>
-        <location filename="../desktop-widgets/usersurvey.ui" line="44"/>
-        <location filename="../build/ui_usersurvey.h" line="151"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;We would love to learn more about our users, their preferences and their usage habits. Please spare a minute to fill out this form and submit it to the Subsurface team.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Ci piacerebbe conoscere meglio i nostri utenti, le loro preferenze e abitudini. Per favore dedicaci un minuto per riempire il questionario e inviarlo al team di Subsurface.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/usersurvey.ui" line="115"/>
-        <location filename="../build/ui_usersurvey.h" line="156"/>
-        <source>Other software/sources</source>
-        <translation>Altri software/fonti</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/usersurvey.ui" line="128"/>
-        <location filename="../build/ui_usersurvey.h" line="157"/>
-        <source>Manually entering dives</source>
-        <translation>Immisione manuale delle immersioni </translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="14"/>
         <location filename="../build/ui_usersurvey.h" line="149"/>
         <source>User survey</source>
@@ -8215,6 +8368,12 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
         <translation>Sondaggio degli utenti di Subsurface</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/usersurvey.ui" line="44"/>
+        <location filename="../build/ui_usersurvey.h" line="151"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;We would love to learn more about our users, their preferences and their usage habits. Please spare a minute to fill out this form and submit it to the Subsurface team.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Ci piacerebbe conoscere meglio i nostri utenti, le loro preferenze e abitudini. Per favore dedicaci un minuto per riempire il questionario e inviarlo al team di Subsurface.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="63"/>
         <location filename="../build/ui_usersurvey.h" line="152"/>
         <source>Technical diver</source>
@@ -8239,6 +8398,18 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
         <translation>Computer subacqueo supportato</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/usersurvey.ui" line="115"/>
+        <location filename="../build/ui_usersurvey.h" line="156"/>
+        <source>Other software/sources</source>
+        <translation>Altri software/fonti</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/usersurvey.ui" line="128"/>
+        <location filename="../build/ui_usersurvey.h" line="157"/>
+        <source>Manually entering dives</source>
+        <translation>Immisione manuale delle immersioni </translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="141"/>
         <location filename="../build/ui_usersurvey.h" line="158"/>
         <source>Android/iPhone companion app</source>
@@ -8269,6 +8440,11 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
         <translation>Da dove importi i dati di immersione?</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/usersurvey.cpp" line="18"/>
+        <source>Send</source>
+        <translation>Invia</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/usersurvey.cpp" line="43"/>
         <source>
 Operating system: %1</source>
@@ -8311,19 +8487,14 @@ Lingua: %1</translation>
         <translation>Chiedi in seguto</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/usersurvey.cpp" line="101"/>
-        <source>Submit user survey.</source>
-        <translation>Invia il sondaggio.</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/usersurvey.cpp" line="82"/>
         <source>Ask again?</source>
         <translation>Chiedo di nuovo?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/usersurvey.cpp" line="18"/>
-        <source>Send</source>
-        <translation>Invia</translation>
+        <location filename="../desktop-widgets/usersurvey.cpp" line="101"/>
+        <source>Submit user survey.</source>
+        <translation>Invia il sondaggio.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/usersurvey.cpp" line="102"/>
@@ -8415,12 +8586,12 @@ Lingua: %1</translation>
         <translation>Invia</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="324"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="325"/>
         <source>Operation timed out</source>
         <translation>L&apos;operazione è durata troppo</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="345"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="346"/>
         <source>Transferring data...</source>
         <translation>Trasferimenti dati...</translation>
     </message>
@@ -8455,18 +8626,18 @@ Lingua: %1</translation>
 <context>
     <name>WriteSettingsThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1702"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1709"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1718"/>
-        <source>Failed!</source>
-        <translation>Operazione non riuscita!</translation>
-    </message>
-    <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1700"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1721"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1689"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1710"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Questa funzionalità non è ancora disponibile per il computer selezionato.</translation>
     </message>
+    <message>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1691"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1698"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1707"/>
+        <source>Failed!</source>
+        <translation>Operazione non riuscita!</translation>
+    </message>
 </context>
 <context>
     <name>YearlyStatisticsModel</name>
@@ -8591,7 +8762,7 @@ Media</translation>
 <context>
     <name>getextFromC</name>
     <message>
-        <location filename="../core/libdivecomputer.c" line="674"/>
+        <location filename="../core/libdivecomputer.c" line="737"/>
         <source>Error parsing the header</source>
         <translation>Errore  nel parsing dell&apos;intestazione</translation>
     </message>
@@ -8599,38 +8770,377 @@ Media</translation>
 <context>
     <name>gettextFromC</name>
     <message>
+        <location filename="../core/cochran.c" line="309"/>
+        <location filename="../core/cochran.c" line="315"/>
+        <location filename="../core/cochran.c" line="385"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>deco stop</source>
+        <translation>deco stop</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="336"/>
+        <location filename="../core/cochran.c" line="390"/>
+        <location filename="../core/file.c" line="777"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>ascent</source>
+        <translation>risalita</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="342"/>
+        <location filename="../core/file.c" line="755"/>
+        <source>battery</source>
+        <translation>batteria</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="348"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
+        <source>OLF</source>
+        <translation>OLF</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="353"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
+        <source>maxdepth</source>
+        <translation>profondità massima</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="358"/>
+        <location filename="../core/cochran.c" line="404"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
+        <source>pO₂</source>
+        <translation>pO₂</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="365"/>
+        <location filename="../core/cochran.c" line="414"/>
+        <location filename="../core/cochran.c" line="421"/>
+        <location filename="../core/file.c" line="868"/>
+        <location filename="../core/libdivecomputer.c" line="225"/>
+        <location filename="../core/libdivecomputer.c" line="228"/>
+        <source>gaschange</source>
+        <translation>cambio gas</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="370"/>
+        <location filename="../core/cochran.c" line="409"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>rbt</source>
+        <translation>rbt</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="379"/>
+        <location filename="../core/cochran.c" line="426"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>ceiling</source>
+        <translation>ceiling</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="395"/>
+        <location filename="../core/libdivecomputer.c" line="224"/>
+        <source>transmitter</source>
+        <translation>trasmettitore</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="153"/>
+        <source>Error: the file does not appear to be a DATATRAK divelog</source>
+        <translation>Errore: il file non sembra essere un log di immersioni DATATRAK</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="286"/>
+        <source>clear</source>
+        <translation>cancellare</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="289"/>
+        <source>misty</source>
+        <translation>offuscato</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="292"/>
+        <source>fog</source>
+        <translation>nebbia</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="295"/>
+        <source>rain</source>
+        <translation>pioggia</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="298"/>
+        <source>storm</source>
+        <translation>temporale</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="301"/>
+        <source>snow</source>
+        <translation>neve</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="321"/>
+        <source>No suit</source>
+        <translation>Nessuna muta</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="324"/>
+        <source>Shorty</source>
+        <translation>Muta corta</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="327"/>
+        <source>Combi</source>
+        <translation>Combi</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="330"/>
+        <source>Wet suit</source>
+        <translation>Muta umida</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="333"/>
+        <source>Semidry suit</source>
+        <translation>Muta semistagna</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="336"/>
+        <source>Dry suit</source>
+        <translation>Muta stagna</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="396"/>
+        <source>no stop</source>
+        <translation>no stop</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="398"/>
+        <location filename="../core/dive.c" line="29"/>
+        <source>deco</source>
+        <translation>deco</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="400"/>
+        <source>single ascent</source>
+        <translation>risalita singola</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="402"/>
+        <source>multiple ascent</source>
+        <translation>risalita multipla</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="404"/>
+        <location filename="../core/dive.c" line="27"/>
+        <source>fresh</source>
+        <translation>acqua dolce</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="406"/>
+        <source>salt water</source>
+        <translation>acqua salata</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="431"/>
+        <source>sight seeing</source>
+        <translation>gita</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="433"/>
+        <source>club dive</source>
+        <translation>immersione di club</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="435"/>
+        <location filename="../core/dive.c" line="28"/>
+        <source>instructor</source>
+        <translation>istruttore</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="437"/>
+        <source>instruction</source>
+        <translation>istruzione</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="439"/>
+        <location filename="../core/dive.c" line="27"/>
+        <source>night</source>
+        <translation>notte</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="441"/>
+        <location filename="../core/dive.c" line="25"/>
+        <source>cave</source>
+        <translation>grotta</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="443"/>
+        <location filename="../core/dive.c" line="24"/>
+        <source>ice</source>
+        <translation>ghiaccio</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="445"/>
+        <source>search</source>
+        <translation>cerca</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="455"/>
+        <location filename="../core/dive.c" line="25"/>
+        <source>wreck</source>
+        <translation>relitto</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="457"/>
+        <location filename="../core/dive.c" line="26"/>
+        <source>river</source>
+        <translation>fiume</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="459"/>
+        <location filename="../core/dive.c" line="23"/>
+        <source>drift</source>
+        <translation>in corrente</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="461"/>
+        <location filename="../core/dive.c" line="28"/>
+        <source>photo</source>
+        <translation>foto</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="463"/>
+        <source>other</source>
+        <translation>altro</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="474"/>
+        <source>Other activities</source>
+        <translation>Altre attività</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="498"/>
+        <source>Datatrak/Wlog notes</source>
+        <translation>Note Datatrak/Wlog</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="537"/>
+        <source>Manually entered dive</source>
+        <translation>Immersione inserita manualmente</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="588"/>
+        <source>Unknown</source>
+        <translation>Sconosiuto</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="674"/>
+        <source>Error: couldn&apos;t open the file %s</source>
+        <translation>Errore: impossibile aprire il file %s</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="687"/>
+        <source>Error: no dive</source>
+        <translation>Errore: nessuna immersione</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="23"/>
+        <source>boat</source>
+        <translation>barca</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="23"/>
+        <source>shore</source>
+        <translation>riva</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="24"/>
+        <source>deep</source>
+        <translation>profondo</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="24"/>
+        <source>cavern</source>
+        <translation>caverna</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="25"/>
+        <source>altitude</source>
+        <translation>altitudine</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="26"/>
+        <source>pool</source>
+        <translation>piscina</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="26"/>
+        <source>lake</source>
+        <translation>lago</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="27"/>
+        <source>student</source>
+        <translation>allievo</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="28"/>
+        <source>video</source>
+        <translation>video</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="33"/>
+        <source>OC-gas</source>
+        <translation>OC-gas</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="33"/>
+        <source>diluent</source>
+        <translation>diluente</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="33"/>
+        <location filename="../core/equipment.c" line="88"/>
+        <location filename="../core/planner.c" line="1436"/>
+        <location filename="../core/planner.c" line="1439"/>
+        <source>oxygen</source>
+        <translation>ossigeno</translation>
+    </message>
+    <message>
         <location filename="../core/dive.c" line="181"/>
         <source>pascal</source>
         <translation>pascal</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="186"/>
-        <location filename="../core/qthelper.cpp" line="669"/>
+        <location filename="../core/qthelper.cpp" line="674"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="190"/>
-        <location filename="../core/qthelper.cpp" line="672"/>
+        <location filename="../core/qthelper.cpp" line="677"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
+        <location filename="../core/dive.c" line="227"/>
+        <source>ℓ</source>
+        <translation>ℓ</translation>
+    </message>
+    <message>
         <location filename="../core/dive.c" line="232"/>
         <source>cuft</source>
         <translation>piedi cubi</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="269"/>
-        <location filename="../core/qthelper.cpp" line="590"/>
-        <location filename="../core/qthelper.cpp" line="605"/>
+        <location filename="../core/qthelper.cpp" line="595"/>
+        <location filename="../core/qthelper.cpp" line="610"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="274"/>
-        <location filename="../core/qthelper.cpp" line="593"/>
-        <location filename="../core/qthelper.cpp" line="607"/>
+        <location filename="../core/qthelper.cpp" line="598"/>
+        <location filename="../core/qthelper.cpp" line="612"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
@@ -8656,53 +9166,58 @@ Media</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="325"/>
-        <location filename="../core/qthelper.cpp" line="616"/>
-        <location filename="../core/qthelper.cpp" line="626"/>
+        <location filename="../core/qthelper.cpp" line="621"/>
+        <location filename="../core/qthelper.cpp" line="631"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="329"/>
-        <location filename="../core/qthelper.cpp" line="614"/>
-        <location filename="../core/qthelper.cpp" line="624"/>
+        <location filename="../core/qthelper.cpp" line="619"/>
+        <location filename="../core/qthelper.cpp" line="629"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="1772"/>
+        <location filename="../core/dive.c" line="1751"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) o (%s)</translation>
     </message>
     <message>
-        <location filename="../core/divelist.c" line="484"/>
+        <location filename="../core/divelist.c" line="487"/>
         <location filename="../core/equipment.c" line="84"/>
-        <location filename="../core/planner.c" line="1411"/>
-        <location filename="../core/planner.c" line="1414"/>
+        <location filename="../core/planner.c" line="1432"/>
+        <location filename="../core/planner.c" line="1435"/>
         <source>air</source>
         <translation>aria</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="197"/>
+        <location filename="../core/equipment.c" line="86"/>
+        <source>EAN%d</source>
+        <translation>EAN%d</translation>
+    </message>
+    <message>
+        <location filename="../core/equipment.c" line="198"/>
         <source>integrated</source>
         <translation>integrato</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="198"/>
+        <location filename="../core/equipment.c" line="199"/>
         <source>belt</source>
         <translation>cintura</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="199"/>
+        <location filename="../core/equipment.c" line="200"/>
         <source>ankle</source>
         <translation>caviglia</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="200"/>
+        <location filename="../core/equipment.c" line="201"/>
         <source>backplate weight</source>
         <translation>peso della piastra</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="201"/>
+        <location filename="../core/equipment.c" line="202"/>
         <source>clip-on</source>
         <translation>clip-on</translation>
     </message>
@@ -8715,8 +9230,8 @@ Media</translation>
         <location filename="../core/file.c" line="121"/>
         <location filename="../core/file.c" line="512"/>
         <location filename="../core/file.c" line="597"/>
-        <location filename="../core/file.c" line="924"/>
-        <location filename="../core/file.c" line="1056"/>
+        <location filename="../core/file.c" line="909"/>
+        <location filename="../core/file.c" line="1092"/>
         <location filename="../core/ostctools.c" line="80"/>
         <source>Failed to read &apos;%s&apos;</source>
         <translation>Impossibile leggere &apos;%s&apos;</translation>
@@ -8774,487 +9289,497 @@ Media</translation>
         <translation>Calibrazione O₂</translation>
     </message>
     <message>
-        <location filename="../core/file.c" line="887"/>
-        <source>No matching DC found for file &apos;%s&apos;</source>
-        <translation>Nessun computer corrispondente per il file &apos;%s&apos;</translation>
+        <location filename="../core/git-access.c" line="134"/>
+        <source>Local cache directory %s corrupted - can&apos;t sync with Subsurface cloud storage</source>
+        <translation>La cartella della cache locale %s è corrotta - non è possibile sincronizzare con la memoria cloud di Subsurface</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>none</source>
-        <translation>nessuno</translation>
+        <location filename="../core/git-access.c" line="157"/>
+        <location filename="../core/git-access.c" line="177"/>
+        <source>Could not update local cache to newer remote data</source>
+        <translation>Non è stato possibile aggiornare la cache local con i dati remoti più aggiornati</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="309"/>
-        <location filename="../core/cochran.c" line="315"/>
-        <location filename="../core/cochran.c" line="385"/>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>deco stop</source>
-        <translation>deco stop</translation>
+        <location filename="../core/git-access.c" line="170"/>
+        <source>Subsurface cloud storage corrupted</source>
+        <translation>Memoria cloud di Subsurface corrotta</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="342"/>
-        <location filename="../core/file.c" line="755"/>
-        <source>battery</source>
-        <translation>batteria</translation>
+        <location filename="../core/git-access.c" line="284"/>
+        <source>Could not update Subsurface cloud storage, try again later</source>
+        <translation>Non ho potuto aggiornare la memoria cloud di Subsurface, riprovare più tardi</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="370"/>
-        <location filename="../core/cochran.c" line="409"/>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>rbt</source>
-        <translation>rbt</translation>
+        <location filename="../core/git-access.c" line="344"/>
+        <source>Remote storage and local data diverged. Error: merge failed (%s)</source>
+        <translation>Dati remoti e dati locali non coincidono. Errore: unione fallita (%s)</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="336"/>
-        <location filename="../core/cochran.c" line="390"/>
-        <location filename="../core/file.c" line="777"/>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>ascent</source>
-        <translation>risalita</translation>
+        <location filename="../core/git-access.c" line="374"/>
+        <source>Remote storage and local data diverged. Cannot combine local and remote changes</source>
+        <translation>Dati locali e dati remoti non coincidono. Non è possibile unire i cambiamenti locali e remoti</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="379"/>
-        <location filename="../core/cochran.c" line="426"/>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>ceiling</source>
-        <translation>ceiling</translation>
+        <location filename="../core/git-access.c" line="408"/>
+        <source>Remote storage and local data diverged</source>
+        <translation>Dati remoti e dati locali non coincidono</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>workload</source>
-        <translation>carico di lavoro</translation>
+        <location filename="../core/git-access.c" line="411"/>
+        <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source>
+        <translation>Dati remoti e dati locali non coincidono. Errore: impossibile scrivere i dati (%s)</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="395"/>
-        <location filename="../core/libdivecomputer.c" line="203"/>
-        <source>transmitter</source>
-        <translation>trasmettitore</translation>
+        <location filename="../core/git-access.c" line="420"/>
+        <source>Problems with local cache of Subsurface cloud data</source>
+        <translation>Problemi con la cache locale della memoria cloud Subsurface</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="203"/>
+        <location filename="../core/git-access.c" line="421"/>
+        <source>Moved cache data to %s. Please try the operation again.</source>
+        <translation>Dati della cache spostati in %s. Perfavore, riprova di nuovo</translation>
+    </message>
+    <message>
+        <location filename="../core/git-access.c" line="743"/>
+        <source>Error connecting to Subsurface cloud storage</source>
+        <translation>Errore nella connessione alla memoria cloud di Subsurface</translation>
+    </message>
+    <message>
+        <location filename="../core/git-access.c" line="746"/>
+        <source>git clone of %s failed (%s)</source>
+        <translation>Errore (%s) nel clone git di %s</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="210"/>
+        <location filename="../core/parse-xml.c" line="3317"/>
+        <location filename="../core/uemis-downloader.c" line="134"/>
+        <source>unknown</source>
+        <translation>sconosciuto</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>none</source>
+        <translation>nessuno</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>workload</source>
+        <translation>carico di lavoro</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="224"/>
         <source>violation</source>
         <translation>violazione</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="203"/>
+        <location filename="../core/libdivecomputer.c" line="224"/>
         <source>bookmark</source>
         <translation>segnalibro</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="203"/>
+        <location filename="../core/libdivecomputer.c" line="224"/>
         <source>surface</source>
         <translation>superficie</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="203"/>
+        <location filename="../core/libdivecomputer.c" line="224"/>
         <source>safety stop</source>
         <translation>sosta di sicurezza</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="365"/>
-        <location filename="../core/cochran.c" line="414"/>
-        <location filename="../core/cochran.c" line="421"/>
-        <location filename="../core/file.c" line="868"/>
-        <location filename="../core/libdivecomputer.c" line="204"/>
-        <location filename="../core/libdivecomputer.c" line="207"/>
-        <source>gaschange</source>
-        <translation>cambio gas</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="204"/>
+        <location filename="../core/libdivecomputer.c" line="225"/>
         <source>safety stop (voluntary)</source>
         <translation>sosta di sicurezza (facoltativa)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="204"/>
+        <location filename="../core/libdivecomputer.c" line="225"/>
         <source>safety stop (mandatory)</source>
         <translation>sosta di sicurezza (obbligatoria)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="205"/>
+        <location filename="../core/libdivecomputer.c" line="226"/>
         <source>deepstop</source>
         <translation>deepstop</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="205"/>
+        <location filename="../core/libdivecomputer.c" line="226"/>
         <source>ceiling (safety stop)</source>
         <translation>ceiling (sosta di sicurezza)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="205"/>
-        <source>divetime</source>
-        <translation>durata immersione</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="205"/>
+        <location filename="../core/libdivecomputer.c" line="226"/>
         <source>below floor</source>
         <comment>event showing dive is below deco floor and adding deco time</comment>
         <translation>sotto il piano</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="353"/>
-        <location filename="../core/libdivecomputer.c" line="206"/>
-        <source>maxdepth</source>
-        <translation>profondità massima</translation>
-    </message>
-    <message>
-        <location filename="../core/cochran.c" line="348"/>
-        <location filename="../core/libdivecomputer.c" line="206"/>
-        <source>OLF</source>
-        <translation>OLF</translation>
+        <location filename="../core/libdivecomputer.c" line="226"/>
+        <source>divetime</source>
+        <translation>durata immersione</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="206"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
         <source>airtime</source>
         <translation>tempo in aria</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="206"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
         <source>rgbm</source>
         <translation>rgbm</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="206"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
         <source>heading</source>
         <translation>intestazione</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="358"/>
-        <location filename="../core/cochran.c" line="404"/>
-        <location filename="../core/libdivecomputer.c" line="206"/>
-        <source>pO₂</source>
-        <translation>pO₂</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="207"/>
+        <location filename="../core/libdivecomputer.c" line="228"/>
         <source>tissue level warning</source>
         <translation>avviso del livello dei tessuti</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="207"/>
+        <location filename="../core/libdivecomputer.c" line="228"/>
         <source>non stop time</source>
         <translation>tempo di non stop</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="224"/>
+        <location filename="../core/libdivecomputer.c" line="237"/>
         <source>invalid event number</source>
         <translation>numero evento non valido</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="658"/>
-        <source>Unable to create parser for %s %s</source>
-        <translation>Impossibile creare un parser per %s %s</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="664"/>
-        <source>Error registering the data</source>
-        <translation>Errore registrando la data</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="495"/>
+        <location filename="../core/libdivecomputer.c" line="553"/>
         <source>Error parsing the datetime</source>
         <translation>Errore analizzando la data/il tempo</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="513"/>
+        <location filename="../core/libdivecomputer.c" line="571"/>
         <source>Dive %d: %s</source>
         <translation>Immersione #%d: %s</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="519"/>
+        <location filename="../core/libdivecomputer.c" line="577"/>
         <source>Error parsing the divetime</source>
         <translation>Errore analizzando il tempo di immersione</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="529"/>
+        <location filename="../core/libdivecomputer.c" line="587"/>
         <source>Error parsing the maxdepth</source>
         <translation>Errore analizzando la profondità massima</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="548"/>
+        <location filename="../core/libdivecomputer.c" line="606"/>
         <source>Error parsing temperature</source>
         <translation>Errore analizzando la temperatura</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="568"/>
+        <location filename="../core/libdivecomputer.c" line="626"/>
         <source>Error parsing the gas mix count</source>
         <translation>Errore analizzando il conteggio della miscela di gas</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="580"/>
+        <location filename="../core/libdivecomputer.c" line="638"/>
         <source>Error obtaining water salinity</source>
         <translation>Errore nell&apos;ottenimento della salinità dell&apos;acqua</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="589"/>
+        <location filename="../core/libdivecomputer.c" line="647"/>
         <source>Error obtaining surface pressure</source>
         <translation>Errore nell&apos;ottenere la pressione superficiale</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="614"/>
+        <location filename="../core/libdivecomputer.c" line="672"/>
         <source>Error obtaining divemode</source>
         <translation>Errore nell&apos;ottenere la modalità di immersione</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="634"/>
+        <location filename="../core/libdivecomputer.c" line="692"/>
         <source>Error parsing the gas mix</source>
         <translation>Errore analizzando la miscela di gas</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="684"/>
+        <location filename="../core/libdivecomputer.c" line="717"/>
+        <source>Unable to create parser for %s %s</source>
+        <translation>Impossibile creare un parser per %s %s</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="723"/>
+        <source>Error registering the data</source>
+        <translation>Errore registrando la data</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="744"/>
         <source>Error parsing the samples</source>
         <translation>Errore analizzando i campioni</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="822"/>
+        <location filename="../core/libdivecomputer.c" line="882"/>
         <source>Event: waiting for user action</source>
         <translation>Evento: in attesa dell&apos; azione dell&apos;utente.</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="830"/>
+        <location filename="../core/libdivecomputer.c" line="890"/>
         <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="../core/libdivecomputer.c" line="894"/>
+        <location filename="../core/libdivecomputer.c" line="954"/>
         <source>Error registering the event handler.</source>
         <translation>Errore registrando il gestore degli eventi.</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="899"/>
+        <location filename="../core/libdivecomputer.c" line="959"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Errore registrando il gestore della cancellazione.</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="920"/>
+        <location filename="../core/libdivecomputer.c" line="980"/>
         <source>Dive data import error</source>
         <translation>Errore importazione dati immersione</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="959"/>
+        <location filename="../core/libdivecomputer.c" line="1019"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Impossibile creare un contesto libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="966"/>
+        <location filename="../core/libdivecomputer.c" line="1026"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Impossibile aprire %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="992"/>
+        <location filename="../core/libdivecomputer.c" line="1048"/>
         <source>Insufficient privileges to open the device %s %s (%s)</source>
         <translation>Privilegi insufficienti per aprire il dispositivo %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../core/parse-xml.c" line="517"/>
-        <source>Strange percentage reading %s
+        <location filename="../core/load-git.c" line="194"/>
+        <location filename="../core/parse-xml.c" line="1242"/>
+        <source>multiple GPS locations for this dive site; also %s
 </source>
-        <translation>Lettura di strane percentuali %s
-
+        <translation>Ci sono più coordinate GPS per questo luogo di immersione, anche %s
 </translation>
     </message>
     <message>
-        <location filename="../core/load-git.c" line="194"/>
-        <location filename="../core/parse-xml.c" line="1238"/>
-        <source>multiple GPS locations for this dive site; also %s
+        <location filename="../core/load-git.c" line="222"/>
+        <location filename="../core/parse-xml.c" line="1304"/>
+        <source>additional name for site: %s
 </source>
-        <translation>Ci sono più coordinate GPS per questo luogo di immersione, anche %s
+        <translation>nome addizionale per il sito: %s
+</translation>
+    </message>
+    <message>
+        <location filename="../core/ostctools.c" line="120"/>
+        <location filename="../core/ostctools.c" line="152"/>
+        <source>Unknown DC in dive %d</source>
+        <translation>Computer da immersione sconosciuto nella immersione %d</translation>
+    </message>
+    <message>
+        <location filename="../core/ostctools.c" line="165"/>
+        <source>Error - %s - parsing dive %d</source>
+        <translation>Errore - %s - nel parsing dell&apos;immersione %d</translation>
+    </message>
+    <message>
+        <location filename="../core/parse-xml.c" line="517"/>
+        <source>Strange percentage reading %s
+</source>
+        <translation>Lettura di strane percentuali %s
+
 </translation>
     </message>
     <message>
-        <location filename="../core/parse-xml.c" line="2044"/>
+        <location filename="../core/parse-xml.c" line="2051"/>
         <source>Failed to parse &apos;%s&apos;</source>
         <translation>Impossibile analizzare  &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../core/parse-xml.c" line="3741"/>
+        <location filename="../core/parse-xml.c" line="3774"/>
         <source>Can&apos;t open stylesheet %s</source>
         <translation>Non é possibile aprire il foglio di stile %s</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="86"/>
-        <source>EAN%d</source>
-        <translation>EAN%d</translation>
+        <location filename="../core/planner.c" line="555"/>
+        <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE %s ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source>
+        <translation>ESONERO DI RESPONSABILITÀ&apos;: QUESTA E&apos; UNA NUOVA REALIZZAZIONE DELL&apos;ALGORITMO %s E DEL RELATIVO PIANIFICATORE DI IMMERSIONE. ENTRAMBI HANNO RICEVUTO DEI TEST LIMITATI PER CUI RACCOMANDIAMO CON FORZA DI NON PIANIFICARE IMMERSIONI SEMPLICEMENTE SULLA BASE DEI DATI CALCOLATI QUI. </translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="1032"/>
-        <location filename="../core/planner.c" line="1184"/>
-        <source>Can&apos;t find gas %s</source>
-        <translation>Non trovo il gas %s</translation>
+        <location filename="../core/planner.c" line="569"/>
+        <source>Decompression calculation aborted due to excessive time</source>
+        <translation>Calcolo della decompressione annullato per tempo eccessivo</translation>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="571"/>
+        <location filename="../core/planner.c" line="829"/>
+        <location filename="../core/planner.c" line="834"/>
+        <location filename="../core/planner.c" line="860"/>
+        <location filename="../core/planner.c" line="870"/>
+        <source>Warning:</source>
+        <translation>Avviso</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="368"/>
-        <source>Too many gas mixes</source>
-        <translation>Troppe miscele gas</translation>
+        <location filename="../core/planner.c" line="581"/>
+        <source>based on Bühlmann ZHL-16C with GFlow = %d and GFhigh = %d</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="568"/>
-        <source>Decompression calculation aborted due to excessive time</source>
-        <translation>Calcolo della decompressione annullato per tempo eccessivo</translation>
+        <location filename="../core/planner.c" line="586"/>
+        <source>based on VPM-B at nominal conservatism</source>
+        <translation>basato su VPM-B senza conservatorismo.</translation>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="588"/>
+        <source>based on VPM-B at +%d conservatism</source>
+        <translation>basato su VPM-B con conseratorismo +%d</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="592"/>
+        <location filename="../core/planner.c" line="590"/>
+        <source>, effective GF=%d/%d</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="594"/>
+        <source>recreational mode based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source>
+        <translation>modalita ricreativa basata su Bühlmann ZHL-16B con GFlow = %d e GFhigh = %d</translation>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="598"/>
         <source>Subsurface dive plan</source>
         <translation>Piano di immersione di Subsurface </translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="596"/>
-        <source>depth</source>
-        <translation>profondità</translation>
+        <location filename="../core/planner.c" line="599"/>
+        <source>&lt;div&gt;Runtime: %dmin&lt;/div&gt;&lt;br&gt;</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="602"/>
-        <source>runtime</source>
-        <translation>runtime</translation>
+        <location filename="../core/planner.c" line="604"/>
+        <source>depth</source>
+        <translation>profondità</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="599"/>
+        <location filename="../core/planner.c" line="607"/>
         <source>duration</source>
         <translation>durata</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="554"/>
-        <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE %s ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source>
-        <translation>ESONERO DI RESPONSABILITÀ&apos;: QUESTA E&apos; UNA NUOVA REALIZZAZIONE DELL&apos;ALGORITMO %s E DEL RELATIVO PIANIFICATORE DI IMMERSIONE. ENTRAMBI HANNO RICEVUTO DEI TEST LIMITATI PER CUI RACCOMANDIAMO CON FORZA DI NON PIANIFICARE IMMERSIONI SEMPLICEMENTE SULLA BASE DEI DATI CALCOLATI QUI. </translation>
+        <location filename="../core/planner.c" line="610"/>
+        <source>runtime</source>
+        <translation>runtime</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="605"/>
+        <location filename="../core/planner.c" line="613"/>
         <source>gas</source>
         <translation>gas</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="648"/>
+        <location filename="../core/planner.c" line="656"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation>Passare a %.*f %s in %d:%02d min - runtime %d:%02u su %s (SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="656"/>
+        <location filename="../core/planner.c" line="664"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source>
         <translation>Passaggio a %.*f %s al %d:%02d min - runtime %d:%02u con %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="669"/>
+        <location filename="../core/planner.c" line="677"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation>Rimani a %.*f %s per %d:%02d min - runtime %d:%02u su %s (SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="676"/>
+        <location filename="../core/planner.c" line="684"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source>
         <translation>Rimani a %.*f %s per %d:%02d min - runtime %d:%02u con %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="721"/>
+        <location filename="../core/planner.c" line="729"/>
         <source>%3.0f%s</source>
         <translation>%3.0f%s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="724"/>
-        <location filename="../core/planner.c" line="728"/>
+        <location filename="../core/planner.c" line="732"/>
+        <location filename="../core/planner.c" line="736"/>
         <source>%3dmin</source>
         <translation>%3dmin</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="737"/>
-        <location filename="../core/planner.c" line="749"/>
+        <location filename="../core/planner.c" line="745"/>
+        <location filename="../core/planner.c" line="757"/>
         <source>(SP = %.1fbar)</source>
         <translation>(SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="772"/>
+        <location filename="../core/planner.c" line="780"/>
         <source>Switch gas to %s (SP = %.1fbar)</source>
         <translation>Cambio gas a %s (SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="774"/>
+        <location filename="../core/planner.c" line="782"/>
         <source>Switch gas to %s</source>
         <translation>Passa al gas %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="793"/>
+        <location filename="../core/planner.c" line="801"/>
         <source>CNS</source>
         <translation>CNS</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="795"/>
+        <location filename="../core/planner.c" line="803"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="799"/>
+        <location filename="../core/planner.c" line="807"/>
         <source>Gas consumption (CCR legs excluded):</source>
         <translation>Consumo del gas (CCR legs escluse):</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="801"/>
+        <location filename="../core/planner.c" line="809"/>
         <source>Gas consumption:</source>
         <translation>Consumo gas:</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="570"/>
-        <location filename="../core/planner.c" line="821"/>
-        <location filename="../core/planner.c" line="826"/>
-        <location filename="../core/planner.c" line="851"/>
-        <location filename="../core/planner.c" line="861"/>
-        <source>Warning:</source>
-        <translation>Avviso</translation>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="580"/>
-        <source>based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source>
-        <translation>basato su Bühlmann ZHL-16B con GFlow = %d e GFhigh = %d</translation>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="584"/>
-        <source>based on VPM-B at nominal conservatism</source>
-        <translation>basato su VPM-B senza conservatorismo.</translation>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="586"/>
-        <source>based on VPM-B at +%d conservatism</source>
-        <translation>basato su VPM-B con conseratorismo +%d</translation>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="588"/>
-        <source>recreational mode based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source>
-        <translation>modalita ricreativa basata su Bühlmann ZHL-16B con GFlow = %d e GFhigh = %d</translation>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="822"/>
+        <location filename="../core/planner.c" line="830"/>
         <source>this is more gas than available in the specified cylinder!</source>
         <translation>il gas necessario è superiore a quello disponibile nella bombola</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="827"/>
+        <location filename="../core/planner.c" line="835"/>
         <source>not enough reserve for gas sharing on ascent!</source>
         <translation>riserva di gas non sufficiente per la condivisione in risalita</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="829"/>
+        <location filename="../core/planner.c" line="837"/>
         <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source>
         <translation>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s nella risalita pianificata)</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="831"/>
+        <location filename="../core/planner.c" line="839"/>
         <source>%.0f%s (%.0f%s during planned ascent) of %s</source>
         <translation>%.0f%s (%.0f%s durante la risalita pianificata) di %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="848"/>
+        <location filename="../core/planner.c" line="857"/>
         <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
         <translation>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="858"/>
+        <location filename="../core/planner.c" line="867"/>
         <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
         <translation>Valore pO₂ basso %.2f a %d:%02u con il gas %s aalla profondità %.*f %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="1419"/>
+        <location filename="../core/planner.c" line="1194"/>
+        <source>Can&apos;t find gas %s</source>
+        <translation>Non trovo il gas %s</translation>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="1440"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1280"/>
+        <location filename="../core/profile.c" line="1298"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
@@ -9263,28 +9788,28 @@ D:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1283"/>
+        <location filename="../core/profile.c" line="1301"/>
         <source>P: %d%s
 </source>
         <translation>P:%d%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1287"/>
+        <location filename="../core/profile.c" line="1305"/>
         <source>T: %.1f%s
 </source>
         <translation>T: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1293"/>
+        <location filename="../core/profile.c" line="1311"/>
         <source>V: %.1f%s
 </source>
         <translation>V: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1296"/>
+        <location filename="../core/profile.c" line="1314"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation>CAS: %.*f%s/min
@@ -9292,42 +9817,42 @@ D:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1298"/>
+        <location filename="../core/profile.c" line="1316"/>
         <source>CNS: %u%%
 </source>
         <translation>CNS: %u%%
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1300"/>
+        <location filename="../core/profile.c" line="1318"/>
         <source>pO%s: %.2fbar
 </source>
         <translation>pO₂%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1302"/>
+        <location filename="../core/profile.c" line="1320"/>
         <source>pN%s: %.2fbar
 </source>
         <translation>pN₂ %s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1304"/>
+        <location filename="../core/profile.c" line="1322"/>
         <source>pHe: %.2fbar
 </source>
         <translation>pHe: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1307"/>
+        <location filename="../core/profile.c" line="1325"/>
         <source>MOD: %d%s
 </source>
         <translation>MOD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1314"/>
+        <location filename="../core/profile.c" line="1332"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
@@ -9336,7 +9861,7 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1318"/>
+        <location filename="../core/profile.c" line="1336"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
@@ -9345,174 +9870,179 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1331"/>
+        <location filename="../core/profile.c" line="1349"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation>Sosta di sicurezza: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1334"/>
+        <location filename="../core/profile.c" line="1352"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation>Sosta di sicurezza: @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1339"/>
+        <location filename="../core/profile.c" line="1357"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation>Deco: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1342"/>
+        <location filename="../core/profile.c" line="1360"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation>Deco: temo di sosta sconosciuto @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1346"/>
+        <location filename="../core/profile.c" line="1364"/>
         <source>In deco
 </source>
         <translation>In deco
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1348"/>
+        <location filename="../core/profile.c" line="1366"/>
         <source>NDL: %umin
 </source>
         <translation>NDL: %umin
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1351"/>
+        <location filename="../core/profile.c" line="1369"/>
         <source>TTS: %umin
 </source>
         <translation>TTS: %umin
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1354"/>
+        <location filename="../core/profile.c" line="1372"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation>Deco: %umin @ %.0f%s (calc)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1362"/>
+        <location filename="../core/profile.c" line="1380"/>
         <source>In deco (calc)
 </source>
         <translation>In deco (calc)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1365"/>
+        <location filename="../core/profile.c" line="1383"/>
         <source>NDL: %umin (calc)
 </source>
         <translation>NDL:%umin (calc)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1367"/>
+        <location filename="../core/profile.c" line="1385"/>
         <source>NDL: &gt;2h (calc)
 </source>
         <translation>NDL: &gt;2h (calc)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1371"/>
+        <location filename="../core/profile.c" line="1389"/>
         <source>TTS: %umin (calc)
 </source>
         <translation>TTS: %umin (calc)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1373"/>
+        <location filename="../core/profile.c" line="1391"/>
         <source>TTS: &gt;2h (calc)
 </source>
         <translation>TTS: &gt;2h (calc)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1376"/>
+        <location filename="../core/profile.c" line="1394"/>
         <source>RBT: %umin
 </source>
         <translation>RBT: %umin
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1379"/>
+        <location filename="../core/profile.c" line="1397"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation>Ceiling calcolato %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1385"/>
+        <location filename="../core/profile.c" line="1403"/>
         <source>Tissue %.0fmin: %.1f%s
 </source>
         <translation>Tessuti %.0fmin: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1391"/>
+        <location filename="../core/profile.c" line="1409"/>
         <source>heartbeat: %d
 </source>
         <translation>Battito cardiaco: %d
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1393"/>
+        <location filename="../core/profile.c" line="1411"/>
         <source>bearing: %d
 </source>
         <translation>Direzione: %d
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1396"/>
+        <location filename="../core/profile.c" line="1414"/>
         <source>mean depth to here %.1f%s
 </source>
         <translation>Profondità media fin qui %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1491"/>
+        <location filename="../core/profile.c" line="1515"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1495"/>
-        <location filename="../core/profile.c" line="1499"/>
-        <location filename="../core/profile.c" line="1503"/>
+        <location filename="../core/profile.c" line="1519"/>
+        <location filename="../core/profile.c" line="1523"/>
+        <location filename="../core/profile.c" line="1527"/>
         <source>%s %sD:%.1f%s</source>
         <translation>%s %sD:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1507"/>
+        <location filename="../core/profile.c" line="1531"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sD:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1511"/>
+        <location filename="../core/profile.c" line="1535"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1515"/>
-        <location filename="../core/profile.c" line="1519"/>
+        <location filename="../core/profile.c" line="1539"/>
+        <location filename="../core/profile.c" line="1543"/>
         <source>%s %sV:%.2f%s</source>
         <translation>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1526"/>
+        <location filename="../core/profile.c" line="1550"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s</translation>
     </message>
     <message>
+        <location filename="../core/profile.c" line="1575"/>
+        <source>%s SAC:%.*f %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../core/qthelper.cpp" line="67"/>
         <source>%1km</source>
         <translation>%1km</translation>
@@ -9533,446 +10063,460 @@ EADD: %d%s
         <translation>%1yd</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="635"/>
+        <location filename="../core/qthelper.cpp" line="91"/>
+        <location filename="../core/qthelper.cpp" line="226"/>
+        <source>N</source>
+        <translation>N</translation>
+    </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="91"/>
+        <location filename="../core/qthelper.cpp" line="227"/>
+        <source>S</source>
+        <translation>S</translation>
+    </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="92"/>
+        <location filename="../core/qthelper.cpp" line="228"/>
+        <source>E</source>
+        <translation>E</translation>
+    </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="92"/>
+        <location filename="../core/qthelper.cpp" line="229"/>
+        <source>W</source>
+        <translation>W</translation>
+    </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="640"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="638"/>
+        <location filename="../core/qthelper.cpp" line="643"/>
         <source>F</source>
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="23"/>
-        <source>boat</source>
-        <translation>barca</translation>
+        <location filename="../core/save-html.c" line="469"/>
+        <location filename="../core/save-html.c" line="553"/>
+        <location filename="../core/worldmap-save.c" line="111"/>
+        <source>Can&apos;t open file %s</source>
+        <translation>Non posso aprire il file %s</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="23"/>
-        <source>shore</source>
-        <translation>riva</translation>
+        <location filename="../core/save-html.c" line="488"/>
+        <source>Number</source>
+        <translation>Numero</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="459"/>
-        <location filename="../core/dive.c" line="23"/>
-        <source>drift</source>
-        <translation>in corrente</translation>
+        <location filename="../core/save-html.c" line="489"/>
+        <source>Date</source>
+        <translation>Data</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="24"/>
-        <source>deep</source>
-        <translation>profondo</translation>
+        <location filename="../core/save-html.c" line="490"/>
+        <source>Time</source>
+        <translation>Ora</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="24"/>
-        <source>cavern</source>
-        <translation>caverna</translation>
+        <location filename="../core/save-html.c" line="491"/>
+        <source>Location</source>
+        <translation>Luogo</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="443"/>
-        <location filename="../core/dive.c" line="24"/>
-        <source>ice</source>
-        <translation>ghiaccio</translation>
+        <location filename="../core/save-html.c" line="492"/>
+        <source>Air temp.</source>
+        <translation>Temperatura atmosferica</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="445"/>
-        <source>search</source>
-        <translation>cerca</translation>
+        <location filename="../core/save-html.c" line="493"/>
+        <source>Water temp.</source>
+        <translation>Temperatura dell&apos;acqua</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="455"/>
-        <location filename="../core/dive.c" line="25"/>
-        <source>wreck</source>
-        <translation>relitto</translation>
+        <location filename="../core/save-html.c" line="494"/>
+        <source>Dives</source>
+        <translation>Immersioni</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="441"/>
-        <location filename="../core/dive.c" line="25"/>
-        <source>cave</source>
-        <translation>grotta</translation>
+        <location filename="../core/save-html.c" line="495"/>
+        <source>Expand all</source>
+        <translation>Espandi tutto</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="25"/>
-        <source>altitude</source>
-        <translation>altitudine</translation>
+        <location filename="../core/save-html.c" line="496"/>
+        <source>Collapse all</source>
+        <translation>Minimizza tutto</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="26"/>
-        <source>pool</source>
-        <translation>piscina</translation>
+        <location filename="../core/save-html.c" line="497"/>
+        <source>Trips</source>
+        <translation>Viaggi</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="26"/>
-        <source>lake</source>
-        <translation>lago</translation>
+        <location filename="../core/save-html.c" line="498"/>
+        <source>Statistics</source>
+        <translation>Statistiche</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="457"/>
-        <location filename="../core/dive.c" line="26"/>
-        <source>river</source>
-        <translation>fiume</translation>
+        <location filename="../core/save-html.c" line="499"/>
+        <source>Advanced search</source>
+        <translation>Ricerca avanzata</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="439"/>
-        <location filename="../core/dive.c" line="27"/>
-        <source>night</source>
-        <translation>notte</translation>
+        <location filename="../core/save-html.c" line="502"/>
+        <source>Rating</source>
+        <translation>Valutazione</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="153"/>
-        <source>Error: the file does not appear to be a DATATRAK divelog</source>
-        <translation>Errore: il file non sembra essere un log di immersioni DATATRAK</translation>
+        <location filename="../core/save-html.c" line="503"/>
+        <source>Visibility</source>
+        <translation>Visibilità</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="286"/>
-        <source>clear</source>
-        <translation>cancellare</translation>
+        <location filename="../core/save-html.c" line="504"/>
+        <source>Duration</source>
+        <translation>Durata</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="289"/>
-        <source>misty</source>
-        <translation>offuscato</translation>
+        <location filename="../core/save-html.c" line="505"/>
+        <source>Divemaster</source>
+        <translation>Divemaster</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="292"/>
-        <source>fog</source>
-        <translation>nebbia</translation>
+        <location filename="../core/save-html.c" line="506"/>
+        <source>Buddy</source>
+        <translation>Compagno</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="295"/>
-        <source>rain</source>
-        <translation>pioggia</translation>
+        <location filename="../core/save-html.c" line="507"/>
+        <source>Suit</source>
+        <translation>Muta</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="298"/>
-        <source>storm</source>
-        <translation>temporale</translation>
+        <location filename="../core/save-html.c" line="508"/>
+        <source>Tags</source>
+        <translation>Tags</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="301"/>
-        <source>snow</source>
-        <translation>neve</translation>
+        <location filename="../core/save-html.c" line="509"/>
+        <location filename="../smtk-import/smartrak.c" line="251"/>
+        <location filename="../smtk-import/smartrak.c" line="321"/>
+        <source>Notes</source>
+        <translation>Note</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="321"/>
-        <source>No suit</source>
-        <translation>Nessuna muta</translation>
+        <location filename="../core/save-html.c" line="510"/>
+        <source>Show more details</source>
+        <translation>Mostra maggiori dettagli</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="324"/>
-        <source>Shorty</source>
-        <translation>Muta corta</translation>
+        <location filename="../core/save-html.c" line="513"/>
+        <source>Yearly statistics</source>
+        <translation>Statistiche Annuali</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="327"/>
-        <source>Combi</source>
-        <translation>Combi</translation>
+        <location filename="../core/save-html.c" line="514"/>
+        <source>Year</source>
+        <translation>Anno</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="330"/>
-        <source>Wet suit</source>
-        <translation>Muta umida</translation>
+        <location filename="../core/save-html.c" line="515"/>
+        <source>Total time</source>
+        <translation>Tempo totale</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="333"/>
-        <source>Semidry suit</source>
-        <translation>Muta semistagna</translation>
+        <location filename="../core/save-html.c" line="516"/>
+        <source>Average time</source>
+        <translation>Durata media</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="336"/>
-        <source>Dry suit</source>
-        <translation>Muta stagna</translation>
+        <location filename="../core/save-html.c" line="517"/>
+        <source>Shortest time</source>
+        <translation>Durata più breve</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="396"/>
-        <source>no stop</source>
-        <translation>no stop</translation>
+        <location filename="../core/save-html.c" line="518"/>
+        <source>Longest time</source>
+        <translation>Durata più lunga</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="400"/>
-        <source>single ascent</source>
-        <translation>risalita singola</translation>
+        <location filename="../core/save-html.c" line="519"/>
+        <source>Average depth</source>
+        <translation>Profondità media</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="402"/>
-        <source>multiple ascent</source>
-        <translation>risalita multipla</translation>
+        <location filename="../core/save-html.c" line="520"/>
+        <source>Min. depth</source>
+        <translation>Profondità minima</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="404"/>
-        <location filename="../core/dive.c" line="27"/>
-        <source>fresh</source>
-        <translation>acqua dolce</translation>
+        <location filename="../core/save-html.c" line="521"/>
+        <source>Max. depth</source>
+        <translation>Profondità massima</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="406"/>
-        <source>salt water</source>
-        <translation>acqua salata</translation>
+        <location filename="../core/save-html.c" line="522"/>
+        <source>Average SAC</source>
+        <translation>CAS medio</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="431"/>
-        <source>sight seeing</source>
-        <translation>gita</translation>
+        <location filename="../core/save-html.c" line="523"/>
+        <source>Min. SAC</source>
+        <translation>CAS minimo</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="433"/>
-        <source>club dive</source>
-        <translation>immersione di club</translation>
+        <location filename="../core/save-html.c" line="524"/>
+        <source>Max. SAC</source>
+        <translation>CAS massimo</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="437"/>
-        <source>instruction</source>
-        <translation>istruzione</translation>
+        <location filename="../core/save-html.c" line="525"/>
+        <source>Average temp.</source>
+        <translation>Temperatura media</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="463"/>
-        <source>other</source>
-        <translation>altro</translation>
+        <location filename="../core/save-html.c" line="526"/>
+        <source>Min. temp.</source>
+        <translation>Temperatura minima</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="474"/>
-        <source>Other activities</source>
-        <translation>Altre attività</translation>
+        <location filename="../core/save-html.c" line="527"/>
+        <source>Max. temp.</source>
+        <translation>Temperatura massima</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="498"/>
-        <source>Datatrak/Wlog notes</source>
-        <translation>Note Datatrak/Wlog</translation>
+        <location filename="../core/save-html.c" line="528"/>
+        <source>Back to list</source>
+        <translation>Indietro alla lista</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="537"/>
-        <source>Manually entered dive</source>
-        <translation>Immersione inserita manualmente</translation>
+        <location filename="../core/save-html.c" line="531"/>
+        <source>Dive No.</source>
+        <translation>Immersione n.</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="588"/>
-        <source>Unknown</source>
-        <translation>Sconosiuto</translation>
+        <location filename="../core/save-html.c" line="532"/>
+        <source>Dive profile</source>
+        <translation>Profilo di immersione</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="674"/>
-        <source>Error: couldn&apos;t open the file %s</source>
-        <translation>Errore: impossibile aprire il file %s</translation>
+        <location filename="../core/save-html.c" line="533"/>
+        <source>Dive information</source>
+        <translation>informazioni dell&apos;immersione</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="687"/>
-        <source>Error: no dive</source>
-        <translation>Errore: nessuna immersione</translation>
+        <location filename="../core/save-html.c" line="534"/>
+        <source>Dive equipment</source>
+        <translation>Attrezzatura</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="27"/>
-        <source>student</source>
-        <translation>allievo</translation>
+        <location filename="../core/save-html.c" line="535"/>
+        <location filename="../core/save-html.c" line="542"/>
+        <source>Type</source>
+        <translation>Tipo</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="461"/>
-        <location filename="../core/dive.c" line="28"/>
-        <source>photo</source>
-        <translation>foto</translation>
+        <location filename="../core/save-html.c" line="536"/>
+        <source>Size</source>
+        <translation>Dimensione</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="28"/>
-        <source>video</source>
-        <translation>video</translation>
+        <location filename="../core/save-html.c" line="537"/>
+        <source>Work pressure</source>
+        <translation>Pressione di esercizio</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="435"/>
-        <location filename="../core/dive.c" line="28"/>
-        <source>instructor</source>
-        <translation>istruttore</translation>
+        <location filename="../core/save-html.c" line="538"/>
+        <source>Start pressure</source>
+        <translation>Pressione iniziale</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="398"/>
-        <location filename="../core/dive.c" line="29"/>
-        <source>deco</source>
-        <translation>deco</translation>
+        <location filename="../core/save-html.c" line="539"/>
+        <source>End pressure</source>
+        <translation>Pressione finale</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="33"/>
-        <source>OC-gas</source>
-        <translation>OC-gas</translation>
+        <location filename="../core/save-html.c" line="540"/>
+        <source>Gas</source>
+        <translation>Gas</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="33"/>
-        <source>diluent</source>
-        <translation>diluente</translation>
+        <location filename="../core/save-html.c" line="541"/>
+        <source>Weight</source>
+        <translation>Peso</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="33"/>
-        <location filename="../core/equipment.c" line="88"/>
-        <location filename="../core/planner.c" line="1415"/>
-        <location filename="../core/planner.c" line="1418"/>
-        <source>oxygen</source>
-        <translation>ossigeno</translation>
+        <location filename="../core/save-html.c" line="543"/>
+        <source>Events</source>
+        <translation>Eventi</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="227"/>
-        <source>ℓ</source>
-        <translation>ℓ</translation>
+        <location filename="../core/save-html.c" line="544"/>
+        <source>Name</source>
+        <translation>Nome</translation>
+    </message>
+    <message>
+        <location filename="../core/save-html.c" line="545"/>
+        <source>Value</source>
+        <translation>Valore</translation>
+    </message>
+    <message>
+        <location filename="../core/save-html.c" line="546"/>
+        <source>Coordinates</source>
+        <translation>Coordinate</translation>
+    </message>
+    <message>
+        <location filename="../core/save-html.c" line="547"/>
+        <source>Dive status</source>
+        <translation>Stato dell&apos;immersione</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="239"/>
+        <location filename="../core/statistics.c" line="242"/>
         <source>more than %d days</source>
         <translation>più di %d giorni</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="246"/>
+        <location filename="../core/statistics.c" line="249"/>
         <source>%dd %dh %dmin</source>
         <translation>%dG %dh %dmin</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="249"/>
+        <location filename="../core/statistics.c" line="252"/>
         <source>%dmin %dsecs</source>
         <translation>%dmin %ds</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="251"/>
+        <location filename="../core/statistics.c" line="254"/>
         <source>%dh %dmin</source>
         <translation>%dh %dmin</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="263"/>
+        <location filename="../core/statistics.c" line="266"/>
         <source>for dives #</source>
         <translation>per l&apos;immersione nº</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="269"/>
+        <location filename="../core/statistics.c" line="272"/>
         <source>for selected dives</source>
         <translation>per le immersioni selezionate</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="304"/>
+        <location filename="../core/statistics.c" line="307"/>
         <source>for dive #%d</source>
         <translation>per l&apos;immersione nº%d</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="306"/>
+        <location filename="../core/statistics.c" line="309"/>
         <source>for selected dive</source>
         <translation>per l&apos;immersione selezionata</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="308"/>
+        <location filename="../core/statistics.c" line="311"/>
         <source>for all dives</source>
         <translation>per tutte le immersioni</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="310"/>
+        <location filename="../core/statistics.c" line="313"/>
         <source>(no dives)</source>
         <translation>(nessuna immersione)</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Sun</source>
         <translation>Dom</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Mon</source>
         <translation>Lun</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Tue</source>
         <translation>Mar</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Wed</source>
         <translation>Mer</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Thu</source>
         <translation>Gio</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Fri</source>
         <translation>Ven</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Sat</source>
         <translation>Sab</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Jan</source>
         <translation>Gen</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Feb</source>
         <translation>Feb</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Mar</source>
         <translation>Mar</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Apr</source>
         <translation>Apr</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>May</source>
         <translation>Mag</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Jun</source>
         <translation>Giu</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Jul</source>
         <translation>Lug</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Aug</source>
         <translation>Ago</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Sep</source>
         <translation>Set</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Oct</source>
         <translation>Ott</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Nov</source>
         <translation>Nov</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Dec</source>
         <translation>Dic</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="191"/>
-        <location filename="../core/parse-xml.c" line="3284"/>
-        <location filename="../core/uemis-downloader.c" line="134"/>
-        <source>unknown</source>
-        <translation>sconosciuto</translation>
-    </message>
-    <message>
-        <location filename="../core/uemis-downloader.c" line="467"/>
-        <source>data</source>
-        <translation>data</translation>
-    </message>
-    <message>
-        <location filename="../core/uemis-downloader.c" line="447"/>
-        <source>%s %s</source>
-        <translation>%s %s</translation>
-    </message>
-    <message>
         <location filename="../core/uemis-downloader.c" line="27"/>
         <source>Uemis Zurich: the file system is almost full.
 Disconnect/reconnect the dive computer
@@ -10003,6 +10547,16 @@ Lo Uemis Zurich e&apos; collegato correttamente?</translation>
         <translation>nessuna immersione da scaricare</translation>
     </message>
     <message>
+        <location filename="../core/uemis-downloader.c" line="447"/>
+        <source>%s %s</source>
+        <translation>%s %s</translation>
+    </message>
+    <message>
+        <location filename="../core/uemis-downloader.c" line="467"/>
+        <source>data</source>
+        <translation>data</translation>
+    </message>
+    <message>
         <location filename="../core/uemis-downloader.c" line="495"/>
         <source>divelog #</source>
         <translation>divelog #</translation>
@@ -10173,281 +10727,6 @@ Lo Uemis Zurich e&apos; collegato correttamente?</translation>
         <translation>Allarme batteria scarica</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="469"/>
-        <location filename="../core/save-html.c" line="553"/>
-        <location filename="../core/worldmap-save.c" line="111"/>
-        <source>Can&apos;t open file %s</source>
-        <translation>Non posso aprire il file %s</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="488"/>
-        <source>Number</source>
-        <translation>Numero</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="489"/>
-        <source>Date</source>
-        <translation>Data</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="490"/>
-        <source>Time</source>
-        <translation>Ora</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="491"/>
-        <source>Location</source>
-        <translation>Luogo</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="492"/>
-        <source>Air temp.</source>
-        <translation>Temperatura atmosferica</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="493"/>
-        <source>Water temp.</source>
-        <translation>Temperatura dell&apos;acqua</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="498"/>
-        <source>Statistics</source>
-        <translation>Statistiche</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="502"/>
-        <source>Rating</source>
-        <translation>Valutazione</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="503"/>
-        <source>Visibility</source>
-        <translation>Visibilità</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="504"/>
-        <source>Duration</source>
-        <translation>Durata</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="494"/>
-        <source>Dives</source>
-        <translation>Immersioni</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="495"/>
-        <source>Expand all</source>
-        <translation>Espandi tutto</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="496"/>
-        <source>Collapse all</source>
-        <translation>Minimizza tutto</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="497"/>
-        <source>Trips</source>
-        <translation>Viaggi</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="499"/>
-        <source>Advanced search</source>
-        <translation>Ricerca avanzata</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="505"/>
-        <source>Divemaster</source>
-        <translation>Divemaster</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="506"/>
-        <source>Buddy</source>
-        <translation>Compagno</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="507"/>
-        <source>Suit</source>
-        <translation>Muta</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="508"/>
-        <source>Tags</source>
-        <translation>Tags</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="509"/>
-        <location filename="../smtk-import/smartrak.c" line="251"/>
-        <location filename="../smtk-import/smartrak.c" line="321"/>
-        <source>Notes</source>
-        <translation>Note</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="510"/>
-        <source>Show more details</source>
-        <translation>Mostra maggiori dettagli</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="513"/>
-        <source>Yearly statistics</source>
-        <translation>Statistiche Annuali</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="514"/>
-        <source>Year</source>
-        <translation>Anno</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="515"/>
-        <source>Total time</source>
-        <translation>Tempo totale</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="516"/>
-        <source>Average time</source>
-        <translation>Durata media</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="517"/>
-        <source>Shortest time</source>
-        <translation>Durata più breve</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="518"/>
-        <source>Longest time</source>
-        <translation>Durata più lunga</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="519"/>
-        <source>Average depth</source>
-        <translation>Profondità media</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="520"/>
-        <source>Min. depth</source>
-        <translation>Profondità minima</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="521"/>
-        <source>Max. depth</source>
-        <translation>Profondità massima</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="523"/>
-        <source>Min. SAC</source>
-        <translation>CAS minimo</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="524"/>
-        <source>Max. SAC</source>
-        <translation>CAS massimo</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="525"/>
-        <source>Average temp.</source>
-        <translation>Temperatura media</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="526"/>
-        <source>Min. temp.</source>
-        <translation>Temperatura minima</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="527"/>
-        <source>Max. temp.</source>
-        <translation>Temperatura massima</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="528"/>
-        <source>Back to list</source>
-        <translation>Indietro alla lista</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="534"/>
-        <source>Dive equipment</source>
-        <translation>Attrezzatura</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="537"/>
-        <source>Work pressure</source>
-        <translation>Pressione di esercizio</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="538"/>
-        <source>Start pressure</source>
-        <translation>Pressione iniziale</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="539"/>
-        <source>End pressure</source>
-        <translation>Pressione finale</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="547"/>
-        <source>Dive status</source>
-        <translation>Stato dell&apos;immersione</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="522"/>
-        <source>Average SAC</source>
-        <translation>CAS medio</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="531"/>
-        <source>Dive No.</source>
-        <translation>Immersione n.</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="532"/>
-        <source>Dive profile</source>
-        <translation>Profilo di immersione</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="533"/>
-        <source>Dive information</source>
-        <translation>informazioni dell&apos;immersione</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="535"/>
-        <location filename="../core/save-html.c" line="542"/>
-        <source>Type</source>
-        <translation>Tipo</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="536"/>
-        <source>Size</source>
-        <translation>Dimensione</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="540"/>
-        <source>Gas</source>
-        <translation>Gas</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="541"/>
-        <source>Weight</source>
-        <translation>Peso</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="543"/>
-        <source>Events</source>
-        <translation>Eventi</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="544"/>
-        <source>Name</source>
-        <translation>Nome</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="545"/>
-        <source>Value</source>
-        <translation>Valore</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="546"/>
-        <source>Coordinates</source>
-        <translation>Coordinate</translation>
-    </message>
-    <message>
         <location filename="../core/worldmap-save.c" line="39"/>
         <source>Date:</source>
         <translation>Data:</translation>
@@ -10493,110 +10772,6 @@ Lo Uemis Zurich e&apos; collegato correttamente?</translation>
         <translation>Note:</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="91"/>
-        <location filename="../core/qthelper.cpp" line="226"/>
-        <source>N</source>
-        <translation>N</translation>
-    </message>
-    <message>
-        <location filename="../core/qthelper.cpp" line="91"/>
-        <location filename="../core/qthelper.cpp" line="227"/>
-        <source>S</source>
-        <translation>S</translation>
-    </message>
-    <message>
-        <location filename="../core/qthelper.cpp" line="92"/>
-        <location filename="../core/qthelper.cpp" line="228"/>
-        <source>E</source>
-        <translation>E</translation>
-    </message>
-    <message>
-        <location filename="../core/qthelper.cpp" line="92"/>
-        <location filename="../core/qthelper.cpp" line="229"/>
-        <source>W</source>
-        <translation>W</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="341"/>
-        <source>Remote storage and local data diverged. Error: merge failed (%s)</source>
-        <translation>Dati remoti e dati locali non coincidono. Errore: unione fallita (%s)</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="134"/>
-        <source>Local cache directory %s corrupted - can&apos;t sync with Subsurface cloud storage</source>
-        <translation>La cartella della cache locale %s è corrotta - non è possibile sincronizzare con la memoria cloud di Subsurface</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="157"/>
-        <location filename="../core/git-access.c" line="177"/>
-        <source>Could not update local cache to newer remote data</source>
-        <translation>Non è stato possibile aggiornare la cache local con i dati remoti più aggiornati</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="170"/>
-        <source>Subsurface cloud storage corrupted</source>
-        <translation>Memoria cloud di Subsurface corrotta</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="285"/>
-        <source>Could not update Subsurface cloud storage, try again later</source>
-        <translation>Non ho potuto aggiornare la memoria cloud di Subsurface, riprovare più tardi</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="371"/>
-        <source>Remote storage and local data diverged. Cannot combine local and remote changes</source>
-        <translation>Dati locali e dati remoti non coincidono. Non è possibile unire i cambiamenti locali e remoti</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="405"/>
-        <source>Remote storage and local data diverged</source>
-        <translation>Dati remoti e dati locali non coincidono</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="408"/>
-        <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source>
-        <translation>Dati remoti e dati locali non coincidono. Errore: impossibile scrivere i dati (%s)</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="417"/>
-        <source>Problems with local cache of Subsurface cloud data</source>
-        <translation>Problemi con la cache locale della memoria cloud Subsurface</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="418"/>
-        <source>Moved cache data to %s. Please try the operation again.</source>
-        <translation>Dati della cache spostati in %s. Perfavore, riprova di nuovo</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="737"/>
-        <source>Error connecting to Subsurface cloud storage</source>
-        <translation>Errore nella connessione alla memoria cloud di Subsurface</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="740"/>
-        <source>git clone of %s failed (%s)</source>
-        <translation>Errore (%s) nel clone git di %s</translation>
-    </message>
-    <message>
-        <location filename="../core/load-git.c" line="222"/>
-        <location filename="../core/parse-xml.c" line="1300"/>
-        <source>additional name for site: %s
-</source>
-        <translation>nome addizionale per il sito: %s
-</translation>
-    </message>
-    <message>
-        <location filename="../core/ostctools.c" line="120"/>
-        <location filename="../core/ostctools.c" line="152"/>
-        <source>Unknown DC in dive %d</source>
-        <translation>Computer da immersione sconosciuto nella immersione %d</translation>
-    </message>
-    <message>
-        <location filename="../core/ostctools.c" line="165"/>
-        <source>Error - %s - parsing dive %d</source>
-        <translation>Errore - %s - nel parsing dell&apos;immersione %d</translation>
-    </message>
-    <message>
         <location filename="../smtk-import/smartrak.c" line="247"/>
         <source>Built</source>
         <translation type="unfinished"/>
@@ -10680,117 +10855,117 @@ Lo Uemis Zurich e&apos; collegato correttamente?</translation>
         <translation>Subsurface-mobile</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="91"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="103"/>
         <source>Subsurface</source>
         <translation>Subsurface</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="97"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="110"/>
         <source>Dive list</source>
         <translation>Lista immersioni</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="112"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="125"/>
         <source>Cloud credentials</source>
         <translation>Credenziali per il cloud</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="126"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="139"/>
         <source>Manage dives</source>
         <translation>Gestione immesioni</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="138"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="141"/>
         <source>Add dive manually</source>
         <translation>Aggiungi immersione manualmente</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="146"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="149"/>
         <source>Manual sync with cloud</source>
         <translation>Sincronizzazione manuale con il cloud</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="164"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="167"/>
         <source>Offline mode</source>
         <translation>Modalità fuori linea</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="164"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="167"/>
         <source>Enable auto cloud sync</source>
         <translation>Abilita auto sincronizzazione con il cloud</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="182"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="187"/>
         <source>GPS</source>
         <translation>GPS</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="185"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="190"/>
         <source>GPS-tag dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="192"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="197"/>
         <source>Upload GPS data</source>
         <translation>Carica dati GPS</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="199"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="204"/>
         <source>Download GPS data</source>
         <translation>§Scarica dati GPS</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="206"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="211"/>
         <source>Show GPS fixes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="215"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="220"/>
         <source>Clear GPS cache</source>
         <translation>Cacenlla la cache del GPS</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="221"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="226"/>
         <source>Preferences</source>
         <translation>Preferenze</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="230"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="237"/>
         <source>Developer</source>
         <translation>Sviluppatore</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="232"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="239"/>
         <source>App log</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="239"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="246"/>
         <source>Theme information</source>
         <translation>Informazioni sul tema</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="246"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="253"/>
         <source>User manual</source>
         <translation>Manuale utente</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="252"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="259"/>
         <source>About</source>
         <translation>Informazioni</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="283"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="304"/>
         <source>Run location service</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="283"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="304"/>
         <source>No GPS source available</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="295"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="316"/>
         <source>Actions</source>
         <translation>Azioni</translation>
     </message>
@@ -10871,6 +11046,24 @@ p, li { white-space: pre-wrap; }
         <translation>m/min</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="121"/>
+        <location filename="../build/ui_plannerSettings.h" line="425"/>
+        <source>75% to 50% avg. depth</source>
+        <translation>Dal 75% al 50% della prof. media</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="138"/>
+        <location filename="../build/ui_plannerSettings.h" line="427"/>
+        <source>50% avg. depth to 6m</source>
+        <translation>Dal 50% della prof. media a 6m</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="155"/>
+        <location filename="../build/ui_plannerSettings.h" line="429"/>
+        <source>6m to surface</source>
+        <translation>6m alla superficie</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="175"/>
         <location filename="../build/ui_plannerSettings.h" line="431"/>
         <source>Descent</source>
@@ -10894,12 +11087,35 @@ p, li { white-space: pre-wrap; }
         <translation>Deco VPM-B </translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="268"/>
+        <source>Bühlmann deco</source>
+        <translation>deco Bühlmann</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="278"/>
         <location filename="../build/ui_plannerSettings.h" line="445"/>
         <source>Reserve gas</source>
         <translation>Gas di riserva</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="288"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="549"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="578"/>
+        <location filename="../build/ui_plannerSettings.h" line="446"/>
+        <location filename="../build/ui_plannerSettings.h" line="459"/>
+        <location filename="../build/ui_plannerSettings.h" line="461"/>
+        <source>bar</source>
+        <translation>bar</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="307"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="416"/>
+        <location filename="../build/ui_plannerSettings.h" line="437"/>
+        <location filename="../build/ui_plannerSettings.h" line="440"/>
+        <source>%</source>
+        <translation>%</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="320"/>
         <location filename="../build/ui_plannerSettings.h" line="449"/>
         <source>Postpone gas change if a stop is not required</source>
@@ -10918,12 +11134,10 @@ p, li { white-space: pre-wrap; }
         <translation>GF low</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="307"/>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="416"/>
-        <location filename="../build/ui_plannerSettings.h" line="437"/>
-        <location filename="../build/ui_plannerSettings.h" line="440"/>
-        <source>%</source>
-        <translation>%</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="353"/>
+        <location filename="../build/ui_plannerSettings.h" line="436"/>
+        <source>Plan backgas breaks</source>
+        <translation>Pianifica i break in backgas</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="360"/>
@@ -10932,10 +11146,10 @@ p, li { white-space: pre-wrap; }
         <translation>GF high</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="429"/>
-        <location filename="../build/ui_plannerSettings.h" line="441"/>
-        <source>Drop to first depth</source>
-        <translation>Discesa immediata</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="370"/>
+        <location filename="../build/ui_plannerSettings.h" line="453"/>
+        <source>min</source>
+        <translation>min</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="389"/>
@@ -10944,163 +11158,139 @@ p, li { white-space: pre-wrap; }
         <translation>Ultima sosta a 6m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="353"/>
-        <location filename="../build/ui_plannerSettings.h" line="436"/>
-        <source>Plan backgas breaks</source>
-        <translation>Pianifica i break in backgas</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="396"/>
+        <source>Maximize bottom time allowed by gas and no decompression limits</source>
+        <translation>Massimizzare il tempo di fondo consentito dal gas e dai limiti di non decompressione</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="515"/>
-        <location filename="../build/ui_plannerSettings.h" line="455"/>
-        <source>Gas options</source>
-        <translation>Impostazioni gas</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="399"/>
+        <location filename="../build/ui_plannerSettings.h" line="443"/>
+        <source>Recreational mode</source>
+        <translation>Modalità ricreativa</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="594"/>
-        <location filename="../build/ui_plannerSettings.h" line="456"/>
-        <source>Bottom SAC</source>
-        <translation>CAS sul fondo</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="429"/>
+        <location filename="../build/ui_plannerSettings.h" line="441"/>
+        <source>Drop to first depth</source>
+        <translation>Discesa immediata</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="692"/>
-        <location filename="../build/ui_plannerSettings.h" line="457"/>
-        <source>Deco SAC</source>
-        <translation>CAS in deco</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="436"/>
+        <location filename="../build/ui_plannerSettings.h" line="452"/>
+        <source>Min. switch duration</source>
+        <translation>Durata minima del cambio</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="601"/>
-        <location filename="../build/ui_plannerSettings.h" line="458"/>
-        <source>Bottom pO₂</source>
-        <translation>pO₂ sul fondo</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="459"/>
+        <location filename="../build/ui_plannerSettings.h" line="444"/>
+        <source>Safety stop</source>
+        <translation>sosta di sicurezza</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="685"/>
-        <location filename="../build/ui_plannerSettings.h" line="460"/>
-        <source>Deco pO₂</source>
-        <translation>pO₂ in deco</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="495"/>
+        <source>Conservatism level</source>
+        <translation>livello di conservatorismo</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="515"/>
+        <location filename="../build/ui_plannerSettings.h" line="455"/>
+        <source>Gas options</source>
+        <translation>Impostazioni gas</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="565"/>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="672"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="698"/>
         <location filename="../build/ui_plannerSettings.h" line="462"/>
         <location filename="../build/ui_plannerSettings.h" line="463"/>
         <source>ℓ/min</source>
         <translation>ℓ/min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="632"/>
-        <location filename="../build/ui_plannerSettings.h" line="468"/>
-        <source>Display runtime</source>
-        <translation>Mostra il runtime</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="645"/>
-        <location filename="../build/ui_plannerSettings.h" line="472"/>
-        <source>Display segment duration</source>
-        <translation>Mostra la durata del segmento</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="655"/>
-        <location filename="../build/ui_plannerSettings.h" line="476"/>
-        <source>Display transitions in deco</source>
-        <translation>Mostra i cambi tappa in deco</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="662"/>
-        <location filename="../build/ui_plannerSettings.h" line="477"/>
-        <source>Verbatim dive plan</source>
-        <translation>Piano di immersione dettagliato</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="288"/>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="549"/>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="578"/>
-        <location filename="../build/ui_plannerSettings.h" line="446"/>
-        <location filename="../build/ui_plannerSettings.h" line="459"/>
-        <location filename="../build/ui_plannerSettings.h" line="461"/>
-        <source>bar</source>
-        <translation>bar</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="121"/>
-        <location filename="../build/ui_plannerSettings.h" line="425"/>
-        <source>75% to 50% avg. depth</source>
-        <translation>Dal 75% al 50% della prof. media</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="138"/>
-        <location filename="../build/ui_plannerSettings.h" line="427"/>
-        <source>50% avg. depth to 6m</source>
-        <translation>Dal 50% della prof. media a 6m</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="155"/>
-        <location filename="../build/ui_plannerSettings.h" line="429"/>
-        <source>6m to surface</source>
-        <translation>6m alla superficie</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="268"/>
-        <source>Bühlmann deco</source>
-        <translation>deco Bühlmann</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="370"/>
-        <location filename="../build/ui_plannerSettings.h" line="453"/>
-        <source>min</source>
-        <translation>min</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="396"/>
-        <source>Maximize bottom time allowed by gas and no decompression limits</source>
-        <translation>Massimizzare il tempo di fondo consentito dal gas e dai limiti di non decompressione</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="594"/>
+        <source>m</source>
+        <translation>m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="399"/>
-        <location filename="../build/ui_plannerSettings.h" line="443"/>
-        <source>Recreational mode</source>
-        <translation>Modalità ricreativa</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="606"/>
+        <source>Used to calculate best mix. Select best mix depth in &apos;Available gases&apos; table by entering gas depth, followed by &quot;B&quot; (best trimix mix) or &quot;BN&quot; (best nitrox mix)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="436"/>
-        <location filename="../build/ui_plannerSettings.h" line="452"/>
-        <source>Min. switch duration</source>
-        <translation>Durata minima del cambio</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="613"/>
+        <location filename="../build/ui_plannerSettings.h" line="456"/>
+        <source>Bottom SAC</source>
+        <translation>CAS sul fondo</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="459"/>
-        <location filename="../build/ui_plannerSettings.h" line="444"/>
-        <source>Safety stop</source>
-        <translation>sosta di sicurezza</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="620"/>
+        <location filename="../build/ui_plannerSettings.h" line="458"/>
+        <source>Bottom pO₂</source>
+        <translation>pO₂ sul fondo</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="495"/>
-        <source>Conservatism level</source>
-        <translation>livello di conservatorismo</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="627"/>
+        <source>Best mix END</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="608"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="634"/>
         <location filename="../build/ui_plannerSettings.h" line="464"/>
         <source>Notes</source>
         <translation>Note</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="629"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="655"/>
         <location filename="../build/ui_plannerSettings.h" line="466"/>
         <source>In dive plan, show runtime (absolute time) of stops</source>
         <translation>Nel piano di immersione, mostra il runtime (tempo assoluto) delle soste</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="642"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="658"/>
+        <location filename="../build/ui_plannerSettings.h" line="468"/>
+        <source>Display runtime</source>
+        <translation>Mostra il runtime</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="668"/>
         <location filename="../build/ui_plannerSettings.h" line="470"/>
         <source>In dive plan, show duration (relative time) of stops</source>
         <translation>Nel piano di immersione, mostra la durata (tempo relativo) delle soste</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="652"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="671"/>
+        <location filename="../build/ui_plannerSettings.h" line="472"/>
+        <source>Display segment duration</source>
+        <translation>Mostra la durata del segmento</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="678"/>
         <location filename="../build/ui_plannerSettings.h" line="474"/>
         <source>In diveplan, list transitions or treat them as implicit</source>
         <translation>Nel piano di immersione, elenca i cambi tappa o trattali come impliciti</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="681"/>
+        <location filename="../build/ui_plannerSettings.h" line="476"/>
+        <source>Display transitions in deco</source>
+        <translation>Mostra i cambi tappa in deco</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="688"/>
+        <location filename="../build/ui_plannerSettings.h" line="477"/>
+        <source>Verbatim dive plan</source>
+        <translation>Piano di immersione dettagliato</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="711"/>
+        <location filename="../build/ui_plannerSettings.h" line="460"/>
+        <source>Deco pO₂</source>
+        <translation>pO₂ in deco</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="718"/>
+        <location filename="../build/ui_plannerSettings.h" line="457"/>
+        <source>Deco SAC</source>
+        <translation>CAS in deco</translation>
+    </message>
 </context>
 </TS>
\ No newline at end of file
diff --git a/translations/subsurface_lv_LV.ts b/translations/subsurface_lv_LV.ts
index 4c2c7f84e..b0efe1c7c 100644
--- a/translations/subsurface_lv_LV.ts
+++ b/translations/subsurface_lv_LV.ts
@@ -105,6 +105,11 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="56"/>
+        <source>Could not initialize Winsock version 2.2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="134"/>
         <source>Trying to turn on the local Bluetooth device...</source>
         <translation type="unfinished"/>
@@ -115,6 +120,11 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="167"/>
+        <source>Remote devices list was cleared.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="183"/>
         <source>Scanning for remote devices...</source>
         <translation type="unfinished"/>
@@ -125,6 +135,22 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="208"/>
+        <source>The local Bluetooth device was %1.</source>
+        <extracomment>%1 will be replaced with &quot;turned on&quot; or &quot;turned off&quot;</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
+        <source>turned on</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
+        <source>turned off</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="225"/>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="339"/>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="359"/>
@@ -172,37 +198,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="352"/>
-        <source>Device %1 was paired and is authorized.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="56"/>
-        <source>Could not initialize Winsock version 2.2</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="167"/>
-        <source>Remote devices list was cleared.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="208"/>
-        <source>The local Bluetooth device was %1.</source>
-        <extracomment>%1 will be replaced with &quot;turned on&quot; or &quot;turned off&quot;</extracomment>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
-        <source>turned on</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
-        <source>turned off</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="307"/>
         <source>Remove pairing</source>
         <translation type="unfinished"/>
@@ -228,6 +223,11 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="352"/>
+        <source>Device %1 was paired and is authorized.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="378"/>
         <source>The device %1 can now be used for connection. You can press the Save button.</source>
         <translation type="unfinished"/>
@@ -286,12 +286,12 @@
 <context>
     <name>BuddyFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="621"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="619"/>
         <source>Person: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="622"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="620"/>
         <source>Searches for buddies and divemasters</source>
         <translation type="unfinished"/>
     </message>
@@ -299,7 +299,7 @@
 <context>
     <name>BuddyFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="243"/>
+        <location filename="../qt-models/filtermodels.cpp" line="248"/>
         <source>No buddies</source>
         <translation type="unfinished"/>
     </message>
@@ -307,25 +307,30 @@
 <context>
     <name>CloudCredentials</name>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="49"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="50"/>
         <source>Cloud credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="55"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="56"/>
         <source>Email</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="67"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="68"/>
         <source>Password</source>
         <translation>Parole</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="90"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="92"/>
         <source>Show password</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="97"/>
+        <source>PIN</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>ColumnNameProvider</name>
@@ -381,6 +386,16 @@
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
+        <source>Max. depth</source>
+        <translation>Maks. dziļums</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
+        <source>Avg. depth</source>
+        <translation>Vid. dziļums</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
         <source>Divemaster</source>
         <translation>Niršanas speciālists</translation>
     </message>
@@ -391,6 +406,11 @@
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
+        <source>Suit</source>
+        <translation>Kostīms</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
         <source>Notes</source>
         <translation>Piezīmes</translation>
     </message>
@@ -410,21 +430,6 @@
         <translation>Ūdens temp.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
-        <source>Max. depth</source>
-        <translation>Maks. dziļums</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
-        <source>Avg. depth</source>
-        <translation>Vid. dziļums</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
-        <source>Suit</source>
-        <translation>Kostīms</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="44"/>
         <source>O₂</source>
         <translation type="unfinished"/>
@@ -538,7 +543,7 @@
         <translation>Nav iespējams izveidot libdivecomputer kontekstu</translation>
     </message>
     <message>
-        <location filename="../core/configuredivecomputer.cpp" line="660"/>
+        <location filename="../core/configuredivecomputer.cpp" line="656"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation type="unfinished"/>
     </message>
@@ -558,11 +563,19 @@
         <translation>Ierīce via montēšanas vieta</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="170"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1520"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1533"/>
-        <source>...</source>
-        <translation>...</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="47"/>
+        <source>Connect via Bluetooth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="54"/>
+        <source>Connect</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="64"/>
+        <source>Disconnect</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="80"/>
@@ -571,12 +584,24 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="90"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1523"/>
+        <source>Read settings from backup file or from device before writing to the device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="93"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1525"/>
         <source>Save changes to device</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="116"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1527"/>
+        <source>Read settings from backup file or from device before writing to a backup file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="119"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1529"/>
         <source>Backup</source>
@@ -595,14 +620,39 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="163"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1532"/>
+        <source>Save libdivecomputer logfile</source>
+        <translation>Saglabāt libdivecomputer žurnālu</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="170"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1520"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1533"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="177"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1534"/>
         <source>Cancel</source>
         <translation>Atcelt</translation>
     </message>
     <message>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1539"/>
-        <source>OSTC 3</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="214"/>
+        <source>OSTC 3,Sport,Cr,2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="223"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1541"/>
+        <source>Suunto Vyper family</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="232"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1543"/>
+        <source>OSTC, Mk.2/2N/2C</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -616,40 +666,56 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="326"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1656"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1943"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1546"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1726"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1766"/>
-        <source>Serial No.</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="260"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1575"/>
+        <source>Eco</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="349"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1679"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1980"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1547"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1727"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1767"/>
-        <source>Firmware version</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="265"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1576"/>
+        <source>Medium</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="538"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1713"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1990"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1548"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1729"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1768"/>
-        <source>Custom text</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="270"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1577"/>
+        <source>High</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="385"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1549"/>
-        <source>Language</source>
-        <translation>Valoda</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="278"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="826"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="849"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="875"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="927"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="993"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1019"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1101"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1117"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1450"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2278"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2382"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2408"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2434"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2474"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2497"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1586"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1621"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1623"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1625"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1628"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1637"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1638"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1710"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1785"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1789"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1801"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1803"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1806"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1807"/>
+        <source>%</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="289"/>
@@ -676,38 +742,62 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="579"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1557"/>
-        <source>Dive mode</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="313"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1582"/>
+        <source>m/°C</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="556"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1560"/>
-        <source>OC</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="318"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1583"/>
+        <source>ft/°F</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="561"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1561"/>
-        <source>CC</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="326"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1656"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1943"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1546"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1726"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1766"/>
+        <source>Serial No.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="566"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2336"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1562"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1793"/>
-        <source>Gauge</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="349"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1679"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1980"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1547"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1727"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1767"/>
+        <source>Firmware version</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="571"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1563"/>
-        <source>Apnea</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="360"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1568"/>
+        <source>MMDDYY</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="365"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1569"/>
+        <source>DDMMYY</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="370"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1570"/>
+        <source>YYMMDD</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="385"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1549"/>
+        <source>Language</source>
+        <translation>Valoda</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="395"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2063"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1565"/>
@@ -716,165 +806,154 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="360"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1568"/>
-        <source>MMDDYY</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="405"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1572"/>
+        <source>Brightness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="365"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1569"/>
-        <source>DDMMYY</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="415"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1850"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1579"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1753"/>
+        <source>Units</source>
+        <translation>Mērvienības</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="425"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1585"/>
+        <source>Salinity (0-5%)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="370"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1570"/>
-        <source>YYMMDD</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="438"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1615"/>
+        <source>Reset device to default settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1042"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2457"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1639"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1805"/>
-        <source>Saturation</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="452"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1590"/>
+        <source>230LSB/Gauss</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="278"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="826"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="849"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="875"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="927"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="993"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1019"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1101"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1117"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1450"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2278"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2382"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2408"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2434"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2474"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2497"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1586"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1621"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1623"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1625"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1628"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1637"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1638"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1710"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1785"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1789"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1801"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1803"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1806"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1807"/>
-        <source>%</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="457"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1591"/>
+        <source>330LSB/Gauss</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="865"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2261"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1624"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1784"/>
-        <source>Desaturation</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="462"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1592"/>
+        <source>390LSB/Gauss</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="983"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2398"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1636"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1800"/>
-        <source>Last deco</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="467"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1593"/>
+        <source>440LSB/Gauss</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="711"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="736"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="758"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="904"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2181"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2206"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2228"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2307"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1626"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1786"/>
-        <source> m</source>
-        <translation>m</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="472"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1594"/>
+        <source>660LSB/Gauss</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="405"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1572"/>
-        <source>Brightness</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="477"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1595"/>
+        <source>820LSB/Gauss</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="260"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1575"/>
-        <source>Eco</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="482"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1596"/>
+        <source>1090LSB/Gauss</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="265"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1576"/>
-        <source>Medium</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="487"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1597"/>
+        <source>1370LSB/Gauss</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="270"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1577"/>
-        <source>High</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="521"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1587"/>
+        <source>Compass gain</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="603"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2034"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1599"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1779"/>
-        <source>Sampling rate</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="531"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1799"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1745"/>
+        <source>Computer model</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="590"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1602"/>
-        <source>2s</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="538"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1713"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1990"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1548"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1729"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1768"/>
+        <source>Custom text</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="595"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1769"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1603"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1739"/>
-        <source>10s</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="556"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1560"/>
+        <source>OC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="415"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1850"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1579"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1753"/>
-        <source>Units</source>
-        <translation>Mērvienības</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="561"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1561"/>
+        <source>CC</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="313"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1582"/>
-        <source>m/°C</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="566"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2336"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1562"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1793"/>
+        <source>Gauge</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="318"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1583"/>
-        <source>ft/°F</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="571"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1563"/>
+        <source>Apnea</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="644"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1605"/>
-        <source>Dive mode color</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="579"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1557"/>
+        <source>Dive mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="590"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1602"/>
+        <source>2s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="595"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1769"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1603"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1739"/>
+        <source>10s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="603"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2034"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1599"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1779"/>
+        <source>Sampling rate</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -902,12 +981,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="425"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1585"/>
-        <source>Salinity (0-5%)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="637"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2092"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1613"/>
@@ -916,89 +989,79 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="521"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1587"/>
-        <source>Compass gain</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="90"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1523"/>
-        <source>Read settings from backup file or from device before writing to the device</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="116"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1527"/>
-        <source>Read settings from backup file or from device before writing to a backup file</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="232"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1543"/>
-        <source>OSTC, Mk.2/2N/2C</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="644"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1605"/>
+        <source>Dive mode color</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="452"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1590"/>
-        <source>230LSB/Gauss</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="654"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2020"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1614"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1771"/>
+        <source>Show safety stop</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="457"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1591"/>
-        <source>330LSB/Gauss</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="661"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2145"/>
+        <source>End Depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="462"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1592"/>
-        <source>390LSB/Gauss</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="671"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2162"/>
+        <source> s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="467"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1593"/>
-        <source>440LSB/Gauss</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="687"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1953"/>
+        <source>Length</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="472"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1594"/>
-        <source>660LSB/Gauss</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="694"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2138"/>
+        <source>Start Depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="477"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1595"/>
-        <source>820LSB/Gauss</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="701"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2152"/>
+        <source>Reset Depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="482"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1596"/>
-        <source>1090LSB/Gauss</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="711"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="736"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="758"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="904"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2181"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2206"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2228"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2307"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1626"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1786"/>
+        <source> m</source>
+        <translation>m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="487"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1597"/>
-        <source>1370LSB/Gauss</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="778"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2248"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1643"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1810"/>
+        <source>Advanced settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="654"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2020"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1614"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1771"/>
-        <source>Show safety stop</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="784"/>
+        <source>Left button sensitivity</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="438"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1615"/>
-        <source>Reset device to default settings</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="791"/>
+        <source>Always show ppO2</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1010,20 +1073,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="223"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1541"/>
-        <source>Suunto Vyper family</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="778"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2248"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1643"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1810"/>
-        <source>Advanced settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="805"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2271"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1618"/>
@@ -1054,6 +1103,14 @@
         <translation>GFHigh</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="865"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2261"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1624"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1784"/>
+        <source>Desaturation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="917"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2320"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1627"/>
@@ -1068,14 +1125,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="973"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2369"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1630"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1788"/>
-        <source> min</source>
-        <translation>min</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="960"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2331"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1633"/>
@@ -1084,60 +1133,25 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="47"/>
-        <source>Connect via Bluetooth</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="163"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1532"/>
-        <source>Save libdivecomputer logfile</source>
-        <translation>Saglabāt libdivecomputer žurnālu</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="661"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2145"/>
-        <source>End Depth</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="671"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2162"/>
-        <source> s</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="687"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1953"/>
-        <source>Length</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="694"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2138"/>
-        <source>Start Depth</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="701"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2152"/>
-        <source>Reset Depth</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="784"/>
-        <source>Left button sensitivity</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="965"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1634"/>
+        <source>ZH-L16+GF</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="791"/>
-        <source>Always show ppO2</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="973"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2369"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1630"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1788"/>
+        <source> min</source>
+        <translation>min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="965"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1634"/>
-        <source>ZH-L16+GF</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="983"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2398"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1636"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1800"/>
+        <source>Last deco</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1157,6 +1171,14 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1042"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2457"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1639"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1805"/>
+        <source>Saturation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1052"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1642"/>
         <source>Flip screen</source>
@@ -1168,12 +1190,22 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1066"/>
+        <source>MOD warning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1073"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2513"/>
         <source>Graphical speed indicator</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1080"/>
+        <source>Dynamic ascent rate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1087"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2552"/>
         <source>Bottom gas consumption</source>
@@ -1186,6 +1218,14 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1133"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1149"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2520"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2536"/>
+        <source> ℓ/min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1165"/>
         <source>Temperature sensor offset</source>
         <translation type="unfinished"/>
@@ -1204,6 +1244,18 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1235"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1320"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2610"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2695"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1645"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1668"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1812"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1835"/>
+        <source>%O₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1240"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1325"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2615"/>
@@ -1322,15 +1374,9 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1691"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1858"/>
-        <source>Set point [cbar]</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1693"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1860"/>
-        <source>Change depth [m]</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1405"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2770"/>
+        <source>Setpoint</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1370,6 +1416,12 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1443"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1709"/>
+        <source>O₂ in calibration gas</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1467"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1713"/>
         <source>Fixed setpoint</source>
@@ -1400,101 +1452,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1748"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1733"/>
-        <source>P1 (medium)</source>
-        <extracomment>Suunto safety level</extracomment>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1753"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1734"/>
-        <source>P2 (high)</source>
-        <extracomment>Suunto safety level</extracomment>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1792"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1744"/>
-        <source>Total dive time</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2109"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1769"/>
-        <source>kg/ℓ</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2346"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1795"/>
-        <source>Apnoea</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1583"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1722"/>
-        <source>Safety level</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="54"/>
-        <source>Connect</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="64"/>
-        <source>Disconnect</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="214"/>
-        <source>OSTC 3,Sport,Cr,2</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1066"/>
-        <source>MOD warning</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1080"/>
-        <source>Dynamic ascent rate</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1133"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1149"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2520"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2536"/>
-        <source> ℓ/min</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1235"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1320"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2610"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2695"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1645"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1668"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1812"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1835"/>
-        <source>%O₂</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1405"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2770"/>
-        <source>Setpoint</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1443"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1709"/>
-        <source>O₂ in calibration gas</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1535"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2843"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1719"/>
@@ -1511,6 +1468,12 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1583"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1722"/>
+        <source>Safety level</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1609"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1723"/>
         <source>Altitude range</source>
@@ -1544,6 +1507,20 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1748"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1733"/>
+        <source>P1 (medium)</source>
+        <extracomment>Suunto safety level</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1753"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1734"/>
+        <source>P2 (high)</source>
+        <extracomment>Suunto safety level</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1761"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1736"/>
         <source>Sample rate</source>
@@ -1568,10 +1545,9 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="531"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1799"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1745"/>
-        <source>Computer model</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1792"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1744"/>
+        <source>Total dive time</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1637,12 +1613,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2099"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1765"/>
-        <source>Salinity</source>
-        <translation>Sāļums</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2074"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1774"/>
         <source>MM/DD/YY</source>
@@ -1661,12 +1631,30 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2099"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1765"/>
+        <source>Salinity</source>
+        <translation>Sāļums</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2109"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1769"/>
+        <source>kg/ℓ</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2341"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1794"/>
         <source>ZH-L16 CC</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2346"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1795"/>
+        <source>Apnoea</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2351"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1796"/>
         <source>L16-GF OC</source>
@@ -1685,85 +1673,110 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1108"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1129"/>
-        <source>Backup files (*.xml)</source>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1539"/>
+        <source>OSTC 3</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1113"/>
-        <source>An error occurred while saving the backup file.
-%1</source>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1691"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1858"/>
+        <source>Set point [cbar]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1116"/>
-        <source>Backup succeeded</source>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1693"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1860"/>
+        <source>Change depth [m]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1117"/>
-        <source>Your settings have been saved to: %1</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1110"/>
+        <source>Backup dive computer settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1107"/>
-        <source>Backup dive computer settings</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1111"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1132"/>
+        <source>Backup files (*.xml)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1112"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1115"/>
         <source>XML backup error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1128"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1116"/>
+        <source>An error occurred while saving the backup file.
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1119"/>
+        <source>Backup succeeded</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1120"/>
+        <source>Your settings have been saved to: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1131"/>
         <source>Restore dive computer settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1134"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1137"/>
         <source>XML restore error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1135"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1138"/>
         <source>An error occurred while restoring the backup file.
 %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1139"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1142"/>
         <source>Restore succeeded</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1140"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1143"/>
         <source>Your settings have been restored successfully.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1150"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1153"/>
         <source>Select firmware file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1151"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1154"/>
         <source>All files (*.*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1207"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1210"/>
         <source>Choose file for divecomputer download logfile</source>
         <translation>Izvēliet failu priekš žurnāla lejupielādēšanas no niršanas datora</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1208"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1211"/>
         <source>Log files (*.log)</source>
         <translation>Žurnalēšanas faili (*.log)</translation>
     </message>
 </context>
 <context>
+    <name>ContextDrawer</name>
+    <message>
+        <location filename="../mobile-widgets/qml/kirigami/src/controls/ContextDrawer.qml" line="76"/>
+        <source>Actions</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>CylindersModel</name>
     <message>
         <location filename="../qt-models/cylindermodel.cpp" line="16"/>
@@ -1777,11 +1790,6 @@
     </message>
     <message>
         <location filename="../qt-models/cylindermodel.cpp" line="16"/>
-        <source>He%</source>
-        <translation>He%</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="16"/>
         <source>Work press.</source>
         <translation type="unfinished"/>
     </message>
@@ -1801,9 +1809,24 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="16"/>
+        <source>He%</source>
+        <translation>He%</translation>
+    </message>
+    <message>
         <location filename="../qt-models/cylindermodel.cpp" line="17"/>
-        <source>Switch at</source>
-        <translation>Pārslēgties uz</translation>
+        <source>Deco switch at</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
+        <source>Bot. MOD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
+        <source>MND</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-models/cylindermodel.cpp" line="17"/>
@@ -1821,17 +1844,32 @@
         <translation>ℓ</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="161"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="177"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation>Noklikšķot šeit Jūs noņemsiet balonu.</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="383"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="180"/>
+        <source>Switch depth for deco gas. Calculated using Deco pO₂ preference, unless set manually.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="183"/>
+        <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to &apos;*&apos; for best O₂% for max depth.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="186"/>
+        <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to &apos;*&apos; for best He% for max depth.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="444"/>
         <source>Cylinder cannot be removed</source>
         <translation>Balons never būt noņemts.</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="384"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="445"/>
         <source>This gas is 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>
@@ -1851,42 +1889,24 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="73"/>
+        <location filename="../build/ui_divecomponentselection.h" line="141"/>
+        <source>Dive site</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="80"/>
         <location filename="../build/ui_divecomponentselection.h" line="142"/>
         <source>Suit</source>
         <translation>Kostīms</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="122"/>
-        <location filename="../build/ui_divecomponentselection.h" line="148"/>
-        <source>Divemaster</source>
-        <translation>Niršanas speciālists</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="129"/>
-        <location filename="../build/ui_divecomponentselection.h" line="149"/>
-        <source>Buddy</source>
-        <translation>Draugs</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="136"/>
-        <location filename="../build/ui_divecomponentselection.h" line="150"/>
-        <source>Rating</source>
-        <translation>Novērtējums</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="87"/>
         <location filename="../build/ui_divecomponentselection.h" line="143"/>
         <source>Visibility</source>
         <translation>Redzamība</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="73"/>
-        <location filename="../build/ui_divecomponentselection.h" line="141"/>
-        <source>Dive site</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="94"/>
         <location filename="../build/ui_divecomponentselection.h" line="144"/>
         <source>Notes</source>
@@ -1910,10 +1930,34 @@
         <source>Cylinders</source>
         <translation>Cilindri</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="122"/>
+        <location filename="../build/ui_divecomponentselection.h" line="148"/>
+        <source>Divemaster</source>
+        <translation>Niršanas speciālists</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="129"/>
+        <location filename="../build/ui_divecomponentselection.h" line="149"/>
+        <source>Buddy</source>
+        <translation>Draugs</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="136"/>
+        <location filename="../build/ui_divecomponentselection.h" line="150"/>
+        <source>Rating</source>
+        <translation>Novērtējums</translation>
+    </message>
 </context>
 <context>
     <name>DiveComputerManagementDialog</name>
     <message>
+        <location filename="../desktop-widgets/divecomputermanagementdialog.ui" line="17"/>
+        <location filename="../build/ui_divecomputermanagementdialog.h" line="65"/>
+        <source>Edit dive computer nicknames</source>
+        <translation>Rediģēt niršanas datoru iesaukas</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divecomputermanagementdialog.cpp" line="49"/>
         <source>Remove the selected dive computer?</source>
         <translation>Likvidēt izvēlētus datorus?</translation>
@@ -1925,12 +1969,6 @@
         <translation>Vai Jūs esat pārliecināti ka gribat
 likvidēt izvēlētus datorus?</translation>
     </message>
-    <message>
-        <location filename="../desktop-widgets/divecomputermanagementdialog.ui" line="17"/>
-        <location filename="../build/ui_divecomputermanagementdialog.h" line="65"/>
-        <source>Edit dive computer nicknames</source>
-        <translation>Rediģēt niršanas datoru iesaukas</translation>
-    </message>
 </context>
 <context>
     <name>DiveComputerModel</name>
@@ -1958,17 +1996,17 @@ likvidēt izvēlētus datorus?</translation>
 <context>
     <name>DiveDetails</name>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="33"/>
+        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="38"/>
         <source>Dive details</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="67"/>
+        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="72"/>
         <source>Delete dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="84"/>
+        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="89"/>
         <source>Show on map</source>
         <translation type="unfinished"/>
     </message>
@@ -1976,88 +2014,93 @@ likvidēt izvēlētus datorus?</translation>
 <context>
     <name>DiveDetailsEdit</name>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="74"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="80"/>
         <source>Dive %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="78"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="84"/>
         <source>Date:</source>
         <translation>Datums:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="86"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="92"/>
         <source>Location:</source>
         <translation>Vieta:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="95"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="101"/>
         <source>Coordinates:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="104"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="110"/>
         <source>Use current
 GPS location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="118"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="124"/>
         <source>Depth:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="127"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="133"/>
         <source>Duration:</source>
         <translation>Ilgums:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="137"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="143"/>
         <source>Air Temp:</source>
         <translation>Gaisa temp.:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="146"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="152"/>
         <source>Water Temp:</source>
         <translation>Ūdens temp.:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="155"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="161"/>
         <source>Suit:</source>
         <translation>Kostīms:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="164"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="176"/>
         <source>Buddy:</source>
         <translation>Draugs:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="173"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="191"/>
         <source>Dive Master:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="182"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="206"/>
         <source>Weight:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="192"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="216"/>
+        <source>Cylinder:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="231"/>
         <source>Gas mix:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="203"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="241"/>
         <source>Start Pressure:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="213"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="250"/>
         <source>End Pressure:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="224"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="260"/>
         <source>Notes:</source>
         <translation>Piezīmes:</translation>
     </message>
@@ -2095,42 +2138,42 @@ GPS location:</source>
         <translation>Kostīms:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="159"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="158"/>
         <source>Air Temp:</source>
         <translation>Gaisa temp.:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="175"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="172"/>
         <source>Cylinder:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="189"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="185"/>
         <source>Water Temp:</source>
         <translation>Ūdens temp.:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="205"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="198"/>
         <source>Dive Master:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="220"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="211"/>
         <source>Weight:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="249"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="224"/>
         <source>Buddy:</source>
         <translation>Draugs:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="263"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="237"/>
         <source>SAC:</source>
         <translation>SAC:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="280"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="252"/>
         <source>Notes</source>
         <translation>Piezīmes</translation>
     </message>
@@ -2138,18 +2181,18 @@ GPS location:</source>
 <context>
     <name>DiveEventItem</name>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="134"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="165"/>
         <source>Manual switch to OC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="136"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="167"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation>sākums</translation>
     </message>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="137"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="168"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation>beigas</translation>
@@ -2158,27 +2201,27 @@ GPS location:</source>
 <context>
     <name>DiveImportedModel</name>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="646"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="656"/>
         <source>Date/time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="648"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="658"/>
         <source>Duration</source>
         <translation>Ilgums</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="650"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="660"/>
         <source>Depth</source>
         <translation>Dziļums</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="672"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="682"/>
         <source>h:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="672"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="682"/>
         <source>min</source>
         <translation>min</translation>
     </message>
@@ -2187,8 +2230,8 @@ GPS location:</source>
     <name>DiveList</name>
     <message>
         <location filename="../mobile-widgets/qml/DiveList.qml" line="12"/>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="226"/>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="232"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="227"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="233"/>
         <source>Dive list</source>
         <translation type="unfinished"/>
     </message>
@@ -2203,110 +2246,115 @@ GPS location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="222"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="223"/>
         <source>Cloud credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="228"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="229"/>
         <source>Please tap the &apos;+&apos; button to add a dive</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="248"/>
+        <source>No dives in dive list</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DiveListView</name>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="846"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="849"/>
         <source>Expand all</source>
         <translation>Izvērst visu</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="848"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="851"/>
         <source>Collapse all</source>
         <translation>Savērst visu</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="852"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="855"/>
         <source>Collapse others</source>
         <translation>Savērst pārējus</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="856"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="859"/>
         <source>Remove dive(s) from trip</source>
         <translation>Noņemt niršanas reizi(-es) no ceļojuma</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="857"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="860"/>
         <source>Create new trip above</source>
         <translation>Izveidot jaunu ceļojumu augšup</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="871"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="874"/>
         <source>Add dive(s) to trip immediately above</source>
         <translation>Nekavējoties pievienot niršanu(-as) ceļojumam augšup</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="873"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="876"/>
         <source>Add dive(s) to trip immediately below</source>
         <translation>Tūlītēji pievienot niršanu(-as) pie apakšēja ceļojuma</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="877"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="880"/>
         <source>Merge trip with trip above</source>
         <translation>Saplūdināt ceļojumu ar augšējo</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="878"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="881"/>
         <source>Merge trip with trip below</source>
         <translation>Saplūdināt ceļojumu ar apakšējo</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="882"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="885"/>
         <source>Delete dive(s)</source>
         <translation>Izdzēst niršanu(-as)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="884"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="887"/>
         <source>Mark dive(s) invalid</source>
         <translation>Atzīmēt niršanu(-as) kā nepareizus</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="888"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="891"/>
         <source>Merge selected dives</source>
         <translation>Saplūdināt izvēlētas niršanas</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="890"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="893"/>
         <source>Renumber dive(s)</source>
         <translation>Pārnumurēt niršanu(-as)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="891"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="894"/>
         <source>Shift dive times</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="892"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="895"/>
         <source>Split selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="893"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="896"/>
         <source>Load image(s) from file(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="894"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="897"/>
         <source>Load image(s) from web</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="917"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="919"/>
         <source>Open image files</source>
         <translation>Atvērt attēla failu</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="917"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="919"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>Attēlu faili (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -2327,56 +2375,6 @@ GPS location:</source>
 <context>
     <name>DiveLogExportDialog</name>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="103"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="351"/>
-        <source>Export format</source>
-        <translation>Eksportēšanas formāts</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="134"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="353"/>
-        <source>UDDF</source>
-        <translation>UDDF</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="187"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="358"/>
-        <source>Worldmap</source>
-        <translation>Pasaules karte</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="197"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="359"/>
-        <source>I&amp;mage depths</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="243"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="360"/>
-        <source>Selection</source>
-        <translation>Izvēle</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="252"/>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="346"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="361"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="372"/>
-        <source>Selected dives</source>
-        <translation>Izvēlētas niršanas</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="262"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="362"/>
-        <source>All dives</source>
-        <translation>Visas niršanas</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="306"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="396"/>
-        <source>HTML</source>
-        <translation>HTML</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="14"/>
         <location filename="../build/ui_divelogexportdialog.h" line="349"/>
         <source>Export dive log files</source>
@@ -2389,12 +2387,24 @@ GPS location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="103"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="351"/>
+        <source>Export format</source>
+        <translation>Eksportēšanas formāts</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="115"/>
         <location filename="../build/ui_divelogexportdialog.h" line="352"/>
         <source>Subsurface &amp;XML</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="134"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="353"/>
+        <source>UDDF</source>
+        <translation>UDDF</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="147"/>
         <location filename="../build/ui_divelogexportdialog.h" line="354"/>
         <source>di&amp;velogs.de</source>
@@ -2419,238 +2429,297 @@ GPS location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="275"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="187"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="358"/>
+        <source>Worldmap</source>
+        <translation>Pasaules karte</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="197"/>
+        <source>TeX</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="207"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="359"/>
+        <source>I&amp;mage depths</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="253"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="360"/>
+        <source>Selection</source>
+        <translation>Izvēle</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="262"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="356"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="361"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="372"/>
+        <source>Selected dives</source>
+        <translation>Izvēlētas niršanas</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="272"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="362"/>
+        <source>All dives</source>
+        <translation>Visas niršanas</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="285"/>
         <location filename="../build/ui_divelogexportdialog.h" line="363"/>
         <source>CSV units</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="288"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="298"/>
         <location filename="../build/ui_divelogexportdialog.h" line="366"/>
         <source>Metric</source>
         <translation>Metrisks</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="293"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="303"/>
         <location filename="../build/ui_divelogexportdialog.h" line="367"/>
         <source>Imperial</source>
         <translation>Imperiāls</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="324"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="316"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="396"/>
+        <source>HTML</source>
+        <translation>HTML</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="334"/>
         <location filename="../build/ui_divelogexportdialog.h" line="370"/>
         <source>General settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="330"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="340"/>
         <location filename="../build/ui_divelogexportdialog.h" line="371"/>
         <source>Subsurface numbers</source>
         <translation>Numuri Subsurface</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="359"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="369"/>
         <location filename="../build/ui_divelogexportdialog.h" line="373"/>
         <source>Export yearly statistics</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="375"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="385"/>
         <location filename="../build/ui_divelogexportdialog.h" line="374"/>
         <source>All di&amp;ves</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="385"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="395"/>
         <location filename="../build/ui_divelogexportdialog.h" line="375"/>
         <source>Export list only</source>
         <translation>Eksportēt tikai sarakstu</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="392"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="402"/>
         <location filename="../build/ui_divelogexportdialog.h" line="376"/>
         <source>Export photos</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="408"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="418"/>
         <location filename="../build/ui_divelogexportdialog.h" line="377"/>
         <source>Style options</source>
         <translation>Stila opcijas</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="423"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="433"/>
         <location filename="../build/ui_divelogexportdialog.h" line="378"/>
         <source>Font</source>
         <translation>Fonts</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="433"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="443"/>
         <location filename="../build/ui_divelogexportdialog.h" line="379"/>
         <source>Font size</source>
         <translation>Fonta izmērs</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="444"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="454"/>
         <location filename="../build/ui_divelogexportdialog.h" line="382"/>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="449"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="459"/>
         <location filename="../build/ui_divelogexportdialog.h" line="383"/>
         <source>10</source>
         <translation>10</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="454"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="464"/>
         <location filename="../build/ui_divelogexportdialog.h" line="384"/>
         <source>12</source>
         <translation>12</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="459"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="469"/>
         <location filename="../build/ui_divelogexportdialog.h" line="385"/>
         <source>14</source>
         <translation>14</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="464"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="474"/>
         <location filename="../build/ui_divelogexportdialog.h" line="386"/>
         <source>16</source>
         <translation>16</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="469"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="479"/>
         <location filename="../build/ui_divelogexportdialog.h" line="387"/>
         <source>18</source>
         <translation>18</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="474"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="484"/>
         <location filename="../build/ui_divelogexportdialog.h" line="388"/>
         <source>20</source>
         <translation>20</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="482"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="492"/>
         <location filename="../build/ui_divelogexportdialog.h" line="390"/>
         <source>Theme</source>
         <translation>Tēma</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="493"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="503"/>
         <location filename="../build/ui_divelogexportdialog.h" line="393"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="95"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="99"/>
         <source>Light</source>
         <translation>Gaišs</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="498"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="508"/>
         <location filename="../build/ui_divelogexportdialog.h" line="394"/>
         <source>Sand</source>
         <translation>Smilts</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="134"/>
-        <source>UDDF files (*.uddf *.UDDF)</source>
-        <translation>UDDF faili (*.uddf *.UDDF)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="142"/>
-        <source>CSV files (*.csv *.CSV)</source>
-        <translation>CSV faili (*.csv *.CSV)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="74"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="76"/>
         <source>Generic format that is used for data exchange between a variety of diving related programs.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="76"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="78"/>
         <source>Comma separated values describing the dive profile.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="78"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="80"/>
         <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="80"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="82"/>
         <source>Send the dive data to divelogs.de website.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="82"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="84"/>
         <source>Send the dive data to dive-share.appspot.com website</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="84"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="86"/>
         <source>HTML export of the dive locations, visualized on a world map.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="86"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="88"/>
         <source>Subsurface native XML format.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="88"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="90"/>
         <source>Write depths of images to file.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="133"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="92"/>
+        <source>Write dive as TeX macros to file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="137"/>
         <source>Export UDDF file as</source>
         <translation>Eksportēt UDDF failu kā</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="137"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/>
+        <source>UDDF files (*.uddf *.UDDF)</source>
+        <translation>UDDF faili (*.uddf *.UDDF)</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divelogexportdialog.cpp" line="141"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="145"/>
         <source>Export CSV file as</source>
         <translation>Eksportēt CSV failu kā</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="148"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="142"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="146"/>
+        <source>CSV files (*.csv *.CSV)</source>
+        <translation>CSV faili (*.csv *.CSV)</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="152"/>
         <source>Export world map</source>
         <translation>Eksportēt pasaules karti</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="149"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="169"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="153"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="177"/>
         <source>HTML files (*.html)</source>
         <translation>HTML faili (*.html)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="153"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="157"/>
         <source>Export Subsurface XML</source>
         <translation>Eksportēt Subsurface XML</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="158"/>
         <source>XML files (*.xml *.ssrf)</source>
         <translation>XML faili (*.xml, *.ssrf)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="162"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="166"/>
         <source>Save image depths</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="168"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="170"/>
+        <source>Export to TeX file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="170"/>
+        <source>TeX files (*.tex)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="176"/>
         <source>Export HTML files as</source>
         <translation>Eksportēt HTML failus, kā</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="184"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="192"/>
         <source>Please wait, exporting...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="219"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="227"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="311"/>
         <source>Can&apos;t open file %s</source>
         <translation>Nevar atvērt failu %s</translation>
     </message>
@@ -2664,25 +2733,6 @@ GPS location:</source>
         <translation>Niršanas žurnālu importēšana</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="643"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="727"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="856"/>
-        <source>Time</source>
-        <translation>Laiks</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.ui" line="127"/>
-        <location filename="../build/ui_divelogimportdialog.h" line="164"/>
-        <source>Metric</source>
-        <translation>Metrisks</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.ui" line="132"/>
-        <location filename="../build/ui_divelogimportdialog.h" line="165"/>
-        <source>Imperial</source>
-        <translation>Imperiāls</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divelogimportdialog.ui" line="89"/>
         <location filename="../build/ui_divelogimportdialog.h" line="152"/>
         <source>dd.mm.yyyy</source>
@@ -2701,74 +2751,6 @@ GPS location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.ui" line="155"/>
-        <location filename="../build/ui_divelogimportdialog.h" line="167"/>
-        <source>Drag the tags above to each corresponding column below</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="641"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="729"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="852"/>
-        <source>Dive #</source>
-        <translation>Niršana #</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="642"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="723"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="854"/>
-        <source>Date</source>
-        <translation>Datums</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="644"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="858"/>
-        <source>Duration</source>
-        <translation>Ilgums</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="655"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="862"/>
-        <source>GPS</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="645"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="864"/>
-        <source>Max. depth</source>
-        <translation>Maks. dziļums</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="646"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="866"/>
-        <source>Avg. depth</source>
-        <translation>Vid. dziļums</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="658"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="872"/>
-        <source>Suit</source>
-        <translation>Kostīms</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="663"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="878"/>
-        <source>Tags</source>
-        <translation>Tagi</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="652"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="894"/>
-        <source>O₂</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="653"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="896"/>
-        <source>He</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divelogimportdialog.ui" line="108"/>
         <location filename="../build/ui_divelogimportdialog.h" line="158"/>
         <source>Seconds</source>
@@ -2787,183 +2769,269 @@ GPS location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="654"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="860"/>
-        <source>Location</source>
-        <translation>Vieta</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.ui" line="127"/>
+        <location filename="../build/ui_divelogimportdialog.h" line="164"/>
+        <source>Metric</source>
+        <translation>Metrisks</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="354"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="499"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="505"/>
+        <location filename="../desktop-widgets/divelogimportdialog.ui" line="132"/>
+        <location filename="../build/ui_divelogimportdialog.h" line="165"/>
+        <source>Imperial</source>
+        <translation>Imperiāls</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.ui" line="155"/>
+        <location filename="../build/ui_divelogimportdialog.h" line="167"/>
+        <source>Drag the tags above to each corresponding column below</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="355"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="528"/>
         <source>Tab</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="575"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="598"/>
         <source>Some column headers were pre-populated; please drag and drop the headers so they match the column they are in.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="613"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="731"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="782"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="848"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="636"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="761"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="857"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="925"/>
         <source>Sample time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="615"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="733"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="784"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="638"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="763"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="859"/>
         <source>Sample depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="617"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="735"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="786"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="640"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="765"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="861"/>
         <source>Sample temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="621"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="739"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="790"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="642"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="767"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="863"/>
+        <source>Sample pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="644"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="769"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="865"/>
         <source>Sample sensor1 pO₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="623"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="741"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="792"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="646"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="771"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="867"/>
         <source>Sample sensor2 pO₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="625"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="743"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="794"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="648"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="773"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="869"/>
         <source>Sample sensor3 pO₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="633"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="751"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="802"/>
-        <source>Sample stopdepth</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="650"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="775"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="871"/>
+        <source>Sample CNS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="637"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="755"/>
-        <source>Sample setpoint</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="652"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="777"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="873"/>
+        <source>Sample NDL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="619"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="737"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="788"/>
-        <source>Sample pO₂</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="654"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="779"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="875"/>
+        <source>Sample TTS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="627"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="745"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="796"/>
-        <source>Sample CNS</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="656"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="781"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="877"/>
+        <source>Sample stopdepth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="629"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="747"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="798"/>
-        <source>Sample NDL</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="658"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="783"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="879"/>
+        <source>Sample pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="631"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="749"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="800"/>
-        <source>Sample TTS</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="660"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="785"/>
+        <source>Sample setpoint</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="635"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="664"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="759"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="929"/>
+        <source>Dive #</source>
+        <translation>Niršana #</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="665"/>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="753"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="804"/>
-        <source>Sample pressure</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="931"/>
+        <source>Date</source>
+        <translation>Datums</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="656"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="868"/>
-        <source>Divemaster</source>
-        <translation>Niršanas speciālists</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="666"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="757"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="933"/>
+        <source>Time</source>
+        <translation>Laiks</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="657"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="870"/>
-        <source>Buddy</source>
-        <translation>Draugs</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="667"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="935"/>
+        <source>Duration</source>
+        <translation>Ilgums</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="659"/>
-        <source>Rating</source>
-        <translation>Novērtējums</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="668"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="941"/>
+        <source>Max. depth</source>
+        <translation>Maks. dziļums</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="660"/>
-        <source>Visibility</source>
-        <translation>Redzamība</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="669"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="943"/>
+        <source>Avg. depth</source>
+        <translation>Vid. dziļums</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="661"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="874"/>
-        <source>Notes</source>
-        <translation>Piezīmes</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="670"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="975"/>
+        <source>Air temp.</source>
+        <translation>Gaisa temp.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="662"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="876"/>
-        <source>Weight</source>
-        <translation>Svars</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="671"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="977"/>
+        <source>Water temp.</source>
+        <translation>Ūdens temp.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="649"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="888"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="672"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="965"/>
         <source>Cyl. size</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="650"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="890"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="673"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="967"/>
         <source>Start pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="651"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="892"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="674"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="969"/>
         <source>End pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="647"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="898"/>
-        <source>Air temp.</source>
-        <translation>Gaisa temp.</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="675"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="971"/>
+        <source>O₂</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="648"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="900"/>
-        <source>Water temp.</source>
-        <translation>Ūdens temp.</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="676"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="973"/>
+        <source>He</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="677"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="937"/>
+        <source>Location</source>
+        <translation>Vieta</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="678"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="939"/>
+        <source>GPS</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="679"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="945"/>
+        <source>Divemaster</source>
+        <translation>Niršanas speciālists</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="680"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="947"/>
+        <source>Buddy</source>
+        <translation>Draugs</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="681"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="949"/>
+        <source>Suit</source>
+        <translation>Kostīms</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="682"/>
+        <source>Rating</source>
+        <translation>Novērtējums</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="683"/>
+        <source>Visibility</source>
+        <translation>Redzamība</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="684"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="951"/>
+        <source>Notes</source>
+        <translation>Piezīmes</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="685"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="953"/>
+        <source>Weight</source>
+        <translation>Svars</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="686"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="955"/>
+        <source>Tags</source>
+        <translation>Tagi</translation>
     </message>
 </context>
 <context>
     <name>DiveObjectHelper</name>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="287"/>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="323"/>
         <source>%1 dive(s)</source>
         <translation type="unfinished"/>
     </message>
@@ -2971,18 +3039,18 @@ GPS location:</source>
 <context>
     <name>DivePlanner</name>
     <message>
-        <location filename="../desktop-widgets/diveplanner.ui" line="152"/>
-        <location filename="../build/ui_diveplanner.h" line="190"/>
-        <source>Altitude</source>
-        <translation>Augstums</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/diveplanner.ui" line="109"/>
         <location filename="../build/ui_diveplanner.h" line="189"/>
         <source>Planned dive time</source>
         <translation>Plānots dive laiks</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/diveplanner.ui" line="152"/>
+        <location filename="../build/ui_diveplanner.h" line="190"/>
+        <source>Altitude</source>
+        <translation>Augstums</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/diveplanner.ui" line="159"/>
         <location filename="../build/ui_diveplanner.h" line="191"/>
         <source>ATM pressure</source>
@@ -3016,32 +3084,32 @@ GPS location:</source>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="134"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="136"/>
         <source>unknown</source>
         <translation>nezināms</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="312"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="326"/>
         <source>Final depth</source>
         <translation>Gala dziļums</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="314"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="328"/>
         <source>Run time</source>
         <translation>Izpildes laiks</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="316"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="330"/>
         <source>Duration</source>
         <translation>Ilgums</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="318"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="332"/>
         <source>Used gas</source>
         <translation>Izm. gāze</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="320"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="334"/>
         <source>CC setpoint</source>
         <translation type="unfinished"/>
     </message>
@@ -3049,22 +3117,22 @@ GPS location:</source>
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="108"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="112"/>
         <source>Dive planner points</source>
         <translation>Niršanas vietas</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="112"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="116"/>
         <source>Available gases</source>
         <translation>Pieejamas gāzes</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="137"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="143"/>
         <source>Add dive data point</source>
         <translation>Pievienot niršanas vietu</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="146"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="152"/>
         <source>Save new</source>
         <translation type="unfinished"/>
     </message>
@@ -3097,11 +3165,36 @@ GPS location:</source>
         <translation>Krāsa</translation>
     </message>
     <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="124"/>
+        <source>User entered</source>
+        <translation>Ievādīts lietotājs</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="126"/>
+        <source>Cylinder index</source>
+        <translation>Balona indekss</translation>
+    </message>
+    <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="128"/>
         <source>Pressure S</source>
         <translation>Spiedums S</translation>
     </message>
     <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="130"/>
+        <source>Pressure I</source>
+        <translation>Spiediens I</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="132"/>
+        <source>Ceiling</source>
+        <translation>Maksimāla dekompr. pietura</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="134"/>
+        <source>SAC</source>
+        <translation>SAC</translation>
+    </message>
+    <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="136"/>
         <source>pN₂</source>
         <translation>pN₂</translation>
@@ -3137,18 +3230,13 @@ GPS location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="152"/>
-        <source>Heart rate</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="156"/>
-        <source>Mean depth @ s</source>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="150"/>
+        <source>Ambient pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="150"/>
-        <source>Ambient pressure</source>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="152"/>
+        <source>Heart rate</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -3157,29 +3245,9 @@ GPS location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="130"/>
-        <source>Pressure I</source>
-        <translation>Spiediens I</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="124"/>
-        <source>User entered</source>
-        <translation>Ievādīts lietotājs</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="126"/>
-        <source>Cylinder index</source>
-        <translation>Balona indekss</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="132"/>
-        <source>Ceiling</source>
-        <translation>Maksimāla dekompr. pietura</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="134"/>
-        <source>SAC</source>
-        <translation>SAC</translation>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="156"/>
+        <source>Mean depth @ s</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3246,310 +3314,314 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="395"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="441"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="434"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="483"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="398"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="444"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="437"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="486"/>
         <source>Date</source>
         <translation>Datums</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="401"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="447"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="440"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="489"/>
         <source>Rating</source>
         <translation>Novērtējums</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="404"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="443"/>
         <source>Depth</source>
         <translation>Dziļums</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="410"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="446"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="495"/>
+        <source>Duration</source>
+        <translation>Ilgums</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="449"/>
         <source>Temp</source>
         <translation>Temp.</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="413"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="452"/>
         <source>Weight</source>
         <translation>Svars</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="425"/>
-        <source>SAC</source>
-        <translation>SAC</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
-        <source>m</source>
-        <translation>m</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
-        <source>ft</source>
-        <translation>ft</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
-        <source>Weight(%1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="416"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="462"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="455"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="504"/>
         <source>Suit</source>
         <translation>Kostīms</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="419"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="465"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="458"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="507"/>
         <source>Cyl</source>
         <translation>Balons</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="422"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="468"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="461"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="510"/>
         <source>Gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
-        <source>SAC(%1)</source>
-        <translation type="unfinished"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="464"/>
+        <source>SAC</source>
+        <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
-        <source>/min</source>
-        <translation>/min</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="467"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="518"/>
+        <source>OTU</source>
+        <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="431"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="479"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="470"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="521"/>
         <source>Max CNS</source>
         <translation>Maks. CNS</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="434"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="482"/>
-        <source>Location</source>
-        <translation>Vieta</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
+        <source>Photos</source>
+        <translation>Fotogrāfijas</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
-        <source>kg</source>
-        <translation>kg</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="476"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="527"/>
+        <source>Location</source>
+        <translation>Vieta</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="492"/>
         <source>Depth(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="407"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="453"/>
-        <source>Duration</source>
-        <translation>Ilgums</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="492"/>
+        <source>m</source>
+        <translation>m</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="492"/>
+        <source>ft</source>
+        <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="456"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="498"/>
         <source>Temp(%1%2)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="501"/>
+        <source>Weight(%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="501"/>
+        <source>kg</source>
+        <translation>kg</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="501"/>
         <source>lbs</source>
         <translation>mārciņa</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="428"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="476"/>
-        <source>OTU</source>
-        <translation>OTU</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="515"/>
+        <source>SAC(%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="515"/>
+        <source>/min</source>
+        <translation>/min</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="524"/>
+        <source>Photos before/during/after dive</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="164"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="165"/>
         <source>no dives were selected</source>
         <translation>neviena niršana nebija izvēlēta</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="174"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="175"/>
         <source>stylesheet to export to divelogs.de is not found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="184"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="185"/>
         <source>failed to create zip file for upload: %s</source>
         <translation>neizdevas izveidot ZIP failu augšupielādēšanai: %s</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="236"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="237"/>
         <source>internal error</source>
         <translation>iekšēja kļūda</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="244"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="245"/>
         <source>Conversion of dive %1 to divelogs.de format failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="272"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="273"/>
         <source>error writing zip file: %s zip error %d system error %d - %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="745"/>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="935"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="936"/>
         <source>Done</source>
         <translation>Izdarīts</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="778"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="779"/>
         <source>Uploading dive list...</source>
         <translation>Augšupielādē niršanas sarakstu...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="810"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="811"/>
         <source>Downloading dive list...</source>
         <translation>Niršanas saraksta lejupielādēšana...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="851"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="852"/>
         <source>Downloading %1 dives...</source>
         <translation>Lejupielādē %1 niršanas...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="885"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="886"/>
         <source>Download finished - %1</source>
         <translation>Lejupielādēšana pabeigta - %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="899"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="900"/>
         <source>Problem with download</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="900"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="901"/>
         <source>The archive could not be opened:
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="909"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="910"/>
         <source>Corrupted download</source>
         <translation>Bojāta lejupielādēšana</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="910"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="911"/>
         <source>The archive could not be opened:
 %1</source>
         <translation>Nevar atvērt arhīvu:
 %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="937"/>
+        <source>Upload finished</source>
+        <translation>Augšupielādēšana ir pabeigta</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="950"/>
         <source>Upload failed</source>
         <translation>Augšupielādēšana neizdodas</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="952"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="953"/>
         <source>Upload successful</source>
         <translation>Sekmīga augšupielādēšana</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="955"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="956"/>
         <source>Login failed</source>
         <translation>Pieteikšanās neizdevās</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="958"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="959"/>
         <source>Cannot parse response</source>
         <translation>Nevar noparsēt atbildi</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="970"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="971"/>
         <source>Error: %1</source>
         <translation>Kļūda: %1</translation>
     </message>
-    <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="936"/>
-        <source>Upload finished</source>
-        <translation>Augšupielādēšana ir pabeigta</translation>
-    </message>
 </context>
 <context>
     <name>DownloadFromDCWidget</name>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="185"/>
-        <source>Error</source>
-        <translation>Kļūda</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="436"/>
-        <source>Retry</source>
-        <translation>Atkārtot</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="280"/>
-        <source>Find Uemis dive computer</source>
-        <translation>Atrast Uemis niršanas datoru</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="101"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="107"/>
         <source>Download</source>
         <translation>Lejupielādēt</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="104"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="110"/>
         <source>Choose Bluetooth download mode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="382"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="191"/>
+        <source>Error</source>
+        <translation>Kļūda</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="286"/>
+        <source>Find Uemis dive computer</source>
+        <translation>Atrast Uemis niršanas datoru</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="392"/>
         <source>Choose file for divecomputer download logfile</source>
         <translation>Izvēliet failu priekš žurnāla lejupielādēšanas no niršanas datora</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="383"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="393"/>
         <source>Log files (*.log)</source>
         <translation>Žurnalēšanas faili (*.log)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="398"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="408"/>
         <source>Warning</source>
         <translation>Brīdinājums</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="399"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="409"/>
         <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source>
         <translation>Saglabājot izraksti, niršanas NEsaglabājas niršanas sarakstā.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="410"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="420"/>
         <source>Choose file for divecomputer binary dump file</source>
         <translation>Izvēliet failu priekš niršanas datora bināra izraksta</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="411"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="421"/>
         <source>Dump files (*.bin)</source>
         <translation>Izraksta faili (*.bin)</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="446"/>
+        <source>Retry</source>
+        <translation>Atkārtot</translation>
+    </message>
 </context>
 <context>
     <name>DownloadFromDiveComputer</name>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="139"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="275"/>
-        <source>Vendor</source>
-        <translation>Ražotājs</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="14"/>
         <location filename="../build/ui_downloadfromdivecomputer.h" line="265"/>
         <source>Download from dive computer</source>
@@ -3562,17 +3634,6 @@ p, li { white-space: pre-wrap; }
         <translation>Ierīce via montēšanas vieta</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="122"/>
-        <source>Choose Bluetooth download mode</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="149"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="276"/>
-        <source>Dive computer</source>
-        <translation>Niršanas dators</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="66"/>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="101"/>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="115"/>
@@ -3596,11 +3657,46 @@ p, li { white-space: pre-wrap; }
         <translation>Vienmēr lejupielādēt niršanas</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="87"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="270"/>
+        <source>Download into new trip</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="94"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="271"/>
+        <source>Save libdivecomputer logfile</source>
+        <translation>Saglabāt libdivecomputer žurnālu</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="108"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="273"/>
+        <source>Save libdivecomputer dumpfile</source>
+        <translation>Saglabāt libdivecomputer izraksta failu</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="122"/>
+        <source>Choose Bluetooth download mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="129"/>
         <source>Select a remote Bluetooth device.</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="139"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="275"/>
+        <source>Vendor</source>
+        <translation>Ražotājs</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="149"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="276"/>
+        <source>Dive computer</source>
+        <translation>Niršanas dators</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/>
         <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="52"/>
         <location filename="../build/ui_downloadfromdivecomputer.h" line="277"/>
@@ -3608,18 +3704,6 @@ p, li { white-space: pre-wrap; }
         <translation>Lejupielādēt</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="284"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="281"/>
-        <source>OK</source>
-        <translation>Labi</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="291"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="282"/>
-        <source>Cancel</source>
-        <translation>Atcelt</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="226"/>
         <location filename="../build/ui_downloadfromdivecomputer.h" line="278"/>
         <source>Downloaded dives</source>
@@ -3638,22 +3722,16 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="94"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="271"/>
-        <source>Save libdivecomputer logfile</source>
-        <translation>Saglabāt libdivecomputer žurnālu</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="108"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="273"/>
-        <source>Save libdivecomputer dumpfile</source>
-        <translation>Saglabāt libdivecomputer izraksta failu</translation>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="284"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="281"/>
+        <source>OK</source>
+        <translation>Labi</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="87"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="270"/>
-        <source>Download into new trip</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="291"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="282"/>
+        <source>Cancel</source>
+        <translation>Atcelt</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="16"/>
@@ -3743,12 +3821,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="297"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="242"/>
         <source>To disconnect Subsurface from your Facebook account, use the button below</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="306"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="251"/>
         <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source>
         <translation type="unfinished"/>
     </message>
@@ -3756,22 +3834,22 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>FacebookManager</name>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="266"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="211"/>
         <source>Photo upload sucessfull</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="267"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="212"/>
         <source>Your dive profile was updated to Facebook.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="271"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="216"/>
         <source>Photo upload failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="272"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="217"/>
         <source>Your dive profile was not updated to Facebook, 
  please send the following to the developer. 
 </source>
@@ -3831,17 +3909,25 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>FirmwareUpdateThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1750"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1739"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1755"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1744"/>
         <source>Firmware update failed!</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
+    <name>GlobalDrawer</name>
+    <message>
+        <location filename="../mobile-widgets/qml/kirigami/src/controls/GlobalDrawer.qml" line="364"/>
+        <source>Back</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>GlobeGPS</name>
     <message>
         <location filename="../desktop-widgets/globe.cpp" line="124"/>
@@ -3857,27 +3943,27 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="40"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="32"/>
         <source>Date: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="50"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="42"/>
         <source>Name: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="60"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="52"/>
         <source>Latitude: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="69"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="61"/>
         <source>Longitude: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="113"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="105"/>
         <source>List of stored GPS fixes</source>
         <translation type="unfinished"/>
     </message>
@@ -3906,7 +3992,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>LocationFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="648"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="646"/>
         <source>Location: </source>
         <translation type="unfinished"/>
     </message>
@@ -3947,7 +4033,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>LocationFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="299"/>
+        <location filename="../qt-models/filtermodels.cpp" line="304"/>
         <source>No location set</source>
         <translation type="unfinished"/>
     </message>
@@ -4068,20 +4154,55 @@ p, li { white-space: pre-wrap; }
     </message>
 </context>
 <context>
-    <name>MainForm.ui</name>
+    <name>MainTab</name>
     <message>
-        <location filename="../packaging/ios/Subsurface-mobile/MainForm.ui.qml" line="17"/>
-        <source>Press Me 1</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/maintab.ui" line="18"/>
+        <location filename="../desktop-widgets/maintab.ui" line="439"/>
+        <location filename="../build/ui_maintab.h" line="961"/>
+        <location filename="../build/ui_maintab.h" line="963"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="539"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="571"/>
+        <source>Notes</source>
+        <translation>Piezīmes</translation>
     </message>
     <message>
-        <location filename="../packaging/ios/Subsurface-mobile/MainForm.ui.qml" line="22"/>
-        <source>Press Me 2</source>
+        <location filename="../desktop-widgets/maintab.ui" line="21"/>
+        <location filename="../build/ui_maintab.h" line="964"/>
+        <source>General notes about the current selection</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>MainTab</name>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="92"/>
+        <location filename="../desktop-widgets/maintab.ui" line="646"/>
+        <location filename="../build/ui_maintab.h" line="947"/>
+        <location filename="../build/ui_maintab.h" line="967"/>
+        <source>Date</source>
+        <translation>Datums</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="102"/>
+        <location filename="../build/ui_maintab.h" line="948"/>
+        <source>Time</source>
+        <translation>Laiks</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="112"/>
+        <location filename="../desktop-widgets/maintab.ui" line="836"/>
+        <location filename="../build/ui_maintab.h" line="949"/>
+        <location filename="../build/ui_maintab.h" line="987"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="306"/>
+        <source>Air temp.</source>
+        <translation>Gaisa temp.</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="122"/>
+        <location filename="../desktop-widgets/maintab.ui" line="855"/>
+        <location filename="../build/ui_maintab.h" line="950"/>
+        <location filename="../build/ui_maintab.h" line="989"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="307"/>
+        <source>Water temp.</source>
+        <translation>Ūdens temp.</translation>
+    </message>
     <message>
         <location filename="../desktop-widgets/maintab.ui" line="184"/>
         <location filename="../build/ui_maintab.h" line="951"/>
@@ -4090,6 +4211,17 @@ p, li { white-space: pre-wrap; }
         <translation>Vieta</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="214"/>
+        <source>Edit dive site</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="217"/>
+        <location filename="../build/ui_maintab.h" line="953"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="252"/>
         <location filename="../build/ui_maintab.h" line="954"/>
         <source>Divemaster</source>
@@ -4102,12 +4234,6 @@ p, li { white-space: pre-wrap; }
         <translation>Draugs</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.ui" line="387"/>
-        <location filename="../build/ui_maintab.h" line="959"/>
-        <source>Tags</source>
-        <translation>Tagi</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/maintab.ui" line="308"/>
         <location filename="../build/ui_maintab.h" line="956"/>
         <source>Rating</source>
@@ -4126,57 +4252,18 @@ p, li { white-space: pre-wrap; }
         <translation>Kostīms</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="387"/>
+        <location filename="../build/ui_maintab.h" line="959"/>
+        <source>Tags</source>
+        <translation>Tagi</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="397"/>
         <location filename="../build/ui_maintab.h" line="960"/>
         <source>Dive mode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.ui" line="112"/>
-        <location filename="../desktop-widgets/maintab.ui" line="836"/>
-        <location filename="../build/ui_maintab.h" line="949"/>
-        <location filename="../build/ui_maintab.h" line="987"/>
-        <location filename="../desktop-widgets/maintab.cpp" line="306"/>
-        <source>Air temp.</source>
-        <translation>Gaisa temp.</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="122"/>
-        <location filename="../desktop-widgets/maintab.ui" line="855"/>
-        <location filename="../build/ui_maintab.h" line="950"/>
-        <location filename="../build/ui_maintab.h" line="989"/>
-        <location filename="../desktop-widgets/maintab.cpp" line="307"/>
-        <source>Water temp.</source>
-        <translation>Ūdens temp.</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="18"/>
-        <location filename="../desktop-widgets/maintab.ui" line="439"/>
-        <location filename="../build/ui_maintab.h" line="961"/>
-        <location filename="../build/ui_maintab.h" line="963"/>
-        <location filename="../desktop-widgets/maintab.cpp" line="539"/>
-        <location filename="../desktop-widgets/maintab.cpp" line="571"/>
-        <source>Notes</source>
-        <translation>Piezīmes</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="21"/>
-        <location filename="../build/ui_maintab.h" line="964"/>
-        <source>General notes about the current selection</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="214"/>
-        <source>Edit dive site</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="217"/>
-        <location filename="../build/ui_maintab.h" line="953"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/maintab.ui" line="491"/>
         <location filename="../build/ui_maintab.h" line="965"/>
         <source>Equipment</source>
@@ -4201,6 +4288,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="665"/>
+        <location filename="../build/ui_maintab.h" line="969"/>
+        <source>Interval</source>
+        <translation>Intervāls</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="684"/>
         <location filename="../build/ui_maintab.h" line="971"/>
         <source>Gases used</source>
@@ -4213,18 +4306,38 @@ p, li { white-space: pre-wrap; }
         <translation>Patērēta gāze</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="722"/>
+        <location filename="../desktop-widgets/maintab.ui" line="1094"/>
+        <location filename="../build/ui_maintab.h" line="975"/>
+        <location filename="../build/ui_maintab.h" line="1003"/>
+        <source>SAC</source>
+        <translation>SAC</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="741"/>
         <location filename="../build/ui_maintab.h" line="977"/>
         <source>CNS</source>
         <translation>CNS</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="760"/>
+        <location filename="../build/ui_maintab.h" line="979"/>
+        <source>OTU</source>
+        <translation>OTU</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="779"/>
         <location filename="../build/ui_maintab.h" line="981"/>
         <source>Max. depth</source>
         <translation>Maks. dziļums</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="798"/>
+        <location filename="../build/ui_maintab.h" line="983"/>
+        <source>Avg. depth</source>
+        <translation>Vid. dziļums</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="817"/>
         <location filename="../build/ui_maintab.h" line="985"/>
         <source>Air pressure</source>
@@ -4237,82 +4350,6 @@ p, li { white-space: pre-wrap; }
         <translation>Niršanas laiks</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.ui" line="933"/>
-        <location filename="../build/ui_maintab.h" line="1007"/>
-        <source>Simple statistics about the selection</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1039"/>
-        <location filename="../build/ui_maintab.h" line="999"/>
-        <source>Total time</source>
-        <translation>Kopējais laiks</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1106"/>
-        <location filename="../build/ui_maintab.h" line="1004"/>
-        <source>Gas consumption</source>
-        <translation>Gāzes patērēšana</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1151"/>
-        <location filename="../build/ui_maintab.h" line="1009"/>
-        <source>All photos from the current selection</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1177"/>
-        <location filename="../build/ui_maintab.h" line="1010"/>
-        <source>Extra data</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1180"/>
-        <location filename="../build/ui_maintab.h" line="1011"/>
-        <source>Adittional data from the dive computer</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="92"/>
-        <location filename="../desktop-widgets/maintab.ui" line="646"/>
-        <location filename="../build/ui_maintab.h" line="947"/>
-        <location filename="../build/ui_maintab.h" line="967"/>
-        <source>Date</source>
-        <translation>Datums</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="102"/>
-        <location filename="../build/ui_maintab.h" line="948"/>
-        <source>Time</source>
-        <translation>Laiks</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="665"/>
-        <location filename="../build/ui_maintab.h" line="969"/>
-        <source>Interval</source>
-        <translation>Intervāls</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="722"/>
-        <location filename="../desktop-widgets/maintab.ui" line="1094"/>
-        <location filename="../build/ui_maintab.h" line="975"/>
-        <location filename="../build/ui_maintab.h" line="1003"/>
-        <source>SAC</source>
-        <translation>SAC</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="798"/>
-        <location filename="../build/ui_maintab.h" line="983"/>
-        <source>Avg. depth</source>
-        <translation>Vid. dziļums</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="760"/>
-        <location filename="../build/ui_maintab.h" line="979"/>
-        <source>OTU</source>
-        <translation>OTU</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/maintab.ui" line="893"/>
         <location filename="../build/ui_maintab.h" line="993"/>
         <source>Salinity</source>
@@ -4325,22 +4362,34 @@ p, li { white-space: pre-wrap; }
         <translation>Statistika</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="933"/>
+        <location filename="../build/ui_maintab.h" line="1007"/>
+        <source>Simple statistics about the selection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="986"/>
         <location filename="../build/ui_maintab.h" line="996"/>
         <source>Depth</source>
         <translation>Dziļums</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="998"/>
+        <location filename="../build/ui_maintab.h" line="997"/>
+        <source>Duration</source>
+        <translation>Ilgums</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="1027"/>
         <location filename="../build/ui_maintab.h" line="998"/>
         <source>Temperature</source>
         <translation>Temperatūra</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.ui" line="998"/>
-        <location filename="../build/ui_maintab.h" line="997"/>
-        <source>Duration</source>
-        <translation>Ilgums</translation>
+        <location filename="../desktop-widgets/maintab.ui" line="1039"/>
+        <location filename="../build/ui_maintab.h" line="999"/>
+        <source>Total time</source>
+        <translation>Kopējais laiks</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/maintab.ui" line="1058"/>
@@ -4349,20 +4398,34 @@ p, li { white-space: pre-wrap; }
         <translation>Niršanas</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="1106"/>
+        <location filename="../build/ui_maintab.h" line="1004"/>
+        <source>Gas consumption</source>
+        <translation>Gāzes patērēšana</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="1148"/>
         <location filename="../build/ui_maintab.h" line="1008"/>
         <source>Photos</source>
         <translation>Fotogrāfijas</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.cpp" line="88"/>
-        <source>Cylinders</source>
-        <translation>Cilindri</translation>
+        <location filename="../desktop-widgets/maintab.ui" line="1151"/>
+        <location filename="../build/ui_maintab.h" line="1009"/>
+        <source>All photos from the current selection</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.cpp" line="92"/>
-        <source>Weights</source>
-        <translation>Sver</translation>
+        <location filename="../desktop-widgets/maintab.ui" line="1177"/>
+        <location filename="../build/ui_maintab.h" line="1010"/>
+        <source>Extra data</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="1180"/>
+        <location filename="../build/ui_maintab.h" line="1011"/>
+        <source>Adittional data from the dive computer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/maintab.cpp" line="63"/>
@@ -4375,11 +4438,21 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.cpp" line="88"/>
+        <source>Cylinders</source>
+        <translation>Cilindri</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.cpp" line="89"/>
         <source>Add cylinder</source>
         <translation>Pievienot cilindri</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.cpp" line="92"/>
+        <source>Weights</source>
+        <translation>Sver</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.cpp" line="93"/>
         <source>Add weight system</source>
         <translation type="unfinished"/>
@@ -4570,659 +4643,685 @@ mixed from Air and using:
         <translation>&amp;Fails</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="455"/>
-        <location filename="../build/ui_mainwindow.h" line="534"/>
-        <source>Export dive logs</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="510"/>
-        <location filename="../build/ui_mainwindow.h" line="542"/>
-        <source>Toggle pHe graph</source>
-        <translation>Pārslēgt pHe grafiku</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="546"/>
-        <location filename="../build/ui_mainwindow.h" line="545"/>
-        <source>Toggle calculating all tissues</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="522"/>
-        <location filename="../build/ui_mainwindow.h" line="543"/>
-        <source>Toggle DC reported ceiling</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="534"/>
-        <location filename="../build/ui_mainwindow.h" line="544"/>
-        <source>Toggle calculated ceiling</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="606"/>
-        <location filename="../build/ui_mainwindow.h" line="550"/>
-        <source>Toggle NDL, TTS</source>
-        <translation>Pārslēgt NDL, TTS</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="558"/>
-        <location filename="../build/ui_mainwindow.h" line="546"/>
-        <source>Toggle calculated ceiling with 3m increments</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="463"/>
-        <location filename="../build/ui_mainwindow.h" line="537"/>
-        <source>Configure &amp;dive computer</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="570"/>
-        <location filename="../build/ui_mainwindow.h" line="547"/>
-        <source>Toggle heart rate</source>
-        <translation>Pārslēgt pulsu</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="582"/>
-        <location filename="../build/ui_mainwindow.h" line="548"/>
-        <source>Toggle MOD</source>
-        <translation>Pārslēgt MOD</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="594"/>
-        <location filename="../build/ui_mainwindow.h" line="549"/>
-        <source>Toggle EAD, END, EADD</source>
-        <translation>Pārslēgt EAD, END, EADD</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="618"/>
-        <location filename="../build/ui_mainwindow.h" line="551"/>
-        <source>Toggle SAC rate</source>
-        <translation>SAC</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="630"/>
-        <location filename="../build/ui_mainwindow.h" line="552"/>
-        <source>Toggle ruler</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="86"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="87"/>
         <location filename="../build/ui_mainwindow.h" line="569"/>
         <source>&amp;Log</source>
         <translation>&amp;Žurnāls</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="105"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="104"/>
         <location filename="../build/ui_mainwindow.h" line="570"/>
         <source>&amp;View</source>
         <translation>&amp;Skats</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="121"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="120"/>
         <location filename="../build/ui_mainwindow.h" line="571"/>
         <source>&amp;Help</source>
         <translation>&amp;Palīdzība</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="130"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="129"/>
         <location filename="../build/ui_mainwindow.h" line="572"/>
         <source>&amp;Import</source>
         <translation>&amp;Imports</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="139"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="138"/>
         <location filename="../build/ui_mainwindow.h" line="573"/>
         <source>&amp;Edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="144"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="143"/>
         <source>Share on</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="158"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="157"/>
         <location filename="../build/ui_mainwindow.h" line="453"/>
         <source>&amp;New logbook</source>
         <translation>&amp;Jauns žunāls</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="161"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="160"/>
         <location filename="../build/ui_mainwindow.h" line="455"/>
         <source>New</source>
         <translation>Jauns</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="164"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="163"/>
         <location filename="../build/ui_mainwindow.h" line="457"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="169"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="168"/>
         <location filename="../build/ui_mainwindow.h" line="458"/>
         <source>&amp;Open logbook</source>
         <translation>&amp;Atvērt žurnālu</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="172"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="171"/>
         <location filename="../build/ui_mainwindow.h" line="460"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="508"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="502"/>
         <source>Open</source>
         <translation>Atvērt</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="175"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="174"/>
         <location filename="../build/ui_mainwindow.h" line="462"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="180"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="179"/>
         <location filename="../build/ui_mainwindow.h" line="463"/>
         <source>&amp;Save</source>
         <translation>&amp;Saglabāt</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="183"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="182"/>
         <location filename="../build/ui_mainwindow.h" line="465"/>
         <source>Save</source>
         <translation>Saglabāt</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="186"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="185"/>
         <location filename="../build/ui_mainwindow.h" line="467"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="191"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="190"/>
         <location filename="../build/ui_mainwindow.h" line="468"/>
         <source>Sa&amp;ve as</source>
         <translation>Saglabāt kā</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="194"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="193"/>
         <location filename="../build/ui_mainwindow.h" line="470"/>
         <source>Save as</source>
         <translation>Saglabāt kā</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="197"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="196"/>
         <location filename="../build/ui_mainwindow.h" line="472"/>
         <source>Ctrl+Shift+S</source>
         <translation>Ctrl+Shift+S</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="202"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="201"/>
         <location filename="../build/ui_mainwindow.h" line="473"/>
         <source>&amp;Close</source>
         <translation>Aizvērt</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="205"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="204"/>
         <location filename="../build/ui_mainwindow.h" line="475"/>
         <source>Close</source>
         <translation>Aizvērt</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="208"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="207"/>
         <location filename="../build/ui_mainwindow.h" line="477"/>
         <source>Ctrl+W</source>
         <translation>Ctrl+w</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="221"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="212"/>
+        <location filename="../build/ui_mainwindow.h" line="478"/>
+        <source>&amp;Print</source>
+        <translation>&amp;Drukāt</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="215"/>
+        <location filename="../build/ui_mainwindow.h" line="479"/>
+        <source>Ctrl+P</source>
+        <translation>Ctrl+P</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="220"/>
         <location filename="../build/ui_mainwindow.h" line="480"/>
         <source>P&amp;references</source>
         <translation>Preferences</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="251"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="223"/>
+        <location filename="../build/ui_mainwindow.h" line="481"/>
+        <source>Ctrl+,</source>
+        <translation>Ctrl+,</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="231"/>
+        <location filename="../build/ui_mainwindow.h" line="482"/>
+        <source>&amp;Quit</source>
+        <translation>&amp;Pabeigt</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="234"/>
+        <location filename="../build/ui_mainwindow.h" line="483"/>
+        <source>Ctrl+Q</source>
+        <translation>Ctrl+Q</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="242"/>
+        <location filename="../build/ui_mainwindow.h" line="484"/>
+        <source>Import from &amp;dive computer</source>
+        <translation>Importēt no &amp;niršanas datora</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="245"/>
+        <location filename="../build/ui_mainwindow.h" line="485"/>
+        <source>Ctrl+D</source>
+        <translation>Ctrl+D</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="250"/>
         <location filename="../build/ui_mainwindow.h" line="486"/>
         <source>Import &amp;GPS data from Subsurface web service</source>
         <translation>Importēt &amp;GPS datus no Subsurface servissa</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="259"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="253"/>
+        <location filename="../build/ui_mainwindow.h" line="487"/>
+        <source>Ctrl+G</source>
+        <translation>Ctrl+G</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="258"/>
         <location filename="../build/ui_mainwindow.h" line="488"/>
         <source>Edit device &amp;names</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="272"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="263"/>
+        <location filename="../build/ui_mainwindow.h" line="489"/>
+        <source>&amp;Add dive</source>
+        <translation>&amp;Pievienot niršanu</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="266"/>
+        <location filename="../build/ui_mainwindow.h" line="490"/>
+        <source>Ctrl++</source>
+        <translation>Ctrl++</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="271"/>
         <location filename="../build/ui_mainwindow.h" line="491"/>
         <source>&amp;Edit dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="277"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="276"/>
         <location filename="../build/ui_mainwindow.h" line="492"/>
         <source>&amp;Copy dive components</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="280"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="279"/>
         <location filename="../build/ui_mainwindow.h" line="493"/>
         <source>Ctrl+C</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="285"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="284"/>
         <location filename="../build/ui_mainwindow.h" line="494"/>
         <source>&amp;Paste dive components</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="288"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="287"/>
         <location filename="../build/ui_mainwindow.h" line="495"/>
         <source>Ctrl+V</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="325"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="292"/>
+        <location filename="../build/ui_mainwindow.h" line="496"/>
+        <source>&amp;Renumber</source>
+        <translation>&amp;Pārnumurēt</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="295"/>
+        <location filename="../build/ui_mainwindow.h" line="497"/>
+        <source>Ctrl+R</source>
+        <translation>Ctrl+R</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="303"/>
+        <location filename="../build/ui_mainwindow.h" line="498"/>
+        <source>Auto &amp;group</source>
+        <translation>&amp;Auto-grupēšana</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="308"/>
+        <location filename="../build/ui_mainwindow.h" line="499"/>
+        <source>&amp;Yearly statistics</source>
+        <translation>&amp;Gada statistika</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="311"/>
+        <location filename="../build/ui_mainwindow.h" line="500"/>
+        <source>Ctrl+Y</source>
+        <translation>Ctrl+Y</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="316"/>
+        <location filename="../build/ui_mainwindow.h" line="501"/>
+        <source>&amp;Dive list</source>
+        <translation>&amp;Niršanas saraksts</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="319"/>
+        <location filename="../build/ui_mainwindow.h" line="502"/>
+        <source>Ctrl+2</source>
+        <translation>Ctrl+2</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="324"/>
         <location filename="../build/ui_mainwindow.h" line="503"/>
         <source>&amp;Profile</source>
         <translation>Profils</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="333"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="327"/>
+        <location filename="../build/ui_mainwindow.h" line="504"/>
+        <source>Ctrl+3</source>
+        <translation>Ctrl+3</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="332"/>
         <location filename="../build/ui_mainwindow.h" line="505"/>
         <source>&amp;Info</source>
         <translation>Info</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="341"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="335"/>
+        <location filename="../build/ui_mainwindow.h" line="506"/>
+        <source>Ctrl+4</source>
+        <translation>Ctrl+4</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="340"/>
         <location filename="../build/ui_mainwindow.h" line="507"/>
         <source>&amp;All</source>
         <translation>Visi</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="357"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="343"/>
+        <location filename="../build/ui_mainwindow.h" line="508"/>
+        <source>Ctrl+1</source>
+        <translation>Ctrl+1</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="348"/>
+        <location filename="../build/ui_mainwindow.h" line="509"/>
+        <source>P&amp;revious DC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="351"/>
+        <location filename="../build/ui_mainwindow.h" line="510"/>
+        <source>Left</source>
+        <translation>Pa kreisi</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="356"/>
         <location filename="../build/ui_mainwindow.h" line="511"/>
         <source>&amp;Next DC</source>
         <translation>Nākamais DC</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="365"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="359"/>
+        <location filename="../build/ui_mainwindow.h" line="512"/>
+        <source>Right</source>
+        <translation>Pa labi</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="364"/>
         <location filename="../build/ui_mainwindow.h" line="513"/>
         <source>&amp;About Subsurface</source>
         <translation>Par Subsurface</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="381"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="372"/>
+        <location filename="../build/ui_mainwindow.h" line="514"/>
+        <source>User &amp;manual</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="375"/>
+        <location filename="../build/ui_mainwindow.h" line="515"/>
+        <source>F1</source>
+        <translation>F1</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="380"/>
         <location filename="../build/ui_mainwindow.h" line="516"/>
         <source>&amp;Globe</source>
         <translation>Karte</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="403"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="383"/>
+        <location filename="../build/ui_mainwindow.h" line="517"/>
+        <source>Ctrl+5</source>
+        <translation>Ctrl+5</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="388"/>
+        <location filename="../build/ui_mainwindow.h" line="518"/>
+        <source>P&amp;lan dive</source>
+        <translation>Plānotājs</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="391"/>
+        <location filename="../build/ui_mainwindow.h" line="519"/>
+        <source>Ctrl+L</source>
+        <translation>Ctrl+L</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="396"/>
+        <location filename="../build/ui_mainwindow.h" line="520"/>
+        <source>&amp;Import log files</source>
+        <translation>&amp;Importēt žurnalēšanas failu</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="399"/>
+        <location filename="../build/ui_mainwindow.h" line="522"/>
+        <source>Import divelog files from other applications</source>
+        <translation>Importēt žurnālus no citām programmām</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="402"/>
         <location filename="../build/ui_mainwindow.h" line="524"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+l</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="408"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="407"/>
         <location filename="../build/ui_mainwindow.h" line="525"/>
         <source>Import &amp;from divelogs.de</source>
         <translation>Importēt &amp;no divelogs.de</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="416"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="415"/>
         <location filename="../build/ui_mainwindow.h" line="526"/>
         <source>&amp;Full screen</source>
         <translation>Pilnekrāns</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="419"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="418"/>
         <location filename="../build/ui_mainwindow.h" line="528"/>
         <source>Toggle full screen</source>
         <translation>Pārslēgt pilnekrāna režīmu</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="447"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="421"/>
+        <location filename="../build/ui_mainwindow.h" line="530"/>
+        <source>F11</source>
+        <translation>F11</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="446"/>
         <location filename="../build/ui_mainwindow.h" line="531"/>
         <source>&amp;Check for updates</source>
         <translation> &amp;Pārbaudīt atjaunāšanas</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="452"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="451"/>
         <location filename="../build/ui_mainwindow.h" line="532"/>
         <source>&amp;Export</source>
         <translation>Eksports</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="458"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="454"/>
+        <location filename="../build/ui_mainwindow.h" line="534"/>
+        <source>Export dive logs</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="457"/>
         <location filename="../build/ui_mainwindow.h" line="536"/>
         <source>Ctrl+E</source>
         <translation>Ctrl+E</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="466"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="462"/>
+        <location filename="../build/ui_mainwindow.h" line="537"/>
+        <source>Configure &amp;dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="465"/>
         <location filename="../build/ui_mainwindow.h" line="538"/>
         <source>Ctrl+Shift+C</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="474"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="473"/>
         <location filename="../build/ui_mainwindow.h" line="539"/>
         <source>Edit &amp;dive in planner</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="486"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="485"/>
         <location filename="../build/ui_mainwindow.h" line="540"/>
         <source>Toggle pO₂ graph</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="498"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="497"/>
         <location filename="../build/ui_mainwindow.h" line="541"/>
         <source>Toggle pN₂ graph</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="642"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="509"/>
+        <location filename="../build/ui_mainwindow.h" line="542"/>
+        <source>Toggle pHe graph</source>
+        <translation>Pārslēgt pHe grafiku</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="521"/>
+        <location filename="../build/ui_mainwindow.h" line="543"/>
+        <source>Toggle DC reported ceiling</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="533"/>
+        <location filename="../build/ui_mainwindow.h" line="544"/>
+        <source>Toggle calculated ceiling</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="545"/>
+        <location filename="../build/ui_mainwindow.h" line="545"/>
+        <source>Toggle calculating all tissues</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="557"/>
+        <location filename="../build/ui_mainwindow.h" line="546"/>
+        <source>Toggle calculated ceiling with 3m increments</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="569"/>
+        <location filename="../build/ui_mainwindow.h" line="547"/>
+        <source>Toggle heart rate</source>
+        <translation>Pārslēgt pulsu</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="581"/>
+        <location filename="../build/ui_mainwindow.h" line="548"/>
+        <source>Toggle MOD</source>
+        <translation>Pārslēgt MOD</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="593"/>
+        <location filename="../build/ui_mainwindow.h" line="549"/>
+        <source>Toggle EAD, END, EADD</source>
+        <translation>Pārslēgt EAD, END, EADD</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="605"/>
+        <location filename="../build/ui_mainwindow.h" line="550"/>
+        <source>Toggle NDL, TTS</source>
+        <translation>Pārslēgt NDL, TTS</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="617"/>
+        <location filename="../build/ui_mainwindow.h" line="551"/>
+        <source>Toggle SAC rate</source>
+        <translation>SAC</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="629"/>
+        <location filename="../build/ui_mainwindow.h" line="552"/>
+        <source>Toggle ruler</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="641"/>
         <location filename="../build/ui_mainwindow.h" line="553"/>
         <source>Scale graph</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="654"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="653"/>
         <location filename="../build/ui_mainwindow.h" line="554"/>
         <source>Toggle pictures</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="666"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="665"/>
         <location filename="../build/ui_mainwindow.h" line="555"/>
         <source>Toggle tank bar</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="674"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="673"/>
         <location filename="../build/ui_mainwindow.h" line="556"/>
         <source>&amp;Filter divelist</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="689"/>
-        <location filename="../build/ui_mainwindow.h" line="558"/>
-        <source>Toggle tissue graph</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="676"/>
+        <location filename="../build/ui_mainwindow.h" line="557"/>
+        <source>Ctrl+F</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="694"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="688"/>
+        <source>Toggle tissue heat-map</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="693"/>
         <location filename="../build/ui_mainwindow.h" line="559"/>
         <source>User &amp;survey</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="699"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="698"/>
         <location filename="../build/ui_mainwindow.h" line="560"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="238"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="231"/>
         <source>&amp;Undo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="702"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="701"/>
         <location filename="../build/ui_mainwindow.h" line="561"/>
         <source>Ctrl+Z</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="707"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="706"/>
         <location filename="../build/ui_mainwindow.h" line="562"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="239"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="232"/>
         <source>&amp;Redo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="710"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="709"/>
         <location filename="../build/ui_mainwindow.h" line="563"/>
         <source>Ctrl+Shift+Z</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="715"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="714"/>
         <location filename="../build/ui_mainwindow.h" line="564"/>
         <source>&amp;Find moved images</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="720"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="719"/>
         <source>Open c&amp;loud storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="725"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="724"/>
         <source>Save to clo&amp;ud storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="730"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="729"/>
         <location filename="../build/ui_mainwindow.h" line="567"/>
         <source>&amp;Manage dive sites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="735"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="734"/>
         <source>Dive Site &amp;Edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="740"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="739"/>
         <source>Facebook</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="745"/>
-        <source>Add GPS location here</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="744"/>
+        <source>Take cloud storage online</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="677"/>
-        <location filename="../build/ui_mainwindow.h" line="557"/>
-        <source>Ctrl+F</source>
+        <location filename="../build/ui_mainwindow.h" line="558"/>
+        <source>Toggle tissue graph</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="213"/>
-        <location filename="../build/ui_mainwindow.h" line="478"/>
-        <source>&amp;Print</source>
-        <translation>&amp;Drukāt</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="224"/>
-        <location filename="../build/ui_mainwindow.h" line="481"/>
-        <source>Ctrl+,</source>
-        <translation>Ctrl+,</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="232"/>
-        <location filename="../build/ui_mainwindow.h" line="482"/>
-        <source>&amp;Quit</source>
-        <translation>&amp;Pabeigt</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="243"/>
-        <location filename="../build/ui_mainwindow.h" line="484"/>
-        <source>Import from &amp;dive computer</source>
-        <translation>Importēt no &amp;niršanas datora</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="254"/>
-        <location filename="../build/ui_mainwindow.h" line="487"/>
-        <source>Ctrl+G</source>
-        <translation>Ctrl+G</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="267"/>
-        <location filename="../build/ui_mainwindow.h" line="490"/>
-        <source>Ctrl++</source>
-        <translation>Ctrl++</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="293"/>
-        <location filename="../build/ui_mainwindow.h" line="496"/>
-        <source>&amp;Renumber</source>
-        <translation>&amp;Pārnumurēt</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="296"/>
-        <location filename="../build/ui_mainwindow.h" line="497"/>
-        <source>Ctrl+R</source>
-        <translation>Ctrl+R</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="312"/>
-        <location filename="../build/ui_mainwindow.h" line="500"/>
-        <source>Ctrl+Y</source>
-        <translation>Ctrl+Y</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="392"/>
-        <location filename="../build/ui_mainwindow.h" line="519"/>
-        <source>Ctrl+L</source>
-        <translation>Ctrl+L</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="216"/>
-        <location filename="../build/ui_mainwindow.h" line="479"/>
-        <source>Ctrl+P</source>
-        <translation>Ctrl+P</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="235"/>
-        <location filename="../build/ui_mainwindow.h" line="483"/>
-        <source>Ctrl+Q</source>
-        <translation>Ctrl+Q</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="246"/>
-        <location filename="../build/ui_mainwindow.h" line="485"/>
-        <source>Ctrl+D</source>
-        <translation>Ctrl+D</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="264"/>
-        <location filename="../build/ui_mainwindow.h" line="489"/>
-        <source>&amp;Add dive</source>
-        <translation>&amp;Pievienot niršanu</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="304"/>
-        <location filename="../build/ui_mainwindow.h" line="498"/>
-        <source>Auto &amp;group</source>
-        <translation>&amp;Auto-grupēšana</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="309"/>
-        <location filename="../build/ui_mainwindow.h" line="499"/>
-        <source>&amp;Yearly statistics</source>
-        <translation>&amp;Gada statistika</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="317"/>
-        <location filename="../build/ui_mainwindow.h" line="501"/>
-        <source>&amp;Dive list</source>
-        <translation>&amp;Niršanas saraksts</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="320"/>
-        <location filename="../build/ui_mainwindow.h" line="502"/>
-        <source>Ctrl+2</source>
-        <translation>Ctrl+2</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="328"/>
-        <location filename="../build/ui_mainwindow.h" line="504"/>
-        <source>Ctrl+3</source>
-        <translation>Ctrl+3</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="336"/>
-        <location filename="../build/ui_mainwindow.h" line="506"/>
-        <source>Ctrl+4</source>
-        <translation>Ctrl+4</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="344"/>
-        <location filename="../build/ui_mainwindow.h" line="508"/>
-        <source>Ctrl+1</source>
-        <translation>Ctrl+1</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="349"/>
-        <location filename="../build/ui_mainwindow.h" line="509"/>
-        <source>P&amp;revious DC</source>
+        <location filename="../build/ui_mainwindow.h" line="565"/>
+        <source>Open cloud storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="352"/>
-        <location filename="../build/ui_mainwindow.h" line="510"/>
-        <source>Left</source>
-        <translation>Pa kreisi</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="360"/>
-        <location filename="../build/ui_mainwindow.h" line="512"/>
-        <source>Right</source>
-        <translation>Pa labi</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="373"/>
-        <location filename="../build/ui_mainwindow.h" line="514"/>
-        <source>User &amp;manual</source>
+        <location filename="../build/ui_mainwindow.h" line="566"/>
+        <source>Save to cloud storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="376"/>
-        <location filename="../build/ui_mainwindow.h" line="515"/>
-        <source>F1</source>
-        <translation>F1</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="384"/>
-        <location filename="../build/ui_mainwindow.h" line="517"/>
-        <source>Ctrl+5</source>
-        <translation>Ctrl+5</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="389"/>
-        <location filename="../build/ui_mainwindow.h" line="518"/>
-        <source>P&amp;lan dive</source>
-        <translation>Plānotājs</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="397"/>
-        <location filename="../build/ui_mainwindow.h" line="520"/>
-        <source>&amp;Import log files</source>
-        <translation>&amp;Importēt žurnalēšanas failu</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="400"/>
-        <location filename="../build/ui_mainwindow.h" line="522"/>
-        <source>Import divelog files from other applications</source>
-        <translation>Importēt žurnālus no citām programmām</translation>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="331"/>
+        <source>Connect to</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="422"/>
-        <location filename="../build/ui_mainwindow.h" line="530"/>
-        <source>F11</source>
-        <translation>F11</translation>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="493"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="538"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1545"/>
+        <source>Please save or cancel the current dive edit before opening a new file.</source>
+        <translation>Lūdzu, saglabājiet vai atceliet pašreizējo niršanu rediģēšanu pirms jauna faila atveršanas.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="505"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="499"/>
         <source>Open file</source>
         <translation>Atvērt failu</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="509"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="503"/>
         <location filename="../desktop-widgets/mainwindow.cpp" line="614"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1972"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1978"/>
         <source>Cancel</source>
         <translation>Atcelt</translation>
     </message>
@@ -5242,6 +5341,16 @@ mixed from Air and using:
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="649"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="796"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="977"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="983"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1849"/>
+        <source>Warning</source>
+        <translation>Brīdinājums</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="674"/>
         <source>Please save or cancel the current dive edit before closing the file.</source>
         <translation>Lūdzu, saglabājiet vai atceliet pašreizējo niršanu rediģēšanu pirms fails aizvēršanas.</translation>
@@ -5257,124 +5366,97 @@ mixed from Air and using:
         <translation>Izdrukāt niršanas tabulu</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="982"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
+        <source>Trying to replan a dive that&apos;s not a planned dive.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="977"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1849"/>
+        <source>Please, first finish the current edition before trying to do another.</source>
+        <translation>Lūdzu, pabeidziet tekošo rediģēšanu pirms mēģinot citu.</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="983"/>
         <source>Trying to edit a dive that&apos;s not a manually added dive.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1243"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1030"/>
+        <source>Yearly statistics</source>
+        <translation>Gada statistika</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1244"/>
         <source>Do you want to save the changes that you made in the file %1?</source>
         <translation>Vai velāties saglabāt izmaiņas datnē %1?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1246"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1247"/>
         <source>Do you want to save the changes that you made in the data file?</source>
         <translation>Vai velāties saglabāt izmaiņas datnes datu datnē?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1251"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1252"/>
         <source>Save changes?</source>
         <translation>Saglabāt izmaiņas?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1587"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1253"/>
+        <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="../desktop-widgets/mainwindow.cpp" line="1572"/>
         <source>Save file as</source>
         <translation>Saglabāt kā</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1682"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1573"/>
+        <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
+        <translation>Subsurface XML datnes (*.ssrf *.xml *.XML)</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1670"/>
+        <source>[local cache for] %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1672"/>
         <source>[cloud storage for] %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1782"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1788"/>
         <source>Opening datafile from older version</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1783"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1789"/>
         <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly.
 Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1794"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1800"/>
         <source>Open dive log file</source>
         <translation>Atvērt niršanas žurnālu</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1795"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1801"/>
         <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1972"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1978"/>
         <source>Contacting cloud service...</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1252"/>
-        <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="../desktop-widgets/mainwindow.cpp" line="649"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="796"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="976"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="982"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/>
-        <source>Warning</source>
-        <translation>Brīdinājums</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="499"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="544"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1560"/>
-        <source>Please save or cancel the current dive edit before opening a new file.</source>
-        <translation>Lūdzu, saglabājiet vai atceliet pašreizējo niršanu rediģēšanu pirms jauna faila atveršanas.</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="338"/>
-        <source>Connect to</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
-        <source>Trying to replan a dive that&apos;s not a planned dive.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1029"/>
-        <source>Yearly statistics</source>
-        <translation>Gada statistika</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1588"/>
-        <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
-        <translation>Subsurface XML datnes (*.ssrf *.xml *.XML)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="976"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/>
-        <source>Please, first finish the current edition before trying to do another.</source>
-        <translation>Lūdzu, pabeidziet tekošo rediģēšanu pirms mēģinot citu.</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_mainwindow.h" line="565"/>
-        <source>Open cloud storage</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../build/ui_mainwindow.h" line="566"/>
-        <source>Save to cloud storage</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>MultiFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="733"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="731"/>
         <source>Filter shows %1 (of %2) dives</source>
         <translation type="unfinished"/>
     </message>
@@ -5382,39 +5464,39 @@ Subsurface has already tried to pre-populate the data but it might be worth whil
 <context>
     <name>OstcFirmwareCheck</name>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="269"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="271"/>
         <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="273"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="275"/>
         <source>
 
 Please start Bluetooth on your OSTC Sport and do the same preparations as for a logbook download before continuing with the update</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="274"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="276"/>
         <source>Not now</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="275"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="277"/>
         <source>Update firmware</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="277"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="279"/>
         <source>Firmware upgrade notice</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="295"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="297"/>
         <source>Save the downloaded firmware as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="296"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="298"/>
         <source>HEX files (*.hex)</source>
         <translation type="unfinished"/>
     </message>
@@ -5422,79 +5504,89 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PlannerSettingsWidget</name>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="322"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="302"/>
         <source>Open circuit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="322"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="302"/>
         <source>CCR</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="322"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="302"/>
         <source>pSCR</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="421"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="388"/>
         <source>ft/min</source>
         <translation>ft/min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="422"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="389"/>
         <source>Last stop at 20ft</source>
         <translation>Pēdējā pietura pie 20ft</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="423"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="390"/>
         <source>50% avg. depth to 20ft</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="424"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="391"/>
         <source>20ft to surface</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="426"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="392"/>
+        <source>ft</source>
+        <translation>ft</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="394"/>
         <source>m/min</source>
         <translation>m/min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="427"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="395"/>
         <source>Last stop at 6m</source>
         <translation>Pēdējā pietura pie 6m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="428"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="396"/>
         <source>50% avg. depth to 6m</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="429"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="397"/>
         <source>6m to surface</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="432"/>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="433"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="398"/>
+        <source>m</source>
+        <translation>m</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="401"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="402"/>
         <source>cuft/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="441"/>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="442"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="410"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="411"/>
         <source>ℓ/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="451"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="420"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="456"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="425"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
@@ -5644,6 +5736,11 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PreferencesDialog</name>
     <message>
+        <location filename="../build/ui_preferences.h" line="1283"/>
+        <source>Preferences</source>
+        <translation>Priekšrocības</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1288"/>
         <source>Defaults</source>
         <translation>Noklusējumi</translation>
@@ -5679,6 +5776,11 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1303"/>
+        <source>Lists and tables</source>
+        <translation>Saraksti un tabulas</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1304"/>
         <source>Font</source>
         <translation>Fonts</translation>
@@ -5694,6 +5796,11 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>Niršanas</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1307"/>
+        <source>Default dive log file</source>
+        <translation>Noklusējama niršanas datne</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1308"/>
         <source>No default file</source>
         <translation type="unfinished"/>
@@ -5724,6 +5831,21 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>...</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1314"/>
+        <source>Display invalid</source>
+        <translation>Izrādīt nederīgu</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1316"/>
+        <source>Default cylinder</source>
+        <translation>Noklusējamais balons</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1317"/>
+        <source>Use default cylinder</source>
+        <translation>Izmantot noklusējamo balonu</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1318"/>
         <source>Animations</source>
         <translation>Animācija</translation>
@@ -5754,42 +5876,26 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>Sistēma</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1401"/>
-        <source>Dive site geo lookup</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1402"/>
-        <source>Enable geocoding for dive site management</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1403"/>
-        <source>Parse site without GPS data</source>
+        <location filename="../build/ui_preferences.h" line="1324"/>
+        <source>&amp;Metric</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1404"/>
-        <source>Same format for existing dives</source>
-        <translation type="unfinished"/>
+        <location filename="../build/ui_preferences.h" line="1325"/>
+        <source>Imperial</source>
+        <translation>Imperiāls</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1405"/>
-        <source>Dive Site Layout</source>
+        <location filename="../build/ui_preferences.h" line="1326"/>
+        <source>Personali&amp;ze</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1406"/>
-        <location filename="../build/ui_preferences.h" line="1407"/>
-        <source>/</source>
+        <location filename="../build/ui_preferences.h" line="1327"/>
+        <source>Individual settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1325"/>
-        <source>Imperial</source>
-        <translation>Imperiāls</translation>
-    </message>
-    <message>
         <location filename="../build/ui_preferences.h" line="1328"/>
         <source>Depth</source>
         <translation>Dziļums</translation>
@@ -5805,6 +5911,11 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>pēda</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1331"/>
+        <source>Pressure</source>
+        <translation>Spiediens</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1332"/>
         <location filename="../build/ui_preferences.h" line="1366"/>
         <source>bar</source>
@@ -5816,11 +5927,26 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>psi</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1334"/>
+        <source>Volume</source>
+        <translation>Tilpums</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1335"/>
+        <source>&amp;liter</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1336"/>
         <source>cu ft</source>
         <translation>ft³</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1337"/>
+        <source>Temperature</source>
+        <translation>Temperatūra</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1338"/>
         <source>celsius</source>
         <translation>celsija</translation>
@@ -5831,11 +5957,121 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>fārenheita</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1340"/>
+        <source>Weight</source>
+        <translation>Svars</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1341"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1342"/>
+        <source>lbs</source>
+        <translation>lbs</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1343"/>
+        <source>Time units</source>
+        <translation>Laika mērvienības</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1344"/>
+        <source>Ascent/descent speed denominator</source>
+        <translation>Pacelšanas/nolaišanas ātruma saucējs</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1345"/>
+        <source>Minutes</source>
+        <translation>Minūtes</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1346"/>
+        <source>Seconds</source>
+        <translation>Sekundes</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1347"/>
+        <source>GPS coordinates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1348"/>
+        <source>Location Display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1349"/>
+        <source>traditional (dms)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1350"/>
+        <source>decimal</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1351"/>
+        <source>Show</source>
+        <translation>Parādīt</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1352"/>
+        <source>Threshold when showing pO₂</source>
+        <translation>Sliekšņu vērtība pO₂</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1353"/>
+        <source>Threshold when showing pN₂</source>
+        <translation>sliekšņu vērtība pN₂</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1354"/>
+        <source>Threshold when showing pHe</source>
+        <translation>sliekšņu vērtība pHe</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1355"/>
+        <source>Max pO₂ when showing MOD</source>
+        <translation>maks ppO₂ parādot MOD</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1356"/>
+        <source>Draw dive computer reported ceiling red</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1357"/>
+        <source>Show unused cylinders in Equipment tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1358"/>
+        <source>Show average depth</source>
+        <translation>Parādīt vidējo dziļumu</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1359"/>
+        <source>Misc</source>
+        <translation>Dažāds</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1360"/>
+        <source>GFLow</source>
+        <translation>GFLow</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1361"/>
+        <source>GFHigh</source>
+        <translation>GFHigh</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1362"/>
+        <source>GFLow at max depth</source>
+        <translation>GFLow maks. dziļumā</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1363"/>
         <source>CCR: show setpoints when viewing pO₂</source>
         <translation type="unfinished"/>
@@ -5881,14 +6117,19 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>Sistēmas noklusējama iestādīšana</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1374"/>
+        <source>Filter</source>
+        <translation>Filtrs</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1375"/>
         <source>Proxy</source>
         <translation>Proxy</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1379"/>
-        <source>Proxy type</source>
-        <translation>Proxy veids</translation>
+        <location filename="../build/ui_preferences.h" line="1376"/>
+        <source>Port</source>
+        <translation>Ports</translation>
     </message>
     <message>
         <location filename="../build/ui_preferences.h" line="1377"/>
@@ -5896,16 +6137,16 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1376"/>
-        <source>Port</source>
-        <translation>Ports</translation>
-    </message>
-    <message>
         <location filename="../build/ui_preferences.h" line="1378"/>
         <source>Requires authentication</source>
         <translation>Vajadzīga autorizācija</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1379"/>
+        <source>Proxy type</source>
+        <translation>Proxy veids</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1380"/>
         <source>Username</source>
         <translation>Lietotājvārds</translation>
@@ -5917,46 +6158,6 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>Parole</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1400"/>
-        <source>Disconnect from Facebook</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1374"/>
-        <source>Filter</source>
-        <translation>Filtrs</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1331"/>
-        <source>Pressure</source>
-        <translation>Spiediens</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1303"/>
-        <source>Lists and tables</source>
-        <translation>Saraksti un tabulas</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1307"/>
-        <source>Default dive log file</source>
-        <translation>Noklusējama niršanas datne</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1314"/>
-        <source>Display invalid</source>
-        <translation>Izrādīt nederīgu</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1316"/>
-        <source>Default cylinder</source>
-        <translation>Noklusējamais balons</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1317"/>
-        <source>Use default cylinder</source>
-        <translation>Izmantot noklusējamo balonu</translation>
-    </message>
-    <message>
         <location filename="../build/ui_preferences.h" line="1382"/>
         <source>Subsurface cloud storage</source>
         <translation type="unfinished"/>
@@ -5997,150 +6198,41 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>Saglabāt lietotāja ID lokāli?</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1334"/>
-        <source>Volume</source>
-        <translation>Tilpums</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1337"/>
-        <source>Temperature</source>
-        <translation>Temperatūra</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1340"/>
-        <source>Weight</source>
-        <translation>Svars</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1342"/>
-        <source>lbs</source>
-        <translation>lbs</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1343"/>
-        <source>Time units</source>
-        <translation>Laika mērvienības</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1345"/>
-        <source>Minutes</source>
-        <translation>Minūtes</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1346"/>
-        <source>Seconds</source>
-        <translation>Sekundes</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1351"/>
-        <source>Show</source>
-        <translation>Parādīt</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1362"/>
-        <source>GFLow at max depth</source>
-        <translation>GFLow maks. dziļumā</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1359"/>
-        <source>Misc</source>
-        <translation>Dažāds</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1283"/>
-        <source>Preferences</source>
-        <translation>Priekšrocības</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1324"/>
-        <source>&amp;Metric</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1326"/>
-        <source>Personali&amp;ze</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1327"/>
-        <source>Individual settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1335"/>
-        <source>&amp;liter</source>
+        <location filename="../build/ui_preferences.h" line="1400"/>
+        <source>Disconnect from Facebook</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1344"/>
-        <source>Ascent/descent speed denominator</source>
-        <translation>Pacelšanas/nolaišanas ātruma saucējs</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1347"/>
-        <source>GPS coordinates</source>
+        <location filename="../build/ui_preferences.h" line="1401"/>
+        <source>Dive site geo lookup</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1348"/>
-        <source>Location Display</source>
+        <location filename="../build/ui_preferences.h" line="1402"/>
+        <source>Enable geocoding for dive site management</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1349"/>
-        <source>traditional (dms)</source>
+        <location filename="../build/ui_preferences.h" line="1403"/>
+        <source>Parse site without GPS data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1350"/>
-        <source>decimal</source>
+        <location filename="../build/ui_preferences.h" line="1404"/>
+        <source>Same format for existing dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1352"/>
-        <source>Threshold when showing pO₂</source>
-        <translation>Sliekšņu vērtība pO₂</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1353"/>
-        <source>Threshold when showing pN₂</source>
-        <translation>sliekšņu vērtība pN₂</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1354"/>
-        <source>Threshold when showing pHe</source>
-        <translation>sliekšņu vērtība pHe</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1355"/>
-        <source>Max pO₂ when showing MOD</source>
-        <translation>maks ppO₂ parādot MOD</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1356"/>
-        <source>Draw dive computer reported ceiling red</source>
+        <location filename="../build/ui_preferences.h" line="1405"/>
+        <source>Dive Site Layout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1357"/>
-        <source>Show unused cylinders in Equipment tab</source>
+        <location filename="../build/ui_preferences.h" line="1406"/>
+        <location filename="../build/ui_preferences.h" line="1407"/>
+        <source>/</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1358"/>
-        <source>Show average depth</source>
-        <translation>Parādīt vidējo dziļumu</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1360"/>
-        <source>GFLow</source>
-        <translation>GFLow</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1361"/>
-        <source>GFHigh</source>
-        <translation>GFHigh</translation>
-    </message>
 </context>
 <context>
     <name>PreferencesGeoreference</name>
@@ -6195,106 +6287,136 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="20"/>
-        <source>Show</source>
-        <translation>Parādīt</translation>
+        <source>Gas pressure display setup</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="29"/>
-        <source>Threshold when showing pO₂</source>
-        <translation>Sliekšņu vērtība pO₂</translation>
+        <source>Threshold for pO₂ (bar)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="49"/>
-        <source>Threshold when showing pN₂</source>
-        <translation>sliekšņu vērtība pN₂</translation>
+        <source>Threshold for pN₂ (bar)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="69"/>
-        <source>Threshold when showing pHe</source>
-        <translation>sliekšņu vērtība pHe</translation>
+        <source>Threshold for pHe (bar)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="89"/>
-        <source>Max pO₂ when showing MOD</source>
-        <translation>maks ppO₂ parādot MOD</translation>
+        <source>pO₂ in calculating MOD (bar)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="109"/>
-        <source>Draw dive computer reported ceiling red</source>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="106"/>
+        <source>CCR options:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="116"/>
-        <source>Show unused cylinders in Equipment tab</source>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="113"/>
+        <source>Dive planner default setpoint (bar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="123"/>
-        <source>Show mean depth</source>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="133"/>
+        <source>Show setpoints when viewing pO₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="133"/>
-        <source>Misc</source>
-        <translation>Dažāds</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="140"/>
+        <source>Show individual O₂ sensor values when viewing pO₂</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="149"/>
-        <source>bar</source>
-        <translation>bar</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="150"/>
+        <source>Ceiling display setup</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="165"/>
-        <source>Default CCR set-point for dive planning</source>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="159"/>
+        <source>Draw dive computer reported ceiling red</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="172"/>
-        <source>pSCR O₂ metabolism rate</source>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="169"/>
+        <source>Algorithm for calculated ceiling:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="179"/>
-        <source>GFLow</source>
-        <translation>GFLow</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="176"/>
+        <source>VPM-B</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="183"/>
+        <source>VPM-B Conservatism</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="193"/>
+        <source>+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="206"/>
+        <source>Bühlmann</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="186"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="216"/>
         <source>GFHigh</source>
         <translation>GFHigh</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="203"/>
-        <source>ℓ/min</source>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="236"/>
+        <source>GFLow</source>
+        <translation>GFLow</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="256"/>
+        <source>GFLow at max depth</source>
+        <translation>GFLow maks. dziļumā</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="263"/>
+        <source>pSCR options:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="213"/>
-        <source>pSCR ratio</source>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="270"/>
+        <source>Metabolic rate (ℓ O₂/min)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="223"/>
-        <source>1:</source>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="287"/>
+        <source>Dilution ratio</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="230"/>
-        <source>CCR: show individual O₂ sensor values when viewing pO₂</source>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="300"/>
+        <source>1:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="237"/>
-        <source>CCR: show setpoints when viewing pO₂</source>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="310"/>
+        <source>Misc</source>
+        <translation>Dažāds</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="316"/>
+        <source>Show unused cylinders in Equipment tab</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="244"/>
-        <source>GFLow at max depth</source>
-        <translation>GFLow maks. dziļumā</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="323"/>
+        <source>Show mean depth in Profile</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="10"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="9"/>
         <source>Graph</source>
         <translation>Grafiks</translation>
     </message>
@@ -6363,15 +6485,29 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>Valoda</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="57"/>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="53"/>
         <source>Restart required</source>
         <translation>Ir nepieciešams restarts</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="58"/>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="54"/>
         <source>To correctly load a new language you must restart Subsurface.</source>
         <translation>Lai pareizi atspoguļotu jaunu valodu Jums jārestartē Subsurface.</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="76"/>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="82"/>
+        <source>Literal characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="77"/>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="83"/>
+        <source>Non-special character(s) in time format.
+These will be used as is. This might not be what you intended.
+See http://doc.qt.io/qt-5/qdatetime.html#toString</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PreferencesNetwork</name>
@@ -6418,7 +6554,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_network.ui" line="156"/>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="148"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="134"/>
         <source>Subsurface cloud storage</source>
         <translation type="unfinished"/>
     </message>
@@ -6463,39 +6599,39 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>Saglabāt lietotāja ID lokāli?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="11"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="10"/>
         <source>Network</source>
         <translation>Tīkls</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="15"/>
         <source>No proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/>
         <source>System proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/>
         <source>HTTP proxy</source>
         <translation>HTTP proxy</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="19"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/>
         <source>SOCKS proxy</source>
         <translation>SOCKS proxy</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="75"/>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="97"/>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="110"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="72"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="93"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="106"/>
         <source>Cloud storage email and password can only consist of letters, numbers, and &apos;.&apos;, &apos;-&apos;, &apos;_&apos;, and &apos;+&apos;.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="146"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="132"/>
         <source>Subsurface cloud storage (credentials verified)</source>
         <translation type="unfinished"/>
     </message>
@@ -6653,7 +6789,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="8"/>
+        <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="7"/>
         <source>Units</source>
         <translation>Mērvienības</translation>
     </message>
@@ -6661,17 +6797,17 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PrintDialog</name>
     <message>
-        <location filename="../desktop-widgets/printdialog.cpp" line="118"/>
-        <source>&amp;Preview</source>
-        <translation>&amp;Priekšskatījums</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/printdialog.cpp" line="115"/>
+        <location filename="../desktop-widgets/printdialog.cpp" line="102"/>
         <source>P&amp;rint</source>
         <translation>Drukāt</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/printdialog.cpp" line="130"/>
+        <location filename="../desktop-widgets/printdialog.cpp" line="105"/>
+        <source>&amp;Preview</source>
+        <translation>&amp;Priekšskatījums</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/printdialog.cpp" line="117"/>
         <source>Print</source>
         <translation>Drukāt</translation>
     </message>
@@ -6679,19 +6815,10 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PrintOptions</name>
     <message>
-        <location filename="../build/ui_printoptions.h" line="150"/>
-        <source>&amp;Table print</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../build/ui_printoptions.h" line="158"/>
-        <source>One dive per page</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../build/ui_printoptions.h" line="159"/>
-        <source>Two dives per page</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/printoptions.ui" line="29"/>
+        <location filename="../build/ui_printoptions.h" line="148"/>
+        <source>Print type</source>
+        <translation>Drukāt tipu</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/printoptions.ui" line="41"/>
@@ -6751,10 +6878,19 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/printoptions.ui" line="29"/>
-        <location filename="../build/ui_printoptions.h" line="148"/>
-        <source>Print type</source>
-        <translation>Drukāt tipu</translation>
+        <location filename="../build/ui_printoptions.h" line="150"/>
+        <source>&amp;Table print</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../build/ui_printoptions.h" line="158"/>
+        <source>One dive per page</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../build/ui_printoptions.h" line="159"/>
+        <source>Two dives per page</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/printoptions.cpp" line="128"/>
@@ -6796,103 +6932,103 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="755"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="752"/>
         <source>Show NDL / TTS was disabled because of excessive processing time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1344"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1338"/>
         <source>Make first divecomputer</source>
         <translation>Padarīt niršanas datoru par pirmo</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1346"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1340"/>
         <source>Delete this divecomputer</source>
         <translation>Nodzēst šo niršanas datoru</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1360"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1354"/>
         <source>Add gas change</source>
         <translation>Pievienot gāzes maiņu</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1363"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1357"/>
         <source> (Tank %1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1371"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1365"/>
         <source>Add set-point change</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1373"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1367"/>
         <source>Add bookmark</source>
         <translation>Pievienot grāmatzīmi</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1377"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1371"/>
         <source>Edit the profile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1381"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1375"/>
         <source>Remove event</source>
         <translation>Noņemt notikumu</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1386"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1380"/>
         <source>Hide similar events</source>
         <translation>Paslēpt līdzīgus notikumus</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1393"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1387"/>
         <source>Edit name</source>
         <translation>Rediģēt vārdu</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1422"/>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1429"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1416"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1423"/>
         <source>Adjust pressure of tank %1 (currently interpolated as %2)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1444"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1438"/>
         <source>Unhide all events</source>
         <translation>Parādīt visus notikumus</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1479"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1473"/>
         <source>Hide events</source>
         <translation>Paslēpt notikumus</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1479"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1473"/>
         <source>Hide all %1 events?</source>
         <translation>Paslēpt visus %1 notikumus?</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1514"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1508"/>
         <source>Remove the selected event?</source>
         <translation>Nodzēst izvēlēto notikumu?</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1515"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1509"/>
         <source>%1 @ %2:%3</source>
         <translation>%1 @ %2:%3</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1638"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1632"/>
         <source>Edit name of bookmark</source>
         <translation>Rediģēt grāmatzīmes vārdu</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1639"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1633"/>
         <source>Custom name:</source>
         <translation>Vārds:</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1644"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1638"/>
         <source>Name is too long!</source>
         <translation type="unfinished"/>
     </message>
@@ -6900,91 +7036,101 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>QMLManager</name>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="95"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="97"/>
         <source>Starting...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="202"/>
         <source>working in no-cloud mode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="213"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="216"/>
         <source>no cloud credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="214"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="270"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="217"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="269"/>
         <source>Please enter valid cloud credentials.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="285"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="284"/>
         <source>Attempting to open cloud storage with new credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="304"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="306"/>
         <source>Testing cloud credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="331"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="320"/>
+        <source>No response from cloud server to validate the credentials</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="329"/>
+        <source>Cannot connect to cloud storage - cloud account not verified</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="361"/>
         <source>Cloud credentials are invalid</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="344"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="374"/>
         <source>Cannot open cloud storage: Error creating https connection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="357"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="387"/>
         <source>Cannot open cloud storage: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="369"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="399"/>
         <source>Cannot connect to cloud storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="411"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="441"/>
         <source>Cloud storage error: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="501"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="531"/>
         <source>Failed to connect to cloud server, reverting to no cloud status</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="520"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="550"/>
         <source>Cloud storage open successfully. No dives in dive list.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="689"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="690"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="721"/>
         <source>h</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="689"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="690"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="691"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="721"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="722"/>
         <source>min</source>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="689"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/>
         <source>sec</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="1041"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="1102"/>
         <source>Unknown GPS location</source>
         <translation type="unfinished"/>
     </message>
@@ -6992,126 +7138,126 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../core/qthelper.cpp" line="866"/>
-        <location filename="../core/qthelper.cpp" line="1214"/>
-        <source>AIR</source>
-        <translation>Gaisa</translation>
+        <location filename="../core/gpslocation.h" line="13"/>
+        <source>Waiting to aquire GPS location</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="1214"/>
-        <source>OXYGEN</source>
-        <translation type="unfinished"/>
+        <location filename="../core/qthelper.cpp" line="766"/>
+        <location filename="../core/qthelper.cpp" line="1275"/>
+        <source>m</source>
+        <translation>m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="59"/>
-        <source>Remove this point</source>
-        <translation>Noņemt šo vietu</translation>
+        <location filename="../core/qthelper.cpp" line="768"/>
+        <location filename="../core/qthelper.cpp" line="1274"/>
+        <source>ft</source>
+        <translation>pēda</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="32"/>
-        <source>Average</source>
-        <translation>Vidējais</translation>
+        <location filename="../core/qthelper.cpp" line="794"/>
+        <source>C</source>
+        <translation>C</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="35"/>
-        <source>Minimum</source>
-        <translation>Minimums</translation>
+        <location filename="../core/qthelper.cpp" line="796"/>
+        <source>F</source>
+        <translation>F</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="38"/>
-        <source>Maximum</source>
-        <translation>Maksimums</translation>
+        <location filename="../core/qthelper.cpp" line="821"/>
+        <location filename="../core/qthelper.cpp" line="1250"/>
+        <source>kg</source>
+        <translation>kg</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/globe.cpp" line="327"/>
-        <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>
+        <location filename="../core/qthelper.cpp" line="823"/>
+        <location filename="../core/qthelper.cpp" line="1251"/>
+        <source>lbs</source>
+        <translation>mārciņa</translation>
     </message>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="28"/>
-        <source>unknown</source>
-        <translation>nezināms</translation>
+        <location filename="../core/qthelper.cpp" line="848"/>
+        <location filename="../core/qthelper.cpp" line="1300"/>
+        <source>bar</source>
+        <translation>bar</translation>
     </message>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="105"/>
-        <source>h:</source>
-        <translation type="unfinished"/>
+        <location filename="../core/qthelper.cpp" line="850"/>
+        <location filename="../core/qthelper.cpp" line="1299"/>
+        <source>psi</source>
+        <translation>psi</translation>
     </message>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="105"/>
-        <source>min</source>
-        <translation>min</translation>
+        <location filename="../core/qthelper.cpp" line="871"/>
+        <location filename="../core/qthelper.cpp" line="1235"/>
+        <source>AIR</source>
+        <translation>Gaisa</translation>
     </message>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="337"/>
-        <source>Multiple</source>
+        <location filename="../core/qthelper.cpp" line="873"/>
+        <source>EAN</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="../core/qthelper.cpp" line="957"/>
+        <location filename="../core/qthelper.cpp" line="962"/>
         <source>(%n dive(s))</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="816"/>
-        <location filename="../core/qthelper.cpp" line="1228"/>
-        <source>kg</source>
-        <translation>kg</translation>
+        <location filename="../core/qthelper.cpp" line="1235"/>
+        <source>OXYGEN</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="818"/>
-        <location filename="../core/qthelper.cpp" line="1229"/>
-        <source>lbs</source>
-        <translation>mārciņa</translation>
+        <location filename="../core/qthelper.cpp" line="1322"/>
+        <source>l</source>
+        <translation>l</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="763"/>
-        <location filename="../core/qthelper.cpp" line="1252"/>
-        <source>ft</source>
-        <translation>pēda</translation>
+        <location filename="../core/qthelper.cpp" line="1323"/>
+        <source>cuft</source>
+        <translation>kub. pēda</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="761"/>
-        <location filename="../core/qthelper.cpp" line="1253"/>
-        <source>m</source>
-        <translation>m</translation>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="29"/>
+        <source>unknown</source>
+        <translation>nezināms</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="789"/>
-        <source>C</source>
-        <translation>C</translation>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="114"/>
+        <source>h:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="791"/>
-        <source>F</source>
-        <translation>F</translation>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="114"/>
+        <source>min</source>
+        <translation>min</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="845"/>
-        <location filename="../core/qthelper.cpp" line="1275"/>
-        <source>psi</source>
-        <translation>psi</translation>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="63"/>
+        <source>Remove this point</source>
+        <translation>Noņemt šo vietu</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="843"/>
-        <location filename="../core/qthelper.cpp" line="1276"/>
-        <source>bar</source>
-        <translation>bar</translation>
+        <location filename="../desktop-widgets/globe.cpp" line="327"/>
+        <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>
     <message>
-        <location filename="../core/qthelper.cpp" line="868"/>
-        <source>EAN</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="32"/>
+        <source>Average</source>
+        <translation>Vidējais</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="1298"/>
-        <source>l</source>
-        <translation>l</translation>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="35"/>
+        <source>Minimum</source>
+        <translation>Minimums</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="1299"/>
-        <source>cuft</source>
-        <translation>kub. pēda</translation>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="38"/>
+        <source>Maximum</source>
+        <translation>Maksimums</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="625"/>
@@ -7133,17 +7279,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <source>Malformed XML response. Line %1: %2</source>
         <translation>Kļūdaina XML atbilde. Līnija %1: %2</translation>
     </message>
-    <message>
-        <location filename="../core/gpslocation.h" line="13"/>
-        <source>Waiting to aquire GPS location</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>ReadSettingsThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1651"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1676"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1640"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1665"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation type="unfinished"/>
     </message>
@@ -7172,7 +7313,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ResetSettingsThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1775"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1764"/>
         <source>Reset settings failed!</source>
         <translation type="unfinished"/>
     </message>
@@ -7210,6 +7351,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ShiftImageTimesDialog</name>
     <message>
+        <location filename="../desktop-widgets/shiftimagetimes.ui" line="23"/>
+        <location filename="../build/ui_shiftimagetimes.h" line="184"/>
+        <source>Shift selected image times</source>
+        <translation>Nobīdīt izvēlētus laikus</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/shiftimagetimes.ui" line="34"/>
         <location filename="../build/ui_shiftimagetimes.h" line="185"/>
         <source>Shift times of image(s) by</source>
@@ -7222,12 +7369,6 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>h:mm</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/shiftimagetimes.ui" line="23"/>
-        <location filename="../build/ui_shiftimagetimes.h" line="184"/>
-        <source>Shift selected image times</source>
-        <translation>Nobīdīt izvēlētus laikus</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/shiftimagetimes.ui" line="105"/>
         <location filename="../build/ui_shiftimagetimes.h" line="187"/>
         <source>Earlier</source>
@@ -7277,12 +7418,12 @@ Not all images have timestamps in the range between
         <translation>Kurš datums un laiks ir attēlots?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="297"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="296"/>
         <source>Open image file</source>
         <translation>Atvērt attēla failu</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="299"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="298"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>Attēlu faili (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -7440,49 +7581,49 @@ Not all images have timestamps in the range between
 <context>
     <name>SocialNetworkDialog</name>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="339"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="284"/>
         <source>Dive date: %1 
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="342"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="287"/>
         <source>Duration: %1 
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="343"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="288"/>
         <source>h:</source>
         <comment>abbreviation for hours plus separator</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="344"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="289"/>
         <source>min</source>
         <comment>abbreviation for minutes</comment>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="347"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="292"/>
         <source>Dive location: %1 
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="350"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="295"/>
         <source>Buddy: %1 
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="353"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="298"/>
         <source>Divemaster: %1 
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="356"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="301"/>
         <source>
 %1</source>
         <translation type="unfinished"/>
@@ -7567,9 +7708,20 @@ Not all images have timestamps in the range between
     <name>StartPage</name>
     <message>
         <location filename="../mobile-widgets/qml/StartPage.qml" line="19"/>
-        <source>To use Subsurface-mobile with Subsurface cloud storage, please enteryour cloud credentials.
+        <source>To use Subsurface-mobile with Subsurface cloud storage, please enter your cloud credentials.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/StartPage.qml" line="20"/>
+        <source>If this is the first time you use Subsurface cloud storage, enter a valid email (all lower case) and a password of your choice (letters and numbers). The server will send a PIN to the email address provided that you will have to enter here.
 
-To use Subsurface-mobile only with local data on this device, tap on the no cloud icon below.</source>
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/StartPage.qml" line="23"/>
+        <source>To use Subsurface-mobile only with local data on this device, tap on the no cloud icon below.</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -7608,7 +7760,12 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>SubsurfaceWebServices</name>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="419"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="395"/>
+        <source>Enter User ID and click Download</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="417"/>
         <source>Webservice</source>
         <translation>Tīmekļserviss</translation>
     </message>
@@ -7633,30 +7790,25 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
         <translation>Savienojuma kļūda:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="557"/>
-        <source>Download successful</source>
-        <translation>Lejupielādēšana ir sekmīga</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="551"/>
         <source>Invalid user identifier!</source>
         <translation>Nepareizs lietotāja identifikators!</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="397"/>
-        <source>Enter User ID and click Download</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="554"/>
         <source>Cannot parse response!</source>
         <translation>Nevar saparsēt atbildi!</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="557"/>
+        <source>Download successful</source>
+        <translation>Lejupielādēšana ir sekmīga</translation>
+    </message>
 </context>
 <context>
     <name>SuitFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="674"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="672"/>
         <source>Suits: </source>
         <translation type="unfinished"/>
     </message>
@@ -7664,7 +7816,7 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>SuitsFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="123"/>
+        <location filename="../qt-models/filtermodels.cpp" line="128"/>
         <source>No suit set</source>
         <translation type="unfinished"/>
     </message>
@@ -7683,7 +7835,7 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>TagFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="595"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="593"/>
         <source>Tags: </source>
         <translation type="unfinished"/>
     </message>
@@ -7691,7 +7843,7 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>TagFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="148"/>
+        <location filename="../qt-models/filtermodels.cpp" line="153"/>
         <source>Empty tags</source>
         <translation type="unfinished"/>
     </message>
@@ -7717,6 +7869,11 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>TemplateEdit</name>
     <message>
+        <location filename="../desktop-widgets/templateedit.ui" line="14"/>
+        <source>Edit template</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/templateedit.ui" line="37"/>
         <source>Preview</source>
         <translation type="unfinished"/>
@@ -7762,11 +7919,6 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
         <translation>Fonta izmērs</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/templateedit.ui" line="14"/>
-        <source>Edit template</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/templateedit.ui" line="165"/>
         <source>Color palette</source>
         <translation type="unfinished"/>
@@ -7948,85 +8100,12 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>TextHyperlinkEventFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="817"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="815"/>
         <source>%1click to visit %2</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>ThemeTest</name>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="29"/>
-        <source>Theme Information</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="33"/>
-        <source>Screen</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="42"/>
-        <source>Geometry (pixels):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="49"/>
-        <source>Geometry (gridUnits):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="56"/>
-        <source>Units.gridUnit:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="63"/>
-        <source>Units.devicePixelRatio:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="70"/>
-        <source>Font Metrics</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="76"/>
-        <source>FontMetrics pointSize:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="83"/>
-        <source>FontMetrics pixelSize:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="90"/>
-        <source>FontMetrics devicePixelRatio:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="97"/>
-        <source>Text item pixelSize:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="104"/>
-        <source>Text item pointSize:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="111"/>
-        <source>Pixel density:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="118"/>
-        <source>Height of default font:</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
     <name>ToolTipItem</name>
     <message>
         <location filename="../profile-widget/divetooltipitem.cpp" line="136"/>
@@ -8037,102 +8116,107 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>TripItem</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="67"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="68"/>
         <source>(%1 shown)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="194"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="197"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="215"/>
         <source>Date</source>
         <translation>Datums</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="200"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="218"/>
         <source>Rating</source>
         <translation>Novērtējums</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
         <source>Depth(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="206"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="224"/>
         <source>Duration</source>
         <translation>Ilgums</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="209"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="227"/>
         <source>Temp(%1%2)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
         <source>Weight(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
         <source>lbs</source>
         <translation>mārciņa</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="215"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="233"/>
         <source>Suit</source>
         <translation>Kostīms</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="218"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="236"/>
         <source>Cyl</source>
         <translation>Balons</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="239"/>
         <source>Gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="244"/>
         <source>SAC(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="244"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="229"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="247"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="232"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="250"/>
         <source>Max CNS</source>
         <translation>Maks. CNS</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="235"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="253"/>
+        <source>Photos before/during/after dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="256"/>
         <source>Location</source>
         <translation>Vieta</translation>
     </message>
@@ -8155,72 +8239,73 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>UpdateManager</name>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="69"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="61"/>
         <source>Check for updates.</source>
         <translation>Pārbaudīt atjaunāšanas.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="70"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="62"/>
         <source>Subsurface was unable to check for updates.</source>
         <translation>Subsurface&apos;am neizdevas pārbaudīt atjaunāšanas</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="75"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="67"/>
         <source>The following error occurred:</source>
         <translation>Sekojoša kļūda gadījas:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="76"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="68"/>
         <source>Please check your internet connection.</source>
         <translation>Lūdzu, pārbaudiet interneta pieslēgšanu.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="86"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="78"/>
         <source>You are using the latest version of Subsurface.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="89"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="81"/>
         <source>A new version of Subsurface is available.&lt;br/&gt;Click on:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; to download it.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="95"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="87"/>
         <source>A new version of Subsurface is available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="96"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="88"/>
         <source>Latest version is %1, please check %2 our download page %3 for information in how to update.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="106"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="98"/>
         <source>Newest release version is </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="107"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="99"/>
         <source>The server returned the following information:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="125"/>
-        <source>Subsurface is checking every two weeks if a new version is available. If you don&apos;t want Subsurface to continue checking, please click Decline.</source>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="117"/>
+        <source>Subsurface is checking every two weeks if a new version is available. 
+ If you don&apos;t want Subsurface to continue checking, please click Decline.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="126"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="119"/>
         <source>Decline</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="127"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="120"/>
         <source>Accept</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="129"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="122"/>
         <source>Automatic check for updates</source>
         <translation type="unfinished"/>
     </message>
@@ -8242,24 +8327,6 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>UserSurvey</name>
     <message>
-        <location filename="../desktop-widgets/usersurvey.ui" line="44"/>
-        <location filename="../build/ui_usersurvey.h" line="151"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;We would love to learn more about our users, their preferences and their usage habits. Please spare a minute to fill out this form and submit it to the Subsurface team.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/usersurvey.ui" line="115"/>
-        <location filename="../build/ui_usersurvey.h" line="156"/>
-        <source>Other software/sources</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/usersurvey.ui" line="128"/>
-        <location filename="../build/ui_usersurvey.h" line="157"/>
-        <source>Manually entering dives</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="14"/>
         <location filename="../build/ui_usersurvey.h" line="149"/>
         <source>User survey</source>
@@ -8272,6 +8339,12 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
         <translation>Subsurface lietotāja aptauja</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/usersurvey.ui" line="44"/>
+        <location filename="../build/ui_usersurvey.h" line="151"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;We would love to learn more about our users, their preferences and their usage habits. Please spare a minute to fill out this form and submit it to the Subsurface team.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="63"/>
         <location filename="../build/ui_usersurvey.h" line="152"/>
         <source>Technical diver</source>
@@ -8296,6 +8369,18 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/usersurvey.ui" line="115"/>
+        <location filename="../build/ui_usersurvey.h" line="156"/>
+        <source>Other software/sources</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/usersurvey.ui" line="128"/>
+        <location filename="../build/ui_usersurvey.h" line="157"/>
+        <source>Manually entering dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="141"/>
         <location filename="../build/ui_usersurvey.h" line="158"/>
         <source>Android/iPhone companion app</source>
@@ -8326,6 +8411,11 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/usersurvey.cpp" line="18"/>
+        <source>Send</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/usersurvey.cpp" line="43"/>
         <source>
 Operating system: %1</source>
@@ -8366,18 +8456,13 @@ Valoda: %1</translation>
         <translation>Pajautāt vēlāk</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/usersurvey.cpp" line="101"/>
-        <source>Submit user survey.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/usersurvey.cpp" line="82"/>
         <source>Ask again?</source>
         <translation>Pajautāt velreiz?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/usersurvey.cpp" line="18"/>
-        <source>Send</source>
+        <location filename="../desktop-widgets/usersurvey.cpp" line="101"/>
+        <source>Submit user survey.</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -8470,12 +8555,12 @@ Valoda: %1</translation>
         <translation>Augšupielādēt</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="324"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="325"/>
         <source>Operation timed out</source>
         <translation>Procesa izpilīdšanas laiks pārsniedza robežus</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="345"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="346"/>
         <source>Transferring data...</source>
         <translation type="unfinished"/>
     </message>
@@ -8510,16 +8595,16 @@ Valoda: %1</translation>
 <context>
     <name>WriteSettingsThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1702"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1709"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1718"/>
-        <source>Failed!</source>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1689"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1710"/>
+        <source>This feature is not yet available for the selected dive computer.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1700"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1721"/>
-        <source>This feature is not yet available for the selected dive computer.</source>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1691"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1698"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1707"/>
+        <source>Failed!</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -8646,7 +8731,7 @@ Vidējais</translation>
 <context>
     <name>getextFromC</name>
     <message>
-        <location filename="../core/libdivecomputer.c" line="674"/>
+        <location filename="../core/libdivecomputer.c" line="737"/>
         <source>Error parsing the header</source>
         <translation type="unfinished"/>
     </message>
@@ -8654,38 +8739,377 @@ Vidējais</translation>
 <context>
     <name>gettextFromC</name>
     <message>
+        <location filename="../core/cochran.c" line="309"/>
+        <location filename="../core/cochran.c" line="315"/>
+        <location filename="../core/cochran.c" line="385"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>deco stop</source>
+        <translation>deko pietura</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="336"/>
+        <location filename="../core/cochran.c" line="390"/>
+        <location filename="../core/file.c" line="777"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>ascent</source>
+        <translation>stāvums</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="342"/>
+        <location filename="../core/file.c" line="755"/>
+        <source>battery</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="348"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
+        <source>OLF</source>
+        <translation>OLF</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="353"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
+        <source>maxdepth</source>
+        <translation>maks. dziļums</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="358"/>
+        <location filename="../core/cochran.c" line="404"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
+        <source>pO₂</source>
+        <translation>pO₂</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="365"/>
+        <location filename="../core/cochran.c" line="414"/>
+        <location filename="../core/cochran.c" line="421"/>
+        <location filename="../core/file.c" line="868"/>
+        <location filename="../core/libdivecomputer.c" line="225"/>
+        <location filename="../core/libdivecomputer.c" line="228"/>
+        <source>gaschange</source>
+        <translation>gāzes maiņa</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="370"/>
+        <location filename="../core/cochran.c" line="409"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>rbt</source>
+        <translation>rbt</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="379"/>
+        <location filename="../core/cochran.c" line="426"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>ceiling</source>
+        <translation>maksimāla dekompr. pietura</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="395"/>
+        <location filename="../core/libdivecomputer.c" line="224"/>
+        <source>transmitter</source>
+        <translation>raidītājs</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="153"/>
+        <source>Error: the file does not appear to be a DATATRAK divelog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="286"/>
+        <source>clear</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="289"/>
+        <source>misty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="292"/>
+        <source>fog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="295"/>
+        <source>rain</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="298"/>
+        <source>storm</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="301"/>
+        <source>snow</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="321"/>
+        <source>No suit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="324"/>
+        <source>Shorty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="327"/>
+        <source>Combi</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="330"/>
+        <source>Wet suit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="333"/>
+        <source>Semidry suit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="336"/>
+        <source>Dry suit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="396"/>
+        <source>no stop</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="398"/>
+        <location filename="../core/dive.c" line="29"/>
+        <source>deco</source>
+        <translation>dekompr.</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="400"/>
+        <source>single ascent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="402"/>
+        <source>multiple ascent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="404"/>
+        <location filename="../core/dive.c" line="27"/>
+        <source>fresh</source>
+        <translation>svaigs</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="406"/>
+        <source>salt water</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="431"/>
+        <source>sight seeing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="433"/>
+        <source>club dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="435"/>
+        <location filename="../core/dive.c" line="28"/>
+        <source>instructor</source>
+        <translation>instruktors</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="437"/>
+        <source>instruction</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="439"/>
+        <location filename="../core/dive.c" line="27"/>
+        <source>night</source>
+        <translation>nakts</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="441"/>
+        <location filename="../core/dive.c" line="25"/>
+        <source>cave</source>
+        <translation>ala</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="443"/>
+        <location filename="../core/dive.c" line="24"/>
+        <source>ice</source>
+        <translation>ledus</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="445"/>
+        <source>search</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="455"/>
+        <location filename="../core/dive.c" line="25"/>
+        <source>wreck</source>
+        <translation>šķembas</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="457"/>
+        <location filename="../core/dive.c" line="26"/>
+        <source>river</source>
+        <translation>upe</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="459"/>
+        <location filename="../core/dive.c" line="23"/>
+        <source>drift</source>
+        <translation>straume</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="461"/>
+        <location filename="../core/dive.c" line="28"/>
+        <source>photo</source>
+        <translation>foto</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="463"/>
+        <source>other</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="474"/>
+        <source>Other activities</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="498"/>
+        <source>Datatrak/Wlog notes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="537"/>
+        <source>Manually entered dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="588"/>
+        <source>Unknown</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="674"/>
+        <source>Error: couldn&apos;t open the file %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="687"/>
+        <source>Error: no dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="23"/>
+        <source>boat</source>
+        <translation>kuģis</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="23"/>
+        <source>shore</source>
+        <translation>krasts</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="24"/>
+        <source>deep</source>
+        <translation>dziļums</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="24"/>
+        <source>cavern</source>
+        <translation>ala</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="25"/>
+        <source>altitude</source>
+        <translation>augstiene</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="26"/>
+        <source>pool</source>
+        <translation>baseins</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="26"/>
+        <source>lake</source>
+        <translation>ezers</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="27"/>
+        <source>student</source>
+        <translation>students</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="28"/>
+        <source>video</source>
+        <translation>video</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="33"/>
+        <source>OC-gas</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="33"/>
+        <source>diluent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="33"/>
+        <location filename="../core/equipment.c" line="88"/>
+        <location filename="../core/planner.c" line="1436"/>
+        <location filename="../core/planner.c" line="1439"/>
+        <source>oxygen</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../core/dive.c" line="181"/>
         <source>pascal</source>
         <translation>paskāls</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="186"/>
-        <location filename="../core/qthelper.cpp" line="669"/>
+        <location filename="../core/qthelper.cpp" line="674"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="190"/>
-        <location filename="../core/qthelper.cpp" line="672"/>
+        <location filename="../core/qthelper.cpp" line="677"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
+        <location filename="../core/dive.c" line="227"/>
+        <source>ℓ</source>
+        <translation>ℓ</translation>
+    </message>
+    <message>
         <location filename="../core/dive.c" line="232"/>
         <source>cuft</source>
         <translation>cuft</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="269"/>
-        <location filename="../core/qthelper.cpp" line="590"/>
-        <location filename="../core/qthelper.cpp" line="605"/>
+        <location filename="../core/qthelper.cpp" line="595"/>
+        <location filename="../core/qthelper.cpp" line="610"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="274"/>
-        <location filename="../core/qthelper.cpp" line="593"/>
-        <location filename="../core/qthelper.cpp" line="607"/>
+        <location filename="../core/qthelper.cpp" line="598"/>
+        <location filename="../core/qthelper.cpp" line="612"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
@@ -8711,53 +9135,58 @@ Vidējais</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="325"/>
-        <location filename="../core/qthelper.cpp" line="616"/>
-        <location filename="../core/qthelper.cpp" line="626"/>
+        <location filename="../core/qthelper.cpp" line="621"/>
+        <location filename="../core/qthelper.cpp" line="631"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="329"/>
-        <location filename="../core/qthelper.cpp" line="614"/>
-        <location filename="../core/qthelper.cpp" line="624"/>
+        <location filename="../core/qthelper.cpp" line="619"/>
+        <location filename="../core/qthelper.cpp" line="629"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="1772"/>
+        <location filename="../core/dive.c" line="1751"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) vai (%s)</translation>
     </message>
     <message>
-        <location filename="../core/divelist.c" line="484"/>
+        <location filename="../core/divelist.c" line="487"/>
         <location filename="../core/equipment.c" line="84"/>
-        <location filename="../core/planner.c" line="1411"/>
-        <location filename="../core/planner.c" line="1414"/>
+        <location filename="../core/planner.c" line="1432"/>
+        <location filename="../core/planner.c" line="1435"/>
         <source>air</source>
         <translation>gaiss</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="197"/>
+        <location filename="../core/equipment.c" line="86"/>
+        <source>EAN%d</source>
+        <translation>EAN%d</translation>
+    </message>
+    <message>
+        <location filename="../core/equipment.c" line="198"/>
         <source>integrated</source>
         <translation>integrēts</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="198"/>
+        <location filename="../core/equipment.c" line="199"/>
         <source>belt</source>
         <translation>josta</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="199"/>
+        <location filename="../core/equipment.c" line="200"/>
         <source>ankle</source>
         <translation>svars uz kājām</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="200"/>
+        <location filename="../core/equipment.c" line="201"/>
         <source>backplate weight</source>
         <translation>svars uz plātni</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="201"/>
+        <location filename="../core/equipment.c" line="202"/>
         <source>clip-on</source>
         <translation>clip-on</translation>
     </message>
@@ -8770,8 +9199,8 @@ Vidējais</translation>
         <location filename="../core/file.c" line="121"/>
         <location filename="../core/file.c" line="512"/>
         <location filename="../core/file.c" line="597"/>
-        <location filename="../core/file.c" line="924"/>
-        <location filename="../core/file.c" line="1056"/>
+        <location filename="../core/file.c" line="909"/>
+        <location filename="../core/file.c" line="1092"/>
         <location filename="../core/ostctools.c" line="80"/>
         <source>Failed to read &apos;%s&apos;</source>
         <translation>Neizdevas nolasīt &apos;%s&apos;</translation>
@@ -8829,485 +9258,494 @@ Vidējais</translation>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/file.c" line="887"/>
-        <source>No matching DC found for file &apos;%s&apos;</source>
+        <location filename="../core/git-access.c" line="134"/>
+        <source>Local cache directory %s corrupted - can&apos;t sync with Subsurface cloud storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>none</source>
-        <translation>neviens</translation>
+        <location filename="../core/git-access.c" line="157"/>
+        <location filename="../core/git-access.c" line="177"/>
+        <source>Could not update local cache to newer remote data</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="309"/>
-        <location filename="../core/cochran.c" line="315"/>
-        <location filename="../core/cochran.c" line="385"/>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>deco stop</source>
-        <translation>deko pietura</translation>
+        <location filename="../core/git-access.c" line="170"/>
+        <source>Subsurface cloud storage corrupted</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="342"/>
-        <location filename="../core/file.c" line="755"/>
-        <source>battery</source>
+        <location filename="../core/git-access.c" line="284"/>
+        <source>Could not update Subsurface cloud storage, try again later</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="370"/>
-        <location filename="../core/cochran.c" line="409"/>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>rbt</source>
-        <translation>rbt</translation>
+        <location filename="../core/git-access.c" line="344"/>
+        <source>Remote storage and local data diverged. Error: merge failed (%s)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="336"/>
-        <location filename="../core/cochran.c" line="390"/>
-        <location filename="../core/file.c" line="777"/>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>ascent</source>
-        <translation>stāvums</translation>
+        <location filename="../core/git-access.c" line="374"/>
+        <source>Remote storage and local data diverged. Cannot combine local and remote changes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="379"/>
-        <location filename="../core/cochran.c" line="426"/>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>ceiling</source>
-        <translation>maksimāla dekompr. pietura</translation>
+        <location filename="../core/git-access.c" line="408"/>
+        <source>Remote storage and local data diverged</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>workload</source>
-        <translation>darba slodze</translation>
+        <location filename="../core/git-access.c" line="411"/>
+        <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="395"/>
-        <location filename="../core/libdivecomputer.c" line="203"/>
-        <source>transmitter</source>
-        <translation>raidītājs</translation>
+        <location filename="../core/git-access.c" line="420"/>
+        <source>Problems with local cache of Subsurface cloud data</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/git-access.c" line="421"/>
+        <source>Moved cache data to %s. Please try the operation again.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/git-access.c" line="743"/>
+        <source>Error connecting to Subsurface cloud storage</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/git-access.c" line="746"/>
+        <source>git clone of %s failed (%s)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="210"/>
+        <location filename="../core/parse-xml.c" line="3317"/>
+        <location filename="../core/uemis-downloader.c" line="134"/>
+        <source>unknown</source>
+        <translation>nezināms</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>none</source>
+        <translation>neviens</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>workload</source>
+        <translation>darba slodze</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="203"/>
+        <location filename="../core/libdivecomputer.c" line="224"/>
         <source>violation</source>
         <translation>pārkapšana</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="203"/>
+        <location filename="../core/libdivecomputer.c" line="224"/>
         <source>bookmark</source>
         <translation>grāmatzīme</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="203"/>
+        <location filename="../core/libdivecomputer.c" line="224"/>
         <source>surface</source>
         <translation>virsma</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="203"/>
+        <location filename="../core/libdivecomputer.c" line="224"/>
         <source>safety stop</source>
         <translation>drošības pietura</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="365"/>
-        <location filename="../core/cochran.c" line="414"/>
-        <location filename="../core/cochran.c" line="421"/>
-        <location filename="../core/file.c" line="868"/>
-        <location filename="../core/libdivecomputer.c" line="204"/>
-        <location filename="../core/libdivecomputer.c" line="207"/>
-        <source>gaschange</source>
-        <translation>gāzes maiņa</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="204"/>
+        <location filename="../core/libdivecomputer.c" line="225"/>
         <source>safety stop (voluntary)</source>
         <translation>drošības pietura (brīvprātīga)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="204"/>
+        <location filename="../core/libdivecomputer.c" line="225"/>
         <source>safety stop (mandatory)</source>
         <translation>drošības pietura (obligāta)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="205"/>
+        <location filename="../core/libdivecomputer.c" line="226"/>
         <source>deepstop</source>
         <translation>dziļa pietura</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="205"/>
+        <location filename="../core/libdivecomputer.c" line="226"/>
         <source>ceiling (safety stop)</source>
         <translation>maksimāla dekompr. pietura (drošības pietura)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="205"/>
-        <source>divetime</source>
-        <translation>niršanas laiks</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="205"/>
+        <location filename="../core/libdivecomputer.c" line="226"/>
         <source>below floor</source>
         <comment>event showing dive is below deco floor and adding deco time</comment>
         <translation>zemāk par grīdu</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="353"/>
-        <location filename="../core/libdivecomputer.c" line="206"/>
-        <source>maxdepth</source>
-        <translation>maks. dziļums</translation>
-    </message>
-    <message>
-        <location filename="../core/cochran.c" line="348"/>
-        <location filename="../core/libdivecomputer.c" line="206"/>
-        <source>OLF</source>
-        <translation>OLF</translation>
+        <location filename="../core/libdivecomputer.c" line="226"/>
+        <source>divetime</source>
+        <translation>niršanas laiks</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="206"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
         <source>airtime</source>
         <translation>skābekļa laiks</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="206"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
         <source>rgbm</source>
         <translation>rgbm</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="206"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
         <source>heading</source>
         <translation>virziens</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="358"/>
-        <location filename="../core/cochran.c" line="404"/>
-        <location filename="../core/libdivecomputer.c" line="206"/>
-        <source>pO₂</source>
-        <translation>pO₂</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="207"/>
+        <location filename="../core/libdivecomputer.c" line="228"/>
         <source>tissue level warning</source>
         <translation>audu līmeņa brīdinājums</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="207"/>
+        <location filename="../core/libdivecomputer.c" line="228"/>
         <source>non stop time</source>
         <translation>bes apstāšanas laiks</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="224"/>
+        <location filename="../core/libdivecomputer.c" line="237"/>
         <source>invalid event number</source>
         <translation>kļūdains notikuma numurs</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="658"/>
-        <source>Unable to create parser for %s %s</source>
-        <translation>Nav iespējams izveidot parsētāju priekš %s %s</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="664"/>
-        <source>Error registering the data</source>
-        <translation>Kļūda reģistrējot datus</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="495"/>
+        <location filename="../core/libdivecomputer.c" line="553"/>
         <source>Error parsing the datetime</source>
         <translation>Kļūda parsējot laiku</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="513"/>
+        <location filename="../core/libdivecomputer.c" line="571"/>
         <source>Dive %d: %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="519"/>
+        <location filename="../core/libdivecomputer.c" line="577"/>
         <source>Error parsing the divetime</source>
         <translation>Kļūda parsējot niršanas laiku</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="529"/>
+        <location filename="../core/libdivecomputer.c" line="587"/>
         <source>Error parsing the maxdepth</source>
         <translation>Kļūda parsējot maks. dziļumu</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="548"/>
+        <location filename="../core/libdivecomputer.c" line="606"/>
         <source>Error parsing temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="568"/>
+        <location filename="../core/libdivecomputer.c" line="626"/>
         <source>Error parsing the gas mix count</source>
         <translation>Kļūda parsējot gāzes maisījuma daudzumu</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="580"/>
+        <location filename="../core/libdivecomputer.c" line="638"/>
         <source>Error obtaining water salinity</source>
         <translation>Kļūda ūdens sāļuma noteikšanā</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="589"/>
+        <location filename="../core/libdivecomputer.c" line="647"/>
         <source>Error obtaining surface pressure</source>
         <translation>Kļūda spiediena noteikšanā uz virsmu</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="614"/>
+        <location filename="../core/libdivecomputer.c" line="672"/>
         <source>Error obtaining divemode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="634"/>
+        <location filename="../core/libdivecomputer.c" line="692"/>
         <source>Error parsing the gas mix</source>
         <translation>Kļūda parsējot gāzes maisījumu</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="684"/>
+        <location filename="../core/libdivecomputer.c" line="717"/>
+        <source>Unable to create parser for %s %s</source>
+        <translation>Nav iespējams izveidot parsētāju priekš %s %s</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="723"/>
+        <source>Error registering the data</source>
+        <translation>Kļūda reģistrējot datus</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="744"/>
         <source>Error parsing the samples</source>
         <translation>Kļūda parsējot paraugus</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="822"/>
+        <location filename="../core/libdivecomputer.c" line="882"/>
         <source>Event: waiting for user action</source>
         <translation>Notikums: gaida lietotāja darbību</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="830"/>
+        <location filename="../core/libdivecomputer.c" line="890"/>
         <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source>
         <translation>modelis=%u (0x%08x), aparātprogrammatūra=%u (0x%08x), serial numurs=%u (0x%08x)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="894"/>
+        <location filename="../core/libdivecomputer.c" line="954"/>
         <source>Error registering the event handler.</source>
         <translation>Kļūda reģistrējot notikumu apstrādātāju.</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="899"/>
+        <location filename="../core/libdivecomputer.c" line="959"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Error registering the cancellation handler.</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="920"/>
+        <location filename="../core/libdivecomputer.c" line="980"/>
         <source>Dive data import error</source>
         <translation>Kļūda importējot niršanas datus</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="959"/>
+        <location filename="../core/libdivecomputer.c" line="1019"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Nav iespējams izveidot libdivecomputer kontekstu</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="966"/>
+        <location filename="../core/libdivecomputer.c" line="1026"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Nevar atvērt %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="992"/>
+        <location filename="../core/libdivecomputer.c" line="1048"/>
         <source>Insufficient privileges to open the device %s %s (%s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/parse-xml.c" line="517"/>
-        <source>Strange percentage reading %s
+        <location filename="../core/load-git.c" line="194"/>
+        <location filename="../core/parse-xml.c" line="1242"/>
+        <source>multiple GPS locations for this dive site; also %s
 </source>
-        <translation>Dīvaina procentu nolasīšana %s
-</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/load-git.c" line="194"/>
-        <location filename="../core/parse-xml.c" line="1238"/>
-        <source>multiple GPS locations for this dive site; also %s
+        <location filename="../core/load-git.c" line="222"/>
+        <location filename="../core/parse-xml.c" line="1304"/>
+        <source>additional name for site: %s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/parse-xml.c" line="2044"/>
+        <location filename="../core/ostctools.c" line="120"/>
+        <location filename="../core/ostctools.c" line="152"/>
+        <source>Unknown DC in dive %d</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/ostctools.c" line="165"/>
+        <source>Error - %s - parsing dive %d</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/parse-xml.c" line="517"/>
+        <source>Strange percentage reading %s
+</source>
+        <translation>Dīvaina procentu nolasīšana %s
+</translation>
+    </message>
+    <message>
+        <location filename="../core/parse-xml.c" line="2051"/>
         <source>Failed to parse &apos;%s&apos;</source>
         <translation>Kļūme parsējot &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../core/parse-xml.c" line="3741"/>
+        <location filename="../core/parse-xml.c" line="3774"/>
         <source>Can&apos;t open stylesheet %s</source>
         <translation>Nevar atvērts stila lapu %s</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="86"/>
-        <source>EAN%d</source>
-        <translation>EAN%d</translation>
+        <location filename="../core/planner.c" line="555"/>
+        <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE %s ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="1032"/>
-        <location filename="../core/planner.c" line="1184"/>
-        <source>Can&apos;t find gas %s</source>
-        <translation>Nevar atrast gāzi %s</translation>
+        <location filename="../core/planner.c" line="569"/>
+        <source>Decompression calculation aborted due to excessive time</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="368"/>
-        <source>Too many gas mixes</source>
-        <translation>Parāk daudz gāzes maisījumu</translation>
+        <location filename="../core/planner.c" line="571"/>
+        <location filename="../core/planner.c" line="829"/>
+        <location filename="../core/planner.c" line="834"/>
+        <location filename="../core/planner.c" line="860"/>
+        <location filename="../core/planner.c" line="870"/>
+        <source>Warning:</source>
+        <translation>Brīdinājums:</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="568"/>
-        <source>Decompression calculation aborted due to excessive time</source>
+        <location filename="../core/planner.c" line="581"/>
+        <source>based on Bühlmann ZHL-16C with GFlow = %d and GFhigh = %d</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="592"/>
+        <location filename="../core/planner.c" line="586"/>
+        <source>based on VPM-B at nominal conservatism</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="588"/>
+        <source>based on VPM-B at +%d conservatism</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="590"/>
+        <source>, effective GF=%d/%d</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="594"/>
+        <source>recreational mode based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="598"/>
         <source>Subsurface dive plan</source>
         <translation>Subsurface niršanas plāns</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="596"/>
-        <source>depth</source>
-        <translation>dziļums</translation>
+        <location filename="../core/planner.c" line="599"/>
+        <source>&lt;div&gt;Runtime: %dmin&lt;/div&gt;&lt;br&gt;</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="602"/>
-        <source>runtime</source>
-        <translation>izpildlaiks</translation>
+        <location filename="../core/planner.c" line="604"/>
+        <source>depth</source>
+        <translation>dziļums</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="599"/>
+        <location filename="../core/planner.c" line="607"/>
         <source>duration</source>
         <translation>ilgums</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="554"/>
-        <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE %s ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source>
-        <translation type="unfinished"/>
+        <location filename="../core/planner.c" line="610"/>
+        <source>runtime</source>
+        <translation>izpildlaiks</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="605"/>
+        <location filename="../core/planner.c" line="613"/>
         <source>gas</source>
         <translation>gāze</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="648"/>
+        <location filename="../core/planner.c" line="656"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="656"/>
+        <location filename="../core/planner.c" line="664"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source>
         <translation>Pāreja uz %.*f %s pēc %d:%02d min - izpildlaiks %d:%02u ar maisījumu %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="669"/>
+        <location filename="../core/planner.c" line="677"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="676"/>
+        <location filename="../core/planner.c" line="684"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source>
         <translation>Apturēties uz %.*f %s uz %d:%02d min - izpildlaiks %d:%02u uz maisījuma %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="721"/>
+        <location filename="../core/planner.c" line="729"/>
         <source>%3.0f%s</source>
         <translation>%3.0f%s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="724"/>
-        <location filename="../core/planner.c" line="728"/>
+        <location filename="../core/planner.c" line="732"/>
+        <location filename="../core/planner.c" line="736"/>
         <source>%3dmin</source>
         <translation>%3dmin</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="737"/>
-        <location filename="../core/planner.c" line="749"/>
+        <location filename="../core/planner.c" line="745"/>
+        <location filename="../core/planner.c" line="757"/>
         <source>(SP = %.1fbar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="772"/>
+        <location filename="../core/planner.c" line="780"/>
         <source>Switch gas to %s (SP = %.1fbar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="774"/>
+        <location filename="../core/planner.c" line="782"/>
         <source>Switch gas to %s</source>
         <translation>Pārslēgt gāzi uz %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="793"/>
+        <location filename="../core/planner.c" line="801"/>
         <source>CNS</source>
         <translation>CNS</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="795"/>
+        <location filename="../core/planner.c" line="803"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="799"/>
+        <location filename="../core/planner.c" line="807"/>
         <source>Gas consumption (CCR legs excluded):</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="801"/>
+        <location filename="../core/planner.c" line="809"/>
         <source>Gas consumption:</source>
         <translation>Gāzes patēriņš:</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="570"/>
-        <location filename="../core/planner.c" line="821"/>
-        <location filename="../core/planner.c" line="826"/>
-        <location filename="../core/planner.c" line="851"/>
-        <location filename="../core/planner.c" line="861"/>
-        <source>Warning:</source>
-        <translation>Brīdinājums:</translation>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="580"/>
-        <source>based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="584"/>
-        <source>based on VPM-B at nominal conservatism</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="586"/>
-        <source>based on VPM-B at +%d conservatism</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="588"/>
-        <source>recreational mode based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="822"/>
+        <location filename="../core/planner.c" line="830"/>
         <source>this is more gas than available in the specified cylinder!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="827"/>
+        <location filename="../core/planner.c" line="835"/>
         <source>not enough reserve for gas sharing on ascent!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="829"/>
+        <location filename="../core/planner.c" line="837"/>
         <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="831"/>
+        <location filename="../core/planner.c" line="839"/>
         <source>%.0f%s (%.0f%s during planned ascent) of %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="848"/>
+        <location filename="../core/planner.c" line="857"/>
         <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="858"/>
+        <location filename="../core/planner.c" line="867"/>
         <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="1419"/>
+        <location filename="../core/planner.c" line="1194"/>
+        <source>Can&apos;t find gas %s</source>
+        <translation>Nevar atrast gāzi %s</translation>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="1440"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1280"/>
+        <location filename="../core/profile.c" line="1298"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
@@ -9316,70 +9754,70 @@ D: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1283"/>
+        <location filename="../core/profile.c" line="1301"/>
         <source>P: %d%s
 </source>
         <translation>S: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1287"/>
+        <location filename="../core/profile.c" line="1305"/>
         <source>T: %.1f%s
 </source>
         <translation>L: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1293"/>
+        <location filename="../core/profile.c" line="1311"/>
         <source>V: %.1f%s
 </source>
         <translation>Ā: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1296"/>
+        <location filename="../core/profile.c" line="1314"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation>SAC: %.*f%s/min
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1298"/>
+        <location filename="../core/profile.c" line="1316"/>
         <source>CNS: %u%%
 </source>
         <translation>CNS: %u%%
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1300"/>
+        <location filename="../core/profile.c" line="1318"/>
         <source>pO%s: %.2fbar
 </source>
         <translation>pO%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1302"/>
+        <location filename="../core/profile.c" line="1320"/>
         <source>pN%s: %.2fbar
 </source>
         <translation>pN%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1304"/>
+        <location filename="../core/profile.c" line="1322"/>
         <source>pHe: %.2fbar
 </source>
         <translation>pHe: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1307"/>
+        <location filename="../core/profile.c" line="1325"/>
         <source>MOD: %d%s
 </source>
         <translation>MOD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1314"/>
+        <location filename="../core/profile.c" line="1332"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
@@ -9388,7 +9826,7 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1318"/>
+        <location filename="../core/profile.c" line="1336"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
@@ -9397,49 +9835,49 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1331"/>
+        <location filename="../core/profile.c" line="1349"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation>Drošības apstāšana: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1334"/>
+        <location filename="../core/profile.c" line="1352"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation>Drošības apstāšana: nez. laiks @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1339"/>
+        <location filename="../core/profile.c" line="1357"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation>Dekompr.: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1342"/>
+        <location filename="../core/profile.c" line="1360"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation>Dekompr.: nez. laiks @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1346"/>
+        <location filename="../core/profile.c" line="1364"/>
         <source>In deco
 </source>
         <translation>Dekompresijā
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1348"/>
+        <location filename="../core/profile.c" line="1366"/>
         <source>NDL: %umin
 </source>
         <translation>NDL: %umin
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1351"/>
+        <location filename="../core/profile.c" line="1369"/>
         <source>TTS: %umin
 </source>
         <translation>TTS: %umin
@@ -9448,120 +9886,125 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1354"/>
+        <location filename="../core/profile.c" line="1372"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation>Dekompr.: %umin @ %.0f%s (izrēķ.)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1362"/>
+        <location filename="../core/profile.c" line="1380"/>
         <source>In deco (calc)
 </source>
         <translation>Dekompresijā (izrēķ.)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1365"/>
+        <location filename="../core/profile.c" line="1383"/>
         <source>NDL: %umin (calc)
 </source>
         <translation>NDL: %umin (izrēķ.)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1367"/>
+        <location filename="../core/profile.c" line="1385"/>
         <source>NDL: &gt;2h (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1371"/>
+        <location filename="../core/profile.c" line="1389"/>
         <source>TTS: %umin (calc)
 </source>
         <translation>TTS: %umin (izrēķ.)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1373"/>
+        <location filename="../core/profile.c" line="1391"/>
         <source>TTS: &gt;2h (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1376"/>
+        <location filename="../core/profile.c" line="1394"/>
         <source>RBT: %umin
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1379"/>
+        <location filename="../core/profile.c" line="1397"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation>Aprēķināta maks. dekompr. pietura %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1385"/>
+        <location filename="../core/profile.c" line="1403"/>
         <source>Tissue %.0fmin: %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1391"/>
+        <location filename="../core/profile.c" line="1409"/>
         <source>heartbeat: %d
 </source>
         <translation>sirdspuksti: %d
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1393"/>
+        <location filename="../core/profile.c" line="1411"/>
         <source>bearing: %d
 </source>
         <translation>azimuts: %d
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1396"/>
+        <location filename="../core/profile.c" line="1414"/>
         <source>mean depth to here %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1491"/>
+        <location filename="../core/profile.c" line="1515"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1495"/>
-        <location filename="../core/profile.c" line="1499"/>
-        <location filename="../core/profile.c" line="1503"/>
+        <location filename="../core/profile.c" line="1519"/>
+        <location filename="../core/profile.c" line="1523"/>
+        <location filename="../core/profile.c" line="1527"/>
         <source>%s %sD:%.1f%s</source>
         <translation>%s %sD:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1507"/>
+        <location filename="../core/profile.c" line="1531"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sD:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1511"/>
+        <location filename="../core/profile.c" line="1535"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1515"/>
-        <location filename="../core/profile.c" line="1519"/>
+        <location filename="../core/profile.c" line="1539"/>
+        <location filename="../core/profile.c" line="1543"/>
         <source>%s %sV:%.2f%s</source>
         <translation>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1526"/>
+        <location filename="../core/profile.c" line="1550"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s</translation>
     </message>
     <message>
+        <location filename="../core/profile.c" line="1575"/>
+        <source>%s SAC:%.*f %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../core/qthelper.cpp" line="67"/>
         <source>%1km</source>
         <translation type="unfinished"/>
@@ -9582,446 +10025,460 @@ EADD: %d%s
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="635"/>
+        <location filename="../core/qthelper.cpp" line="91"/>
+        <location filename="../core/qthelper.cpp" line="226"/>
+        <source>N</source>
+        <translation>Z</translation>
+    </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="91"/>
+        <location filename="../core/qthelper.cpp" line="227"/>
+        <source>S</source>
+        <translation>D</translation>
+    </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="92"/>
+        <location filename="../core/qthelper.cpp" line="228"/>
+        <source>E</source>
+        <translation>A</translation>
+    </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="92"/>
+        <location filename="../core/qthelper.cpp" line="229"/>
+        <source>W</source>
+        <translation>R</translation>
+    </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="640"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="638"/>
+        <location filename="../core/qthelper.cpp" line="643"/>
         <source>F</source>
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="23"/>
-        <source>boat</source>
-        <translation>kuģis</translation>
+        <location filename="../core/save-html.c" line="469"/>
+        <location filename="../core/save-html.c" line="553"/>
+        <location filename="../core/worldmap-save.c" line="111"/>
+        <source>Can&apos;t open file %s</source>
+        <translation>Nevar atvērt failu %s</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="23"/>
-        <source>shore</source>
-        <translation>krasts</translation>
+        <location filename="../core/save-html.c" line="488"/>
+        <source>Number</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="459"/>
-        <location filename="../core/dive.c" line="23"/>
-        <source>drift</source>
-        <translation>straume</translation>
+        <location filename="../core/save-html.c" line="489"/>
+        <source>Date</source>
+        <translation>Datums</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="24"/>
-        <source>deep</source>
-        <translation>dziļums</translation>
+        <location filename="../core/save-html.c" line="490"/>
+        <source>Time</source>
+        <translation>Laiks</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="24"/>
-        <source>cavern</source>
-        <translation>ala</translation>
+        <location filename="../core/save-html.c" line="491"/>
+        <source>Location</source>
+        <translation>Vieta</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="443"/>
-        <location filename="../core/dive.c" line="24"/>
-        <source>ice</source>
-        <translation>ledus</translation>
+        <location filename="../core/save-html.c" line="492"/>
+        <source>Air temp.</source>
+        <translation>Gaisa temp.</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="445"/>
-        <source>search</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="493"/>
+        <source>Water temp.</source>
+        <translation>Ūdens temp.</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="455"/>
-        <location filename="../core/dive.c" line="25"/>
-        <source>wreck</source>
-        <translation>šķembas</translation>
+        <location filename="../core/save-html.c" line="494"/>
+        <source>Dives</source>
+        <translation>Niršanas</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="441"/>
-        <location filename="../core/dive.c" line="25"/>
-        <source>cave</source>
-        <translation>ala</translation>
+        <location filename="../core/save-html.c" line="495"/>
+        <source>Expand all</source>
+        <translation>Izvērst visu</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="25"/>
-        <source>altitude</source>
-        <translation>augstiene</translation>
+        <location filename="../core/save-html.c" line="496"/>
+        <source>Collapse all</source>
+        <translation>Savērst visu</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="26"/>
-        <source>pool</source>
-        <translation>baseins</translation>
+        <location filename="../core/save-html.c" line="497"/>
+        <source>Trips</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/dive.c" line="26"/>
-        <source>lake</source>
-        <translation>ezers</translation>
+        <location filename="../core/save-html.c" line="498"/>
+        <source>Statistics</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="457"/>
-        <location filename="../core/dive.c" line="26"/>
-        <source>river</source>
-        <translation>upe</translation>
+        <location filename="../core/save-html.c" line="499"/>
+        <source>Advanced search</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="439"/>
-        <location filename="../core/dive.c" line="27"/>
-        <source>night</source>
-        <translation>nakts</translation>
+        <location filename="../core/save-html.c" line="502"/>
+        <source>Rating</source>
+        <translation>Novērtējums</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="153"/>
-        <source>Error: the file does not appear to be a DATATRAK divelog</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="503"/>
+        <source>Visibility</source>
+        <translation>Redzamība</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="286"/>
-        <source>clear</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="504"/>
+        <source>Duration</source>
+        <translation>Ilgums</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="289"/>
-        <source>misty</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="505"/>
+        <source>Divemaster</source>
+        <translation>Niršanas speciālists</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="292"/>
-        <source>fog</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="506"/>
+        <source>Buddy</source>
+        <translation>Draugs</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="295"/>
-        <source>rain</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="507"/>
+        <source>Suit</source>
+        <translation>Kostīms</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="298"/>
-        <source>storm</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="508"/>
+        <source>Tags</source>
+        <translation>Tagi</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="301"/>
-        <source>snow</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="509"/>
+        <location filename="../smtk-import/smartrak.c" line="251"/>
+        <location filename="../smtk-import/smartrak.c" line="321"/>
+        <source>Notes</source>
+        <translation>Piezīmes</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="321"/>
-        <source>No suit</source>
+        <location filename="../core/save-html.c" line="510"/>
+        <source>Show more details</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="324"/>
-        <source>Shorty</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="513"/>
+        <source>Yearly statistics</source>
+        <translation>Gada statistika</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="327"/>
-        <source>Combi</source>
+        <location filename="../core/save-html.c" line="514"/>
+        <source>Year</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="330"/>
-        <source>Wet suit</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="515"/>
+        <source>Total time</source>
+        <translation>Kopējais laiks</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="333"/>
-        <source>Semidry suit</source>
+        <location filename="../core/save-html.c" line="516"/>
+        <source>Average time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="336"/>
-        <source>Dry suit</source>
+        <location filename="../core/save-html.c" line="517"/>
+        <source>Shortest time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="396"/>
-        <source>no stop</source>
+        <location filename="../core/save-html.c" line="518"/>
+        <source>Longest time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="400"/>
-        <source>single ascent</source>
+        <location filename="../core/save-html.c" line="519"/>
+        <source>Average depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="402"/>
-        <source>multiple ascent</source>
+        <location filename="../core/save-html.c" line="520"/>
+        <source>Min. depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="404"/>
-        <location filename="../core/dive.c" line="27"/>
-        <source>fresh</source>
-        <translation>svaigs</translation>
+        <location filename="../core/save-html.c" line="521"/>
+        <source>Max. depth</source>
+        <translation>Maks. dziļums</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="406"/>
-        <source>salt water</source>
+        <location filename="../core/save-html.c" line="522"/>
+        <source>Average SAC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="431"/>
-        <source>sight seeing</source>
+        <location filename="../core/save-html.c" line="523"/>
+        <source>Min. SAC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="433"/>
-        <source>club dive</source>
+        <location filename="../core/save-html.c" line="524"/>
+        <source>Max. SAC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="437"/>
-        <source>instruction</source>
+        <location filename="../core/save-html.c" line="525"/>
+        <source>Average temp.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="463"/>
-        <source>other</source>
+        <location filename="../core/save-html.c" line="526"/>
+        <source>Min. temp.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="474"/>
-        <source>Other activities</source>
+        <location filename="../core/save-html.c" line="527"/>
+        <source>Max. temp.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="498"/>
-        <source>Datatrak/Wlog notes</source>
+        <location filename="../core/save-html.c" line="528"/>
+        <source>Back to list</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="537"/>
-        <source>Manually entered dive</source>
+        <location filename="../core/save-html.c" line="531"/>
+        <source>Dive No.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="588"/>
-        <source>Unknown</source>
+        <location filename="../core/save-html.c" line="532"/>
+        <source>Dive profile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="674"/>
-        <source>Error: couldn&apos;t open the file %s</source>
+        <location filename="../core/save-html.c" line="533"/>
+        <source>Dive information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="687"/>
-        <source>Error: no dive</source>
+        <location filename="../core/save-html.c" line="534"/>
+        <source>Dive equipment</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/dive.c" line="27"/>
-        <source>student</source>
-        <translation>students</translation>
+        <location filename="../core/save-html.c" line="535"/>
+        <location filename="../core/save-html.c" line="542"/>
+        <source>Type</source>
+        <translation>Tips</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="461"/>
-        <location filename="../core/dive.c" line="28"/>
-        <source>photo</source>
-        <translation>foto</translation>
+        <location filename="../core/save-html.c" line="536"/>
+        <source>Size</source>
+        <translation>Izmērs</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="28"/>
-        <source>video</source>
-        <translation>video</translation>
+        <location filename="../core/save-html.c" line="537"/>
+        <source>Work pressure</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="435"/>
-        <location filename="../core/dive.c" line="28"/>
-        <source>instructor</source>
-        <translation>instruktors</translation>
+        <location filename="../core/save-html.c" line="538"/>
+        <source>Start pressure</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="398"/>
-        <location filename="../core/dive.c" line="29"/>
-        <source>deco</source>
-        <translation>dekompr.</translation>
+        <location filename="../core/save-html.c" line="539"/>
+        <source>End pressure</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/dive.c" line="33"/>
-        <source>OC-gas</source>
+        <location filename="../core/save-html.c" line="540"/>
+        <source>Gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/dive.c" line="33"/>
-        <source>diluent</source>
+        <location filename="../core/save-html.c" line="541"/>
+        <source>Weight</source>
+        <translation>Svars</translation>
+    </message>
+    <message>
+        <location filename="../core/save-html.c" line="543"/>
+        <source>Events</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/dive.c" line="33"/>
-        <location filename="../core/equipment.c" line="88"/>
-        <location filename="../core/planner.c" line="1415"/>
-        <location filename="../core/planner.c" line="1418"/>
-        <source>oxygen</source>
+        <location filename="../core/save-html.c" line="544"/>
+        <source>Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/dive.c" line="227"/>
-        <source>ℓ</source>
-        <translation>ℓ</translation>
+        <location filename="../core/save-html.c" line="545"/>
+        <source>Value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/save-html.c" line="546"/>
+        <source>Coordinates</source>
+        <translation>Koordinātas</translation>
+    </message>
+    <message>
+        <location filename="../core/save-html.c" line="547"/>
+        <source>Dive status</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="239"/>
+        <location filename="../core/statistics.c" line="242"/>
         <source>more than %d days</source>
         <translation>vairāk nekā %d dienas</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="246"/>
+        <location filename="../core/statistics.c" line="249"/>
         <source>%dd %dh %dmin</source>
         <translation>%dd %dst %dmin</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="249"/>
+        <location filename="../core/statistics.c" line="252"/>
         <source>%dmin %dsecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="251"/>
+        <location filename="../core/statistics.c" line="254"/>
         <source>%dh %dmin</source>
         <translation>%dst %dmin</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="263"/>
+        <location filename="../core/statistics.c" line="266"/>
         <source>for dives #</source>
         <translation>priekš niršanas #</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="269"/>
+        <location filename="../core/statistics.c" line="272"/>
         <source>for selected dives</source>
         <translation>priekš izvēlētām niršanām</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="304"/>
+        <location filename="../core/statistics.c" line="307"/>
         <source>for dive #%d</source>
         <translation>priekš niršanas #%d</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="306"/>
+        <location filename="../core/statistics.c" line="309"/>
         <source>for selected dive</source>
         <translation>priekš izvēlētai niršanai</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="308"/>
+        <location filename="../core/statistics.c" line="311"/>
         <source>for all dives</source>
         <translation>priekš visām niršanām</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="310"/>
+        <location filename="../core/statistics.c" line="313"/>
         <source>(no dives)</source>
         <translation>(nav niršanas)</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Sun</source>
         <translation>Svēt</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Mon</source>
         <translation>Pirm</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Tue</source>
         <translation>Otr</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Wed</source>
         <translation>Treš</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Thu</source>
         <translation>Cet</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Fri</source>
         <translation>Piekt</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Sat</source>
         <translation>Sest</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Jan</source>
         <translation>Jan</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Feb</source>
         <translation>Feb</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Mar</source>
         <translation>Mar</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Apr</source>
         <translation>Apr</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>May</source>
         <translation>Maijs</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Jun</source>
         <translation>Jūn</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Jul</source>
         <translation>Jūl</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Aug</source>
         <translation>Aug</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Sep</source>
         <translation>Sep</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Oct</source>
         <translation>Okt</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Nov</source>
         <translation>Nov</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Dec</source>
         <translation>Dec</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="191"/>
-        <location filename="../core/parse-xml.c" line="3284"/>
-        <location filename="../core/uemis-downloader.c" line="134"/>
-        <source>unknown</source>
-        <translation>nezināms</translation>
-    </message>
-    <message>
-        <location filename="../core/uemis-downloader.c" line="467"/>
-        <source>data</source>
-        <translation>dati</translation>
-    </message>
-    <message>
-        <location filename="../core/uemis-downloader.c" line="447"/>
-        <source>%s %s</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../core/uemis-downloader.c" line="27"/>
         <source>Uemis Zurich: the file system is almost full.
 Disconnect/reconnect the dive computer
@@ -10047,6 +10504,16 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../core/uemis-downloader.c" line="447"/>
+        <source>%s %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/uemis-downloader.c" line="467"/>
+        <source>data</source>
+        <translation>dati</translation>
+    </message>
+    <message>
         <location filename="../core/uemis-downloader.c" line="495"/>
         <source>divelog #</source>
         <translation type="unfinished"/>
@@ -10217,281 +10684,6 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="469"/>
-        <location filename="../core/save-html.c" line="553"/>
-        <location filename="../core/worldmap-save.c" line="111"/>
-        <source>Can&apos;t open file %s</source>
-        <translation>Nevar atvērt failu %s</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="488"/>
-        <source>Number</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="489"/>
-        <source>Date</source>
-        <translation>Datums</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="490"/>
-        <source>Time</source>
-        <translation>Laiks</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="491"/>
-        <source>Location</source>
-        <translation>Vieta</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="492"/>
-        <source>Air temp.</source>
-        <translation>Gaisa temp.</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="493"/>
-        <source>Water temp.</source>
-        <translation>Ūdens temp.</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="498"/>
-        <source>Statistics</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="502"/>
-        <source>Rating</source>
-        <translation>Novērtējums</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="503"/>
-        <source>Visibility</source>
-        <translation>Redzamība</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="504"/>
-        <source>Duration</source>
-        <translation>Ilgums</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="494"/>
-        <source>Dives</source>
-        <translation>Niršanas</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="495"/>
-        <source>Expand all</source>
-        <translation>Izvērst visu</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="496"/>
-        <source>Collapse all</source>
-        <translation>Savērst visu</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="497"/>
-        <source>Trips</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="499"/>
-        <source>Advanced search</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="505"/>
-        <source>Divemaster</source>
-        <translation>Niršanas speciālists</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="506"/>
-        <source>Buddy</source>
-        <translation>Draugs</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="507"/>
-        <source>Suit</source>
-        <translation>Kostīms</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="508"/>
-        <source>Tags</source>
-        <translation>Tagi</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="509"/>
-        <location filename="../smtk-import/smartrak.c" line="251"/>
-        <location filename="../smtk-import/smartrak.c" line="321"/>
-        <source>Notes</source>
-        <translation>Piezīmes</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="510"/>
-        <source>Show more details</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="513"/>
-        <source>Yearly statistics</source>
-        <translation>Gada statistika</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="514"/>
-        <source>Year</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="515"/>
-        <source>Total time</source>
-        <translation>Kopējais laiks</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="516"/>
-        <source>Average time</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="517"/>
-        <source>Shortest time</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="518"/>
-        <source>Longest time</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="519"/>
-        <source>Average depth</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="520"/>
-        <source>Min. depth</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="521"/>
-        <source>Max. depth</source>
-        <translation>Maks. dziļums</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="523"/>
-        <source>Min. SAC</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="524"/>
-        <source>Max. SAC</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="525"/>
-        <source>Average temp.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="526"/>
-        <source>Min. temp.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="527"/>
-        <source>Max. temp.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="528"/>
-        <source>Back to list</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="534"/>
-        <source>Dive equipment</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="537"/>
-        <source>Work pressure</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="538"/>
-        <source>Start pressure</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="539"/>
-        <source>End pressure</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="547"/>
-        <source>Dive status</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="522"/>
-        <source>Average SAC</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="531"/>
-        <source>Dive No.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="532"/>
-        <source>Dive profile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="533"/>
-        <source>Dive information</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="535"/>
-        <location filename="../core/save-html.c" line="542"/>
-        <source>Type</source>
-        <translation>Tips</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="536"/>
-        <source>Size</source>
-        <translation>Izmērs</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="540"/>
-        <source>Gas</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="541"/>
-        <source>Weight</source>
-        <translation>Svars</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="543"/>
-        <source>Events</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="544"/>
-        <source>Name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="545"/>
-        <source>Value</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="546"/>
-        <source>Coordinates</source>
-        <translation>Koordinātas</translation>
-    </message>
-    <message>
         <location filename="../core/worldmap-save.c" line="39"/>
         <source>Date:</source>
         <translation>Datums:</translation>
@@ -10537,109 +10729,6 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation>Piezīmes:</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="91"/>
-        <location filename="../core/qthelper.cpp" line="226"/>
-        <source>N</source>
-        <translation>Z</translation>
-    </message>
-    <message>
-        <location filename="../core/qthelper.cpp" line="91"/>
-        <location filename="../core/qthelper.cpp" line="227"/>
-        <source>S</source>
-        <translation>D</translation>
-    </message>
-    <message>
-        <location filename="../core/qthelper.cpp" line="92"/>
-        <location filename="../core/qthelper.cpp" line="228"/>
-        <source>E</source>
-        <translation>A</translation>
-    </message>
-    <message>
-        <location filename="../core/qthelper.cpp" line="92"/>
-        <location filename="../core/qthelper.cpp" line="229"/>
-        <source>W</source>
-        <translation>R</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="341"/>
-        <source>Remote storage and local data diverged. Error: merge failed (%s)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="134"/>
-        <source>Local cache directory %s corrupted - can&apos;t sync with Subsurface cloud storage</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="157"/>
-        <location filename="../core/git-access.c" line="177"/>
-        <source>Could not update local cache to newer remote data</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="170"/>
-        <source>Subsurface cloud storage corrupted</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="285"/>
-        <source>Could not update Subsurface cloud storage, try again later</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="371"/>
-        <source>Remote storage and local data diverged. Cannot combine local and remote changes</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="405"/>
-        <source>Remote storage and local data diverged</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="408"/>
-        <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="417"/>
-        <source>Problems with local cache of Subsurface cloud data</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="418"/>
-        <source>Moved cache data to %s. Please try the operation again.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="737"/>
-        <source>Error connecting to Subsurface cloud storage</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="740"/>
-        <source>git clone of %s failed (%s)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/load-git.c" line="222"/>
-        <location filename="../core/parse-xml.c" line="1300"/>
-        <source>additional name for site: %s
-</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/ostctools.c" line="120"/>
-        <location filename="../core/ostctools.c" line="152"/>
-        <source>Unknown DC in dive %d</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/ostctools.c" line="165"/>
-        <source>Error - %s - parsing dive %d</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../smtk-import/smartrak.c" line="247"/>
         <source>Built</source>
         <translation type="unfinished"/>
@@ -10723,155 +10812,120 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="91"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="103"/>
         <source>Subsurface</source>
         <translation>Subsurface</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="97"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="110"/>
         <source>Dive list</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="112"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="125"/>
         <source>Cloud credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="126"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="139"/>
         <source>Manage dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="138"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="141"/>
         <source>Add dive manually</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="146"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="149"/>
         <source>Manual sync with cloud</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="164"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="167"/>
         <source>Offline mode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="164"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="167"/>
         <source>Enable auto cloud sync</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="182"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="187"/>
         <source>GPS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="185"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="190"/>
         <source>GPS-tag dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="192"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="197"/>
         <source>Upload GPS data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="199"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="204"/>
         <source>Download GPS data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="206"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="211"/>
         <source>Show GPS fixes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="215"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="220"/>
         <source>Clear GPS cache</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="221"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="226"/>
         <source>Preferences</source>
         <translation>Priekšrocības</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="230"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="237"/>
         <source>Developer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="232"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="239"/>
         <source>App log</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="239"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="246"/>
         <source>Theme information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="246"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="253"/>
         <source>User manual</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="252"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="259"/>
         <source>About</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="283"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="304"/>
         <source>Run location service</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="283"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="304"/>
         <source>No GPS source available</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="295"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="316"/>
         <source>Actions</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="9"/>
-        <source>Hello World</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="13"/>
-        <source>File</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="15"/>
-        <source>&amp;Open</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="19"/>
-        <source>Exit</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="27"/>
-        <source>Button 1 pressed</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="28"/>
-        <source>Button 2 pressed</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="33"/>
-        <source>May I have your attention, please?</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>plannerDetails</name>
@@ -10949,6 +11003,24 @@ p, li { white-space: pre-wrap; }
         <translation>m/min</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="121"/>
+        <location filename="../build/ui_plannerSettings.h" line="425"/>
+        <source>75% to 50% avg. depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="138"/>
+        <location filename="../build/ui_plannerSettings.h" line="427"/>
+        <source>50% avg. depth to 6m</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="155"/>
+        <location filename="../build/ui_plannerSettings.h" line="429"/>
+        <source>6m to surface</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="175"/>
         <location filename="../build/ui_plannerSettings.h" line="431"/>
         <source>Descent</source>
@@ -10972,12 +11044,35 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="268"/>
+        <source>Bühlmann deco</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="278"/>
         <location filename="../build/ui_plannerSettings.h" line="445"/>
         <source>Reserve gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="288"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="549"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="578"/>
+        <location filename="../build/ui_plannerSettings.h" line="446"/>
+        <location filename="../build/ui_plannerSettings.h" line="459"/>
+        <location filename="../build/ui_plannerSettings.h" line="461"/>
+        <source>bar</source>
+        <translation>bar</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="307"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="416"/>
+        <location filename="../build/ui_plannerSettings.h" line="437"/>
+        <location filename="../build/ui_plannerSettings.h" line="440"/>
+        <source>%</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="320"/>
         <location filename="../build/ui_plannerSettings.h" line="449"/>
         <source>Postpone gas change if a stop is not required</source>
@@ -10996,11 +11091,9 @@ p, li { white-space: pre-wrap; }
         <translation>GF low</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="307"/>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="416"/>
-        <location filename="../build/ui_plannerSettings.h" line="437"/>
-        <location filename="../build/ui_plannerSettings.h" line="440"/>
-        <source>%</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="353"/>
+        <location filename="../build/ui_plannerSettings.h" line="436"/>
+        <source>Plan backgas breaks</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -11010,10 +11103,10 @@ p, li { white-space: pre-wrap; }
         <translation>GF high</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="429"/>
-        <location filename="../build/ui_plannerSettings.h" line="441"/>
-        <source>Drop to first depth</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="370"/>
+        <location filename="../build/ui_plannerSettings.h" line="453"/>
+        <source>min</source>
+        <translation>min</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="389"/>
@@ -11022,163 +11115,139 @@ p, li { white-space: pre-wrap; }
         <translation>Pēdējā pietura pie 6m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="353"/>
-        <location filename="../build/ui_plannerSettings.h" line="436"/>
-        <source>Plan backgas breaks</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="396"/>
+        <source>Maximize bottom time allowed by gas and no decompression limits</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="515"/>
-        <location filename="../build/ui_plannerSettings.h" line="455"/>
-        <source>Gas options</source>
-        <translation>Gāzes opcijas</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="399"/>
+        <location filename="../build/ui_plannerSettings.h" line="443"/>
+        <source>Recreational mode</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="594"/>
-        <location filename="../build/ui_plannerSettings.h" line="456"/>
-        <source>Bottom SAC</source>
-        <translation>Apakšējais SAC</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="429"/>
+        <location filename="../build/ui_plannerSettings.h" line="441"/>
+        <source>Drop to first depth</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="692"/>
-        <location filename="../build/ui_plannerSettings.h" line="457"/>
-        <source>Deco SAC</source>
-        <translation>Deko SAC</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="436"/>
+        <location filename="../build/ui_plannerSettings.h" line="452"/>
+        <source>Min. switch duration</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="601"/>
-        <location filename="../build/ui_plannerSettings.h" line="458"/>
-        <source>Bottom pO₂</source>
-        <translation>Apakšējais pO₂</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="459"/>
+        <location filename="../build/ui_plannerSettings.h" line="444"/>
+        <source>Safety stop</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="685"/>
-        <location filename="../build/ui_plannerSettings.h" line="460"/>
-        <source>Deco pO₂</source>
-        <translation>Deko pO₂</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="495"/>
+        <source>Conservatism level</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="515"/>
+        <location filename="../build/ui_plannerSettings.h" line="455"/>
+        <source>Gas options</source>
+        <translation>Gāzes opcijas</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="565"/>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="672"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="698"/>
         <location filename="../build/ui_plannerSettings.h" line="462"/>
         <location filename="../build/ui_plannerSettings.h" line="463"/>
         <source>ℓ/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="632"/>
-        <location filename="../build/ui_plannerSettings.h" line="468"/>
-        <source>Display runtime</source>
-        <translation>Izrādīt izpildlaiku</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="645"/>
-        <location filename="../build/ui_plannerSettings.h" line="472"/>
-        <source>Display segment duration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="655"/>
-        <location filename="../build/ui_plannerSettings.h" line="476"/>
-        <source>Display transitions in deco</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="594"/>
+        <source>m</source>
+        <translation>m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="662"/>
-        <location filename="../build/ui_plannerSettings.h" line="477"/>
-        <source>Verbatim dive plan</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="606"/>
+        <source>Used to calculate best mix. Select best mix depth in &apos;Available gases&apos; table by entering gas depth, followed by &quot;B&quot; (best trimix mix) or &quot;BN&quot; (best nitrox mix)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="288"/>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="549"/>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="578"/>
-        <location filename="../build/ui_plannerSettings.h" line="446"/>
-        <location filename="../build/ui_plannerSettings.h" line="459"/>
-        <location filename="../build/ui_plannerSettings.h" line="461"/>
-        <source>bar</source>
-        <translation>bar</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="613"/>
+        <location filename="../build/ui_plannerSettings.h" line="456"/>
+        <source>Bottom SAC</source>
+        <translation>Apakšējais SAC</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="121"/>
-        <location filename="../build/ui_plannerSettings.h" line="425"/>
-        <source>75% to 50% avg. depth</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="620"/>
+        <location filename="../build/ui_plannerSettings.h" line="458"/>
+        <source>Bottom pO₂</source>
+        <translation>Apakšējais pO₂</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="138"/>
-        <location filename="../build/ui_plannerSettings.h" line="427"/>
-        <source>50% avg. depth to 6m</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="627"/>
+        <source>Best mix END</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="155"/>
-        <location filename="../build/ui_plannerSettings.h" line="429"/>
-        <source>6m to surface</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="634"/>
+        <location filename="../build/ui_plannerSettings.h" line="464"/>
+        <source>Notes</source>
+        <translation>Piezīmes</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="268"/>
-        <source>Bühlmann deco</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="655"/>
+        <location filename="../build/ui_plannerSettings.h" line="466"/>
+        <source>In dive plan, show runtime (absolute time) of stops</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="370"/>
-        <location filename="../build/ui_plannerSettings.h" line="453"/>
-        <source>min</source>
-        <translation>min</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="396"/>
-        <source>Maximize bottom time allowed by gas and no decompression limits</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="658"/>
+        <location filename="../build/ui_plannerSettings.h" line="468"/>
+        <source>Display runtime</source>
+        <translation>Izrādīt izpildlaiku</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="399"/>
-        <location filename="../build/ui_plannerSettings.h" line="443"/>
-        <source>Recreational mode</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="668"/>
+        <location filename="../build/ui_plannerSettings.h" line="470"/>
+        <source>In dive plan, show duration (relative time) of stops</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="436"/>
-        <location filename="../build/ui_plannerSettings.h" line="452"/>
-        <source>Min. switch duration</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="671"/>
+        <location filename="../build/ui_plannerSettings.h" line="472"/>
+        <source>Display segment duration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="459"/>
-        <location filename="../build/ui_plannerSettings.h" line="444"/>
-        <source>Safety stop</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="678"/>
+        <location filename="../build/ui_plannerSettings.h" line="474"/>
+        <source>In diveplan, list transitions or treat them as implicit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="495"/>
-        <source>Conservatism level</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="681"/>
+        <location filename="../build/ui_plannerSettings.h" line="476"/>
+        <source>Display transitions in deco</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="608"/>
-        <location filename="../build/ui_plannerSettings.h" line="464"/>
-        <source>Notes</source>
-        <translation>Piezīmes</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="629"/>
-        <location filename="../build/ui_plannerSettings.h" line="466"/>
-        <source>In dive plan, show runtime (absolute time) of stops</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="688"/>
+        <location filename="../build/ui_plannerSettings.h" line="477"/>
+        <source>Verbatim dive plan</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="642"/>
-        <location filename="../build/ui_plannerSettings.h" line="470"/>
-        <source>In dive plan, show duration (relative time) of stops</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="711"/>
+        <location filename="../build/ui_plannerSettings.h" line="460"/>
+        <source>Deco pO₂</source>
+        <translation>Deko pO₂</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="652"/>
-        <location filename="../build/ui_plannerSettings.h" line="474"/>
-        <source>In diveplan, list transitions or treat them as implicit</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="718"/>
+        <location filename="../build/ui_plannerSettings.h" line="457"/>
+        <source>Deco SAC</source>
+        <translation>Deko SAC</translation>
     </message>
 </context>
 </TS>
\ No newline at end of file
diff --git a/translations/subsurface_nb_NO.ts b/translations/subsurface_nb_NO.ts
index ac0549e81..8f1f110da 100644
--- a/translations/subsurface_nb_NO.ts
+++ b/translations/subsurface_nb_NO.ts
@@ -105,6 +105,11 @@
         <translation>Navn:</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="56"/>
+        <source>Could not initialize Winsock version 2.2</source>
+        <translation>Kunne ikke starte Winsock version 2.2</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="134"/>
         <source>Trying to turn on the local Bluetooth device...</source>
         <translation>Prøver å skru på lokal bluetooth-enhet...</translation>
@@ -115,6 +120,11 @@
         <translation>Prøver å skru av lokal bluetooth-enhet...</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="167"/>
+        <source>Remote devices list was cleared.</source>
+        <translation>Enhetsliste ble slettet.</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="183"/>
         <source>Scanning for remote devices...</source>
         <translation>Leter etter enheter...</translation>
@@ -125,6 +135,22 @@
         <translation>Scanning ferdig.</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="208"/>
+        <source>The local Bluetooth device was %1.</source>
+        <extracomment>%1 will be replaced with &quot;turned on&quot; or &quot;turned off&quot;</extracomment>
+        <translation>Den lokale Bluetooth-enheten ble %1.</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
+        <source>turned on</source>
+        <translation>skrudd på</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
+        <source>turned off</source>
+        <translation>skrudd av</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="225"/>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="339"/>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="359"/>
@@ -172,37 +198,6 @@
         <translation>Par</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="352"/>
-        <source>Device %1 was paired and is authorized.</source>
-        <translation>%1 ble paret og er autorisert.</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="56"/>
-        <source>Could not initialize Winsock version 2.2</source>
-        <translation>Kunne ikke starte Winsock version 2.2</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="167"/>
-        <source>Remote devices list was cleared.</source>
-        <translation>Enhetsliste ble slettet.</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="208"/>
-        <source>The local Bluetooth device was %1.</source>
-        <extracomment>%1 will be replaced with &quot;turned on&quot; or &quot;turned off&quot;</extracomment>
-        <translation>Den lokale Bluetooth-enheten ble %1.</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
-        <source>turned on</source>
-        <translation>skrudd på</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
-        <source>turned off</source>
-        <translation>skrudd av</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="307"/>
         <source>Remove pairing</source>
         <translation>Fjern paring</translation>
@@ -228,6 +223,11 @@
         <translation>%1 er paret.</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="352"/>
+        <source>Device %1 was paired and is authorized.</source>
+        <translation>%1 ble paret og er autorisert.</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="378"/>
         <source>The device %1 can now be used for connection. You can press the Save button.</source>
         <translation>%1 kan nå bli bruk til forbindelse.  Trykk &quot;Lagre&quot;-knappen.</translation>
@@ -286,12 +286,12 @@
 <context>
     <name>BuddyFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="621"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="619"/>
         <source>Person: </source>
         <translation>Person: </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="622"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="620"/>
         <source>Searches for buddies and divemasters</source>
         <translation>Søk etter buddyer og dykkeledere</translation>
     </message>
@@ -299,7 +299,7 @@
 <context>
     <name>BuddyFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="243"/>
+        <location filename="../qt-models/filtermodels.cpp" line="248"/>
         <source>No buddies</source>
         <translation>Ingen buddyer</translation>
     </message>
@@ -307,25 +307,30 @@
 <context>
     <name>CloudCredentials</name>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="49"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="50"/>
         <source>Cloud credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="55"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="56"/>
         <source>Email</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="67"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="68"/>
         <source>Password</source>
         <translation>Passord</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="90"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="92"/>
         <source>Show password</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="97"/>
+        <source>PIN</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>ColumnNameProvider</name>
@@ -381,6 +386,16 @@
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
+        <source>Max. depth</source>
+        <translation>Maksdybde</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
+        <source>Avg. depth</source>
+        <translation>Snittdybde</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
         <source>Divemaster</source>
         <translation>Dykkeleder</translation>
     </message>
@@ -391,6 +406,11 @@
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
+        <source>Suit</source>
+        <translation>Drakt</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
         <source>Notes</source>
         <translation>Notater</translation>
     </message>
@@ -410,21 +430,6 @@
         <translation>Vanntemp.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
-        <source>Max. depth</source>
-        <translation>Maksdybde</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
-        <source>Avg. depth</source>
-        <translation>Snittdybde</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
-        <source>Suit</source>
-        <translation>Drakt</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="44"/>
         <source>O₂</source>
         <translation>O₂</translation>
@@ -538,7 +543,7 @@
         <translation>Kunne ikke opprette kontekst for libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../core/configuredivecomputer.cpp" line="660"/>
+        <location filename="../core/configuredivecomputer.cpp" line="656"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation>Klarte ikke å koble til computeren.</translation>
     </message>
@@ -558,11 +563,19 @@
         <translation>Enhet eller disk</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="170"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1520"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1533"/>
-        <source>...</source>
-        <translation>...</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="47"/>
+        <source>Connect via Bluetooth</source>
+        <translation>Koble til med Bluetooth</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="54"/>
+        <source>Connect</source>
+        <translation>Koble til</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="64"/>
+        <source>Disconnect</source>
+        <translation>Koble fra</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="80"/>
@@ -571,12 +584,24 @@
         <translation>Hent tilgjengelige data</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="90"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1523"/>
+        <source>Read settings from backup file or from device before writing to the device</source>
+        <translation>Les innstillinger fra sikkerhetskopi eller fra dykkecomputeren før det skrives til den</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="93"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1525"/>
         <source>Save changes to device</source>
         <translation>Lagre endringer til computer</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="116"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1527"/>
+        <source>Read settings from backup file or from device before writing to a backup file</source>
+        <translation>Les innstillinger fra sikkerhetskopi eller fra dykkecomputeren før lagring til sikkerhetskopi</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="119"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1529"/>
         <source>Backup</source>
@@ -595,15 +620,40 @@
         <translation>Oppdater firmware</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="163"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1532"/>
+        <source>Save libdivecomputer logfile</source>
+        <translation>Lagre loggfil fra libdivecomputer</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="170"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1520"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1533"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="177"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1534"/>
         <source>Cancel</source>
         <translation>Avbryt</translation>
     </message>
     <message>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1539"/>
-        <source>OSTC 3</source>
-        <translation>OSTC 3</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="214"/>
+        <source>OSTC 3,Sport,Cr,2</source>
+        <translation>OSTC 3,Sport,Cr,2</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="223"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1541"/>
+        <source>Suunto Vyper family</source>
+        <translation>Suunty Vyper-familien</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="232"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1543"/>
+        <source>OSTC, Mk.2/2N/2C</source>
+        <translation>OSTC, Mk.2/2N/2C</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="253"/>
@@ -616,40 +666,56 @@
         <translation>Innstillinger</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="326"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1656"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1943"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1546"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1726"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1766"/>
-        <source>Serial No.</source>
-        <translation>Serienr.</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="260"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1575"/>
+        <source>Eco</source>
+        <translation>Øko</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="349"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1679"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1980"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1547"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1727"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1767"/>
-        <source>Firmware version</source>
-        <translation>Firmware-versjon</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="265"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1576"/>
+        <source>Medium</source>
+        <translation>Medium</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="538"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1713"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1990"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1548"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1729"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1768"/>
-        <source>Custom text</source>
-        <translation>Tekst</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="270"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1577"/>
+        <source>High</source>
+        <translation>Høy</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="385"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1549"/>
-        <source>Language</source>
-        <translation>Språk</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="278"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="826"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="849"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="875"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="927"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="993"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1019"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1101"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1117"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1450"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2278"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2382"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2408"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2434"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2474"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2497"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1586"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1621"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1623"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1625"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1628"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1637"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1638"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1710"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1785"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1789"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1801"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1803"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1806"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1807"/>
+        <source>%</source>
+        <translation>%</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="289"/>
@@ -676,44 +742,36 @@
         <translation>Italiensk</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="579"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1557"/>
-        <source>Dive mode</source>
-        <translation>Dykkemodus</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="556"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1560"/>
-        <source>OC</source>
-        <translation>OC</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="561"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1561"/>
-        <source>CC</source>
-        <translation>CC</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="313"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1582"/>
+        <source>m/°C</source>
+        <translation>m/°C</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="566"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2336"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1562"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1793"/>
-        <source>Gauge</source>
-        <translation>Gauge</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="318"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1583"/>
+        <source>ft/°F</source>
+        <translation>ft/°F</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="571"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1563"/>
-        <source>Apnea</source>
-        <translation>Fridykking</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="326"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1656"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1943"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1546"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1726"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1766"/>
+        <source>Serial No.</source>
+        <translation>Serienr.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="395"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2063"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1565"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1780"/>
-        <source>Date format</source>
-        <translation>Datoformat</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="349"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1679"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1980"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1547"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1727"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1767"/>
+        <source>Firmware version</source>
+        <translation>Firmware-versjon</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="360"/>
@@ -734,108 +792,147 @@
         <translation>ÅÅMMDD</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1042"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2457"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1639"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1805"/>
-        <source>Saturation</source>
-        <translation>Metning</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="385"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1549"/>
+        <source>Language</source>
+        <translation>Språk</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="278"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="826"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="849"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="875"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="927"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="993"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1019"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1101"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1117"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1450"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2278"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2382"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2408"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2434"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2474"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2497"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1586"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1621"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1623"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1625"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1628"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1637"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1638"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1710"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1785"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1789"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1801"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1803"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1806"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1807"/>
-        <source>%</source>
-        <translation>%</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="395"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2063"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1565"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1780"/>
+        <source>Date format</source>
+        <translation>Datoformat</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="865"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2261"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1624"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1784"/>
-        <source>Desaturation</source>
-        <translation>Avmetning</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="405"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1572"/>
+        <source>Brightness</source>
+        <translation>Lysstyrke</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="983"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2398"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1636"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1800"/>
-        <source>Last deco</source>
-        <translation>Siste deko</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="415"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1850"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1579"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1753"/>
+        <source>Units</source>
+        <translation>Enheter</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="711"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="736"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="758"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="904"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2181"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2206"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2228"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2307"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1626"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1786"/>
-        <source> m</source>
-        <translation>m</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="425"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1585"/>
+        <source>Salinity (0-5%)</source>
+        <translation>Saltnivå (0-5%)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="405"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1572"/>
-        <source>Brightness</source>
-        <translation>Lysstyrke</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="438"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1615"/>
+        <source>Reset device to default settings</source>
+        <translation>Resett dykkecomputer til standardinnstillinger</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="260"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1575"/>
-        <source>Eco</source>
-        <translation>Øko</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="452"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1590"/>
+        <source>230LSB/Gauss</source>
+        <translation>230LSB/Gauss</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="265"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1576"/>
-        <source>Medium</source>
-        <translation>Medium</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="457"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1591"/>
+        <source>330LSB/Gauss</source>
+        <translation>330LSB/Gauss</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="270"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1577"/>
-        <source>High</source>
-        <translation>Høy</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="462"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1592"/>
+        <source>390LSB/Gauss</source>
+        <translation>390LSB/Gauss</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="603"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2034"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1599"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1779"/>
-        <source>Sampling rate</source>
-        <translation>Samplingsfrekvens</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="467"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1593"/>
+        <source>440LSB/Gauss</source>
+        <translation>440LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="472"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1594"/>
+        <source>660LSB/Gauss</source>
+        <translation>660LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="477"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1595"/>
+        <source>820LSB/Gauss</source>
+        <translation>820LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="482"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1596"/>
+        <source>1090LSB/Gauss</source>
+        <translation>1090LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="487"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1597"/>
+        <source>1370LSB/Gauss</source>
+        <translation>1370LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="521"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1587"/>
+        <source>Compass gain</source>
+        <translation>Kompassdeviasjon</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="531"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1799"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1745"/>
+        <source>Computer model</source>
+        <translation>Computermodell</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="538"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1713"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1990"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1548"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1729"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1768"/>
+        <source>Custom text</source>
+        <translation>Tekst</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="556"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1560"/>
+        <source>OC</source>
+        <translation>OC</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="561"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1561"/>
+        <source>CC</source>
+        <translation>CC</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="566"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2336"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1562"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1793"/>
+        <source>Gauge</source>
+        <translation>Gauge</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="571"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1563"/>
+        <source>Apnea</source>
+        <translation>Fridykking</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="579"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1557"/>
+        <source>Dive mode</source>
+        <translation>Dykkemodus</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="590"/>
@@ -852,30 +949,12 @@
         <translation>10s</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="415"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1850"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1579"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1753"/>
-        <source>Units</source>
-        <translation>Enheter</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="313"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1582"/>
-        <source>m/°C</source>
-        <translation>m/°C</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="318"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1583"/>
-        <source>ft/°F</source>
-        <translation>ft/°F</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="644"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1605"/>
-        <source>Dive mode color</source>
-        <translation>Dykkemodusfarge</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="603"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2034"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1599"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1779"/>
+        <source>Sampling rate</source>
+        <translation>Samplingsfrekvens</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="614"/>
@@ -902,12 +981,6 @@
         <translation>Blå</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="425"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1585"/>
-        <source>Salinity (0-5%)</source>
-        <translation>Saltnivå (0-5%)</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="637"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2092"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1613"/>
@@ -916,90 +989,80 @@
         <translation>Synkroniser tid på dykkecomputer med PC</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="521"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1587"/>
-        <source>Compass gain</source>
-        <translation>Kompassdeviasjon</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="90"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1523"/>
-        <source>Read settings from backup file or from device before writing to the device</source>
-        <translation>Les innstillinger fra sikkerhetskopi eller fra dykkecomputeren før det skrives til den</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="116"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1527"/>
-        <source>Read settings from backup file or from device before writing to a backup file</source>
-        <translation>Les innstillinger fra sikkerhetskopi eller fra dykkecomputeren før lagring til sikkerhetskopi</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="232"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1543"/>
-        <source>OSTC, Mk.2/2N/2C</source>
-        <translation>OSTC, Mk.2/2N/2C</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="644"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1605"/>
+        <source>Dive mode color</source>
+        <translation>Dykkemodusfarge</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="452"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1590"/>
-        <source>230LSB/Gauss</source>
-        <translation>230LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="654"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2020"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1614"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1771"/>
+        <source>Show safety stop</source>
+        <translation>Vis sikkerhetsstop</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="457"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1591"/>
-        <source>330LSB/Gauss</source>
-        <translation>330LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="661"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2145"/>
+        <source>End Depth</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="462"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1592"/>
-        <source>390LSB/Gauss</source>
-        <translation>390LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="671"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2162"/>
+        <source> s</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="467"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1593"/>
-        <source>440LSB/Gauss</source>
-        <translation>440LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="687"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1953"/>
+        <source>Length</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="472"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1594"/>
-        <source>660LSB/Gauss</source>
-        <translation>660LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="694"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2138"/>
+        <source>Start Depth</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="477"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1595"/>
-        <source>820LSB/Gauss</source>
-        <translation>820LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="701"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2152"/>
+        <source>Reset Depth</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="482"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1596"/>
-        <source>1090LSB/Gauss</source>
-        <translation>1090LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="711"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="736"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="758"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="904"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2181"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2206"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2228"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2307"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1626"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1786"/>
+        <source> m</source>
+        <translation>m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="487"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1597"/>
-        <source>1370LSB/Gauss</source>
-        <translation>1370LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="778"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2248"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1643"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1810"/>
+        <source>Advanced settings</source>
+        <translation>Avanserte innstillinger</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="654"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2020"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1614"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1771"/>
-        <source>Show safety stop</source>
-        <translation>Vis sikkerhetsstop</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="784"/>
+        <source>Left button sensitivity</source>
+        <translation>Sensitivitet på venstre knapp</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="438"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1615"/>
-        <source>Reset device to default settings</source>
-        <translation>Resett dykkecomputer til standardinnstillinger</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="791"/>
+        <source>Always show ppO2</source>
+        <translation>Vis alltid ppO₂</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="798"/>
@@ -1010,20 +1073,6 @@
         <translation>Alternativ GF kan velges under dykk</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="223"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1541"/>
-        <source>Suunto Vyper family</source>
-        <translation>Suunty Vyper-familien</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="778"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2248"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1643"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1810"/>
-        <source>Advanced settings</source>
-        <translation>Avanserte innstillinger</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="805"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2271"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1618"/>
@@ -1054,6 +1103,14 @@
         <translation>GF høy</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="865"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2261"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1624"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1784"/>
+        <source>Desaturation</source>
+        <translation>Avmetning</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="917"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2320"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1627"/>
@@ -1068,14 +1125,6 @@
         <translation>mbar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="973"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2369"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1630"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1788"/>
-        <source> min</source>
-        <translation>min</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="960"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2331"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1633"/>
@@ -1084,63 +1133,28 @@
         <translation>ZH-L16</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="47"/>
-        <source>Connect via Bluetooth</source>
-        <translation>Koble til med Bluetooth</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="163"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1532"/>
-        <source>Save libdivecomputer logfile</source>
-        <translation>Lagre loggfil fra libdivecomputer</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="661"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2145"/>
-        <source>End Depth</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="671"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2162"/>
-        <source> s</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="687"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1953"/>
-        <source>Length</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="694"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2138"/>
-        <source>Start Depth</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="701"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2152"/>
-        <source>Reset Depth</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="784"/>
-        <source>Left button sensitivity</source>
-        <translation>Sensitivitet på venstre knapp</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="791"/>
-        <source>Always show ppO2</source>
-        <translation>Vis alltid ppO₂</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="965"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1634"/>
         <source>ZH-L16+GF</source>
         <translation>ZH-L16+GF</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="973"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2369"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1630"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1788"/>
+        <source> min</source>
+        <translation>min</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="983"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2398"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1636"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1800"/>
+        <source>Last deco</source>
+        <translation>Siste deko</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1009"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2424"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1640"/>
@@ -1157,6 +1171,14 @@
         <translation>Alt GF-Høy</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1042"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2457"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1639"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1805"/>
+        <source>Saturation</source>
+        <translation>Metning</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1052"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1642"/>
         <source>Flip screen</source>
@@ -1168,12 +1190,22 @@
         <translation>Sensitivitet på høyre knap</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1066"/>
+        <source>MOD warning</source>
+        <translation>MOD-advarsel</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1073"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2513"/>
         <source>Graphical speed indicator</source>
         <translation>Grafisk fartsindikator</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1080"/>
+        <source>Dynamic ascent rate</source>
+        <translation>Dynamisk oppstigningshastighet</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1087"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2552"/>
         <source>Bottom gas consumption</source>
@@ -1186,6 +1218,14 @@
         <translation>Gassforbruk på dekogass</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1133"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1149"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2520"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2536"/>
+        <source> ℓ/min</source>
+        <translation> ℓ/min</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1165"/>
         <source>Temperature sensor offset</source>
         <translation type="unfinished"/>
@@ -1204,6 +1244,18 @@
         <translation>Gassvalg</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1235"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1320"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2610"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2695"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1645"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1668"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1812"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1835"/>
+        <source>%O₂</source>
+        <translation>%O₂</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1240"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1325"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2615"/>
@@ -1322,16 +1374,10 @@
         <translation>Dil 5</translation>
     </message>
     <message>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1691"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1858"/>
-        <source>Set point [cbar]</source>
-        <translation>Settpunkt [cbar]</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1693"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1860"/>
-        <source>Change depth [m]</source>
-        <translation>Endre dybde [m]</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1405"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2770"/>
+        <source>Setpoint</source>
+        <translation>Settpunkt</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1415"/>
@@ -1370,6 +1416,12 @@
         <translation>SP 5</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1443"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1709"/>
+        <source>O₂ in calibration gas</source>
+        <translation>O₂ i kalibreringsgass</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1467"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1713"/>
         <source>Fixed setpoint</source>
@@ -1400,101 +1452,6 @@
         <translation>cbar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1748"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1733"/>
-        <source>P1 (medium)</source>
-        <extracomment>Suunto safety level</extracomment>
-        <translation>P1 (medium)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1753"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1734"/>
-        <source>P2 (high)</source>
-        <extracomment>Suunto safety level</extracomment>
-        <translation>P2 (høy)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1792"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1744"/>
-        <source>Total dive time</source>
-        <translation>Total dykketid</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2109"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1769"/>
-        <source>kg/ℓ</source>
-        <translation>kg/ℓ</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2346"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1795"/>
-        <source>Apnoea</source>
-        <translation>Apnea</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1583"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1722"/>
-        <source>Safety level</source>
-        <translation>Sikkerhetsnivå</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="54"/>
-        <source>Connect</source>
-        <translation>Koble til</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="64"/>
-        <source>Disconnect</source>
-        <translation>Koble fra</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="214"/>
-        <source>OSTC 3,Sport,Cr,2</source>
-        <translation>OSTC 3,Sport,Cr,2</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1066"/>
-        <source>MOD warning</source>
-        <translation>MOD-advarsel</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1080"/>
-        <source>Dynamic ascent rate</source>
-        <translation>Dynamisk oppstigningshastighet</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1133"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1149"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2520"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2536"/>
-        <source> ℓ/min</source>
-        <translation> ℓ/min</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1235"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1320"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2610"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2695"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1645"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1668"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1812"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1835"/>
-        <source>%O₂</source>
-        <translation>%O₂</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1405"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2770"/>
-        <source>Setpoint</source>
-        <translation>Settpunkt</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1443"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1709"/>
-        <source>O₂ in calibration gas</source>
-        <translation>O₂ i kalibreringsgass</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1535"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2843"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1719"/>
@@ -1511,6 +1468,12 @@
         <translation>pO₂ min</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1583"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1722"/>
+        <source>Safety level</source>
+        <translation>Sikkerhetsnivå</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1609"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1723"/>
         <source>Altitude range</source>
@@ -1544,6 +1507,20 @@
         <translation>P0 (ingen)</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1748"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1733"/>
+        <source>P1 (medium)</source>
+        <extracomment>Suunto safety level</extracomment>
+        <translation>P1 (medium)</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1753"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1734"/>
+        <source>P2 (high)</source>
+        <extracomment>Suunto safety level</extracomment>
+        <translation>P2 (høy)</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1761"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1736"/>
         <source>Sample rate</source>
@@ -1568,11 +1545,10 @@
         <translation>60s</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="531"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1799"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1745"/>
-        <source>Computer model</source>
-        <translation>Computermodell</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1792"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1744"/>
+        <source>Total dive time</source>
+        <translation>Total dykketid</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1816"/>
@@ -1637,12 +1613,6 @@
         <translation>Tidsalarm</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2099"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1765"/>
-        <source>Salinity</source>
-        <translation>Saltholdighet</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2074"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1774"/>
         <source>MM/DD/YY</source>
@@ -1661,12 +1631,30 @@
         <translation>ÅÅ/MM/DD</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2099"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1765"/>
+        <source>Salinity</source>
+        <translation>Saltholdighet</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2109"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1769"/>
+        <source>kg/ℓ</source>
+        <translation>kg/ℓ</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2341"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1794"/>
         <source>ZH-L16 CC</source>
         <translation>ZH-L16 CC</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2346"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1795"/>
+        <source>Apnoea</source>
+        <translation>Apnea</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2351"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1796"/>
         <source>L16-GF OC</source>
@@ -1685,87 +1673,112 @@
         <translation>PSCR-GF</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1108"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1129"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1539"/>
+        <source>OSTC 3</source>
+        <translation>OSTC 3</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1691"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1858"/>
+        <source>Set point [cbar]</source>
+        <translation>Settpunkt [cbar]</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1693"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1860"/>
+        <source>Change depth [m]</source>
+        <translation>Endre dybde [m]</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1110"/>
+        <source>Backup dive computer settings</source>
+        <translation>Backupinnstillinger for computer</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1111"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1132"/>
         <source>Backup files (*.xml)</source>
         <translation>Backupfil (*.xml)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1113"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1115"/>
+        <source>XML backup error</source>
+        <translation>Feil ved XML-backup</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1116"/>
         <source>An error occurred while saving the backup file.
 %1</source>
         <translation>En feil inntraff under lagring av backupfila.
 %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1116"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1119"/>
         <source>Backup succeeded</source>
         <translation>Backup OK</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1117"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1120"/>
         <source>Your settings have been saved to: %1</source>
         <translation>Instillingene ble lagret til: %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1107"/>
-        <source>Backup dive computer settings</source>
-        <translation>Backupinnstillinger for computer</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1112"/>
-        <source>XML backup error</source>
-        <translation>Feil ved XML-backup</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1128"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1131"/>
         <source>Restore dive computer settings</source>
         <translation>Gjenopprett computerinnstillinger</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1134"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1137"/>
         <source>XML restore error</source>
         <translation>Feil ved gjenoppretting fra XML</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1135"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1138"/>
         <source>An error occurred while restoring the backup file.
 %1</source>
         <translation>En feil inntraff ved gjenoppretting av backupfila.
 %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1139"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1142"/>
         <source>Restore succeeded</source>
         <translation>Gjenoppretting OK</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1140"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1143"/>
         <source>Your settings have been restored successfully.</source>
         <translation>Innstillingene dine har blitt gjenopprettet.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1150"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1153"/>
         <source>Select firmware file</source>
         <translation>Velg firmware-fil</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1151"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1154"/>
         <source>All files (*.*)</source>
         <translation>Alle filer (*.*)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1207"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1210"/>
         <source>Choose file for divecomputer download logfile</source>
         <translation>Velg fil som loggfil for dykkecomputer</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1208"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1211"/>
         <source>Log files (*.log)</source>
         <translation>Loggfiler (*.log)</translation>
     </message>
 </context>
 <context>
+    <name>ContextDrawer</name>
+    <message>
+        <location filename="../mobile-widgets/qml/kirigami/src/controls/ContextDrawer.qml" line="76"/>
+        <source>Actions</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>CylindersModel</name>
     <message>
         <location filename="../qt-models/cylindermodel.cpp" line="16"/>
@@ -1779,11 +1792,6 @@
     </message>
     <message>
         <location filename="../qt-models/cylindermodel.cpp" line="16"/>
-        <source>He%</source>
-        <translation>He%</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="16"/>
         <source>Work press.</source>
         <translation>Trykkrating</translation>
     </message>
@@ -1803,9 +1811,24 @@
         <translation>O₂%</translation>
     </message>
     <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="16"/>
+        <source>He%</source>
+        <translation>He%</translation>
+    </message>
+    <message>
         <location filename="../qt-models/cylindermodel.cpp" line="17"/>
-        <source>Switch at</source>
-        <translation>Gassbytte ved</translation>
+        <source>Deco switch at</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
+        <source>Bot. MOD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
+        <source>MND</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-models/cylindermodel.cpp" line="17"/>
@@ -1823,17 +1846,32 @@
         <translation>ℓ</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="161"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="177"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation>Klikk her for å fjerne denne flaska.</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="383"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="180"/>
+        <source>Switch depth for deco gas. Calculated using Deco pO₂ preference, unless set manually.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="183"/>
+        <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to &apos;*&apos; for best O₂% for max depth.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="186"/>
+        <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to &apos;*&apos; for best He% for max depth.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="444"/>
         <source>Cylinder cannot be removed</source>
         <translation>Flaska kan ikke fjernes</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="384"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="445"/>
         <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source>
         <translation>Gassen er i bruk. Bare flasker som ikke er i bruk kan fjernes.</translation>
     </message>
@@ -1853,42 +1891,24 @@
         <translation>Hvilke komponenter vil du kopiere</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="73"/>
+        <location filename="../build/ui_divecomponentselection.h" line="141"/>
+        <source>Dive site</source>
+        <translation>Dykkested</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="80"/>
         <location filename="../build/ui_divecomponentselection.h" line="142"/>
         <source>Suit</source>
         <translation>Drakt</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="122"/>
-        <location filename="../build/ui_divecomponentselection.h" line="148"/>
-        <source>Divemaster</source>
-        <translation>Dykkeleder</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="129"/>
-        <location filename="../build/ui_divecomponentselection.h" line="149"/>
-        <source>Buddy</source>
-        <translation>Buddy</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="136"/>
-        <location filename="../build/ui_divecomponentselection.h" line="150"/>
-        <source>Rating</source>
-        <translation>Vurdering</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="87"/>
         <location filename="../build/ui_divecomponentselection.h" line="143"/>
         <source>Visibility</source>
         <translation>Sikt</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="73"/>
-        <location filename="../build/ui_divecomponentselection.h" line="141"/>
-        <source>Dive site</source>
-        <translation>Dykkested</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="94"/>
         <location filename="../build/ui_divecomponentselection.h" line="144"/>
         <source>Notes</source>
@@ -1912,10 +1932,34 @@
         <source>Cylinders</source>
         <translation>Flasker</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="122"/>
+        <location filename="../build/ui_divecomponentselection.h" line="148"/>
+        <source>Divemaster</source>
+        <translation>Dykkeleder</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="129"/>
+        <location filename="../build/ui_divecomponentselection.h" line="149"/>
+        <source>Buddy</source>
+        <translation>Buddy</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="136"/>
+        <location filename="../build/ui_divecomponentselection.h" line="150"/>
+        <source>Rating</source>
+        <translation>Vurdering</translation>
+    </message>
 </context>
 <context>
     <name>DiveComputerManagementDialog</name>
     <message>
+        <location filename="../desktop-widgets/divecomputermanagementdialog.ui" line="17"/>
+        <location filename="../build/ui_divecomputermanagementdialog.h" line="65"/>
+        <source>Edit dive computer nicknames</source>
+        <translation>Rediger computerens navn</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divecomputermanagementdialog.cpp" line="49"/>
         <source>Remove the selected dive computer?</source>
         <translation>Fjern valgte dykkecomputer?</translation>
@@ -1926,12 +1970,6 @@
  remove the selected dive computer?</source>
         <translation>Vil du fjerne den valgte computeren?</translation>
     </message>
-    <message>
-        <location filename="../desktop-widgets/divecomputermanagementdialog.ui" line="17"/>
-        <location filename="../build/ui_divecomputermanagementdialog.h" line="65"/>
-        <source>Edit dive computer nicknames</source>
-        <translation>Rediger computerens navn</translation>
-    </message>
 </context>
 <context>
     <name>DiveComputerModel</name>
@@ -1959,17 +1997,17 @@
 <context>
     <name>DiveDetails</name>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="33"/>
+        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="38"/>
         <source>Dive details</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="67"/>
+        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="72"/>
         <source>Delete dive</source>
         <translation>Slett dykk</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="84"/>
+        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="89"/>
         <source>Show on map</source>
         <translation type="unfinished"/>
     </message>
@@ -1977,88 +2015,93 @@
 <context>
     <name>DiveDetailsEdit</name>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="74"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="80"/>
         <source>Dive %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="78"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="84"/>
         <source>Date:</source>
         <translation>Dato:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="86"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="92"/>
         <source>Location:</source>
         <translation>Sted:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="95"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="101"/>
         <source>Coordinates:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="104"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="110"/>
         <source>Use current
 GPS location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="118"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="124"/>
         <source>Depth:</source>
         <translation>Dybde:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="127"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="133"/>
         <source>Duration:</source>
         <translation>Lengde:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="137"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="143"/>
         <source>Air Temp:</source>
         <translation>Lufttemp:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="146"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="152"/>
         <source>Water Temp:</source>
         <translation>Vanntemp:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="155"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="161"/>
         <source>Suit:</source>
         <translation>Drakt:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="164"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="176"/>
         <source>Buddy:</source>
         <translation>Buddy:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="173"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="191"/>
         <source>Dive Master:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="182"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="206"/>
         <source>Weight:</source>
         <translation>Vekt:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="192"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="216"/>
+        <source>Cylinder:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="231"/>
         <source>Gas mix:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="203"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="241"/>
         <source>Start Pressure:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="213"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="250"/>
         <source>End Pressure:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="224"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="260"/>
         <source>Notes:</source>
         <translation>Notater:</translation>
     </message>
@@ -2096,42 +2139,42 @@ GPS location:</source>
         <translation>Drakt:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="159"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="158"/>
         <source>Air Temp:</source>
         <translation>Lufttemp:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="175"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="172"/>
         <source>Cylinder:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="189"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="185"/>
         <source>Water Temp:</source>
         <translation>Vanntemp:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="205"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="198"/>
         <source>Dive Master:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="220"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="211"/>
         <source>Weight:</source>
         <translation>Vekt:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="249"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="224"/>
         <source>Buddy:</source>
         <translation>Buddy:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="263"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="237"/>
         <source>SAC:</source>
         <translation>SAC:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="280"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="252"/>
         <source>Notes</source>
         <translation>Notater</translation>
     </message>
@@ -2139,18 +2182,18 @@ GPS location:</source>
 <context>
     <name>DiveEventItem</name>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="134"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="165"/>
         <source>Manual switch to OC</source>
         <translation>Manuelt bytte til OC</translation>
     </message>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="136"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="167"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation> start</translation>
     </message>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="137"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="168"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation> slutt</translation>
@@ -2159,27 +2202,27 @@ GPS location:</source>
 <context>
     <name>DiveImportedModel</name>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="646"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="656"/>
         <source>Date/time</source>
         <translation>Dato/tid</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="648"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="658"/>
         <source>Duration</source>
         <translation>Varighet</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="650"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="660"/>
         <source>Depth</source>
         <translation>Dybde</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="672"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="682"/>
         <source>h:</source>
         <translation>t:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="672"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="682"/>
         <source>min</source>
         <translation>min</translation>
     </message>
@@ -2188,8 +2231,8 @@ GPS location:</source>
     <name>DiveList</name>
     <message>
         <location filename="../mobile-widgets/qml/DiveList.qml" line="12"/>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="226"/>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="232"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="227"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="233"/>
         <source>Dive list</source>
         <translation type="unfinished"/>
     </message>
@@ -2204,110 +2247,115 @@ GPS location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="222"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="223"/>
         <source>Cloud credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="228"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="229"/>
         <source>Please tap the &apos;+&apos; button to add a dive</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="248"/>
+        <source>No dives in dive list</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DiveListView</name>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="846"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="849"/>
         <source>Expand all</source>
         <translation>Fold ut turer</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="848"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="851"/>
         <source>Collapse all</source>
         <translation>Fold sammen turer</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="852"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="855"/>
         <source>Collapse others</source>
         <translation>Slå sammen andre</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="856"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="859"/>
         <source>Remove dive(s) from trip</source>
         <translation>Fjern dykk fra tur</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="857"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="860"/>
         <source>Create new trip above</source>
         <translation>Lag ny tur</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="871"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="874"/>
         <source>Add dive(s) to trip immediately above</source>
         <translation>Legg til dykk til turen over</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="873"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="876"/>
         <source>Add dive(s) to trip immediately below</source>
         <translation>Legg til dykk til turen under</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="877"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="880"/>
         <source>Merge trip with trip above</source>
         <translation>Slå samme tur med turen over</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="878"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="881"/>
         <source>Merge trip with trip below</source>
         <translation>Slå sammen tur med turen under</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="882"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="885"/>
         <source>Delete dive(s)</source>
         <translation>Slett dykk</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="884"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="887"/>
         <source>Mark dive(s) invalid</source>
         <translation>Marker dykk som ugyldige</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="888"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="891"/>
         <source>Merge selected dives</source>
         <translation>Slå sammen valgte dyk</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="890"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="893"/>
         <source>Renumber dive(s)</source>
         <translation>Renummerer dykk</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="891"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="894"/>
         <source>Shift dive times</source>
         <translation>Flytt på dykketider</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="892"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="895"/>
         <source>Split selected dives</source>
         <translation>Del opp valgte dykk</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="893"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="896"/>
         <source>Load image(s) from file(s)</source>
         <translation>Hent bilde(r) fra fil(er)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="894"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="897"/>
         <source>Load image(s) from web</source>
         <translation>Hent bilde(r) fra web</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="917"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="919"/>
         <source>Open image files</source>
         <translation>Åpne bilder</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="917"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="919"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>Bilder (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -2328,56 +2376,6 @@ GPS location:</source>
 <context>
     <name>DiveLogExportDialog</name>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="103"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="351"/>
-        <source>Export format</source>
-        <translation>Eksportformat</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="134"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="353"/>
-        <source>UDDF</source>
-        <translation>UDDF</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="187"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="358"/>
-        <source>Worldmap</source>
-        <translation>Verdenskart</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="197"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="359"/>
-        <source>I&amp;mage depths</source>
-        <translation>Bi&amp;ldedypder</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="243"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="360"/>
-        <source>Selection</source>
-        <translation>Valg</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="252"/>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="346"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="361"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="372"/>
-        <source>Selected dives</source>
-        <translation>Valgte dykk</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="262"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="362"/>
-        <source>All dives</source>
-        <translation>Alle dyk</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="306"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="396"/>
-        <source>HTML</source>
-        <translation>HTML</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="14"/>
         <location filename="../build/ui_divelogexportdialog.h" line="349"/>
         <source>Export dive log files</source>
@@ -2390,12 +2388,24 @@ GPS location:</source>
         <translation>Generell eksport</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="103"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="351"/>
+        <source>Export format</source>
+        <translation>Eksportformat</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="115"/>
         <location filename="../build/ui_divelogexportdialog.h" line="352"/>
         <source>Subsurface &amp;XML</source>
         <translation>Subsurface &amp;XML</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="134"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="353"/>
+        <source>UDDF</source>
+        <translation>UDDF</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="147"/>
         <location filename="../build/ui_divelogexportdialog.h" line="354"/>
         <source>di&amp;velogs.de</source>
@@ -2420,238 +2430,297 @@ GPS location:</source>
         <translation>Dykkedetaljer som CSV</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="275"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="187"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="358"/>
+        <source>Worldmap</source>
+        <translation>Verdenskart</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="197"/>
+        <source>TeX</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="207"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="359"/>
+        <source>I&amp;mage depths</source>
+        <translation>Bi&amp;ldedypder</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="253"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="360"/>
+        <source>Selection</source>
+        <translation>Valg</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="262"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="356"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="361"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="372"/>
+        <source>Selected dives</source>
+        <translation>Valgte dykk</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="272"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="362"/>
+        <source>All dives</source>
+        <translation>Alle dyk</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="285"/>
         <location filename="../build/ui_divelogexportdialog.h" line="363"/>
         <source>CSV units</source>
         <translation>CSV-enheter</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="288"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="298"/>
         <location filename="../build/ui_divelogexportdialog.h" line="366"/>
         <source>Metric</source>
         <translation>Metrisk</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="293"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="303"/>
         <location filename="../build/ui_divelogexportdialog.h" line="367"/>
         <source>Imperial</source>
         <translation>Britiske mål</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="324"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="316"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="396"/>
+        <source>HTML</source>
+        <translation>HTML</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="334"/>
         <location filename="../build/ui_divelogexportdialog.h" line="370"/>
         <source>General settings</source>
         <translation>Generelle innstillinger</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="330"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="340"/>
         <location filename="../build/ui_divelogexportdialog.h" line="371"/>
         <source>Subsurface numbers</source>
         <translation>Subsurface-tall</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="359"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="369"/>
         <location filename="../build/ui_divelogexportdialog.h" line="373"/>
         <source>Export yearly statistics</source>
         <translation>Eksporter årsstatistikk</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="375"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="385"/>
         <location filename="../build/ui_divelogexportdialog.h" line="374"/>
         <source>All di&amp;ves</source>
         <translation>Alle dykk</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="385"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="395"/>
         <location filename="../build/ui_divelogexportdialog.h" line="375"/>
         <source>Export list only</source>
         <translation>Bare eksporter liste</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="392"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="402"/>
         <location filename="../build/ui_divelogexportdialog.h" line="376"/>
         <source>Export photos</source>
         <translation>Eksporter bilder</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="408"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="418"/>
         <location filename="../build/ui_divelogexportdialog.h" line="377"/>
         <source>Style options</source>
         <translation>Stilvalg</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="423"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="433"/>
         <location filename="../build/ui_divelogexportdialog.h" line="378"/>
         <source>Font</source>
         <translation>Skrifttype</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="433"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="443"/>
         <location filename="../build/ui_divelogexportdialog.h" line="379"/>
         <source>Font size</source>
         <translation>Skriftstørrelse</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="444"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="454"/>
         <location filename="../build/ui_divelogexportdialog.h" line="382"/>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="449"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="459"/>
         <location filename="../build/ui_divelogexportdialog.h" line="383"/>
         <source>10</source>
         <translation>10</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="454"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="464"/>
         <location filename="../build/ui_divelogexportdialog.h" line="384"/>
         <source>12</source>
         <translation>12</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="459"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="469"/>
         <location filename="../build/ui_divelogexportdialog.h" line="385"/>
         <source>14</source>
         <translation>14</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="464"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="474"/>
         <location filename="../build/ui_divelogexportdialog.h" line="386"/>
         <source>16</source>
         <translation>16</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="469"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="479"/>
         <location filename="../build/ui_divelogexportdialog.h" line="387"/>
         <source>18</source>
         <translation>18</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="474"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="484"/>
         <location filename="../build/ui_divelogexportdialog.h" line="388"/>
         <source>20</source>
         <translation>20</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="482"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="492"/>
         <location filename="../build/ui_divelogexportdialog.h" line="390"/>
         <source>Theme</source>
         <translation>Tema</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="493"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="503"/>
         <location filename="../build/ui_divelogexportdialog.h" line="393"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="95"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="99"/>
         <source>Light</source>
         <translation>Lys</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="498"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="508"/>
         <location filename="../build/ui_divelogexportdialog.h" line="394"/>
         <source>Sand</source>
         <translation>Sand</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="134"/>
-        <source>UDDF files (*.uddf *.UDDF)</source>
-        <translation>UDDF-filer (*.uddf *.UDDF)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="142"/>
-        <source>CSV files (*.csv *.CSV)</source>
-        <translation>CSV-filer (*.csv *.CSV)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="74"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="76"/>
         <source>Generic format that is used for data exchange between a variety of diving related programs.</source>
         <translation>Generelt format som brukes til datautveksling mellom en mengde dykkerelaterte programmer.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="76"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="78"/>
         <source>Comma separated values describing the dive profile.</source>
         <translation>Dykkeprofil med kommaseparerte verdier.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="78"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="80"/>
         <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source>
         <translation>Dykkeinformasjon som kommaseparerte verdier. Dette inkluderer de fleste dykkedetaljene men ikke profilinformasjonen.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="80"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="82"/>
         <source>Send the dive data to divelogs.de website.</source>
         <translation>Send dataene til divelogs.de.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="82"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="84"/>
         <source>Send the dive data to dive-share.appspot.com website</source>
         <translation>Send dykkedata til dive-share.appspot.com</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="84"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="86"/>
         <source>HTML export of the dive locations, visualized on a world map.</source>
         <translation>HTML-eksport av dykkestedene, visualisert på et verdenskart.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="86"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="88"/>
         <source>Subsurface native XML format.</source>
         <translation>Subsurface sitt eget XML-format.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="88"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="90"/>
         <source>Write depths of images to file.</source>
         <translation>Skriv dybdedata fra bilder til fil.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="133"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="92"/>
+        <source>Write dive as TeX macros to file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="137"/>
         <source>Export UDDF file as</source>
         <translation>Eksporter UDDF-filer som</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="137"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/>
+        <source>UDDF files (*.uddf *.UDDF)</source>
+        <translation>UDDF-filer (*.uddf *.UDDF)</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divelogexportdialog.cpp" line="141"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="145"/>
         <source>Export CSV file as</source>
         <translation>Eksporter CSV-file som</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="148"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="142"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="146"/>
+        <source>CSV files (*.csv *.CSV)</source>
+        <translation>CSV-filer (*.csv *.CSV)</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="152"/>
         <source>Export world map</source>
         <translation>Eksporter verdenskart</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="149"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="169"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="153"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="177"/>
         <source>HTML files (*.html)</source>
         <translation>HTML-filer (*.html)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="153"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="157"/>
         <source>Export Subsurface XML</source>
         <translation>Eksporter Subsurface XML</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="158"/>
         <source>XML files (*.xml *.ssrf)</source>
         <translation>XML-filer (*.xml *.ssrf)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="162"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="166"/>
         <source>Save image depths</source>
         <translation>Lagre dybdedata fra bilder </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="168"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="170"/>
+        <source>Export to TeX file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="170"/>
+        <source>TeX files (*.tex)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="176"/>
         <source>Export HTML files as</source>
         <translation>Eksporter HTML-filer som</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="184"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="192"/>
         <source>Please wait, exporting...</source>
         <translation>Vent, eksporterer...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="219"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="227"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="311"/>
         <source>Can&apos;t open file %s</source>
         <translation>Klarer ikke åpne fila %s</translation>
     </message>
@@ -2665,25 +2734,6 @@ GPS location:</source>
         <translation>Importer dykkelogg</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="643"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="727"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="856"/>
-        <source>Time</source>
-        <translation>Tid</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.ui" line="127"/>
-        <location filename="../build/ui_divelogimportdialog.h" line="164"/>
-        <source>Metric</source>
-        <translation>Metrisk</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.ui" line="132"/>
-        <location filename="../build/ui_divelogimportdialog.h" line="165"/>
-        <source>Imperial</source>
-        <translation>Britiske mål</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divelogimportdialog.ui" line="89"/>
         <location filename="../build/ui_divelogimportdialog.h" line="152"/>
         <source>dd.mm.yyyy</source>
@@ -2702,74 +2752,6 @@ GPS location:</source>
         <translation>åååå-mm-dd</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.ui" line="155"/>
-        <location filename="../build/ui_divelogimportdialog.h" line="167"/>
-        <source>Drag the tags above to each corresponding column below</source>
-        <translation>Dra emneknaggene til de korresponderende kolonnene under</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="641"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="729"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="852"/>
-        <source>Dive #</source>
-        <translation>Dykk #</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="642"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="723"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="854"/>
-        <source>Date</source>
-        <translation>Dato</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="644"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="858"/>
-        <source>Duration</source>
-        <translation>Varighet</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="655"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="862"/>
-        <source>GPS</source>
-        <translation>GPS</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="645"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="864"/>
-        <source>Max. depth</source>
-        <translation>Maksdybde</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="646"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="866"/>
-        <source>Avg. depth</source>
-        <translation>Snittdybde</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="658"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="872"/>
-        <source>Suit</source>
-        <translation>Drakt</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="663"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="878"/>
-        <source>Tags</source>
-        <translation>Emner</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="652"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="894"/>
-        <source>O₂</source>
-        <translation>O₂</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="653"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="896"/>
-        <source>He</source>
-        <translation>He</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divelogimportdialog.ui" line="108"/>
         <location filename="../build/ui_divelogimportdialog.h" line="158"/>
         <source>Seconds</source>
@@ -2788,183 +2770,269 @@ GPS location:</source>
         <translation>Minutter:sekunder</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="654"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="860"/>
-        <source>Location</source>
-        <translation>Sted</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.ui" line="127"/>
+        <location filename="../build/ui_divelogimportdialog.h" line="164"/>
+        <source>Metric</source>
+        <translation>Metrisk</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.ui" line="132"/>
+        <location filename="../build/ui_divelogimportdialog.h" line="165"/>
+        <source>Imperial</source>
+        <translation>Britiske mål</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.ui" line="155"/>
+        <location filename="../build/ui_divelogimportdialog.h" line="167"/>
+        <source>Drag the tags above to each corresponding column below</source>
+        <translation>Dra emneknaggene til de korresponderende kolonnene under</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="354"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="499"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="505"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="355"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="528"/>
         <source>Tab</source>
         <translation>Tab</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="575"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="598"/>
         <source>Some column headers were pre-populated; please drag and drop the headers so they match the column they are in.</source>
         <translation>Noen kolonnetitler ble automatisk fylt ut.  Dra og slipp disse titlene så de matcher kolonnene de er i.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="613"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="731"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="782"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="848"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="636"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="761"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="857"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="925"/>
         <source>Sample time</source>
         <translation>Datapunkt: tid</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="615"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="733"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="784"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="638"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="763"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="859"/>
         <source>Sample depth</source>
         <translation>Datapunkt: dybde</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="617"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="735"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="786"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="640"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="765"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="861"/>
         <source>Sample temperature</source>
         <translation>Datapunkt: temperatur</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="621"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="739"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="790"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="642"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="767"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="863"/>
+        <source>Sample pO₂</source>
+        <translation>Datapunkt: pO₂</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="644"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="769"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="865"/>
         <source>Sample sensor1 pO₂</source>
         <translation>Sample sensor1 pO₂</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="623"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="741"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="792"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="646"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="771"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="867"/>
         <source>Sample sensor2 pO₂</source>
         <translation>Sample sensor2 pO₂</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="625"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="743"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="794"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="648"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="773"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="869"/>
         <source>Sample sensor3 pO₂</source>
         <translation>Sample sensor3 pO₂</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="633"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="751"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="802"/>
-        <source>Sample stopdepth</source>
-        <translation>Datapunkt: stoppdybde</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="637"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="755"/>
-        <source>Sample setpoint</source>
-        <translation>Sample settpunkt</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="619"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="737"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="788"/>
-        <source>Sample pO₂</source>
-        <translation>Datapunkt: pO₂</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="627"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="745"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="796"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="650"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="775"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="871"/>
         <source>Sample CNS</source>
         <translation>Datapunkt: CNS</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="629"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="747"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="798"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="652"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="777"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="873"/>
         <source>Sample NDL</source>
         <translation>Datapunkt: NDL</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="631"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="749"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="800"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="654"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="779"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="875"/>
         <source>Sample TTS</source>
         <translation>Datapunkt: TTS</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="635"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="753"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="804"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="656"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="781"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="877"/>
+        <source>Sample stopdepth</source>
+        <translation>Datapunkt: stoppdybde</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="658"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="783"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="879"/>
         <source>Sample pressure</source>
         <translation>Datapunkt: trykk</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="656"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="868"/>
-        <source>Divemaster</source>
-        <translation>Dykkeleder</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="660"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="785"/>
+        <source>Sample setpoint</source>
+        <translation>Sample settpunkt</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="657"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="870"/>
-        <source>Buddy</source>
-        <translation>Buddy</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="664"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="759"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="929"/>
+        <source>Dive #</source>
+        <translation>Dykk #</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="659"/>
-        <source>Rating</source>
-        <translation>Vurdering</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="665"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="753"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="931"/>
+        <source>Date</source>
+        <translation>Dato</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="660"/>
-        <source>Visibility</source>
-        <translation>Sikt</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="666"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="757"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="933"/>
+        <source>Time</source>
+        <translation>Tid</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="661"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="874"/>
-        <source>Notes</source>
-        <translation>Notater</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="667"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="935"/>
+        <source>Duration</source>
+        <translation>Varighet</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="662"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="876"/>
-        <source>Weight</source>
-        <translation>Vekt</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="668"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="941"/>
+        <source>Max. depth</source>
+        <translation>Maksdybde</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="669"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="943"/>
+        <source>Avg. depth</source>
+        <translation>Snittdybde</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="670"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="975"/>
+        <source>Air temp.</source>
+        <translation>Lufttemp.</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="671"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="977"/>
+        <source>Water temp.</source>
+        <translation>Vanntemp.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="649"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="888"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="672"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="965"/>
         <source>Cyl. size</source>
         <translation>Tankstr.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="650"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="890"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="673"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="967"/>
         <source>Start pressure</source>
         <translation>Starttrykk</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="651"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="892"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="674"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="969"/>
         <source>End pressure</source>
         <translation>Sluttrykk</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="647"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="898"/>
-        <source>Air temp.</source>
-        <translation>Lufttemp.</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="675"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="971"/>
+        <source>O₂</source>
+        <translation>O₂</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="648"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="900"/>
-        <source>Water temp.</source>
-        <translation>Vanntemp.</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="676"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="973"/>
+        <source>He</source>
+        <translation>He</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="677"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="937"/>
+        <source>Location</source>
+        <translation>Sted</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="678"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="939"/>
+        <source>GPS</source>
+        <translation>GPS</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="679"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="945"/>
+        <source>Divemaster</source>
+        <translation>Dykkeleder</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="680"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="947"/>
+        <source>Buddy</source>
+        <translation>Buddy</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="681"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="949"/>
+        <source>Suit</source>
+        <translation>Drakt</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="682"/>
+        <source>Rating</source>
+        <translation>Vurdering</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="683"/>
+        <source>Visibility</source>
+        <translation>Sikt</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="684"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="951"/>
+        <source>Notes</source>
+        <translation>Notater</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="685"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="953"/>
+        <source>Weight</source>
+        <translation>Vekt</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="686"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="955"/>
+        <source>Tags</source>
+        <translation>Emner</translation>
     </message>
 </context>
 <context>
     <name>DiveObjectHelper</name>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="287"/>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="323"/>
         <source>%1 dive(s)</source>
         <translation type="unfinished"/>
     </message>
@@ -2972,18 +3040,18 @@ GPS location:</source>
 <context>
     <name>DivePlanner</name>
     <message>
-        <location filename="../desktop-widgets/diveplanner.ui" line="152"/>
-        <location filename="../build/ui_diveplanner.h" line="190"/>
-        <source>Altitude</source>
-        <translation>Høyde over havet</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/diveplanner.ui" line="109"/>
         <location filename="../build/ui_diveplanner.h" line="189"/>
         <source>Planned dive time</source>
         <translation>Planlagt dykketid</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/diveplanner.ui" line="152"/>
+        <location filename="../build/ui_diveplanner.h" line="190"/>
+        <source>Altitude</source>
+        <translation>Høyde over havet</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/diveplanner.ui" line="159"/>
         <location filename="../build/ui_diveplanner.h" line="191"/>
         <source>ATM pressure</source>
@@ -3017,32 +3085,32 @@ GPS location:</source>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="134"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="136"/>
         <source>unknown</source>
         <translation>ukjent</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="312"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="326"/>
         <source>Final depth</source>
         <translation>Siste dybde</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="314"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="328"/>
         <source>Run time</source>
         <translation>Løpetid</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="316"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="330"/>
         <source>Duration</source>
         <translation>Varighet</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="318"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="332"/>
         <source>Used gas</source>
         <translation>Gassforbruk</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="320"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="334"/>
         <source>CC setpoint</source>
         <translation>CC settpunkt</translation>
     </message>
@@ -3050,22 +3118,22 @@ GPS location:</source>
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="108"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="112"/>
         <source>Dive planner points</source>
         <translation>Punkter i dykkplan</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="112"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="116"/>
         <source>Available gases</source>
         <translation>Tilgjengelige gasser</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="137"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="143"/>
         <source>Add dive data point</source>
         <translation>Legg til punkt</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="146"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="152"/>
         <source>Save new</source>
         <translation>Lagre ny</translation>
     </message>
@@ -3098,11 +3166,36 @@ GPS location:</source>
         <translation>Farge</translation>
     </message>
     <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="124"/>
+        <source>User entered</source>
+        <translation>Brukeren la inn</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="126"/>
+        <source>Cylinder index</source>
+        <translation>Flaskeindeks</translation>
+    </message>
+    <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="128"/>
         <source>Pressure S</source>
         <translation>Trykk S</translation>
     </message>
     <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="130"/>
+        <source>Pressure I</source>
+        <translation>Trykk I</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="132"/>
+        <source>Ceiling</source>
+        <translation>Tak</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="134"/>
+        <source>SAC</source>
+        <translation>SAC</translation>
+    </message>
+    <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="136"/>
         <source>pN₂</source>
         <translation>pN₂</translation>
@@ -3138,49 +3231,24 @@ GPS location:</source>
         <translation>Sensor 3</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="152"/>
-        <source>Heart rate</source>
-        <translation>Hjertefrekvens</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="156"/>
-        <source>Mean depth @ s</source>
-        <translation>Snittdypde @ s</translation>
-    </message>
-    <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="150"/>
         <source>Ambient pressure</source>
         <translation>Omgivelsestrykk</translation>
     </message>
     <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="152"/>
+        <source>Heart rate</source>
+        <translation>Hjertefrekvens</translation>
+    </message>
+    <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="154"/>
         <source>Gradient factor</source>
         <translation>Gradientfaktor</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="130"/>
-        <source>Pressure I</source>
-        <translation>Trykk I</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="124"/>
-        <source>User entered</source>
-        <translation>Brukeren la inn</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="126"/>
-        <source>Cylinder index</source>
-        <translation>Flaskeindeks</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="132"/>
-        <source>Ceiling</source>
-        <translation>Tak</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="134"/>
-        <source>SAC</source>
-        <translation>SAC</translation>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="156"/>
+        <source>Mean depth @ s</source>
+        <translation>Snittdypde @ s</translation>
     </message>
 </context>
 <context>
@@ -3251,311 +3319,315 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="395"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="441"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="434"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="483"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="398"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="444"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="437"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="486"/>
         <source>Date</source>
         <translation>Dato</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="401"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="447"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="440"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="489"/>
         <source>Rating</source>
         <translation>Vurdering</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="404"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="443"/>
         <source>Depth</source>
         <translation>Dybde</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="410"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="446"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="495"/>
+        <source>Duration</source>
+        <translation>Varighet</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="449"/>
         <source>Temp</source>
         <translation>Temp</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="413"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="452"/>
         <source>Weight</source>
         <translation>Vekt</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="425"/>
-        <source>SAC</source>
-        <translation>SAC</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
-        <source>m</source>
-        <translation>m</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
-        <source>ft</source>
-        <translation>ft</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
-        <source>Weight(%1)</source>
-        <translation>Vekt(%1)</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="416"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="462"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="455"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="504"/>
         <source>Suit</source>
         <translation>Drakt</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="419"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="465"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="458"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="507"/>
         <source>Cyl</source>
         <translation>Flaske</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="422"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="468"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="461"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="510"/>
         <source>Gas</source>
         <translation>Gass</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
-        <source>SAC(%1)</source>
-        <translation>SAC(%1)</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="464"/>
+        <source>SAC</source>
+        <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
-        <source>/min</source>
-        <translation>/min</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="467"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="518"/>
+        <source>OTU</source>
+        <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="431"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="479"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="470"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="521"/>
         <source>Max CNS</source>
         <translation>Maks CNS</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="434"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="482"/>
-        <source>Location</source>
-        <translation>Sted</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
+        <source>Photos</source>
+        <translation>Bilder</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
-        <source>kg</source>
-        <translation>kg</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="476"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="527"/>
+        <source>Location</source>
+        <translation>Sted</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="492"/>
         <source>Depth(%1)</source>
         <translation>Dybde(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="407"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="453"/>
-        <source>Duration</source>
-        <translation>Varighet</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="492"/>
+        <source>m</source>
+        <translation>m</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="492"/>
+        <source>ft</source>
+        <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="456"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="498"/>
         <source>Temp(%1%2)</source>
         <translation>Temp(%1%2)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="501"/>
+        <source>Weight(%1)</source>
+        <translation>Vekt(%1)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="501"/>
+        <source>kg</source>
+        <translation>kg</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="501"/>
         <source>lbs</source>
         <translation>pund</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="428"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="476"/>
-        <source>OTU</source>
-        <translation>OTU</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="515"/>
+        <source>SAC(%1)</source>
+        <translation>SAC(%1)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="515"/>
+        <source>/min</source>
+        <translation>/min</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="524"/>
+        <source>Photos before/during/after dive</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="164"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="165"/>
         <source>no dives were selected</source>
         <translation>ingen dykk valgt</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="174"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="175"/>
         <source>stylesheet to export to divelogs.de is not found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="184"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="185"/>
         <source>failed to create zip file for upload: %s</source>
         <translation>klarte ikke å lage zipfil for opplasting: %s</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="236"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="237"/>
         <source>internal error</source>
         <translation>intern feil</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="244"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="245"/>
         <source>Conversion of dive %1 to divelogs.de format failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="272"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="273"/>
         <source>error writing zip file: %s zip error %d system error %d - %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="745"/>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="935"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="936"/>
         <source>Done</source>
         <translation>Ferdig</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="778"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="779"/>
         <source>Uploading dive list...</source>
         <translation>Laster opp liste over dykk...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="810"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="811"/>
         <source>Downloading dive list...</source>
         <translation>Laster ned liste over dykk...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="851"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="852"/>
         <source>Downloading %1 dives...</source>
         <translation>Laster ned %1 dykk...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="885"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="886"/>
         <source>Download finished - %1</source>
         <translation>Nedlasting er ferdig - %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="899"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="900"/>
         <source>Problem with download</source>
         <translation>Kunne ikke laste ned</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="900"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="901"/>
         <source>The archive could not be opened:
 </source>
         <translation>Arkivet kunne ikke åpnes:
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="909"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="910"/>
         <source>Corrupted download</source>
         <translation>Nedlastingen er skadet</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="910"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="911"/>
         <source>The archive could not be opened:
 %1</source>
         <translation>Arkivet kunne ikke åpnes:
 %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="937"/>
+        <source>Upload finished</source>
+        <translation>Opplasting er ferdig</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="950"/>
         <source>Upload failed</source>
         <translation>Opplasting feilet</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="952"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="953"/>
         <source>Upload successful</source>
         <translation>Ferdig å laste opp</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="955"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="956"/>
         <source>Login failed</source>
         <translation>Innlogging feilet</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="958"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="959"/>
         <source>Cannot parse response</source>
         <translation>Kan ikke lese svar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="970"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="971"/>
         <source>Error: %1</source>
         <translation>Feil: %1</translation>
     </message>
-    <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="936"/>
-        <source>Upload finished</source>
-        <translation>Opplasting er ferdig</translation>
-    </message>
 </context>
 <context>
     <name>DownloadFromDCWidget</name>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="185"/>
-        <source>Error</source>
-        <translation>Feil</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="436"/>
-        <source>Retry</source>
-        <translation>Prøv igjen</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="280"/>
-        <source>Find Uemis dive computer</source>
-        <translation>Finn Uemis dykkecomputer</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="101"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="107"/>
         <source>Download</source>
         <translation>Last ned</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="104"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="110"/>
         <source>Choose Bluetooth download mode</source>
         <translation>Velg nedlastingsmåte for Bluetooth</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="382"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="191"/>
+        <source>Error</source>
+        <translation>Feil</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="286"/>
+        <source>Find Uemis dive computer</source>
+        <translation>Finn Uemis dykkecomputer</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="392"/>
         <source>Choose file for divecomputer download logfile</source>
         <translation>Velg fil som loggfil for dykkecomputer</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="383"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="393"/>
         <source>Log files (*.log)</source>
         <translation>Loggfiler (*.log)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="398"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="408"/>
         <source>Warning</source>
         <translation>Advarsel</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="399"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="409"/>
         <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source>
         <translation>Lagring av dump fra libdivecomputer vil IKKE laste ned dykk til dykkeloggen.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="410"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="420"/>
         <source>Choose file for divecomputer binary dump file</source>
         <translation>Velg fil som binærdump fra dykkecomputer</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="411"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="421"/>
         <source>Dump files (*.bin)</source>
         <translation>Dumpfiler (*.bin)</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="446"/>
+        <source>Retry</source>
+        <translation>Prøv igjen</translation>
+    </message>
 </context>
 <context>
     <name>DownloadFromDiveComputer</name>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="139"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="275"/>
-        <source>Vendor</source>
-        <translation>Leverandør</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="14"/>
         <location filename="../build/ui_downloadfromdivecomputer.h" line="265"/>
         <source>Download from dive computer</source>
@@ -3568,17 +3640,6 @@ p, li { white-space: pre-wrap; }
         <translation>Enhet eller disk</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="122"/>
-        <source>Choose Bluetooth download mode</source>
-        <translation>Velg nedlastingsmåte for Bluetooth</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="149"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="276"/>
-        <source>Dive computer</source>
-        <translation>Dykkecomputer</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="66"/>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="101"/>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="115"/>
@@ -3602,11 +3663,46 @@ p, li { white-space: pre-wrap; }
         <translation>Foretrekk alltid nedlastede dykk</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="87"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="270"/>
+        <source>Download into new trip</source>
+        <translation>Last ned til ny tur</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="94"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="271"/>
+        <source>Save libdivecomputer logfile</source>
+        <translation>Lagre loggfil fra libdivecomputer</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="108"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="273"/>
+        <source>Save libdivecomputer dumpfile</source>
+        <translation>Lagre dumpfil fra libdivecomputer</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="122"/>
+        <source>Choose Bluetooth download mode</source>
+        <translation>Velg nedlastingsmåte for Bluetooth</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="129"/>
         <source>Select a remote Bluetooth device.</source>
         <translation>Velg en Bluetooth-enhet.</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="139"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="275"/>
+        <source>Vendor</source>
+        <translation>Leverandør</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="149"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="276"/>
+        <source>Dive computer</source>
+        <translation>Dykkecomputer</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/>
         <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="52"/>
         <location filename="../build/ui_downloadfromdivecomputer.h" line="277"/>
@@ -3614,18 +3710,6 @@ p, li { white-space: pre-wrap; }
         <translation>Last ned</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="284"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="281"/>
-        <source>OK</source>
-        <translation>OK</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="291"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="282"/>
-        <source>Cancel</source>
-        <translation>Avbryt</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="226"/>
         <location filename="../build/ui_downloadfromdivecomputer.h" line="278"/>
         <source>Downloaded dives</source>
@@ -3644,22 +3728,16 @@ p, li { white-space: pre-wrap; }
         <translation>Velg vekk alle</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="94"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="271"/>
-        <source>Save libdivecomputer logfile</source>
-        <translation>Lagre loggfil fra libdivecomputer</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="108"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="273"/>
-        <source>Save libdivecomputer dumpfile</source>
-        <translation>Lagre dumpfil fra libdivecomputer</translation>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="284"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="281"/>
+        <source>OK</source>
+        <translation>OK</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="87"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="270"/>
-        <source>Download into new trip</source>
-        <translation>Last ned til ny tur</translation>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="291"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="282"/>
+        <source>Cancel</source>
+        <translation>Avbryt</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="16"/>
@@ -3749,12 +3827,12 @@ p, li { white-space: pre-wrap; }
         <translation>Koble til facebook teksteksempel</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="297"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="242"/>
         <source>To disconnect Subsurface from your Facebook account, use the button below</source>
         <translation>Bruk knappen under for å koble Subsurface fra Facebook</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="306"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="251"/>
         <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source>
         <translation>Logg inn for å koble til Facebook. Dette gjør at Subsurface kan poste dykk på veggen din</translation>
     </message>
@@ -3762,22 +3840,22 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>FacebookManager</name>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="266"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="211"/>
         <source>Photo upload sucessfull</source>
         <translation>Lastet opp bilde</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="267"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="212"/>
         <source>Your dive profile was updated to Facebook.</source>
         <translation>Dykkeprofilen din ble oppdatert på Facebook.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="271"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="216"/>
         <source>Photo upload failed</source>
         <translation>Fotoopplasting feilet</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="272"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="217"/>
         <source>Your dive profile was not updated to Facebook, 
  please send the following to the developer. 
 </source>
@@ -3839,17 +3917,25 @@ send gjerne følgende til utvikleren.
 <context>
     <name>FirmwareUpdateThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1750"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1739"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Denne funksjonen er ikke tilgjengelig for den valgte computeren.</translation>
     </message>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1755"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1744"/>
         <source>Firmware update failed!</source>
         <translation>Kunne ikke oppdatere firmware!</translation>
     </message>
 </context>
 <context>
+    <name>GlobalDrawer</name>
+    <message>
+        <location filename="../mobile-widgets/qml/kirigami/src/controls/GlobalDrawer.qml" line="364"/>
+        <source>Back</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>GlobeGPS</name>
     <message>
         <location filename="../desktop-widgets/globe.cpp" line="124"/>
@@ -3865,27 +3951,27 @@ send gjerne følgende til utvikleren.
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="40"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="32"/>
         <source>Date: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="50"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="42"/>
         <source>Name: </source>
         <translation>Navn:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="60"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="52"/>
         <source>Latitude: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="69"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="61"/>
         <source>Longitude: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="113"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="105"/>
         <source>List of stored GPS fixes</source>
         <translation type="unfinished"/>
     </message>
@@ -3914,7 +4000,7 @@ send gjerne følgende til utvikleren.
 <context>
     <name>LocationFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="648"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="646"/>
         <source>Location: </source>
         <translation>Sted:</translation>
     </message>
@@ -3955,7 +4041,7 @@ send gjerne følgende til utvikleren.
 <context>
     <name>LocationFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="299"/>
+        <location filename="../qt-models/filtermodels.cpp" line="304"/>
         <source>No location set</source>
         <translation>Ingen sted er satt</translation>
     </message>
@@ -4077,20 +4163,55 @@ Er du sikker på at du vil fortsette?</translation>
     </message>
 </context>
 <context>
-    <name>MainForm.ui</name>
+    <name>MainTab</name>
     <message>
-        <location filename="../packaging/ios/Subsurface-mobile/MainForm.ui.qml" line="17"/>
-        <source>Press Me 1</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/maintab.ui" line="18"/>
+        <location filename="../desktop-widgets/maintab.ui" line="439"/>
+        <location filename="../build/ui_maintab.h" line="961"/>
+        <location filename="../build/ui_maintab.h" line="963"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="539"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="571"/>
+        <source>Notes</source>
+        <translation>Notater</translation>
     </message>
     <message>
-        <location filename="../packaging/ios/Subsurface-mobile/MainForm.ui.qml" line="22"/>
-        <source>Press Me 2</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/maintab.ui" line="21"/>
+        <location filename="../build/ui_maintab.h" line="964"/>
+        <source>General notes about the current selection</source>
+        <translation>Notater om det som er valgt</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="92"/>
+        <location filename="../desktop-widgets/maintab.ui" line="646"/>
+        <location filename="../build/ui_maintab.h" line="947"/>
+        <location filename="../build/ui_maintab.h" line="967"/>
+        <source>Date</source>
+        <translation>Dato</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="102"/>
+        <location filename="../build/ui_maintab.h" line="948"/>
+        <source>Time</source>
+        <translation>Tid</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="112"/>
+        <location filename="../desktop-widgets/maintab.ui" line="836"/>
+        <location filename="../build/ui_maintab.h" line="949"/>
+        <location filename="../build/ui_maintab.h" line="987"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="306"/>
+        <source>Air temp.</source>
+        <translation>Lufttemp.</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="122"/>
+        <location filename="../desktop-widgets/maintab.ui" line="855"/>
+        <location filename="../build/ui_maintab.h" line="950"/>
+        <location filename="../build/ui_maintab.h" line="989"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="307"/>
+        <source>Water temp.</source>
+        <translation>Vanntemp.</translation>
     </message>
-</context>
-<context>
-    <name>MainTab</name>
     <message>
         <location filename="../desktop-widgets/maintab.ui" line="184"/>
         <location filename="../build/ui_maintab.h" line="951"/>
@@ -4099,6 +4220,17 @@ Er du sikker på at du vil fortsette?</translation>
         <translation>Sted</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="214"/>
+        <source>Edit dive site</source>
+        <translation>Rediger dykkested</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="217"/>
+        <location filename="../build/ui_maintab.h" line="953"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="252"/>
         <location filename="../build/ui_maintab.h" line="954"/>
         <source>Divemaster</source>
@@ -4111,12 +4243,6 @@ Er du sikker på at du vil fortsette?</translation>
         <translation>Buddy</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.ui" line="387"/>
-        <location filename="../build/ui_maintab.h" line="959"/>
-        <source>Tags</source>
-        <translation>Emner</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/maintab.ui" line="308"/>
         <location filename="../build/ui_maintab.h" line="956"/>
         <source>Rating</source>
@@ -4135,57 +4261,18 @@ Er du sikker på at du vil fortsette?</translation>
         <translation>Drakt</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="387"/>
+        <location filename="../build/ui_maintab.h" line="959"/>
+        <source>Tags</source>
+        <translation>Emner</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="397"/>
         <location filename="../build/ui_maintab.h" line="960"/>
         <source>Dive mode</source>
         <translation>Dykkemodus</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.ui" line="112"/>
-        <location filename="../desktop-widgets/maintab.ui" line="836"/>
-        <location filename="../build/ui_maintab.h" line="949"/>
-        <location filename="../build/ui_maintab.h" line="987"/>
-        <location filename="../desktop-widgets/maintab.cpp" line="306"/>
-        <source>Air temp.</source>
-        <translation>Lufttemp.</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="122"/>
-        <location filename="../desktop-widgets/maintab.ui" line="855"/>
-        <location filename="../build/ui_maintab.h" line="950"/>
-        <location filename="../build/ui_maintab.h" line="989"/>
-        <location filename="../desktop-widgets/maintab.cpp" line="307"/>
-        <source>Water temp.</source>
-        <translation>Vanntemp.</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="18"/>
-        <location filename="../desktop-widgets/maintab.ui" line="439"/>
-        <location filename="../build/ui_maintab.h" line="961"/>
-        <location filename="../build/ui_maintab.h" line="963"/>
-        <location filename="../desktop-widgets/maintab.cpp" line="539"/>
-        <location filename="../desktop-widgets/maintab.cpp" line="571"/>
-        <source>Notes</source>
-        <translation>Notater</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="21"/>
-        <location filename="../build/ui_maintab.h" line="964"/>
-        <source>General notes about the current selection</source>
-        <translation>Notater om det som er valgt</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="214"/>
-        <source>Edit dive site</source>
-        <translation>Rediger dykkested</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="217"/>
-        <location filename="../build/ui_maintab.h" line="953"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/maintab.ui" line="491"/>
         <location filename="../build/ui_maintab.h" line="965"/>
         <source>Equipment</source>
@@ -4210,6 +4297,12 @@ Er du sikker på at du vil fortsette?</translation>
         <translation>Dykkeinformasjon</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="665"/>
+        <location filename="../build/ui_maintab.h" line="969"/>
+        <source>Interval</source>
+        <translation>Overflateintervall</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="684"/>
         <location filename="../build/ui_maintab.h" line="971"/>
         <source>Gases used</source>
@@ -4222,18 +4315,38 @@ Er du sikker på at du vil fortsette?</translation>
         <translation>Gassforbruk</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="722"/>
+        <location filename="../desktop-widgets/maintab.ui" line="1094"/>
+        <location filename="../build/ui_maintab.h" line="975"/>
+        <location filename="../build/ui_maintab.h" line="1003"/>
+        <source>SAC</source>
+        <translation>SAC</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="741"/>
         <location filename="../build/ui_maintab.h" line="977"/>
         <source>CNS</source>
         <translation>CNS</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="760"/>
+        <location filename="../build/ui_maintab.h" line="979"/>
+        <source>OTU</source>
+        <translation>OTU</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="779"/>
         <location filename="../build/ui_maintab.h" line="981"/>
         <source>Max. depth</source>
         <translation>Maksdybde</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="798"/>
+        <location filename="../build/ui_maintab.h" line="983"/>
+        <source>Avg. depth</source>
+        <translation>Snittdybde</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="817"/>
         <location filename="../build/ui_maintab.h" line="985"/>
         <source>Air pressure</source>
@@ -4246,82 +4359,6 @@ Er du sikker på at du vil fortsette?</translation>
         <translation>Varighet</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.ui" line="933"/>
-        <location filename="../build/ui_maintab.h" line="1007"/>
-        <source>Simple statistics about the selection</source>
-        <translation>Statistikk om det som er valgt</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1039"/>
-        <location filename="../build/ui_maintab.h" line="999"/>
-        <source>Total time</source>
-        <translation>Totaltid</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1106"/>
-        <location filename="../build/ui_maintab.h" line="1004"/>
-        <source>Gas consumption</source>
-        <translation>Gassforbruk</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1151"/>
-        <location filename="../build/ui_maintab.h" line="1009"/>
-        <source>All photos from the current selection</source>
-        <translation>Alle bilder i det som er valgt</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1177"/>
-        <location filename="../build/ui_maintab.h" line="1010"/>
-        <source>Extra data</source>
-        <translation>Ekstra data</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1180"/>
-        <location filename="../build/ui_maintab.h" line="1011"/>
-        <source>Adittional data from the dive computer</source>
-        <translation>Ekstra data fra dykkecomputeren</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="92"/>
-        <location filename="../desktop-widgets/maintab.ui" line="646"/>
-        <location filename="../build/ui_maintab.h" line="947"/>
-        <location filename="../build/ui_maintab.h" line="967"/>
-        <source>Date</source>
-        <translation>Dato</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="102"/>
-        <location filename="../build/ui_maintab.h" line="948"/>
-        <source>Time</source>
-        <translation>Tid</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="665"/>
-        <location filename="../build/ui_maintab.h" line="969"/>
-        <source>Interval</source>
-        <translation>Overflateintervall</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="722"/>
-        <location filename="../desktop-widgets/maintab.ui" line="1094"/>
-        <location filename="../build/ui_maintab.h" line="975"/>
-        <location filename="../build/ui_maintab.h" line="1003"/>
-        <source>SAC</source>
-        <translation>SAC</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="798"/>
-        <location filename="../build/ui_maintab.h" line="983"/>
-        <source>Avg. depth</source>
-        <translation>Snittdybde</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="760"/>
-        <location filename="../build/ui_maintab.h" line="979"/>
-        <source>OTU</source>
-        <translation>OTU</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/maintab.ui" line="893"/>
         <location filename="../build/ui_maintab.h" line="993"/>
         <source>Salinity</source>
@@ -4334,22 +4371,34 @@ Er du sikker på at du vil fortsette?</translation>
         <translation>Statistikk</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="933"/>
+        <location filename="../build/ui_maintab.h" line="1007"/>
+        <source>Simple statistics about the selection</source>
+        <translation>Statistikk om det som er valgt</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="986"/>
         <location filename="../build/ui_maintab.h" line="996"/>
         <source>Depth</source>
         <translation>Dybde</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="998"/>
+        <location filename="../build/ui_maintab.h" line="997"/>
+        <source>Duration</source>
+        <translation>Varighet</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="1027"/>
         <location filename="../build/ui_maintab.h" line="998"/>
         <source>Temperature</source>
         <translation>Temperatur</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.ui" line="998"/>
-        <location filename="../build/ui_maintab.h" line="997"/>
-        <source>Duration</source>
-        <translation>Varighet</translation>
+        <location filename="../desktop-widgets/maintab.ui" line="1039"/>
+        <location filename="../build/ui_maintab.h" line="999"/>
+        <source>Total time</source>
+        <translation>Totaltid</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/maintab.ui" line="1058"/>
@@ -4358,20 +4407,34 @@ Er du sikker på at du vil fortsette?</translation>
         <translation>Dykk</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="1106"/>
+        <location filename="../build/ui_maintab.h" line="1004"/>
+        <source>Gas consumption</source>
+        <translation>Gassforbruk</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="1148"/>
         <location filename="../build/ui_maintab.h" line="1008"/>
         <source>Photos</source>
         <translation>Bilder</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.cpp" line="88"/>
-        <source>Cylinders</source>
-        <translation>Flasker</translation>
+        <location filename="../desktop-widgets/maintab.ui" line="1151"/>
+        <location filename="../build/ui_maintab.h" line="1009"/>
+        <source>All photos from the current selection</source>
+        <translation>Alle bilder i det som er valgt</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.cpp" line="92"/>
-        <source>Weights</source>
-        <translation>Vekter</translation>
+        <location filename="../desktop-widgets/maintab.ui" line="1177"/>
+        <location filename="../build/ui_maintab.h" line="1010"/>
+        <source>Extra data</source>
+        <translation>Ekstra data</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="1180"/>
+        <location filename="../build/ui_maintab.h" line="1011"/>
+        <source>Adittional data from the dive computer</source>
+        <translation>Ekstra data fra dykkecomputeren</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/maintab.cpp" line="63"/>
@@ -4384,11 +4447,21 @@ Er du sikker på at du vil fortsette?</translation>
         <translation>Forkast endringene</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.cpp" line="88"/>
+        <source>Cylinders</source>
+        <translation>Flasker</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.cpp" line="89"/>
         <source>Add cylinder</source>
         <translation>Legg til flaske</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.cpp" line="92"/>
+        <source>Weights</source>
+        <translation>Vekter</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.cpp" line="93"/>
         <source>Add weight system</source>
         <translation>Legg til vektsystem</translation>
@@ -4581,659 +4654,685 @@ fra luft og bruker:
         <translation>&amp;Fil</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="455"/>
-        <location filename="../build/ui_mainwindow.h" line="534"/>
-        <source>Export dive logs</source>
-        <translation>Eksporter dykkelogger</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="510"/>
-        <location filename="../build/ui_mainwindow.h" line="542"/>
-        <source>Toggle pHe graph</source>
-        <translation>Skru pHe-graf av/på</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="546"/>
-        <location filename="../build/ui_mainwindow.h" line="545"/>
-        <source>Toggle calculating all tissues</source>
-        <translation>Skru av/på utregning av vev</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="522"/>
-        <location filename="../build/ui_mainwindow.h" line="543"/>
-        <source>Toggle DC reported ceiling</source>
-        <translation>Skru av/på dekograf fra computer</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="534"/>
-        <location filename="../build/ui_mainwindow.h" line="544"/>
-        <source>Toggle calculated ceiling</source>
-        <translation>Skru av/på dekograf</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="606"/>
-        <location filename="../build/ui_mainwindow.h" line="550"/>
-        <source>Toggle NDL, TTS</source>
-        <translation>Skru av/på NDL, TTS</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="558"/>
-        <location filename="../build/ui_mainwindow.h" line="546"/>
-        <source>Toggle calculated ceiling with 3m increments</source>
-        <translation>Skru av/på 3m-inkrementer for dekotak</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="463"/>
-        <location filename="../build/ui_mainwindow.h" line="537"/>
-        <source>Configure &amp;dive computer</source>
-        <translation>Konfigurer &amp;dykkecomputer</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="570"/>
-        <location filename="../build/ui_mainwindow.h" line="547"/>
-        <source>Toggle heart rate</source>
-        <translation>Skru av/på hjertefrekvens</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="582"/>
-        <location filename="../build/ui_mainwindow.h" line="548"/>
-        <source>Toggle MOD</source>
-        <translation>Skru av/på MOD</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="594"/>
-        <location filename="../build/ui_mainwindow.h" line="549"/>
-        <source>Toggle EAD, END, EADD</source>
-        <translation>Skru av/på EAD, END, EADD</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="618"/>
-        <location filename="../build/ui_mainwindow.h" line="551"/>
-        <source>Toggle SAC rate</source>
-        <translation>Skru av/på SAC</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="630"/>
-        <location filename="../build/ui_mainwindow.h" line="552"/>
-        <source>Toggle ruler</source>
-        <translation>Skru av/på linjal</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="86"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="87"/>
         <location filename="../build/ui_mainwindow.h" line="569"/>
         <source>&amp;Log</source>
         <translation>&amp;Logg</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="105"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="104"/>
         <location filename="../build/ui_mainwindow.h" line="570"/>
         <source>&amp;View</source>
         <translation>&amp;Vis</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="121"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="120"/>
         <location filename="../build/ui_mainwindow.h" line="571"/>
         <source>&amp;Help</source>
         <translation>&amp;Hjelp</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="130"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="129"/>
         <location filename="../build/ui_mainwindow.h" line="572"/>
         <source>&amp;Import</source>
         <translation>&amp;Importer</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="139"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="138"/>
         <location filename="../build/ui_mainwindow.h" line="573"/>
         <source>&amp;Edit</source>
         <translation>R&amp;ediger</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="144"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="143"/>
         <source>Share on</source>
         <translation>Del på</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="158"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="157"/>
         <location filename="../build/ui_mainwindow.h" line="453"/>
         <source>&amp;New logbook</source>
         <translation>&amp;Ny loggbok</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="161"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="160"/>
         <location filename="../build/ui_mainwindow.h" line="455"/>
         <source>New</source>
         <translation>Ny</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="164"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="163"/>
         <location filename="../build/ui_mainwindow.h" line="457"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="169"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="168"/>
         <location filename="../build/ui_mainwindow.h" line="458"/>
         <source>&amp;Open logbook</source>
         <translation>Åpne l&amp;oggbok</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="172"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="171"/>
         <location filename="../build/ui_mainwindow.h" line="460"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="508"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="502"/>
         <source>Open</source>
         <translation>Åpne</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="175"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="174"/>
         <location filename="../build/ui_mainwindow.h" line="462"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="180"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="179"/>
         <location filename="../build/ui_mainwindow.h" line="463"/>
         <source>&amp;Save</source>
         <translation>Lagre</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="183"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="182"/>
         <location filename="../build/ui_mainwindow.h" line="465"/>
         <source>Save</source>
         <translation>Lagre</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="186"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="185"/>
         <location filename="../build/ui_mainwindow.h" line="467"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="191"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="190"/>
         <location filename="../build/ui_mainwindow.h" line="468"/>
         <source>Sa&amp;ve as</source>
         <translation>Lagre som</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="194"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="193"/>
         <location filename="../build/ui_mainwindow.h" line="470"/>
         <source>Save as</source>
         <translation>Lagre som</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="197"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="196"/>
         <location filename="../build/ui_mainwindow.h" line="472"/>
         <source>Ctrl+Shift+S</source>
         <translation>Ctrl+Shift+S</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="202"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="201"/>
         <location filename="../build/ui_mainwindow.h" line="473"/>
         <source>&amp;Close</source>
         <translation>Lukk</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="205"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="204"/>
         <location filename="../build/ui_mainwindow.h" line="475"/>
         <source>Close</source>
         <translation>Lukk</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="208"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="207"/>
         <location filename="../build/ui_mainwindow.h" line="477"/>
         <source>Ctrl+W</source>
         <translation>Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="221"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="212"/>
+        <location filename="../build/ui_mainwindow.h" line="478"/>
+        <source>&amp;Print</source>
+        <translation>Skriv ut</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="215"/>
+        <location filename="../build/ui_mainwindow.h" line="479"/>
+        <source>Ctrl+P</source>
+        <translation>Ctrl+P</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="220"/>
         <location filename="../build/ui_mainwindow.h" line="480"/>
         <source>P&amp;references</source>
         <translation>Valg</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="251"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="223"/>
+        <location filename="../build/ui_mainwindow.h" line="481"/>
+        <source>Ctrl+,</source>
+        <translation>Ctrl+,</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="231"/>
+        <location filename="../build/ui_mainwindow.h" line="482"/>
+        <source>&amp;Quit</source>
+        <translation>Avslutt</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="234"/>
+        <location filename="../build/ui_mainwindow.h" line="483"/>
+        <source>Ctrl+Q</source>
+        <translation>Ctrl+Q</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="242"/>
+        <location filename="../build/ui_mainwindow.h" line="484"/>
+        <source>Import from &amp;dive computer</source>
+        <translation>Importer fra &amp;dykkecomputer</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="245"/>
+        <location filename="../build/ui_mainwindow.h" line="485"/>
+        <source>Ctrl+D</source>
+        <translation>Ctrl+D</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="250"/>
         <location filename="../build/ui_mainwindow.h" line="486"/>
         <source>Import &amp;GPS data from Subsurface web service</source>
         <translation>Importer &amp;GPS-data fra Subsurface webtjeneste</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="259"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="253"/>
+        <location filename="../build/ui_mainwindow.h" line="487"/>
+        <source>Ctrl+G</source>
+        <translation>Ctrl+G</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="258"/>
         <location filename="../build/ui_mainwindow.h" line="488"/>
         <source>Edit device &amp;names</source>
         <translation>Rediger device&amp;navn</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="272"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="263"/>
+        <location filename="../build/ui_mainwindow.h" line="489"/>
+        <source>&amp;Add dive</source>
+        <translation>Legg til dykk</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="266"/>
+        <location filename="../build/ui_mainwindow.h" line="490"/>
+        <source>Ctrl++</source>
+        <translation>Ctrl++</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="271"/>
         <location filename="../build/ui_mainwindow.h" line="491"/>
         <source>&amp;Edit dive</source>
         <translation>R&amp;ediger dykk</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="277"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="276"/>
         <location filename="../build/ui_mainwindow.h" line="492"/>
         <source>&amp;Copy dive components</source>
         <translation>Kopier dykkekomponenter</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="280"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="279"/>
         <location filename="../build/ui_mainwindow.h" line="493"/>
         <source>Ctrl+C</source>
         <translation>Ctrl+C</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="285"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="284"/>
         <location filename="../build/ui_mainwindow.h" line="494"/>
         <source>&amp;Paste dive components</source>
         <translation>Lim inn dykkekomponenter</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="288"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="287"/>
         <location filename="../build/ui_mainwindow.h" line="495"/>
         <source>Ctrl+V</source>
         <translation>Ctrl+V</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="325"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="292"/>
+        <location filename="../build/ui_mainwindow.h" line="496"/>
+        <source>&amp;Renumber</source>
+        <translation>Nummere&amp;r på nytt</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="295"/>
+        <location filename="../build/ui_mainwindow.h" line="497"/>
+        <source>Ctrl+R</source>
+        <translation>Ctrl+R</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="303"/>
+        <location filename="../build/ui_mainwindow.h" line="498"/>
+        <source>Auto &amp;group</source>
+        <translation>Auto&amp;grupper</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="308"/>
+        <location filename="../build/ui_mainwindow.h" line="499"/>
+        <source>&amp;Yearly statistics</source>
+        <translation>Årsstatistikk</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="311"/>
+        <location filename="../build/ui_mainwindow.h" line="500"/>
+        <source>Ctrl+Y</source>
+        <translation>Ctrl+Y</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="316"/>
+        <location filename="../build/ui_mainwindow.h" line="501"/>
+        <source>&amp;Dive list</source>
+        <translation>&amp;Dykkeliste</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="319"/>
+        <location filename="../build/ui_mainwindow.h" line="502"/>
+        <source>Ctrl+2</source>
+        <translation>Ctrl+2</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="324"/>
         <location filename="../build/ui_mainwindow.h" line="503"/>
         <source>&amp;Profile</source>
         <translation>&amp;Profil</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="333"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="327"/>
+        <location filename="../build/ui_mainwindow.h" line="504"/>
+        <source>Ctrl+3</source>
+        <translation>Ctrl+3</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="332"/>
         <location filename="../build/ui_mainwindow.h" line="505"/>
         <source>&amp;Info</source>
         <translation>&amp;Info</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="341"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="335"/>
+        <location filename="../build/ui_mainwindow.h" line="506"/>
+        <source>Ctrl+4</source>
+        <translation>Ctrl+4</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="340"/>
         <location filename="../build/ui_mainwindow.h" line="507"/>
         <source>&amp;All</source>
         <translation>&amp;Alle</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="357"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="343"/>
+        <location filename="../build/ui_mainwindow.h" line="508"/>
+        <source>Ctrl+1</source>
+        <translation>Ctrl+1</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="348"/>
+        <location filename="../build/ui_mainwindow.h" line="509"/>
+        <source>P&amp;revious DC</source>
+        <translation>Fo&amp;rrige computer</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="351"/>
+        <location filename="../build/ui_mainwindow.h" line="510"/>
+        <source>Left</source>
+        <translation>Venstre</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="356"/>
         <location filename="../build/ui_mainwindow.h" line="511"/>
         <source>&amp;Next DC</source>
         <translation>&amp;Neste computer</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="365"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="359"/>
+        <location filename="../build/ui_mainwindow.h" line="512"/>
+        <source>Right</source>
+        <translation>Høyre</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="364"/>
         <location filename="../build/ui_mainwindow.h" line="513"/>
         <source>&amp;About Subsurface</source>
         <translation>Om Subsurf&amp;ace</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="381"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="372"/>
+        <location filename="../build/ui_mainwindow.h" line="514"/>
+        <source>User &amp;manual</source>
+        <translation>Bruker&amp;manual</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="375"/>
+        <location filename="../build/ui_mainwindow.h" line="515"/>
+        <source>F1</source>
+        <translation>F1</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="380"/>
         <location filename="../build/ui_mainwindow.h" line="516"/>
         <source>&amp;Globe</source>
         <translation>&amp;Globus</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="403"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="383"/>
+        <location filename="../build/ui_mainwindow.h" line="517"/>
+        <source>Ctrl+5</source>
+        <translation>Ctrl+5</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="388"/>
+        <location filename="../build/ui_mainwindow.h" line="518"/>
+        <source>P&amp;lan dive</source>
+        <translation>P&amp;lanlegg dykk</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="391"/>
+        <location filename="../build/ui_mainwindow.h" line="519"/>
+        <source>Ctrl+L</source>
+        <translation>Ctrl+L</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="396"/>
+        <location filename="../build/ui_mainwindow.h" line="520"/>
+        <source>&amp;Import log files</source>
+        <translation>&amp;Importer loggfiler</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="399"/>
+        <location filename="../build/ui_mainwindow.h" line="522"/>
+        <source>Import divelog files from other applications</source>
+        <translation>Importer dykkelogg fra andre programmer</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="402"/>
         <location filename="../build/ui_mainwindow.h" line="524"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="408"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="407"/>
         <location filename="../build/ui_mainwindow.h" line="525"/>
         <source>Import &amp;from divelogs.de</source>
         <translation>Importer &amp;fra divelogs.de</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="416"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="415"/>
         <location filename="../build/ui_mainwindow.h" line="526"/>
         <source>&amp;Full screen</source>
         <translation>&amp;Fullskjerm</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="419"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="418"/>
         <location filename="../build/ui_mainwindow.h" line="528"/>
         <source>Toggle full screen</source>
         <translation>Fullskjerm av/på</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="447"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="421"/>
+        <location filename="../build/ui_mainwindow.h" line="530"/>
+        <source>F11</source>
+        <translation>F11</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="446"/>
         <location filename="../build/ui_mainwindow.h" line="531"/>
         <source>&amp;Check for updates</source>
         <translation>Se etter oppdateringer</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="452"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="451"/>
         <location filename="../build/ui_mainwindow.h" line="532"/>
         <source>&amp;Export</source>
         <translation>&amp;Eksport</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="458"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="454"/>
+        <location filename="../build/ui_mainwindow.h" line="534"/>
+        <source>Export dive logs</source>
+        <translation>Eksporter dykkelogger</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="457"/>
         <location filename="../build/ui_mainwindow.h" line="536"/>
         <source>Ctrl+E</source>
         <translation>Ctrl+E</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="466"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="462"/>
+        <location filename="../build/ui_mainwindow.h" line="537"/>
+        <source>Configure &amp;dive computer</source>
+        <translation>Konfigurer &amp;dykkecomputer</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="465"/>
         <location filename="../build/ui_mainwindow.h" line="538"/>
         <source>Ctrl+Shift+C</source>
         <translation>Ctrl+Shift+C</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="474"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="473"/>
         <location filename="../build/ui_mainwindow.h" line="539"/>
         <source>Edit &amp;dive in planner</source>
         <translation>Rediger &amp;dykk i planlegger</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="486"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="485"/>
         <location filename="../build/ui_mainwindow.h" line="540"/>
         <source>Toggle pO₂ graph</source>
         <translation>Skru av/på pO₂-graf</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="498"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="497"/>
         <location filename="../build/ui_mainwindow.h" line="541"/>
         <source>Toggle pN₂ graph</source>
         <translation>Skru av/på  pN₂-graf</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="642"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="509"/>
+        <location filename="../build/ui_mainwindow.h" line="542"/>
+        <source>Toggle pHe graph</source>
+        <translation>Skru pHe-graf av/på</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="521"/>
+        <location filename="../build/ui_mainwindow.h" line="543"/>
+        <source>Toggle DC reported ceiling</source>
+        <translation>Skru av/på dekograf fra computer</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="533"/>
+        <location filename="../build/ui_mainwindow.h" line="544"/>
+        <source>Toggle calculated ceiling</source>
+        <translation>Skru av/på dekograf</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="545"/>
+        <location filename="../build/ui_mainwindow.h" line="545"/>
+        <source>Toggle calculating all tissues</source>
+        <translation>Skru av/på utregning av vev</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="557"/>
+        <location filename="../build/ui_mainwindow.h" line="546"/>
+        <source>Toggle calculated ceiling with 3m increments</source>
+        <translation>Skru av/på 3m-inkrementer for dekotak</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="569"/>
+        <location filename="../build/ui_mainwindow.h" line="547"/>
+        <source>Toggle heart rate</source>
+        <translation>Skru av/på hjertefrekvens</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="581"/>
+        <location filename="../build/ui_mainwindow.h" line="548"/>
+        <source>Toggle MOD</source>
+        <translation>Skru av/på MOD</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="593"/>
+        <location filename="../build/ui_mainwindow.h" line="549"/>
+        <source>Toggle EAD, END, EADD</source>
+        <translation>Skru av/på EAD, END, EADD</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="605"/>
+        <location filename="../build/ui_mainwindow.h" line="550"/>
+        <source>Toggle NDL, TTS</source>
+        <translation>Skru av/på NDL, TTS</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="617"/>
+        <location filename="../build/ui_mainwindow.h" line="551"/>
+        <source>Toggle SAC rate</source>
+        <translation>Skru av/på SAC</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="629"/>
+        <location filename="../build/ui_mainwindow.h" line="552"/>
+        <source>Toggle ruler</source>
+        <translation>Skru av/på linjal</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="641"/>
         <location filename="../build/ui_mainwindow.h" line="553"/>
         <source>Scale graph</source>
         <translation>Skaler graf</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="654"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="653"/>
         <location filename="../build/ui_mainwindow.h" line="554"/>
         <source>Toggle pictures</source>
         <translation>Skru av/på bilder</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="666"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="665"/>
         <location filename="../build/ui_mainwindow.h" line="555"/>
         <source>Toggle tank bar</source>
         <translation>Skru av/på tank-linjen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="674"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="673"/>
         <location filename="../build/ui_mainwindow.h" line="556"/>
         <source>&amp;Filter divelist</source>
         <translation>&amp;Filtrer dykkeliste</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="689"/>
-        <location filename="../build/ui_mainwindow.h" line="558"/>
-        <source>Toggle tissue graph</source>
-        <translation>Skru av/på vev-graf</translation>
+        <location filename="../desktop-widgets/mainwindow.ui" line="676"/>
+        <location filename="../build/ui_mainwindow.h" line="557"/>
+        <source>Ctrl+F</source>
+        <translation>Ctrl+F</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="688"/>
+        <source>Toggle tissue heat-map</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="694"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="693"/>
         <location filename="../build/ui_mainwindow.h" line="559"/>
         <source>User &amp;survey</source>
         <translation>Brukerunder&amp;søkelse</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="699"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="698"/>
         <location filename="../build/ui_mainwindow.h" line="560"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="238"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="231"/>
         <source>&amp;Undo</source>
         <translation>Angre</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="702"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="701"/>
         <location filename="../build/ui_mainwindow.h" line="561"/>
         <source>Ctrl+Z</source>
         <translation>Ctrl+Z</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="707"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="706"/>
         <location filename="../build/ui_mainwindow.h" line="562"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="239"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="232"/>
         <source>&amp;Redo</source>
         <translation>Gjør om</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="710"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="709"/>
         <location filename="../build/ui_mainwindow.h" line="563"/>
         <source>Ctrl+Shift+Z</source>
         <translation>Ctrl+Shift+Z</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="715"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="714"/>
         <location filename="../build/ui_mainwindow.h" line="564"/>
         <source>&amp;Find moved images</source>
         <translation>&amp;Finn bilder som er flyttet</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="720"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="719"/>
         <source>Open c&amp;loud storage</source>
         <translation>Åpne skylager</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="725"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="724"/>
         <source>Save to clo&amp;ud storage</source>
         <translation>Lagre til skylager</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="730"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="729"/>
         <location filename="../build/ui_mainwindow.h" line="567"/>
         <source>&amp;Manage dive sites</source>
         <translation>Dykkestedsdatabase</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="735"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="734"/>
         <source>Dive Site &amp;Edit</source>
         <translation>R&amp;ediger dykkested</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="740"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="739"/>
         <source>Facebook</source>
         <translation>Facebook</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="745"/>
-        <source>Add GPS location here</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="744"/>
+        <source>Take cloud storage online</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="677"/>
-        <location filename="../build/ui_mainwindow.h" line="557"/>
-        <source>Ctrl+F</source>
-        <translation>Ctrl+F</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="213"/>
-        <location filename="../build/ui_mainwindow.h" line="478"/>
-        <source>&amp;Print</source>
-        <translation>Skriv ut</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="224"/>
-        <location filename="../build/ui_mainwindow.h" line="481"/>
-        <source>Ctrl+,</source>
-        <translation>Ctrl+,</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="232"/>
-        <location filename="../build/ui_mainwindow.h" line="482"/>
-        <source>&amp;Quit</source>
-        <translation>Avslutt</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="243"/>
-        <location filename="../build/ui_mainwindow.h" line="484"/>
-        <source>Import from &amp;dive computer</source>
-        <translation>Importer fra &amp;dykkecomputer</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="254"/>
-        <location filename="../build/ui_mainwindow.h" line="487"/>
-        <source>Ctrl+G</source>
-        <translation>Ctrl+G</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="267"/>
-        <location filename="../build/ui_mainwindow.h" line="490"/>
-        <source>Ctrl++</source>
-        <translation>Ctrl++</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="293"/>
-        <location filename="../build/ui_mainwindow.h" line="496"/>
-        <source>&amp;Renumber</source>
-        <translation>Nummere&amp;r på nytt</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="296"/>
-        <location filename="../build/ui_mainwindow.h" line="497"/>
-        <source>Ctrl+R</source>
-        <translation>Ctrl+R</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="312"/>
-        <location filename="../build/ui_mainwindow.h" line="500"/>
-        <source>Ctrl+Y</source>
-        <translation>Ctrl+Y</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="392"/>
-        <location filename="../build/ui_mainwindow.h" line="519"/>
-        <source>Ctrl+L</source>
-        <translation>Ctrl+L</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="216"/>
-        <location filename="../build/ui_mainwindow.h" line="479"/>
-        <source>Ctrl+P</source>
-        <translation>Ctrl+P</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="235"/>
-        <location filename="../build/ui_mainwindow.h" line="483"/>
-        <source>Ctrl+Q</source>
-        <translation>Ctrl+Q</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="246"/>
-        <location filename="../build/ui_mainwindow.h" line="485"/>
-        <source>Ctrl+D</source>
-        <translation>Ctrl+D</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="264"/>
-        <location filename="../build/ui_mainwindow.h" line="489"/>
-        <source>&amp;Add dive</source>
-        <translation>Legg til dykk</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="304"/>
-        <location filename="../build/ui_mainwindow.h" line="498"/>
-        <source>Auto &amp;group</source>
-        <translation>Auto&amp;grupper</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="309"/>
-        <location filename="../build/ui_mainwindow.h" line="499"/>
-        <source>&amp;Yearly statistics</source>
-        <translation>Årsstatistikk</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="317"/>
-        <location filename="../build/ui_mainwindow.h" line="501"/>
-        <source>&amp;Dive list</source>
-        <translation>&amp;Dykkeliste</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="320"/>
-        <location filename="../build/ui_mainwindow.h" line="502"/>
-        <source>Ctrl+2</source>
-        <translation>Ctrl+2</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="328"/>
-        <location filename="../build/ui_mainwindow.h" line="504"/>
-        <source>Ctrl+3</source>
-        <translation>Ctrl+3</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="336"/>
-        <location filename="../build/ui_mainwindow.h" line="506"/>
-        <source>Ctrl+4</source>
-        <translation>Ctrl+4</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="344"/>
-        <location filename="../build/ui_mainwindow.h" line="508"/>
-        <source>Ctrl+1</source>
-        <translation>Ctrl+1</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="349"/>
-        <location filename="../build/ui_mainwindow.h" line="509"/>
-        <source>P&amp;revious DC</source>
-        <translation>Fo&amp;rrige computer</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="352"/>
-        <location filename="../build/ui_mainwindow.h" line="510"/>
-        <source>Left</source>
-        <translation>Venstre</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="360"/>
-        <location filename="../build/ui_mainwindow.h" line="512"/>
-        <source>Right</source>
-        <translation>Høyre</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="373"/>
-        <location filename="../build/ui_mainwindow.h" line="514"/>
-        <source>User &amp;manual</source>
-        <translation>Bruker&amp;manual</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="376"/>
-        <location filename="../build/ui_mainwindow.h" line="515"/>
-        <source>F1</source>
-        <translation>F1</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="384"/>
-        <location filename="../build/ui_mainwindow.h" line="517"/>
-        <source>Ctrl+5</source>
-        <translation>Ctrl+5</translation>
+        <location filename="../build/ui_mainwindow.h" line="558"/>
+        <source>Toggle tissue graph</source>
+        <translation>Skru av/på vev-graf</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="389"/>
-        <location filename="../build/ui_mainwindow.h" line="518"/>
-        <source>P&amp;lan dive</source>
-        <translation>P&amp;lanlegg dykk</translation>
+        <location filename="../build/ui_mainwindow.h" line="565"/>
+        <source>Open cloud storage</source>
+        <translation>Åpne skylager</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="397"/>
-        <location filename="../build/ui_mainwindow.h" line="520"/>
-        <source>&amp;Import log files</source>
-        <translation>&amp;Importer loggfiler</translation>
+        <location filename="../build/ui_mainwindow.h" line="566"/>
+        <source>Save to cloud storage</source>
+        <translation>Lagre til skyen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="400"/>
-        <location filename="../build/ui_mainwindow.h" line="522"/>
-        <source>Import divelog files from other applications</source>
-        <translation>Importer dykkelogg fra andre programmer</translation>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="331"/>
+        <source>Connect to</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="422"/>
-        <location filename="../build/ui_mainwindow.h" line="530"/>
-        <source>F11</source>
-        <translation>F11</translation>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="493"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="538"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1545"/>
+        <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="../desktop-widgets/mainwindow.cpp" line="505"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="499"/>
         <source>Open file</source>
         <translation>Åpne fil</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="509"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="503"/>
         <location filename="../desktop-widgets/mainwindow.cpp" line="614"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1972"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1978"/>
         <source>Cancel</source>
         <translation>Avbryt</translation>
     </message>
@@ -5253,6 +5352,16 @@ fra luft og bruker:
         <translation>Går gjennom bilder... (dette kan ta en stund)</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="649"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="796"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="977"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="983"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1849"/>
+        <source>Warning</source>
+        <translation>Advarsel</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="674"/>
         <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>
@@ -5268,125 +5377,98 @@ fra luft og bruker:
         <translation>Skriv ut løpetidstabel</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="982"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
+        <source>Trying to replan a dive that&apos;s not a planned dive.</source>
+        <translation>Prøver å re-planlegge et dykk som ikke allerede er et planlagt dykk.</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="977"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1849"/>
+        <source>Please, first finish the current edition before trying to do another.</source>
+        <translation>Avslutt denne redigeringa før du starter en ny.</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="983"/>
         <source>Trying to edit a dive that&apos;s not a manually added dive.</source>
         <translation>Prøver å redigere et dykk som ikke er lagt til manuelt.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1243"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1030"/>
+        <source>Yearly statistics</source>
+        <translation>Årsstatistikk</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1244"/>
         <source>Do you want to save the changes that you made in the file %1?</source>
         <translation>Vil du lagre endringene i fila %1?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1246"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1247"/>
         <source>Do you want to save the changes that you made in the data file?</source>
         <translation>Vil du lagre endrinene i datafila?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1251"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1252"/>
         <source>Save changes?</source>
         <translation>Lagre endringer?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1587"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1253"/>
+        <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="../desktop-widgets/mainwindow.cpp" line="1572"/>
         <source>Save file as</source>
         <translation>Lagre fil som</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1682"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1573"/>
+        <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
+        <translation>Subsurface XML-filer (*.ssrf *.xml *.XML)</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1670"/>
+        <source>[local cache for] %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1672"/>
         <source>[cloud storage for] %1</source>
         <translation>[skylager for] %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1782"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1788"/>
         <source>Opening datafile from older version</source>
         <translation>Åpner datafil fra eldre versjon</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1783"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1789"/>
         <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly.
 Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source>
         <translation>Du åpnet en datafil fra en eldre versjon av Subsurface. Vi anbefaler at du leser manualen for å else om endringene i den nye versjonen, særlig med tanke på dykkestedsdatabasen.
 Subsurface har allerede konvertert dataene, men det er sikkert lurt å kikke på dykkestedsdatabasen og sjekke at alt er greit.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1794"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1800"/>
         <source>Open dive log file</source>
         <translation>Åpne dykkelogg</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1795"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1801"/>
         <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1972"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1978"/>
         <source>Contacting cloud service...</source>
         <translation>Kontakter skylager...</translation>
     </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1252"/>
-        <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="../desktop-widgets/mainwindow.cpp" line="649"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="796"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="976"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="982"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/>
-        <source>Warning</source>
-        <translation>Advarsel</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="499"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="544"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1560"/>
-        <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="../desktop-widgets/mainwindow.cpp" line="338"/>
-        <source>Connect to</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
-        <source>Trying to replan a dive that&apos;s not a planned dive.</source>
-        <translation>Prøver å re-planlegge et dykk som ikke allerede er et planlagt dykk.</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1029"/>
-        <source>Yearly statistics</source>
-        <translation>Årsstatistikk</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1588"/>
-        <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
-        <translation>Subsurface XML-filer (*.ssrf *.xml *.XML)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="976"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/>
-        <source>Please, first finish the current edition before trying to do another.</source>
-        <translation>Avslutt denne redigeringa før du starter en ny.</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_mainwindow.h" line="565"/>
-        <source>Open cloud storage</source>
-        <translation>Åpne skylager</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_mainwindow.h" line="566"/>
-        <source>Save to cloud storage</source>
-        <translation>Lagre til skyen</translation>
-    </message>
 </context>
 <context>
     <name>MultiFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="733"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="731"/>
         <source>Filter shows %1 (of %2) dives</source>
         <translation>Filter viser %1 (av %2) dykk</translation>
     </message>
@@ -5394,12 +5476,12 @@ Subsurface har allerede konvertert dataene, men det er sikkert lurt å kikke på
 <context>
     <name>OstcFirmwareCheck</name>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="269"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="271"/>
         <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source>
         <translation>Du burde oppdatere firmwaren på computeren din: du har versjon %1 men den siste stabile versjonen er %2</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="273"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="275"/>
         <source>
 
 Please start Bluetooth on your OSTC Sport and do the same preparations as for a logbook download before continuing with the update</source>
@@ -5408,27 +5490,27 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 Start Bluetooth på din OSTC Sport og gjør det du pleier å gjøre når du skal laste ned logbook, før du fortsetter med oppdateringa</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="274"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="276"/>
         <source>Not now</source>
         <translation>Ikke nå</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="275"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="277"/>
         <source>Update firmware</source>
         <translation>Oppdater firmware</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="277"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="279"/>
         <source>Firmware upgrade notice</source>
         <translation>Firmwareoppgraderingsnotis</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="295"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="297"/>
         <source>Save the downloaded firmware as</source>
         <translation>Lagre den nedlastede firmwaren som</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="296"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="298"/>
         <source>HEX files (*.hex)</source>
         <translation>HEX-filer (*.hex)</translation>
     </message>
@@ -5436,79 +5518,89 @@ Start Bluetooth på din OSTC Sport og gjør det du pleier å gjøre når du skal
 <context>
     <name>PlannerSettingsWidget</name>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="322"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="302"/>
         <source>Open circuit</source>
         <translation>Åpent system</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="322"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="302"/>
         <source>CCR</source>
         <translation>CCR</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="322"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="302"/>
         <source>pSCR</source>
         <translation>pSCR</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="421"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="388"/>
         <source>ft/min</source>
         <translation>ft/min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="422"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="389"/>
         <source>Last stop at 20ft</source>
         <translation>Siste stopp ved 20ft</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="423"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="390"/>
         <source>50% avg. depth to 20ft</source>
         <translation>50% av snittdybde til 20ft</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="424"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="391"/>
         <source>20ft to surface</source>
         <translation>20ft til overflaten</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="426"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="392"/>
+        <source>ft</source>
+        <translation>ft</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="394"/>
         <source>m/min</source>
         <translation>m/min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="427"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="395"/>
         <source>Last stop at 6m</source>
         <translation>Siste stopp ved 6m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="428"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="396"/>
         <source>50% avg. depth to 6m</source>
         <translation>50% av snittdybde til 6m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="429"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="397"/>
         <source>6m to surface</source>
         <translation>6m til overflaten</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="432"/>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="433"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="398"/>
+        <source>m</source>
+        <translation>m</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="401"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="402"/>
         <source>cuft/min</source>
         <translation>ft³/min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="441"/>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="442"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="410"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="411"/>
         <source>ℓ/min</source>
         <translation>ℓ/min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="451"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="420"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="456"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="425"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
@@ -5658,6 +5750,11 @@ Start Bluetooth på din OSTC Sport og gjør det du pleier å gjøre når du skal
 <context>
     <name>PreferencesDialog</name>
     <message>
+        <location filename="../build/ui_preferences.h" line="1283"/>
+        <source>Preferences</source>
+        <translation>Valg</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1288"/>
         <source>Defaults</source>
         <translation>Standardvalg</translation>
@@ -5693,6 +5790,11 @@ Start Bluetooth på din OSTC Sport og gjør det du pleier å gjøre når du skal
         <translation>Geo-referanse</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1303"/>
+        <source>Lists and tables</source>
+        <translation>Lister og tabeller</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1304"/>
         <source>Font</source>
         <translation>Skrifttype</translation>
@@ -5708,6 +5810,11 @@ Start Bluetooth på din OSTC Sport og gjør det du pleier å gjøre når du skal
         <translation>Dykk</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1307"/>
+        <source>Default dive log file</source>
+        <translation>Standard loggfil</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1308"/>
         <source>No default file</source>
         <translation>Ingen forhåndsvalgt fil</translation>
@@ -5738,6 +5845,21 @@ Start Bluetooth på din OSTC Sport og gjør det du pleier å gjøre når du skal
         <translation>...</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1314"/>
+        <source>Display invalid</source>
+        <translation>Vis ugyldige</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1316"/>
+        <source>Default cylinder</source>
+        <translation>Standardflaske</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1317"/>
+        <source>Use default cylinder</source>
+        <translation>Bruk standardflaske</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1318"/>
         <source>Animations</source>
         <translation>Animasjoner</translation>
@@ -5768,40 +5890,24 @@ Start Bluetooth på din OSTC Sport og gjør det du pleier å gjøre når du skal
         <translation>System</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1401"/>
-        <source>Dive site geo lookup</source>
-        <translation>Geo-oppslag av dykkested</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1402"/>
-        <source>Enable geocoding for dive site management</source>
-        <translation>Skru på geo-koding for dykkestedsdatabase</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1403"/>
-        <source>Parse site without GPS data</source>
-        <translation>Les inn sted uten GPS-data</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1404"/>
-        <source>Same format for existing dives</source>
-        <translation>Samme format for eksisterende dyk</translation>
+        <location filename="../build/ui_preferences.h" line="1324"/>
+        <source>&amp;Metric</source>
+        <translation>&amp;Metrisk</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1405"/>
-        <source>Dive Site Layout</source>
-        <translation>Dykkestedsoppsett</translation>
+        <location filename="../build/ui_preferences.h" line="1325"/>
+        <source>Imperial</source>
+        <translation>Britiske mål</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1406"/>
-        <location filename="../build/ui_preferences.h" line="1407"/>
-        <source>/</source>
-        <translation>/</translation>
+        <location filename="../build/ui_preferences.h" line="1326"/>
+        <source>Personali&amp;ze</source>
+        <translation>Personifiser</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1325"/>
-        <source>Imperial</source>
-        <translation>Britiske mål</translation>
+        <location filename="../build/ui_preferences.h" line="1327"/>
+        <source>Individual settings</source>
+        <translation>Individuelle valg</translation>
     </message>
     <message>
         <location filename="../build/ui_preferences.h" line="1328"/>
@@ -5819,6 +5925,11 @@ Start Bluetooth på din OSTC Sport og gjør det du pleier å gjøre når du skal
         <translation>fot</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1331"/>
+        <source>Pressure</source>
+        <translation>Trykk</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1332"/>
         <location filename="../build/ui_preferences.h" line="1366"/>
         <source>bar</source>
@@ -5830,11 +5941,26 @@ Start Bluetooth på din OSTC Sport og gjør det du pleier å gjøre når du skal
         <translation>psi</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1334"/>
+        <source>Volume</source>
+        <translation>Volum</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1335"/>
+        <source>&amp;liter</source>
+        <translation>&amp;liter</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1336"/>
         <source>cu ft</source>
         <translation>ft³</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1337"/>
+        <source>Temperature</source>
+        <translation>Temperatur</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1338"/>
         <source>celsius</source>
         <translation>celsius</translation>
@@ -5845,11 +5971,121 @@ Start Bluetooth på din OSTC Sport og gjør det du pleier å gjøre når du skal
         <translation>fahrenheit</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1340"/>
+        <source>Weight</source>
+        <translation>Vekt</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1341"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1342"/>
+        <source>lbs</source>
+        <translation>pund</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1343"/>
+        <source>Time units</source>
+        <translation>Tidsenheter</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1344"/>
+        <source>Ascent/descent speed denominator</source>
+        <translation>Tidsenhet for opp- og nedstigning</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1345"/>
+        <source>Minutes</source>
+        <translation>Minutter</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1346"/>
+        <source>Seconds</source>
+        <translation>Sekunder</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1347"/>
+        <source>GPS coordinates</source>
+        <translation>GPS-koordinater</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1348"/>
+        <source>Location Display</source>
+        <translation>Stedsvisning</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1349"/>
+        <source>traditional (dms)</source>
+        <translation>tradisjonell (dms)</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1350"/>
+        <source>decimal</source>
+        <translation>desimal</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1351"/>
+        <source>Show</source>
+        <translation>Vis</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1352"/>
+        <source>Threshold when showing pO₂</source>
+        <translation>Grense når  pO₂ vises</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1353"/>
+        <source>Threshold when showing pN₂</source>
+        <translation>Grense når  pN₂ vises</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1354"/>
+        <source>Threshold when showing pHe</source>
+        <translation>Grense når pHe vises</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1355"/>
+        <source>Max pO₂ when showing MOD</source>
+        <translation>Maks  pO₂ når MOD vises</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1356"/>
+        <source>Draw dive computer reported ceiling red</source>
+        <translation>Farg dekograf fra dykkecomputer i rødt</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1357"/>
+        <source>Show unused cylinders in Equipment tab</source>
+        <translation>Vis ubrukte flasker i utstyrsfanen</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1358"/>
+        <source>Show average depth</source>
+        <translation>Vis snittdybde</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1359"/>
+        <source>Misc</source>
+        <translation>Ymse</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1360"/>
+        <source>GFLow</source>
+        <translation>GF lav</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1361"/>
+        <source>GFHigh</source>
+        <translation>GF høy</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1362"/>
+        <source>GFLow at max depth</source>
+        <translation>GF lav ved maksdybde</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1363"/>
         <source>CCR: show setpoints when viewing pO₂</source>
         <translation>CCR: vis settpunkter når pO₂ vises</translation>
@@ -5895,14 +6131,19 @@ Start Bluetooth på din OSTC Sport og gjør det du pleier å gjøre når du skal
         <translation>Systemstandard</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1374"/>
+        <source>Filter</source>
+        <translation>Filter</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1375"/>
         <source>Proxy</source>
         <translation>Proxy</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1379"/>
-        <source>Proxy type</source>
-        <translation>Proxytype</translation>
+        <location filename="../build/ui_preferences.h" line="1376"/>
+        <source>Port</source>
+        <translation>Port</translation>
     </message>
     <message>
         <location filename="../build/ui_preferences.h" line="1377"/>
@@ -5910,16 +6151,16 @@ Start Bluetooth på din OSTC Sport og gjør det du pleier å gjøre når du skal
         <translation>Tjener</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1376"/>
-        <source>Port</source>
-        <translation>Port</translation>
-    </message>
-    <message>
         <location filename="../build/ui_preferences.h" line="1378"/>
         <source>Requires authentication</source>
         <translation>Krever autentisering</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1379"/>
+        <source>Proxy type</source>
+        <translation>Proxytype</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1380"/>
         <source>Username</source>
         <translation>Brukernavn</translation>
@@ -5931,46 +6172,6 @@ Start Bluetooth på din OSTC Sport og gjør det du pleier å gjøre når du skal
         <translation>Passord</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1400"/>
-        <source>Disconnect from Facebook</source>
-        <translation>Koble fra Facebook</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1374"/>
-        <source>Filter</source>
-        <translation>Filter</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1331"/>
-        <source>Pressure</source>
-        <translation>Trykk</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1303"/>
-        <source>Lists and tables</source>
-        <translation>Lister og tabeller</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1307"/>
-        <source>Default dive log file</source>
-        <translation>Standard loggfil</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1314"/>
-        <source>Display invalid</source>
-        <translation>Vis ugyldige</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1316"/>
-        <source>Default cylinder</source>
-        <translation>Standardflaske</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1317"/>
-        <source>Use default cylinder</source>
-        <translation>Bruk standardflaske</translation>
-    </message>
-    <message>
         <location filename="../build/ui_preferences.h" line="1382"/>
         <source>Subsurface cloud storage</source>
         <translation>Skylager for Subsurface</translation>
@@ -6011,149 +6212,40 @@ Start Bluetooth på din OSTC Sport og gjør det du pleier å gjøre når du skal
         <translation>Lagre bruker-ID lokalt?</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1334"/>
-        <source>Volume</source>
-        <translation>Volum</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1337"/>
-        <source>Temperature</source>
-        <translation>Temperatur</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1340"/>
-        <source>Weight</source>
-        <translation>Vekt</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1342"/>
-        <source>lbs</source>
-        <translation>pund</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1343"/>
-        <source>Time units</source>
-        <translation>Tidsenheter</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1345"/>
-        <source>Minutes</source>
-        <translation>Minutter</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1346"/>
-        <source>Seconds</source>
-        <translation>Sekunder</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1351"/>
-        <source>Show</source>
-        <translation>Vis</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1362"/>
-        <source>GFLow at max depth</source>
-        <translation>GF lav ved maksdybde</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1359"/>
-        <source>Misc</source>
-        <translation>Ymse</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1283"/>
-        <source>Preferences</source>
-        <translation>Valg</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1324"/>
-        <source>&amp;Metric</source>
-        <translation>&amp;Metrisk</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1326"/>
-        <source>Personali&amp;ze</source>
-        <translation>Personifiser</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1327"/>
-        <source>Individual settings</source>
-        <translation>Individuelle valg</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1335"/>
-        <source>&amp;liter</source>
-        <translation>&amp;liter</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1344"/>
-        <source>Ascent/descent speed denominator</source>
-        <translation>Tidsenhet for opp- og nedstigning</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1347"/>
-        <source>GPS coordinates</source>
-        <translation>GPS-koordinater</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1348"/>
-        <source>Location Display</source>
-        <translation>Stedsvisning</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1349"/>
-        <source>traditional (dms)</source>
-        <translation>tradisjonell (dms)</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1350"/>
-        <source>decimal</source>
-        <translation>desimal</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1352"/>
-        <source>Threshold when showing pO₂</source>
-        <translation>Grense når  pO₂ vises</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1353"/>
-        <source>Threshold when showing pN₂</source>
-        <translation>Grense når  pN₂ vises</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1354"/>
-        <source>Threshold when showing pHe</source>
-        <translation>Grense når pHe vises</translation>
+        <location filename="../build/ui_preferences.h" line="1400"/>
+        <source>Disconnect from Facebook</source>
+        <translation>Koble fra Facebook</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1355"/>
-        <source>Max pO₂ when showing MOD</source>
-        <translation>Maks  pO₂ når MOD vises</translation>
+        <location filename="../build/ui_preferences.h" line="1401"/>
+        <source>Dive site geo lookup</source>
+        <translation>Geo-oppslag av dykkested</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1356"/>
-        <source>Draw dive computer reported ceiling red</source>
-        <translation>Farg dekograf fra dykkecomputer i rødt</translation>
+        <location filename="../build/ui_preferences.h" line="1402"/>
+        <source>Enable geocoding for dive site management</source>
+        <translation>Skru på geo-koding for dykkestedsdatabase</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1357"/>
-        <source>Show unused cylinders in Equipment tab</source>
-        <translation>Vis ubrukte flasker i utstyrsfanen</translation>
+        <location filename="../build/ui_preferences.h" line="1403"/>
+        <source>Parse site without GPS data</source>
+        <translation>Les inn sted uten GPS-data</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1358"/>
-        <source>Show average depth</source>
-        <translation>Vis snittdybde</translation>
+        <location filename="../build/ui_preferences.h" line="1404"/>
+        <source>Same format for existing dives</source>
+        <translation>Samme format for eksisterende dyk</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1360"/>
-        <source>GFLow</source>
-        <translation>GF lav</translation>
+        <location filename="../build/ui_preferences.h" line="1405"/>
+        <source>Dive Site Layout</source>
+        <translation>Dykkestedsoppsett</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1361"/>
-        <source>GFHigh</source>
-        <translation>GF høy</translation>
+        <location filename="../build/ui_preferences.h" line="1406"/>
+        <location filename="../build/ui_preferences.h" line="1407"/>
+        <source>/</source>
+        <translation>/</translation>
     </message>
 </context>
 <context>
@@ -6209,106 +6301,136 @@ Start Bluetooth på din OSTC Sport og gjør det du pleier å gjøre når du skal
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="20"/>
-        <source>Show</source>
-        <translation>Vis</translation>
+        <source>Gas pressure display setup</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="29"/>
-        <source>Threshold when showing pO₂</source>
-        <translation>Grense når  pO₂ vises</translation>
+        <source>Threshold for pO₂ (bar)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="49"/>
-        <source>Threshold when showing pN₂</source>
-        <translation>Grense når  pN₂ vises</translation>
+        <source>Threshold for pN₂ (bar)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="69"/>
-        <source>Threshold when showing pHe</source>
-        <translation>Grense når pHe vises</translation>
+        <source>Threshold for pHe (bar)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="89"/>
-        <source>Max pO₂ when showing MOD</source>
-        <translation>Maks  pO₂ når MOD vises</translation>
+        <source>pO₂ in calculating MOD (bar)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="106"/>
+        <source>CCR options:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="113"/>
+        <source>Dive planner default setpoint (bar)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="133"/>
+        <source>Show setpoints when viewing pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="140"/>
+        <source>Show individual O₂ sensor values when viewing pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="150"/>
+        <source>Ceiling display setup</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="109"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="159"/>
         <source>Draw dive computer reported ceiling red</source>
         <translation>Farg dekograf fra dykkecomputer i rødt</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="116"/>
-        <source>Show unused cylinders in Equipment tab</source>
-        <translation>Vis ubrukte flasker i utstyrsfanen</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="169"/>
+        <source>Algorithm for calculated ceiling:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="123"/>
-        <source>Show mean depth</source>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="176"/>
+        <source>VPM-B</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="133"/>
-        <source>Misc</source>
-        <translation>Ymse</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="183"/>
+        <source>VPM-B Conservatism</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="149"/>
-        <source>bar</source>
-        <translation>bar</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="193"/>
+        <source>+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="165"/>
-        <source>Default CCR set-point for dive planning</source>
-        <translation>Standard CCR settpunkt for dykkeplanlegging</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="206"/>
+        <source>Bühlmann</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="172"/>
-        <source>pSCR O₂ metabolism rate</source>
-        <translation>pSCR O₂ metabolisme-rate</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="216"/>
+        <source>GFHigh</source>
+        <translation>GF høy</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="179"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="236"/>
         <source>GFLow</source>
         <translation>GF lav</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="186"/>
-        <source>GFHigh</source>
-        <translation>GF høy</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="256"/>
+        <source>GFLow at max depth</source>
+        <translation>GF lav ved maksdybde</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="203"/>
-        <source>ℓ/min</source>
-        <translation>ℓ/min</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="263"/>
+        <source>pSCR options:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="213"/>
-        <source>pSCR ratio</source>
-        <translation>pSCR-forhold</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="270"/>
+        <source>Metabolic rate (ℓ O₂/min)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="287"/>
+        <source>Dilution ratio</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="223"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="300"/>
         <source>1:</source>
         <translation>1:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="230"/>
-        <source>CCR: show individual O₂ sensor values when viewing pO₂</source>
-        <translation>CCR: vis individuelle O₂-sensorverdier når pO₂ vises</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="310"/>
+        <source>Misc</source>
+        <translation>Ymse</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="237"/>
-        <source>CCR: show setpoints when viewing pO₂</source>
-        <translation>CCR: vis settpunkter når pO₂ vises</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="316"/>
+        <source>Show unused cylinders in Equipment tab</source>
+        <translation>Vis ubrukte flasker i utstyrsfanen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="244"/>
-        <source>GFLow at max depth</source>
-        <translation>GF lav ved maksdybde</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="323"/>
+        <source>Show mean depth in Profile</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="10"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="9"/>
         <source>Graph</source>
         <translation>Graf</translation>
     </message>
@@ -6377,15 +6499,29 @@ Start Bluetooth på din OSTC Sport og gjør det du pleier å gjøre når du skal
         <translation>Språk</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="57"/>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="53"/>
         <source>Restart required</source>
         <translation>Programmet må startes på nytt</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="58"/>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="54"/>
         <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="../desktop-widgets/preferences/preferences_language.cpp" line="76"/>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="82"/>
+        <source>Literal characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="77"/>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="83"/>
+        <source>Non-special character(s) in time format.
+These will be used as is. This might not be what you intended.
+See http://doc.qt.io/qt-5/qdatetime.html#toString</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PreferencesNetwork</name>
@@ -6432,7 +6568,7 @@ Start Bluetooth på din OSTC Sport og gjør det du pleier å gjøre når du skal
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_network.ui" line="156"/>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="148"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="134"/>
         <source>Subsurface cloud storage</source>
         <translation>Skylager for Subsurface</translation>
     </message>
@@ -6477,39 +6613,39 @@ Start Bluetooth på din OSTC Sport og gjør det du pleier å gjøre når du skal
         <translation>Lagre bruker-ID lokalt?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="11"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="10"/>
         <source>Network</source>
         <translation>Nettverk</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="15"/>
         <source>No proxy</source>
         <translation>Ingen proxy</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/>
         <source>System proxy</source>
         <translation>System-proxy</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/>
         <source>HTTP proxy</source>
         <translation>HTTP-proxy</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="19"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/>
         <source>SOCKS proxy</source>
         <translation>SOCKS-proxy</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="75"/>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="97"/>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="110"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="72"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="93"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="106"/>
         <source>Cloud storage email and password can only consist of letters, numbers, and &apos;.&apos;, &apos;-&apos;, &apos;_&apos;, and &apos;+&apos;.</source>
         <translation>Epost og passord for skylager kan bare bestå av bokstaver, tall og &apos;.&apos;, &apos;-&apos;, &apos;_&apos;, og &apos;+&apos;.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="146"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="132"/>
         <source>Subsurface cloud storage (credentials verified)</source>
         <translation>Skylager for Subsurface (bruker godkjent)</translation>
     </message>
@@ -6667,7 +6803,7 @@ Start Bluetooth på din OSTC Sport og gjør det du pleier å gjøre når du skal
         <translation>desimal</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="8"/>
+        <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="7"/>
         <source>Units</source>
         <translation>Enheter</translation>
     </message>
@@ -6675,17 +6811,17 @@ Start Bluetooth på din OSTC Sport og gjør det du pleier å gjøre når du skal
 <context>
     <name>PrintDialog</name>
     <message>
-        <location filename="../desktop-widgets/printdialog.cpp" line="118"/>
-        <source>&amp;Preview</source>
-        <translation>Forhåndsvisning</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/printdialog.cpp" line="115"/>
+        <location filename="../desktop-widgets/printdialog.cpp" line="102"/>
         <source>P&amp;rint</source>
         <translation>Skriv ut</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/printdialog.cpp" line="130"/>
+        <location filename="../desktop-widgets/printdialog.cpp" line="105"/>
+        <source>&amp;Preview</source>
+        <translation>Forhåndsvisning</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/printdialog.cpp" line="117"/>
         <source>Print</source>
         <translation>Skriv ut</translation>
     </message>
@@ -6693,19 +6829,10 @@ Start Bluetooth på din OSTC Sport og gjør det du pleier å gjøre når du skal
 <context>
     <name>PrintOptions</name>
     <message>
-        <location filename="../build/ui_printoptions.h" line="150"/>
-        <source>&amp;Table print</source>
-        <translation>&amp;Tabellutskrift</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_printoptions.h" line="158"/>
-        <source>One dive per page</source>
-        <translation>Ett dykk per side</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_printoptions.h" line="159"/>
-        <source>Two dives per page</source>
-        <translation>To dykk per side</translation>
+        <location filename="../desktop-widgets/printoptions.ui" line="29"/>
+        <location filename="../build/ui_printoptions.h" line="148"/>
+        <source>Print type</source>
+        <translation>Utskriftstype</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/printoptions.ui" line="41"/>
@@ -6765,10 +6892,19 @@ Start Bluetooth på din OSTC Sport og gjør det du pleier å gjøre når du skal
         <translation>Import</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/printoptions.ui" line="29"/>
-        <location filename="../build/ui_printoptions.h" line="148"/>
-        <source>Print type</source>
-        <translation>Utskriftstype</translation>
+        <location filename="../build/ui_printoptions.h" line="150"/>
+        <source>&amp;Table print</source>
+        <translation>&amp;Tabellutskrift</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_printoptions.h" line="158"/>
+        <source>One dive per page</source>
+        <translation>Ett dykk per side</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_printoptions.h" line="159"/>
+        <source>Two dives per page</source>
+        <translation>To dykk per side</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/printoptions.cpp" line="128"/>
@@ -6810,103 +6946,103 @@ Start Bluetooth på din OSTC Sport og gjør det du pleier å gjøre når du skal
         <translation>Ukjent computer</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="755"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="752"/>
         <source>Show NDL / TTS was disabled because of excessive processing time</source>
         <translation>Funksjonen Vis NDL/TTS ble avskrudd siden den brukte for mye ressurser</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1344"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1338"/>
         <source>Make first divecomputer</source>
         <translation>Gjør til første dykkecomputer</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1346"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1340"/>
         <source>Delete this divecomputer</source>
         <translation>Slett denne dykkecomputeren</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1360"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1354"/>
         <source>Add gas change</source>
         <translation>Legg til gassbytte</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1363"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1357"/>
         <source> (Tank %1)</source>
         <translation>(Tank %1)</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1371"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1365"/>
         <source>Add set-point change</source>
         <translation>Legg til settpunktendring</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1373"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1367"/>
         <source>Add bookmark</source>
         <translation>Legg til bokmerke</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1377"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1371"/>
         <source>Edit the profile</source>
         <translation>Rediger profil</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1381"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1375"/>
         <source>Remove event</source>
         <translation>Fjern hendelse</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1386"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1380"/>
         <source>Hide similar events</source>
         <translation>Skjul lignende hendelser</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1393"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1387"/>
         <source>Edit name</source>
         <translation>Rediger navn</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1422"/>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1429"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1416"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1423"/>
         <source>Adjust pressure of tank %1 (currently interpolated as %2)</source>
         <translation>Juster trykket i tank %1 (nå er den satt til %2)</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1444"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1438"/>
         <source>Unhide all events</source>
         <translation>Vis alle hendelser</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1479"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1473"/>
         <source>Hide events</source>
         <translation>Skjul hendelser</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1479"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1473"/>
         <source>Hide all %1 events?</source>
         <translation>Skjul alle %1 hendelser?</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1514"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1508"/>
         <source>Remove the selected event?</source>
         <translation>Fjern den valgte hendelsen?</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1515"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1509"/>
         <source>%1 @ %2:%3</source>
         <translation>%1 @ %2:%3</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1638"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1632"/>
         <source>Edit name of bookmark</source>
         <translation>Rediger navn på bokmerke</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1639"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1633"/>
         <source>Custom name:</source>
         <translation>Tilpasset navn:</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1644"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1638"/>
         <source>Name is too long!</source>
         <translation>Navnet er for langt</translation>
     </message>
@@ -6914,91 +7050,101 @@ Start Bluetooth på din OSTC Sport og gjør det du pleier å gjøre når du skal
 <context>
     <name>QMLManager</name>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="95"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="97"/>
         <source>Starting...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="202"/>
         <source>working in no-cloud mode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="213"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="216"/>
         <source>no cloud credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="214"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="270"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="217"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="269"/>
         <source>Please enter valid cloud credentials.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="285"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="284"/>
         <source>Attempting to open cloud storage with new credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="304"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="306"/>
         <source>Testing cloud credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="331"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="320"/>
+        <source>No response from cloud server to validate the credentials</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="329"/>
+        <source>Cannot connect to cloud storage - cloud account not verified</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="361"/>
         <source>Cloud credentials are invalid</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="344"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="374"/>
         <source>Cannot open cloud storage: Error creating https connection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="357"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="387"/>
         <source>Cannot open cloud storage: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="369"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="399"/>
         <source>Cannot connect to cloud storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="411"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="441"/>
         <source>Cloud storage error: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="501"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="531"/>
         <source>Failed to connect to cloud server, reverting to no cloud status</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="520"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="550"/>
         <source>Cloud storage open successfully. No dives in dive list.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="689"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="690"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="721"/>
         <source>h</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="689"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="690"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="691"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="721"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="722"/>
         <source>min</source>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="689"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/>
         <source>sec</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="1041"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="1102"/>
         <source>Unknown GPS location</source>
         <translation type="unfinished"/>
     </message>
@@ -7006,126 +7152,126 @@ Start Bluetooth på din OSTC Sport og gjør det du pleier å gjøre når du skal
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../core/qthelper.cpp" line="866"/>
-        <location filename="../core/qthelper.cpp" line="1214"/>
-        <source>AIR</source>
-        <translation>Luft</translation>
+        <location filename="../core/gpslocation.h" line="13"/>
+        <source>Waiting to aquire GPS location</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="1214"/>
-        <source>OXYGEN</source>
-        <translation>Oksygen</translation>
+        <location filename="../core/qthelper.cpp" line="766"/>
+        <location filename="../core/qthelper.cpp" line="1275"/>
+        <source>m</source>
+        <translation>m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="59"/>
-        <source>Remove this point</source>
-        <translation>Fjern dette punktet</translation>
+        <location filename="../core/qthelper.cpp" line="768"/>
+        <location filename="../core/qthelper.cpp" line="1274"/>
+        <source>ft</source>
+        <translation>ft</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="32"/>
-        <source>Average</source>
-        <translation>Gjennomsnitt</translation>
+        <location filename="../core/qthelper.cpp" line="794"/>
+        <source>C</source>
+        <translation>C</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="35"/>
-        <source>Minimum</source>
-        <translation>Minimum</translation>
+        <location filename="../core/qthelper.cpp" line="796"/>
+        <source>F</source>
+        <translation>F</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="38"/>
-        <source>Maximum</source>
-        <translation>Maksimum</translation>
+        <location filename="../core/qthelper.cpp" line="821"/>
+        <location filename="../core/qthelper.cpp" line="1250"/>
+        <source>kg</source>
+        <translation>kg</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/globe.cpp" line="327"/>
-        <source>Move the map and double-click to set the dive location</source>
-        <translation>Finn sted i kartet og dobbeltklikk for å sette posisjon</translation>
+        <location filename="../core/qthelper.cpp" line="823"/>
+        <location filename="../core/qthelper.cpp" line="1251"/>
+        <source>lbs</source>
+        <translation>pund</translation>
     </message>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="28"/>
-        <source>unknown</source>
-        <translation>ukjent</translation>
+        <location filename="../core/qthelper.cpp" line="848"/>
+        <location filename="../core/qthelper.cpp" line="1300"/>
+        <source>bar</source>
+        <translation>bar</translation>
     </message>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="105"/>
-        <source>h:</source>
-        <translation>t:</translation>
+        <location filename="../core/qthelper.cpp" line="850"/>
+        <location filename="../core/qthelper.cpp" line="1299"/>
+        <source>psi</source>
+        <translation>psi</translation>
     </message>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="105"/>
-        <source>min</source>
-        <translation>min</translation>
+        <location filename="../core/qthelper.cpp" line="871"/>
+        <location filename="../core/qthelper.cpp" line="1235"/>
+        <source>AIR</source>
+        <translation>Luft</translation>
     </message>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="337"/>
-        <source>Multiple</source>
+        <location filename="../core/qthelper.cpp" line="873"/>
+        <source>EAN</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="../core/qthelper.cpp" line="957"/>
+        <location filename="../core/qthelper.cpp" line="962"/>
         <source>(%n dive(s))</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="816"/>
-        <location filename="../core/qthelper.cpp" line="1228"/>
-        <source>kg</source>
-        <translation>kg</translation>
+        <location filename="../core/qthelper.cpp" line="1235"/>
+        <source>OXYGEN</source>
+        <translation>Oksygen</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="818"/>
-        <location filename="../core/qthelper.cpp" line="1229"/>
-        <source>lbs</source>
-        <translation>pund</translation>
+        <location filename="../core/qthelper.cpp" line="1322"/>
+        <source>l</source>
+        <translation>l</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="763"/>
-        <location filename="../core/qthelper.cpp" line="1252"/>
-        <source>ft</source>
-        <translation>ft</translation>
+        <location filename="../core/qthelper.cpp" line="1323"/>
+        <source>cuft</source>
+        <translation>ft³</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="761"/>
-        <location filename="../core/qthelper.cpp" line="1253"/>
-        <source>m</source>
-        <translation>m</translation>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="29"/>
+        <source>unknown</source>
+        <translation>ukjent</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="789"/>
-        <source>C</source>
-        <translation>C</translation>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="114"/>
+        <source>h:</source>
+        <translation>t:</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="791"/>
-        <source>F</source>
-        <translation>F</translation>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="114"/>
+        <source>min</source>
+        <translation>min</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="845"/>
-        <location filename="../core/qthelper.cpp" line="1275"/>
-        <source>psi</source>
-        <translation>psi</translation>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="63"/>
+        <source>Remove this point</source>
+        <translation>Fjern dette punktet</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="843"/>
-        <location filename="../core/qthelper.cpp" line="1276"/>
-        <source>bar</source>
-        <translation>bar</translation>
+        <location filename="../desktop-widgets/globe.cpp" line="327"/>
+        <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>
     <message>
-        <location filename="../core/qthelper.cpp" line="868"/>
-        <source>EAN</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="32"/>
+        <source>Average</source>
+        <translation>Gjennomsnitt</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="1298"/>
-        <source>l</source>
-        <translation>l</translation>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="35"/>
+        <source>Minimum</source>
+        <translation>Minimum</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="1299"/>
-        <source>cuft</source>
-        <translation>ft³</translation>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="38"/>
+        <source>Maximum</source>
+        <translation>Maksimum</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="625"/>
@@ -7147,17 +7293,12 @@ Start Bluetooth på din OSTC Sport og gjør det du pleier å gjøre når du skal
         <source>Malformed XML response. Line %1: %2</source>
         <translation>Feil formattert XML-svar. Linje %1: %2</translation>
     </message>
-    <message>
-        <location filename="../core/gpslocation.h" line="13"/>
-        <source>Waiting to aquire GPS location</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>ReadSettingsThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1651"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1676"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1640"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1665"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Denne funksjonen er ikke tilgjengelig for den valgte computeren.</translation>
     </message>
@@ -7186,7 +7327,7 @@ Start Bluetooth på din OSTC Sport og gjør det du pleier å gjøre når du skal
 <context>
     <name>ResetSettingsThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1775"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1764"/>
         <source>Reset settings failed!</source>
         <translation>Kunne ikke nullstille innstillinger!</translation>
     </message>
@@ -7224,6 +7365,12 @@ Start Bluetooth på din OSTC Sport og gjør det du pleier å gjøre når du skal
 <context>
     <name>ShiftImageTimesDialog</name>
     <message>
+        <location filename="../desktop-widgets/shiftimagetimes.ui" line="23"/>
+        <location filename="../build/ui_shiftimagetimes.h" line="184"/>
+        <source>Shift selected image times</source>
+        <translation>Flytt tid for valgte bilder</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/shiftimagetimes.ui" line="34"/>
         <location filename="../build/ui_shiftimagetimes.h" line="185"/>
         <source>Shift times of image(s) by</source>
@@ -7236,12 +7383,6 @@ Start Bluetooth på din OSTC Sport og gjør det du pleier å gjøre når du skal
         <translation>h:mm</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/shiftimagetimes.ui" line="23"/>
-        <location filename="../build/ui_shiftimagetimes.h" line="184"/>
-        <source>Shift selected image times</source>
-        <translation>Flytt tid for valgte bilder</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/shiftimagetimes.ui" line="105"/>
         <location filename="../build/ui_shiftimagetimes.h" line="187"/>
         <source>Earlier</source>
@@ -7293,12 +7434,12 @@ valgte dykk. </translation>
         <translation>Hvilket dato og tid vises på bildet?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="297"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="296"/>
         <source>Open image file</source>
         <translation>Åpne bilder</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="299"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="298"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>Bilder (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -7456,54 +7597,54 @@ valgte dykk. </translation>
 <context>
     <name>SocialNetworkDialog</name>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="339"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="284"/>
         <source>Dive date: %1 
 </source>
         <translation>Dato: %1
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="342"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="287"/>
         <source>Duration: %1 
 </source>
         <translation>Varighet: %1
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="343"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="288"/>
         <source>h:</source>
         <comment>abbreviation for hours plus separator</comment>
         <translation>t:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="344"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="289"/>
         <source>min</source>
         <comment>abbreviation for minutes</comment>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="347"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="292"/>
         <source>Dive location: %1 
 </source>
         <translation>Sted: %1
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="350"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="295"/>
         <source>Buddy: %1 
 </source>
         <translation>Buddy: %1
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="353"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="298"/>
         <source>Divemaster: %1 
 </source>
         <translation>Dykkeleder: %1
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="356"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="301"/>
         <source>
 %1</source>
         <translation>
@@ -7589,9 +7730,20 @@ valgte dykk. </translation>
     <name>StartPage</name>
     <message>
         <location filename="../mobile-widgets/qml/StartPage.qml" line="19"/>
-        <source>To use Subsurface-mobile with Subsurface cloud storage, please enteryour cloud credentials.
+        <source>To use Subsurface-mobile with Subsurface cloud storage, please enter your cloud credentials.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/StartPage.qml" line="20"/>
+        <source>If this is the first time you use Subsurface cloud storage, enter a valid email (all lower case) and a password of your choice (letters and numbers). The server will send a PIN to the email address provided that you will have to enter here.
 
-To use Subsurface-mobile only with local data on this device, tap on the no cloud icon below.</source>
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/StartPage.qml" line="23"/>
+        <source>To use Subsurface-mobile only with local data on this device, tap on the no cloud icon below.</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -7630,7 +7782,12 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>SubsurfaceWebServices</name>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="419"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="395"/>
+        <source>Enter User ID and click Download</source>
+        <translation>Skriv inn bruker-ID og trykk Last ned</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="417"/>
         <source>Webservice</source>
         <translation>Nettjeneste</translation>
     </message>
@@ -7655,30 +7812,25 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
         <translation>Forbindelsesfeil:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="557"/>
-        <source>Download successful</source>
-        <translation>Nedlasting ferdig</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="551"/>
         <source>Invalid user identifier!</source>
         <translation>Ugyldig bruker-ID!</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="397"/>
-        <source>Enter User ID and click Download</source>
-        <translation>Skriv inn bruker-ID og trykk Last ned</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="554"/>
         <source>Cannot parse response!</source>
         <translation>Kan ikke lese svar!</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="557"/>
+        <source>Download successful</source>
+        <translation>Nedlasting ferdig</translation>
+    </message>
 </context>
 <context>
     <name>SuitFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="674"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="672"/>
         <source>Suits: </source>
         <translation>Drakter:</translation>
     </message>
@@ -7686,7 +7838,7 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>SuitsFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="123"/>
+        <location filename="../qt-models/filtermodels.cpp" line="128"/>
         <source>No suit set</source>
         <translation>Ingen drakt er satt</translation>
     </message>
@@ -7705,7 +7857,7 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>TagFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="595"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="593"/>
         <source>Tags: </source>
         <translation>Emneord:</translation>
     </message>
@@ -7713,7 +7865,7 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>TagFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="148"/>
+        <location filename="../qt-models/filtermodels.cpp" line="153"/>
         <source>Empty tags</source>
         <translation>Ingen emneord</translation>
     </message>
@@ -7739,6 +7891,11 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>TemplateEdit</name>
     <message>
+        <location filename="../desktop-widgets/templateedit.ui" line="14"/>
+        <source>Edit template</source>
+        <translation>Rediger mal</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/templateedit.ui" line="37"/>
         <source>Preview</source>
         <translation>Forhåndsvisning</translation>
@@ -7784,11 +7941,6 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
         <translation>Skriftstørrelse</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/templateedit.ui" line="14"/>
-        <source>Edit template</source>
-        <translation>Rediger mal</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/templateedit.ui" line="165"/>
         <source>Color palette</source>
         <translation>Fargepalett</translation>
@@ -7970,85 +8122,12 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>TextHyperlinkEventFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="817"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="815"/>
         <source>%1click to visit %2</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>ThemeTest</name>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="29"/>
-        <source>Theme Information</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="33"/>
-        <source>Screen</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="42"/>
-        <source>Geometry (pixels):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="49"/>
-        <source>Geometry (gridUnits):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="56"/>
-        <source>Units.gridUnit:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="63"/>
-        <source>Units.devicePixelRatio:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="70"/>
-        <source>Font Metrics</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="76"/>
-        <source>FontMetrics pointSize:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="83"/>
-        <source>FontMetrics pixelSize:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="90"/>
-        <source>FontMetrics devicePixelRatio:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="97"/>
-        <source>Text item pixelSize:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="104"/>
-        <source>Text item pointSize:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="111"/>
-        <source>Pixel density:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="118"/>
-        <source>Height of default font:</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
     <name>ToolTipItem</name>
     <message>
         <location filename="../profile-widget/divetooltipitem.cpp" line="136"/>
@@ -8059,102 +8138,107 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>TripItem</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="67"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="68"/>
         <source>(%1 shown)</source>
         <translation>(%1 vist)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="194"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="197"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="215"/>
         <source>Date</source>
         <translation>Dato</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="200"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="218"/>
         <source>Rating</source>
         <translation>Vurdering</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
         <source>Depth(%1)</source>
         <translation>Dybde(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="206"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="224"/>
         <source>Duration</source>
         <translation>Varighet</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="209"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="227"/>
         <source>Temp(%1%2)</source>
         <translation>Temp(%1%2)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
         <source>Weight(%1)</source>
         <translation>Vekt(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
         <source>lbs</source>
         <translation>pund</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="215"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="233"/>
         <source>Suit</source>
         <translation>Drakt</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="218"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="236"/>
         <source>Cyl</source>
         <translation>Flaske</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="239"/>
         <source>Gas</source>
         <translation>Gass</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="244"/>
         <source>SAC(%1)</source>
         <translation>SAC(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="244"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="229"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="247"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="232"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="250"/>
         <source>Max CNS</source>
         <translation>Maks CNS</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="235"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="253"/>
+        <source>Photos before/during/after dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="256"/>
         <source>Location</source>
         <translation>Sted</translation>
     </message>
@@ -8177,72 +8261,73 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>UpdateManager</name>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="69"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="61"/>
         <source>Check for updates.</source>
         <translation>Se etter oppdateringer.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="70"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="62"/>
         <source>Subsurface was unable to check for updates.</source>
         <translation>Subsurface klarte ikke å se etter oppdateringer.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="75"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="67"/>
         <source>The following error occurred:</source>
         <translation>Den følgende feilen inntraff:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="76"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="68"/>
         <source>Please check your internet connection.</source>
         <translation>Sjekk internettforbindelsen din.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="86"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="78"/>
         <source>You are using the latest version of Subsurface.</source>
         <translation>Du bruker den siste versjonen av Subsurface.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="89"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="81"/>
         <source>A new version of Subsurface is available.&lt;br/&gt;Click on:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; to download it.</source>
         <translation>En ny Subsurface-versjon er tilgjengelig.&lt;br/&gt;Klikk på &lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; for å laste den ned.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="95"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="87"/>
         <source>A new version of Subsurface is available.</source>
         <translation>En ny versjon av Subsurface er tilgjengelig.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="96"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="88"/>
         <source>Latest version is %1, please check %2 our download page %3 for information in how to update.</source>
         <translation>Den siste versjonen er %1, se på %2 nedlastingssiden vår %3 for informasjon om hvordan du oppgraderer.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="106"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="98"/>
         <source>Newest release version is </source>
         <translation>Den nyeste versjonen er</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="107"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="99"/>
         <source>The server returned the following information:</source>
         <translation>Serveren svarte med denne informasjonen: </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="125"/>
-        <source>Subsurface is checking every two weeks if a new version is available. If you don&apos;t want Subsurface to continue checking, please click Decline.</source>
-        <translation>Subsurface sjekker automatisk etter ny versjon annenhver uke. Hvis du vil skru av sjekken, trykk Avslå. </translation>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="117"/>
+        <source>Subsurface is checking every two weeks if a new version is available. 
+ If you don&apos;t want Subsurface to continue checking, please click Decline.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="126"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="119"/>
         <source>Decline</source>
         <translation>Avslå</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="127"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="120"/>
         <source>Accept</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="129"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="122"/>
         <source>Automatic check for updates</source>
         <translation>Sjekk etter oppdateringer automatisk</translation>
     </message>
@@ -8264,24 +8349,6 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>UserSurvey</name>
     <message>
-        <location filename="../desktop-widgets/usersurvey.ui" line="44"/>
-        <location filename="../build/ui_usersurvey.h" line="151"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;We would love to learn more about our users, their preferences and their usage habits. Please spare a minute to fill out this form and submit it to the Subsurface team.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Vi ønsker å lære mer om brukerne være, valgene deres og bruksmønster.  Fyll gjerne ut dette skjemaet og sen til Subsurface-teamet.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/usersurvey.ui" line="115"/>
-        <location filename="../build/ui_usersurvey.h" line="156"/>
-        <source>Other software/sources</source>
-        <translation>Annen programvare/kilder</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/usersurvey.ui" line="128"/>
-        <location filename="../build/ui_usersurvey.h" line="157"/>
-        <source>Manually entering dives</source>
-        <translation>Legge inn dykk manuelt</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="14"/>
         <location filename="../build/ui_usersurvey.h" line="149"/>
         <source>User survey</source>
@@ -8294,6 +8361,12 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
         <translation>Brukerundersøkelse for Subsurface</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/usersurvey.ui" line="44"/>
+        <location filename="../build/ui_usersurvey.h" line="151"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;We would love to learn more about our users, their preferences and their usage habits. Please spare a minute to fill out this form and submit it to the Subsurface team.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Vi ønsker å lære mer om brukerne være, valgene deres og bruksmønster.  Fyll gjerne ut dette skjemaet og sen til Subsurface-teamet.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="63"/>
         <location filename="../build/ui_usersurvey.h" line="152"/>
         <source>Technical diver</source>
@@ -8318,6 +8391,18 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
         <translation>Støttede dykkecomputere</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/usersurvey.ui" line="115"/>
+        <location filename="../build/ui_usersurvey.h" line="156"/>
+        <source>Other software/sources</source>
+        <translation>Annen programvare/kilder</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/usersurvey.ui" line="128"/>
+        <location filename="../build/ui_usersurvey.h" line="157"/>
+        <source>Manually entering dives</source>
+        <translation>Legge inn dykk manuelt</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="141"/>
         <location filename="../build/ui_usersurvey.h" line="158"/>
         <source>Android/iPhone companion app</source>
@@ -8348,6 +8433,11 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
         <translation>Hvor importerer du dykkedata fra?</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/usersurvey.cpp" line="18"/>
+        <source>Send</source>
+        <translation>Send</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/usersurvey.cpp" line="43"/>
         <source>
 Operating system: %1</source>
@@ -8390,19 +8480,14 @@ Language: %1</source>
         <translation>Spør senere</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/usersurvey.cpp" line="101"/>
-        <source>Submit user survey.</source>
-        <translation>Send inn brukerundersøkelse.</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/usersurvey.cpp" line="82"/>
         <source>Ask again?</source>
         <translation>Spørre igjen?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/usersurvey.cpp" line="18"/>
-        <source>Send</source>
-        <translation>Send</translation>
+        <location filename="../desktop-widgets/usersurvey.cpp" line="101"/>
+        <source>Submit user survey.</source>
+        <translation>Send inn brukerundersøkelse.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/usersurvey.cpp" line="102"/>
@@ -8494,12 +8579,12 @@ Language: %1</source>
         <translation>Last opp</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="324"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="325"/>
         <source>Operation timed out</source>
         <translation>Handlingen fikk tidsavbrudd</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="345"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="346"/>
         <source>Transferring data...</source>
         <translation>Overfører data...</translation>
     </message>
@@ -8534,18 +8619,18 @@ Language: %1</source>
 <context>
     <name>WriteSettingsThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1702"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1709"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1718"/>
-        <source>Failed!</source>
-        <translation>Feil!</translation>
-    </message>
-    <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1700"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1721"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1689"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1710"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Denne funksjonen er ikke tilgjengelig for den valgte computeren.</translation>
     </message>
+    <message>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1691"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1698"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1707"/>
+        <source>Failed!</source>
+        <translation>Feil!</translation>
+    </message>
 </context>
 <context>
     <name>YearlyStatisticsModel</name>
@@ -8670,7 +8755,7 @@ Snitt</translation>
 <context>
     <name>getextFromC</name>
     <message>
-        <location filename="../core/libdivecomputer.c" line="674"/>
+        <location filename="../core/libdivecomputer.c" line="737"/>
         <source>Error parsing the header</source>
         <translation>Kunne ikke lese header</translation>
     </message>
@@ -8678,38 +8763,377 @@ Snitt</translation>
 <context>
     <name>gettextFromC</name>
     <message>
+        <location filename="../core/cochran.c" line="309"/>
+        <location filename="../core/cochran.c" line="315"/>
+        <location filename="../core/cochran.c" line="385"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>deco stop</source>
+        <translation>dekostopp</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="336"/>
+        <location filename="../core/cochran.c" line="390"/>
+        <location filename="../core/file.c" line="777"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>ascent</source>
+        <translation>oppstigning</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="342"/>
+        <location filename="../core/file.c" line="755"/>
+        <source>battery</source>
+        <translation>batteri</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="348"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
+        <source>OLF</source>
+        <translation>OLF</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="353"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
+        <source>maxdepth</source>
+        <translation>maksdybde</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="358"/>
+        <location filename="../core/cochran.c" line="404"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
+        <source>pO₂</source>
+        <translation>pO₂</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="365"/>
+        <location filename="../core/cochran.c" line="414"/>
+        <location filename="../core/cochran.c" line="421"/>
+        <location filename="../core/file.c" line="868"/>
+        <location filename="../core/libdivecomputer.c" line="225"/>
+        <location filename="../core/libdivecomputer.c" line="228"/>
+        <source>gaschange</source>
+        <translation>gassbytte</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="370"/>
+        <location filename="../core/cochran.c" line="409"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>rbt</source>
+        <translation>rbt</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="379"/>
+        <location filename="../core/cochran.c" line="426"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>ceiling</source>
+        <translation>tak</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="395"/>
+        <location filename="../core/libdivecomputer.c" line="224"/>
+        <source>transmitter</source>
+        <translation>sender</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="153"/>
+        <source>Error: the file does not appear to be a DATATRAK divelog</source>
+        <translation>Feil: dette ser ikke ut til å være en DATATRAK-fil</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="286"/>
+        <source>clear</source>
+        <translation>klart</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="289"/>
+        <source>misty</source>
+        <translation>lett tåke</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="292"/>
+        <source>fog</source>
+        <translation>tåke</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="295"/>
+        <source>rain</source>
+        <translation>regn</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="298"/>
+        <source>storm</source>
+        <translation>storm</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="301"/>
+        <source>snow</source>
+        <translation>sn</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="321"/>
+        <source>No suit</source>
+        <translation>Ingen drakt</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="324"/>
+        <source>Shorty</source>
+        <translation>Shorty</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="327"/>
+        <source>Combi</source>
+        <translation>Kombi</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="330"/>
+        <source>Wet suit</source>
+        <translation>Våtdrakt</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="333"/>
+        <source>Semidry suit</source>
+        <translation>Semidry</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="336"/>
+        <source>Dry suit</source>
+        <translation>Tørrdrakt</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="396"/>
+        <source>no stop</source>
+        <translation>ingen stop</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="398"/>
+        <location filename="../core/dive.c" line="29"/>
+        <source>deco</source>
+        <translation>deko</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="400"/>
+        <source>single ascent</source>
+        <translation>enkel oppstigning</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="402"/>
+        <source>multiple ascent</source>
+        <translation>flere oppstigninger</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="404"/>
+        <location filename="../core/dive.c" line="27"/>
+        <source>fresh</source>
+        <translation>ferskvann</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="406"/>
+        <source>salt water</source>
+        <translation>saltvan</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="431"/>
+        <source>sight seeing</source>
+        <translation>sightseeing</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="433"/>
+        <source>club dive</source>
+        <translation>klubbdyk</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="435"/>
+        <location filename="../core/dive.c" line="28"/>
+        <source>instructor</source>
+        <translation>instruktør</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="437"/>
+        <source>instruction</source>
+        <translation>instruksjon</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="439"/>
+        <location filename="../core/dive.c" line="27"/>
+        <source>night</source>
+        <translation>nattdykk</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="441"/>
+        <location filename="../core/dive.c" line="25"/>
+        <source>cave</source>
+        <translation>grotte</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="443"/>
+        <location filename="../core/dive.c" line="24"/>
+        <source>ice</source>
+        <translation>isdykk</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="445"/>
+        <source>search</source>
+        <translation>søk</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="455"/>
+        <location filename="../core/dive.c" line="25"/>
+        <source>wreck</source>
+        <translation>vrakdykk</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="457"/>
+        <location filename="../core/dive.c" line="26"/>
+        <source>river</source>
+        <translation>elv</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="459"/>
+        <location filename="../core/dive.c" line="23"/>
+        <source>drift</source>
+        <translation>strømdykk</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="461"/>
+        <location filename="../core/dive.c" line="28"/>
+        <source>photo</source>
+        <translation>foto</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="463"/>
+        <source>other</source>
+        <translation>annet</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="474"/>
+        <source>Other activities</source>
+        <translation>Andre aktiviteter</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="498"/>
+        <source>Datatrak/Wlog notes</source>
+        <translation>Datatrak/Wlog-notater</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="537"/>
+        <source>Manually entered dive</source>
+        <translation>Dykk lagt inn manuelt</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="588"/>
+        <source>Unknown</source>
+        <translation>Ukjent</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="674"/>
+        <source>Error: couldn&apos;t open the file %s</source>
+        <translation>Feil: kunne ikke åpne %s</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="687"/>
+        <source>Error: no dive</source>
+        <translation>Feil: Ikke noe dykk</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="23"/>
+        <source>boat</source>
+        <translation>båt</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="23"/>
+        <source>shore</source>
+        <translation>landdykk</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="24"/>
+        <source>deep</source>
+        <translation>dypdykk</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="24"/>
+        <source>cavern</source>
+        <translation>hule</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="25"/>
+        <source>altitude</source>
+        <translation>høydedykk</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="26"/>
+        <source>pool</source>
+        <translation>basseng</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="26"/>
+        <source>lake</source>
+        <translation>innsjø</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="27"/>
+        <source>student</source>
+        <translation>elev</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="28"/>
+        <source>video</source>
+        <translation>video</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="33"/>
+        <source>OC-gas</source>
+        <translation>OC-gass</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="33"/>
+        <source>diluent</source>
+        <translation>diluent</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="33"/>
+        <location filename="../core/equipment.c" line="88"/>
+        <location filename="../core/planner.c" line="1436"/>
+        <location filename="../core/planner.c" line="1439"/>
+        <source>oxygen</source>
+        <translation>oksygen</translation>
+    </message>
+    <message>
         <location filename="../core/dive.c" line="181"/>
         <source>pascal</source>
         <translation>pascal</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="186"/>
-        <location filename="../core/qthelper.cpp" line="669"/>
+        <location filename="../core/qthelper.cpp" line="674"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="190"/>
-        <location filename="../core/qthelper.cpp" line="672"/>
+        <location filename="../core/qthelper.cpp" line="677"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
+        <location filename="../core/dive.c" line="227"/>
+        <source>ℓ</source>
+        <translation>ℓ</translation>
+    </message>
+    <message>
         <location filename="../core/dive.c" line="232"/>
         <source>cuft</source>
         <translation>ft³</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="269"/>
-        <location filename="../core/qthelper.cpp" line="590"/>
-        <location filename="../core/qthelper.cpp" line="605"/>
+        <location filename="../core/qthelper.cpp" line="595"/>
+        <location filename="../core/qthelper.cpp" line="610"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="274"/>
-        <location filename="../core/qthelper.cpp" line="593"/>
-        <location filename="../core/qthelper.cpp" line="607"/>
+        <location filename="../core/qthelper.cpp" line="598"/>
+        <location filename="../core/qthelper.cpp" line="612"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
@@ -8735,53 +9159,58 @@ Snitt</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="325"/>
-        <location filename="../core/qthelper.cpp" line="616"/>
-        <location filename="../core/qthelper.cpp" line="626"/>
+        <location filename="../core/qthelper.cpp" line="621"/>
+        <location filename="../core/qthelper.cpp" line="631"/>
         <source>lbs</source>
         <translation>pund</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="329"/>
-        <location filename="../core/qthelper.cpp" line="614"/>
-        <location filename="../core/qthelper.cpp" line="624"/>
+        <location filename="../core/qthelper.cpp" line="619"/>
+        <location filename="../core/qthelper.cpp" line="629"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="1772"/>
+        <location filename="../core/dive.c" line="1751"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) eller (%s)</translation>
     </message>
     <message>
-        <location filename="../core/divelist.c" line="484"/>
+        <location filename="../core/divelist.c" line="487"/>
         <location filename="../core/equipment.c" line="84"/>
-        <location filename="../core/planner.c" line="1411"/>
-        <location filename="../core/planner.c" line="1414"/>
+        <location filename="../core/planner.c" line="1432"/>
+        <location filename="../core/planner.c" line="1435"/>
         <source>air</source>
         <translation>luft</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="197"/>
+        <location filename="../core/equipment.c" line="86"/>
+        <source>EAN%d</source>
+        <translation>EAN%d</translation>
+    </message>
+    <message>
+        <location filename="../core/equipment.c" line="198"/>
         <source>integrated</source>
         <translation>integrert bly</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="198"/>
+        <location filename="../core/equipment.c" line="199"/>
         <source>belt</source>
         <translation>vektbelte</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="199"/>
+        <location filename="../core/equipment.c" line="200"/>
         <source>ankle</source>
         <translation>ankelvekt</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="200"/>
+        <location filename="../core/equipment.c" line="201"/>
         <source>backplate weight</source>
         <translation>p-vekt</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="201"/>
+        <location filename="../core/equipment.c" line="202"/>
         <source>clip-on</source>
         <translation>clip-on</translation>
     </message>
@@ -8794,8 +9223,8 @@ Snitt</translation>
         <location filename="../core/file.c" line="121"/>
         <location filename="../core/file.c" line="512"/>
         <location filename="../core/file.c" line="597"/>
-        <location filename="../core/file.c" line="924"/>
-        <location filename="../core/file.c" line="1056"/>
+        <location filename="../core/file.c" line="909"/>
+        <location filename="../core/file.c" line="1092"/>
         <location filename="../core/ostctools.c" line="80"/>
         <source>Failed to read &apos;%s&apos;</source>
         <translation>Kunne ikke åpne &apos;%s&apos;</translation>
@@ -8853,486 +9282,496 @@ Snitt</translation>
         <translation>O₂-kalibrering</translation>
     </message>
     <message>
-        <location filename="../core/file.c" line="887"/>
-        <source>No matching DC found for file &apos;%s&apos;</source>
-        <translation>Ingen matchende computer funnet for fila &apos;%s&apos;</translation>
+        <location filename="../core/git-access.c" line="134"/>
+        <source>Local cache directory %s corrupted - can&apos;t sync with Subsurface cloud storage</source>
+        <translation>Lokalt mellomlager i %s er ødelagt - kan ikke synkronisere med Subsurface skylager</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>none</source>
-        <translation>ingen</translation>
+        <location filename="../core/git-access.c" line="157"/>
+        <location filename="../core/git-access.c" line="177"/>
+        <source>Could not update local cache to newer remote data</source>
+        <translation>Kunne ikke oppdatere lokalt mellomlager med nyere data</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="309"/>
-        <location filename="../core/cochran.c" line="315"/>
-        <location filename="../core/cochran.c" line="385"/>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>deco stop</source>
-        <translation>dekostopp</translation>
+        <location filename="../core/git-access.c" line="170"/>
+        <source>Subsurface cloud storage corrupted</source>
+        <translation>Subsurface skylager ødelagt</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="342"/>
-        <location filename="../core/file.c" line="755"/>
-        <source>battery</source>
-        <translation>batteri</translation>
+        <location filename="../core/git-access.c" line="284"/>
+        <source>Could not update Subsurface cloud storage, try again later</source>
+        <translation>Kunne ikke oppdatere Subsurface skylager, prøv igjen senere</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="370"/>
-        <location filename="../core/cochran.c" line="409"/>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>rbt</source>
-        <translation>rbt</translation>
+        <location filename="../core/git-access.c" line="344"/>
+        <source>Remote storage and local data diverged. Error: merge failed (%s)</source>
+        <translation>Skylager og lokal data avviker. Feil: merge failed (%s)</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="336"/>
-        <location filename="../core/cochran.c" line="390"/>
-        <location filename="../core/file.c" line="777"/>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>ascent</source>
-        <translation>oppstigning</translation>
+        <location filename="../core/git-access.c" line="374"/>
+        <source>Remote storage and local data diverged. Cannot combine local and remote changes</source>
+        <translation>Skylager og lokal data er forskjellig. Klarer ikke å kombinere nye data med lokale data.</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="379"/>
-        <location filename="../core/cochran.c" line="426"/>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>ceiling</source>
-        <translation>tak</translation>
+        <location filename="../core/git-access.c" line="408"/>
+        <source>Remote storage and local data diverged</source>
+        <translation>Skylager og lokal data er forskjellig</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>workload</source>
-        <translation>arbeidsbelastning</translation>
+        <location filename="../core/git-access.c" line="411"/>
+        <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source>
+        <translation>Skylager og lokal data er forskjellig. Feil: kunne ikke skrive data (%s)</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="395"/>
-        <location filename="../core/libdivecomputer.c" line="203"/>
-        <source>transmitter</source>
-        <translation>sender</translation>
+        <location filename="../core/git-access.c" line="420"/>
+        <source>Problems with local cache of Subsurface cloud data</source>
+        <translation>Problemer med det lokale mellomlageret til skylageret</translation>
+    </message>
+    <message>
+        <location filename="../core/git-access.c" line="421"/>
+        <source>Moved cache data to %s. Please try the operation again.</source>
+        <translation>Flyttet mellomlager til %s. Prøv igjen.</translation>
+    </message>
+    <message>
+        <location filename="../core/git-access.c" line="743"/>
+        <source>Error connecting to Subsurface cloud storage</source>
+        <translation>Klarte ikke å koble til skylager for Subsurface</translation>
+    </message>
+    <message>
+        <location filename="../core/git-access.c" line="746"/>
+        <source>git clone of %s failed (%s)</source>
+        <translation>git clone of %s failed (%s)</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="210"/>
+        <location filename="../core/parse-xml.c" line="3317"/>
+        <location filename="../core/uemis-downloader.c" line="134"/>
+        <source>unknown</source>
+        <translation>ukjent</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>none</source>
+        <translation>ingen</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="203"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>workload</source>
+        <translation>arbeidsbelastning</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="224"/>
         <source>violation</source>
         <translation>brudd</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="203"/>
+        <location filename="../core/libdivecomputer.c" line="224"/>
         <source>bookmark</source>
         <translation>bokmerke</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="203"/>
+        <location filename="../core/libdivecomputer.c" line="224"/>
         <source>surface</source>
         <translation>overflate</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="203"/>
+        <location filename="../core/libdivecomputer.c" line="224"/>
         <source>safety stop</source>
         <translation>sikkerhetsstopp</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="365"/>
-        <location filename="../core/cochran.c" line="414"/>
-        <location filename="../core/cochran.c" line="421"/>
-        <location filename="../core/file.c" line="868"/>
-        <location filename="../core/libdivecomputer.c" line="204"/>
-        <location filename="../core/libdivecomputer.c" line="207"/>
-        <source>gaschange</source>
-        <translation>gassbytte</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="204"/>
+        <location filename="../core/libdivecomputer.c" line="225"/>
         <source>safety stop (voluntary)</source>
         <translation>sikkerhetsstopp (frivillig)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="204"/>
+        <location filename="../core/libdivecomputer.c" line="225"/>
         <source>safety stop (mandatory)</source>
         <translation>sikkerhetsstopp (obligatorisk)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="205"/>
+        <location filename="../core/libdivecomputer.c" line="226"/>
         <source>deepstop</source>
         <translation>dypstopp</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="205"/>
+        <location filename="../core/libdivecomputer.c" line="226"/>
         <source>ceiling (safety stop)</source>
         <translation>tak (sikkerhetsstopp)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="205"/>
-        <source>divetime</source>
-        <translation>dykketid</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="205"/>
+        <location filename="../core/libdivecomputer.c" line="226"/>
         <source>below floor</source>
         <comment>event showing dive is below deco floor and adding deco time</comment>
         <translation>under tak</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="353"/>
-        <location filename="../core/libdivecomputer.c" line="206"/>
-        <source>maxdepth</source>
-        <translation>maksdybde</translation>
-    </message>
-    <message>
-        <location filename="../core/cochran.c" line="348"/>
-        <location filename="../core/libdivecomputer.c" line="206"/>
-        <source>OLF</source>
-        <translation>OLF</translation>
+        <location filename="../core/libdivecomputer.c" line="226"/>
+        <source>divetime</source>
+        <translation>dykketid</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="206"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
         <source>airtime</source>
         <translation>lufttid</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="206"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
         <source>rgbm</source>
         <translation>rgbm</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="206"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
         <source>heading</source>
         <translation>retning</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="358"/>
-        <location filename="../core/cochran.c" line="404"/>
-        <location filename="../core/libdivecomputer.c" line="206"/>
-        <source>pO₂</source>
-        <translation>pO₂</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="207"/>
+        <location filename="../core/libdivecomputer.c" line="228"/>
         <source>tissue level warning</source>
         <translation>Advarsel: nivå i vev</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="207"/>
+        <location filename="../core/libdivecomputer.c" line="228"/>
         <source>non stop time</source>
         <translation>tid uten stopp</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="224"/>
+        <location filename="../core/libdivecomputer.c" line="237"/>
         <source>invalid event number</source>
         <translation>ugyldig hendelsesnummer</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="658"/>
-        <source>Unable to create parser for %s %s</source>
-        <translation>Kunne ikke lage parser for %s %s</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="664"/>
-        <source>Error registering the data</source>
-        <translation>Feil ved registrering av data</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="495"/>
+        <location filename="../core/libdivecomputer.c" line="553"/>
         <source>Error parsing the datetime</source>
         <translation>Feil ved lesing av dato</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="513"/>
+        <location filename="../core/libdivecomputer.c" line="571"/>
         <source>Dive %d: %s</source>
         <translation>Dykk %d: %s</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="519"/>
+        <location filename="../core/libdivecomputer.c" line="577"/>
         <source>Error parsing the divetime</source>
         <translation>Feil ved lesing av dykketid</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="529"/>
+        <location filename="../core/libdivecomputer.c" line="587"/>
         <source>Error parsing the maxdepth</source>
         <translation>Feil ved lesing av maksdybde</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="548"/>
+        <location filename="../core/libdivecomputer.c" line="606"/>
         <source>Error parsing temperature</source>
         <translation>Klarte ikke å lese temperatur</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="568"/>
+        <location filename="../core/libdivecomputer.c" line="626"/>
         <source>Error parsing the gas mix count</source>
         <translation>Feil ved lesing av gassmiksantall</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="580"/>
+        <location filename="../core/libdivecomputer.c" line="638"/>
         <source>Error obtaining water salinity</source>
         <translation>Feil ved lesing av salthetsgrad</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="589"/>
+        <location filename="../core/libdivecomputer.c" line="647"/>
         <source>Error obtaining surface pressure</source>
         <translation>Klarte ikke å hente overflatetrykk</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="614"/>
+        <location filename="../core/libdivecomputer.c" line="672"/>
         <source>Error obtaining divemode</source>
         <translation>Klarte ikke å lese dykkemodus</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="634"/>
+        <location filename="../core/libdivecomputer.c" line="692"/>
         <source>Error parsing the gas mix</source>
         <translation>Feil ved lesing av gassmiks</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="684"/>
+        <location filename="../core/libdivecomputer.c" line="717"/>
+        <source>Unable to create parser for %s %s</source>
+        <translation>Kunne ikke lage parser for %s %s</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="723"/>
+        <source>Error registering the data</source>
+        <translation>Feil ved registrering av data</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="744"/>
         <source>Error parsing the samples</source>
         <translation>Feil ved lesing av detaljer</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="822"/>
+        <location filename="../core/libdivecomputer.c" line="882"/>
         <source>Event: waiting for user action</source>
         <translation>Hendelse: Venter på bruker</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="830"/>
+        <location filename="../core/libdivecomputer.c" line="890"/>
         <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="../core/libdivecomputer.c" line="894"/>
+        <location filename="../core/libdivecomputer.c" line="954"/>
         <source>Error registering the event handler.</source>
         <translation>Feil ved registrering av hendelseshåndterer.</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="899"/>
+        <location filename="../core/libdivecomputer.c" line="959"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Feil ved registrering av avbruddshåndterer.</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="920"/>
+        <location filename="../core/libdivecomputer.c" line="980"/>
         <source>Dive data import error</source>
         <translation>Feil ved import av dykkedata</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="959"/>
+        <location filename="../core/libdivecomputer.c" line="1019"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Kunne ikke opprette kontekst for libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="966"/>
+        <location filename="../core/libdivecomputer.c" line="1026"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Fikk ikke åpnet %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="992"/>
+        <location filename="../core/libdivecomputer.c" line="1048"/>
         <source>Insufficient privileges to open the device %s %s (%s)</source>
         <translation>Har ikke tilgang til å åpne enhet %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../core/parse-xml.c" line="517"/>
-        <source>Strange percentage reading %s
+        <location filename="../core/load-git.c" line="194"/>
+        <location filename="../core/parse-xml.c" line="1242"/>
+        <source>multiple GPS locations for this dive site; also %s
 </source>
-        <translation>Rar lesing av prosent %s
+        <translation>Flere GPS-posisjoner for dette steder; også %s
 </translation>
     </message>
     <message>
-        <location filename="../core/load-git.c" line="194"/>
-        <location filename="../core/parse-xml.c" line="1238"/>
-        <source>multiple GPS locations for this dive site; also %s
+        <location filename="../core/load-git.c" line="222"/>
+        <location filename="../core/parse-xml.c" line="1304"/>
+        <source>additional name for site: %s
 </source>
-        <translation>Flere GPS-posisjoner for dette steder; også %s
+        <translation>ytterligere navn for sted: %s
 </translation>
     </message>
     <message>
-        <location filename="../core/parse-xml.c" line="2044"/>
+        <location filename="../core/ostctools.c" line="120"/>
+        <location filename="../core/ostctools.c" line="152"/>
+        <source>Unknown DC in dive %d</source>
+        <translation>Ukjent computer i dykk %d</translation>
+    </message>
+    <message>
+        <location filename="../core/ostctools.c" line="165"/>
+        <source>Error - %s - parsing dive %d</source>
+        <translation>Feil - %s - leser dykk %d</translation>
+    </message>
+    <message>
+        <location filename="../core/parse-xml.c" line="517"/>
+        <source>Strange percentage reading %s
+</source>
+        <translation>Rar lesing av prosent %s
+</translation>
+    </message>
+    <message>
+        <location filename="../core/parse-xml.c" line="2051"/>
         <source>Failed to parse &apos;%s&apos;</source>
         <translation>Kunne ikke lese &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../core/parse-xml.c" line="3741"/>
+        <location filename="../core/parse-xml.c" line="3774"/>
         <source>Can&apos;t open stylesheet %s</source>
         <translation>Kan ikke åpne stilark %s</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="86"/>
-        <source>EAN%d</source>
-        <translation>EAN%d</translation>
+        <location filename="../core/planner.c" line="555"/>
+        <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE %s ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source>
+        <translation>Advarsel: Dette er en ny implementasjon av %s og er en dykkeplan-implementasjon som bare har sett begrenset med testing. Vi anbefaler å ikke planlegge dykk utelukkende på bakgrunn av disse resultatene.</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="1032"/>
-        <location filename="../core/planner.c" line="1184"/>
-        <source>Can&apos;t find gas %s</source>
-        <translation>Finner ikke gassen %s</translation>
+        <location filename="../core/planner.c" line="569"/>
+        <source>Decompression calculation aborted due to excessive time</source>
+        <translation>Kalkulering av dekompresjon tok for lang tid, og er avbrutt</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="368"/>
-        <source>Too many gas mixes</source>
-        <translation>For mange gassmikser</translation>
+        <location filename="../core/planner.c" line="571"/>
+        <location filename="../core/planner.c" line="829"/>
+        <location filename="../core/planner.c" line="834"/>
+        <location filename="../core/planner.c" line="860"/>
+        <location filename="../core/planner.c" line="870"/>
+        <source>Warning:</source>
+        <translation>Advarsel:</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="568"/>
-        <source>Decompression calculation aborted due to excessive time</source>
-        <translation>Kalkulering av dekompresjon tok for lang tid, og er avbrutt</translation>
+        <location filename="../core/planner.c" line="581"/>
+        <source>based on Bühlmann ZHL-16C with GFlow = %d and GFhigh = %d</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="586"/>
+        <source>based on VPM-B at nominal conservatism</source>
+        <translation>basert på VPM-B med standard konservatisme</translation>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="588"/>
+        <source>based on VPM-B at +%d conservatism</source>
+        <translation>basert på VPM-B med +%d konservatisme</translation>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="590"/>
+        <source>, effective GF=%d/%d</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="594"/>
+        <source>recreational mode based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source>
+        <translation>rekreasjonsmodus basert på Bühlmann ZHL-16B med GFlow = %d og GFhigh = %d</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="592"/>
+        <location filename="../core/planner.c" line="598"/>
         <source>Subsurface dive plan</source>
         <translation>Subsurface dykkeplan</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="596"/>
-        <source>depth</source>
-        <translation>dybde</translation>
+        <location filename="../core/planner.c" line="599"/>
+        <source>&lt;div&gt;Runtime: %dmin&lt;/div&gt;&lt;br&gt;</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="602"/>
-        <source>runtime</source>
-        <translation>løpetid</translation>
+        <location filename="../core/planner.c" line="604"/>
+        <source>depth</source>
+        <translation>dybde</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="599"/>
+        <location filename="../core/planner.c" line="607"/>
         <source>duration</source>
         <translation>lengde</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="554"/>
-        <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE %s ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source>
-        <translation>Advarsel: Dette er en ny implementasjon av %s og er en dykkeplan-implementasjon som bare har sett begrenset med testing. Vi anbefaler å ikke planlegge dykk utelukkende på bakgrunn av disse resultatene.</translation>
+        <location filename="../core/planner.c" line="610"/>
+        <source>runtime</source>
+        <translation>løpetid</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="605"/>
+        <location filename="../core/planner.c" line="613"/>
         <source>gas</source>
         <translation>gass</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="648"/>
+        <location filename="../core/planner.c" line="656"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation>Overgang til %.*f %s på %d:%02d min - løpetid %d:%02u i %s (SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="656"/>
+        <location filename="../core/planner.c" line="664"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source>
         <translation>Overgang til %.*f %s på %d:%02d min - løpetid %d:%02u på %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="669"/>
+        <location filename="../core/planner.c" line="677"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation>Bli ved %.*f %s i %d:%02d min - løpetid %d:%02u i %s (SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="676"/>
+        <location filename="../core/planner.c" line="684"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source>
         <translation>Bli ved %.*f %s i %d:%02d min - løpetid %d:%02u i %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="721"/>
+        <location filename="../core/planner.c" line="729"/>
         <source>%3.0f%s</source>
         <translation>%3.0f%s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="724"/>
-        <location filename="../core/planner.c" line="728"/>
+        <location filename="../core/planner.c" line="732"/>
+        <location filename="../core/planner.c" line="736"/>
         <source>%3dmin</source>
         <translation>%3dmin</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="737"/>
-        <location filename="../core/planner.c" line="749"/>
+        <location filename="../core/planner.c" line="745"/>
+        <location filename="../core/planner.c" line="757"/>
         <source>(SP = %.1fbar)</source>
         <translation>(SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="772"/>
+        <location filename="../core/planner.c" line="780"/>
         <source>Switch gas to %s (SP = %.1fbar)</source>
         <translation>Bytt gass til %s (SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="774"/>
+        <location filename="../core/planner.c" line="782"/>
         <source>Switch gas to %s</source>
         <translation>Bytt til gass %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="793"/>
+        <location filename="../core/planner.c" line="801"/>
         <source>CNS</source>
         <translation>CNS</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="795"/>
+        <location filename="../core/planner.c" line="803"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="799"/>
+        <location filename="../core/planner.c" line="807"/>
         <source>Gas consumption (CCR legs excluded):</source>
         <translation>Gassforbruk (CCR-etapper ekskludert):</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="801"/>
+        <location filename="../core/planner.c" line="809"/>
         <source>Gas consumption:</source>
         <translation>Gassforbruk:</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="570"/>
-        <location filename="../core/planner.c" line="821"/>
-        <location filename="../core/planner.c" line="826"/>
-        <location filename="../core/planner.c" line="851"/>
-        <location filename="../core/planner.c" line="861"/>
-        <source>Warning:</source>
-        <translation>Advarsel:</translation>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="580"/>
-        <source>based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source>
-        <translation>basert på Bühlmann ZHL-16B med GFlow = %d og GFhigh = %d</translation>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="584"/>
-        <source>based on VPM-B at nominal conservatism</source>
-        <translation>basert på VPM-B med standard konservatisme</translation>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="586"/>
-        <source>based on VPM-B at +%d conservatism</source>
-        <translation>basert på VPM-B med +%d konservatisme</translation>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="588"/>
-        <source>recreational mode based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source>
-        <translation>rekreasjonsmodus basert på Bühlmann ZHL-16B med GFlow = %d og GFhigh = %d</translation>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="822"/>
+        <location filename="../core/planner.c" line="830"/>
         <source>this is more gas than available in the specified cylinder!</source>
         <translation>dette er mer gass en det som er tilgjengelig i tanken!</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="827"/>
+        <location filename="../core/planner.c" line="835"/>
         <source>not enough reserve for gas sharing on ascent!</source>
         <translation>ikke nok i reserve til å dele gass under oppstigning!</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="829"/>
+        <location filename="../core/planner.c" line="837"/>
         <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source>
         <translation>%.0f%s/%.0f%s av %s (%.0f%s/%.0f%s i planlagt oppstigning)</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="831"/>
+        <location filename="../core/planner.c" line="839"/>
         <source>%.0f%s (%.0f%s during planned ascent) of %s</source>
         <translation>%.0f%s (%.0f%s under planlagt oppstigning) av %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="848"/>
+        <location filename="../core/planner.c" line="857"/>
         <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
         <translation>høy pO₂-verdi %.2f ve %d:%02u med gass %s ved dybde %.*f %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="858"/>
+        <location filename="../core/planner.c" line="867"/>
         <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
         <translation>lav pO₂ verdi %.2f ved %d:%02u med gass %s ved dybde %.*f %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="1419"/>
+        <location filename="../core/planner.c" line="1194"/>
+        <source>Can&apos;t find gas %s</source>
+        <translation>Finner ikke gassen %s</translation>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="1440"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1280"/>
+        <location filename="../core/profile.c" line="1298"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
@@ -9341,70 +9780,70 @@ D: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1283"/>
+        <location filename="../core/profile.c" line="1301"/>
         <source>P: %d%s
 </source>
         <translation>P: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1287"/>
+        <location filename="../core/profile.c" line="1305"/>
         <source>T: %.1f%s
 </source>
         <translation>T: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1293"/>
+        <location filename="../core/profile.c" line="1311"/>
         <source>V: %.1f%s
 </source>
         <translation>V: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1296"/>
+        <location filename="../core/profile.c" line="1314"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation>SAC: %.*f%s/min
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1298"/>
+        <location filename="../core/profile.c" line="1316"/>
         <source>CNS: %u%%
 </source>
         <translation>CNS: %u%%
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1300"/>
+        <location filename="../core/profile.c" line="1318"/>
         <source>pO%s: %.2fbar
 </source>
         <translation>pO%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1302"/>
+        <location filename="../core/profile.c" line="1320"/>
         <source>pN%s: %.2fbar
 </source>
         <translation>pN%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1304"/>
+        <location filename="../core/profile.c" line="1322"/>
         <source>pHe: %.2fbar
 </source>
         <translation>pHe: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1307"/>
+        <location filename="../core/profile.c" line="1325"/>
         <source>MOD: %d%s
 </source>
         <translation>MOD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1314"/>
+        <location filename="../core/profile.c" line="1332"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
@@ -9413,7 +9852,7 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1318"/>
+        <location filename="../core/profile.c" line="1336"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
@@ -9422,174 +9861,179 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1331"/>
+        <location filename="../core/profile.c" line="1349"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation>Sikkerhetsstopp: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1334"/>
+        <location filename="../core/profile.c" line="1352"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation>Sikkerhetsstopp: ukjent tid @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1339"/>
+        <location filename="../core/profile.c" line="1357"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation>Deko: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1342"/>
+        <location filename="../core/profile.c" line="1360"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation>Deko: ukjent tid @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1346"/>
+        <location filename="../core/profile.c" line="1364"/>
         <source>In deco
 </source>
         <translation>I deko
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1348"/>
+        <location filename="../core/profile.c" line="1366"/>
         <source>NDL: %umin
 </source>
         <translation>NDL: %umin
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1351"/>
+        <location filename="../core/profile.c" line="1369"/>
         <source>TTS: %umin
 </source>
         <translation>TTS: %umin
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1354"/>
+        <location filename="../core/profile.c" line="1372"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation>Deko: %umin @ %.0f%s (kalk.)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1362"/>
+        <location filename="../core/profile.c" line="1380"/>
         <source>In deco (calc)
 </source>
         <translation>I deko (kalk.)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1365"/>
+        <location filename="../core/profile.c" line="1383"/>
         <source>NDL: %umin (calc)
 </source>
         <translation>NDL: %umin (kalk.)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1367"/>
+        <location filename="../core/profile.c" line="1385"/>
         <source>NDL: &gt;2h (calc)
 </source>
         <translation>NDL: &gt;2h (kalk.)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1371"/>
+        <location filename="../core/profile.c" line="1389"/>
         <source>TTS: %umin (calc)
 </source>
         <translation>TTS: %umin (kalk.)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1373"/>
+        <location filename="../core/profile.c" line="1391"/>
         <source>TTS: &gt;2h (calc)
 </source>
         <translation>TTS: &gt;2h (kalk.)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1376"/>
+        <location filename="../core/profile.c" line="1394"/>
         <source>RBT: %umin
 </source>
         <translation>RBT: %umin
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1379"/>
+        <location filename="../core/profile.c" line="1397"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation>Kalkulert tak %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1385"/>
+        <location filename="../core/profile.c" line="1403"/>
         <source>Tissue %.0fmin: %.1f%s
 </source>
         <translation>Vev %.0fmin: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1391"/>
+        <location filename="../core/profile.c" line="1409"/>
         <source>heartbeat: %d
 </source>
         <translation>puls: %d
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1393"/>
+        <location filename="../core/profile.c" line="1411"/>
         <source>bearing: %d
 </source>
         <translation>retning: %d
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1396"/>
+        <location filename="../core/profile.c" line="1414"/>
         <source>mean depth to here %.1f%s
 </source>
         <translation>snittdybde hit  %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1491"/>
+        <location filename="../core/profile.c" line="1515"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1495"/>
-        <location filename="../core/profile.c" line="1499"/>
-        <location filename="../core/profile.c" line="1503"/>
+        <location filename="../core/profile.c" line="1519"/>
+        <location filename="../core/profile.c" line="1523"/>
+        <location filename="../core/profile.c" line="1527"/>
         <source>%s %sD:%.1f%s</source>
         <translation>%s %sD:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1507"/>
+        <location filename="../core/profile.c" line="1531"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sD:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1511"/>
+        <location filename="../core/profile.c" line="1535"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1515"/>
-        <location filename="../core/profile.c" line="1519"/>
+        <location filename="../core/profile.c" line="1539"/>
+        <location filename="../core/profile.c" line="1543"/>
         <source>%s %sV:%.2f%s</source>
         <translation>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1526"/>
+        <location filename="../core/profile.c" line="1550"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s</translation>
     </message>
     <message>
+        <location filename="../core/profile.c" line="1575"/>
+        <source>%s SAC:%.*f %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../core/qthelper.cpp" line="67"/>
         <source>%1km</source>
         <translation>%1km</translation>
@@ -9610,446 +10054,460 @@ EADD: %d%s
         <translation>%1yd</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="635"/>
+        <location filename="../core/qthelper.cpp" line="91"/>
+        <location filename="../core/qthelper.cpp" line="226"/>
+        <source>N</source>
+        <translation>N</translation>
+    </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="91"/>
+        <location filename="../core/qthelper.cpp" line="227"/>
+        <source>S</source>
+        <translation>S</translation>
+    </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="92"/>
+        <location filename="../core/qthelper.cpp" line="228"/>
+        <source>E</source>
+        <translation>Ø</translation>
+    </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="92"/>
+        <location filename="../core/qthelper.cpp" line="229"/>
+        <source>W</source>
+        <translation>V</translation>
+    </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="640"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="638"/>
+        <location filename="../core/qthelper.cpp" line="643"/>
         <source>F</source>
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="23"/>
-        <source>boat</source>
-        <translation>båt</translation>
+        <location filename="../core/save-html.c" line="469"/>
+        <location filename="../core/save-html.c" line="553"/>
+        <location filename="../core/worldmap-save.c" line="111"/>
+        <source>Can&apos;t open file %s</source>
+        <translation>Klarer ikke åpne fila %s</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="23"/>
-        <source>shore</source>
-        <translation>landdykk</translation>
+        <location filename="../core/save-html.c" line="488"/>
+        <source>Number</source>
+        <translation>Tall</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="459"/>
-        <location filename="../core/dive.c" line="23"/>
-        <source>drift</source>
-        <translation>strømdykk</translation>
+        <location filename="../core/save-html.c" line="489"/>
+        <source>Date</source>
+        <translation>Dato</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="24"/>
-        <source>deep</source>
-        <translation>dypdykk</translation>
+        <location filename="../core/save-html.c" line="490"/>
+        <source>Time</source>
+        <translation>Tid</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="24"/>
-        <source>cavern</source>
-        <translation>hule</translation>
+        <location filename="../core/save-html.c" line="491"/>
+        <source>Location</source>
+        <translation>Sted</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="443"/>
-        <location filename="../core/dive.c" line="24"/>
-        <source>ice</source>
-        <translation>isdykk</translation>
+        <location filename="../core/save-html.c" line="492"/>
+        <source>Air temp.</source>
+        <translation>Lufttemp.</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="445"/>
-        <source>search</source>
-        <translation>søk</translation>
+        <location filename="../core/save-html.c" line="493"/>
+        <source>Water temp.</source>
+        <translation>Vanntemp.</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="455"/>
-        <location filename="../core/dive.c" line="25"/>
-        <source>wreck</source>
-        <translation>vrakdykk</translation>
+        <location filename="../core/save-html.c" line="494"/>
+        <source>Dives</source>
+        <translation>Dykk</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="441"/>
-        <location filename="../core/dive.c" line="25"/>
-        <source>cave</source>
-        <translation>grotte</translation>
+        <location filename="../core/save-html.c" line="495"/>
+        <source>Expand all</source>
+        <translation>Fold ut turer</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="25"/>
-        <source>altitude</source>
-        <translation>høydedykk</translation>
+        <location filename="../core/save-html.c" line="496"/>
+        <source>Collapse all</source>
+        <translation>Fold sammen turer</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="26"/>
-        <source>pool</source>
-        <translation>basseng</translation>
+        <location filename="../core/save-html.c" line="497"/>
+        <source>Trips</source>
+        <translation>Turer</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="26"/>
-        <source>lake</source>
-        <translation>innsjø</translation>
+        <location filename="../core/save-html.c" line="498"/>
+        <source>Statistics</source>
+        <translation>Statistikk</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="457"/>
-        <location filename="../core/dive.c" line="26"/>
-        <source>river</source>
-        <translation>elv</translation>
+        <location filename="../core/save-html.c" line="499"/>
+        <source>Advanced search</source>
+        <translation>Avansert søk</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="439"/>
-        <location filename="../core/dive.c" line="27"/>
-        <source>night</source>
-        <translation>nattdykk</translation>
+        <location filename="../core/save-html.c" line="502"/>
+        <source>Rating</source>
+        <translation>Vurdering</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="153"/>
-        <source>Error: the file does not appear to be a DATATRAK divelog</source>
-        <translation>Feil: dette ser ikke ut til å være en DATATRAK-fil</translation>
+        <location filename="../core/save-html.c" line="503"/>
+        <source>Visibility</source>
+        <translation>Sikt</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="286"/>
-        <source>clear</source>
-        <translation>klart</translation>
+        <location filename="../core/save-html.c" line="504"/>
+        <source>Duration</source>
+        <translation>Varighet</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="289"/>
-        <source>misty</source>
-        <translation>lett tåke</translation>
+        <location filename="../core/save-html.c" line="505"/>
+        <source>Divemaster</source>
+        <translation>Dykkeleder</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="292"/>
-        <source>fog</source>
-        <translation>tåke</translation>
+        <location filename="../core/save-html.c" line="506"/>
+        <source>Buddy</source>
+        <translation>Buddy</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="295"/>
-        <source>rain</source>
-        <translation>regn</translation>
+        <location filename="../core/save-html.c" line="507"/>
+        <source>Suit</source>
+        <translation>Drakt</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="298"/>
-        <source>storm</source>
-        <translation>storm</translation>
+        <location filename="../core/save-html.c" line="508"/>
+        <source>Tags</source>
+        <translation>Emner</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="301"/>
-        <source>snow</source>
-        <translation>sn</translation>
+        <location filename="../core/save-html.c" line="509"/>
+        <location filename="../smtk-import/smartrak.c" line="251"/>
+        <location filename="../smtk-import/smartrak.c" line="321"/>
+        <source>Notes</source>
+        <translation>Notater</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="321"/>
-        <source>No suit</source>
-        <translation>Ingen drakt</translation>
+        <location filename="../core/save-html.c" line="510"/>
+        <source>Show more details</source>
+        <translation>Vis flere detaljer</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="324"/>
-        <source>Shorty</source>
-        <translation>Shorty</translation>
+        <location filename="../core/save-html.c" line="513"/>
+        <source>Yearly statistics</source>
+        <translation>Årsstatistikk</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="327"/>
-        <source>Combi</source>
-        <translation>Kombi</translation>
+        <location filename="../core/save-html.c" line="514"/>
+        <source>Year</source>
+        <translation>År</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="330"/>
-        <source>Wet suit</source>
-        <translation>Våtdrakt</translation>
+        <location filename="../core/save-html.c" line="515"/>
+        <source>Total time</source>
+        <translation>Totaltid</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="333"/>
-        <source>Semidry suit</source>
-        <translation>Semidry</translation>
+        <location filename="../core/save-html.c" line="516"/>
+        <source>Average time</source>
+        <translation>Snittid</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="336"/>
-        <source>Dry suit</source>
-        <translation>Tørrdrakt</translation>
+        <location filename="../core/save-html.c" line="517"/>
+        <source>Shortest time</source>
+        <translation>Korteste tid</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="396"/>
-        <source>no stop</source>
-        <translation>ingen stop</translation>
+        <location filename="../core/save-html.c" line="518"/>
+        <source>Longest time</source>
+        <translation>Lengste tid</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="400"/>
-        <source>single ascent</source>
-        <translation>enkel oppstigning</translation>
+        <location filename="../core/save-html.c" line="519"/>
+        <source>Average depth</source>
+        <translation>Snittdybde</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="402"/>
-        <source>multiple ascent</source>
-        <translation>flere oppstigninger</translation>
+        <location filename="../core/save-html.c" line="520"/>
+        <source>Min. depth</source>
+        <translation>Min. dybde</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="404"/>
-        <location filename="../core/dive.c" line="27"/>
-        <source>fresh</source>
-        <translation>ferskvann</translation>
+        <location filename="../core/save-html.c" line="521"/>
+        <source>Max. depth</source>
+        <translation>Maksdybde</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="406"/>
-        <source>salt water</source>
-        <translation>saltvan</translation>
+        <location filename="../core/save-html.c" line="522"/>
+        <source>Average SAC</source>
+        <translation>Snitt-SAC</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="431"/>
-        <source>sight seeing</source>
-        <translation>sightseeing</translation>
+        <location filename="../core/save-html.c" line="523"/>
+        <source>Min. SAC</source>
+        <translation>Min. SAC</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="433"/>
-        <source>club dive</source>
-        <translation>klubbdyk</translation>
+        <location filename="../core/save-html.c" line="524"/>
+        <source>Max. SAC</source>
+        <translation>Maks. SAC</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="437"/>
-        <source>instruction</source>
-        <translation>instruksjon</translation>
+        <location filename="../core/save-html.c" line="525"/>
+        <source>Average temp.</source>
+        <translation>Snitt-temp.</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="463"/>
-        <source>other</source>
-        <translation>annet</translation>
+        <location filename="../core/save-html.c" line="526"/>
+        <source>Min. temp.</source>
+        <translation>Min. temp</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="474"/>
-        <source>Other activities</source>
-        <translation>Andre aktiviteter</translation>
+        <location filename="../core/save-html.c" line="527"/>
+        <source>Max. temp.</source>
+        <translation>Maks. temp.</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="498"/>
-        <source>Datatrak/Wlog notes</source>
-        <translation>Datatrak/Wlog-notater</translation>
+        <location filename="../core/save-html.c" line="528"/>
+        <source>Back to list</source>
+        <translation>Tilbake til liste</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="537"/>
-        <source>Manually entered dive</source>
-        <translation>Dykk lagt inn manuelt</translation>
+        <location filename="../core/save-html.c" line="531"/>
+        <source>Dive No.</source>
+        <translation>Dykk nr.</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="588"/>
-        <source>Unknown</source>
-        <translation>Ukjent</translation>
+        <location filename="../core/save-html.c" line="532"/>
+        <source>Dive profile</source>
+        <translation>Dykkeprofil</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="674"/>
-        <source>Error: couldn&apos;t open the file %s</source>
-        <translation>Feil: kunne ikke åpne %s</translation>
+        <location filename="../core/save-html.c" line="533"/>
+        <source>Dive information</source>
+        <translation>Dykkeinformasjon</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="687"/>
-        <source>Error: no dive</source>
-        <translation>Feil: Ikke noe dykk</translation>
+        <location filename="../core/save-html.c" line="534"/>
+        <source>Dive equipment</source>
+        <translation>Dykkerutstyr</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="27"/>
-        <source>student</source>
-        <translation>elev</translation>
+        <location filename="../core/save-html.c" line="535"/>
+        <location filename="../core/save-html.c" line="542"/>
+        <source>Type</source>
+        <translation>Type</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="461"/>
-        <location filename="../core/dive.c" line="28"/>
-        <source>photo</source>
-        <translation>foto</translation>
+        <location filename="../core/save-html.c" line="536"/>
+        <source>Size</source>
+        <translation>Størrelse</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="28"/>
-        <source>video</source>
-        <translation>video</translation>
+        <location filename="../core/save-html.c" line="537"/>
+        <source>Work pressure</source>
+        <translation>Trykkrating</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="435"/>
-        <location filename="../core/dive.c" line="28"/>
-        <source>instructor</source>
-        <translation>instruktør</translation>
+        <location filename="../core/save-html.c" line="538"/>
+        <source>Start pressure</source>
+        <translation>Starttrykk</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="398"/>
-        <location filename="../core/dive.c" line="29"/>
-        <source>deco</source>
-        <translation>deko</translation>
+        <location filename="../core/save-html.c" line="539"/>
+        <source>End pressure</source>
+        <translation>Sluttrykk</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="33"/>
-        <source>OC-gas</source>
-        <translation>OC-gass</translation>
+        <location filename="../core/save-html.c" line="540"/>
+        <source>Gas</source>
+        <translation>Gass</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="33"/>
-        <source>diluent</source>
-        <translation>diluent</translation>
+        <location filename="../core/save-html.c" line="541"/>
+        <source>Weight</source>
+        <translation>Vekt</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="33"/>
-        <location filename="../core/equipment.c" line="88"/>
-        <location filename="../core/planner.c" line="1415"/>
-        <location filename="../core/planner.c" line="1418"/>
-        <source>oxygen</source>
-        <translation>oksygen</translation>
+        <location filename="../core/save-html.c" line="543"/>
+        <source>Events</source>
+        <translation>Hendelser</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="227"/>
-        <source>ℓ</source>
-        <translation>ℓ</translation>
+        <location filename="../core/save-html.c" line="544"/>
+        <source>Name</source>
+        <translation>Navn</translation>
+    </message>
+    <message>
+        <location filename="../core/save-html.c" line="545"/>
+        <source>Value</source>
+        <translation>Verdi</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="239"/>
+        <location filename="../core/save-html.c" line="546"/>
+        <source>Coordinates</source>
+        <translation>Koordinater</translation>
+    </message>
+    <message>
+        <location filename="../core/save-html.c" line="547"/>
+        <source>Dive status</source>
+        <translation>Dykkestatus</translation>
+    </message>
+    <message>
+        <location filename="../core/statistics.c" line="242"/>
         <source>more than %d days</source>
         <translation>mer enn %d dager</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="246"/>
+        <location filename="../core/statistics.c" line="249"/>
         <source>%dd %dh %dmin</source>
         <translation>%dt %dt %dmin</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="249"/>
+        <location filename="../core/statistics.c" line="252"/>
         <source>%dmin %dsecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="251"/>
+        <location filename="../core/statistics.c" line="254"/>
         <source>%dh %dmin</source>
         <translation>%dt %dmin</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="263"/>
+        <location filename="../core/statistics.c" line="266"/>
         <source>for dives #</source>
         <translation>for dykk #</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="269"/>
+        <location filename="../core/statistics.c" line="272"/>
         <source>for selected dives</source>
         <translation>for valgte dykk</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="304"/>
+        <location filename="../core/statistics.c" line="307"/>
         <source>for dive #%d</source>
         <translation>for dykk #%d</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="306"/>
+        <location filename="../core/statistics.c" line="309"/>
         <source>for selected dive</source>
         <translation>for valgte dykk</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="308"/>
+        <location filename="../core/statistics.c" line="311"/>
         <source>for all dives</source>
         <translation>for alle dykk</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="310"/>
+        <location filename="../core/statistics.c" line="313"/>
         <source>(no dives)</source>
         <translation>(ingen dykk)</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Sun</source>
         <translation>søn</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Mon</source>
         <translation>man</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Tue</source>
         <translation>tir</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Wed</source>
         <translation>ons</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Thu</source>
         <translation>tor</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Fri</source>
         <translation>fre</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Sat</source>
         <translation>lør</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Jan</source>
         <translation>jan</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Feb</source>
         <translation>feb</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Mar</source>
         <translation>mar</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Apr</source>
         <translation>apr</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>May</source>
         <translation>mai</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Jun</source>
         <translation>jun</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Jul</source>
         <translation>jul</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Aug</source>
         <translation>aug</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Sep</source>
         <translation>sep</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Oct</source>
         <translation>okt</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Nov</source>
         <translation>nov</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Dec</source>
         <translation>des</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="191"/>
-        <location filename="../core/parse-xml.c" line="3284"/>
-        <location filename="../core/uemis-downloader.c" line="134"/>
-        <source>unknown</source>
-        <translation>ukjent</translation>
-    </message>
-    <message>
-        <location filename="../core/uemis-downloader.c" line="467"/>
-        <source>data</source>
-        <translation>data</translation>
-    </message>
-    <message>
-        <location filename="../core/uemis-downloader.c" line="447"/>
-        <source>%s %s</source>
-        <translation>%s %s</translation>
-    </message>
-    <message>
         <location filename="../core/uemis-downloader.c" line="27"/>
         <source>Uemis Zurich: the file system is almost full.
 Disconnect/reconnect the dive computer
@@ -10081,6 +10539,16 @@ Er Uemis Zurich plugget i ordentlig?</translation>
         <translation>Ingen dykk å laste ned</translation>
     </message>
     <message>
+        <location filename="../core/uemis-downloader.c" line="447"/>
+        <source>%s %s</source>
+        <translation>%s %s</translation>
+    </message>
+    <message>
+        <location filename="../core/uemis-downloader.c" line="467"/>
+        <source>data</source>
+        <translation>data</translation>
+    </message>
+    <message>
         <location filename="../core/uemis-downloader.c" line="495"/>
         <source>divelog #</source>
         <translation>logg # </translation>
@@ -10251,281 +10719,6 @@ Er Uemis Zurich plugget i ordentlig?</translation>
         <translation>Alarm: dårlig batteri</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="469"/>
-        <location filename="../core/save-html.c" line="553"/>
-        <location filename="../core/worldmap-save.c" line="111"/>
-        <source>Can&apos;t open file %s</source>
-        <translation>Klarer ikke åpne fila %s</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="488"/>
-        <source>Number</source>
-        <translation>Tall</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="489"/>
-        <source>Date</source>
-        <translation>Dato</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="490"/>
-        <source>Time</source>
-        <translation>Tid</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="491"/>
-        <source>Location</source>
-        <translation>Sted</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="492"/>
-        <source>Air temp.</source>
-        <translation>Lufttemp.</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="493"/>
-        <source>Water temp.</source>
-        <translation>Vanntemp.</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="498"/>
-        <source>Statistics</source>
-        <translation>Statistikk</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="502"/>
-        <source>Rating</source>
-        <translation>Vurdering</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="503"/>
-        <source>Visibility</source>
-        <translation>Sikt</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="504"/>
-        <source>Duration</source>
-        <translation>Varighet</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="494"/>
-        <source>Dives</source>
-        <translation>Dykk</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="495"/>
-        <source>Expand all</source>
-        <translation>Fold ut turer</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="496"/>
-        <source>Collapse all</source>
-        <translation>Fold sammen turer</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="497"/>
-        <source>Trips</source>
-        <translation>Turer</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="499"/>
-        <source>Advanced search</source>
-        <translation>Avansert søk</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="505"/>
-        <source>Divemaster</source>
-        <translation>Dykkeleder</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="506"/>
-        <source>Buddy</source>
-        <translation>Buddy</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="507"/>
-        <source>Suit</source>
-        <translation>Drakt</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="508"/>
-        <source>Tags</source>
-        <translation>Emner</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="509"/>
-        <location filename="../smtk-import/smartrak.c" line="251"/>
-        <location filename="../smtk-import/smartrak.c" line="321"/>
-        <source>Notes</source>
-        <translation>Notater</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="510"/>
-        <source>Show more details</source>
-        <translation>Vis flere detaljer</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="513"/>
-        <source>Yearly statistics</source>
-        <translation>Årsstatistikk</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="514"/>
-        <source>Year</source>
-        <translation>År</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="515"/>
-        <source>Total time</source>
-        <translation>Totaltid</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="516"/>
-        <source>Average time</source>
-        <translation>Snittid</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="517"/>
-        <source>Shortest time</source>
-        <translation>Korteste tid</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="518"/>
-        <source>Longest time</source>
-        <translation>Lengste tid</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="519"/>
-        <source>Average depth</source>
-        <translation>Snittdybde</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="520"/>
-        <source>Min. depth</source>
-        <translation>Min. dybde</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="521"/>
-        <source>Max. depth</source>
-        <translation>Maksdybde</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="523"/>
-        <source>Min. SAC</source>
-        <translation>Min. SAC</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="524"/>
-        <source>Max. SAC</source>
-        <translation>Maks. SAC</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="525"/>
-        <source>Average temp.</source>
-        <translation>Snitt-temp.</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="526"/>
-        <source>Min. temp.</source>
-        <translation>Min. temp</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="527"/>
-        <source>Max. temp.</source>
-        <translation>Maks. temp.</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="528"/>
-        <source>Back to list</source>
-        <translation>Tilbake til liste</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="534"/>
-        <source>Dive equipment</source>
-        <translation>Dykkerutstyr</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="537"/>
-        <source>Work pressure</source>
-        <translation>Trykkrating</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="538"/>
-        <source>Start pressure</source>
-        <translation>Starttrykk</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="539"/>
-        <source>End pressure</source>
-        <translation>Sluttrykk</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="547"/>
-        <source>Dive status</source>
-        <translation>Dykkestatus</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="522"/>
-        <source>Average SAC</source>
-        <translation>Snitt-SAC</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="531"/>
-        <source>Dive No.</source>
-        <translation>Dykk nr.</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="532"/>
-        <source>Dive profile</source>
-        <translation>Dykkeprofil</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="533"/>
-        <source>Dive information</source>
-        <translation>Dykkeinformasjon</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="535"/>
-        <location filename="../core/save-html.c" line="542"/>
-        <source>Type</source>
-        <translation>Type</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="536"/>
-        <source>Size</source>
-        <translation>Størrelse</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="540"/>
-        <source>Gas</source>
-        <translation>Gass</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="541"/>
-        <source>Weight</source>
-        <translation>Vekt</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="543"/>
-        <source>Events</source>
-        <translation>Hendelser</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="544"/>
-        <source>Name</source>
-        <translation>Navn</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="545"/>
-        <source>Value</source>
-        <translation>Verdi</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="546"/>
-        <source>Coordinates</source>
-        <translation>Koordinater</translation>
-    </message>
-    <message>
         <location filename="../core/worldmap-save.c" line="39"/>
         <source>Date:</source>
         <translation>Dato:</translation>
@@ -10571,110 +10764,6 @@ Er Uemis Zurich plugget i ordentlig?</translation>
         <translation>Notater:</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="91"/>
-        <location filename="../core/qthelper.cpp" line="226"/>
-        <source>N</source>
-        <translation>N</translation>
-    </message>
-    <message>
-        <location filename="../core/qthelper.cpp" line="91"/>
-        <location filename="../core/qthelper.cpp" line="227"/>
-        <source>S</source>
-        <translation>S</translation>
-    </message>
-    <message>
-        <location filename="../core/qthelper.cpp" line="92"/>
-        <location filename="../core/qthelper.cpp" line="228"/>
-        <source>E</source>
-        <translation>Ø</translation>
-    </message>
-    <message>
-        <location filename="../core/qthelper.cpp" line="92"/>
-        <location filename="../core/qthelper.cpp" line="229"/>
-        <source>W</source>
-        <translation>V</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="341"/>
-        <source>Remote storage and local data diverged. Error: merge failed (%s)</source>
-        <translation>Skylager og lokal data avviker. Feil: merge failed (%s)</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="134"/>
-        <source>Local cache directory %s corrupted - can&apos;t sync with Subsurface cloud storage</source>
-        <translation>Lokalt mellomlager i %s er ødelagt - kan ikke synkronisere med Subsurface skylager</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="157"/>
-        <location filename="../core/git-access.c" line="177"/>
-        <source>Could not update local cache to newer remote data</source>
-        <translation>Kunne ikke oppdatere lokalt mellomlager med nyere data</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="170"/>
-        <source>Subsurface cloud storage corrupted</source>
-        <translation>Subsurface skylager ødelagt</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="285"/>
-        <source>Could not update Subsurface cloud storage, try again later</source>
-        <translation>Kunne ikke oppdatere Subsurface skylager, prøv igjen senere</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="371"/>
-        <source>Remote storage and local data diverged. Cannot combine local and remote changes</source>
-        <translation>Skylager og lokal data er forskjellig. Klarer ikke å kombinere nye data med lokale data.</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="405"/>
-        <source>Remote storage and local data diverged</source>
-        <translation>Skylager og lokal data er forskjellig</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="408"/>
-        <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source>
-        <translation>Skylager og lokal data er forskjellig. Feil: kunne ikke skrive data (%s)</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="417"/>
-        <source>Problems with local cache of Subsurface cloud data</source>
-        <translation>Problemer med det lokale mellomlageret til skylageret</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="418"/>
-        <source>Moved cache data to %s. Please try the operation again.</source>
-        <translation>Flyttet mellomlager til %s. Prøv igjen.</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="737"/>
-        <source>Error connecting to Subsurface cloud storage</source>
-        <translation>Klarte ikke å koble til skylager for Subsurface</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="740"/>
-        <source>git clone of %s failed (%s)</source>
-        <translation>git clone of %s failed (%s)</translation>
-    </message>
-    <message>
-        <location filename="../core/load-git.c" line="222"/>
-        <location filename="../core/parse-xml.c" line="1300"/>
-        <source>additional name for site: %s
-</source>
-        <translation>ytterligere navn for sted: %s
-</translation>
-    </message>
-    <message>
-        <location filename="../core/ostctools.c" line="120"/>
-        <location filename="../core/ostctools.c" line="152"/>
-        <source>Unknown DC in dive %d</source>
-        <translation>Ukjent computer i dykk %d</translation>
-    </message>
-    <message>
-        <location filename="../core/ostctools.c" line="165"/>
-        <source>Error - %s - parsing dive %d</source>
-        <translation>Feil - %s - leser dykk %d</translation>
-    </message>
-    <message>
         <location filename="../smtk-import/smartrak.c" line="247"/>
         <source>Built</source>
         <translation type="unfinished"/>
@@ -10758,155 +10847,120 @@ Er Uemis Zurich plugget i ordentlig?</translation>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="91"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="103"/>
         <source>Subsurface</source>
         <translation>Subsurface</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="97"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="110"/>
         <source>Dive list</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="112"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="125"/>
         <source>Cloud credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="126"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="139"/>
         <source>Manage dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="138"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="141"/>
         <source>Add dive manually</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="146"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="149"/>
         <source>Manual sync with cloud</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="164"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="167"/>
         <source>Offline mode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="164"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="167"/>
         <source>Enable auto cloud sync</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="182"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="187"/>
         <source>GPS</source>
         <translation>GPS</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="185"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="190"/>
         <source>GPS-tag dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="192"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="197"/>
         <source>Upload GPS data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="199"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="204"/>
         <source>Download GPS data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="206"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="211"/>
         <source>Show GPS fixes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="215"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="220"/>
         <source>Clear GPS cache</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="221"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="226"/>
         <source>Preferences</source>
         <translation>Valg</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="230"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="237"/>
         <source>Developer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="232"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="239"/>
         <source>App log</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="239"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="246"/>
         <source>Theme information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="246"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="253"/>
         <source>User manual</source>
         <translation>Brukermanual</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="252"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="259"/>
         <source>About</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="283"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="304"/>
         <source>Run location service</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="283"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="304"/>
         <source>No GPS source available</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="295"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="316"/>
         <source>Actions</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="9"/>
-        <source>Hello World</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="13"/>
-        <source>File</source>
-        <translation>Fil</translation>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="15"/>
-        <source>&amp;Open</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="19"/>
-        <source>Exit</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="27"/>
-        <source>Button 1 pressed</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="28"/>
-        <source>Button 2 pressed</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="33"/>
-        <source>May I have your attention, please?</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>plannerDetails</name>
@@ -10984,6 +11038,24 @@ p, li { white-space: pre-wrap; }
         <translation>m/min</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="121"/>
+        <location filename="../build/ui_plannerSettings.h" line="425"/>
+        <source>75% to 50% avg. depth</source>
+        <translation>75% til 50% av snittdybde</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="138"/>
+        <location filename="../build/ui_plannerSettings.h" line="427"/>
+        <source>50% avg. depth to 6m</source>
+        <translation>50% av snittdybde til 6m</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="155"/>
+        <location filename="../build/ui_plannerSettings.h" line="429"/>
+        <source>6m to surface</source>
+        <translation>6m til overflaten</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="175"/>
         <location filename="../build/ui_plannerSettings.h" line="431"/>
         <source>Descent</source>
@@ -11007,12 +11079,35 @@ p, li { white-space: pre-wrap; }
         <translation>VPM-B deko</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="268"/>
+        <source>Bühlmann deco</source>
+        <translation>Bühlmann deko</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="278"/>
         <location filename="../build/ui_plannerSettings.h" line="445"/>
         <source>Reserve gas</source>
         <translation>Reservegass</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="288"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="549"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="578"/>
+        <location filename="../build/ui_plannerSettings.h" line="446"/>
+        <location filename="../build/ui_plannerSettings.h" line="459"/>
+        <location filename="../build/ui_plannerSettings.h" line="461"/>
+        <source>bar</source>
+        <translation>bar</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="307"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="416"/>
+        <location filename="../build/ui_plannerSettings.h" line="437"/>
+        <location filename="../build/ui_plannerSettings.h" line="440"/>
+        <source>%</source>
+        <translation>%</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="320"/>
         <location filename="../build/ui_plannerSettings.h" line="449"/>
         <source>Postpone gas change if a stop is not required</source>
@@ -11031,12 +11126,10 @@ p, li { white-space: pre-wrap; }
         <translation>GF low</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="307"/>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="416"/>
-        <location filename="../build/ui_plannerSettings.h" line="437"/>
-        <location filename="../build/ui_plannerSettings.h" line="440"/>
-        <source>%</source>
-        <translation>%</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="353"/>
+        <location filename="../build/ui_plannerSettings.h" line="436"/>
+        <source>Plan backgas breaks</source>
+        <translation>Planlegg stopp med bakgass</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="360"/>
@@ -11045,10 +11138,10 @@ p, li { white-space: pre-wrap; }
         <translation>GF high</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="429"/>
-        <location filename="../build/ui_plannerSettings.h" line="441"/>
-        <source>Drop to first depth</source>
-        <translation>Dropp til første dybde</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="370"/>
+        <location filename="../build/ui_plannerSettings.h" line="453"/>
+        <source>min</source>
+        <translation>min</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="389"/>
@@ -11057,163 +11150,139 @@ p, li { white-space: pre-wrap; }
         <translation>Siste stopp ved 6m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="353"/>
-        <location filename="../build/ui_plannerSettings.h" line="436"/>
-        <source>Plan backgas breaks</source>
-        <translation>Planlegg stopp med bakgass</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="396"/>
+        <source>Maximize bottom time allowed by gas and no decompression limits</source>
+        <translation>Maksimal bunntid utifra gass og dekompresjonsgrenser</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="515"/>
-        <location filename="../build/ui_plannerSettings.h" line="455"/>
-        <source>Gas options</source>
-        <translation>Gassvalg</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="399"/>
+        <location filename="../build/ui_plannerSettings.h" line="443"/>
+        <source>Recreational mode</source>
+        <translation>Rekreasjonsmodus</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="594"/>
-        <location filename="../build/ui_plannerSettings.h" line="456"/>
-        <source>Bottom SAC</source>
-        <translation>SAC på bunn</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="429"/>
+        <location filename="../build/ui_plannerSettings.h" line="441"/>
+        <source>Drop to first depth</source>
+        <translation>Dropp til første dybde</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="692"/>
-        <location filename="../build/ui_plannerSettings.h" line="457"/>
-        <source>Deco SAC</source>
-        <translation>SAC under deko</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="436"/>
+        <location filename="../build/ui_plannerSettings.h" line="452"/>
+        <source>Min. switch duration</source>
+        <translation>Minimum tid for bytte</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="601"/>
-        <location filename="../build/ui_plannerSettings.h" line="458"/>
-        <source>Bottom pO₂</source>
-        <translation>pO₂ på bunn</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="459"/>
+        <location filename="../build/ui_plannerSettings.h" line="444"/>
+        <source>Safety stop</source>
+        <translation>Sikkerhetsstopp</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="685"/>
-        <location filename="../build/ui_plannerSettings.h" line="460"/>
-        <source>Deco pO₂</source>
-        <translation>pO₂ for deko</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="495"/>
+        <source>Conservatism level</source>
+        <translation>Konservatisme</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="515"/>
+        <location filename="../build/ui_plannerSettings.h" line="455"/>
+        <source>Gas options</source>
+        <translation>Gassvalg</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="565"/>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="672"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="698"/>
         <location filename="../build/ui_plannerSettings.h" line="462"/>
         <location filename="../build/ui_plannerSettings.h" line="463"/>
         <source>ℓ/min</source>
         <translation>ℓ/min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="632"/>
-        <location filename="../build/ui_plannerSettings.h" line="468"/>
-        <source>Display runtime</source>
-        <translation>Vis løpetid</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="645"/>
-        <location filename="../build/ui_plannerSettings.h" line="472"/>
-        <source>Display segment duration</source>
-        <translation>Vis lengde på segment</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="655"/>
-        <location filename="../build/ui_plannerSettings.h" line="476"/>
-        <source>Display transitions in deco</source>
-        <translation>Vis overganger i deko</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="662"/>
-        <location filename="../build/ui_plannerSettings.h" line="477"/>
-        <source>Verbatim dive plan</source>
-        <translation>Utdypende dykkeplan</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="288"/>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="549"/>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="578"/>
-        <location filename="../build/ui_plannerSettings.h" line="446"/>
-        <location filename="../build/ui_plannerSettings.h" line="459"/>
-        <location filename="../build/ui_plannerSettings.h" line="461"/>
-        <source>bar</source>
-        <translation>bar</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="121"/>
-        <location filename="../build/ui_plannerSettings.h" line="425"/>
-        <source>75% to 50% avg. depth</source>
-        <translation>75% til 50% av snittdybde</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="138"/>
-        <location filename="../build/ui_plannerSettings.h" line="427"/>
-        <source>50% avg. depth to 6m</source>
-        <translation>50% av snittdybde til 6m</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="155"/>
-        <location filename="../build/ui_plannerSettings.h" line="429"/>
-        <source>6m to surface</source>
-        <translation>6m til overflaten</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="268"/>
-        <source>Bühlmann deco</source>
-        <translation>Bühlmann deko</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="370"/>
-        <location filename="../build/ui_plannerSettings.h" line="453"/>
-        <source>min</source>
-        <translation>min</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="396"/>
-        <source>Maximize bottom time allowed by gas and no decompression limits</source>
-        <translation>Maksimal bunntid utifra gass og dekompresjonsgrenser</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="594"/>
+        <source>m</source>
+        <translation>m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="399"/>
-        <location filename="../build/ui_plannerSettings.h" line="443"/>
-        <source>Recreational mode</source>
-        <translation>Rekreasjonsmodus</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="606"/>
+        <source>Used to calculate best mix. Select best mix depth in &apos;Available gases&apos; table by entering gas depth, followed by &quot;B&quot; (best trimix mix) or &quot;BN&quot; (best nitrox mix)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="436"/>
-        <location filename="../build/ui_plannerSettings.h" line="452"/>
-        <source>Min. switch duration</source>
-        <translation>Minimum tid for bytte</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="613"/>
+        <location filename="../build/ui_plannerSettings.h" line="456"/>
+        <source>Bottom SAC</source>
+        <translation>SAC på bunn</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="459"/>
-        <location filename="../build/ui_plannerSettings.h" line="444"/>
-        <source>Safety stop</source>
-        <translation>Sikkerhetsstopp</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="620"/>
+        <location filename="../build/ui_plannerSettings.h" line="458"/>
+        <source>Bottom pO₂</source>
+        <translation>pO₂ på bunn</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="495"/>
-        <source>Conservatism level</source>
-        <translation>Konservatisme</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="627"/>
+        <source>Best mix END</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="608"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="634"/>
         <location filename="../build/ui_plannerSettings.h" line="464"/>
         <source>Notes</source>
         <translation>Notater</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="629"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="655"/>
         <location filename="../build/ui_plannerSettings.h" line="466"/>
         <source>In dive plan, show runtime (absolute time) of stops</source>
         <translation>I dykkeplanen, vis stoppenes løpetid (absolutt tid)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="642"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="658"/>
+        <location filename="../build/ui_plannerSettings.h" line="468"/>
+        <source>Display runtime</source>
+        <translation>Vis løpetid</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="668"/>
         <location filename="../build/ui_plannerSettings.h" line="470"/>
         <source>In dive plan, show duration (relative time) of stops</source>
         <translation>I dykkeplanen, vis stoppenes lengde (relativ tid)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="652"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="671"/>
+        <location filename="../build/ui_plannerSettings.h" line="472"/>
+        <source>Display segment duration</source>
+        <translation>Vis lengde på segment</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="678"/>
         <location filename="../build/ui_plannerSettings.h" line="474"/>
         <source>In diveplan, list transitions or treat them as implicit</source>
         <translation>I dykkeplanen, vis overganger eller behandle dem eksplisitt</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="681"/>
+        <location filename="../build/ui_plannerSettings.h" line="476"/>
+        <source>Display transitions in deco</source>
+        <translation>Vis overganger i deko</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="688"/>
+        <location filename="../build/ui_plannerSettings.h" line="477"/>
+        <source>Verbatim dive plan</source>
+        <translation>Utdypende dykkeplan</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="711"/>
+        <location filename="../build/ui_plannerSettings.h" line="460"/>
+        <source>Deco pO₂</source>
+        <translation>pO₂ for deko</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="718"/>
+        <location filename="../build/ui_plannerSettings.h" line="457"/>
+        <source>Deco SAC</source>
+        <translation>SAC under deko</translation>
+    </message>
 </context>
 </TS>
\ No newline at end of file
diff --git a/translations/subsurface_nl_NL.ts b/translations/subsurface_nl_NL.ts
index e8e7bdb06..0dcddc306 100644
--- a/translations/subsurface_nl_NL.ts
+++ b/translations/subsurface_nl_NL.ts
@@ -109,6 +109,11 @@
         <translation>Naam:</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="56"/>
+        <source>Could not initialize Winsock version 2.2</source>
+        <translation>Kan Winsock version 2.2 niet initialiseren</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="134"/>
         <source>Trying to turn on the local Bluetooth device...</source>
         <translation>Probeer het lokale Bluetooth toestel aan te zetten...</translation>
@@ -119,6 +124,11 @@
         <translation>Probeer het lokale Bluetooth toestel uit te zetten...</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="167"/>
+        <source>Remote devices list was cleared.</source>
+        <translation>Lijst met externe toestellen is leeg gemaakt.</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="183"/>
         <source>Scanning for remote devices...</source>
         <translation>Externe toestellen zoeken...</translation>
@@ -129,6 +139,22 @@
         <translation>Scan was succesvol.</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="208"/>
+        <source>The local Bluetooth device was %1.</source>
+        <extracomment>%1 will be replaced with &quot;turned on&quot; or &quot;turned off&quot;</extracomment>
+        <translation>Het lokale Bluetooth toestel was %1.</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
+        <source>turned on</source>
+        <translation>aangezet</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
+        <source>turned off</source>
+        <translation>uitgezet</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="225"/>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="339"/>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="359"/>
@@ -176,37 +202,6 @@
         <translation>Koppel</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="352"/>
-        <source>Device %1 was paired and is authorized.</source>
-        <translation>Toestel %1 is gekoppeld en toegestaan.</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="56"/>
-        <source>Could not initialize Winsock version 2.2</source>
-        <translation>Kan Winsock version 2.2 niet initialiseren</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="167"/>
-        <source>Remote devices list was cleared.</source>
-        <translation>Lijst met externe toestellen is leeg gemaakt.</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="208"/>
-        <source>The local Bluetooth device was %1.</source>
-        <extracomment>%1 will be replaced with &quot;turned on&quot; or &quot;turned off&quot;</extracomment>
-        <translation>Het lokale Bluetooth toestel was %1.</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
-        <source>turned on</source>
-        <translation>aangezet</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
-        <source>turned off</source>
-        <translation>uitgezet</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="307"/>
         <source>Remove pairing</source>
         <translation>Ontkoppel</translation>
@@ -232,6 +227,11 @@
         <translation>Toestel %1 was gekoppeld.</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="352"/>
+        <source>Device %1 was paired and is authorized.</source>
+        <translation>Toestel %1 is gekoppeld en toegestaan.</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="378"/>
         <source>The device %1 can now be used for connection. You can press the Save button.</source>
         <translation>Toestel %1 kan gebruikt worden voor connectie. Druk op de Opslaan knop.</translation>
@@ -290,12 +290,12 @@
 <context>
     <name>BuddyFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="621"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="619"/>
         <source>Person: </source>
         <translation>Persoon:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="622"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="620"/>
         <source>Searches for buddies and divemasters</source>
         <translation>zoekt naar buddies en divemasters</translation>
     </message>
@@ -303,7 +303,7 @@
 <context>
     <name>BuddyFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="243"/>
+        <location filename="../qt-models/filtermodels.cpp" line="248"/>
         <source>No buddies</source>
         <translation>Geen buddies</translation>
     </message>
@@ -311,25 +311,30 @@
 <context>
     <name>CloudCredentials</name>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="49"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="50"/>
         <source>Cloud credentials</source>
         <translation>Cloud rechten</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="55"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="56"/>
         <source>Email</source>
         <translation>Email</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="67"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="68"/>
         <source>Password</source>
         <translation>Wachtwoord</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="90"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="92"/>
         <source>Show password</source>
         <translation>Toon wachtwoord</translation>
     </message>
+    <message>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="97"/>
+        <source>PIN</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>ColumnNameProvider</name>
@@ -385,6 +390,16 @@
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
+        <source>Max. depth</source>
+        <translation>Max. diepte</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
+        <source>Avg. depth</source>
+        <translation>Gem. diepte</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
         <source>Divemaster</source>
         <translation>Duikleider</translation>
     </message>
@@ -395,6 +410,11 @@
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
+        <source>Suit</source>
+        <translation>Pak</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
         <source>Notes</source>
         <translation>Notities</translation>
     </message>
@@ -414,21 +434,6 @@
         <translation>Water temp.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
-        <source>Max. depth</source>
-        <translation>Max. diepte</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
-        <source>Avg. depth</source>
-        <translation>Gem. diepte</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
-        <source>Suit</source>
-        <translation>Pak</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="44"/>
         <source>O₂</source>
         <translation>O₂</translation>
@@ -542,7 +547,7 @@
         <translation>Kan geen context creëren voor libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../core/configuredivecomputer.cpp" line="660"/>
+        <location filename="../core/configuredivecomputer.cpp" line="656"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation>Kon geen verbinding maken met de duikcomputer.</translation>
     </message>
@@ -562,11 +567,19 @@
         <translation>Device of mountpoint</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="170"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1520"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1533"/>
-        <source>...</source>
-        <translation>...</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="47"/>
+        <source>Connect via Bluetooth</source>
+        <translation>Aansluiten via Bluetooth</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="54"/>
+        <source>Connect</source>
+        <translation>Verbind</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="64"/>
+        <source>Disconnect</source>
+        <translation>Verbreek verbinding</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="80"/>
@@ -575,12 +588,24 @@
         <translation>Beschikbare details ophalen</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="90"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1523"/>
+        <source>Read settings from backup file or from device before writing to the device</source>
+        <translation>Instellingen lezen van een backup bestand of van het toestel vóór het bewaren op het toestel</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="93"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1525"/>
         <source>Save changes to device</source>
         <translation>Aanpassingen opslaan op het toestel</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="116"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1527"/>
+        <source>Read settings from backup file or from device before writing to a backup file</source>
+        <translation>Instellingen lezen van een backup bestand of van het toestel vóór het bewaren in een backup bestand</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="119"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1529"/>
         <source>Backup</source>
@@ -599,15 +624,40 @@
         <translation>Firmware updaten</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="163"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1532"/>
+        <source>Save libdivecomputer logfile</source>
+        <translation>libdivecomputer logbestand opslaan</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="170"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1520"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1533"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="177"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1534"/>
         <source>Cancel</source>
         <translation>Annuleren</translation>
     </message>
     <message>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1539"/>
-        <source>OSTC 3</source>
-        <translation>OSTC 3</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="214"/>
+        <source>OSTC 3,Sport,Cr,2</source>
+        <translation>OSTC 3,Sport,Cr,2</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="223"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1541"/>
+        <source>Suunto Vyper family</source>
+        <translation>Suunto Vyper familie</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="232"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1543"/>
+        <source>OSTC, Mk.2/2N/2C</source>
+        <translation>OSTC, Mk.2/2N/2C</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="253"/>
@@ -620,40 +670,56 @@
         <translation>Basisinstellingen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="326"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1656"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1943"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1546"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1726"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1766"/>
-        <source>Serial No.</source>
-        <translation>Serienummer</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="260"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1575"/>
+        <source>Eco</source>
+        <translation>Eco</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="349"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1679"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1980"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1547"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1727"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1767"/>
-        <source>Firmware version</source>
-        <translation>Firmware versie</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="265"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1576"/>
+        <source>Medium</source>
+        <translation>Gemiddeld</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="538"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1713"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1990"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1548"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1729"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1768"/>
-        <source>Custom text</source>
-        <translation>Eigen tekst</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="270"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1577"/>
+        <source>High</source>
+        <translation>Hoog</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="385"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1549"/>
-        <source>Language</source>
-        <translation>Taal</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="278"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="826"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="849"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="875"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="927"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="993"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1019"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1101"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1117"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1450"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2278"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2382"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2408"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2434"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2474"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2497"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1586"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1621"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1623"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1625"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1628"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1637"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1638"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1710"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1785"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1789"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1801"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1803"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1806"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1807"/>
+        <source>%</source>
+        <translation>%</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="289"/>
@@ -680,44 +746,36 @@
         <translation>Italiaans</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="579"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1557"/>
-        <source>Dive mode</source>
-        <translation>Duikmodus</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="556"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1560"/>
-        <source>OC</source>
-        <translation>Open Circuit</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="561"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1561"/>
-        <source>CC</source>
-        <translation>Gesloten Circuit</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="313"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1582"/>
+        <source>m/°C</source>
+        <translation>m/°C</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="566"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2336"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1562"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1793"/>
-        <source>Gauge</source>
-        <translation>Meter</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="318"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1583"/>
+        <source>ft/°F</source>
+        <translation>ft/°F</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="571"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1563"/>
-        <source>Apnea</source>
-        <translation>Apnee</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="326"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1656"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1943"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1546"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1726"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1766"/>
+        <source>Serial No.</source>
+        <translation>Serienummer</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="395"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2063"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1565"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1780"/>
-        <source>Date format</source>
-        <translation>Datumformaat:</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="349"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1679"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1980"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1547"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1727"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1767"/>
+        <source>Firmware version</source>
+        <translation>Firmware versie</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="360"/>
@@ -738,108 +796,147 @@
         <translation>JJMMDD</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1042"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2457"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1639"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1805"/>
-        <source>Saturation</source>
-        <translation>Saturatie</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="385"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1549"/>
+        <source>Language</source>
+        <translation>Taal</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="278"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="826"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="849"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="875"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="927"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="993"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1019"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1101"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1117"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1450"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2278"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2382"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2408"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2434"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2474"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2497"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1586"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1621"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1623"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1625"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1628"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1637"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1638"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1710"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1785"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1789"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1801"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1803"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1806"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1807"/>
-        <source>%</source>
-        <translation>%</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="395"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2063"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1565"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1780"/>
+        <source>Date format</source>
+        <translation>Datumformaat:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="865"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2261"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1624"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1784"/>
-        <source>Desaturation</source>
-        <translation>Desaturatie</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="405"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1572"/>
+        <source>Brightness</source>
+        <translation>Helderheid</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="983"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2398"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1636"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1800"/>
-        <source>Last deco</source>
-        <translation>Laatste Decostop</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="415"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1850"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1579"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1753"/>
+        <source>Units</source>
+        <translation>Eenheden</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="711"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="736"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="758"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="904"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2181"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2206"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2228"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2307"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1626"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1786"/>
-        <source> m</source>
-        <translation>m</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="425"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1585"/>
+        <source>Salinity (0-5%)</source>
+        <translation>Zoutgehalte (0-5%)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="405"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1572"/>
-        <source>Brightness</source>
-        <translation>Helderheid</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="438"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1615"/>
+        <source>Reset device to default settings</source>
+        <translation>Toestel instellen met standaardinstellingen </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="260"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1575"/>
-        <source>Eco</source>
-        <translation>Eco</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="452"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1590"/>
+        <source>230LSB/Gauss</source>
+        <translation>230LSB/Gauss</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="265"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1576"/>
-        <source>Medium</source>
-        <translation>Gemiddeld</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="457"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1591"/>
+        <source>330LSB/Gauss</source>
+        <translation>330LSB/Gauss</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="270"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1577"/>
-        <source>High</source>
-        <translation>Hoog</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="462"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1592"/>
+        <source>390LSB/Gauss</source>
+        <translation>390LSB/Gauss</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="603"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2034"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1599"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1779"/>
-        <source>Sampling rate</source>
-        <translation>Meetfrequentie</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="467"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1593"/>
+        <source>440LSB/Gauss</source>
+        <translation>440LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="472"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1594"/>
+        <source>660LSB/Gauss</source>
+        <translation>660LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="477"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1595"/>
+        <source>820LSB/Gauss</source>
+        <translation>820LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="482"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1596"/>
+        <source>1090LSB/Gauss</source>
+        <translation>1090LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="487"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1597"/>
+        <source>1370LSB/Gauss</source>
+        <translation>1370LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="521"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1587"/>
+        <source>Compass gain</source>
+        <translation>Kompas gevoeligheid</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="531"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1799"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1745"/>
+        <source>Computer model</source>
+        <translation>Computer model</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="538"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1713"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1990"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1548"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1729"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1768"/>
+        <source>Custom text</source>
+        <translation>Eigen tekst</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="556"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1560"/>
+        <source>OC</source>
+        <translation>Open Circuit</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="561"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1561"/>
+        <source>CC</source>
+        <translation>Gesloten Circuit</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="566"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2336"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1562"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1793"/>
+        <source>Gauge</source>
+        <translation>Meter</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="571"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1563"/>
+        <source>Apnea</source>
+        <translation>Apnee</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="579"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1557"/>
+        <source>Dive mode</source>
+        <translation>Duikmodus</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="590"/>
@@ -856,30 +953,12 @@
         <translation>10s</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="415"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1850"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1579"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1753"/>
-        <source>Units</source>
-        <translation>Eenheden</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="313"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1582"/>
-        <source>m/°C</source>
-        <translation>m/°C</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="318"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1583"/>
-        <source>ft/°F</source>
-        <translation>ft/°F</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="644"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1605"/>
-        <source>Dive mode color</source>
-        <translation>Kleur duikmodus</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="603"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2034"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1599"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1779"/>
+        <source>Sampling rate</source>
+        <translation>Meetfrequentie</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="614"/>
@@ -906,12 +985,6 @@
         <translation>Blauw</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="425"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1585"/>
-        <source>Salinity (0-5%)</source>
-        <translation>Zoutgehalte (0-5%)</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="637"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2092"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1613"/>
@@ -920,90 +993,80 @@
         <translation>Klok duikcomputer met PC synchroniseren</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="521"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1587"/>
-        <source>Compass gain</source>
-        <translation>Kompas gevoeligheid</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="90"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1523"/>
-        <source>Read settings from backup file or from device before writing to the device</source>
-        <translation>Instellingen lezen van een backup bestand of van het toestel vóór het bewaren op het toestel</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="116"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1527"/>
-        <source>Read settings from backup file or from device before writing to a backup file</source>
-        <translation>Instellingen lezen van een backup bestand of van het toestel vóór het bewaren in een backup bestand</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="232"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1543"/>
-        <source>OSTC, Mk.2/2N/2C</source>
-        <translation>OSTC, Mk.2/2N/2C</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="644"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1605"/>
+        <source>Dive mode color</source>
+        <translation>Kleur duikmodus</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="452"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1590"/>
-        <source>230LSB/Gauss</source>
-        <translation>230LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="654"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2020"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1614"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1771"/>
+        <source>Show safety stop</source>
+        <translation>Toon veiligheidsstop</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="457"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1591"/>
-        <source>330LSB/Gauss</source>
-        <translation>330LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="661"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2145"/>
+        <source>End Depth</source>
+        <translation>Einddiepte</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="462"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1592"/>
-        <source>390LSB/Gauss</source>
-        <translation>390LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="671"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2162"/>
+        <source> s</source>
+        <translation> s</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="467"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1593"/>
-        <source>440LSB/Gauss</source>
-        <translation>440LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="687"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1953"/>
+        <source>Length</source>
+        <translation>Lengte</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="472"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1594"/>
-        <source>660LSB/Gauss</source>
-        <translation>660LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="694"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2138"/>
+        <source>Start Depth</source>
+        <translation>Startdiepte</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="477"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1595"/>
-        <source>820LSB/Gauss</source>
-        <translation>820LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="701"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2152"/>
+        <source>Reset Depth</source>
+        <translation>Reset Diepte</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="482"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1596"/>
-        <source>1090LSB/Gauss</source>
-        <translation>1090LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="711"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="736"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="758"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="904"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2181"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2206"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2228"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2307"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1626"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1786"/>
+        <source> m</source>
+        <translation>m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="487"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1597"/>
-        <source>1370LSB/Gauss</source>
-        <translation>1370LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="778"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2248"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1643"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1810"/>
+        <source>Advanced settings</source>
+        <translation>Geavanceerde instellingen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="654"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2020"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1614"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1771"/>
-        <source>Show safety stop</source>
-        <translation>Toon veiligheidsstop</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="784"/>
+        <source>Left button sensitivity</source>
+        <translation>Gevoeligheid linker knop</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="438"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1615"/>
-        <source>Reset device to default settings</source>
-        <translation>Toestel instellen met standaardinstellingen </translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="791"/>
+        <source>Always show ppO2</source>
+        <translation>Altijd ppO2 tonen</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="798"/>
@@ -1014,20 +1077,6 @@
         <translation>Alt GF kan onderwater geselecteerd worden</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="223"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1541"/>
-        <source>Suunto Vyper family</source>
-        <translation>Suunto Vyper familie</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="778"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2248"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1643"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1810"/>
-        <source>Advanced settings</source>
-        <translation>Geavanceerde instellingen</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="805"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2271"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1618"/>
@@ -1058,6 +1107,14 @@
         <translation>GFHigh</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="865"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2261"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1624"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1784"/>
+        <source>Desaturation</source>
+        <translation>Desaturatie</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="917"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2320"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1627"/>
@@ -1072,14 +1129,6 @@
         <translation> mbar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="973"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2369"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1630"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1788"/>
-        <source> min</source>
-        <translation> min</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="960"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2331"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1633"/>
@@ -1088,63 +1137,28 @@
         <translation>ZH-L16</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="47"/>
-        <source>Connect via Bluetooth</source>
-        <translation>Aansluiten via Bluetooth</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="163"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1532"/>
-        <source>Save libdivecomputer logfile</source>
-        <translation>libdivecomputer logbestand opslaan</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="661"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2145"/>
-        <source>End Depth</source>
-        <translation>Einddiepte</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="671"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2162"/>
-        <source> s</source>
-        <translation> s</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="687"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1953"/>
-        <source>Length</source>
-        <translation>Lengte</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="694"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2138"/>
-        <source>Start Depth</source>
-        <translation>Startdiepte</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="701"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2152"/>
-        <source>Reset Depth</source>
-        <translation>Reset Diepte</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="784"/>
-        <source>Left button sensitivity</source>
-        <translation>Gevoeligheid linker knop</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="791"/>
-        <source>Always show ppO2</source>
-        <translation>Altijd ppO2 tonen</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="965"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1634"/>
         <source>ZH-L16+GF</source>
         <translation>ZH-L16+GF</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="973"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2369"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1630"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1788"/>
+        <source> min</source>
+        <translation> min</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="983"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2398"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1636"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1800"/>
+        <source>Last deco</source>
+        <translation>Laatste Decostop</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1009"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2424"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1640"/>
@@ -1161,6 +1175,14 @@
         <translation>Alt GFHigh</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1042"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2457"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1639"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1805"/>
+        <source>Saturation</source>
+        <translation>Saturatie</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1052"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1642"/>
         <source>Flip screen</source>
@@ -1172,12 +1194,22 @@
         <translation>Gevoeligheid rechter knop</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1066"/>
+        <source>MOD warning</source>
+        <translation>MOD Waarschuwing</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1073"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2513"/>
         <source>Graphical speed indicator</source>
         <translation>Grafische snelheidsindicator</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1080"/>
+        <source>Dynamic ascent rate</source>
+        <translation>Dynamische stijgsnelheid</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1087"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2552"/>
         <source>Bottom gas consumption</source>
@@ -1190,6 +1222,14 @@
         <translation>Decompressie gas consumptie</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1133"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1149"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2520"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2536"/>
+        <source> ℓ/min</source>
+        <translation>ℓ/min</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1165"/>
         <source>Temperature sensor offset</source>
         <translation>Temperatuursensor compensatie</translation>
@@ -1208,6 +1248,18 @@
         <translation>Gas instellingen</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1235"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1320"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2610"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2695"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1645"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1668"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1812"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1835"/>
+        <source>%O₂</source>
+        <translation>%O₂</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1240"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1325"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2615"/>
@@ -1326,16 +1378,10 @@
         <translation>Dil 5</translation>
     </message>
     <message>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1691"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1858"/>
-        <source>Set point [cbar]</source>
-        <translation>Set point [cbar]</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1693"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1860"/>
-        <source>Change depth [m]</source>
-        <translation>Diepte wijzigen [m]</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1405"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2770"/>
+        <source>Setpoint</source>
+        <translation>Instelpunt</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1415"/>
@@ -1374,6 +1420,12 @@
         <translation>SP 5</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1443"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1709"/>
+        <source>O₂ in calibration gas</source>
+        <translation>O₂ in calibratiegas</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1467"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1713"/>
         <source>Fixed setpoint</source>
@@ -1404,101 +1456,6 @@
         <translation> cbar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1748"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1733"/>
-        <source>P1 (medium)</source>
-        <extracomment>Suunto safety level</extracomment>
-        <translation>P1 (medium)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1753"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1734"/>
-        <source>P2 (high)</source>
-        <extracomment>Suunto safety level</extracomment>
-        <translation>P2 (hoog)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1792"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1744"/>
-        <source>Total dive time</source>
-        <translation>Totale duiktijd</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2109"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1769"/>
-        <source>kg/ℓ</source>
-        <translation>kg/ℓ</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2346"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1795"/>
-        <source>Apnoea</source>
-        <translation>Apnee</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1583"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1722"/>
-        <source>Safety level</source>
-        <translation>Veiligheidsniveau</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="54"/>
-        <source>Connect</source>
-        <translation>Verbind</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="64"/>
-        <source>Disconnect</source>
-        <translation>Verbreek verbinding</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="214"/>
-        <source>OSTC 3,Sport,Cr,2</source>
-        <translation>OSTC 3,Sport,Cr,2</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1066"/>
-        <source>MOD warning</source>
-        <translation>MOD Waarschuwing</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1080"/>
-        <source>Dynamic ascent rate</source>
-        <translation>Dynamische stijgsnelheid</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1133"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1149"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2520"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2536"/>
-        <source> ℓ/min</source>
-        <translation>ℓ/min</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1235"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1320"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2610"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2695"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1645"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1668"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1812"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1835"/>
-        <source>%O₂</source>
-        <translation>%O₂</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1405"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2770"/>
-        <source>Setpoint</source>
-        <translation>Instelpunt</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1443"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1709"/>
-        <source>O₂ in calibration gas</source>
-        <translation>O₂ in calibratiegas</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1535"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2843"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1719"/>
@@ -1515,6 +1472,12 @@
         <translation>pO₂ min</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1583"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1722"/>
+        <source>Safety level</source>
+        <translation>Veiligheidsniveau</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1609"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1723"/>
         <source>Altitude range</source>
@@ -1548,6 +1511,20 @@
         <translation>P0 (geen)</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1748"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1733"/>
+        <source>P1 (medium)</source>
+        <extracomment>Suunto safety level</extracomment>
+        <translation>P1 (medium)</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1753"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1734"/>
+        <source>P2 (high)</source>
+        <extracomment>Suunto safety level</extracomment>
+        <translation>P2 (hoog)</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1761"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1736"/>
         <source>Sample rate</source>
@@ -1572,11 +1549,10 @@
         <translation>60s</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="531"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1799"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1745"/>
-        <source>Computer model</source>
-        <translation>Computer model</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1792"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1744"/>
+        <source>Total dive time</source>
+        <translation>Totale duiktijd</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1816"/>
@@ -1641,12 +1617,6 @@
         <translation>Tijdsalarm</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2099"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1765"/>
-        <source>Salinity</source>
-        <translation>Zoutgehalte</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2074"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1774"/>
         <source>MM/DD/YY</source>
@@ -1665,12 +1635,30 @@
         <translation>JJ/MM/DD</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2099"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1765"/>
+        <source>Salinity</source>
+        <translation>Zoutgehalte</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2109"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1769"/>
+        <source>kg/ℓ</source>
+        <translation>kg/ℓ</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2341"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1794"/>
         <source>ZH-L16 CC</source>
         <translation>ZH-L16 CC</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2346"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1795"/>
+        <source>Apnoea</source>
+        <translation>Apnee</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2351"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1796"/>
         <source>L16-GF OC</source>
@@ -1689,87 +1677,112 @@
         <translation>PSCR-GF</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1108"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1129"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1539"/>
+        <source>OSTC 3</source>
+        <translation>OSTC 3</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1691"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1858"/>
+        <source>Set point [cbar]</source>
+        <translation>Set point [cbar]</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1693"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1860"/>
+        <source>Change depth [m]</source>
+        <translation>Diepte wijzigen [m]</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1110"/>
+        <source>Backup dive computer settings</source>
+        <translation>Backup duikcomputer instellingen</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1111"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1132"/>
         <source>Backup files (*.xml)</source>
         <translation>Backup bestanden (*.xml)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1113"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1115"/>
+        <source>XML backup error</source>
+        <translation>Fout in XML backup</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1116"/>
         <source>An error occurred while saving the backup file.
 %1</source>
         <translation>Fout tijdens het opslaan van het backup bestand
 %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1116"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1119"/>
         <source>Backup succeeded</source>
         <translation>Backup geslaagd</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1117"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1120"/>
         <source>Your settings have been saved to: %1</source>
         <translation>Uw instellingen zijn bewaard in: %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1107"/>
-        <source>Backup dive computer settings</source>
-        <translation>Backup duikcomputer instellingen</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1112"/>
-        <source>XML backup error</source>
-        <translation>Fout in XML backup</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1128"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1131"/>
         <source>Restore dive computer settings</source>
         <translation>Instellingen duikcomputer herstellen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1134"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1137"/>
         <source>XML restore error</source>
         <translation>Fout bij het herstellen van XML</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1135"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1138"/>
         <source>An error occurred while restoring the backup file.
 %1</source>
         <translation>Fout tijdens het herstellen van het backup bestand.
 %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1139"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1142"/>
         <source>Restore succeeded</source>
         <translation>Herstelling geslaagd</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1140"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1143"/>
         <source>Your settings have been restored successfully.</source>
         <translation>Uw instellingen zijn hersteld.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1150"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1153"/>
         <source>Select firmware file</source>
         <translation>Firmware bestand selecteren</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1151"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1154"/>
         <source>All files (*.*)</source>
         <translation>Alle bestanden (*.*)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1207"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1210"/>
         <source>Choose file for divecomputer download logfile</source>
         <translation>Kies een bestand om duikcomputer log te downloaden</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1208"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1211"/>
         <source>Log files (*.log)</source>
         <translation>Log bestanden (*.log)</translation>
     </message>
 </context>
 <context>
+    <name>ContextDrawer</name>
+    <message>
+        <location filename="../mobile-widgets/qml/kirigami/src/controls/ContextDrawer.qml" line="76"/>
+        <source>Actions</source>
+        <translation>Acties</translation>
+    </message>
+</context>
+<context>
     <name>CylindersModel</name>
     <message>
         <location filename="../qt-models/cylindermodel.cpp" line="16"/>
@@ -1783,11 +1796,6 @@
     </message>
     <message>
         <location filename="../qt-models/cylindermodel.cpp" line="16"/>
-        <source>He%</source>
-        <translation>He%</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="16"/>
         <source>Work press.</source>
         <translation>Werkdruk</translation>
     </message>
@@ -1807,9 +1815,24 @@
         <translation>O₂%</translation>
     </message>
     <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="16"/>
+        <source>He%</source>
+        <translation>He%</translation>
+    </message>
+    <message>
         <location filename="../qt-models/cylindermodel.cpp" line="17"/>
-        <source>Switch at</source>
-        <translation>Wissel op</translation>
+        <source>Deco switch at</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
+        <source>Bot. MOD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
+        <source>MND</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-models/cylindermodel.cpp" line="17"/>
@@ -1827,17 +1850,32 @@
         <translation>ℓ</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="161"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="177"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation>Klik hier om de fles te verwijderen.</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="383"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="180"/>
+        <source>Switch depth for deco gas. Calculated using Deco pO₂ preference, unless set manually.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="183"/>
+        <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to &apos;*&apos; for best O₂% for max depth.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="186"/>
+        <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to &apos;*&apos; for best He% for max depth.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="444"/>
         <source>Cylinder cannot be removed</source>
         <translation>Fles kan niet verwijderd worden</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="384"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="445"/>
         <source>This gas is 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 tijdens deze duik kunnen verwijderd worden.</translation>
     </message>
@@ -1857,42 +1895,24 @@
         <translation>Welke componenten wilt u kopiëren?</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="73"/>
+        <location filename="../build/ui_divecomponentselection.h" line="141"/>
+        <source>Dive site</source>
+        <translation>Duikstek</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="80"/>
         <location filename="../build/ui_divecomponentselection.h" line="142"/>
         <source>Suit</source>
         <translation>Pak</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="122"/>
-        <location filename="../build/ui_divecomponentselection.h" line="148"/>
-        <source>Divemaster</source>
-        <translation>Duikleider</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="129"/>
-        <location filename="../build/ui_divecomponentselection.h" line="149"/>
-        <source>Buddy</source>
-        <translation>Buddy</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="136"/>
-        <location filename="../build/ui_divecomponentselection.h" line="150"/>
-        <source>Rating</source>
-        <translation>Waardering</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="87"/>
         <location filename="../build/ui_divecomponentselection.h" line="143"/>
         <source>Visibility</source>
         <translation>Zicht</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="73"/>
-        <location filename="../build/ui_divecomponentselection.h" line="141"/>
-        <source>Dive site</source>
-        <translation>Duikstek</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="94"/>
         <location filename="../build/ui_divecomponentselection.h" line="144"/>
         <source>Notes</source>
@@ -1916,10 +1936,34 @@
         <source>Cylinders</source>
         <translation>Flessen</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="122"/>
+        <location filename="../build/ui_divecomponentselection.h" line="148"/>
+        <source>Divemaster</source>
+        <translation>Duikleider</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="129"/>
+        <location filename="../build/ui_divecomponentselection.h" line="149"/>
+        <source>Buddy</source>
+        <translation>Buddy</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="136"/>
+        <location filename="../build/ui_divecomponentselection.h" line="150"/>
+        <source>Rating</source>
+        <translation>Waardering</translation>
+    </message>
 </context>
 <context>
     <name>DiveComputerManagementDialog</name>
     <message>
+        <location filename="../desktop-widgets/divecomputermanagementdialog.ui" line="17"/>
+        <location filename="../build/ui_divecomputermanagementdialog.h" line="65"/>
+        <source>Edit dive computer nicknames</source>
+        <translation>Bewerk duikcomputer namen</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divecomputermanagementdialog.cpp" line="49"/>
         <source>Remove the selected dive computer?</source>
         <translation>Geselecteerde duikcomputer verwijderen?</translation>
@@ -1931,12 +1975,6 @@
         <translation>Bent u zeker dat u de geselecteerde
 duikcomputer wilt verwijderen?</translation>
     </message>
-    <message>
-        <location filename="../desktop-widgets/divecomputermanagementdialog.ui" line="17"/>
-        <location filename="../build/ui_divecomputermanagementdialog.h" line="65"/>
-        <source>Edit dive computer nicknames</source>
-        <translation>Bewerk duikcomputer namen</translation>
-    </message>
 </context>
 <context>
     <name>DiveComputerModel</name>
@@ -1964,17 +2002,17 @@ duikcomputer wilt verwijderen?</translation>
 <context>
     <name>DiveDetails</name>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="33"/>
+        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="38"/>
         <source>Dive details</source>
         <translation>Duikdetails</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="67"/>
+        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="72"/>
         <source>Delete dive</source>
         <translation>Duik verwijderen</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="84"/>
+        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="89"/>
         <source>Show on map</source>
         <translation>Toon op kaart</translation>
     </message>
@@ -1982,89 +2020,94 @@ duikcomputer wilt verwijderen?</translation>
 <context>
     <name>DiveDetailsEdit</name>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="74"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="80"/>
         <source>Dive %1</source>
         <translation>Duik %1</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="78"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="84"/>
         <source>Date:</source>
         <translation>Datum:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="86"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="92"/>
         <source>Location:</source>
         <translation>Locatie:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="95"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="101"/>
         <source>Coordinates:</source>
         <translation>Coördinaten:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="104"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="110"/>
         <source>Use current
 GPS location:</source>
         <translation>Gebruik huidige
 GPS locatie:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="118"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="124"/>
         <source>Depth:</source>
         <translation>Diepte:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="127"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="133"/>
         <source>Duration:</source>
         <translation>Duur:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="137"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="143"/>
         <source>Air Temp:</source>
         <translation>Lucht Temp:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="146"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="152"/>
         <source>Water Temp:</source>
         <translation>Water Temp:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="155"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="161"/>
         <source>Suit:</source>
         <translation>Duikpak:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="164"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="176"/>
         <source>Buddy:</source>
         <translation>Buddy:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="173"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="191"/>
         <source>Dive Master:</source>
         <translation>Duikleider</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="182"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="206"/>
         <source>Weight:</source>
         <translation>Gewicht:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="192"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="216"/>
+        <source>Cylinder:</source>
+        <translation>Fles:</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="231"/>
         <source>Gas mix:</source>
         <translation>Gas mix:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="203"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="241"/>
         <source>Start Pressure:</source>
         <translation>Startdruk:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="213"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="250"/>
         <source>End Pressure:</source>
         <translation>Einddruk:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="224"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="260"/>
         <source>Notes:</source>
         <translation>Notities:</translation>
     </message>
@@ -2102,42 +2145,42 @@ GPS locatie:</translation>
         <translation>Duikpak:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="159"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="158"/>
         <source>Air Temp:</source>
         <translation>Lucht Temp:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="175"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="172"/>
         <source>Cylinder:</source>
         <translation>Fles:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="189"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="185"/>
         <source>Water Temp:</source>
         <translation>Water Temp:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="205"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="198"/>
         <source>Dive Master:</source>
         <translation>Duikleider:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="220"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="211"/>
         <source>Weight:</source>
         <translation>Gewicht:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="249"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="224"/>
         <source>Buddy:</source>
         <translation>Buddy:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="263"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="237"/>
         <source>SAC:</source>
         <translation>Gasverbruik:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="280"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="252"/>
         <source>Notes</source>
         <translation>Notities</translation>
     </message>
@@ -2145,18 +2188,18 @@ GPS locatie:</translation>
 <context>
     <name>DiveEventItem</name>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="134"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="165"/>
         <source>Manual switch to OC</source>
         <translation>Handmatig overschakelen naar OC</translation>
     </message>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="136"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="167"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation> begin</translation>
     </message>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="137"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="168"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation> eind</translation>
@@ -2165,27 +2208,27 @@ GPS locatie:</translation>
 <context>
     <name>DiveImportedModel</name>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="646"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="656"/>
         <source>Date/time</source>
         <translation>Datum/tijd</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="648"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="658"/>
         <source>Duration</source>
         <translation>Duur</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="650"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="660"/>
         <source>Depth</source>
         <translation>Diepte</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="672"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="682"/>
         <source>h:</source>
         <translation>u:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="672"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="682"/>
         <source>min</source>
         <translation>min</translation>
     </message>
@@ -2194,8 +2237,8 @@ GPS locatie:</translation>
     <name>DiveList</name>
     <message>
         <location filename="../mobile-widgets/qml/DiveList.qml" line="12"/>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="226"/>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="232"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="227"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="233"/>
         <source>Dive list</source>
         <translation>Duiklijst</translation>
     </message>
@@ -2210,110 +2253,115 @@ GPS locatie:</translation>
         <translation>Duur:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="222"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="223"/>
         <source>Cloud credentials</source>
         <translation>Cloud rechten</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="228"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="229"/>
         <source>Please tap the &apos;+&apos; button to add a dive</source>
         <translation>Selecteer de &apos;+&apos; knop om een duik toe te voegen</translation>
     </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="248"/>
+        <source>No dives in dive list</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DiveListView</name>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="846"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="849"/>
         <source>Expand all</source>
         <translation>Alles uitklappen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="848"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="851"/>
         <source>Collapse all</source>
         <translation>Alles inklappen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="852"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="855"/>
         <source>Collapse others</source>
         <translation>andere samenklappen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="856"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="859"/>
         <source>Remove dive(s) from trip</source>
         <translation>Duik(en) uit trip verwijderen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="857"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="860"/>
         <source>Create new trip above</source>
         <translation>Nieuwe trip hierboven invoegen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="871"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="874"/>
         <source>Add dive(s) to trip immediately above</source>
         <translation>Duik(en) toevoegen aan de trip hierboven</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="873"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="876"/>
         <source>Add dive(s) to trip immediately below</source>
         <translation>Voeg duik(en) toe aan de trip hieronder</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="877"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="880"/>
         <source>Merge trip with trip above</source>
         <translation>Trip met bovenstaande samenvoegen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="878"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="881"/>
         <source>Merge trip with trip below</source>
         <translation>Trip met onderstaande samenvoegen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="882"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="885"/>
         <source>Delete dive(s)</source>
         <translation>Duik(en) verwijderen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="884"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="887"/>
         <source>Mark dive(s) invalid</source>
         <translation>Markeer duik(en) als ongeldig</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="888"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="891"/>
         <source>Merge selected dives</source>
         <translation>geselecteerde duiken samenvoegen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="890"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="893"/>
         <source>Renumber dive(s)</source>
         <translation>Duik(en) opnieuw nummeren</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="891"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="894"/>
         <source>Shift dive times</source>
         <translation>Tijdstip verschuiven</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="892"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="895"/>
         <source>Split selected dives</source>
         <translation>Splits geselecteerde duiken</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="893"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="896"/>
         <source>Load image(s) from file(s)</source>
         <translation>Laad foto(&apos;s) van bestand(en)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="894"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="897"/>
         <source>Load image(s) from web</source>
         <translation>Laad foto(&apos;s) van het web</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="917"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="919"/>
         <source>Open image files</source>
         <translation>Afbeelding openen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="917"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="919"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>Afbeeldingen (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -2334,56 +2382,6 @@ GPS locatie:</translation>
 <context>
     <name>DiveLogExportDialog</name>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="103"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="351"/>
-        <source>Export format</source>
-        <translation>Exporteer opmaak</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="134"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="353"/>
-        <source>UDDF</source>
-        <translation>UDDF</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="187"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="358"/>
-        <source>Worldmap</source>
-        <translation>Wereldkaart</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="197"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="359"/>
-        <source>I&amp;mage depths</source>
-        <translation>Diepte foto&apos;s</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="243"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="360"/>
-        <source>Selection</source>
-        <translation>Selectie</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="252"/>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="346"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="361"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="372"/>
-        <source>Selected dives</source>
-        <translation>Geselecteerde duiken</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="262"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="362"/>
-        <source>All dives</source>
-        <translation>Alle duiken</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="306"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="396"/>
-        <source>HTML</source>
-        <translation>HTML</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="14"/>
         <location filename="../build/ui_divelogexportdialog.h" line="349"/>
         <source>Export dive log files</source>
@@ -2396,12 +2394,24 @@ GPS locatie:</translation>
         <translation>Algemene Export</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="103"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="351"/>
+        <source>Export format</source>
+        <translation>Exporteer opmaak</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="115"/>
         <location filename="../build/ui_divelogexportdialog.h" line="352"/>
         <source>Subsurface &amp;XML</source>
         <translation>Subsurface XML</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="134"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="353"/>
+        <source>UDDF</source>
+        <translation>UDDF</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="147"/>
         <location filename="../build/ui_divelogexportdialog.h" line="354"/>
         <source>di&amp;velogs.de</source>
@@ -2426,238 +2436,297 @@ GPS locatie:</translation>
         <translation>CSV duikdetails</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="275"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="187"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="358"/>
+        <source>Worldmap</source>
+        <translation>Wereldkaart</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="197"/>
+        <source>TeX</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="207"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="359"/>
+        <source>I&amp;mage depths</source>
+        <translation>Diepte foto&apos;s</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="253"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="360"/>
+        <source>Selection</source>
+        <translation>Selectie</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="262"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="356"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="361"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="372"/>
+        <source>Selected dives</source>
+        <translation>Geselecteerde duiken</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="272"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="362"/>
+        <source>All dives</source>
+        <translation>Alle duiken</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="285"/>
         <location filename="../build/ui_divelogexportdialog.h" line="363"/>
         <source>CSV units</source>
         <translation>CSV eenheden</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="288"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="298"/>
         <location filename="../build/ui_divelogexportdialog.h" line="366"/>
         <source>Metric</source>
         <translation>Metrisch</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="293"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="303"/>
         <location filename="../build/ui_divelogexportdialog.h" line="367"/>
         <source>Imperial</source>
         <translation>Imperiaal</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="324"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="316"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="396"/>
+        <source>HTML</source>
+        <translation>HTML</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="334"/>
         <location filename="../build/ui_divelogexportdialog.h" line="370"/>
         <source>General settings</source>
         <translation>Algemene Instellingen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="330"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="340"/>
         <location filename="../build/ui_divelogexportdialog.h" line="371"/>
         <source>Subsurface numbers</source>
         <translation>Subsurface Statistieken</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="359"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="369"/>
         <location filename="../build/ui_divelogexportdialog.h" line="373"/>
         <source>Export yearly statistics</source>
         <translation>Jaarlijkse statistieken uitvoeren</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="375"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="385"/>
         <location filename="../build/ui_divelogexportdialog.h" line="374"/>
         <source>All di&amp;ves</source>
         <translation>Alle duiken</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="385"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="395"/>
         <location filename="../build/ui_divelogexportdialog.h" line="375"/>
         <source>Export list only</source>
         <translation>Exporteer enkel lijst</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="392"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="402"/>
         <location filename="../build/ui_divelogexportdialog.h" line="376"/>
         <source>Export photos</source>
         <translation>Foto&apos;s exporteren</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="408"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="418"/>
         <location filename="../build/ui_divelogexportdialog.h" line="377"/>
         <source>Style options</source>
         <translation>Opmaakstijl opties</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="423"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="433"/>
         <location filename="../build/ui_divelogexportdialog.h" line="378"/>
         <source>Font</source>
         <translation>Lettertype</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="433"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="443"/>
         <location filename="../build/ui_divelogexportdialog.h" line="379"/>
         <source>Font size</source>
         <translation>Lettertype grootte</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="444"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="454"/>
         <location filename="../build/ui_divelogexportdialog.h" line="382"/>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="449"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="459"/>
         <location filename="../build/ui_divelogexportdialog.h" line="383"/>
         <source>10</source>
         <translation>10</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="454"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="464"/>
         <location filename="../build/ui_divelogexportdialog.h" line="384"/>
         <source>12</source>
         <translation>12</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="459"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="469"/>
         <location filename="../build/ui_divelogexportdialog.h" line="385"/>
         <source>14</source>
         <translation>14</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="464"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="474"/>
         <location filename="../build/ui_divelogexportdialog.h" line="386"/>
         <source>16</source>
         <translation>16</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="469"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="479"/>
         <location filename="../build/ui_divelogexportdialog.h" line="387"/>
         <source>18</source>
         <translation>18</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="474"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="484"/>
         <location filename="../build/ui_divelogexportdialog.h" line="388"/>
         <source>20</source>
         <translation>20</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="482"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="492"/>
         <location filename="../build/ui_divelogexportdialog.h" line="390"/>
         <source>Theme</source>
         <translation>Thema</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="493"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="503"/>
         <location filename="../build/ui_divelogexportdialog.h" line="393"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="95"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="99"/>
         <source>Light</source>
         <translation>Licht</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="498"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="508"/>
         <location filename="../build/ui_divelogexportdialog.h" line="394"/>
         <source>Sand</source>
         <translation>Zandkleurig</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="134"/>
-        <source>UDDF files (*.uddf *.UDDF)</source>
-        <translation>UDDF bestanden (*.uddf *.UDDF)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="142"/>
-        <source>CSV files (*.csv *.CSV)</source>
-        <translation>CSV bestanden (*.csv *.CSV)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="74"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="76"/>
         <source>Generic format that is used for data exchange between a variety of diving related programs.</source>
         <translation>Algemene bestandsindeling die gebruikt wordt om gegevens uit te wisselen tussen verschillende duik programma&apos;s</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="76"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="78"/>
         <source>Comma separated values describing the dive profile.</source>
         <translation>Waarden gescheiden door komma&apos;s die het duikprofiel beschrijven</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="78"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="80"/>
         <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source>
         <translation>Waarden gescheiden komma&apos;s met duikinformatie. Deze omvatten een groot deel van de informatie, uitgezonderd het duikprofiel.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="80"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="82"/>
         <source>Send the dive data to divelogs.de website.</source>
         <translation>Zend de duikgegevens naar de divelogs.de website.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="82"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="84"/>
         <source>Send the dive data to dive-share.appspot.com website</source>
         <translation>Verzend duikgegevens naar dive-share.appspot.com</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="84"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="86"/>
         <source>HTML export of the dive locations, visualized on a world map.</source>
         <translation>HTML export van duiklocaties op een wereldkaart.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="86"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="88"/>
         <source>Subsurface native XML format.</source>
         <translation>Subsurface XML bestandsindeling.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="88"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="90"/>
         <source>Write depths of images to file.</source>
         <translation>Voeg dieptes waarop foto&apos;s genomen zijn toe aan het bestand.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="133"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="92"/>
+        <source>Write dive as TeX macros to file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="137"/>
         <source>Export UDDF file as</source>
         <translation>Exporteer UDDF bestand als</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="137"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/>
+        <source>UDDF files (*.uddf *.UDDF)</source>
+        <translation>UDDF bestanden (*.uddf *.UDDF)</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divelogexportdialog.cpp" line="141"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="145"/>
         <source>Export CSV file as</source>
         <translation>Exporteer CSV bestand als</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="148"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="142"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="146"/>
+        <source>CSV files (*.csv *.CSV)</source>
+        <translation>CSV bestanden (*.csv *.CSV)</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="152"/>
         <source>Export world map</source>
         <translation>Wereldkaart exporteren</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="149"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="169"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="153"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="177"/>
         <source>HTML files (*.html)</source>
         <translation>HTML bestanden (*.html)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="153"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="157"/>
         <source>Export Subsurface XML</source>
         <translation>Exporteer Subsurface XML</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="158"/>
         <source>XML files (*.xml *.ssrf)</source>
         <translation>XML bestanden (*.xml *.ssrf)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="162"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="166"/>
         <source>Save image depths</source>
         <translation>Bewaar dieptes waarop de foto&apos;s genomen zijn</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="168"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="170"/>
+        <source>Export to TeX file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="170"/>
+        <source>TeX files (*.tex)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="176"/>
         <source>Export HTML files as</source>
         <translation>Exporteer HTML bestanden als</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="184"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="192"/>
         <source>Please wait, exporting...</source>
         <translation>Even geduld, bezig met exporteren...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="219"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="227"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="311"/>
         <source>Can&apos;t open file %s</source>
         <translation>Kan het bestand %s niet openen</translation>
     </message>
@@ -2671,25 +2740,6 @@ GPS locatie:</translation>
         <translation>Duiklogboek importeren</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="643"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="727"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="856"/>
-        <source>Time</source>
-        <translation>Tijd</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.ui" line="127"/>
-        <location filename="../build/ui_divelogimportdialog.h" line="164"/>
-        <source>Metric</source>
-        <translation>Metrisch</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.ui" line="132"/>
-        <location filename="../build/ui_divelogimportdialog.h" line="165"/>
-        <source>Imperial</source>
-        <translation>Imperiaal</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divelogimportdialog.ui" line="89"/>
         <location filename="../build/ui_divelogimportdialog.h" line="152"/>
         <source>dd.mm.yyyy</source>
@@ -2708,74 +2758,6 @@ GPS locatie:</translation>
         <translation>jjjj-mm-dd</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.ui" line="155"/>
-        <location filename="../build/ui_divelogimportdialog.h" line="167"/>
-        <source>Drag the tags above to each corresponding column below</source>
-        <translation>Versleep de trefwoorden van boven naar de juiste kolom hieronder.</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="641"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="729"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="852"/>
-        <source>Dive #</source>
-        <translation>Duik #</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="642"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="723"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="854"/>
-        <source>Date</source>
-        <translation>Datum</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="644"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="858"/>
-        <source>Duration</source>
-        <translation>Duur</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="655"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="862"/>
-        <source>GPS</source>
-        <translation>GPS</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="645"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="864"/>
-        <source>Max. depth</source>
-        <translation>Max. diepte</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="646"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="866"/>
-        <source>Avg. depth</source>
-        <translation>Gem. diepte</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="658"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="872"/>
-        <source>Suit</source>
-        <translation>Pak</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="663"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="878"/>
-        <source>Tags</source>
-        <translation>Trefwoorden</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="652"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="894"/>
-        <source>O₂</source>
-        <translation>O₂</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="653"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="896"/>
-        <source>He</source>
-        <translation>He</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divelogimportdialog.ui" line="108"/>
         <location filename="../build/ui_divelogimportdialog.h" line="158"/>
         <source>Seconds</source>
@@ -2794,183 +2776,269 @@ GPS locatie:</translation>
         <translation>Minuten:seconden</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="654"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="860"/>
-        <source>Location</source>
-        <translation>Locatie</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.ui" line="127"/>
+        <location filename="../build/ui_divelogimportdialog.h" line="164"/>
+        <source>Metric</source>
+        <translation>Metrisch</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.ui" line="132"/>
+        <location filename="../build/ui_divelogimportdialog.h" line="165"/>
+        <source>Imperial</source>
+        <translation>Imperiaal</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="354"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="499"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="505"/>
+        <location filename="../desktop-widgets/divelogimportdialog.ui" line="155"/>
+        <location filename="../build/ui_divelogimportdialog.h" line="167"/>
+        <source>Drag the tags above to each corresponding column below</source>
+        <translation>Versleep de trefwoorden van boven naar de juiste kolom hieronder.</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="355"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="528"/>
         <source>Tab</source>
         <translation>Tab</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="575"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="598"/>
         <source>Some column headers were pre-populated; please drag and drop the headers so they match the column they are in.</source>
         <translation>Sommige hoofdingen werden op voorhand automatisch ingesteld: versleep de hoofdingen totdat ze boven de juiste kolom geplaatst zijn.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="613"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="731"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="782"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="848"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="636"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="761"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="857"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="925"/>
         <source>Sample time</source>
         <translation>Voorbeeld tijd</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="615"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="733"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="784"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="638"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="763"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="859"/>
         <source>Sample depth</source>
         <translation>Voorbeeld diepte</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="617"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="735"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="786"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="640"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="765"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="861"/>
         <source>Sample temperature</source>
         <translation>Voorbeeld temperatuur</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="621"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="739"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="790"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="642"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="767"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="863"/>
+        <source>Sample pO₂</source>
+        <translation>Voorbeeld pO₂</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="644"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="769"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="865"/>
         <source>Sample sensor1 pO₂</source>
         <translation>Voorbeeld sensor1 pO₂</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="623"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="741"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="792"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="646"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="771"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="867"/>
         <source>Sample sensor2 pO₂</source>
         <translation>Voorbeeld sensor2 pO₂</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="625"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="743"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="794"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="648"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="773"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="869"/>
         <source>Sample sensor3 pO₂</source>
         <translation>Voorbeeld sensor3 pO₂</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="633"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="751"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="802"/>
-        <source>Sample stopdepth</source>
-        <translation>Voorbeeld diepte stop</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="637"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="755"/>
-        <source>Sample setpoint</source>
-        <translation>Voorbeeld instelpunt</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="619"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="737"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="788"/>
-        <source>Sample pO₂</source>
-        <translation>Voorbeeld pO₂</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="627"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="745"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="796"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="650"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="775"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="871"/>
         <source>Sample CNS</source>
         <translation>Voorbeeld CNS</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="629"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="747"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="798"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="652"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="777"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="873"/>
         <source>Sample NDL</source>
         <translation>Voorbeeld NDL</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="631"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="749"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="800"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="654"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="779"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="875"/>
         <source>Sample TTS</source>
         <translation>Voorbeeld TTS</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="635"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="753"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="804"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="656"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="781"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="877"/>
+        <source>Sample stopdepth</source>
+        <translation>Voorbeeld diepte stop</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="658"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="783"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="879"/>
         <source>Sample pressure</source>
         <translation>Voorbeeld druk</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="656"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="868"/>
-        <source>Divemaster</source>
-        <translation>Duikleider</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="660"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="785"/>
+        <source>Sample setpoint</source>
+        <translation>Voorbeeld instelpunt</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="657"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="870"/>
-        <source>Buddy</source>
-        <translation>Buddy</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="664"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="759"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="929"/>
+        <source>Dive #</source>
+        <translation>Duik #</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="659"/>
-        <source>Rating</source>
-        <translation>Waardering</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="665"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="753"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="931"/>
+        <source>Date</source>
+        <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="660"/>
-        <source>Visibility</source>
-        <translation>Zicht</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="666"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="757"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="933"/>
+        <source>Time</source>
+        <translation>Tijd</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="661"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="874"/>
-        <source>Notes</source>
-        <translation>Notities</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="667"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="935"/>
+        <source>Duration</source>
+        <translation>Duur</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="662"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="876"/>
-        <source>Weight</source>
-        <translation>Gewicht</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="668"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="941"/>
+        <source>Max. depth</source>
+        <translation>Max. diepte</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="669"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="943"/>
+        <source>Avg. depth</source>
+        <translation>Gem. diepte</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="649"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="888"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="670"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="975"/>
+        <source>Air temp.</source>
+        <translation>Lucht temp.</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="671"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="977"/>
+        <source>Water temp.</source>
+        <translation>Water temp.</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="672"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="965"/>
         <source>Cyl. size</source>
         <translation>Formaat fles</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="650"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="890"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="673"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="967"/>
         <source>Start pressure</source>
         <translation>Startdruk</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="651"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="892"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="674"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="969"/>
         <source>End pressure</source>
         <translation>Einddruk</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="647"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="898"/>
-        <source>Air temp.</source>
-        <translation>Lucht temp.</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="675"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="971"/>
+        <source>O₂</source>
+        <translation>O₂</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="648"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="900"/>
-        <source>Water temp.</source>
-        <translation>Water temp.</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="676"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="973"/>
+        <source>He</source>
+        <translation>He</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="677"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="937"/>
+        <source>Location</source>
+        <translation>Locatie</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="678"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="939"/>
+        <source>GPS</source>
+        <translation>GPS</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="679"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="945"/>
+        <source>Divemaster</source>
+        <translation>Duikleider</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="680"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="947"/>
+        <source>Buddy</source>
+        <translation>Buddy</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="681"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="949"/>
+        <source>Suit</source>
+        <translation>Pak</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="682"/>
+        <source>Rating</source>
+        <translation>Waardering</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="683"/>
+        <source>Visibility</source>
+        <translation>Zicht</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="684"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="951"/>
+        <source>Notes</source>
+        <translation>Notities</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="685"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="953"/>
+        <source>Weight</source>
+        <translation>Gewicht</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="686"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="955"/>
+        <source>Tags</source>
+        <translation>Trefwoorden</translation>
     </message>
 </context>
 <context>
     <name>DiveObjectHelper</name>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="287"/>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="323"/>
         <source>%1 dive(s)</source>
         <translation>%1 duik(en)</translation>
     </message>
@@ -2978,18 +3046,18 @@ GPS locatie:</translation>
 <context>
     <name>DivePlanner</name>
     <message>
-        <location filename="../desktop-widgets/diveplanner.ui" line="152"/>
-        <location filename="../build/ui_diveplanner.h" line="190"/>
-        <source>Altitude</source>
-        <translation>Hoogte</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/diveplanner.ui" line="109"/>
         <location filename="../build/ui_diveplanner.h" line="189"/>
         <source>Planned dive time</source>
         <translation>Geplande Duiktijd</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/diveplanner.ui" line="152"/>
+        <location filename="../build/ui_diveplanner.h" line="190"/>
+        <source>Altitude</source>
+        <translation>Hoogte</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/diveplanner.ui" line="159"/>
         <location filename="../build/ui_diveplanner.h" line="191"/>
         <source>ATM pressure</source>
@@ -3023,32 +3091,32 @@ GPS locatie:</translation>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="134"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="136"/>
         <source>unknown</source>
         <translation>onbekend</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="312"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="326"/>
         <source>Final depth</source>
         <translation>Eind diepte</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="314"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="328"/>
         <source>Run time</source>
         <translation>Run time</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="316"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="330"/>
         <source>Duration</source>
         <translation>Duur</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="318"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="332"/>
         <source>Used gas</source>
         <translation>Verbruikt Gas</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="320"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="334"/>
         <source>CC setpoint</source>
         <translation>CC Instelpunt</translation>
     </message>
@@ -3056,22 +3124,22 @@ GPS locatie:</translation>
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="108"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="112"/>
         <source>Dive planner points</source>
         <translation>Duikplanner punten</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="112"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="116"/>
         <source>Available gases</source>
         <translation>Beschikbare gasmengsels</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="137"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="143"/>
         <source>Add dive data point</source>
         <translation>Duik punt toevoegen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="146"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="152"/>
         <source>Save new</source>
         <translation>Bewaar als nieuw bestand</translation>
     </message>
@@ -3104,11 +3172,36 @@ GPS locatie:</translation>
         <translation>Kleur</translation>
     </message>
     <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="124"/>
+        <source>User entered</source>
+        <translation>Ingevoerd door gebruiker</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="126"/>
+        <source>Cylinder index</source>
+        <translation>Fles index</translation>
+    </message>
+    <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="128"/>
         <source>Pressure S</source>
         <translation>Druk S</translation>
     </message>
     <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="130"/>
+        <source>Pressure I</source>
+        <translation>Druk I</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="132"/>
+        <source>Ceiling</source>
+        <translation>Plafond</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="134"/>
+        <source>SAC</source>
+        <translation>Gasverbruik</translation>
+    </message>
+    <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="136"/>
         <source>pN₂</source>
         <translation>pN₂</translation>
@@ -3144,49 +3237,24 @@ GPS locatie:</translation>
         <translation>Sensor 3</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="152"/>
-        <source>Heart rate</source>
-        <translation>Hartslag</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="156"/>
-        <source>Mean depth @ s</source>
-        <translation>Gemiddelde diepte @ s</translation>
-    </message>
-    <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="150"/>
         <source>Ambient pressure</source>
         <translation>Omgevingsdruk</translation>
     </message>
     <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="152"/>
+        <source>Heart rate</source>
+        <translation>Hartslag</translation>
+    </message>
+    <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="154"/>
         <source>Gradient factor</source>
         <translation>Gradiënt Factor</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="130"/>
-        <source>Pressure I</source>
-        <translation>Druk I</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="124"/>
-        <source>User entered</source>
-        <translation>Ingevoerd door gebruiker</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="126"/>
-        <source>Cylinder index</source>
-        <translation>Fles index</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="132"/>
-        <source>Ceiling</source>
-        <translation>Plafond</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="134"/>
-        <source>SAC</source>
-        <translation>Gasverbruik</translation>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="156"/>
+        <source>Mean depth @ s</source>
+        <translation>Gemiddelde diepte @ s</translation>
     </message>
 </context>
 <context>
@@ -3257,311 +3325,315 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="395"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="441"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="434"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="483"/>
         <source>#</source>
         <translation>Nr.</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="398"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="444"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="437"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="486"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="401"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="447"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="440"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="489"/>
         <source>Rating</source>
         <translation>Waardering</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="404"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="443"/>
         <source>Depth</source>
         <translation>Diepte</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="410"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="446"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="495"/>
+        <source>Duration</source>
+        <translation>Duur</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="449"/>
         <source>Temp</source>
         <translation>Temperatuur</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="413"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="452"/>
         <source>Weight</source>
         <translation>Gewicht</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="425"/>
-        <source>SAC</source>
-        <translation>Gasverbruik</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
-        <source>m</source>
-        <translation>m</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
-        <source>ft</source>
-        <translation>ft</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
-        <source>Weight(%1)</source>
-        <translation>Gewicht (%1)</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="416"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="462"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="455"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="504"/>
         <source>Suit</source>
         <translation>Pak</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="419"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="465"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="458"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="507"/>
         <source>Cyl</source>
         <translation>Fles</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="422"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="468"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="461"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="510"/>
         <source>Gas</source>
         <translation>Gas</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
-        <source>SAC(%1)</source>
-        <translation>Gasverbruik (%1)</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="464"/>
+        <source>SAC</source>
+        <translation>Gasverbruik</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
-        <source>/min</source>
-        <translation>/min</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="467"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="518"/>
+        <source>OTU</source>
+        <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="431"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="479"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="470"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="521"/>
         <source>Max CNS</source>
         <translation>Max CNS</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="434"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="482"/>
-        <source>Location</source>
-        <translation>Locatie</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
+        <source>Photos</source>
+        <translation>Foto&apos;s</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
-        <source>kg</source>
-        <translation>kg</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="476"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="527"/>
+        <source>Location</source>
+        <translation>Locatie</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="492"/>
         <source>Depth(%1)</source>
         <translation>Diepte (%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="407"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="453"/>
-        <source>Duration</source>
-        <translation>Duur</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="492"/>
+        <source>m</source>
+        <translation>m</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="492"/>
+        <source>ft</source>
+        <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="456"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="498"/>
         <source>Temp(%1%2)</source>
         <translation>Temp (%1%2)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="501"/>
+        <source>Weight(%1)</source>
+        <translation>Gewicht (%1)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="501"/>
+        <source>kg</source>
+        <translation>kg</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="501"/>
         <source>lbs</source>
         <translation>US pond</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="428"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="476"/>
-        <source>OTU</source>
-        <translation>OTU</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="515"/>
+        <source>SAC(%1)</source>
+        <translation>Gasverbruik (%1)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="515"/>
+        <source>/min</source>
+        <translation>/min</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="524"/>
+        <source>Photos before/during/after dive</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="164"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="165"/>
         <source>no dives were selected</source>
         <translation>geen duiken geselecteerd</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="174"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="175"/>
         <source>stylesheet to export to divelogs.de is not found</source>
         <translation>stylesheet om naar divelogs.de te exporteren is niet gevonden</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="184"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="185"/>
         <source>failed to create zip file for upload: %s</source>
         <translation>kan zip bestand voor opladen niet aanmaken: %s</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="236"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="237"/>
         <source>internal error</source>
         <translation>interne fout</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="244"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="245"/>
         <source>Conversion of dive %1 to divelogs.de format failed</source>
         <translation>Conversie van duik %1 naar divelogs.de formaat is gefaald</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="272"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="273"/>
         <source>error writing zip file: %s zip error %d system error %d - %s</source>
         <translation>Fout bij schrijven zip file: %s zip fout %d systeem fout %d - %s</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="745"/>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="935"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="936"/>
         <source>Done</source>
         <translation>Klaar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="778"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="779"/>
         <source>Uploading dive list...</source>
         <translation>Duiklijst wordt opgeladen...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="810"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="811"/>
         <source>Downloading dive list...</source>
         <translation>Duiklijst wordt geladen...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="851"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="852"/>
         <source>Downloading %1 dives...</source>
         <translation>%1 duiken worden geladen...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="885"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="886"/>
         <source>Download finished - %1</source>
         <translation>Download klaar - %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="899"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="900"/>
         <source>Problem with download</source>
         <translation>Download probleem</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="900"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="901"/>
         <source>The archive could not be opened:
 </source>
         <translation>Het archief kon niet geopend worden:
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="909"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="910"/>
         <source>Corrupted download</source>
         <translation>Beschadigde download</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="910"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="911"/>
         <source>The archive could not be opened:
 %1</source>
         <translation>Het archief kon niet geopend worden:
 %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="937"/>
+        <source>Upload finished</source>
+        <translation>Opladen klaar</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="950"/>
         <source>Upload failed</source>
         <translation>Opladen mislukt</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="952"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="953"/>
         <source>Upload successful</source>
         <translation>Opladen gelukt</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="955"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="956"/>
         <source>Login failed</source>
         <translation>Login mislukt</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="958"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="959"/>
         <source>Cannot parse response</source>
         <translation>Kan antwoord niet correct ontleden</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="970"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="971"/>
         <source>Error: %1</source>
         <translation>Fout: %1</translation>
     </message>
-    <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="936"/>
-        <source>Upload finished</source>
-        <translation>Opladen klaar</translation>
-    </message>
 </context>
 <context>
     <name>DownloadFromDCWidget</name>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="185"/>
-        <source>Error</source>
-        <translation>Fout</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="436"/>
-        <source>Retry</source>
-        <translation>Opnieuw</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="280"/>
-        <source>Find Uemis dive computer</source>
-        <translation>Uemis duikcomputer zoeken</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="101"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="107"/>
         <source>Download</source>
         <translation>Downloaden</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="104"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="110"/>
         <source>Choose Bluetooth download mode</source>
         <translation>Kies Bluetooth download mode</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="382"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="191"/>
+        <source>Error</source>
+        <translation>Fout</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="286"/>
+        <source>Find Uemis dive computer</source>
+        <translation>Uemis duikcomputer zoeken</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="392"/>
         <source>Choose file for divecomputer download logfile</source>
         <translation>Kies een bestand om duikcomputer log te downloaden</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="383"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="393"/>
         <source>Log files (*.log)</source>
         <translation>Log bestanden (*.log)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="398"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="408"/>
         <source>Warning</source>
         <translation>Waarschuwing</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="399"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="409"/>
         <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="../desktop-widgets/downloadfromdivecomputer.cpp" line="410"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="420"/>
         <source>Choose file for divecomputer binary dump file</source>
         <translation>Kies een bestand voor de duikcomputer binaire dump</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="411"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="421"/>
         <source>Dump files (*.bin)</source>
         <translation>Dump bestanden (*.bin)</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="446"/>
+        <source>Retry</source>
+        <translation>Opnieuw</translation>
+    </message>
 </context>
 <context>
     <name>DownloadFromDiveComputer</name>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="139"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="275"/>
-        <source>Vendor</source>
-        <translation>Merk</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="14"/>
         <location filename="../build/ui_downloadfromdivecomputer.h" line="265"/>
         <source>Download from dive computer</source>
@@ -3574,17 +3646,6 @@ p, li { white-space: pre-wrap; }
         <translation>Device of mountpoint</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="122"/>
-        <source>Choose Bluetooth download mode</source>
-        <translation>Kies Bluetooth download mode</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="149"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="276"/>
-        <source>Dive computer</source>
-        <translation>Duikcomputer</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="66"/>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="101"/>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="115"/>
@@ -3608,11 +3669,46 @@ p, li { white-space: pre-wrap; }
         <translation>Altijd gedownloade duiken gebruiken</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="87"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="270"/>
+        <source>Download into new trip</source>
+        <translation>Ophalen als een nieuwe trip</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="94"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="271"/>
+        <source>Save libdivecomputer logfile</source>
+        <translation>libdivecomputer logbestand opslaan</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="108"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="273"/>
+        <source>Save libdivecomputer dumpfile</source>
+        <translation>libdivecomputer dump opslaan</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="122"/>
+        <source>Choose Bluetooth download mode</source>
+        <translation>Kies Bluetooth download mode</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="129"/>
         <source>Select a remote Bluetooth device.</source>
         <translation>Selecteer een extern Bluetooth toestel.</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="139"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="275"/>
+        <source>Vendor</source>
+        <translation>Merk</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="149"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="276"/>
+        <source>Dive computer</source>
+        <translation>Duikcomputer</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/>
         <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="52"/>
         <location filename="../build/ui_downloadfromdivecomputer.h" line="277"/>
@@ -3620,18 +3716,6 @@ p, li { white-space: pre-wrap; }
         <translation>Downloaden</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="284"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="281"/>
-        <source>OK</source>
-        <translation>OK</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="291"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="282"/>
-        <source>Cancel</source>
-        <translation>Annuleren</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="226"/>
         <location filename="../build/ui_downloadfromdivecomputer.h" line="278"/>
         <source>Downloaded dives</source>
@@ -3650,22 +3734,16 @@ p, li { white-space: pre-wrap; }
         <translation>Selectie ongedaan maken</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="94"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="271"/>
-        <source>Save libdivecomputer logfile</source>
-        <translation>libdivecomputer logbestand opslaan</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="108"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="273"/>
-        <source>Save libdivecomputer dumpfile</source>
-        <translation>libdivecomputer dump opslaan</translation>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="284"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="281"/>
+        <source>OK</source>
+        <translation>OK</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="87"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="270"/>
-        <source>Download into new trip</source>
-        <translation>Ophalen als een nieuwe trip</translation>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="291"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="282"/>
+        <source>Cancel</source>
+        <translation>Annuleren</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="16"/>
@@ -3755,12 +3833,12 @@ p, li { white-space: pre-wrap; }
         <translation>Aanmelden bij Facebook text placeholder</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="297"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="242"/>
         <source>To disconnect Subsurface from your Facebook account, use the button below</source>
         <translation>Gebruik de knop hieronder om de verbinding van Subsurface met uw Facebook account te sluiten.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="306"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="251"/>
         <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source>
         <translation>Log in om verbinding met Facebook te maken. Dit maakt het mogelijk om duiken op uw tijdslijn te publiceren</translation>
     </message>
@@ -3768,22 +3846,22 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>FacebookManager</name>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="266"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="211"/>
         <source>Photo upload sucessfull</source>
         <translation>Foto opladen gelukt</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="267"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="212"/>
         <source>Your dive profile was updated to Facebook.</source>
         <translation>Uw duikprofiel is naar Facebook verzonden</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="271"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="216"/>
         <source>Photo upload failed</source>
         <translation>Foto opladen mislukt</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="272"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="217"/>
         <source>Your dive profile was not updated to Facebook, 
  please send the following to the developer. 
 </source>
@@ -3845,17 +3923,25 @@ Zend het volgende naar de ontwikkelaar.
 <context>
     <name>FirmwareUpdateThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1750"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1739"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Deze functie is nog niet beschikbaar voor de geselecteerde duikcomputer</translation>
     </message>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1755"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1744"/>
         <source>Firmware update failed!</source>
         <translation>Firmware bijwerken mislukt!</translation>
     </message>
 </context>
 <context>
+    <name>GlobalDrawer</name>
+    <message>
+        <location filename="../mobile-widgets/qml/kirigami/src/controls/GlobalDrawer.qml" line="364"/>
+        <source>Back</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>GlobeGPS</name>
     <message>
         <location filename="../desktop-widgets/globe.cpp" line="124"/>
@@ -3871,27 +3957,27 @@ Zend het volgende naar de ontwikkelaar.
         <translation>GPS Fixes</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="40"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="32"/>
         <source>Date: </source>
         <translation>Datum:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="50"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="42"/>
         <source>Name: </source>
         <translation>Naam:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="60"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="52"/>
         <source>Latitude: </source>
-        <translation type="unfinished"/>
+        <translation>Latitude: </translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="69"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="61"/>
         <source>Longitude: </source>
-        <translation type="unfinished"/>
+        <translation>Longitude: </translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="113"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="105"/>
         <source>List of stored GPS fixes</source>
         <translation>Lijst opgeslagen GPS fixes</translation>
     </message>
@@ -3920,7 +4006,7 @@ Zend het volgende naar de ontwikkelaar.
 <context>
     <name>LocationFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="648"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="646"/>
         <source>Location: </source>
         <translation>Locatie:</translation>
     </message>
@@ -3961,7 +4047,7 @@ Zend het volgende naar de ontwikkelaar.
 <context>
     <name>LocationFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="299"/>
+        <location filename="../qt-models/filtermodels.cpp" line="304"/>
         <source>No location set</source>
         <translation>Locatie niet ingesteld</translation>
     </message>
@@ -4083,20 +4169,55 @@ Bent u zeker?</translation>
     </message>
 </context>
 <context>
-    <name>MainForm.ui</name>
+    <name>MainTab</name>
     <message>
-        <location filename="../packaging/ios/Subsurface-mobile/MainForm.ui.qml" line="17"/>
-        <source>Press Me 1</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/maintab.ui" line="18"/>
+        <location filename="../desktop-widgets/maintab.ui" line="439"/>
+        <location filename="../build/ui_maintab.h" line="961"/>
+        <location filename="../build/ui_maintab.h" line="963"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="539"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="571"/>
+        <source>Notes</source>
+        <translation>Notities</translation>
     </message>
     <message>
-        <location filename="../packaging/ios/Subsurface-mobile/MainForm.ui.qml" line="22"/>
-        <source>Press Me 2</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/maintab.ui" line="21"/>
+        <location filename="../build/ui_maintab.h" line="964"/>
+        <source>General notes about the current selection</source>
+        <translation>Notities voor de huidige selectie</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="92"/>
+        <location filename="../desktop-widgets/maintab.ui" line="646"/>
+        <location filename="../build/ui_maintab.h" line="947"/>
+        <location filename="../build/ui_maintab.h" line="967"/>
+        <source>Date</source>
+        <translation>Datum</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="102"/>
+        <location filename="../build/ui_maintab.h" line="948"/>
+        <source>Time</source>
+        <translation>Tijd</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="112"/>
+        <location filename="../desktop-widgets/maintab.ui" line="836"/>
+        <location filename="../build/ui_maintab.h" line="949"/>
+        <location filename="../build/ui_maintab.h" line="987"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="306"/>
+        <source>Air temp.</source>
+        <translation>Lucht temp.</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="122"/>
+        <location filename="../desktop-widgets/maintab.ui" line="855"/>
+        <location filename="../build/ui_maintab.h" line="950"/>
+        <location filename="../build/ui_maintab.h" line="989"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="307"/>
+        <source>Water temp.</source>
+        <translation>Water temp.</translation>
     </message>
-</context>
-<context>
-    <name>MainTab</name>
     <message>
         <location filename="../desktop-widgets/maintab.ui" line="184"/>
         <location filename="../build/ui_maintab.h" line="951"/>
@@ -4105,6 +4226,17 @@ Bent u zeker?</translation>
         <translation>Locatie</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="214"/>
+        <source>Edit dive site</source>
+        <translation>Duikstek bewerken</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="217"/>
+        <location filename="../build/ui_maintab.h" line="953"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="252"/>
         <location filename="../build/ui_maintab.h" line="954"/>
         <source>Divemaster</source>
@@ -4117,12 +4249,6 @@ Bent u zeker?</translation>
         <translation>Buddy</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.ui" line="387"/>
-        <location filename="../build/ui_maintab.h" line="959"/>
-        <source>Tags</source>
-        <translation>Trefwoorden</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/maintab.ui" line="308"/>
         <location filename="../build/ui_maintab.h" line="956"/>
         <source>Rating</source>
@@ -4141,57 +4267,18 @@ Bent u zeker?</translation>
         <translation>Pak</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="387"/>
+        <location filename="../build/ui_maintab.h" line="959"/>
+        <source>Tags</source>
+        <translation>Trefwoorden</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="397"/>
         <location filename="../build/ui_maintab.h" line="960"/>
         <source>Dive mode</source>
         <translation>Duikmodus</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.ui" line="112"/>
-        <location filename="../desktop-widgets/maintab.ui" line="836"/>
-        <location filename="../build/ui_maintab.h" line="949"/>
-        <location filename="../build/ui_maintab.h" line="987"/>
-        <location filename="../desktop-widgets/maintab.cpp" line="306"/>
-        <source>Air temp.</source>
-        <translation>Lucht temp.</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="122"/>
-        <location filename="../desktop-widgets/maintab.ui" line="855"/>
-        <location filename="../build/ui_maintab.h" line="950"/>
-        <location filename="../build/ui_maintab.h" line="989"/>
-        <location filename="../desktop-widgets/maintab.cpp" line="307"/>
-        <source>Water temp.</source>
-        <translation>Water temp.</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="18"/>
-        <location filename="../desktop-widgets/maintab.ui" line="439"/>
-        <location filename="../build/ui_maintab.h" line="961"/>
-        <location filename="../build/ui_maintab.h" line="963"/>
-        <location filename="../desktop-widgets/maintab.cpp" line="539"/>
-        <location filename="../desktop-widgets/maintab.cpp" line="571"/>
-        <source>Notes</source>
-        <translation>Notities</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="21"/>
-        <location filename="../build/ui_maintab.h" line="964"/>
-        <source>General notes about the current selection</source>
-        <translation>Notities voor de huidige selectie</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="214"/>
-        <source>Edit dive site</source>
-        <translation>Duikstek bewerken</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="217"/>
-        <location filename="../build/ui_maintab.h" line="953"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/maintab.ui" line="491"/>
         <location filename="../build/ui_maintab.h" line="965"/>
         <source>Equipment</source>
@@ -4216,6 +4303,12 @@ Bent u zeker?</translation>
         <translation>Duikinformatie</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="665"/>
+        <location filename="../build/ui_maintab.h" line="969"/>
+        <source>Interval</source>
+        <translation>Interval</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="684"/>
         <location filename="../build/ui_maintab.h" line="971"/>
         <source>Gases used</source>
@@ -4228,18 +4321,38 @@ Bent u zeker?</translation>
         <translation>Gasverbruik</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="722"/>
+        <location filename="../desktop-widgets/maintab.ui" line="1094"/>
+        <location filename="../build/ui_maintab.h" line="975"/>
+        <location filename="../build/ui_maintab.h" line="1003"/>
+        <source>SAC</source>
+        <translation>Gasverbruik</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="741"/>
         <location filename="../build/ui_maintab.h" line="977"/>
         <source>CNS</source>
         <translation>CNS</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="760"/>
+        <location filename="../build/ui_maintab.h" line="979"/>
+        <source>OTU</source>
+        <translation>OTU</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="779"/>
         <location filename="../build/ui_maintab.h" line="981"/>
         <source>Max. depth</source>
         <translation>Max. diepte</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="798"/>
+        <location filename="../build/ui_maintab.h" line="983"/>
+        <source>Avg. depth</source>
+        <translation>Gem. diepte</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="817"/>
         <location filename="../build/ui_maintab.h" line="985"/>
         <source>Air pressure</source>
@@ -4252,82 +4365,6 @@ Bent u zeker?</translation>
         <translation>Duiktijd</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.ui" line="933"/>
-        <location filename="../build/ui_maintab.h" line="1007"/>
-        <source>Simple statistics about the selection</source>
-        <translation>Eenvoudige statistiek voor de selectie</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1039"/>
-        <location filename="../build/ui_maintab.h" line="999"/>
-        <source>Total time</source>
-        <translation>Totale tijd</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1106"/>
-        <location filename="../build/ui_maintab.h" line="1004"/>
-        <source>Gas consumption</source>
-        <translation>Gasverbruik</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1151"/>
-        <location filename="../build/ui_maintab.h" line="1009"/>
-        <source>All photos from the current selection</source>
-        <translation>Alle foto&apos;s van de huidige selectie</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1177"/>
-        <location filename="../build/ui_maintab.h" line="1010"/>
-        <source>Extra data</source>
-        <translation>Extra gegevens</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1180"/>
-        <location filename="../build/ui_maintab.h" line="1011"/>
-        <source>Adittional data from the dive computer</source>
-        <translation>Bijkomende gegevens van de duikcomputer</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="92"/>
-        <location filename="../desktop-widgets/maintab.ui" line="646"/>
-        <location filename="../build/ui_maintab.h" line="947"/>
-        <location filename="../build/ui_maintab.h" line="967"/>
-        <source>Date</source>
-        <translation>Datum</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="102"/>
-        <location filename="../build/ui_maintab.h" line="948"/>
-        <source>Time</source>
-        <translation>Tijd</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="665"/>
-        <location filename="../build/ui_maintab.h" line="969"/>
-        <source>Interval</source>
-        <translation>Interval</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="722"/>
-        <location filename="../desktop-widgets/maintab.ui" line="1094"/>
-        <location filename="../build/ui_maintab.h" line="975"/>
-        <location filename="../build/ui_maintab.h" line="1003"/>
-        <source>SAC</source>
-        <translation>Gasverbruik</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="798"/>
-        <location filename="../build/ui_maintab.h" line="983"/>
-        <source>Avg. depth</source>
-        <translation>Gem. diepte</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="760"/>
-        <location filename="../build/ui_maintab.h" line="979"/>
-        <source>OTU</source>
-        <translation>OTU</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/maintab.ui" line="893"/>
         <location filename="../build/ui_maintab.h" line="993"/>
         <source>Salinity</source>
@@ -4340,22 +4377,34 @@ Bent u zeker?</translation>
         <translation>Statistieken</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="933"/>
+        <location filename="../build/ui_maintab.h" line="1007"/>
+        <source>Simple statistics about the selection</source>
+        <translation>Eenvoudige statistiek voor de selectie</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="986"/>
         <location filename="../build/ui_maintab.h" line="996"/>
         <source>Depth</source>
         <translation>Diepte</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="998"/>
+        <location filename="../build/ui_maintab.h" line="997"/>
+        <source>Duration</source>
+        <translation>Duur</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="1027"/>
         <location filename="../build/ui_maintab.h" line="998"/>
         <source>Temperature</source>
         <translation>Temperatuur</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.ui" line="998"/>
-        <location filename="../build/ui_maintab.h" line="997"/>
-        <source>Duration</source>
-        <translation>Duur</translation>
+        <location filename="../desktop-widgets/maintab.ui" line="1039"/>
+        <location filename="../build/ui_maintab.h" line="999"/>
+        <source>Total time</source>
+        <translation>Totale tijd</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/maintab.ui" line="1058"/>
@@ -4364,20 +4413,34 @@ Bent u zeker?</translation>
         <translation>Duiken</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="1106"/>
+        <location filename="../build/ui_maintab.h" line="1004"/>
+        <source>Gas consumption</source>
+        <translation>Gasverbruik</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="1148"/>
         <location filename="../build/ui_maintab.h" line="1008"/>
         <source>Photos</source>
         <translation>Foto&apos;s</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.cpp" line="88"/>
-        <source>Cylinders</source>
-        <translation>Flessen</translation>
+        <location filename="../desktop-widgets/maintab.ui" line="1151"/>
+        <location filename="../build/ui_maintab.h" line="1009"/>
+        <source>All photos from the current selection</source>
+        <translation>Alle foto&apos;s van de huidige selectie</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.cpp" line="92"/>
-        <source>Weights</source>
-        <translation>Gewichten</translation>
+        <location filename="../desktop-widgets/maintab.ui" line="1177"/>
+        <location filename="../build/ui_maintab.h" line="1010"/>
+        <source>Extra data</source>
+        <translation>Extra gegevens</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="1180"/>
+        <location filename="../build/ui_maintab.h" line="1011"/>
+        <source>Adittional data from the dive computer</source>
+        <translation>Bijkomende gegevens van de duikcomputer</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/maintab.cpp" line="63"/>
@@ -4390,11 +4453,21 @@ Bent u zeker?</translation>
         <translation>Wijzigingen verwijderen</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.cpp" line="88"/>
+        <source>Cylinders</source>
+        <translation>Flessen</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.cpp" line="89"/>
         <source>Add cylinder</source>
         <translation>Fles toevoegen</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.cpp" line="92"/>
+        <source>Weights</source>
+        <translation>Gewichten</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.cpp" line="93"/>
         <source>Add weight system</source>
         <translation>Voeg gewichtssysteem toe</translation>
@@ -4550,12 +4623,12 @@ worden uit lucht en:
     <message>
         <location filename="../desktop-widgets/maintab.cpp" line="1594"/>
         <source>Deleting Images</source>
-        <translation type="unfinished"/>
+        <translation>Afbeeldingen worden verwijderd</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/maintab.cpp" line="1594"/>
         <source>Are you sure you want to delete all images?</source>
-        <translation type="unfinished"/>
+        <translation>Weet je zeker dat je alle afbeeldingen wilt verwijderen?</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/maintab.cpp" line="1653"/>
@@ -4570,12 +4643,12 @@ worden uit lucht en:
     <message>
         <location filename="../desktop-widgets/maintab.cpp" line="1656"/>
         <source>Delete selected images</source>
-        <translation type="unfinished"/>
+        <translation>Verwijder geselecteerde afbeeldingen</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/maintab.cpp" line="1657"/>
         <source>Delete all images</source>
-        <translation type="unfinished"/>
+        <translation>Verwijder alle afbeeldingen</translation>
     </message>
 </context>
 <context>
@@ -4587,659 +4660,685 @@ worden uit lucht en:
         <translation>Bestand</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="455"/>
-        <location filename="../build/ui_mainwindow.h" line="534"/>
-        <source>Export dive logs</source>
-        <translation>Exporteer logboek</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="510"/>
-        <location filename="../build/ui_mainwindow.h" line="542"/>
-        <source>Toggle pHe graph</source>
-        <translation>pHe grafiek in-/uitschakelen</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="546"/>
-        <location filename="../build/ui_mainwindow.h" line="545"/>
-        <source>Toggle calculating all tissues</source>
-        <translation>Berekening van alle compartimenten in-/uitschakelen</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="522"/>
-        <location filename="../build/ui_mainwindow.h" line="543"/>
-        <source>Toggle DC reported ceiling</source>
-        <translation>Door DC aangegeven plafond in-/uitschakelen</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="534"/>
-        <location filename="../build/ui_mainwindow.h" line="544"/>
-        <source>Toggle calculated ceiling</source>
-        <translation>Berekend plafond in-/uitschakelen</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="606"/>
-        <location filename="../build/ui_mainwindow.h" line="550"/>
-        <source>Toggle NDL, TTS</source>
-        <translation>NDL, TTS in-/uitschakelen</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="558"/>
-        <location filename="../build/ui_mainwindow.h" line="546"/>
-        <source>Toggle calculated ceiling with 3m increments</source>
-        <translation>Berekend plafond in 3m stappen in-/uitschakelen</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="463"/>
-        <location filename="../build/ui_mainwindow.h" line="537"/>
-        <source>Configure &amp;dive computer</source>
-        <translation>Duikcomputer configureren</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="570"/>
-        <location filename="../build/ui_mainwindow.h" line="547"/>
-        <source>Toggle heart rate</source>
-        <translation>Toon/verberg hartslag</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="582"/>
-        <location filename="../build/ui_mainwindow.h" line="548"/>
-        <source>Toggle MOD</source>
-        <translation>MOD in-/uitschakelen</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="594"/>
-        <location filename="../build/ui_mainwindow.h" line="549"/>
-        <source>Toggle EAD, END, EADD</source>
-        <translation>EAD, END, EADD in-/uitschakelen</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="618"/>
-        <location filename="../build/ui_mainwindow.h" line="551"/>
-        <source>Toggle SAC rate</source>
-        <translation>SAC in-/uitschakelen</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="630"/>
-        <location filename="../build/ui_mainwindow.h" line="552"/>
-        <source>Toggle ruler</source>
-        <translation>Meetlat in-/uitschakelen</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="86"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="87"/>
         <location filename="../build/ui_mainwindow.h" line="569"/>
         <source>&amp;Log</source>
         <translation>&amp;Log</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="105"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="104"/>
         <location filename="../build/ui_mainwindow.h" line="570"/>
         <source>&amp;View</source>
         <translation>Toon</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="121"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="120"/>
         <location filename="../build/ui_mainwindow.h" line="571"/>
         <source>&amp;Help</source>
         <translation>&amp;Help</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="130"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="129"/>
         <location filename="../build/ui_mainwindow.h" line="572"/>
         <source>&amp;Import</source>
         <translation>&amp;Importeren</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="139"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="138"/>
         <location filename="../build/ui_mainwindow.h" line="573"/>
         <source>&amp;Edit</source>
         <translation>Bewerken</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="144"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="143"/>
         <source>Share on</source>
         <translation>Deel via</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="158"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="157"/>
         <location filename="../build/ui_mainwindow.h" line="453"/>
         <source>&amp;New logbook</source>
         <translation>&amp;Nieuw logboek</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="161"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="160"/>
         <location filename="../build/ui_mainwindow.h" line="455"/>
         <source>New</source>
         <translation>Nieuw</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="164"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="163"/>
         <location filename="../build/ui_mainwindow.h" line="457"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="169"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="168"/>
         <location filename="../build/ui_mainwindow.h" line="458"/>
         <source>&amp;Open logbook</source>
         <translation>Logboek &amp;openen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="172"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="171"/>
         <location filename="../build/ui_mainwindow.h" line="460"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="508"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="502"/>
         <source>Open</source>
         <translation>Open</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="175"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="174"/>
         <location filename="../build/ui_mainwindow.h" line="462"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="180"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="179"/>
         <location filename="../build/ui_mainwindow.h" line="463"/>
         <source>&amp;Save</source>
         <translation>Bewaar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="183"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="182"/>
         <location filename="../build/ui_mainwindow.h" line="465"/>
         <source>Save</source>
         <translation>Opslaan</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="186"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="185"/>
         <location filename="../build/ui_mainwindow.h" line="467"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="191"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="190"/>
         <location filename="../build/ui_mainwindow.h" line="468"/>
         <source>Sa&amp;ve as</source>
         <translation>Bewaren als</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="194"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="193"/>
         <location filename="../build/ui_mainwindow.h" line="470"/>
         <source>Save as</source>
         <translation>Opslaan als...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="197"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="196"/>
         <location filename="../build/ui_mainwindow.h" line="472"/>
         <source>Ctrl+Shift+S</source>
         <translation>Ctrl+Shift+S</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="202"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="201"/>
         <location filename="../build/ui_mainwindow.h" line="473"/>
         <source>&amp;Close</source>
         <translation>Sluiten</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="205"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="204"/>
         <location filename="../build/ui_mainwindow.h" line="475"/>
         <source>Close</source>
         <translation>Sluiten</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="208"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="207"/>
         <location filename="../build/ui_mainwindow.h" line="477"/>
         <source>Ctrl+W</source>
         <translation>Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="221"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="212"/>
+        <location filename="../build/ui_mainwindow.h" line="478"/>
+        <source>&amp;Print</source>
+        <translation>Afdrukken</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="215"/>
+        <location filename="../build/ui_mainwindow.h" line="479"/>
+        <source>Ctrl+P</source>
+        <translation>Ctrl+P</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="220"/>
         <location filename="../build/ui_mainwindow.h" line="480"/>
         <source>P&amp;references</source>
         <translation>Voorkeuren</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="251"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="223"/>
+        <location filename="../build/ui_mainwindow.h" line="481"/>
+        <source>Ctrl+,</source>
+        <translation>Ctrl+,</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="231"/>
+        <location filename="../build/ui_mainwindow.h" line="482"/>
+        <source>&amp;Quit</source>
+        <translation>Afsluiten</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="234"/>
+        <location filename="../build/ui_mainwindow.h" line="483"/>
+        <source>Ctrl+Q</source>
+        <translation>Ctrl+Q</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="242"/>
+        <location filename="../build/ui_mainwindow.h" line="484"/>
+        <source>Import from &amp;dive computer</source>
+        <translation>Importeren uit &amp;duikcomputer</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="245"/>
+        <location filename="../build/ui_mainwindow.h" line="485"/>
+        <source>Ctrl+D</source>
+        <translation>Ctrl+D</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="250"/>
         <location filename="../build/ui_mainwindow.h" line="486"/>
         <source>Import &amp;GPS data from Subsurface web service</source>
         <translation>GPS gegevens importeren van Subsurface webservice</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="259"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="253"/>
+        <location filename="../build/ui_mainwindow.h" line="487"/>
+        <source>Ctrl+G</source>
+        <translation>Ctrl+G</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="258"/>
         <location filename="../build/ui_mainwindow.h" line="488"/>
         <source>Edit device &amp;names</source>
         <translation>Namen duikcomputers wijzigen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="272"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="263"/>
+        <location filename="../build/ui_mainwindow.h" line="489"/>
+        <source>&amp;Add dive</source>
+        <translation>Duik toevoegen</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="266"/>
+        <location filename="../build/ui_mainwindow.h" line="490"/>
+        <source>Ctrl++</source>
+        <translation>Ctrl++</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="271"/>
         <location filename="../build/ui_mainwindow.h" line="491"/>
         <source>&amp;Edit dive</source>
         <translation>Duik bewerken</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="277"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="276"/>
         <location filename="../build/ui_mainwindow.h" line="492"/>
         <source>&amp;Copy dive components</source>
         <translation>Kopieer duikcomponenten</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="280"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="279"/>
         <location filename="../build/ui_mainwindow.h" line="493"/>
         <source>Ctrl+C</source>
         <translation>Ctrl+C</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="285"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="284"/>
         <location filename="../build/ui_mainwindow.h" line="494"/>
         <source>&amp;Paste dive components</source>
         <translation>Plak duikcomponenten</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="288"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="287"/>
         <location filename="../build/ui_mainwindow.h" line="495"/>
         <source>Ctrl+V</source>
         <translation>Ctrl+V</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="325"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="292"/>
+        <location filename="../build/ui_mainwindow.h" line="496"/>
+        <source>&amp;Renumber</source>
+        <translation>Hernummeren</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="295"/>
+        <location filename="../build/ui_mainwindow.h" line="497"/>
+        <source>Ctrl+R</source>
+        <translation>Ctrl+R</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="303"/>
+        <location filename="../build/ui_mainwindow.h" line="498"/>
+        <source>Auto &amp;group</source>
+        <translation>Automatisch groeperen</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="308"/>
+        <location filename="../build/ui_mainwindow.h" line="499"/>
+        <source>&amp;Yearly statistics</source>
+        <translation>Jaarlijkse statistieken</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="311"/>
+        <location filename="../build/ui_mainwindow.h" line="500"/>
+        <source>Ctrl+Y</source>
+        <translation>Ctrl+Y</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="316"/>
+        <location filename="../build/ui_mainwindow.h" line="501"/>
+        <source>&amp;Dive list</source>
+        <translation>Duiklijst</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="319"/>
+        <location filename="../build/ui_mainwindow.h" line="502"/>
+        <source>Ctrl+2</source>
+        <translation>Ctrl+2</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="324"/>
         <location filename="../build/ui_mainwindow.h" line="503"/>
         <source>&amp;Profile</source>
         <translation>Profiel</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="333"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="327"/>
+        <location filename="../build/ui_mainwindow.h" line="504"/>
+        <source>Ctrl+3</source>
+        <translation>Ctrl+3</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="332"/>
         <location filename="../build/ui_mainwindow.h" line="505"/>
         <source>&amp;Info</source>
         <translation>Info</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="341"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="335"/>
+        <location filename="../build/ui_mainwindow.h" line="506"/>
+        <source>Ctrl+4</source>
+        <translation>Ctrl+4</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="340"/>
         <location filename="../build/ui_mainwindow.h" line="507"/>
         <source>&amp;All</source>
         <translation>Alle</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="357"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="343"/>
+        <location filename="../build/ui_mainwindow.h" line="508"/>
+        <source>Ctrl+1</source>
+        <translation>Ctrl+1</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="348"/>
+        <location filename="../build/ui_mainwindow.h" line="509"/>
+        <source>P&amp;revious DC</source>
+        <translation>Vorige duikcomputer</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="351"/>
+        <location filename="../build/ui_mainwindow.h" line="510"/>
+        <source>Left</source>
+        <translation>Links</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="356"/>
         <location filename="../build/ui_mainwindow.h" line="511"/>
         <source>&amp;Next DC</source>
         <translation>Volgende duikcomputer</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="365"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="359"/>
+        <location filename="../build/ui_mainwindow.h" line="512"/>
+        <source>Right</source>
+        <translation>Rechts</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="364"/>
         <location filename="../build/ui_mainwindow.h" line="513"/>
         <source>&amp;About Subsurface</source>
         <translation>Over Subsurface</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="381"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="372"/>
+        <location filename="../build/ui_mainwindow.h" line="514"/>
+        <source>User &amp;manual</source>
+        <translation>Handleiding</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="375"/>
+        <location filename="../build/ui_mainwindow.h" line="515"/>
+        <source>F1</source>
+        <translation>F1</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="380"/>
         <location filename="../build/ui_mainwindow.h" line="516"/>
         <source>&amp;Globe</source>
         <translation>Wereldbol</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="403"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="383"/>
+        <location filename="../build/ui_mainwindow.h" line="517"/>
+        <source>Ctrl+5</source>
+        <translation>Ctrl+5</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="388"/>
+        <location filename="../build/ui_mainwindow.h" line="518"/>
+        <source>P&amp;lan dive</source>
+        <translation>Duik plannen</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="391"/>
+        <location filename="../build/ui_mainwindow.h" line="519"/>
+        <source>Ctrl+L</source>
+        <translation>Ctrl+L</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="396"/>
+        <location filename="../build/ui_mainwindow.h" line="520"/>
+        <source>&amp;Import log files</source>
+        <translation>Importeer logbestanden</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="399"/>
+        <location filename="../build/ui_mainwindow.h" line="522"/>
+        <source>Import divelog files from other applications</source>
+        <translation>Importeer logboeken uit andere programma&apos;s</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="402"/>
         <location filename="../build/ui_mainwindow.h" line="524"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="408"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="407"/>
         <location filename="../build/ui_mainwindow.h" line="525"/>
         <source>Import &amp;from divelogs.de</source>
         <translation>Importeren van divelogs.de</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="416"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="415"/>
         <location filename="../build/ui_mainwindow.h" line="526"/>
         <source>&amp;Full screen</source>
         <translation>Volledig scherm</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="419"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="418"/>
         <location filename="../build/ui_mainwindow.h" line="528"/>
         <source>Toggle full screen</source>
         <translation>Volledig scherm in-/uitschakelen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="447"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="421"/>
+        <location filename="../build/ui_mainwindow.h" line="530"/>
+        <source>F11</source>
+        <translation>F11</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="446"/>
         <location filename="../build/ui_mainwindow.h" line="531"/>
         <source>&amp;Check for updates</source>
         <translation>Zoek naar updates</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="452"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="451"/>
         <location filename="../build/ui_mainwindow.h" line="532"/>
         <source>&amp;Export</source>
         <translation>Exporteren</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="458"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="454"/>
+        <location filename="../build/ui_mainwindow.h" line="534"/>
+        <source>Export dive logs</source>
+        <translation>Exporteer logboek</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="457"/>
         <location filename="../build/ui_mainwindow.h" line="536"/>
         <source>Ctrl+E</source>
         <translation>Ctrl+E</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="466"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="462"/>
+        <location filename="../build/ui_mainwindow.h" line="537"/>
+        <source>Configure &amp;dive computer</source>
+        <translation>Duikcomputer configureren</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="465"/>
         <location filename="../build/ui_mainwindow.h" line="538"/>
         <source>Ctrl+Shift+C</source>
         <translation>Ctrl+Shift+C</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="474"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="473"/>
         <location filename="../build/ui_mainwindow.h" line="539"/>
         <source>Edit &amp;dive in planner</source>
         <translation>Duik bewerken in de planner</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="486"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="485"/>
         <location filename="../build/ui_mainwindow.h" line="540"/>
         <source>Toggle pO₂ graph</source>
         <translation>Toon/verberg pO₂ grafiek</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="498"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="497"/>
         <location filename="../build/ui_mainwindow.h" line="541"/>
         <source>Toggle pN₂ graph</source>
         <translation>Toon/verberg pN₂ grafiek</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="642"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="509"/>
+        <location filename="../build/ui_mainwindow.h" line="542"/>
+        <source>Toggle pHe graph</source>
+        <translation>pHe grafiek in-/uitschakelen</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="521"/>
+        <location filename="../build/ui_mainwindow.h" line="543"/>
+        <source>Toggle DC reported ceiling</source>
+        <translation>Door DC aangegeven plafond in-/uitschakelen</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="533"/>
+        <location filename="../build/ui_mainwindow.h" line="544"/>
+        <source>Toggle calculated ceiling</source>
+        <translation>Berekend plafond in-/uitschakelen</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="545"/>
+        <location filename="../build/ui_mainwindow.h" line="545"/>
+        <source>Toggle calculating all tissues</source>
+        <translation>Berekening van alle compartimenten in-/uitschakelen</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="557"/>
+        <location filename="../build/ui_mainwindow.h" line="546"/>
+        <source>Toggle calculated ceiling with 3m increments</source>
+        <translation>Berekend plafond in 3m stappen in-/uitschakelen</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="569"/>
+        <location filename="../build/ui_mainwindow.h" line="547"/>
+        <source>Toggle heart rate</source>
+        <translation>Toon/verberg hartslag</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="581"/>
+        <location filename="../build/ui_mainwindow.h" line="548"/>
+        <source>Toggle MOD</source>
+        <translation>MOD in-/uitschakelen</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="593"/>
+        <location filename="../build/ui_mainwindow.h" line="549"/>
+        <source>Toggle EAD, END, EADD</source>
+        <translation>EAD, END, EADD in-/uitschakelen</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="605"/>
+        <location filename="../build/ui_mainwindow.h" line="550"/>
+        <source>Toggle NDL, TTS</source>
+        <translation>NDL, TTS in-/uitschakelen</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="617"/>
+        <location filename="../build/ui_mainwindow.h" line="551"/>
+        <source>Toggle SAC rate</source>
+        <translation>SAC in-/uitschakelen</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="629"/>
+        <location filename="../build/ui_mainwindow.h" line="552"/>
+        <source>Toggle ruler</source>
+        <translation>Meetlat in-/uitschakelen</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="641"/>
         <location filename="../build/ui_mainwindow.h" line="553"/>
         <source>Scale graph</source>
         <translation>Grafiek schalen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="654"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="653"/>
         <location filename="../build/ui_mainwindow.h" line="554"/>
         <source>Toggle pictures</source>
         <translation>Toon/verberg foto&apos;s</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="666"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="665"/>
         <location filename="../build/ui_mainwindow.h" line="555"/>
         <source>Toggle tank bar</source>
         <translation>Toon fles bar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="674"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="673"/>
         <location filename="../build/ui_mainwindow.h" line="556"/>
         <source>&amp;Filter divelist</source>
         <translation>Duiklijst filteren</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="689"/>
-        <location filename="../build/ui_mainwindow.h" line="558"/>
-        <source>Toggle tissue graph</source>
-        <translation>Weefselgrafiek tonen/verbergen</translation>
+        <location filename="../desktop-widgets/mainwindow.ui" line="676"/>
+        <location filename="../build/ui_mainwindow.h" line="557"/>
+        <source>Ctrl+F</source>
+        <translation>Ctrl+F</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="694"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="688"/>
+        <source>Toggle tissue heat-map</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="693"/>
         <location filename="../build/ui_mainwindow.h" line="559"/>
         <source>User &amp;survey</source>
         <translation>Gebruikersenquête</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="699"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="698"/>
         <location filename="../build/ui_mainwindow.h" line="560"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="238"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="231"/>
         <source>&amp;Undo</source>
         <translation>Ongedaan maken</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="702"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="701"/>
         <location filename="../build/ui_mainwindow.h" line="561"/>
         <source>Ctrl+Z</source>
         <translation>Ctrl+Z</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="707"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="706"/>
         <location filename="../build/ui_mainwindow.h" line="562"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="239"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="232"/>
         <source>&amp;Redo</source>
         <translation>Opnieuw</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="710"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="709"/>
         <location filename="../build/ui_mainwindow.h" line="563"/>
         <source>Ctrl+Shift+Z</source>
         <translation>Ctrl+Shift+Z</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="715"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="714"/>
         <location filename="../build/ui_mainwindow.h" line="564"/>
         <source>&amp;Find moved images</source>
         <translation>Vind verplaatste a&amp;fbeeldingen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="720"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="719"/>
         <source>Open c&amp;loud storage</source>
         <translation>Open c&amp;loud opslag</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="725"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="724"/>
         <source>Save to clo&amp;ud storage</source>
         <translation>Bewaar in clo&amp;ud opslag</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="730"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="729"/>
         <location filename="../build/ui_mainwindow.h" line="567"/>
         <source>&amp;Manage dive sites</source>
         <translation>&amp;Manage duikstekken</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="735"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="734"/>
         <source>Dive Site &amp;Edit</source>
         <translation>B&amp;ewerk duikstek</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="740"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="739"/>
         <source>Facebook</source>
         <translation>Facebook</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="745"/>
-        <source>Add GPS location here</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="744"/>
+        <source>Take cloud storage online</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="677"/>
-        <location filename="../build/ui_mainwindow.h" line="557"/>
-        <source>Ctrl+F</source>
-        <translation>Ctrl+F</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="213"/>
-        <location filename="../build/ui_mainwindow.h" line="478"/>
-        <source>&amp;Print</source>
-        <translation>Afdrukken</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="224"/>
-        <location filename="../build/ui_mainwindow.h" line="481"/>
-        <source>Ctrl+,</source>
-        <translation>Ctrl+,</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="232"/>
-        <location filename="../build/ui_mainwindow.h" line="482"/>
-        <source>&amp;Quit</source>
-        <translation>Afsluiten</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="243"/>
-        <location filename="../build/ui_mainwindow.h" line="484"/>
-        <source>Import from &amp;dive computer</source>
-        <translation>Importeren uit &amp;duikcomputer</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="254"/>
-        <location filename="../build/ui_mainwindow.h" line="487"/>
-        <source>Ctrl+G</source>
-        <translation>Ctrl+G</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="267"/>
-        <location filename="../build/ui_mainwindow.h" line="490"/>
-        <source>Ctrl++</source>
-        <translation>Ctrl++</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="293"/>
-        <location filename="../build/ui_mainwindow.h" line="496"/>
-        <source>&amp;Renumber</source>
-        <translation>Hernummeren</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="296"/>
-        <location filename="../build/ui_mainwindow.h" line="497"/>
-        <source>Ctrl+R</source>
-        <translation>Ctrl+R</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="312"/>
-        <location filename="../build/ui_mainwindow.h" line="500"/>
-        <source>Ctrl+Y</source>
-        <translation>Ctrl+Y</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="392"/>
-        <location filename="../build/ui_mainwindow.h" line="519"/>
-        <source>Ctrl+L</source>
-        <translation>Ctrl+L</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="216"/>
-        <location filename="../build/ui_mainwindow.h" line="479"/>
-        <source>Ctrl+P</source>
-        <translation>Ctrl+P</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="235"/>
-        <location filename="../build/ui_mainwindow.h" line="483"/>
-        <source>Ctrl+Q</source>
-        <translation>Ctrl+Q</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="246"/>
-        <location filename="../build/ui_mainwindow.h" line="485"/>
-        <source>Ctrl+D</source>
-        <translation>Ctrl+D</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="264"/>
-        <location filename="../build/ui_mainwindow.h" line="489"/>
-        <source>&amp;Add dive</source>
-        <translation>Duik toevoegen</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="304"/>
-        <location filename="../build/ui_mainwindow.h" line="498"/>
-        <source>Auto &amp;group</source>
-        <translation>Automatisch groeperen</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="309"/>
-        <location filename="../build/ui_mainwindow.h" line="499"/>
-        <source>&amp;Yearly statistics</source>
-        <translation>Jaarlijkse statistieken</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="317"/>
-        <location filename="../build/ui_mainwindow.h" line="501"/>
-        <source>&amp;Dive list</source>
-        <translation>Duiklijst</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="320"/>
-        <location filename="../build/ui_mainwindow.h" line="502"/>
-        <source>Ctrl+2</source>
-        <translation>Ctrl+2</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="328"/>
-        <location filename="../build/ui_mainwindow.h" line="504"/>
-        <source>Ctrl+3</source>
-        <translation>Ctrl+3</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="336"/>
-        <location filename="../build/ui_mainwindow.h" line="506"/>
-        <source>Ctrl+4</source>
-        <translation>Ctrl+4</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="344"/>
-        <location filename="../build/ui_mainwindow.h" line="508"/>
-        <source>Ctrl+1</source>
-        <translation>Ctrl+1</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="349"/>
-        <location filename="../build/ui_mainwindow.h" line="509"/>
-        <source>P&amp;revious DC</source>
-        <translation>Vorige duikcomputer</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="352"/>
-        <location filename="../build/ui_mainwindow.h" line="510"/>
-        <source>Left</source>
-        <translation>Links</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="360"/>
-        <location filename="../build/ui_mainwindow.h" line="512"/>
-        <source>Right</source>
-        <translation>Rechts</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="373"/>
-        <location filename="../build/ui_mainwindow.h" line="514"/>
-        <source>User &amp;manual</source>
-        <translation>Handleiding</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="376"/>
-        <location filename="../build/ui_mainwindow.h" line="515"/>
-        <source>F1</source>
-        <translation>F1</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="384"/>
-        <location filename="../build/ui_mainwindow.h" line="517"/>
-        <source>Ctrl+5</source>
-        <translation>Ctrl+5</translation>
+        <location filename="../build/ui_mainwindow.h" line="558"/>
+        <source>Toggle tissue graph</source>
+        <translation>Weefselgrafiek tonen/verbergen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="389"/>
-        <location filename="../build/ui_mainwindow.h" line="518"/>
-        <source>P&amp;lan dive</source>
-        <translation>Duik plannen</translation>
+        <location filename="../build/ui_mainwindow.h" line="565"/>
+        <source>Open cloud storage</source>
+        <translation>Open cloud opslag</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="397"/>
-        <location filename="../build/ui_mainwindow.h" line="520"/>
-        <source>&amp;Import log files</source>
-        <translation>Importeer logbestanden</translation>
+        <location filename="../build/ui_mainwindow.h" line="566"/>
+        <source>Save to cloud storage</source>
+        <translation>Bewaar in cloud opslag</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="400"/>
-        <location filename="../build/ui_mainwindow.h" line="522"/>
-        <source>Import divelog files from other applications</source>
-        <translation>Importeer logboeken uit andere programma&apos;s</translation>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="331"/>
+        <source>Connect to</source>
+        <translation>Verbind met</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="422"/>
-        <location filename="../build/ui_mainwindow.h" line="530"/>
-        <source>F11</source>
-        <translation>F11</translation>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="493"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="538"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1545"/>
+        <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="../desktop-widgets/mainwindow.cpp" line="505"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="499"/>
         <source>Open file</source>
         <translation>Bestand openen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="509"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="503"/>
         <location filename="../desktop-widgets/mainwindow.cpp" line="614"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1972"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1978"/>
         <source>Cancel</source>
         <translation>Annuleren</translation>
     </message>
@@ -5259,6 +5358,16 @@ worden uit lucht en:
         <translation>Scan afbeeldingen...(even geduld aub)</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="649"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="796"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="977"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="983"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1849"/>
+        <source>Warning</source>
+        <translation>Waarschuwing</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="674"/>
         <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>
@@ -5274,125 +5383,98 @@ worden uit lucht en:
         <translation>Runtime tabel afdrukken</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="982"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
+        <source>Trying to replan a dive that&apos;s not a planned dive.</source>
+        <translation>U probeert een duik te herplannen die geen geplande duik is.</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="977"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1849"/>
+        <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>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="983"/>
         <source>Trying to edit a dive that&apos;s not a manually added dive.</source>
         <translation>U probeert een duik aan te passen die niet handmatig is toegevoegd.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1243"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1030"/>
+        <source>Yearly statistics</source>
+        <translation>Jaarlijkse statistieken</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1244"/>
         <source>Do you want to save the changes that you made in the file %1?</source>
         <translation>Wilt u de wijzigingen in bestand %1 bewaren?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1246"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1247"/>
         <source>Do you want to save the changes that you made in the data file?</source>
         <translation>Wilt u de wijzigingen bewaren in het bestand?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1251"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1252"/>
         <source>Save changes?</source>
         <translation>Aanpassingen opslaan?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1587"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1253"/>
+        <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="../desktop-widgets/mainwindow.cpp" line="1572"/>
         <source>Save file as</source>
         <translation>Bestand bewaren als</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1682"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1573"/>
+        <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
+        <translation>Subsurface XML bestanden (*.ssrf *.xml *.XML)</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1670"/>
+        <source>[local cache for] %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1672"/>
         <source>[cloud storage for] %1</source>
         <translation>[cloud opslag voor] %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1782"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1788"/>
         <source>Opening datafile from older version</source>
         <translation>Opent een datafile van een oudere versie</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1783"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1789"/>
         <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly.
 Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source>
         <translation>U heeft een datafile van een oudere versie van Subsurface geopend. Wij raden u aan de handleiding te lezen met betrekking tot de nieuwe versie, in het bijzonder de sterk veranderde duikstek-afhandeling.
 Subsurface heeft reeds gesprobeerd de data te converteren, maar het is nuttig zelf vast te stellen dat de conversie correct is verlopen.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1794"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1800"/>
         <source>Open dive log file</source>
         <translation>Open duiklogboek</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1795"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1801"/>
         <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;All files (*)</source>
         <translation>Duik log bestanden (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;Alle bestanden (*)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1972"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1978"/>
         <source>Contacting cloud service...</source>
         <translation>Contact opnemen met cloud service...</translation>
     </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1252"/>
-        <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="../desktop-widgets/mainwindow.cpp" line="649"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="796"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="976"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="982"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/>
-        <source>Warning</source>
-        <translation>Waarschuwing</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="499"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="544"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1560"/>
-        <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="../desktop-widgets/mainwindow.cpp" line="338"/>
-        <source>Connect to</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
-        <source>Trying to replan a dive that&apos;s not a planned dive.</source>
-        <translation>U probeert een duik te herplannen die geen geplande duik is.</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1029"/>
-        <source>Yearly statistics</source>
-        <translation>Jaarlijkse statistieken</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1588"/>
-        <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
-        <translation>Subsurface XML bestanden (*.ssrf *.xml *.XML)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="976"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/>
-        <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>
-    <message>
-        <location filename="../build/ui_mainwindow.h" line="565"/>
-        <source>Open cloud storage</source>
-        <translation>Open cloud opslag</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_mainwindow.h" line="566"/>
-        <source>Save to cloud storage</source>
-        <translation>Bewaar in cloud opslag</translation>
-    </message>
 </context>
 <context>
     <name>MultiFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="733"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="731"/>
         <source>Filter shows %1 (of %2) dives</source>
         <translation>Filter toont %1 (van %2) duiken</translation>
     </message>
@@ -5400,12 +5482,12 @@ Subsurface heeft reeds gesprobeerd de data te converteren, maar het is nuttig ze
 <context>
     <name>OstcFirmwareCheck</name>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="269"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="271"/>
         <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source>
         <translation>U moet de firmware van uw duikcomputer updaten: u heeft versie %1 maar de laatste stabiele versie is %2</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="273"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="275"/>
         <source>
 
 Please start Bluetooth on your OSTC Sport and do the same preparations as for a logbook download before continuing with the update</source>
@@ -5414,27 +5496,27 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 Start Bluetooth op uw OSTC Sport en voer dezelfde voorbereidingen als voor een logboek download vóór u verder gaat met de update</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="274"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="276"/>
         <source>Not now</source>
         <translation>Niet nu</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="275"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="277"/>
         <source>Update firmware</source>
         <translation>Firmware updaten</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="277"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="279"/>
         <source>Firmware upgrade notice</source>
         <translation>Firmware upgrade mededeling</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="295"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="297"/>
         <source>Save the downloaded firmware as</source>
         <translation>Bewaar de firmware als</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="296"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="298"/>
         <source>HEX files (*.hex)</source>
         <translation>HEX bestanden (*.hex)</translation>
     </message>
@@ -5442,79 +5524,89 @@ Start Bluetooth op uw OSTC Sport en voer dezelfde voorbereidingen als voor een l
 <context>
     <name>PlannerSettingsWidget</name>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="322"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="302"/>
         <source>Open circuit</source>
         <translation>Open circuit</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="322"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="302"/>
         <source>CCR</source>
         <translation>CCR</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="322"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="302"/>
         <source>pSCR</source>
         <translation>pSCR</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="421"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="388"/>
         <source>ft/min</source>
         <translation>ft/min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="422"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="389"/>
         <source>Last stop at 20ft</source>
         <translation>Laatste stop op 20ft</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="423"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="390"/>
         <source>50% avg. depth to 20ft</source>
         <translation>50% gem. diepte tot 20ft</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="424"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="391"/>
         <source>20ft to surface</source>
         <translation>20ft tot oppervlakte</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="426"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="392"/>
+        <source>ft</source>
+        <translation>ft</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="394"/>
         <source>m/min</source>
         <translation>m/min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="427"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="395"/>
         <source>Last stop at 6m</source>
         <translation>Laatste stop op 6m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="428"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="396"/>
         <source>50% avg. depth to 6m</source>
         <translation>50% gem. diepte tot 6m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="429"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="397"/>
         <source>6m to surface</source>
         <translation>6m tot oppervlakte</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="432"/>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="433"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="398"/>
+        <source>m</source>
+        <translation>m</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="401"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="402"/>
         <source>cuft/min</source>
         <translation>cuft/min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="441"/>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="442"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="410"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="411"/>
         <source>ℓ/min</source>
         <translation>ℓ/min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="451"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="420"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="456"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="425"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
@@ -5535,17 +5627,17 @@ Start Bluetooth op uw OSTC Sport en voer dezelfde voorbereidingen als voor een l
     <message>
         <location filename="../mobile-widgets/qml/Preferences.qml" line="43"/>
         <source>Subsurface GPS data webservice</source>
-        <translation type="unfinished"/>
+        <translation>Subsurface GPS data webservice</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/Preferences.qml" line="51"/>
         <source>Distance threshold (meters)</source>
-        <translation type="unfinished"/>
+        <translation>Afstandsdrempel (meters)</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/Preferences.qml" line="62"/>
         <source>Time threshold (minutes)</source>
-        <translation type="unfinished"/>
+        <translation>Tijdsdrempel (minuten)</translation>
     </message>
 </context>
 <context>
@@ -5664,6 +5756,11 @@ Start Bluetooth op uw OSTC Sport en voer dezelfde voorbereidingen als voor een l
 <context>
     <name>PreferencesDialog</name>
     <message>
+        <location filename="../build/ui_preferences.h" line="1283"/>
+        <source>Preferences</source>
+        <translation>Instellingen</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1288"/>
         <source>Defaults</source>
         <translation>Standaardinstellingen</translation>
@@ -5699,6 +5796,11 @@ Start Bluetooth op uw OSTC Sport en voer dezelfde voorbereidingen als voor een l
         <translation>Georeferentie</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1303"/>
+        <source>Lists and tables</source>
+        <translation>Lijsten en tabellen</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1304"/>
         <source>Font</source>
         <translation>Lettertype</translation>
@@ -5714,6 +5816,11 @@ Start Bluetooth op uw OSTC Sport en voer dezelfde voorbereidingen als voor een l
         <translation>Duiken</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1307"/>
+        <source>Default dive log file</source>
+        <translation>Standaard duikbestand</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1308"/>
         <source>No default file</source>
         <translation>Geen standaard bestand</translation>
@@ -5744,6 +5851,21 @@ Start Bluetooth op uw OSTC Sport en voer dezelfde voorbereidingen als voor een l
         <translation>...</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1314"/>
+        <source>Display invalid</source>
+        <translation>Ongeldig scherm</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1316"/>
+        <source>Default cylinder</source>
+        <translation>Standaard fles</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1317"/>
+        <source>Use default cylinder</source>
+        <translation>Gebruik standaard fles</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1318"/>
         <source>Animations</source>
         <translation>Animaties</translation>
@@ -5774,40 +5896,24 @@ Start Bluetooth op uw OSTC Sport en voer dezelfde voorbereidingen als voor een l
         <translation>Systeem</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1401"/>
-        <source>Dive site geo lookup</source>
-        <translation>Duikstek geo locatie opzoeken</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1402"/>
-        <source>Enable geocoding for dive site management</source>
-        <translation>Geocoding voor duikstek management aanzetten</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1403"/>
-        <source>Parse site without GPS data</source>
-        <translation>Bewerk duikstek zonder GPS data</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1404"/>
-        <source>Same format for existing dives</source>
-        <translation>Gelijke formaat voor bestaande duiken</translation>
+        <location filename="../build/ui_preferences.h" line="1324"/>
+        <source>&amp;Metric</source>
+        <translation>&amp;Metrisch</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1405"/>
-        <source>Dive Site Layout</source>
-        <translation>Duikstek layout</translation>
+        <location filename="../build/ui_preferences.h" line="1325"/>
+        <source>Imperial</source>
+        <translation>Imperiaal</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1406"/>
-        <location filename="../build/ui_preferences.h" line="1407"/>
-        <source>/</source>
-        <translation>/</translation>
+        <location filename="../build/ui_preferences.h" line="1326"/>
+        <source>Personali&amp;ze</source>
+        <translation>Personaliseren</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1325"/>
-        <source>Imperial</source>
-        <translation>Imperiaal</translation>
+        <location filename="../build/ui_preferences.h" line="1327"/>
+        <source>Individual settings</source>
+        <translation>Individuele instellingen</translation>
     </message>
     <message>
         <location filename="../build/ui_preferences.h" line="1328"/>
@@ -5825,6 +5931,11 @@ Start Bluetooth op uw OSTC Sport en voer dezelfde voorbereidingen als voor een l
         <translation>voet</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1331"/>
+        <source>Pressure</source>
+        <translation>Druk</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1332"/>
         <location filename="../build/ui_preferences.h" line="1366"/>
         <source>bar</source>
@@ -5836,11 +5947,26 @@ Start Bluetooth op uw OSTC Sport en voer dezelfde voorbereidingen als voor een l
         <translation>psi</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1334"/>
+        <source>Volume</source>
+        <translation>Volume</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1335"/>
+        <source>&amp;liter</source>
+        <translation>&amp;liter</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1336"/>
         <source>cu ft</source>
         <translation>cu ft</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1337"/>
+        <source>Temperature</source>
+        <translation>Temperatuur</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1338"/>
         <source>celsius</source>
         <translation>celsius</translation>
@@ -5851,11 +5977,121 @@ Start Bluetooth op uw OSTC Sport en voer dezelfde voorbereidingen als voor een l
         <translation>fahrenheit</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1340"/>
+        <source>Weight</source>
+        <translation>Gewicht</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1341"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1342"/>
+        <source>lbs</source>
+        <translation>US pond</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1343"/>
+        <source>Time units</source>
+        <translation>Tijdseenheden</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1344"/>
+        <source>Ascent/descent speed denominator</source>
+        <translation>Stijg-/daalsnelheid noemer</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1345"/>
+        <source>Minutes</source>
+        <translation>Minuten</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1346"/>
+        <source>Seconds</source>
+        <translation>Seconden</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1347"/>
+        <source>GPS coordinates</source>
+        <translation>GPS coördinaten</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1348"/>
+        <source>Location Display</source>
+        <translation>Locatie tonen</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1349"/>
+        <source>traditional (dms)</source>
+        <translation>traditioneel (dms)</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1350"/>
+        <source>decimal</source>
+        <translation>decimaal</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1351"/>
+        <source>Show</source>
+        <translation>Toon</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1352"/>
+        <source>Threshold when showing pO₂</source>
+        <translation>Drempelwaarde wanneer pO₂ getoond wordt</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1353"/>
+        <source>Threshold when showing pN₂</source>
+        <translation>Drempelwaarde wanneer pN₂ getoond wordt</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1354"/>
+        <source>Threshold when showing pHe</source>
+        <translation>Drempelwaarde wanneer pHe getoond wordt</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1355"/>
+        <source>Max pO₂ when showing MOD</source>
+        <translation>Max pO₂ wanneer MOD getoond wordt</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1356"/>
+        <source>Draw dive computer reported ceiling red</source>
+        <translation>Toon door duikcomputer aangegeven plafond in rood</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1357"/>
+        <source>Show unused cylinders in Equipment tab</source>
+        <translation>Toon niet gebruikte flessen in het Uitrusting tabblad</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1358"/>
+        <source>Show average depth</source>
+        <translation>Toon gemiddelde diepte</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1359"/>
+        <source>Misc</source>
+        <translation>Allerlei</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1360"/>
+        <source>GFLow</source>
+        <translation>GFLow</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1361"/>
+        <source>GFHigh</source>
+        <translation>GFHigh</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1362"/>
+        <source>GFLow at max depth</source>
+        <translation>GFLow op max diepte</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1363"/>
         <source>CCR: show setpoints when viewing pO₂</source>
         <translation>CCR: toon instelpunten wanneer pO₂ getoond wordt</translation>
@@ -5901,14 +6137,19 @@ Start Bluetooth op uw OSTC Sport en voer dezelfde voorbereidingen als voor een l
         <translation>Systeem standaardinstelling</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1374"/>
+        <source>Filter</source>
+        <translation>Filter</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1375"/>
         <source>Proxy</source>
         <translation>Proxy</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1379"/>
-        <source>Proxy type</source>
-        <translation>Proxy type</translation>
+        <location filename="../build/ui_preferences.h" line="1376"/>
+        <source>Port</source>
+        <translation>Poort</translation>
     </message>
     <message>
         <location filename="../build/ui_preferences.h" line="1377"/>
@@ -5916,16 +6157,16 @@ Start Bluetooth op uw OSTC Sport en voer dezelfde voorbereidingen als voor een l
         <translation>Host</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1376"/>
-        <source>Port</source>
-        <translation>Poort</translation>
-    </message>
-    <message>
         <location filename="../build/ui_preferences.h" line="1378"/>
         <source>Requires authentication</source>
         <translation>Authenticatie vereist</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1379"/>
+        <source>Proxy type</source>
+        <translation>Proxy type</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1380"/>
         <source>Username</source>
         <translation>Gebruikersnaam</translation>
@@ -5937,46 +6178,6 @@ Start Bluetooth op uw OSTC Sport en voer dezelfde voorbereidingen als voor een l
         <translation>Wachtwoord</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1400"/>
-        <source>Disconnect from Facebook</source>
-        <translation>Facebook afkoppelen</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1374"/>
-        <source>Filter</source>
-        <translation>Filter</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1331"/>
-        <source>Pressure</source>
-        <translation>Druk</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1303"/>
-        <source>Lists and tables</source>
-        <translation>Lijsten en tabellen</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1307"/>
-        <source>Default dive log file</source>
-        <translation>Standaard duikbestand</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1314"/>
-        <source>Display invalid</source>
-        <translation>Ongeldig scherm</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1316"/>
-        <source>Default cylinder</source>
-        <translation>Standaard fles</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1317"/>
-        <source>Use default cylinder</source>
-        <translation>Gebruik standaard fles</translation>
-    </message>
-    <message>
         <location filename="../build/ui_preferences.h" line="1382"/>
         <source>Subsurface cloud storage</source>
         <translation>Subsurface cloud opslag</translation>
@@ -6017,149 +6218,40 @@ Start Bluetooth op uw OSTC Sport en voer dezelfde voorbereidingen als voor een l
         <translation>Bewaar gebruikers ID lokaal?</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1334"/>
-        <source>Volume</source>
-        <translation>Volume</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1337"/>
-        <source>Temperature</source>
-        <translation>Temperatuur</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1340"/>
-        <source>Weight</source>
-        <translation>Gewicht</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1342"/>
-        <source>lbs</source>
-        <translation>US pond</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1343"/>
-        <source>Time units</source>
-        <translation>Tijdseenheden</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1345"/>
-        <source>Minutes</source>
-        <translation>Minuten</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1346"/>
-        <source>Seconds</source>
-        <translation>Seconden</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1351"/>
-        <source>Show</source>
-        <translation>Toon</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1362"/>
-        <source>GFLow at max depth</source>
-        <translation>GFLow op max diepte</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1359"/>
-        <source>Misc</source>
-        <translation>Allerlei</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1283"/>
-        <source>Preferences</source>
-        <translation>Instellingen</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1324"/>
-        <source>&amp;Metric</source>
-        <translation>&amp;Metrisch</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1326"/>
-        <source>Personali&amp;ze</source>
-        <translation>Personaliseren</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1327"/>
-        <source>Individual settings</source>
-        <translation>Individuele instellingen</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1335"/>
-        <source>&amp;liter</source>
-        <translation>&amp;liter</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1344"/>
-        <source>Ascent/descent speed denominator</source>
-        <translation>Stijg-/daalsnelheid noemer</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1347"/>
-        <source>GPS coordinates</source>
-        <translation>GPS coördinaten</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1348"/>
-        <source>Location Display</source>
-        <translation>Locatie tonen</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1349"/>
-        <source>traditional (dms)</source>
-        <translation>traditioneel (dms)</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1350"/>
-        <source>decimal</source>
-        <translation>decimaal</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1352"/>
-        <source>Threshold when showing pO₂</source>
-        <translation>Drempelwaarde wanneer pO₂ getoond wordt</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1353"/>
-        <source>Threshold when showing pN₂</source>
-        <translation>Drempelwaarde wanneer pN₂ getoond wordt</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1354"/>
-        <source>Threshold when showing pHe</source>
-        <translation>Drempelwaarde wanneer pHe getoond wordt</translation>
+        <location filename="../build/ui_preferences.h" line="1400"/>
+        <source>Disconnect from Facebook</source>
+        <translation>Facebook afkoppelen</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1355"/>
-        <source>Max pO₂ when showing MOD</source>
-        <translation>Max pO₂ wanneer MOD getoond wordt</translation>
+        <location filename="../build/ui_preferences.h" line="1401"/>
+        <source>Dive site geo lookup</source>
+        <translation>Duikstek geo locatie opzoeken</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1356"/>
-        <source>Draw dive computer reported ceiling red</source>
-        <translation>Toon door duikcomputer aangegeven plafond in rood</translation>
+        <location filename="../build/ui_preferences.h" line="1402"/>
+        <source>Enable geocoding for dive site management</source>
+        <translation>Geocoding voor duikstek management aanzetten</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1357"/>
-        <source>Show unused cylinders in Equipment tab</source>
-        <translation>Toon niet gebruikte flessen in het Uitrusting tabblad</translation>
+        <location filename="../build/ui_preferences.h" line="1403"/>
+        <source>Parse site without GPS data</source>
+        <translation>Bewerk duikstek zonder GPS data</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1358"/>
-        <source>Show average depth</source>
-        <translation>Toon gemiddelde diepte</translation>
+        <location filename="../build/ui_preferences.h" line="1404"/>
+        <source>Same format for existing dives</source>
+        <translation>Gelijke formaat voor bestaande duiken</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1360"/>
-        <source>GFLow</source>
-        <translation>GFLow</translation>
+        <location filename="../build/ui_preferences.h" line="1405"/>
+        <source>Dive Site Layout</source>
+        <translation>Duikstek layout</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1361"/>
-        <source>GFHigh</source>
-        <translation>GFHigh</translation>
+        <location filename="../build/ui_preferences.h" line="1406"/>
+        <location filename="../build/ui_preferences.h" line="1407"/>
+        <source>/</source>
+        <translation>/</translation>
     </message>
 </context>
 <context>
@@ -6215,106 +6307,136 @@ Start Bluetooth op uw OSTC Sport en voer dezelfde voorbereidingen als voor een l
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="20"/>
-        <source>Show</source>
-        <translation>Toon</translation>
+        <source>Gas pressure display setup</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="29"/>
-        <source>Threshold when showing pO₂</source>
-        <translation>Drempelwaarde wanneer pO₂ getoond wordt</translation>
+        <source>Threshold for pO₂ (bar)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="49"/>
-        <source>Threshold when showing pN₂</source>
-        <translation>Drempelwaarde wanneer pN₂ getoond wordt</translation>
+        <source>Threshold for pN₂ (bar)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="69"/>
-        <source>Threshold when showing pHe</source>
-        <translation>Drempelwaarde wanneer pHe getoond wordt</translation>
+        <source>Threshold for pHe (bar)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="89"/>
-        <source>Max pO₂ when showing MOD</source>
-        <translation>Max pO₂ wanneer MOD getoond wordt</translation>
+        <source>pO₂ in calculating MOD (bar)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="106"/>
+        <source>CCR options:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="113"/>
+        <source>Dive planner default setpoint (bar)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="133"/>
+        <source>Show setpoints when viewing pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="140"/>
+        <source>Show individual O₂ sensor values when viewing pO₂</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="109"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="150"/>
+        <source>Ceiling display setup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="159"/>
         <source>Draw dive computer reported ceiling red</source>
         <translation>Toon door duikcomputer aangegeven plafond in rood</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="116"/>
-        <source>Show unused cylinders in Equipment tab</source>
-        <translation>Toon niet gebruikte flessen in het Uitrusting tabblad</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="169"/>
+        <source>Algorithm for calculated ceiling:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="123"/>
-        <source>Show mean depth</source>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="176"/>
+        <source>VPM-B</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="133"/>
-        <source>Misc</source>
-        <translation>Allerlei</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="183"/>
+        <source>VPM-B Conservatism</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="149"/>
-        <source>bar</source>
-        <translation>bar</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="193"/>
+        <source>+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="165"/>
-        <source>Default CCR set-point for dive planning</source>
-        <translation>Standaard CCR instelpunt voor duikplanning</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="206"/>
+        <source>Bühlmann</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="172"/>
-        <source>pSCR O₂ metabolism rate</source>
-        <translation>pSCR O₂ metabolisme snelheid</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="216"/>
+        <source>GFHigh</source>
+        <translation>GFHigh</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="179"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="236"/>
         <source>GFLow</source>
         <translation>GFLow</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="186"/>
-        <source>GFHigh</source>
-        <translation>GFHigh</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="256"/>
+        <source>GFLow at max depth</source>
+        <translation>GFLow op max diepte</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="203"/>
-        <source>ℓ/min</source>
-        <translation>ℓ/min</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="263"/>
+        <source>pSCR options:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="213"/>
-        <source>pSCR ratio</source>
-        <translation>pSCR verhouding</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="270"/>
+        <source>Metabolic rate (ℓ O₂/min)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="223"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="287"/>
+        <source>Dilution ratio</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="300"/>
         <source>1:</source>
         <translation>1:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="230"/>
-        <source>CCR: show individual O₂ sensor values when viewing pO₂</source>
-        <translation>CCR: toon individuele O₂ sensor waarden wanneer pO₂ getoond wordt</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="310"/>
+        <source>Misc</source>
+        <translation>Allerlei</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="237"/>
-        <source>CCR: show setpoints when viewing pO₂</source>
-        <translation>CCR: toon instelpunten wanneer pO₂ getoond wordt</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="316"/>
+        <source>Show unused cylinders in Equipment tab</source>
+        <translation>Toon niet gebruikte flessen in het Uitrusting tabblad</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="244"/>
-        <source>GFLow at max depth</source>
-        <translation>GFLow op max diepte</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="323"/>
+        <source>Show mean depth in Profile</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="10"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="9"/>
         <source>Graph</source>
         <translation>Grafiek</translation>
     </message>
@@ -6334,7 +6456,7 @@ Start Bluetooth op uw OSTC Sport en voer dezelfde voorbereidingen als voor een l
     <message>
         <location filename="../desktop-widgets/preferences/prefs_language.ui" line="32"/>
         <source>Use system default</source>
-        <translation type="unfinished"/>
+        <translation>Gebruik systeem standaardinstelling</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/prefs_language.ui" line="55"/>
@@ -6349,23 +6471,23 @@ Start Bluetooth op uw OSTC Sport en voer dezelfde voorbereidingen als voor een l
     <message>
         <location filename="../desktop-widgets/preferences/prefs_language.ui" line="80"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Preferred date format. Commonly used fields are&lt;/p&gt;&lt;p&gt;d (day of month)&lt;/p&gt;&lt;p&gt;ddd (abbr. day name)&lt;/p&gt;&lt;p&gt;M (month number)&lt;/p&gt;&lt;p&gt;MMM (abbr. month name)&lt;/p&gt;&lt;p&gt;yy/yyyy (2/4 digit year)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Datum formaat voorkeur. Veel gebruikte velden zijn&lt;/p&gt;&lt;p&gt;d (dag van de maand)&lt;/p&gt;&lt;p&gt;ddd (afkorting dag naam)&lt;/p&gt;&lt;p&gt;M (maand nummer)&lt;/p&gt;&lt;p&gt;MMM (afkorting maand naam)&lt;/p&gt;&lt;p&gt;yy/yyyy (2/4 cijferig jaar)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/prefs_language.ui" line="87"/>
         <location filename="../desktop-widgets/preferences/prefs_language.ui" line="135"/>
         <source>Use UI language default</source>
-        <translation type="unfinished"/>
+        <translation>Gebruik standaard UI taal</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/prefs_language.ui" line="97"/>
         <source>This is used in places where there is less space to show the full date</source>
-        <translation type="unfinished"/>
+        <translation>Dit wordt gebruikt op plaatsen waar te weinig ruimte is voor de volledige datum</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/prefs_language.ui" line="100"/>
         <source>Short format</source>
-        <translation type="unfinished"/>
+        <translation>Kort formaat</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/prefs_language.ui" line="129"/>
@@ -6375,7 +6497,7 @@ Start Bluetooth op uw OSTC Sport en voer dezelfde voorbereidingen als voor een l
     <message>
         <location filename="../desktop-widgets/preferences/prefs_language.ui" line="142"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Preferred time format&lt;/p&gt;&lt;p&gt;Commonly used format specifiers are&lt;/p&gt;&lt;p&gt;h (hours in 12h format)&lt;/p&gt;&lt;p&gt;H (hours in 24h format)&lt;/p&gt;&lt;p&gt;mm (2 digit minutes)&lt;/p&gt;&lt;p&gt;ss (2 digit seconds)&lt;/p&gt;&lt;p&gt;t/tt (a/p or am/pm)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Voorkeur tijd formaat&lt;/p&gt;&lt;p&gt;Veel gebruikte velden zijn&lt;/p&gt;&lt;p&gt;h (uren in 12uur formaat)&lt;/p&gt;&lt;p&gt;H (uren in 24uur formaat)&lt;/p&gt;&lt;p&gt;mm (2 cijferige minuten)&lt;/p&gt;&lt;p&gt;ss (2 cijferige seconden)&lt;/p&gt;&lt;p&gt;t/tt (a/p of am/pm)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="12"/>
@@ -6383,15 +6505,29 @@ Start Bluetooth op uw OSTC Sport en voer dezelfde voorbereidingen als voor een l
         <translation>Taal</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="57"/>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="53"/>
         <source>Restart required</source>
         <translation>Herstarten noodzakelijk</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="58"/>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="54"/>
         <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="../desktop-widgets/preferences/preferences_language.cpp" line="76"/>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="82"/>
+        <source>Literal characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="77"/>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="83"/>
+        <source>Non-special character(s) in time format.
+These will be used as is. This might not be what you intended.
+See http://doc.qt.io/qt-5/qdatetime.html#toString</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PreferencesNetwork</name>
@@ -6438,7 +6574,7 @@ Start Bluetooth op uw OSTC Sport en voer dezelfde voorbereidingen als voor een l
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_network.ui" line="156"/>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="148"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="134"/>
         <source>Subsurface cloud storage</source>
         <translation>Subsurface cloud opslag</translation>
     </message>
@@ -6483,39 +6619,39 @@ Start Bluetooth op uw OSTC Sport en voer dezelfde voorbereidingen als voor een l
         <translation>Bewaar gebruikers ID lokaal?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="11"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="10"/>
         <source>Network</source>
         <translation>Netwerk</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="15"/>
         <source>No proxy</source>
         <translation>Geen proxy</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/>
         <source>System proxy</source>
         <translation>Systeem proxy</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/>
         <source>HTTP proxy</source>
         <translation>HTTP proxy</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="19"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/>
         <source>SOCKS proxy</source>
         <translation>SOCKS proxy</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="75"/>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="97"/>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="110"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="72"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="93"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="106"/>
         <source>Cloud storage email and password can only consist of letters, numbers, and &apos;.&apos;, &apos;-&apos;, &apos;_&apos;, and &apos;+&apos;.</source>
         <translation>Het cloud wachtwoord kan alleen letters, nummers en de volgende symbolen bevatten: &apos;.&apos;, &apos;-&apos;, &apos;_&apos;, and &apos;+&apos;.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="146"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="132"/>
         <source>Subsurface cloud storage (credentials verified)</source>
         <translation>Subsurface cloud opslag (rechten gecontroleerd)</translation>
     </message>
@@ -6673,7 +6809,7 @@ Start Bluetooth op uw OSTC Sport en voer dezelfde voorbereidingen als voor een l
         <translation>decimaal</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="8"/>
+        <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="7"/>
         <source>Units</source>
         <translation>Eenheden</translation>
     </message>
@@ -6681,17 +6817,17 @@ Start Bluetooth op uw OSTC Sport en voer dezelfde voorbereidingen als voor een l
 <context>
     <name>PrintDialog</name>
     <message>
-        <location filename="../desktop-widgets/printdialog.cpp" line="118"/>
-        <source>&amp;Preview</source>
-        <translation>Voorbeeldweergave</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/printdialog.cpp" line="115"/>
+        <location filename="../desktop-widgets/printdialog.cpp" line="102"/>
         <source>P&amp;rint</source>
         <translation>Afd&amp;rukken</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/printdialog.cpp" line="130"/>
+        <location filename="../desktop-widgets/printdialog.cpp" line="105"/>
+        <source>&amp;Preview</source>
+        <translation>Voorbeeldweergave</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/printdialog.cpp" line="117"/>
         <source>Print</source>
         <translation>Afdrukken</translation>
     </message>
@@ -6699,19 +6835,10 @@ Start Bluetooth op uw OSTC Sport en voer dezelfde voorbereidingen als voor een l
 <context>
     <name>PrintOptions</name>
     <message>
-        <location filename="../build/ui_printoptions.h" line="150"/>
-        <source>&amp;Table print</source>
-        <translation>Afdrukken in &amp;tabelvorm</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_printoptions.h" line="158"/>
-        <source>One dive per page</source>
-        <translation>Eén duik per pagina</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_printoptions.h" line="159"/>
-        <source>Two dives per page</source>
-        <translation>Twee duiken per pagina</translation>
+        <location filename="../desktop-widgets/printoptions.ui" line="29"/>
+        <location filename="../build/ui_printoptions.h" line="148"/>
+        <source>Print type</source>
+        <translation>Afdruktype</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/printoptions.ui" line="41"/>
@@ -6771,10 +6898,19 @@ Start Bluetooth op uw OSTC Sport en voer dezelfde voorbereidingen als voor een l
         <translation>Importeren</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/printoptions.ui" line="29"/>
-        <location filename="../build/ui_printoptions.h" line="148"/>
-        <source>Print type</source>
-        <translation>Afdruktype</translation>
+        <location filename="../build/ui_printoptions.h" line="150"/>
+        <source>&amp;Table print</source>
+        <translation>Afdrukken in &amp;tabelvorm</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_printoptions.h" line="158"/>
+        <source>One dive per page</source>
+        <translation>Eén duik per pagina</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_printoptions.h" line="159"/>
+        <source>Two dives per page</source>
+        <translation>Twee duiken per pagina</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/printoptions.cpp" line="128"/>
@@ -6816,103 +6952,103 @@ Start Bluetooth op uw OSTC Sport en voer dezelfde voorbereidingen als voor een l
         <translation>Onbekende duikcomputer</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="755"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="752"/>
         <source>Show NDL / TTS was disabled because of excessive processing time</source>
         <translation>NDL / TTS wordt niet getoond omdat de berekening te lang duurt</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1344"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1338"/>
         <source>Make first divecomputer</source>
         <translation>Eerste duikcomputer aanmaken</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1346"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1340"/>
         <source>Delete this divecomputer</source>
         <translation>Deze duikcomputer verwijderen</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1360"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1354"/>
         <source>Add gas change</source>
         <translation>Gaswissel toevoegen</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1363"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1357"/>
         <source> (Tank %1)</source>
         <translation> (Fles %1)</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1371"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1365"/>
         <source>Add set-point change</source>
         <translation>Voeg set-point wissel toe</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1373"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1367"/>
         <source>Add bookmark</source>
         <translation>Bladwijzer toevoegen</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1377"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1371"/>
         <source>Edit the profile</source>
         <translation>Profiel bewerken</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1381"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1375"/>
         <source>Remove event</source>
         <translation>Gebeurtenis verwijderen</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1386"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1380"/>
         <source>Hide similar events</source>
         <translation>Gelijkaardige gebeurtenissen verbergen</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1393"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1387"/>
         <source>Edit name</source>
         <translation>Naam bewerken</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1422"/>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1429"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1416"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1423"/>
         <source>Adjust pressure of tank %1 (currently interpolated as %2)</source>
         <translation>Druk van fles %1 aanpassen (nu geschat op %2)</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1444"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1438"/>
         <source>Unhide all events</source>
         <translation>Toon alle gebeurtenissen</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1479"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1473"/>
         <source>Hide events</source>
         <translation>Gebeurtenissen verbergen</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1479"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1473"/>
         <source>Hide all %1 events?</source>
         <translation>Alle %1 gebeurtenissen verbergen?</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1514"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1508"/>
         <source>Remove the selected event?</source>
         <translation>Geselecteerde gebeurtenis verwijderen?</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1515"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1509"/>
         <source>%1 @ %2:%3</source>
         <translation>%1 @ %2:%3</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1638"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1632"/>
         <source>Edit name of bookmark</source>
         <translation>Naam bladwijzer bewerken</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1639"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1633"/>
         <source>Custom name:</source>
         <translation>Naam:</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1644"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1638"/>
         <source>Name is too long!</source>
         <translation>Deze naam is te lang!</translation>
     </message>
@@ -6920,92 +7056,102 @@ Start Bluetooth op uw OSTC Sport en voer dezelfde voorbereidingen als voor een l
 <context>
     <name>QMLManager</name>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="95"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="97"/>
         <source>Starting...</source>
-        <translation type="unfinished"/>
+        <translation>Starten...</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="202"/>
         <source>working in no-cloud mode</source>
         <translation>werkt met lokale data</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="213"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="216"/>
         <source>no cloud credentials</source>
         <translation>Geen cloud rechten</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="214"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="270"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="217"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="269"/>
         <source>Please enter valid cloud credentials.</source>
         <translation>Voer geldige cloud rechten in</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="285"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="284"/>
         <source>Attempting to open cloud storage with new credentials</source>
         <translation>Probeert cloud opslag te openen met nieuwe rechten</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="304"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="306"/>
         <source>Testing cloud credentials</source>
         <translation>Cloud rechten worden gecontroleerd</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="331"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="320"/>
+        <source>No response from cloud server to validate the credentials</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="329"/>
+        <source>Cannot connect to cloud storage - cloud account not verified</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="361"/>
         <source>Cloud credentials are invalid</source>
         <translation>Cloud rechten zijn ongeldig</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="344"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="374"/>
         <source>Cannot open cloud storage: Error creating https connection</source>
         <translation>Kan cloud opslag niet openen: Fout bij aanmaken https verbinding</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="357"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="387"/>
         <source>Cannot open cloud storage: %1</source>
         <translation>Kan cloud opslag niet openen: %1</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="369"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="399"/>
         <source>Cannot connect to cloud storage</source>
         <translation>Kan niet verbinden met de Subsurface cloud opslag</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="411"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="441"/>
         <source>Cloud storage error: %1</source>
         <translation>Cloud opslag fout: %1</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="501"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="531"/>
         <source>Failed to connect to cloud server, reverting to no cloud status</source>
         <translation>
 Kan niet verbinden met de Subsurface cloud opslag, terug naar lokale mode</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="520"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="550"/>
         <source>Cloud storage open successfully. No dives in dive list.</source>
         <translation>Cloud opslag succesvol geopend. Geen duiken in de duiklijst.</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="689"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="690"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="721"/>
         <source>h</source>
         <translation>h</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="689"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="690"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="691"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="721"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="722"/>
         <source>min</source>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="689"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/>
         <source>sec</source>
         <translation>sec</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="1041"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="1102"/>
         <source>Unknown GPS location</source>
         <translation>Onbekende GPS locatie</translation>
     </message>
@@ -7013,126 +7159,126 @@ Kan niet verbinden met de Subsurface cloud opslag, terug naar lokale mode</trans
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../core/qthelper.cpp" line="866"/>
-        <location filename="../core/qthelper.cpp" line="1214"/>
-        <source>AIR</source>
-        <translation>AIR</translation>
+        <location filename="../core/gpslocation.h" line="13"/>
+        <source>Waiting to aquire GPS location</source>
+        <translation>Wacht op GPS fix</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="1214"/>
-        <source>OXYGEN</source>
-        <translation>ZUURSTOF</translation>
+        <location filename="../core/qthelper.cpp" line="766"/>
+        <location filename="../core/qthelper.cpp" line="1275"/>
+        <source>m</source>
+        <translation>m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="59"/>
-        <source>Remove this point</source>
-        <translation>Dit punt verwijderen</translation>
+        <location filename="../core/qthelper.cpp" line="768"/>
+        <location filename="../core/qthelper.cpp" line="1274"/>
+        <source>ft</source>
+        <translation>ft</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="32"/>
-        <source>Average</source>
-        <translation>Gemiddelde</translation>
+        <location filename="../core/qthelper.cpp" line="794"/>
+        <source>C</source>
+        <translation>C</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="35"/>
-        <source>Minimum</source>
-        <translation>Kleinste</translation>
+        <location filename="../core/qthelper.cpp" line="796"/>
+        <source>F</source>
+        <translation>F</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="38"/>
-        <source>Maximum</source>
-        <translation>Grootste</translation>
+        <location filename="../core/qthelper.cpp" line="821"/>
+        <location filename="../core/qthelper.cpp" line="1250"/>
+        <source>kg</source>
+        <translation>kg</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/globe.cpp" line="327"/>
-        <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>
+        <location filename="../core/qthelper.cpp" line="823"/>
+        <location filename="../core/qthelper.cpp" line="1251"/>
+        <source>lbs</source>
+        <translation>US pond</translation>
     </message>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="28"/>
-        <source>unknown</source>
-        <translation>onbekend</translation>
+        <location filename="../core/qthelper.cpp" line="848"/>
+        <location filename="../core/qthelper.cpp" line="1300"/>
+        <source>bar</source>
+        <translation>bar</translation>
     </message>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="105"/>
-        <source>h:</source>
-        <translation>u:</translation>
+        <location filename="../core/qthelper.cpp" line="850"/>
+        <location filename="../core/qthelper.cpp" line="1299"/>
+        <source>psi</source>
+        <translation>psi</translation>
     </message>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="105"/>
-        <source>min</source>
-        <translation>min</translation>
+        <location filename="../core/qthelper.cpp" line="871"/>
+        <location filename="../core/qthelper.cpp" line="1235"/>
+        <source>AIR</source>
+        <translation>AIR</translation>
     </message>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="337"/>
-        <source>Multiple</source>
-        <translation>Meerdere</translation>
+        <location filename="../core/qthelper.cpp" line="873"/>
+        <source>EAN</source>
+        <translation>EAN</translation>
     </message>
     <message numerus="yes">
-        <location filename="../core/qthelper.cpp" line="957"/>
+        <location filename="../core/qthelper.cpp" line="962"/>
         <source>(%n dive(s))</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="816"/>
-        <location filename="../core/qthelper.cpp" line="1228"/>
-        <source>kg</source>
-        <translation>kg</translation>
+        <location filename="../core/qthelper.cpp" line="1235"/>
+        <source>OXYGEN</source>
+        <translation>ZUURSTOF</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="818"/>
-        <location filename="../core/qthelper.cpp" line="1229"/>
-        <source>lbs</source>
-        <translation>US pond</translation>
+        <location filename="../core/qthelper.cpp" line="1322"/>
+        <source>l</source>
+        <translation>l</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="763"/>
-        <location filename="../core/qthelper.cpp" line="1252"/>
-        <source>ft</source>
-        <translation>ft</translation>
+        <location filename="../core/qthelper.cpp" line="1323"/>
+        <source>cuft</source>
+        <translation>cuft</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="761"/>
-        <location filename="../core/qthelper.cpp" line="1253"/>
-        <source>m</source>
-        <translation>m</translation>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="29"/>
+        <source>unknown</source>
+        <translation>onbekend</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="789"/>
-        <source>C</source>
-        <translation>C</translation>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="114"/>
+        <source>h:</source>
+        <translation>u:</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="791"/>
-        <source>F</source>
-        <translation>F</translation>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="114"/>
+        <source>min</source>
+        <translation>min</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="845"/>
-        <location filename="../core/qthelper.cpp" line="1275"/>
-        <source>psi</source>
-        <translation>psi</translation>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="63"/>
+        <source>Remove this point</source>
+        <translation>Dit punt verwijderen</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="843"/>
-        <location filename="../core/qthelper.cpp" line="1276"/>
-        <source>bar</source>
-        <translation>bar</translation>
+        <location filename="../desktop-widgets/globe.cpp" line="327"/>
+        <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>
     <message>
-        <location filename="../core/qthelper.cpp" line="868"/>
-        <source>EAN</source>
-        <translation>EAN</translation>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="32"/>
+        <source>Average</source>
+        <translation>Gemiddelde</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="1298"/>
-        <source>l</source>
-        <translation>l</translation>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="35"/>
+        <source>Minimum</source>
+        <translation>Kleinste</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="1299"/>
-        <source>cuft</source>
-        <translation>cuft</translation>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="38"/>
+        <source>Maximum</source>
+        <translation>Grootste</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="625"/>
@@ -7154,17 +7300,12 @@ Kan niet verbinden met de Subsurface cloud opslag, terug naar lokale mode</trans
         <source>Malformed XML response. Line %1: %2</source>
         <translation>Slecht gevormd XML antwoord. Lijn %1: %2</translation>
     </message>
-    <message>
-        <location filename="../core/gpslocation.h" line="13"/>
-        <source>Waiting to aquire GPS location</source>
-        <translation>Wacht op GPS fix</translation>
-    </message>
 </context>
 <context>
     <name>ReadSettingsThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1651"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1676"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1640"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1665"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Deze functie is nog niet beschikbaar voor de geselecteerde duikcomputer.</translation>
     </message>
@@ -7193,7 +7334,7 @@ Kan niet verbinden met de Subsurface cloud opslag, terug naar lokale mode</trans
 <context>
     <name>ResetSettingsThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1775"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1764"/>
         <source>Reset settings failed!</source>
         <translation>Terugzetten instellingen mislukt!</translation>
     </message>
@@ -7231,6 +7372,12 @@ Kan niet verbinden met de Subsurface cloud opslag, terug naar lokale mode</trans
 <context>
     <name>ShiftImageTimesDialog</name>
     <message>
+        <location filename="../desktop-widgets/shiftimagetimes.ui" line="23"/>
+        <location filename="../build/ui_shiftimagetimes.h" line="184"/>
+        <source>Shift selected image times</source>
+        <translation>Geselecteerde tijdsstippen verschuiven</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/shiftimagetimes.ui" line="34"/>
         <location filename="../build/ui_shiftimagetimes.h" line="185"/>
         <source>Shift times of image(s) by</source>
@@ -7243,12 +7390,6 @@ Kan niet verbinden met de Subsurface cloud opslag, terug naar lokale mode</trans
         <translation>u:mm</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/shiftimagetimes.ui" line="23"/>
-        <location filename="../build/ui_shiftimagetimes.h" line="184"/>
-        <source>Shift selected image times</source>
-        <translation>Geselecteerde tijdsstippen verschuiven</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/shiftimagetimes.ui" line="105"/>
         <location filename="../build/ui_shiftimagetimes.h" line="187"/>
         <source>Earlier</source>
@@ -7299,12 +7440,12 @@ Niet alle afbeeldingen hebben tijdstempels tussen 30 minuten voor de start en 30
         <translation>Welke datum en tijd worden weergegeven in de afbeelding?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="297"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="296"/>
         <source>Open image file</source>
         <translation>Afbeelding openen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="299"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="298"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>Afbeeldingen (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -7400,7 +7541,7 @@ Niet alle afbeeldingen hebben tijdstempels tussen 30 minuten voor de start en 30
     <message>
         <location filename="../smtk-import/smrtk2ssrfc_window.ui" line="20"/>
         <source>SmartTrak files importer</source>
-        <translation type="unfinished"/>
+        <translation>Import programma SmartTrak bestanden</translation>
     </message>
     <message>
         <location filename="../smtk-import/smrtk2ssrfc_window.ui" line="79"/>
@@ -7416,12 +7557,12 @@ Niet alle afbeeldingen hebben tijdstempels tussen 30 minuten voor de start en 30
     <message>
         <location filename="../smtk-import/smrtk2ssrfc_window.ui" line="133"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#6ebeb9;&quot;&gt;Smartrak divelog&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#6ebeb9;&quot;&gt;Smartrak divelog&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location filename="../smtk-import/smrtk2ssrfc_window.ui" line="242"/>
         <source>Exit</source>
-        <translation type="unfinished"/>
+        <translation>Beëindigen</translation>
     </message>
     <message>
         <location filename="../smtk-import/smrtk2ssrfc_window.ui" line="270"/>
@@ -7431,85 +7572,85 @@ Niet alle afbeeldingen hebben tijdstempels tussen 30 minuten voor de start en 30
     <message>
         <location filename="../smtk-import/smrtk2ssrfc_window.ui" line="295"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600; color:#6ebeb9;&quot;&gt;Select the .slg file(s) you want to import to Subsurface format, and the exported .xml file. It&apos;s advisable to use a new output file, as its actual content will be erased.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600; color:#6ebeb9;&quot;&gt;Selecteer de .slg bestanden die je wilt importeren in Subsurface formaat en het te exporteren .xml bestand. Gebruik een nieuwe .xml file; de inhoud wordt vervangen.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location filename="../smtk-import/smrtk2ssrfc_window.ui" line="377"/>
         <source>Import messages (Errors, warnings, etc)</source>
-        <translation type="unfinished"/>
+        <translation>Importeer berichten (Fouten, waarschuwingen, etc)</translation>
     </message>
     <message>
         <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="50"/>
         <source>Open SmartTrak files</source>
-        <translation type="unfinished"/>
+        <translation>Open SmartTrak bestanden</translation>
     </message>
     <message>
         <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="51"/>
         <source>SmartTrak files (*.slg *.SLG);;All files (*)</source>
-        <translation type="unfinished"/>
+        <translation>SmartTrak bestanden (*.slg *.SLG);;Alle bestanden (*)</translation>
     </message>
     <message>
         <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="62"/>
         <source>Open Subsurface files</source>
-        <translation type="unfinished"/>
+        <translation>Open Subsurface bestanden</translation>
     </message>
     <message>
         <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="63"/>
         <source>Subsurface files (*.ssrf *SSRF *.xml *.XML);;All files (*)</source>
-        <translation type="unfinished"/>
+        <translation>Subsurface bestanden (*.ssrf *SSRF *.xml *.XML);;Alle bestanden (*)</translation>
     </message>
 </context>
 <context>
     <name>SocialNetworkDialog</name>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="339"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="284"/>
         <source>Dive date: %1 
 </source>
         <translation>Datum duik: %1
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="342"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="287"/>
         <source>Duration: %1 
 </source>
         <translation>Duur: %1 
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="343"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="288"/>
         <source>h:</source>
         <comment>abbreviation for hours plus separator</comment>
         <translation>u:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="344"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="289"/>
         <source>min</source>
         <comment>abbreviation for minutes</comment>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="347"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="292"/>
         <source>Dive location: %1 
 </source>
         <translation>Duiklocatie: %1
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="350"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="295"/>
         <source>Buddy: %1 
 </source>
         <translation>Buddy: %1 
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="353"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="298"/>
         <source>Divemaster: %1 
 </source>
         <translation>Divemaster: %1 
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="356"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="301"/>
         <source>
 %1</source>
         <translation>
@@ -7595,12 +7736,21 @@ Niet alle afbeeldingen hebben tijdstempels tussen 30 minuten voor de start en 30
     <name>StartPage</name>
     <message>
         <location filename="../mobile-widgets/qml/StartPage.qml" line="19"/>
-        <source>To use Subsurface-mobile with Subsurface cloud storage, please enteryour cloud credentials.
-
-To use Subsurface-mobile only with local data on this device, tap on the no cloud icon below.</source>
-        <translation>Voer je cloud rechten in om Subsurface-mobile met Subsurface cloud opslag te gebruiken.
+        <source>To use Subsurface-mobile with Subsurface cloud storage, please enter your cloud credentials.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/StartPage.qml" line="20"/>
+        <source>If this is the first time you use Subsurface cloud storage, enter a valid email (all lower case) and a password of your choice (letters and numbers). The server will send a PIN to the email address provided that you will have to enter here.
 
-Selecteer het &quot;no cloud&quot; icoon om Subsurface-mobile alleen met de lokale data op dit toestel te gebruiken.</translation>
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/StartPage.qml" line="23"/>
+        <source>To use Subsurface-mobile only with local data on this device, tap on the no cloud icon below.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -7632,13 +7782,18 @@ Selecteer het &quot;no cloud&quot; icoon om Subsurface-mobile alleen met de loka
     <message>
         <location filename="../desktop-widgets/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, Tomaz Canabrava, and others, 2011-2016&lt;/span&gt;</source>
-        <translation type="unfinished"/>
+        <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, Tomaz Canabrava, en anderen, 2011-2016&lt;/span&gt;</translation>
     </message>
 </context>
 <context>
     <name>SubsurfaceWebServices</name>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="419"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="395"/>
+        <source>Enter User ID and click Download</source>
+        <translation>Geef GebruikersID en klik op Download</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="417"/>
         <source>Webservice</source>
         <translation>Webservice</translation>
     </message>
@@ -7663,30 +7818,25 @@ Selecteer het &quot;no cloud&quot; icoon om Subsurface-mobile alleen met de loka
         <translation>Verbindingsfout:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="557"/>
-        <source>Download successful</source>
-        <translation>Laden succesvol voltooid</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="551"/>
         <source>Invalid user identifier!</source>
         <translation>Ongeldige gebruikersidentificatie</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="397"/>
-        <source>Enter User ID and click Download</source>
-        <translation>Geef GebruikersID en klik op Download</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="554"/>
         <source>Cannot parse response!</source>
         <translation>Kan antwoord niet parsen!</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="557"/>
+        <source>Download successful</source>
+        <translation>Laden succesvol voltooid</translation>
+    </message>
 </context>
 <context>
     <name>SuitFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="674"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="672"/>
         <source>Suits: </source>
         <translation>Duikpakken:</translation>
     </message>
@@ -7694,7 +7844,7 @@ Selecteer het &quot;no cloud&quot; icoon om Subsurface-mobile alleen met de loka
 <context>
     <name>SuitsFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="123"/>
+        <location filename="../qt-models/filtermodels.cpp" line="128"/>
         <source>No suit set</source>
         <translation>Geen duikpak geselecteerd</translation>
     </message>
@@ -7713,7 +7863,7 @@ Selecteer het &quot;no cloud&quot; icoon om Subsurface-mobile alleen met de loka
 <context>
     <name>TagFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="595"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="593"/>
         <source>Tags: </source>
         <translation>Trefwoorden:</translation>
     </message>
@@ -7721,7 +7871,7 @@ Selecteer het &quot;no cloud&quot; icoon om Subsurface-mobile alleen met de loka
 <context>
     <name>TagFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="148"/>
+        <location filename="../qt-models/filtermodels.cpp" line="153"/>
         <source>Empty tags</source>
         <translation>Lege trefwoorden</translation>
     </message>
@@ -7747,6 +7897,11 @@ Selecteer het &quot;no cloud&quot; icoon om Subsurface-mobile alleen met de loka
 <context>
     <name>TemplateEdit</name>
     <message>
+        <location filename="../desktop-widgets/templateedit.ui" line="14"/>
+        <source>Edit template</source>
+        <translation>Bewerk sjabloon</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/templateedit.ui" line="37"/>
         <source>Preview</source>
         <translation>Voorbeeldweergave</translation>
@@ -7792,11 +7947,6 @@ Selecteer het &quot;no cloud&quot; icoon om Subsurface-mobile alleen met de loka
         <translation>Lettertype grootte</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/templateedit.ui" line="14"/>
-        <source>Edit template</source>
-        <translation>Bewerk sjabloon</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/templateedit.ui" line="165"/>
         <source>Color palette</source>
         <translation>Kleurenpalet</translation>
@@ -7978,82 +8128,9 @@ Selecteer het &quot;no cloud&quot; icoon om Subsurface-mobile alleen met de loka
 <context>
     <name>TextHyperlinkEventFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="817"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="815"/>
         <source>%1click to visit %2</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>ThemeTest</name>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="29"/>
-        <source>Theme Information</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="33"/>
-        <source>Screen</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="42"/>
-        <source>Geometry (pixels):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="49"/>
-        <source>Geometry (gridUnits):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="56"/>
-        <source>Units.gridUnit:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="63"/>
-        <source>Units.devicePixelRatio:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="70"/>
-        <source>Font Metrics</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="76"/>
-        <source>FontMetrics pointSize:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="83"/>
-        <source>FontMetrics pixelSize:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="90"/>
-        <source>FontMetrics devicePixelRatio:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="97"/>
-        <source>Text item pixelSize:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="104"/>
-        <source>Text item pointSize:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="111"/>
-        <source>Pixel density:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="118"/>
-        <source>Height of default font:</source>
-        <translation type="unfinished"/>
+        <translation>%1klik om te bezoeken %2</translation>
     </message>
 </context>
 <context>
@@ -8067,102 +8144,107 @@ Selecteer het &quot;no cloud&quot; icoon om Subsurface-mobile alleen met de loka
 <context>
     <name>TripItem</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="67"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="68"/>
         <source>(%1 shown)</source>
         <translation>(%1 getoond)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="194"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
         <source>#</source>
         <translation>Nr.</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="197"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="215"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="200"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="218"/>
         <source>Rating</source>
         <translation>Waardering</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
         <source>Depth(%1)</source>
         <translation>Diepte (%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="206"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="224"/>
         <source>Duration</source>
         <translation>Duur</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="209"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="227"/>
         <source>Temp(%1%2)</source>
         <translation>Temp (%1%2)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
         <source>Weight(%1)</source>
         <translation>Gewicht (%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
         <source>lbs</source>
         <translation>US pond</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="215"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="233"/>
         <source>Suit</source>
         <translation>Pak</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="218"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="236"/>
         <source>Cyl</source>
         <translation>Fles</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="239"/>
         <source>Gas</source>
         <translation>Gas</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="244"/>
         <source>SAC(%1)</source>
         <translation>Gasverbruik (%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="244"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="229"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="247"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="232"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="250"/>
         <source>Max CNS</source>
         <translation>Max CNS</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="235"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="253"/>
+        <source>Photos before/during/after dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="256"/>
         <source>Location</source>
         <translation>Locatie</translation>
     </message>
@@ -8185,72 +8267,73 @@ Selecteer het &quot;no cloud&quot; icoon om Subsurface-mobile alleen met de loka
 <context>
     <name>UpdateManager</name>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="69"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="61"/>
         <source>Check for updates.</source>
         <translation>Zoek naar updates.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="70"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="62"/>
         <source>Subsurface was unable to check for updates.</source>
         <translation>Subsurface kon niet zoeken naar updates.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="75"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="67"/>
         <source>The following error occurred:</source>
         <translation>De volgende fout trad op:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="76"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="68"/>
         <source>Please check your internet connection.</source>
         <translation>Controleer uw internetverbinding.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="86"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="78"/>
         <source>You are using the latest version of Subsurface.</source>
         <translation>U gebruikt de meest recente versie van Subsurface.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="89"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="81"/>
         <source>A new version of Subsurface is available.&lt;br/&gt;Click on:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; to download it.</source>
         <translation>Er is een nieuwe versie van Subsurface beschikbaar.&lt;br/&gt;Klik op:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; om te downloaden.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="95"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="87"/>
         <source>A new version of Subsurface is available.</source>
         <translation>Er is een nieuwe versie van Subsurface beschikbaar.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="96"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="88"/>
         <source>Latest version is %1, please check %2 our download page %3 for information in how to update.</source>
         <translation>De nieuwste versie is %1, kijk %2 op onze download pagina %3 voor informatie over de update.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="106"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="98"/>
         <source>Newest release version is </source>
         <translation>De nieuwste officiele versie is</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="107"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="99"/>
         <source>The server returned the following information:</source>
         <translation>De server gaf het volgende antwoord:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="125"/>
-        <source>Subsurface is checking every two weeks if a new version is available. If you don&apos;t want Subsurface to continue checking, please click Decline.</source>
-        <translation>Subsurface controleert elke twee weken of er een nieuwe versie beschikbaar is. Als u dat niet wilt, selecteer dan Weigeren.</translation>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="117"/>
+        <source>Subsurface is checking every two weeks if a new version is available. 
+ If you don&apos;t want Subsurface to continue checking, please click Decline.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="126"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="119"/>
         <source>Decline</source>
         <translation>Weigeren</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="127"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="120"/>
         <source>Accept</source>
         <translation>Aanvaarden</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="129"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="122"/>
         <source>Automatic check for updates</source>
         <translation>Automatisch controleren of er updates zijn</translation>
     </message>
@@ -8272,24 +8355,6 @@ Selecteer het &quot;no cloud&quot; icoon om Subsurface-mobile alleen met de loka
 <context>
     <name>UserSurvey</name>
     <message>
-        <location filename="../desktop-widgets/usersurvey.ui" line="44"/>
-        <location filename="../build/ui_usersurvey.h" line="151"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;We would love to learn more about our users, their preferences and their usage habits. Please spare a minute to fill out this form and submit it to the Subsurface team.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;We zouden graag meer weten over onze gebruikers, hun voorkeuren en hun gewoontes. Neem a.u.b. even de tijd om dit formulier in te vullen en het naar het Subsurface team te verzenden.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/usersurvey.ui" line="115"/>
-        <location filename="../build/ui_usersurvey.h" line="156"/>
-        <source>Other software/sources</source>
-        <translation>Andere programma&apos;s/bronnen</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/usersurvey.ui" line="128"/>
-        <location filename="../build/ui_usersurvey.h" line="157"/>
-        <source>Manually entering dives</source>
-        <translation>Met de hand duiken invoeren</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="14"/>
         <location filename="../build/ui_usersurvey.h" line="149"/>
         <source>User survey</source>
@@ -8302,6 +8367,12 @@ Selecteer het &quot;no cloud&quot; icoon om Subsurface-mobile alleen met de loka
         <translation>Subsurface gebruikersenquête</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/usersurvey.ui" line="44"/>
+        <location filename="../build/ui_usersurvey.h" line="151"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;We would love to learn more about our users, their preferences and their usage habits. Please spare a minute to fill out this form and submit it to the Subsurface team.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;We zouden graag meer weten over onze gebruikers, hun voorkeuren en hun gewoontes. Neem a.u.b. even de tijd om dit formulier in te vullen en het naar het Subsurface team te verzenden.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="63"/>
         <location filename="../build/ui_usersurvey.h" line="152"/>
         <source>Technical diver</source>
@@ -8326,6 +8397,18 @@ Selecteer het &quot;no cloud&quot; icoon om Subsurface-mobile alleen met de loka
         <translation>Ondersteunde duikcomputer</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/usersurvey.ui" line="115"/>
+        <location filename="../build/ui_usersurvey.h" line="156"/>
+        <source>Other software/sources</source>
+        <translation>Andere programma&apos;s/bronnen</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/usersurvey.ui" line="128"/>
+        <location filename="../build/ui_usersurvey.h" line="157"/>
+        <source>Manually entering dives</source>
+        <translation>Met de hand duiken invoeren</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="141"/>
         <location filename="../build/ui_usersurvey.h" line="158"/>
         <source>Android/iPhone companion app</source>
@@ -8356,6 +8439,11 @@ Selecteer het &quot;no cloud&quot; icoon om Subsurface-mobile alleen met de loka
         <translation>Van waar importeert u gegevens?</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/usersurvey.cpp" line="18"/>
+        <source>Send</source>
+        <translation>Verzend</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/usersurvey.cpp" line="43"/>
         <source>
 Operating system: %1</source>
@@ -8399,19 +8487,14 @@ Taal: %1</translation>
         <translation>Later vragen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/usersurvey.cpp" line="101"/>
-        <source>Submit user survey.</source>
-        <translation>Gebruikersenquête verzenden.</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/usersurvey.cpp" line="82"/>
         <source>Ask again?</source>
         <translation>Opnieuw vragen?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/usersurvey.cpp" line="18"/>
-        <source>Send</source>
-        <translation>Verzend</translation>
+        <location filename="../desktop-widgets/usersurvey.cpp" line="101"/>
+        <source>Submit user survey.</source>
+        <translation>Gebruikersenquête verzenden.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/usersurvey.cpp" line="102"/>
@@ -8503,12 +8586,12 @@ Taal: %1</translation>
         <translation>Uploaden</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="324"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="325"/>
         <source>Operation timed out</source>
         <translation>Operatie duurt te lang</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="345"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="346"/>
         <source>Transferring data...</source>
         <translation>Gegevens worden overgebracht...</translation>
     </message>
@@ -8543,18 +8626,18 @@ Taal: %1</translation>
 <context>
     <name>WriteSettingsThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1702"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1709"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1718"/>
-        <source>Failed!</source>
-        <translation>Mislukt!</translation>
-    </message>
-    <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1700"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1721"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1689"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1710"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Deze functie is nog niet beschikbaar voor de geselecteerde duikcomputer.</translation>
     </message>
+    <message>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1691"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1698"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1707"/>
+        <source>Failed!</source>
+        <translation>Mislukt!</translation>
+    </message>
 </context>
 <context>
     <name>YearlyStatisticsModel</name>
@@ -8679,7 +8762,7 @@ Maximum</translation>
 <context>
     <name>getextFromC</name>
     <message>
-        <location filename="../core/libdivecomputer.c" line="674"/>
+        <location filename="../core/libdivecomputer.c" line="737"/>
         <source>Error parsing the header</source>
         <translation>Fout bij het verwerken van de header</translation>
     </message>
@@ -8687,38 +8770,377 @@ Maximum</translation>
 <context>
     <name>gettextFromC</name>
     <message>
+        <location filename="../core/cochran.c" line="309"/>
+        <location filename="../core/cochran.c" line="315"/>
+        <location filename="../core/cochran.c" line="385"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>deco stop</source>
+        <translation>decompressiestop</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="336"/>
+        <location filename="../core/cochran.c" line="390"/>
+        <location filename="../core/file.c" line="777"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>ascent</source>
+        <translation>opstijging</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="342"/>
+        <location filename="../core/file.c" line="755"/>
+        <source>battery</source>
+        <translation>batterij</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="348"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
+        <source>OLF</source>
+        <translation>OLF</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="353"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
+        <source>maxdepth</source>
+        <translation>Max. diepte</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="358"/>
+        <location filename="../core/cochran.c" line="404"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
+        <source>pO₂</source>
+        <translation>pO₂</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="365"/>
+        <location filename="../core/cochran.c" line="414"/>
+        <location filename="../core/cochran.c" line="421"/>
+        <location filename="../core/file.c" line="868"/>
+        <location filename="../core/libdivecomputer.c" line="225"/>
+        <location filename="../core/libdivecomputer.c" line="228"/>
+        <source>gaschange</source>
+        <translation>gaswissel</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="370"/>
+        <location filename="../core/cochran.c" line="409"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>rbt</source>
+        <translation>RBT</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="379"/>
+        <location filename="../core/cochran.c" line="426"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>ceiling</source>
+        <translation>plafond</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="395"/>
+        <location filename="../core/libdivecomputer.c" line="224"/>
+        <source>transmitter</source>
+        <translation>zender</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="153"/>
+        <source>Error: the file does not appear to be a DATATRAK divelog</source>
+        <translation>Fout: het bestand lijkt geen DATATRAK divelog bestand</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="286"/>
+        <source>clear</source>
+        <translation>helder</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="289"/>
+        <source>misty</source>
+        <translation>heiig</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="292"/>
+        <source>fog</source>
+        <translation>mist</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="295"/>
+        <source>rain</source>
+        <translation>regen</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="298"/>
+        <source>storm</source>
+        <translation>storm</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="301"/>
+        <source>snow</source>
+        <translation>sneeuw</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="321"/>
+        <source>No suit</source>
+        <translation>Geen pak</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="324"/>
+        <source>Shorty</source>
+        <translation>Shorty</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="327"/>
+        <source>Combi</source>
+        <translation>Combinatie natpak</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="330"/>
+        <source>Wet suit</source>
+        <translation>Natpak</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="333"/>
+        <source>Semidry suit</source>
+        <translation>Semi-natpak</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="336"/>
+        <source>Dry suit</source>
+        <translation>Droogpak</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="396"/>
+        <source>no stop</source>
+        <translation>geen stop</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="398"/>
+        <location filename="../core/dive.c" line="29"/>
+        <source>deco</source>
+        <translation>decompressie</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="400"/>
+        <source>single ascent</source>
+        <translation>enkele opstijging</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="402"/>
+        <source>multiple ascent</source>
+        <translation>meerdere opstijgingen</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="404"/>
+        <location filename="../core/dive.c" line="27"/>
+        <source>fresh</source>
+        <translation>zoet</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="406"/>
+        <source>salt water</source>
+        <translation>zout water</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="431"/>
+        <source>sight seeing</source>
+        <translation>rondkijken</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="433"/>
+        <source>club dive</source>
+        <translation>club duik</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="435"/>
+        <location filename="../core/dive.c" line="28"/>
+        <source>instructor</source>
+        <translation>instructeur</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="437"/>
+        <source>instruction</source>
+        <translation>instructie</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="439"/>
+        <location filename="../core/dive.c" line="27"/>
+        <source>night</source>
+        <translation>nacht</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="441"/>
+        <location filename="../core/dive.c" line="25"/>
+        <source>cave</source>
+        <translation>grot</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="443"/>
+        <location filename="../core/dive.c" line="24"/>
+        <source>ice</source>
+        <translation>ijs</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="445"/>
+        <source>search</source>
+        <translation>zoeken</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="455"/>
+        <location filename="../core/dive.c" line="25"/>
+        <source>wreck</source>
+        <translation>wrak</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="457"/>
+        <location filename="../core/dive.c" line="26"/>
+        <source>river</source>
+        <translation>rivier</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="459"/>
+        <location filename="../core/dive.c" line="23"/>
+        <source>drift</source>
+        <translation>drift</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="461"/>
+        <location filename="../core/dive.c" line="28"/>
+        <source>photo</source>
+        <translation>foto</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="463"/>
+        <source>other</source>
+        <translation>andere</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="474"/>
+        <source>Other activities</source>
+        <translation>Andere activiteiten</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="498"/>
+        <source>Datatrak/Wlog notes</source>
+        <translation>Datatrak/Wlog notities</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="537"/>
+        <source>Manually entered dive</source>
+        <translation>Handmatig toegevoegde duik</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="588"/>
+        <source>Unknown</source>
+        <translation>Onbekend</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="674"/>
+        <source>Error: couldn&apos;t open the file %s</source>
+        <translation>Kan het bestand %s niet openen</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="687"/>
+        <source>Error: no dive</source>
+        <translation>Fout: geen duik</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="23"/>
+        <source>boat</source>
+        <translation>boot</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="23"/>
+        <source>shore</source>
+        <translation>kust</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="24"/>
+        <source>deep</source>
+        <translation>diep</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="24"/>
+        <source>cavern</source>
+        <translation>spelonk</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="25"/>
+        <source>altitude</source>
+        <translation>hoogte</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="26"/>
+        <source>pool</source>
+        <translation>zwembad</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="26"/>
+        <source>lake</source>
+        <translation>meer</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="27"/>
+        <source>student</source>
+        <translation>student</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="28"/>
+        <source>video</source>
+        <translation>video</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="33"/>
+        <source>OC-gas</source>
+        <translation>OC-gas</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="33"/>
+        <source>diluent</source>
+        <translation>diluent</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="33"/>
+        <location filename="../core/equipment.c" line="88"/>
+        <location filename="../core/planner.c" line="1436"/>
+        <location filename="../core/planner.c" line="1439"/>
+        <source>oxygen</source>
+        <translation>zuurstof</translation>
+    </message>
+    <message>
         <location filename="../core/dive.c" line="181"/>
         <source>pascal</source>
         <translation>Pa</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="186"/>
-        <location filename="../core/qthelper.cpp" line="669"/>
+        <location filename="../core/qthelper.cpp" line="674"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="190"/>
-        <location filename="../core/qthelper.cpp" line="672"/>
+        <location filename="../core/qthelper.cpp" line="677"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
+        <location filename="../core/dive.c" line="227"/>
+        <source>ℓ</source>
+        <translation>ℓ</translation>
+    </message>
+    <message>
         <location filename="../core/dive.c" line="232"/>
         <source>cuft</source>
         <translation>cuft</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="269"/>
-        <location filename="../core/qthelper.cpp" line="590"/>
-        <location filename="../core/qthelper.cpp" line="605"/>
+        <location filename="../core/qthelper.cpp" line="595"/>
+        <location filename="../core/qthelper.cpp" line="610"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="274"/>
-        <location filename="../core/qthelper.cpp" line="593"/>
-        <location filename="../core/qthelper.cpp" line="607"/>
+        <location filename="../core/qthelper.cpp" line="598"/>
+        <location filename="../core/qthelper.cpp" line="612"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
@@ -8744,53 +9166,58 @@ Maximum</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="325"/>
-        <location filename="../core/qthelper.cpp" line="616"/>
-        <location filename="../core/qthelper.cpp" line="626"/>
+        <location filename="../core/qthelper.cpp" line="621"/>
+        <location filename="../core/qthelper.cpp" line="631"/>
         <source>lbs</source>
         <translation>US pond</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="329"/>
-        <location filename="../core/qthelper.cpp" line="614"/>
-        <location filename="../core/qthelper.cpp" line="624"/>
+        <location filename="../core/qthelper.cpp" line="619"/>
+        <location filename="../core/qthelper.cpp" line="629"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="1772"/>
+        <location filename="../core/dive.c" line="1751"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) of (%s)</translation>
     </message>
     <message>
-        <location filename="../core/divelist.c" line="484"/>
+        <location filename="../core/divelist.c" line="487"/>
         <location filename="../core/equipment.c" line="84"/>
-        <location filename="../core/planner.c" line="1411"/>
-        <location filename="../core/planner.c" line="1414"/>
+        <location filename="../core/planner.c" line="1432"/>
+        <location filename="../core/planner.c" line="1435"/>
         <source>air</source>
         <translation>lucht</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="197"/>
+        <location filename="../core/equipment.c" line="86"/>
+        <source>EAN%d</source>
+        <translation>EAN%d</translation>
+    </message>
+    <message>
+        <location filename="../core/equipment.c" line="198"/>
         <source>integrated</source>
         <translation>Geïntegreerd</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="198"/>
+        <location filename="../core/equipment.c" line="199"/>
         <source>belt</source>
         <translation>riem</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="199"/>
+        <location filename="../core/equipment.c" line="200"/>
         <source>ankle</source>
         <translation>enkel</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="200"/>
+        <location filename="../core/equipment.c" line="201"/>
         <source>backplate weight</source>
         <translation>backplate-gewicht</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="201"/>
+        <location filename="../core/equipment.c" line="202"/>
         <source>clip-on</source>
         <translation>clip-on</translation>
     </message>
@@ -8803,8 +9230,8 @@ Maximum</translation>
         <location filename="../core/file.c" line="121"/>
         <location filename="../core/file.c" line="512"/>
         <location filename="../core/file.c" line="597"/>
-        <location filename="../core/file.c" line="924"/>
-        <location filename="../core/file.c" line="1056"/>
+        <location filename="../core/file.c" line="909"/>
+        <location filename="../core/file.c" line="1092"/>
         <location filename="../core/ostctools.c" line="80"/>
         <source>Failed to read &apos;%s&apos;</source>
         <translation>Fout bij lezen van &apos;%s&apos;</translation>
@@ -8862,486 +9289,496 @@ Maximum</translation>
         <translation>O₂ calibratie</translation>
     </message>
     <message>
-        <location filename="../core/file.c" line="887"/>
-        <source>No matching DC found for file &apos;%s&apos;</source>
-        <translation>Geen duikcomputer gevonden voor bestand &apos;%s&apos;</translation>
+        <location filename="../core/git-access.c" line="134"/>
+        <source>Local cache directory %s corrupted - can&apos;t sync with Subsurface cloud storage</source>
+        <translation>Lokale cache directorie %s is corrupt - kan niet synchoniseren met de Subsurface cloud opslag</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>none</source>
-        <translation>geen</translation>
+        <location filename="../core/git-access.c" line="157"/>
+        <location filename="../core/git-access.c" line="177"/>
+        <source>Could not update local cache to newer remote data</source>
+        <translation>Kan de lokale cache niet aanpassen naar nieuwere data in de Sursurface cloud</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="309"/>
-        <location filename="../core/cochran.c" line="315"/>
-        <location filename="../core/cochran.c" line="385"/>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>deco stop</source>
-        <translation>decompressiestop</translation>
+        <location filename="../core/git-access.c" line="170"/>
+        <source>Subsurface cloud storage corrupted</source>
+        <translation>Subsurface cloud opslag corrupt</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="342"/>
-        <location filename="../core/file.c" line="755"/>
-        <source>battery</source>
-        <translation>batterij</translation>
+        <location filename="../core/git-access.c" line="284"/>
+        <source>Could not update Subsurface cloud storage, try again later</source>
+        <translation>Kan de Subsurface cloud opslag niet actualiseren, probeer later opnieuw</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="370"/>
-        <location filename="../core/cochran.c" line="409"/>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>rbt</source>
-        <translation>RBT</translation>
+        <location filename="../core/git-access.c" line="344"/>
+        <source>Remote storage and local data diverged. Error: merge failed (%s)</source>
+        <translation>Cloud en lokale data verschillen teveel. Fout: samenvoegen gefaald (%s)</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="336"/>
-        <location filename="../core/cochran.c" line="390"/>
-        <location filename="../core/file.c" line="777"/>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>ascent</source>
-        <translation>opstijging</translation>
+        <location filename="../core/git-access.c" line="374"/>
+        <source>Remote storage and local data diverged. Cannot combine local and remote changes</source>
+        <translation>Cloud en lokale data verschillen teveel. Kan de verschillen niet samenvoegen</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="379"/>
-        <location filename="../core/cochran.c" line="426"/>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>ceiling</source>
-        <translation>plafond</translation>
+        <location filename="../core/git-access.c" line="408"/>
+        <source>Remote storage and local data diverged</source>
+        <translation>Cloud en lokale data verschillen teveel.</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>workload</source>
-        <translation>werklast</translation>
+        <location filename="../core/git-access.c" line="411"/>
+        <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source>
+        <translation>Cloud en lokale data verschillen teveel. Fout: wegschrijven data gefaald (%s)</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="395"/>
-        <location filename="../core/libdivecomputer.c" line="203"/>
-        <source>transmitter</source>
-        <translation>zender</translation>
+        <location filename="../core/git-access.c" line="420"/>
+        <source>Problems with local cache of Subsurface cloud data</source>
+        <translation>Problemen met lokale cache van de Subsurface cloud data</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="203"/>
+        <location filename="../core/git-access.c" line="421"/>
+        <source>Moved cache data to %s. Please try the operation again.</source>
+        <translation>Verplaatste cache data naar %s. Probeer de operatie opnieuw.</translation>
+    </message>
+    <message>
+        <location filename="../core/git-access.c" line="743"/>
+        <source>Error connecting to Subsurface cloud storage</source>
+        <translation>Kan niet verbinden met de Subsurface cloud opslag</translation>
+    </message>
+    <message>
+        <location filename="../core/git-access.c" line="746"/>
+        <source>git clone of %s failed (%s)</source>
+        <translation>git clone van %s gefaald (%s)</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="210"/>
+        <location filename="../core/parse-xml.c" line="3317"/>
+        <location filename="../core/uemis-downloader.c" line="134"/>
+        <source>unknown</source>
+        <translation>onbekend</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>none</source>
+        <translation>geen</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>workload</source>
+        <translation>werklast</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="224"/>
         <source>violation</source>
         <translation>schending</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="203"/>
+        <location filename="../core/libdivecomputer.c" line="224"/>
         <source>bookmark</source>
         <translation>bladwijzer</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="203"/>
+        <location filename="../core/libdivecomputer.c" line="224"/>
         <source>surface</source>
         <translation>oppervlakte</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="203"/>
+        <location filename="../core/libdivecomputer.c" line="224"/>
         <source>safety stop</source>
         <translation>veiligheidsstop</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="365"/>
-        <location filename="../core/cochran.c" line="414"/>
-        <location filename="../core/cochran.c" line="421"/>
-        <location filename="../core/file.c" line="868"/>
-        <location filename="../core/libdivecomputer.c" line="204"/>
-        <location filename="../core/libdivecomputer.c" line="207"/>
-        <source>gaschange</source>
-        <translation>gaswissel</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="204"/>
+        <location filename="../core/libdivecomputer.c" line="225"/>
         <source>safety stop (voluntary)</source>
         <translation>veiligheidsstop (vrijwillig)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="204"/>
+        <location filename="../core/libdivecomputer.c" line="225"/>
         <source>safety stop (mandatory)</source>
         <translation>veiligheidsstop (verplicht)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="205"/>
+        <location filename="../core/libdivecomputer.c" line="226"/>
         <source>deepstop</source>
         <translation>diepe stop</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="205"/>
+        <location filename="../core/libdivecomputer.c" line="226"/>
         <source>ceiling (safety stop)</source>
         <translation>plafond (veiligheidsstop)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="205"/>
-        <source>divetime</source>
-        <translation>duiktijd</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="205"/>
+        <location filename="../core/libdivecomputer.c" line="226"/>
         <source>below floor</source>
         <comment>event showing dive is below deco floor and adding deco time</comment>
         <translation>onder de vloer</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="353"/>
-        <location filename="../core/libdivecomputer.c" line="206"/>
-        <source>maxdepth</source>
-        <translation>Max. diepte</translation>
-    </message>
-    <message>
-        <location filename="../core/cochran.c" line="348"/>
-        <location filename="../core/libdivecomputer.c" line="206"/>
-        <source>OLF</source>
-        <translation>OLF</translation>
+        <location filename="../core/libdivecomputer.c" line="226"/>
+        <source>divetime</source>
+        <translation>duiktijd</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="206"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
         <source>airtime</source>
         <translation>resterende luchttijd</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="206"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
         <source>rgbm</source>
         <translation>RGBM</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="206"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
         <source>heading</source>
         <translation>koers</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="358"/>
-        <location filename="../core/cochran.c" line="404"/>
-        <location filename="../core/libdivecomputer.c" line="206"/>
-        <source>pO₂</source>
-        <translation>pO₂</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="207"/>
+        <location filename="../core/libdivecomputer.c" line="228"/>
         <source>tissue level warning</source>
         <translation>waarschuwing stikstofbelasting</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="207"/>
+        <location filename="../core/libdivecomputer.c" line="228"/>
         <source>non stop time</source>
         <translation>nultijd</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="224"/>
+        <location filename="../core/libdivecomputer.c" line="237"/>
         <source>invalid event number</source>
         <translation>ongeldig event-nummer</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="658"/>
-        <source>Unable to create parser for %s %s</source>
-        <translation>Kan geen parser creëren voor %s %s</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="664"/>
-        <source>Error registering the data</source>
-        <translation>Fout bij het registreren van de data</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="495"/>
+        <location filename="../core/libdivecomputer.c" line="553"/>
         <source>Error parsing the datetime</source>
         <translation>Fout bij verwerken van de datum en tijd</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="513"/>
+        <location filename="../core/libdivecomputer.c" line="571"/>
         <source>Dive %d: %s</source>
         <translation>Duik nr. %d: %s</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="519"/>
+        <location filename="../core/libdivecomputer.c" line="577"/>
         <source>Error parsing the divetime</source>
         <translation>Fout bij verwerken van de duikduur</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="529"/>
+        <location filename="../core/libdivecomputer.c" line="587"/>
         <source>Error parsing the maxdepth</source>
         <translation>Fout bij het verwerken van de maximum duikdiepte</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="548"/>
+        <location filename="../core/libdivecomputer.c" line="606"/>
         <source>Error parsing temperature</source>
         <translation>Fout bij het verwerken van de temperatuur</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="568"/>
+        <location filename="../core/libdivecomputer.c" line="626"/>
         <source>Error parsing the gas mix count</source>
         <translation>Fout bij het verwerken van het aantal gasmengsels</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="580"/>
+        <location filename="../core/libdivecomputer.c" line="638"/>
         <source>Error obtaining water salinity</source>
         <translation>Fout bij het verkrijgen van het zoutgehalte</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="589"/>
+        <location filename="../core/libdivecomputer.c" line="647"/>
         <source>Error obtaining surface pressure</source>
         <translation>Fout bij bekomen van oppervlaktedruk</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="614"/>
+        <location filename="../core/libdivecomputer.c" line="672"/>
         <source>Error obtaining divemode</source>
         <translation>Fout bij bepalen duikmodus</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="634"/>
+        <location filename="../core/libdivecomputer.c" line="692"/>
         <source>Error parsing the gas mix</source>
         <translation>Fout bij het verwerken van het gasmengsel</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="684"/>
+        <location filename="../core/libdivecomputer.c" line="717"/>
+        <source>Unable to create parser for %s %s</source>
+        <translation>Kan geen parser creëren voor %s %s</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="723"/>
+        <source>Error registering the data</source>
+        <translation>Fout bij het registreren van de data</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="744"/>
         <source>Error parsing the samples</source>
         <translation>Fout bij het verwerken van de samples</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="822"/>
+        <location filename="../core/libdivecomputer.c" line="882"/>
         <source>Event: waiting for user action</source>
         <translation>Event: wachten op handeling van gebruiker</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="830"/>
+        <location filename="../core/libdivecomputer.c" line="890"/>
         <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="../core/libdivecomputer.c" line="894"/>
+        <location filename="../core/libdivecomputer.c" line="954"/>
         <source>Error registering the event handler.</source>
         <translation>Fout bij het registreren van de event handler.</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="899"/>
+        <location filename="../core/libdivecomputer.c" line="959"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Fout bij het registreren van de cancellation handler.</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="920"/>
+        <location filename="../core/libdivecomputer.c" line="980"/>
         <source>Dive data import error</source>
         <translation>Fout bij importeren van duikdata</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="959"/>
+        <location filename="../core/libdivecomputer.c" line="1019"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Kan geen context creëren voor libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="966"/>
+        <location filename="../core/libdivecomputer.c" line="1026"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Fout bij openen van  %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="992"/>
+        <location filename="../core/libdivecomputer.c" line="1048"/>
         <source>Insufficient privileges to open the device %s %s (%s)</source>
         <translation>Privileges ontoereikend voor toegang tot het toestel %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../core/parse-xml.c" line="517"/>
-        <source>Strange percentage reading %s
+        <location filename="../core/load-git.c" line="194"/>
+        <location filename="../core/parse-xml.c" line="1242"/>
+        <source>multiple GPS locations for this dive site; also %s
 </source>
-        <translation>Vreemde percentage %s
+        <translation>meedere GPS locaties voor deze duikstek; ook %s
 </translation>
     </message>
     <message>
-        <location filename="../core/load-git.c" line="194"/>
-        <location filename="../core/parse-xml.c" line="1238"/>
-        <source>multiple GPS locations for this dive site; also %s
+        <location filename="../core/load-git.c" line="222"/>
+        <location filename="../core/parse-xml.c" line="1304"/>
+        <source>additional name for site: %s
 </source>
-        <translation>meedere GPS locaties voor deze duikstek; ook %s
+        <translation>extra naam voor duikstek: %s
 </translation>
     </message>
     <message>
-        <location filename="../core/parse-xml.c" line="2044"/>
+        <location filename="../core/ostctools.c" line="120"/>
+        <location filename="../core/ostctools.c" line="152"/>
+        <source>Unknown DC in dive %d</source>
+        <translation>Onbekende duikcomputer in duik %d</translation>
+    </message>
+    <message>
+        <location filename="../core/ostctools.c" line="165"/>
+        <source>Error - %s - parsing dive %d</source>
+        <translation>Fout - %s - verwerking duik %d</translation>
+    </message>
+    <message>
+        <location filename="../core/parse-xml.c" line="517"/>
+        <source>Strange percentage reading %s
+</source>
+        <translation>Vreemde percentage %s
+</translation>
+    </message>
+    <message>
+        <location filename="../core/parse-xml.c" line="2051"/>
         <source>Failed to parse &apos;%s&apos;</source>
         <translation>Fout bij analyse van &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../core/parse-xml.c" line="3741"/>
+        <location filename="../core/parse-xml.c" line="3774"/>
         <source>Can&apos;t open stylesheet %s</source>
         <translation>Kan de stylesheet %s niet openen</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="86"/>
-        <source>EAN%d</source>
-        <translation>EAN%d</translation>
+        <location filename="../core/planner.c" line="555"/>
+        <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE %s ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source>
+        <translation>DISCLAIMER/WAARSCHUWING. DIT IS EEN NIEUWE IMPLEMENTATIE VAN HET %1 ALGORITME EN EEN DAAROP GEBASEERDE DUIK PLANNER IMPLEMENTATIE. DEZE IMPLEMENTATIE IS BEPERKT GETEST, EN WIJ RADEN STERK AF DUIKEN TE PLANNEN MET UITSLUITEND DE HIER GEPRESENTEERDE RESULTATEN.</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="1032"/>
-        <location filename="../core/planner.c" line="1184"/>
-        <source>Can&apos;t find gas %s</source>
-        <translation>Gas %s kan niet gevonden worden</translation>
+        <location filename="../core/planner.c" line="569"/>
+        <source>Decompression calculation aborted due to excessive time</source>
+        <translation>Decompressieberekeningen gestopt omdat ze te lang duren</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="368"/>
-        <source>Too many gas mixes</source>
-        <translation>Teveel gasmengsels</translation>
+        <location filename="../core/planner.c" line="571"/>
+        <location filename="../core/planner.c" line="829"/>
+        <location filename="../core/planner.c" line="834"/>
+        <location filename="../core/planner.c" line="860"/>
+        <location filename="../core/planner.c" line="870"/>
+        <source>Warning:</source>
+        <translation>Waarschuwing:</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="568"/>
-        <source>Decompression calculation aborted due to excessive time</source>
-        <translation>Decompressieberekeningen gestopt omdat ze te lang duren</translation>
+        <location filename="../core/planner.c" line="581"/>
+        <source>based on Bühlmann ZHL-16C with GFlow = %d and GFhigh = %d</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="586"/>
+        <source>based on VPM-B at nominal conservatism</source>
+        <translation>Gebaseerd op VPM-B met nominaal conservatisme</translation>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="588"/>
+        <source>based on VPM-B at +%d conservatism</source>
+        <translation>Gebaseerd op VPM-B met +%d conservatisme</translation>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="590"/>
+        <source>, effective GF=%d/%d</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="594"/>
+        <source>recreational mode based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source>
+        <translation>recreatieve mode gebaseerd op Bühlmann ZHL-16B met GFlow = %d en GFhigh = %d</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="592"/>
+        <location filename="../core/planner.c" line="598"/>
         <source>Subsurface dive plan</source>
         <translation>Subsurface duikplan</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="596"/>
-        <source>depth</source>
-        <translation>diepte</translation>
+        <location filename="../core/planner.c" line="599"/>
+        <source>&lt;div&gt;Runtime: %dmin&lt;/div&gt;&lt;br&gt;</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="602"/>
-        <source>runtime</source>
-        <translation>runtime</translation>
+        <location filename="../core/planner.c" line="604"/>
+        <source>depth</source>
+        <translation>diepte</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="599"/>
+        <location filename="../core/planner.c" line="607"/>
         <source>duration</source>
         <translation>duur</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="554"/>
-        <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE %s ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source>
-        <translation>DISCLAIMER/WAARSCHUWING. DIT IS EEN NIEUWE IMPLEMENTATIE VAN HET %1 ALGORITME EN EEN DAAROP GEBASEERDE DUIK PLANNER IMPLEMENTATIE. DEZE IMPLEMENTATIE IS BEPERKT GETEST, EN WIJ RADEN STERK AF DUIKEN TE PLANNEN MET UITSLUITEND DE HIER GEPRESENTEERDE RESULTATEN.</translation>
+        <location filename="../core/planner.c" line="610"/>
+        <source>runtime</source>
+        <translation>runtime</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="605"/>
+        <location filename="../core/planner.c" line="613"/>
         <source>gas</source>
         <translation>gas</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="648"/>
+        <location filename="../core/planner.c" line="656"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation>Ga naar %.*f %s in %d:%02d min - runtime %d:%02u op %s (SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="656"/>
+        <location filename="../core/planner.c" line="664"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source>
         <translation>Ga naar %.*f %s in %d:%02d min - runtime %d:%02u op %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="669"/>
+        <location filename="../core/planner.c" line="677"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation>Blijf op %.*f %s gedurende %d:%02d min - runtime %d:%02u op %s (SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="676"/>
+        <location filename="../core/planner.c" line="684"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source>
         <translation>Blijf op %.*f %s gedurende %d:%02d min - runtime %d:%02u op %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="721"/>
+        <location filename="../core/planner.c" line="729"/>
         <source>%3.0f%s</source>
         <translation>%3.0f%s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="724"/>
-        <location filename="../core/planner.c" line="728"/>
+        <location filename="../core/planner.c" line="732"/>
+        <location filename="../core/planner.c" line="736"/>
         <source>%3dmin</source>
         <translation>%3dmin</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="737"/>
-        <location filename="../core/planner.c" line="749"/>
+        <location filename="../core/planner.c" line="745"/>
+        <location filename="../core/planner.c" line="757"/>
         <source>(SP = %.1fbar)</source>
         <translation>(SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="772"/>
+        <location filename="../core/planner.c" line="780"/>
         <source>Switch gas to %s (SP = %.1fbar)</source>
         <translation>Gaswissel naar %s (SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="774"/>
+        <location filename="../core/planner.c" line="782"/>
         <source>Switch gas to %s</source>
         <translation>Gaswissel naar %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="793"/>
+        <location filename="../core/planner.c" line="801"/>
         <source>CNS</source>
         <translation>CNS</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="795"/>
+        <location filename="../core/planner.c" line="803"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="799"/>
+        <location filename="../core/planner.c" line="807"/>
         <source>Gas consumption (CCR legs excluded):</source>
         <translation>Gasverbruik (uitgezonderd CCR segmenten):</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="801"/>
+        <location filename="../core/planner.c" line="809"/>
         <source>Gas consumption:</source>
         <translation>Gasverbruik:</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="570"/>
-        <location filename="../core/planner.c" line="821"/>
-        <location filename="../core/planner.c" line="826"/>
-        <location filename="../core/planner.c" line="851"/>
-        <location filename="../core/planner.c" line="861"/>
-        <source>Warning:</source>
-        <translation>Waarschuwing:</translation>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="580"/>
-        <source>based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source>
-        <translation>gebaseerd op Bühlmann ZHL-16B met GFlow = %d en GFhigh = %d</translation>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="584"/>
-        <source>based on VPM-B at nominal conservatism</source>
-        <translation>Gebaseerd op VPM-B met nominaal conservatisme</translation>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="586"/>
-        <source>based on VPM-B at +%d conservatism</source>
-        <translation>Gebaseerd op VPM-B met +%d conservatisme</translation>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="588"/>
-        <source>recreational mode based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source>
-        <translation>recreatieve mode gebaseerd op Bühlmann ZHL-16B met GFlow = %d en GFhigh = %d</translation>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="822"/>
+        <location filename="../core/planner.c" line="830"/>
         <source>this is more gas than available in the specified cylinder!</source>
         <translation>dit is meer gas dan beschikbaar in de geselecteerde duikfles!</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="827"/>
+        <location filename="../core/planner.c" line="835"/>
         <source>not enough reserve for gas sharing on ascent!</source>
         <translation>niet genoeg reserve om gas te delen gedurende opstijging!</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="829"/>
+        <location filename="../core/planner.c" line="837"/>
         <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source>
         <translation>%.0f%s/%.0f%s van %s (%.0f%s/%.0f%s in geplande opstijging)</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="831"/>
+        <location filename="../core/planner.c" line="839"/>
         <source>%.0f%s (%.0f%s during planned ascent) of %s</source>
         <translation>%.0f%s (%.0f%s gedurende geplande opstijging) van %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="848"/>
+        <location filename="../core/planner.c" line="857"/>
         <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
         <translation>hoge pO₂ waarde %.2f op %d:%02u met gas %s op diepte %.*f %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="858"/>
+        <location filename="../core/planner.c" line="867"/>
         <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
         <translation>lage pO₂ waarde %.2f op %d:%02u met gas %s op diepte %.*f %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="1419"/>
+        <location filename="../core/planner.c" line="1194"/>
+        <source>Can&apos;t find gas %s</source>
+        <translation>Gas %s kan niet gevonden worden</translation>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="1440"/>
         <source>ean</source>
         <translation>EAN</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1280"/>
+        <location filename="../core/profile.c" line="1298"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
@@ -9350,70 +9787,70 @@ D: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1283"/>
+        <location filename="../core/profile.c" line="1301"/>
         <source>P: %d%s
 </source>
         <translation>P: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1287"/>
+        <location filename="../core/profile.c" line="1305"/>
         <source>T: %.1f%s
 </source>
         <translation>T: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1293"/>
+        <location filename="../core/profile.c" line="1311"/>
         <source>V: %.1f%s
 </source>
         <translation>V: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1296"/>
+        <location filename="../core/profile.c" line="1314"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation>SAC: %.*f%s/min
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1298"/>
+        <location filename="../core/profile.c" line="1316"/>
         <source>CNS: %u%%
 </source>
         <translation>CNS: %u%%
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1300"/>
+        <location filename="../core/profile.c" line="1318"/>
         <source>pO%s: %.2fbar
 </source>
         <translation>pO%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1302"/>
+        <location filename="../core/profile.c" line="1320"/>
         <source>pN%s: %.2fbar
 </source>
         <translation>pN%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1304"/>
+        <location filename="../core/profile.c" line="1322"/>
         <source>pHe: %.2fbar
 </source>
         <translation>pHe: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1307"/>
+        <location filename="../core/profile.c" line="1325"/>
         <source>MOD: %d%s
 </source>
         <translation>MOD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1314"/>
+        <location filename="../core/profile.c" line="1332"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
@@ -9422,7 +9859,7 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1318"/>
+        <location filename="../core/profile.c" line="1336"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
@@ -9431,174 +9868,179 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1331"/>
+        <location filename="../core/profile.c" line="1349"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation>Veiligheidsstop: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1334"/>
+        <location filename="../core/profile.c" line="1352"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation>Veiligheidsstop: onbek tijd @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1339"/>
+        <location filename="../core/profile.c" line="1357"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation>Deco: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1342"/>
+        <location filename="../core/profile.c" line="1360"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation>Deco: onbek tijd @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1346"/>
+        <location filename="../core/profile.c" line="1364"/>
         <source>In deco
 </source>
         <translation>In deco
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1348"/>
+        <location filename="../core/profile.c" line="1366"/>
         <source>NDL: %umin
 </source>
         <translation>NDL: %umin
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1351"/>
+        <location filename="../core/profile.c" line="1369"/>
         <source>TTS: %umin
 </source>
         <translation>TTS: %umin
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1354"/>
+        <location filename="../core/profile.c" line="1372"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation>Deco: %umin @ %.0f%s (berekend)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1362"/>
+        <location filename="../core/profile.c" line="1380"/>
         <source>In deco (calc)
 </source>
         <translation>In deco (berekend)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1365"/>
+        <location filename="../core/profile.c" line="1383"/>
         <source>NDL: %umin (calc)
 </source>
         <translation>NDL: %umin (berekend)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1367"/>
+        <location filename="../core/profile.c" line="1385"/>
         <source>NDL: &gt;2h (calc)
 </source>
         <translation>NDL: &gt;2h (berekend)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1371"/>
+        <location filename="../core/profile.c" line="1389"/>
         <source>TTS: %umin (calc)
 </source>
         <translation>TTS: %umin (berekend)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1373"/>
+        <location filename="../core/profile.c" line="1391"/>
         <source>TTS: &gt;2h (calc)
 </source>
         <translation>TTS: &gt;2h (berekend)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1376"/>
+        <location filename="../core/profile.c" line="1394"/>
         <source>RBT: %umin
 </source>
         <translation>RBT: %umin
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1379"/>
+        <location filename="../core/profile.c" line="1397"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation>Berekend plafond %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1385"/>
+        <location filename="../core/profile.c" line="1403"/>
         <source>Tissue %.0fmin: %.1f%s
 </source>
         <translation>Compartiment %.0fmin: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1391"/>
+        <location filename="../core/profile.c" line="1409"/>
         <source>heartbeat: %d
 </source>
         <translation>hartslag: %d
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1393"/>
+        <location filename="../core/profile.c" line="1411"/>
         <source>bearing: %d
 </source>
         <translation>koers: %d
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1396"/>
+        <location filename="../core/profile.c" line="1414"/>
         <source>mean depth to here %.1f%s
 </source>
         <translation>gemiddelde diepte tot nu toe %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1491"/>
+        <location filename="../core/profile.c" line="1515"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1495"/>
-        <location filename="../core/profile.c" line="1499"/>
-        <location filename="../core/profile.c" line="1503"/>
+        <location filename="../core/profile.c" line="1519"/>
+        <location filename="../core/profile.c" line="1523"/>
+        <location filename="../core/profile.c" line="1527"/>
         <source>%s %sD:%.1f%s</source>
         <translation>%s %sD:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1507"/>
+        <location filename="../core/profile.c" line="1531"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sD:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1511"/>
+        <location filename="../core/profile.c" line="1535"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1515"/>
-        <location filename="../core/profile.c" line="1519"/>
+        <location filename="../core/profile.c" line="1539"/>
+        <location filename="../core/profile.c" line="1543"/>
         <source>%s %sV:%.2f%s</source>
         <translation>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1526"/>
+        <location filename="../core/profile.c" line="1550"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s</translation>
     </message>
     <message>
+        <location filename="../core/profile.c" line="1575"/>
+        <source>%s SAC:%.*f %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../core/qthelper.cpp" line="67"/>
         <source>%1km</source>
         <translation>%1km</translation>
@@ -9619,446 +10061,460 @@ EADD: %d%s
         <translation>%1yd</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="635"/>
+        <location filename="../core/qthelper.cpp" line="91"/>
+        <location filename="../core/qthelper.cpp" line="226"/>
+        <source>N</source>
+        <translation>N</translation>
+    </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="91"/>
+        <location filename="../core/qthelper.cpp" line="227"/>
+        <source>S</source>
+        <translation>Z</translation>
+    </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="92"/>
+        <location filename="../core/qthelper.cpp" line="228"/>
+        <source>E</source>
+        <translation>O</translation>
+    </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="92"/>
+        <location filename="../core/qthelper.cpp" line="229"/>
+        <source>W</source>
+        <translation>W</translation>
+    </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="640"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="638"/>
+        <location filename="../core/qthelper.cpp" line="643"/>
         <source>F</source>
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="23"/>
-        <source>boat</source>
-        <translation>boot</translation>
+        <location filename="../core/save-html.c" line="469"/>
+        <location filename="../core/save-html.c" line="553"/>
+        <location filename="../core/worldmap-save.c" line="111"/>
+        <source>Can&apos;t open file %s</source>
+        <translation>Kan het bestand %s niet openen</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="23"/>
-        <source>shore</source>
-        <translation>kust</translation>
+        <location filename="../core/save-html.c" line="488"/>
+        <source>Number</source>
+        <translation>Nummer</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="459"/>
-        <location filename="../core/dive.c" line="23"/>
-        <source>drift</source>
-        <translation>drift</translation>
+        <location filename="../core/save-html.c" line="489"/>
+        <source>Date</source>
+        <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="24"/>
-        <source>deep</source>
-        <translation>diep</translation>
+        <location filename="../core/save-html.c" line="490"/>
+        <source>Time</source>
+        <translation>Tijd</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="24"/>
-        <source>cavern</source>
-        <translation>spelonk</translation>
+        <location filename="../core/save-html.c" line="491"/>
+        <source>Location</source>
+        <translation>Locatie</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="443"/>
-        <location filename="../core/dive.c" line="24"/>
-        <source>ice</source>
-        <translation>ijs</translation>
+        <location filename="../core/save-html.c" line="492"/>
+        <source>Air temp.</source>
+        <translation>Lucht temp.</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="445"/>
-        <source>search</source>
-        <translation>zoeken</translation>
+        <location filename="../core/save-html.c" line="493"/>
+        <source>Water temp.</source>
+        <translation>Water temp.</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="455"/>
-        <location filename="../core/dive.c" line="25"/>
-        <source>wreck</source>
-        <translation>wrak</translation>
+        <location filename="../core/save-html.c" line="494"/>
+        <source>Dives</source>
+        <translation>Duiken</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="441"/>
-        <location filename="../core/dive.c" line="25"/>
-        <source>cave</source>
-        <translation>grot</translation>
+        <location filename="../core/save-html.c" line="495"/>
+        <source>Expand all</source>
+        <translation>Alles uitklappen</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="25"/>
-        <source>altitude</source>
-        <translation>hoogte</translation>
+        <location filename="../core/save-html.c" line="496"/>
+        <source>Collapse all</source>
+        <translation>Alles inklappen</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="26"/>
-        <source>pool</source>
-        <translation>zwembad</translation>
+        <location filename="../core/save-html.c" line="497"/>
+        <source>Trips</source>
+        <translation>Trips</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="26"/>
-        <source>lake</source>
-        <translation>meer</translation>
+        <location filename="../core/save-html.c" line="498"/>
+        <source>Statistics</source>
+        <translation>Statistieken</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="457"/>
-        <location filename="../core/dive.c" line="26"/>
-        <source>river</source>
-        <translation>rivier</translation>
+        <location filename="../core/save-html.c" line="499"/>
+        <source>Advanced search</source>
+        <translation>Geavanceerd zoeken</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="439"/>
-        <location filename="../core/dive.c" line="27"/>
-        <source>night</source>
-        <translation>nacht</translation>
+        <location filename="../core/save-html.c" line="502"/>
+        <source>Rating</source>
+        <translation>Waardering</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="153"/>
-        <source>Error: the file does not appear to be a DATATRAK divelog</source>
-        <translation>Fout: het bestand lijkt geen DATATRAK divelog bestand</translation>
+        <location filename="../core/save-html.c" line="503"/>
+        <source>Visibility</source>
+        <translation>Zicht</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="286"/>
-        <source>clear</source>
-        <translation>helder</translation>
+        <location filename="../core/save-html.c" line="504"/>
+        <source>Duration</source>
+        <translation>Duur</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="289"/>
-        <source>misty</source>
-        <translation>heiig</translation>
+        <location filename="../core/save-html.c" line="505"/>
+        <source>Divemaster</source>
+        <translation>Duikleider</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="292"/>
-        <source>fog</source>
-        <translation>mist</translation>
+        <location filename="../core/save-html.c" line="506"/>
+        <source>Buddy</source>
+        <translation>Buddy</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="295"/>
-        <source>rain</source>
-        <translation>regen</translation>
+        <location filename="../core/save-html.c" line="507"/>
+        <source>Suit</source>
+        <translation>Pak</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="298"/>
-        <source>storm</source>
-        <translation>storm</translation>
+        <location filename="../core/save-html.c" line="508"/>
+        <source>Tags</source>
+        <translation>Trefwoorden</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="301"/>
-        <source>snow</source>
-        <translation>sneeuw</translation>
+        <location filename="../core/save-html.c" line="509"/>
+        <location filename="../smtk-import/smartrak.c" line="251"/>
+        <location filename="../smtk-import/smartrak.c" line="321"/>
+        <source>Notes</source>
+        <translation>Notities</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="321"/>
-        <source>No suit</source>
-        <translation>Geen pak</translation>
+        <location filename="../core/save-html.c" line="510"/>
+        <source>Show more details</source>
+        <translation>Toon meer details</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="324"/>
-        <source>Shorty</source>
-        <translation>Shorty</translation>
+        <location filename="../core/save-html.c" line="513"/>
+        <source>Yearly statistics</source>
+        <translation>Jaarlijkse statistieken</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="327"/>
-        <source>Combi</source>
-        <translation>Combinatie natpak</translation>
+        <location filename="../core/save-html.c" line="514"/>
+        <source>Year</source>
+        <translation>Jaar</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="330"/>
-        <source>Wet suit</source>
-        <translation>Natpak</translation>
+        <location filename="../core/save-html.c" line="515"/>
+        <source>Total time</source>
+        <translation>Totale tijd</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="333"/>
-        <source>Semidry suit</source>
-        <translation>Semi-natpak</translation>
+        <location filename="../core/save-html.c" line="516"/>
+        <source>Average time</source>
+        <translation>Gemiddelde tijd</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="336"/>
-        <source>Dry suit</source>
-        <translation>Droogpak</translation>
+        <location filename="../core/save-html.c" line="517"/>
+        <source>Shortest time</source>
+        <translation>Kortste tijd</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="396"/>
-        <source>no stop</source>
-        <translation>geen stop</translation>
+        <location filename="../core/save-html.c" line="518"/>
+        <source>Longest time</source>
+        <translation>Langste tijd</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="400"/>
-        <source>single ascent</source>
-        <translation>enkele opstijging</translation>
+        <location filename="../core/save-html.c" line="519"/>
+        <source>Average depth</source>
+        <translation>Gemiddelde diepte</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="402"/>
-        <source>multiple ascent</source>
-        <translation>meerdere opstijgingen</translation>
+        <location filename="../core/save-html.c" line="520"/>
+        <source>Min. depth</source>
+        <translation>Min. diepte</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="404"/>
-        <location filename="../core/dive.c" line="27"/>
-        <source>fresh</source>
-        <translation>zoet</translation>
+        <location filename="../core/save-html.c" line="521"/>
+        <source>Max. depth</source>
+        <translation>Max. diepte</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="406"/>
-        <source>salt water</source>
-        <translation>zout water</translation>
+        <location filename="../core/save-html.c" line="522"/>
+        <source>Average SAC</source>
+        <translation>Gemiddeld gasverbruik</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="431"/>
-        <source>sight seeing</source>
-        <translation>rondkijken</translation>
+        <location filename="../core/save-html.c" line="523"/>
+        <source>Min. SAC</source>
+        <translation>Min. SAC</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="433"/>
-        <source>club dive</source>
-        <translation>club duik</translation>
+        <location filename="../core/save-html.c" line="524"/>
+        <source>Max. SAC</source>
+        <translation>Max. SAC</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="437"/>
-        <source>instruction</source>
-        <translation>instructie</translation>
+        <location filename="../core/save-html.c" line="525"/>
+        <source>Average temp.</source>
+        <translation>Gemiddelde temp.</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="463"/>
-        <source>other</source>
-        <translation>andere</translation>
+        <location filename="../core/save-html.c" line="526"/>
+        <source>Min. temp.</source>
+        <translation>Min. temp.</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="474"/>
-        <source>Other activities</source>
-        <translation>Andere activiteiten</translation>
+        <location filename="../core/save-html.c" line="527"/>
+        <source>Max. temp.</source>
+        <translation>Max. temp.</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="498"/>
-        <source>Datatrak/Wlog notes</source>
-        <translation>Datatrak/Wlog notities</translation>
+        <location filename="../core/save-html.c" line="528"/>
+        <source>Back to list</source>
+        <translation>Terugkeren naar de lijst</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="537"/>
-        <source>Manually entered dive</source>
-        <translation>Handmatig toegevoegde duik</translation>
+        <location filename="../core/save-html.c" line="531"/>
+        <source>Dive No.</source>
+        <translation>Duik nr.</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="588"/>
-        <source>Unknown</source>
-        <translation>Onbekend</translation>
+        <location filename="../core/save-html.c" line="532"/>
+        <source>Dive profile</source>
+        <translation>Duikprofiel</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="674"/>
-        <source>Error: couldn&apos;t open the file %s</source>
-        <translation>Kan het bestand %s niet openen</translation>
+        <location filename="../core/save-html.c" line="533"/>
+        <source>Dive information</source>
+        <translation>Duikinformatie</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="687"/>
-        <source>Error: no dive</source>
-        <translation>Fout: geen duik</translation>
+        <location filename="../core/save-html.c" line="534"/>
+        <source>Dive equipment</source>
+        <translation>Duikuitrusting</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="27"/>
-        <source>student</source>
-        <translation>student</translation>
+        <location filename="../core/save-html.c" line="535"/>
+        <location filename="../core/save-html.c" line="542"/>
+        <source>Type</source>
+        <translation>Type</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="461"/>
-        <location filename="../core/dive.c" line="28"/>
-        <source>photo</source>
-        <translation>foto</translation>
+        <location filename="../core/save-html.c" line="536"/>
+        <source>Size</source>
+        <translation>Grootte</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="28"/>
-        <source>video</source>
-        <translation>video</translation>
+        <location filename="../core/save-html.c" line="537"/>
+        <source>Work pressure</source>
+        <translation>Werkdruk</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="435"/>
-        <location filename="../core/dive.c" line="28"/>
-        <source>instructor</source>
-        <translation>instructeur</translation>
+        <location filename="../core/save-html.c" line="538"/>
+        <source>Start pressure</source>
+        <translation>Startdruk</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="398"/>
-        <location filename="../core/dive.c" line="29"/>
-        <source>deco</source>
-        <translation>decompressie</translation>
+        <location filename="../core/save-html.c" line="539"/>
+        <source>End pressure</source>
+        <translation>Einddruk</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="33"/>
-        <source>OC-gas</source>
-        <translation>OC-gas</translation>
+        <location filename="../core/save-html.c" line="540"/>
+        <source>Gas</source>
+        <translation>Gas</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="33"/>
-        <source>diluent</source>
-        <translation>diluent</translation>
+        <location filename="../core/save-html.c" line="541"/>
+        <source>Weight</source>
+        <translation>Gewicht</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="33"/>
-        <location filename="../core/equipment.c" line="88"/>
-        <location filename="../core/planner.c" line="1415"/>
-        <location filename="../core/planner.c" line="1418"/>
-        <source>oxygen</source>
-        <translation>zuurstof</translation>
+        <location filename="../core/save-html.c" line="543"/>
+        <source>Events</source>
+        <translation>Gebeurtenissen</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="227"/>
-        <source>ℓ</source>
-        <translation>ℓ</translation>
+        <location filename="../core/save-html.c" line="544"/>
+        <source>Name</source>
+        <translation>Naam</translation>
+    </message>
+    <message>
+        <location filename="../core/save-html.c" line="545"/>
+        <source>Value</source>
+        <translation>Waarde</translation>
+    </message>
+    <message>
+        <location filename="../core/save-html.c" line="546"/>
+        <source>Coordinates</source>
+        <translation>Coördinaten</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="239"/>
+        <location filename="../core/save-html.c" line="547"/>
+        <source>Dive status</source>
+        <translation>Duikstatus</translation>
+    </message>
+    <message>
+        <location filename="../core/statistics.c" line="242"/>
         <source>more than %d days</source>
         <translation>meer dan %d dagen</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="246"/>
+        <location filename="../core/statistics.c" line="249"/>
         <source>%dd %dh %dmin</source>
         <translation>%dd %du %dmin</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="249"/>
+        <location filename="../core/statistics.c" line="252"/>
         <source>%dmin %dsecs</source>
         <translation>%dmin %dsecs</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="251"/>
+        <location filename="../core/statistics.c" line="254"/>
         <source>%dh %dmin</source>
         <translation>%du %dmin</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="263"/>
+        <location filename="../core/statistics.c" line="266"/>
         <source>for dives #</source>
         <translation>voor duik nr.</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="269"/>
+        <location filename="../core/statistics.c" line="272"/>
         <source>for selected dives</source>
         <translation>voor de geselecteerde duiken</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="304"/>
+        <location filename="../core/statistics.c" line="307"/>
         <source>for dive #%d</source>
         <translation>Voor duik nr. %d</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="306"/>
+        <location filename="../core/statistics.c" line="309"/>
         <source>for selected dive</source>
         <translation>voor de geselecteerde duik</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="308"/>
+        <location filename="../core/statistics.c" line="311"/>
         <source>for all dives</source>
         <translation>voor alle duiken</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="310"/>
+        <location filename="../core/statistics.c" line="313"/>
         <source>(no dives)</source>
         <translation>(geen duiken)</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Sun</source>
         <translation>Zo</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Mon</source>
         <translation>Ma</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Tue</source>
         <translation>Di</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Wed</source>
         <translation>Wo</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Thu</source>
         <translation>Do</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Fri</source>
         <translation>Vr</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Sat</source>
         <translation>Za</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Jan</source>
         <translation>jan</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Feb</source>
         <translation>feb</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Mar</source>
         <translation>mar</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Apr</source>
         <translation>apr</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>May</source>
         <translation>mei</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Jun</source>
         <translation>jun</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Jul</source>
         <translation>jul</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Aug</source>
         <translation>aug</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Sep</source>
         <translation>sept</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Oct</source>
         <translation>okt</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Nov</source>
         <translation>nov</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Dec</source>
         <translation>dec</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="191"/>
-        <location filename="../core/parse-xml.c" line="3284"/>
-        <location filename="../core/uemis-downloader.c" line="134"/>
-        <source>unknown</source>
-        <translation>onbekend</translation>
-    </message>
-    <message>
-        <location filename="../core/uemis-downloader.c" line="467"/>
-        <source>data</source>
-        <translation>gegevens</translation>
-    </message>
-    <message>
-        <location filename="../core/uemis-downloader.c" line="447"/>
-        <source>%s %s</source>
-        <translation>%s %s</translation>
-    </message>
-    <message>
         <location filename="../core/uemis-downloader.c" line="27"/>
         <source>Uemis Zurich: the file system is almost full.
 Disconnect/reconnect the dive computer
@@ -10089,6 +10545,16 @@ Is de Uemis Zurich correct aangesloten?</translation>
         <translation>Geen duiken te laden</translation>
     </message>
     <message>
+        <location filename="../core/uemis-downloader.c" line="447"/>
+        <source>%s %s</source>
+        <translation>%s %s</translation>
+    </message>
+    <message>
+        <location filename="../core/uemis-downloader.c" line="467"/>
+        <source>data</source>
+        <translation>gegevens</translation>
+    </message>
+    <message>
         <location filename="../core/uemis-downloader.c" line="495"/>
         <source>divelog #</source>
         <translation>duiklog #</translation>
@@ -10259,281 +10725,6 @@ Is de Uemis Zurich correct aangesloten?</translation>
         <translation>Alarm: lege batterij</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="469"/>
-        <location filename="../core/save-html.c" line="553"/>
-        <location filename="../core/worldmap-save.c" line="111"/>
-        <source>Can&apos;t open file %s</source>
-        <translation>Kan het bestand %s niet openen</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="488"/>
-        <source>Number</source>
-        <translation>Nummer</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="489"/>
-        <source>Date</source>
-        <translation>Datum</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="490"/>
-        <source>Time</source>
-        <translation>Tijd</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="491"/>
-        <source>Location</source>
-        <translation>Locatie</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="492"/>
-        <source>Air temp.</source>
-        <translation>Lucht temp.</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="493"/>
-        <source>Water temp.</source>
-        <translation>Water temp.</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="498"/>
-        <source>Statistics</source>
-        <translation>Statistieken</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="502"/>
-        <source>Rating</source>
-        <translation>Waardering</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="503"/>
-        <source>Visibility</source>
-        <translation>Zicht</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="504"/>
-        <source>Duration</source>
-        <translation>Duur</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="494"/>
-        <source>Dives</source>
-        <translation>Duiken</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="495"/>
-        <source>Expand all</source>
-        <translation>Alles uitklappen</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="496"/>
-        <source>Collapse all</source>
-        <translation>Alles inklappen</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="497"/>
-        <source>Trips</source>
-        <translation>Trips</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="499"/>
-        <source>Advanced search</source>
-        <translation>Geavanceerd zoeken</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="505"/>
-        <source>Divemaster</source>
-        <translation>Duikleider</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="506"/>
-        <source>Buddy</source>
-        <translation>Buddy</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="507"/>
-        <source>Suit</source>
-        <translation>Pak</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="508"/>
-        <source>Tags</source>
-        <translation>Trefwoorden</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="509"/>
-        <location filename="../smtk-import/smartrak.c" line="251"/>
-        <location filename="../smtk-import/smartrak.c" line="321"/>
-        <source>Notes</source>
-        <translation>Notities</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="510"/>
-        <source>Show more details</source>
-        <translation>Toon meer details</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="513"/>
-        <source>Yearly statistics</source>
-        <translation>Jaarlijkse statistieken</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="514"/>
-        <source>Year</source>
-        <translation>Jaar</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="515"/>
-        <source>Total time</source>
-        <translation>Totale tijd</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="516"/>
-        <source>Average time</source>
-        <translation>Gemiddelde tijd</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="517"/>
-        <source>Shortest time</source>
-        <translation>Kortste tijd</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="518"/>
-        <source>Longest time</source>
-        <translation>Langste tijd</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="519"/>
-        <source>Average depth</source>
-        <translation>Gemiddelde diepte</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="520"/>
-        <source>Min. depth</source>
-        <translation>Min. diepte</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="521"/>
-        <source>Max. depth</source>
-        <translation>Max. diepte</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="523"/>
-        <source>Min. SAC</source>
-        <translation>Min. SAC</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="524"/>
-        <source>Max. SAC</source>
-        <translation>Max. SAC</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="525"/>
-        <source>Average temp.</source>
-        <translation>Gemiddelde temp.</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="526"/>
-        <source>Min. temp.</source>
-        <translation>Min. temp.</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="527"/>
-        <source>Max. temp.</source>
-        <translation>Max. temp.</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="528"/>
-        <source>Back to list</source>
-        <translation>Terugkeren naar de lijst</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="534"/>
-        <source>Dive equipment</source>
-        <translation>Duikuitrusting</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="537"/>
-        <source>Work pressure</source>
-        <translation>Werkdruk</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="538"/>
-        <source>Start pressure</source>
-        <translation>Startdruk</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="539"/>
-        <source>End pressure</source>
-        <translation>Einddruk</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="547"/>
-        <source>Dive status</source>
-        <translation>Duikstatus</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="522"/>
-        <source>Average SAC</source>
-        <translation>Gemiddeld gasverbruik</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="531"/>
-        <source>Dive No.</source>
-        <translation>Duik nr.</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="532"/>
-        <source>Dive profile</source>
-        <translation>Duikprofiel</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="533"/>
-        <source>Dive information</source>
-        <translation>Duikinformatie</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="535"/>
-        <location filename="../core/save-html.c" line="542"/>
-        <source>Type</source>
-        <translation>Type</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="536"/>
-        <source>Size</source>
-        <translation>Grootte</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="540"/>
-        <source>Gas</source>
-        <translation>Gas</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="541"/>
-        <source>Weight</source>
-        <translation>Gewicht</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="543"/>
-        <source>Events</source>
-        <translation>Gebeurtenissen</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="544"/>
-        <source>Name</source>
-        <translation>Naam</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="545"/>
-        <source>Value</source>
-        <translation>Waarde</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="546"/>
-        <source>Coordinates</source>
-        <translation>Coördinaten</translation>
-    </message>
-    <message>
         <location filename="../core/worldmap-save.c" line="39"/>
         <source>Date:</source>
         <translation>Datum:</translation>
@@ -10579,110 +10770,6 @@ Is de Uemis Zurich correct aangesloten?</translation>
         <translation>Notities:</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="91"/>
-        <location filename="../core/qthelper.cpp" line="226"/>
-        <source>N</source>
-        <translation>N</translation>
-    </message>
-    <message>
-        <location filename="../core/qthelper.cpp" line="91"/>
-        <location filename="../core/qthelper.cpp" line="227"/>
-        <source>S</source>
-        <translation>Z</translation>
-    </message>
-    <message>
-        <location filename="../core/qthelper.cpp" line="92"/>
-        <location filename="../core/qthelper.cpp" line="228"/>
-        <source>E</source>
-        <translation>O</translation>
-    </message>
-    <message>
-        <location filename="../core/qthelper.cpp" line="92"/>
-        <location filename="../core/qthelper.cpp" line="229"/>
-        <source>W</source>
-        <translation>W</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="341"/>
-        <source>Remote storage and local data diverged. Error: merge failed (%s)</source>
-        <translation>Cloud en lokale data verschillen teveel. Fout: samenvoegen gefaald (%s)</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="134"/>
-        <source>Local cache directory %s corrupted - can&apos;t sync with Subsurface cloud storage</source>
-        <translation>Lokale cache directorie %s is corrupt - kan niet synchoniseren met de Subsurface cloud opslag</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="157"/>
-        <location filename="../core/git-access.c" line="177"/>
-        <source>Could not update local cache to newer remote data</source>
-        <translation>Kan de lokale cache niet aanpassen naar nieuwere data in de Sursurface cloud</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="170"/>
-        <source>Subsurface cloud storage corrupted</source>
-        <translation>Subsurface cloud opslag corrupt</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="285"/>
-        <source>Could not update Subsurface cloud storage, try again later</source>
-        <translation>Kan de Subsurface cloud opslag niet actualiseren, probeer later opnieuw</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="371"/>
-        <source>Remote storage and local data diverged. Cannot combine local and remote changes</source>
-        <translation>Cloud en lokale data verschillen teveel. Kan de verschillen niet samenvoegen</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="405"/>
-        <source>Remote storage and local data diverged</source>
-        <translation>Cloud en lokale data verschillen teveel.</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="408"/>
-        <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source>
-        <translation>Cloud en lokale data verschillen teveel. Fout: wegschrijven data gefaald (%s)</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="417"/>
-        <source>Problems with local cache of Subsurface cloud data</source>
-        <translation>Problemen met lokale cache van de Subsurface cloud data</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="418"/>
-        <source>Moved cache data to %s. Please try the operation again.</source>
-        <translation>Verplaatste cache data naar %s. Probeer de operatie opnieuw.</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="737"/>
-        <source>Error connecting to Subsurface cloud storage</source>
-        <translation>Kan niet verbinden met de Subsurface cloud opslag</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="740"/>
-        <source>git clone of %s failed (%s)</source>
-        <translation>git clone van %s gefaald (%s)</translation>
-    </message>
-    <message>
-        <location filename="../core/load-git.c" line="222"/>
-        <location filename="../core/parse-xml.c" line="1300"/>
-        <source>additional name for site: %s
-</source>
-        <translation>extra naam voor duikstek: %s
-</translation>
-    </message>
-    <message>
-        <location filename="../core/ostctools.c" line="120"/>
-        <location filename="../core/ostctools.c" line="152"/>
-        <source>Unknown DC in dive %d</source>
-        <translation>Onbekende duikcomputer in duik %d</translation>
-    </message>
-    <message>
-        <location filename="../core/ostctools.c" line="165"/>
-        <source>Error - %s - parsing dive %d</source>
-        <translation>Fout - %s - verwerking duik %d</translation>
-    </message>
-    <message>
         <location filename="../smtk-import/smartrak.c" line="247"/>
         <source>Built</source>
         <translation>Gebouwd</translation>
@@ -10766,154 +10853,119 @@ Is de Uemis Zurich correct aangesloten?</translation>
         <translation>Subsurface-mobile</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="91"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="103"/>
         <source>Subsurface</source>
         <translation>Subsurface</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="97"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="110"/>
         <source>Dive list</source>
         <translation>Duiklijst</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="112"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="125"/>
         <source>Cloud credentials</source>
         <translation>Cloud rechten</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="126"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="139"/>
         <source>Manage dives</source>
-        <translation type="unfinished"/>
+        <translation>Beheer duiken</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="138"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="141"/>
         <source>Add dive manually</source>
-        <translation type="unfinished"/>
+        <translation>Handmatig duik toevoegen</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="146"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="149"/>
         <source>Manual sync with cloud</source>
         <translation>Handmatig synchroniseren met cloud</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="164"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="167"/>
         <source>Offline mode</source>
-        <translation type="unfinished"/>
+        <translation>Lokale mode</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="164"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="167"/>
         <source>Enable auto cloud sync</source>
         <translation>Automatische cloud synchronisatie aanzetten </translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="182"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="187"/>
         <source>GPS</source>
         <translation>GPS</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="185"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="190"/>
         <source>GPS-tag dives</source>
-        <translation type="unfinished"/>
+        <translation>GPS-markeer duiken</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="192"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="197"/>
         <source>Upload GPS data</source>
-        <translation type="unfinished"/>
+        <translation>GPS data opladen</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="199"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="204"/>
         <source>Download GPS data</source>
-        <translation type="unfinished"/>
+        <translation>GPS data downloaden</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="206"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="211"/>
         <source>Show GPS fixes</source>
-        <translation type="unfinished"/>
+        <translation>Toon GPS fixes</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="215"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="220"/>
         <source>Clear GPS cache</source>
-        <translation type="unfinished"/>
+        <translation>Maak GPS cache leeg</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="221"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="226"/>
         <source>Preferences</source>
         <translation>Instellingen</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="230"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="237"/>
         <source>Developer</source>
         <translation>Ontwikkelaar</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="232"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="239"/>
         <source>App log</source>
         <translation>App log</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="239"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="246"/>
         <source>Theme information</source>
-        <translation type="unfinished"/>
+        <translation>Thema informatie</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="246"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="253"/>
         <source>User manual</source>
         <translation>Handleiding</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="252"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="259"/>
         <source>About</source>
         <translation>Over</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="283"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="304"/>
         <source>Run location service</source>
-        <translation type="unfinished"/>
+        <translation>Draai locatie service</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="283"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="304"/>
         <source>No GPS source available</source>
-        <translation type="unfinished"/>
+        <translation>Geen GPS bron beschikbaar</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="295"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="316"/>
         <source>Actions</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="9"/>
-        <source>Hello World</source>
-        <translation>Hallo Wereld</translation>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="13"/>
-        <source>File</source>
-        <translation>Bestand</translation>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="15"/>
-        <source>&amp;Open</source>
-        <translation>&amp;Open</translation>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="19"/>
-        <source>Exit</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="27"/>
-        <source>Button 1 pressed</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="28"/>
-        <source>Button 2 pressed</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="33"/>
-        <source>May I have your attention, please?</source>
-        <translation type="unfinished"/>
+        <translation>Acties</translation>
     </message>
 </context>
 <context>
@@ -10992,6 +11044,24 @@ p, li { white-space: pre-wrap; }
         <translation>m/min</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="121"/>
+        <location filename="../build/ui_plannerSettings.h" line="425"/>
+        <source>75% to 50% avg. depth</source>
+        <translation>75%-50% gem. diepte</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="138"/>
+        <location filename="../build/ui_plannerSettings.h" line="427"/>
+        <source>50% avg. depth to 6m</source>
+        <translation>50% gem. diepte tot 6m</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="155"/>
+        <location filename="../build/ui_plannerSettings.h" line="429"/>
+        <source>6m to surface</source>
+        <translation>6m tot oppervlakte</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="175"/>
         <location filename="../build/ui_plannerSettings.h" line="431"/>
         <source>Descent</source>
@@ -11015,12 +11085,35 @@ p, li { white-space: pre-wrap; }
         <translation>VPM-B decompressie</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="268"/>
+        <source>Bühlmann deco</source>
+        <translation>Bühlmann decompressie</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="278"/>
         <location filename="../build/ui_plannerSettings.h" line="445"/>
         <source>Reserve gas</source>
         <translation>Reserve gas</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="288"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="549"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="578"/>
+        <location filename="../build/ui_plannerSettings.h" line="446"/>
+        <location filename="../build/ui_plannerSettings.h" line="459"/>
+        <location filename="../build/ui_plannerSettings.h" line="461"/>
+        <source>bar</source>
+        <translation>bar</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="307"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="416"/>
+        <location filename="../build/ui_plannerSettings.h" line="437"/>
+        <location filename="../build/ui_plannerSettings.h" line="440"/>
+        <source>%</source>
+        <translation>%</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="320"/>
         <location filename="../build/ui_plannerSettings.h" line="449"/>
         <source>Postpone gas change if a stop is not required</source>
@@ -11039,12 +11132,10 @@ p, li { white-space: pre-wrap; }
         <translation>GF low</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="307"/>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="416"/>
-        <location filename="../build/ui_plannerSettings.h" line="437"/>
-        <location filename="../build/ui_plannerSettings.h" line="440"/>
-        <source>%</source>
-        <translation>%</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="353"/>
+        <location filename="../build/ui_plannerSettings.h" line="436"/>
+        <source>Plan backgas breaks</source>
+        <translation>Plan backgas pauzes</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="360"/>
@@ -11053,10 +11144,10 @@ p, li { white-space: pre-wrap; }
         <translation>GF high</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="429"/>
-        <location filename="../build/ui_plannerSettings.h" line="441"/>
-        <source>Drop to first depth</source>
-        <translation>Afdalen tot eerste dieptetrap</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="370"/>
+        <location filename="../build/ui_plannerSettings.h" line="453"/>
+        <source>min</source>
+        <translation>min</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="389"/>
@@ -11065,163 +11156,139 @@ p, li { white-space: pre-wrap; }
         <translation>Laatste stop op 6m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="353"/>
-        <location filename="../build/ui_plannerSettings.h" line="436"/>
-        <source>Plan backgas breaks</source>
-        <translation>Plan backgas pauzes</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="396"/>
+        <source>Maximize bottom time allowed by gas and no decompression limits</source>
+        <translation>Bodemtijd maximaliseren voor zover toegelaten door gas zonder decompressieverplichting</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="515"/>
-        <location filename="../build/ui_plannerSettings.h" line="455"/>
-        <source>Gas options</source>
-        <translation>Gas opties</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="399"/>
+        <location filename="../build/ui_plannerSettings.h" line="443"/>
+        <source>Recreational mode</source>
+        <translation>Recreatieve mode</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="594"/>
-        <location filename="../build/ui_plannerSettings.h" line="456"/>
-        <source>Bottom SAC</source>
-        <translation>Gasverbruik (bodem)</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="429"/>
+        <location filename="../build/ui_plannerSettings.h" line="441"/>
+        <source>Drop to first depth</source>
+        <translation>Afdalen tot eerste dieptetrap</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="692"/>
-        <location filename="../build/ui_plannerSettings.h" line="457"/>
-        <source>Deco SAC</source>
-        <translation>Gasverbruik (deco)</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="436"/>
+        <location filename="../build/ui_plannerSettings.h" line="452"/>
+        <source>Min. switch duration</source>
+        <translation>Min. gaswissel tijd</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="601"/>
-        <location filename="../build/ui_plannerSettings.h" line="458"/>
-        <source>Bottom pO₂</source>
-        <translation>Bodem pO₂</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="459"/>
+        <location filename="../build/ui_plannerSettings.h" line="444"/>
+        <source>Safety stop</source>
+        <translation>Veiligheidsstop</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="685"/>
-        <location filename="../build/ui_plannerSettings.h" line="460"/>
-        <source>Deco pO₂</source>
-        <translation>Deco pO₂</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="495"/>
+        <source>Conservatism level</source>
+        <translation>Conservatisme niveau</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="515"/>
+        <location filename="../build/ui_plannerSettings.h" line="455"/>
+        <source>Gas options</source>
+        <translation>Gas opties</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="565"/>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="672"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="698"/>
         <location filename="../build/ui_plannerSettings.h" line="462"/>
         <location filename="../build/ui_plannerSettings.h" line="463"/>
         <source>ℓ/min</source>
         <translation>ℓ/min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="632"/>
-        <location filename="../build/ui_plannerSettings.h" line="468"/>
-        <source>Display runtime</source>
-        <translation>Runtime tonen</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="645"/>
-        <location filename="../build/ui_plannerSettings.h" line="472"/>
-        <source>Display segment duration</source>
-        <translation>Duur van het segment tonen</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="655"/>
-        <location filename="../build/ui_plannerSettings.h" line="476"/>
-        <source>Display transitions in deco</source>
-        <translation>Toon overgangen in deco</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="662"/>
-        <location filename="../build/ui_plannerSettings.h" line="477"/>
-        <source>Verbatim dive plan</source>
-        <translation>Gedetailleerd duikplan</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="288"/>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="549"/>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="578"/>
-        <location filename="../build/ui_plannerSettings.h" line="446"/>
-        <location filename="../build/ui_plannerSettings.h" line="459"/>
-        <location filename="../build/ui_plannerSettings.h" line="461"/>
-        <source>bar</source>
-        <translation>bar</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="121"/>
-        <location filename="../build/ui_plannerSettings.h" line="425"/>
-        <source>75% to 50% avg. depth</source>
-        <translation>75%-50% gem. diepte</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="138"/>
-        <location filename="../build/ui_plannerSettings.h" line="427"/>
-        <source>50% avg. depth to 6m</source>
-        <translation>50% gem. diepte tot 6m</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="155"/>
-        <location filename="../build/ui_plannerSettings.h" line="429"/>
-        <source>6m to surface</source>
-        <translation>6m tot oppervlakte</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="268"/>
-        <source>Bühlmann deco</source>
-        <translation>Bühlmann decompressie</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="370"/>
-        <location filename="../build/ui_plannerSettings.h" line="453"/>
-        <source>min</source>
-        <translation>min</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="396"/>
-        <source>Maximize bottom time allowed by gas and no decompression limits</source>
-        <translation>Bodemtijd maximaliseren voor zover toegelaten door gas zonder decompressieverplichting</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="594"/>
+        <source>m</source>
+        <translation>m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="399"/>
-        <location filename="../build/ui_plannerSettings.h" line="443"/>
-        <source>Recreational mode</source>
-        <translation>Recreatieve mode</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="606"/>
+        <source>Used to calculate best mix. Select best mix depth in &apos;Available gases&apos; table by entering gas depth, followed by &quot;B&quot; (best trimix mix) or &quot;BN&quot; (best nitrox mix)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="436"/>
-        <location filename="../build/ui_plannerSettings.h" line="452"/>
-        <source>Min. switch duration</source>
-        <translation>Min. gaswissel tijd</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="613"/>
+        <location filename="../build/ui_plannerSettings.h" line="456"/>
+        <source>Bottom SAC</source>
+        <translation>Gasverbruik (bodem)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="459"/>
-        <location filename="../build/ui_plannerSettings.h" line="444"/>
-        <source>Safety stop</source>
-        <translation>Veiligheidsstop</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="620"/>
+        <location filename="../build/ui_plannerSettings.h" line="458"/>
+        <source>Bottom pO₂</source>
+        <translation>Bodem pO₂</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="495"/>
-        <source>Conservatism level</source>
-        <translation>Conservatisme niveau</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="627"/>
+        <source>Best mix END</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="608"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="634"/>
         <location filename="../build/ui_plannerSettings.h" line="464"/>
         <source>Notes</source>
         <translation>Notities</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="629"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="655"/>
         <location filename="../build/ui_plannerSettings.h" line="466"/>
         <source>In dive plan, show runtime (absolute time) of stops</source>
         <translation>Toon runtime (absolute tijd) van de pauzes in het duikplan</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="642"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="658"/>
+        <location filename="../build/ui_plannerSettings.h" line="468"/>
+        <source>Display runtime</source>
+        <translation>Runtime tonen</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="668"/>
         <location filename="../build/ui_plannerSettings.h" line="470"/>
         <source>In dive plan, show duration (relative time) of stops</source>
         <translation>Toon duur (relatieve tijd) van de pauzes in het duikplan</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="652"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="671"/>
+        <location filename="../build/ui_plannerSettings.h" line="472"/>
+        <source>Display segment duration</source>
+        <translation>Duur van het segment tonen</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="678"/>
         <location filename="../build/ui_plannerSettings.h" line="474"/>
         <source>In diveplan, list transitions or treat them as implicit</source>
         <translation>Toon overgangen of beschouw hen als geïmpliceerd in het duikplan</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="681"/>
+        <location filename="../build/ui_plannerSettings.h" line="476"/>
+        <source>Display transitions in deco</source>
+        <translation>Toon overgangen in deco</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="688"/>
+        <location filename="../build/ui_plannerSettings.h" line="477"/>
+        <source>Verbatim dive plan</source>
+        <translation>Gedetailleerd duikplan</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="711"/>
+        <location filename="../build/ui_plannerSettings.h" line="460"/>
+        <source>Deco pO₂</source>
+        <translation>Deco pO₂</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="718"/>
+        <location filename="../build/ui_plannerSettings.h" line="457"/>
+        <source>Deco SAC</source>
+        <translation>Gasverbruik (deco)</translation>
+    </message>
 </context>
 </TS>
\ No newline at end of file
diff --git a/translations/subsurface_pl_PL.ts b/translations/subsurface_pl_PL.ts
index d619a077c..44592c467 100644
--- a/translations/subsurface_pl_PL.ts
+++ b/translations/subsurface_pl_PL.ts
@@ -105,6 +105,11 @@
         <translation>Nazwa:</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="56"/>
+        <source>Could not initialize Winsock version 2.2</source>
+        <translation>NIe udało się zinicjalizować Winsock wersja 2.2</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="134"/>
         <source>Trying to turn on the local Bluetooth device...</source>
         <translation>Próbuję włączyć lokalne urzadzenie Bluetooth...</translation>
@@ -115,6 +120,11 @@
         <translation>Próbuję wyłączyć lokalne urządzenie Bluetooth</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="167"/>
+        <source>Remote devices list was cleared.</source>
+        <translation>Wyczyszczono listę zdalnych urzadzeń.</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="183"/>
         <source>Scanning for remote devices...</source>
         <translation>Trwa skanowanie w poszukiwaniu zdalnych urządzeń...</translation>
@@ -125,6 +135,22 @@
         <translation>Skanowanie zakończone pomyślnie.</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="208"/>
+        <source>The local Bluetooth device was %1.</source>
+        <extracomment>%1 will be replaced with &quot;turned on&quot; or &quot;turned off&quot;</extracomment>
+        <translation>Lokalne urządzenie Bluetooth zostało %1.</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
+        <source>turned on</source>
+        <translation>włączone</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
+        <source>turned off</source>
+        <translation>wyłączone</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="225"/>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="339"/>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="359"/>
@@ -172,37 +198,6 @@
         <translation>Połącz</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="352"/>
-        <source>Device %1 was paired and is authorized.</source>
-        <translation>Urządzenie %1 zostało sparowane i zautoryzowane.</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="56"/>
-        <source>Could not initialize Winsock version 2.2</source>
-        <translation>NIe udało się zinicjalizować Winsock wersja 2.2</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="167"/>
-        <source>Remote devices list was cleared.</source>
-        <translation>Wyczyszczono listę zdalnych urzadzeń.</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="208"/>
-        <source>The local Bluetooth device was %1.</source>
-        <extracomment>%1 will be replaced with &quot;turned on&quot; or &quot;turned off&quot;</extracomment>
-        <translation>Lokalne urządzenie Bluetooth zostało %1.</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
-        <source>turned on</source>
-        <translation>włączone</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
-        <source>turned off</source>
-        <translation>wyłączone</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="307"/>
         <source>Remove pairing</source>
         <translation>Rozłącz</translation>
@@ -228,6 +223,11 @@
         <translation>Urządzenie %1 zostało sparowane.</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="352"/>
+        <source>Device %1 was paired and is authorized.</source>
+        <translation>Urządzenie %1 zostało sparowane i zautoryzowane.</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="378"/>
         <source>The device %1 can now be used for connection. You can press the Save button.</source>
         <translation>Urządzenie %1 może zostać użyte do połączenia. Możesz wcisnać przycisk Zapisz.</translation>
@@ -286,12 +286,12 @@
 <context>
     <name>BuddyFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="621"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="619"/>
         <source>Person: </source>
         <translation>Osoba:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="622"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="620"/>
         <source>Searches for buddies and divemasters</source>
         <translation>Wyszukiwanie partnerów i divemasterów</translation>
     </message>
@@ -299,7 +299,7 @@
 <context>
     <name>BuddyFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="243"/>
+        <location filename="../qt-models/filtermodels.cpp" line="248"/>
         <source>No buddies</source>
         <translation>brak partnerów</translation>
     </message>
@@ -307,25 +307,30 @@
 <context>
     <name>CloudCredentials</name>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="49"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="50"/>
         <source>Cloud credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="55"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="56"/>
         <source>Email</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="67"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="68"/>
         <source>Password</source>
         <translation>Hasło</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="90"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="92"/>
         <source>Show password</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="97"/>
+        <source>PIN</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>ColumnNameProvider</name>
@@ -381,6 +386,16 @@
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
+        <source>Max. depth</source>
+        <translation>Maks. głębokość</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
+        <source>Avg. depth</source>
+        <translation>Śr. głębokość </translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
         <source>Divemaster</source>
         <translation>Divemaster</translation>
     </message>
@@ -391,6 +406,11 @@
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
+        <source>Suit</source>
+        <translation>Skafander</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
         <source>Notes</source>
         <translation>Notatki</translation>
     </message>
@@ -410,21 +430,6 @@
         <translation>Temp. wody</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
-        <source>Max. depth</source>
-        <translation>Maks. głębokość</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
-        <source>Avg. depth</source>
-        <translation>Śr. głębokość </translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
-        <source>Suit</source>
-        <translation>Skafander</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="44"/>
         <source>O₂</source>
         <translation>O₂</translation>
@@ -538,7 +543,7 @@
         <translation>Nie można utworzyć kontekstu libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../core/configuredivecomputer.cpp" line="660"/>
+        <location filename="../core/configuredivecomputer.cpp" line="656"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation>Nie udało się połączyć z komputerem nurkowym.</translation>
     </message>
@@ -558,11 +563,19 @@
         <translation>Urządzenie lub punkt montowania</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="170"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1520"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1533"/>
-        <source>...</source>
-        <translation>...</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="47"/>
+        <source>Connect via Bluetooth</source>
+        <translation>POłąćz przez Bluetooth</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="54"/>
+        <source>Connect</source>
+        <translation>Połącz</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="64"/>
+        <source>Disconnect</source>
+        <translation>Rozłącz</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="80"/>
@@ -571,12 +584,24 @@
         <translation>Pobierz ustawienia</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="90"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1523"/>
+        <source>Read settings from backup file or from device before writing to the device</source>
+        <translation>Wczytuje ustawienia z pliku kopi zapasowej lub z urządzenia przed zapisaniem zmian do urzadzęnia </translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="93"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1525"/>
         <source>Save changes to device</source>
         <translation>Zapisz zmiany do urządzenia</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="116"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1527"/>
+        <source>Read settings from backup file or from device before writing to a backup file</source>
+        <translation>Wczytuje ustawienia z pliku kopi zapasowej lub z urządzenia przed zapisaniem zmian do pliku kopii zapasowej </translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="119"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1529"/>
         <source>Backup</source>
@@ -595,15 +620,40 @@
         <translation>Aktualizacja oprogramowania</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="163"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1532"/>
+        <source>Save libdivecomputer logfile</source>
+        <translation>Zapisz log postępu libdivecomputer </translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="170"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1520"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1533"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="177"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1534"/>
         <source>Cancel</source>
         <translation>Anuluj</translation>
     </message>
     <message>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1539"/>
-        <source>OSTC 3</source>
-        <translation>OSTC 3</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="214"/>
+        <source>OSTC 3,Sport,Cr,2</source>
+        <translation>OSTC 3,Sport,Cr,2</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="223"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1541"/>
+        <source>Suunto Vyper family</source>
+        <translation>rodzina Suunto Vyper</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="232"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1543"/>
+        <source>OSTC, Mk.2/2N/2C</source>
+        <translation>OSTC, Mk.2/2N/2C</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="253"/>
@@ -616,40 +666,56 @@
         <translation>Podstawowe</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="326"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1656"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1943"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1546"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1726"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1766"/>
-        <source>Serial No.</source>
-        <translation>Nr seryjny</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="260"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1575"/>
+        <source>Eco</source>
+        <translation>Eco</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="349"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1679"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1980"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1547"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1727"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1767"/>
-        <source>Firmware version</source>
-        <translation>Wersja oprogramowania</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="265"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1576"/>
+        <source>Medium</source>
+        <translation>Średnia</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="538"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1713"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1990"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1548"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1729"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1768"/>
-        <source>Custom text</source>
-        <translation>Własny tekst</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="270"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1577"/>
+        <source>High</source>
+        <translation>Wysoka</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="385"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1549"/>
-        <source>Language</source>
-        <translation>Język</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="278"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="826"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="849"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="875"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="927"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="993"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1019"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1101"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1117"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1450"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2278"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2382"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2408"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2434"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2474"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2497"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1586"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1621"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1623"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1625"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1628"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1637"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1638"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1710"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1785"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1789"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1801"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1803"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1806"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1807"/>
+        <source>%</source>
+        <translation>%</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="289"/>
@@ -676,44 +742,36 @@
         <translation>Włoski</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="579"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1557"/>
-        <source>Dive mode</source>
-        <translation>Tryb pracy</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="556"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1560"/>
-        <source>OC</source>
-        <translation>OC</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="561"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1561"/>
-        <source>CC</source>
-        <translation>CC</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="313"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1582"/>
+        <source>m/°C</source>
+        <translation>m/°C</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="566"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2336"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1562"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1793"/>
-        <source>Gauge</source>
-        <translation>Gauge</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="318"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1583"/>
+        <source>ft/°F</source>
+        <translation>ft/°F</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="571"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1563"/>
-        <source>Apnea</source>
-        <translation>Apnea</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="326"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1656"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1943"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1546"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1726"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1766"/>
+        <source>Serial No.</source>
+        <translation>Nr seryjny</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="395"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2063"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1565"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1780"/>
-        <source>Date format</source>
-        <translation>Format daty</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="349"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1679"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1980"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1547"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1727"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1767"/>
+        <source>Firmware version</source>
+        <translation>Wersja oprogramowania</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="360"/>
@@ -734,108 +792,147 @@
         <translation>YYMMDD</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1042"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2457"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1639"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1805"/>
-        <source>Saturation</source>
-        <translation>Nasycanie</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="385"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1549"/>
+        <source>Language</source>
+        <translation>Język</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="278"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="826"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="849"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="875"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="927"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="993"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1019"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1101"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1117"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1450"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2278"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2382"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2408"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2434"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2474"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2497"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1586"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1621"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1623"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1625"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1628"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1637"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1638"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1710"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1785"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1789"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1801"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1803"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1806"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1807"/>
-        <source>%</source>
-        <translation>%</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="395"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2063"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1565"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1780"/>
+        <source>Date format</source>
+        <translation>Format daty</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="865"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2261"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1624"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1784"/>
-        <source>Desaturation</source>
-        <translation>Odsycanie</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="405"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1572"/>
+        <source>Brightness</source>
+        <translation>Jasność</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="983"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2398"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1636"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1800"/>
-        <source>Last deco</source>
-        <translation>Ostatni przystanek</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="415"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1850"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1579"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1753"/>
+        <source>Units</source>
+        <translation>Jednostki</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="711"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="736"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="758"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="904"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2181"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2206"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2228"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2307"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1626"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1786"/>
-        <source> m</source>
-        <translation>m</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="425"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1585"/>
+        <source>Salinity (0-5%)</source>
+        <translation>Zasolenie (0-5%)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="405"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1572"/>
-        <source>Brightness</source>
-        <translation>Jasność</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="438"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1615"/>
+        <source>Reset device to default settings</source>
+        <translation>Przywróć ustawienia fabryczne</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="260"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1575"/>
-        <source>Eco</source>
-        <translation>Eco</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="452"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1590"/>
+        <source>230LSB/Gauss</source>
+        <translation>230LSB/Gauss</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="265"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1576"/>
-        <source>Medium</source>
-        <translation>Średnia</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="457"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1591"/>
+        <source>330LSB/Gauss</source>
+        <translation>330LSB/Gauss</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="270"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1577"/>
-        <source>High</source>
-        <translation>Wysoka</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="462"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1592"/>
+        <source>390LSB/Gauss</source>
+        <translation>390LSB/Gauss</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="603"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2034"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1599"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1779"/>
-        <source>Sampling rate</source>
-        <translation>Próbkowanie co</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="467"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1593"/>
+        <source>440LSB/Gauss</source>
+        <translation>440LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="472"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1594"/>
+        <source>660LSB/Gauss</source>
+        <translation>660LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="477"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1595"/>
+        <source>820LSB/Gauss</source>
+        <translation>820LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="482"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1596"/>
+        <source>1090LSB/Gauss</source>
+        <translation>1090LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="487"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1597"/>
+        <source>1370LSB/Gauss</source>
+        <translation>1370LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="521"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1587"/>
+        <source>Compass gain</source>
+        <translation>Wzmocnienie kompasu</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="531"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1799"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1745"/>
+        <source>Computer model</source>
+        <translation>Model</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="538"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1713"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1990"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1548"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1729"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1768"/>
+        <source>Custom text</source>
+        <translation>Własny tekst</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="556"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1560"/>
+        <source>OC</source>
+        <translation>OC</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="561"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1561"/>
+        <source>CC</source>
+        <translation>CC</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="566"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2336"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1562"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1793"/>
+        <source>Gauge</source>
+        <translation>Gauge</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="571"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1563"/>
+        <source>Apnea</source>
+        <translation>Apnea</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="579"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1557"/>
+        <source>Dive mode</source>
+        <translation>Tryb pracy</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="590"/>
@@ -852,30 +949,12 @@
         <translation>10s</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="415"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1850"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1579"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1753"/>
-        <source>Units</source>
-        <translation>Jednostki</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="313"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1582"/>
-        <source>m/°C</source>
-        <translation>m/°C</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="318"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1583"/>
-        <source>ft/°F</source>
-        <translation>ft/°F</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="644"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1605"/>
-        <source>Dive mode color</source>
-        <translation>Kolorystyka</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="603"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2034"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1599"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1779"/>
+        <source>Sampling rate</source>
+        <translation>Próbkowanie co</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="614"/>
@@ -902,12 +981,6 @@
         <translation>Niebieska</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="425"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1585"/>
-        <source>Salinity (0-5%)</source>
-        <translation>Zasolenie (0-5%)</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="637"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2092"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1613"/>
@@ -916,90 +989,80 @@
         <translation>Synchronizuj czas z PC</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="521"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1587"/>
-        <source>Compass gain</source>
-        <translation>Wzmocnienie kompasu</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="90"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1523"/>
-        <source>Read settings from backup file or from device before writing to the device</source>
-        <translation>Wczytuje ustawienia z pliku kopi zapasowej lub z urządzenia przed zapisaniem zmian do urzadzęnia </translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="116"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1527"/>
-        <source>Read settings from backup file or from device before writing to a backup file</source>
-        <translation>Wczytuje ustawienia z pliku kopi zapasowej lub z urządzenia przed zapisaniem zmian do pliku kopii zapasowej </translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="232"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1543"/>
-        <source>OSTC, Mk.2/2N/2C</source>
-        <translation>OSTC, Mk.2/2N/2C</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="644"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1605"/>
+        <source>Dive mode color</source>
+        <translation>Kolorystyka</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="452"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1590"/>
-        <source>230LSB/Gauss</source>
-        <translation>230LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="654"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2020"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1614"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1771"/>
+        <source>Show safety stop</source>
+        <translation>Pokazuj przystanek bezpieczeństwa</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="457"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1591"/>
-        <source>330LSB/Gauss</source>
-        <translation>330LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="661"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2145"/>
+        <source>End Depth</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="462"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1592"/>
-        <source>390LSB/Gauss</source>
-        <translation>390LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="671"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2162"/>
+        <source> s</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="467"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1593"/>
-        <source>440LSB/Gauss</source>
-        <translation>440LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="687"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1953"/>
+        <source>Length</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="472"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1594"/>
-        <source>660LSB/Gauss</source>
-        <translation>660LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="694"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2138"/>
+        <source>Start Depth</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="477"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1595"/>
-        <source>820LSB/Gauss</source>
-        <translation>820LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="701"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2152"/>
+        <source>Reset Depth</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="482"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1596"/>
-        <source>1090LSB/Gauss</source>
-        <translation>1090LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="711"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="736"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="758"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="904"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2181"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2206"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2228"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2307"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1626"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1786"/>
+        <source> m</source>
+        <translation>m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="487"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1597"/>
-        <source>1370LSB/Gauss</source>
-        <translation>1370LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="778"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2248"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1643"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1810"/>
+        <source>Advanced settings</source>
+        <translation>Zaawansowane</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="654"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2020"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1614"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1771"/>
-        <source>Show safety stop</source>
-        <translation>Pokazuj przystanek bezpieczeństwa</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="784"/>
+        <source>Left button sensitivity</source>
+        <translation>Czułość lewego przycisku</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="438"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1615"/>
-        <source>Reset device to default settings</source>
-        <translation>Przywróć ustawienia fabryczne</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="791"/>
+        <source>Always show ppO2</source>
+        <translation>Zawsze pokazuj ppO2</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="798"/>
@@ -1010,20 +1073,6 @@
         <translation>Alt GF może być wybrany pod wodą</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="223"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1541"/>
-        <source>Suunto Vyper family</source>
-        <translation>rodzina Suunto Vyper</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="778"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2248"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1643"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1810"/>
-        <source>Advanced settings</source>
-        <translation>Zaawansowane</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="805"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2271"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1618"/>
@@ -1054,6 +1103,14 @@
         <translation>GFHigh</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="865"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2261"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1624"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1784"/>
+        <source>Desaturation</source>
+        <translation>Odsycanie</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="917"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2320"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1627"/>
@@ -1068,14 +1125,6 @@
         <translation> mbar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="973"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2369"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1630"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1788"/>
-        <source> min</source>
-        <translation> min</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="960"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2331"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1633"/>
@@ -1084,63 +1133,28 @@
         <translation>ZH-L16</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="47"/>
-        <source>Connect via Bluetooth</source>
-        <translation>POłąćz przez Bluetooth</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="163"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1532"/>
-        <source>Save libdivecomputer logfile</source>
-        <translation>Zapisz log postępu libdivecomputer </translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="661"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2145"/>
-        <source>End Depth</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="671"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2162"/>
-        <source> s</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="687"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1953"/>
-        <source>Length</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="694"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2138"/>
-        <source>Start Depth</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="701"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2152"/>
-        <source>Reset Depth</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="784"/>
-        <source>Left button sensitivity</source>
-        <translation>Czułość lewego przycisku</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="791"/>
-        <source>Always show ppO2</source>
-        <translation>Zawsze pokazuj ppO2</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="965"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1634"/>
         <source>ZH-L16+GF</source>
         <translation>ZH-L16+GF</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="973"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2369"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1630"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1788"/>
+        <source> min</source>
+        <translation> min</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="983"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2398"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1636"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1800"/>
+        <source>Last deco</source>
+        <translation>Ostatni przystanek</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1009"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2424"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1640"/>
@@ -1157,6 +1171,14 @@
         <translation>Alt GFHigh</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1042"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2457"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1639"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1805"/>
+        <source>Saturation</source>
+        <translation>Nasycanie</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1052"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1642"/>
         <source>Flip screen</source>
@@ -1168,12 +1190,22 @@
         <translation>Czułość prawego przycisku</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1066"/>
+        <source>MOD warning</source>
+        <translation>Przekroczono MOD</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1073"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2513"/>
         <source>Graphical speed indicator</source>
         <translation>Graficzny wskaźnik prędkości</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1080"/>
+        <source>Dynamic ascent rate</source>
+        <translation>Zmienna prędkość wynurzania</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1087"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2552"/>
         <source>Bottom gas consumption</source>
@@ -1186,6 +1218,14 @@
         <translation>Zużycie gazu deco</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1133"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1149"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2520"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2536"/>
+        <source> ℓ/min</source>
+        <translation> ℓ/min</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1165"/>
         <source>Temperature sensor offset</source>
         <translation type="unfinished"/>
@@ -1204,6 +1244,18 @@
         <translation>Gazy</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1235"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1320"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2610"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2695"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1645"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1668"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1812"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1835"/>
+        <source>%O₂</source>
+        <translation>%O₂</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1240"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1325"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2615"/>
@@ -1322,16 +1374,10 @@
         <translation>Dil 5</translation>
     </message>
     <message>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1691"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1858"/>
-        <source>Set point [cbar]</source>
-        <translation>Set point [cbar]</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1693"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1860"/>
-        <source>Change depth [m]</source>
-        <translation>Głębokość zmiany [m] </translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1405"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2770"/>
+        <source>Setpoint</source>
+        <translation>Setpoint</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1415"/>
@@ -1370,6 +1416,12 @@
         <translation>SP 5</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1443"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1709"/>
+        <source>O₂ in calibration gas</source>
+        <translation>O₂ w gazie kalibrującym</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1467"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1713"/>
         <source>Fixed setpoint</source>
@@ -1400,101 +1452,6 @@
         <translation> cbar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1748"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1733"/>
-        <source>P1 (medium)</source>
-        <extracomment>Suunto safety level</extracomment>
-        <translation>P1 (średnie)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1753"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1734"/>
-        <source>P2 (high)</source>
-        <extracomment>Suunto safety level</extracomment>
-        <translation>P2 (wysokie)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1792"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1744"/>
-        <source>Total dive time</source>
-        <translation>Całkowity czas nurkowania</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2109"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1769"/>
-        <source>kg/ℓ</source>
-        <translation>kg/ℓ</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2346"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1795"/>
-        <source>Apnoea</source>
-        <translation>Apnoea</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1583"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1722"/>
-        <source>Safety level</source>
-        <translation>Konserwatyzm</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="54"/>
-        <source>Connect</source>
-        <translation>Połącz</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="64"/>
-        <source>Disconnect</source>
-        <translation>Rozłącz</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="214"/>
-        <source>OSTC 3,Sport,Cr,2</source>
-        <translation>OSTC 3,Sport,Cr,2</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1066"/>
-        <source>MOD warning</source>
-        <translation>Przekroczono MOD</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1080"/>
-        <source>Dynamic ascent rate</source>
-        <translation>Zmienna prędkość wynurzania</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1133"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1149"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2520"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2536"/>
-        <source> ℓ/min</source>
-        <translation> ℓ/min</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1235"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1320"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2610"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2695"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1645"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1668"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1812"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1835"/>
-        <source>%O₂</source>
-        <translation>%O₂</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1405"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2770"/>
-        <source>Setpoint</source>
-        <translation>Setpoint</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1443"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1709"/>
-        <source>O₂ in calibration gas</source>
-        <translation>O₂ w gazie kalibrującym</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1535"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2843"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1719"/>
@@ -1511,6 +1468,12 @@
         <translation>pO₂ min</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1583"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1722"/>
+        <source>Safety level</source>
+        <translation>Konserwatyzm</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1609"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1723"/>
         <source>Altitude range</source>
@@ -1544,6 +1507,20 @@
         <translation>P0 (brak)</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1748"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1733"/>
+        <source>P1 (medium)</source>
+        <extracomment>Suunto safety level</extracomment>
+        <translation>P1 (średnie)</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1753"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1734"/>
+        <source>P2 (high)</source>
+        <extracomment>Suunto safety level</extracomment>
+        <translation>P2 (wysokie)</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1761"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1736"/>
         <source>Sample rate</source>
@@ -1568,11 +1545,10 @@
         <translation>60s</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="531"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1799"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1745"/>
-        <source>Computer model</source>
-        <translation>Model</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1792"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1744"/>
+        <source>Total dive time</source>
+        <translation>Całkowity czas nurkowania</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1816"/>
@@ -1637,12 +1613,6 @@
         <translation>Alarm czasu</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2099"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1765"/>
-        <source>Salinity</source>
-        <translation>Zasolenie</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2074"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1774"/>
         <source>MM/DD/YY</source>
@@ -1661,12 +1631,30 @@
         <translation>YY/MM/DD</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2099"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1765"/>
+        <source>Salinity</source>
+        <translation>Zasolenie</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2109"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1769"/>
+        <source>kg/ℓ</source>
+        <translation>kg/ℓ</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2341"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1794"/>
         <source>ZH-L16 CC</source>
         <translation>ZH-L16 CC</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2346"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1795"/>
+        <source>Apnoea</source>
+        <translation>Apnoea</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2351"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1796"/>
         <source>L16-GF OC</source>
@@ -1685,87 +1673,112 @@
         <translation>PSCR-GF</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1108"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1129"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1539"/>
+        <source>OSTC 3</source>
+        <translation>OSTC 3</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1691"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1858"/>
+        <source>Set point [cbar]</source>
+        <translation>Set point [cbar]</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1693"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1860"/>
+        <source>Change depth [m]</source>
+        <translation>Głębokość zmiany [m] </translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1110"/>
+        <source>Backup dive computer settings</source>
+        <translation>Tworzy kopię ustawień komputera nurkowego</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1111"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1132"/>
         <source>Backup files (*.xml)</source>
         <translation>Pliki kopii zapasowych (*.xml)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1113"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1115"/>
+        <source>XML backup error</source>
+        <translation>Błąd kopii zapasowej XML</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1116"/>
         <source>An error occurred while saving the backup file.
 %1</source>
         <translation>Wystąpił błąd podczas zapisywania pliku kopii zapasowej.
 %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1116"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1119"/>
         <source>Backup succeeded</source>
         <translation>Pomyślnie utworzono kopię zapasową.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1117"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1120"/>
         <source>Your settings have been saved to: %1</source>
         <translation>Twoje ustawienia zostały zapisane do: %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1107"/>
-        <source>Backup dive computer settings</source>
-        <translation>Tworzy kopię ustawień komputera nurkowego</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1112"/>
-        <source>XML backup error</source>
-        <translation>Błąd kopii zapasowej XML</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1128"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1131"/>
         <source>Restore dive computer settings</source>
         <translation>Przywraca ustawienia komputera nurkowego</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1134"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1137"/>
         <source>XML restore error</source>
         <translation>Błąd przywracania XML</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1135"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1138"/>
         <source>An error occurred while restoring the backup file.
 %1</source>
         <translation>Wystąpił błąd podczas przywracania z pliku kopii zapasowej.
 %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1139"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1142"/>
         <source>Restore succeeded</source>
         <translation>Pomyślnie przywrócono ustawienia</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1140"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1143"/>
         <source>Your settings have been restored successfully.</source>
         <translation>Twoje ustawienia zostały pomyślnie przywrócone.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1150"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1153"/>
         <source>Select firmware file</source>
         <translation>Wybierz plik z aktualizacją</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1151"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1154"/>
         <source>All files (*.*)</source>
         <translation>Wszystkie pliki (*.*)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1207"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1210"/>
         <source>Choose file for divecomputer download logfile</source>
         <translation>Wybierz plik używany do logowania postępu pobierania danych</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1208"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1211"/>
         <source>Log files (*.log)</source>
         <translation>Pliki logów (*.log)</translation>
     </message>
 </context>
 <context>
+    <name>ContextDrawer</name>
+    <message>
+        <location filename="../mobile-widgets/qml/kirigami/src/controls/ContextDrawer.qml" line="76"/>
+        <source>Actions</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>CylindersModel</name>
     <message>
         <location filename="../qt-models/cylindermodel.cpp" line="16"/>
@@ -1779,11 +1792,6 @@
     </message>
     <message>
         <location filename="../qt-models/cylindermodel.cpp" line="16"/>
-        <source>He%</source>
-        <translation>He%</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="16"/>
         <source>Work press.</source>
         <translation>Ciśn. robocze</translation>
     </message>
@@ -1803,9 +1811,24 @@
         <translation>O₂%</translation>
     </message>
     <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="16"/>
+        <source>He%</source>
+        <translation>He%</translation>
+    </message>
+    <message>
         <location filename="../qt-models/cylindermodel.cpp" line="17"/>
-        <source>Switch at</source>
-        <translation>Zmiana na</translation>
+        <source>Deco switch at</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
+        <source>Bot. MOD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
+        <source>MND</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-models/cylindermodel.cpp" line="17"/>
@@ -1823,17 +1846,32 @@
         <translation>ℓ</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="161"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="177"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation>Kliknięcie tu usunie butlę z listy.</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="383"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="180"/>
+        <source>Switch depth for deco gas. Calculated using Deco pO₂ preference, unless set manually.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="183"/>
+        <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to &apos;*&apos; for best O₂% for max depth.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="186"/>
+        <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to &apos;*&apos; for best He% for max depth.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="444"/>
         <source>Cylinder cannot be removed</source>
         <translation>Butla nie może być usunięta.</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="384"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="445"/>
         <source>This gas is 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 gazy, których nie używasz.</translation>
     </message>
@@ -1853,42 +1891,24 @@
         <translation>Które parametry chcesz skopiować?</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="73"/>
+        <location filename="../build/ui_divecomponentselection.h" line="141"/>
+        <source>Dive site</source>
+        <translation>Miejsce nurkowe</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="80"/>
         <location filename="../build/ui_divecomponentselection.h" line="142"/>
         <source>Suit</source>
         <translation>Skafander</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="122"/>
-        <location filename="../build/ui_divecomponentselection.h" line="148"/>
-        <source>Divemaster</source>
-        <translation>Divemaster</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="129"/>
-        <location filename="../build/ui_divecomponentselection.h" line="149"/>
-        <source>Buddy</source>
-        <translation>Partner</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="136"/>
-        <location filename="../build/ui_divecomponentselection.h" line="150"/>
-        <source>Rating</source>
-        <translation>Ocena</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="87"/>
         <location filename="../build/ui_divecomponentselection.h" line="143"/>
         <source>Visibility</source>
         <translation>Widzialność</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="73"/>
-        <location filename="../build/ui_divecomponentselection.h" line="141"/>
-        <source>Dive site</source>
-        <translation>Miejsce nurkowe</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="94"/>
         <location filename="../build/ui_divecomponentselection.h" line="144"/>
         <source>Notes</source>
@@ -1912,10 +1932,34 @@
         <source>Cylinders</source>
         <translation>Butle</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="122"/>
+        <location filename="../build/ui_divecomponentselection.h" line="148"/>
+        <source>Divemaster</source>
+        <translation>Divemaster</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="129"/>
+        <location filename="../build/ui_divecomponentselection.h" line="149"/>
+        <source>Buddy</source>
+        <translation>Partner</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="136"/>
+        <location filename="../build/ui_divecomponentselection.h" line="150"/>
+        <source>Rating</source>
+        <translation>Ocena</translation>
+    </message>
 </context>
 <context>
     <name>DiveComputerManagementDialog</name>
     <message>
+        <location filename="../desktop-widgets/divecomputermanagementdialog.ui" line="17"/>
+        <location filename="../build/ui_divecomputermanagementdialog.h" line="65"/>
+        <source>Edit dive computer nicknames</source>
+        <translation>Edycja nazw komputerów nurkowych</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divecomputermanagementdialog.cpp" line="49"/>
         <source>Remove the selected dive computer?</source>
         <translation>Usunąć wybrany komputer nurkowy?</translation>
@@ -1927,12 +1971,6 @@
         <translation>Czy na pewno chcesz usunąć
 wybrany komputer nurkowy?</translation>
     </message>
-    <message>
-        <location filename="../desktop-widgets/divecomputermanagementdialog.ui" line="17"/>
-        <location filename="../build/ui_divecomputermanagementdialog.h" line="65"/>
-        <source>Edit dive computer nicknames</source>
-        <translation>Edycja nazw komputerów nurkowych</translation>
-    </message>
 </context>
 <context>
     <name>DiveComputerModel</name>
@@ -1960,17 +1998,17 @@ wybrany komputer nurkowy?</translation>
 <context>
     <name>DiveDetails</name>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="33"/>
+        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="38"/>
         <source>Dive details</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="67"/>
+        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="72"/>
         <source>Delete dive</source>
         <translation>Usuń nurkowanie</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="84"/>
+        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="89"/>
         <source>Show on map</source>
         <translation type="unfinished"/>
     </message>
@@ -1978,88 +2016,93 @@ wybrany komputer nurkowy?</translation>
 <context>
     <name>DiveDetailsEdit</name>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="74"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="80"/>
         <source>Dive %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="78"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="84"/>
         <source>Date:</source>
         <translation>Data:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="86"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="92"/>
         <source>Location:</source>
         <translation>Miejsce:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="95"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="101"/>
         <source>Coordinates:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="104"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="110"/>
         <source>Use current
 GPS location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="118"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="124"/>
         <source>Depth:</source>
         <translation>Głębokość:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="127"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="133"/>
         <source>Duration:</source>
         <translation>Długość:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="137"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="143"/>
         <source>Air Temp:</source>
         <translation>Temp. powietrza:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="146"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="152"/>
         <source>Water Temp:</source>
         <translation>Temp. wody:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="155"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="161"/>
         <source>Suit:</source>
         <translation>Skafander:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="164"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="176"/>
         <source>Buddy:</source>
         <translation>Partner:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="173"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="191"/>
         <source>Dive Master:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="182"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="206"/>
         <source>Weight:</source>
         <translation>Waga:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="192"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="216"/>
+        <source>Cylinder:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="231"/>
         <source>Gas mix:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="203"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="241"/>
         <source>Start Pressure:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="213"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="250"/>
         <source>End Pressure:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="224"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="260"/>
         <source>Notes:</source>
         <translation>Notatki:</translation>
     </message>
@@ -2097,42 +2140,42 @@ GPS location:</source>
         <translation>Skafander:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="159"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="158"/>
         <source>Air Temp:</source>
         <translation>Temp. powietrza:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="175"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="172"/>
         <source>Cylinder:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="189"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="185"/>
         <source>Water Temp:</source>
         <translation>Temp. wody:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="205"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="198"/>
         <source>Dive Master:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="220"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="211"/>
         <source>Weight:</source>
         <translation>Waga:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="249"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="224"/>
         <source>Buddy:</source>
         <translation>Partner:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="263"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="237"/>
         <source>SAC:</source>
         <translation>SAC:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="280"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="252"/>
         <source>Notes</source>
         <translation>Opis</translation>
     </message>
@@ -2140,18 +2183,18 @@ GPS location:</source>
 <context>
     <name>DiveEventItem</name>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="134"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="165"/>
         <source>Manual switch to OC</source>
         <translation>Ręczna zmiana na OC</translation>
     </message>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="136"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="167"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation> początek</translation>
     </message>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="137"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="168"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation> koniec</translation>
@@ -2160,27 +2203,27 @@ GPS location:</source>
 <context>
     <name>DiveImportedModel</name>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="646"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="656"/>
         <source>Date/time</source>
         <translation>Data/czas</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="648"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="658"/>
         <source>Duration</source>
         <translation>Czas trwania</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="650"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="660"/>
         <source>Depth</source>
         <translation>Głębokość</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="672"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="682"/>
         <source>h:</source>
         <translation>h:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="672"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="682"/>
         <source>min</source>
         <translation>min</translation>
     </message>
@@ -2189,8 +2232,8 @@ GPS location:</source>
     <name>DiveList</name>
     <message>
         <location filename="../mobile-widgets/qml/DiveList.qml" line="12"/>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="226"/>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="232"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="227"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="233"/>
         <source>Dive list</source>
         <translation type="unfinished"/>
     </message>
@@ -2205,110 +2248,115 @@ GPS location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="222"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="223"/>
         <source>Cloud credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="228"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="229"/>
         <source>Please tap the &apos;+&apos; button to add a dive</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="248"/>
+        <source>No dives in dive list</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DiveListView</name>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="846"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="849"/>
         <source>Expand all</source>
         <translation>Rozwiń wszystkie</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="848"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="851"/>
         <source>Collapse all</source>
         <translation>Zwiń wszystkie</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="852"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="855"/>
         <source>Collapse others</source>
         <translation>Zwiń pozostałe</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="856"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="859"/>
         <source>Remove dive(s) from trip</source>
         <translation>Usuń nurkowanie(a) z grupy</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="857"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="860"/>
         <source>Create new trip above</source>
         <translation>Utwórz nową grupę powyżej</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="871"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="874"/>
         <source>Add dive(s) to trip immediately above</source>
         <translation>Dodaj nurkowanie(a) do grupy powyżej</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="873"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="876"/>
         <source>Add dive(s) to trip immediately below</source>
         <translation>Dodaj nurkowanie(a) do grupy poniżej</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="877"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="880"/>
         <source>Merge trip with trip above</source>
         <translation>Połącz grupę z grupą powyżej</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="878"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="881"/>
         <source>Merge trip with trip below</source>
         <translation>Połącz grupę z grupą poniżej</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="882"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="885"/>
         <source>Delete dive(s)</source>
         <translation>Usuń nurkowanie(a)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="884"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="887"/>
         <source>Mark dive(s) invalid</source>
         <translation>Oznacz nurkowanie(a) jak niepoprawne</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="888"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="891"/>
         <source>Merge selected dives</source>
         <translation>Połącz wybrane nurkowania</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="890"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="893"/>
         <source>Renumber dive(s)</source>
         <translation>Zmień numerację</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="891"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="894"/>
         <source>Shift dive times</source>
         <translation>Zmień czas nurkowania</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="892"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="895"/>
         <source>Split selected dives</source>
         <translation>Podziel wybrane nurkowanie(a)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="893"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="896"/>
         <source>Load image(s) from file(s)</source>
         <translation>Dodaj zdjęcia z dysku</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="894"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="897"/>
         <source>Load image(s) from web</source>
         <translation>Dodaj zdjęcia z Internetu</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="917"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="919"/>
         <source>Open image files</source>
         <translation>Dodawanie zdjęć</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="917"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="919"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>Pliki graficzne (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -2329,56 +2377,6 @@ GPS location:</source>
 <context>
     <name>DiveLogExportDialog</name>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="103"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="351"/>
-        <source>Export format</source>
-        <translation>Format danych</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="134"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="353"/>
-        <source>UDDF</source>
-        <translation>UDDF</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="187"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="358"/>
-        <source>Worldmap</source>
-        <translation>Mapa Świata</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="197"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="359"/>
-        <source>I&amp;mage depths</source>
-        <translation>Głebokości zdjęć</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="243"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="360"/>
-        <source>Selection</source>
-        <translation>Wybór</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="252"/>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="346"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="361"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="372"/>
-        <source>Selected dives</source>
-        <translation>Wybrane nurkowania</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="262"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="362"/>
-        <source>All dives</source>
-        <translation>Wszystkie nurkowania</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="306"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="396"/>
-        <source>HTML</source>
-        <translation>HTML</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="14"/>
         <location filename="../build/ui_divelogexportdialog.h" line="349"/>
         <source>Export dive log files</source>
@@ -2391,12 +2389,24 @@ GPS location:</source>
         <translation>Podstawowy eksport</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="103"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="351"/>
+        <source>Export format</source>
+        <translation>Format danych</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="115"/>
         <location filename="../build/ui_divelogexportdialog.h" line="352"/>
         <source>Subsurface &amp;XML</source>
         <translation>Subsurface XML</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="134"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="353"/>
+        <source>UDDF</source>
+        <translation>UDDF</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="147"/>
         <location filename="../build/ui_divelogexportdialog.h" line="354"/>
         <source>di&amp;velogs.de</source>
@@ -2421,238 +2431,297 @@ GPS location:</source>
         <translation>Dane o nurkowaniu CSV</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="275"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="187"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="358"/>
+        <source>Worldmap</source>
+        <translation>Mapa Świata</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="197"/>
+        <source>TeX</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="207"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="359"/>
+        <source>I&amp;mage depths</source>
+        <translation>Głebokości zdjęć</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="253"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="360"/>
+        <source>Selection</source>
+        <translation>Wybór</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="262"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="356"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="361"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="372"/>
+        <source>Selected dives</source>
+        <translation>Wybrane nurkowania</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="272"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="362"/>
+        <source>All dives</source>
+        <translation>Wszystkie nurkowania</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="285"/>
         <location filename="../build/ui_divelogexportdialog.h" line="363"/>
         <source>CSV units</source>
         <translation>Jednostki CSV</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="288"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="298"/>
         <location filename="../build/ui_divelogexportdialog.h" line="366"/>
         <source>Metric</source>
         <translation>Metryczne</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="293"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="303"/>
         <location filename="../build/ui_divelogexportdialog.h" line="367"/>
         <source>Imperial</source>
         <translation>Imperialne</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="324"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="316"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="396"/>
+        <source>HTML</source>
+        <translation>HTML</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="334"/>
         <location filename="../build/ui_divelogexportdialog.h" line="370"/>
         <source>General settings</source>
         <translation>Ogólne</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="330"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="340"/>
         <location filename="../build/ui_divelogexportdialog.h" line="371"/>
         <source>Subsurface numbers</source>
         <translation>Zachowaj numerację</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="359"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="369"/>
         <location filename="../build/ui_divelogexportdialog.h" line="373"/>
         <source>Export yearly statistics</source>
         <translation>Eksport statystyk rocznych</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="375"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="385"/>
         <location filename="../build/ui_divelogexportdialog.h" line="374"/>
         <source>All di&amp;ves</source>
         <translation>Wszystkie nurkowania</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="385"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="395"/>
         <location filename="../build/ui_divelogexportdialog.h" line="375"/>
         <source>Export list only</source>
         <translation>Eksportuj tylko listę</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="392"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="402"/>
         <location filename="../build/ui_divelogexportdialog.h" line="376"/>
         <source>Export photos</source>
         <translation>Eksport zdjęć</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="408"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="418"/>
         <location filename="../build/ui_divelogexportdialog.h" line="377"/>
         <source>Style options</source>
         <translation>Ustawienia stylu</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="423"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="433"/>
         <location filename="../build/ui_divelogexportdialog.h" line="378"/>
         <source>Font</source>
         <translation>Czcionka</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="433"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="443"/>
         <location filename="../build/ui_divelogexportdialog.h" line="379"/>
         <source>Font size</source>
         <translation>Rozmiar czcionki</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="444"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="454"/>
         <location filename="../build/ui_divelogexportdialog.h" line="382"/>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="449"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="459"/>
         <location filename="../build/ui_divelogexportdialog.h" line="383"/>
         <source>10</source>
         <translation>10</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="454"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="464"/>
         <location filename="../build/ui_divelogexportdialog.h" line="384"/>
         <source>12</source>
         <translation>12</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="459"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="469"/>
         <location filename="../build/ui_divelogexportdialog.h" line="385"/>
         <source>14</source>
         <translation>14</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="464"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="474"/>
         <location filename="../build/ui_divelogexportdialog.h" line="386"/>
         <source>16</source>
         <translation>16</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="469"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="479"/>
         <location filename="../build/ui_divelogexportdialog.h" line="387"/>
         <source>18</source>
         <translation>18</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="474"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="484"/>
         <location filename="../build/ui_divelogexportdialog.h" line="388"/>
         <source>20</source>
         <translation>20</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="482"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="492"/>
         <location filename="../build/ui_divelogexportdialog.h" line="390"/>
         <source>Theme</source>
         <translation>Motyw</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="493"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="503"/>
         <location filename="../build/ui_divelogexportdialog.h" line="393"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="95"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="99"/>
         <source>Light</source>
         <translation>Światło</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="498"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="508"/>
         <location filename="../build/ui_divelogexportdialog.h" line="394"/>
         <source>Sand</source>
         <translation>Piasek</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="134"/>
-        <source>UDDF files (*.uddf *.UDDF)</source>
-        <translation>Pliki UDDF  (*.uddf *.UDDF)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="142"/>
-        <source>CSV files (*.csv *.CSV)</source>
-        <translation>pliki CSV (*.csv *.CSV)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="74"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="76"/>
         <source>Generic format that is used for data exchange between a variety of diving related programs.</source>
         <translation>Format używany do wymiany danych pomiędzy różnorodnymi programami związanymi z nurkowaniem.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="76"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="78"/>
         <source>Comma separated values describing the dive profile.</source>
         <translation>Lista oddzielonych przecinkami danych opisujących profil nurkowania. </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="78"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="80"/>
         <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source>
         <translation>Lista oddzielonych przecinkami najważniejszych informacji z  nurkowania. Nie obejmuje to profilu nurkowania.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="80"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="82"/>
         <source>Send the dive data to divelogs.de website.</source>
         <translation>Wysyła dane na stronę divelogs.de</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="82"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="84"/>
         <source>Send the dive data to dive-share.appspot.com website</source>
         <translation>Wysyła dane do strony dive-share.appspot.com</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="84"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="86"/>
         <source>HTML export of the dive locations, visualized on a world map.</source>
         <translation>Eksport danych o miejscach nurkowych w HTML z zaznaczeniem ich na mapie świata. </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="86"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="88"/>
         <source>Subsurface native XML format.</source>
         <translation>Format XML używany przez Subsurface.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="88"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="90"/>
         <source>Write depths of images to file.</source>
         <translation>Zapisuje głębokości zdjęć do pliku.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="133"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="92"/>
+        <source>Write dive as TeX macros to file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="137"/>
         <source>Export UDDF file as</source>
         <translation>Eksportuj plik UDDF jako</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="137"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/>
+        <source>UDDF files (*.uddf *.UDDF)</source>
+        <translation>Pliki UDDF  (*.uddf *.UDDF)</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divelogexportdialog.cpp" line="141"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="145"/>
         <source>Export CSV file as</source>
         <translation>Eksportuj plik CSV jako</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="148"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="142"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="146"/>
+        <source>CSV files (*.csv *.CSV)</source>
+        <translation>pliki CSV (*.csv *.CSV)</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="152"/>
         <source>Export world map</source>
         <translation>Eksport mapy świata</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="149"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="169"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="153"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="177"/>
         <source>HTML files (*.html)</source>
         <translation>Pliki HTML (*.html)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="153"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="157"/>
         <source>Export Subsurface XML</source>
         <translation>Eksport Subsurface XML</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="158"/>
         <source>XML files (*.xml *.ssrf)</source>
         <translation>Pliki XML (*.xml *.ssrf)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="162"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="166"/>
         <source>Save image depths</source>
         <translation>Zapisz głębokości zdjeć</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="168"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="170"/>
+        <source>Export to TeX file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="170"/>
+        <source>TeX files (*.tex)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="176"/>
         <source>Export HTML files as</source>
         <translation>Eksportuj pliki HTML jako</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="184"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="192"/>
         <source>Please wait, exporting...</source>
         <translation>Poczekaj proszę, trwa eksportowanie..</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="219"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="227"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="311"/>
         <source>Can&apos;t open file %s</source>
         <translation>Nie można otworzyć pliku %s</translation>
     </message>
@@ -2666,25 +2735,6 @@ GPS location:</source>
         <translation>Importowanie logów nurkowych</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="643"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="727"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="856"/>
-        <source>Time</source>
-        <translation>Czas</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.ui" line="127"/>
-        <location filename="../build/ui_divelogimportdialog.h" line="164"/>
-        <source>Metric</source>
-        <translation>Metryczny</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.ui" line="132"/>
-        <location filename="../build/ui_divelogimportdialog.h" line="165"/>
-        <source>Imperial</source>
-        <translation>Imperialny</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divelogimportdialog.ui" line="89"/>
         <location filename="../build/ui_divelogimportdialog.h" line="152"/>
         <source>dd.mm.yyyy</source>
@@ -2703,74 +2753,6 @@ GPS location:</source>
         <translation>yyyy-mm-dd</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.ui" line="155"/>
-        <location filename="../build/ui_divelogimportdialog.h" line="167"/>
-        <source>Drag the tags above to each corresponding column below</source>
-        <translation>Przeciągnij powyższe tagi do odpowiadających im kolumn poniżej</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="641"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="729"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="852"/>
-        <source>Dive #</source>
-        <translation>Nurkowanie nr</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="642"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="723"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="854"/>
-        <source>Date</source>
-        <translation>Data</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="644"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="858"/>
-        <source>Duration</source>
-        <translation>Czas</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="655"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="862"/>
-        <source>GPS</source>
-        <translation>GPS</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="645"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="864"/>
-        <source>Max. depth</source>
-        <translation>Maks. głębokość</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="646"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="866"/>
-        <source>Avg. depth</source>
-        <translation>Śr. głębokość </translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="658"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="872"/>
-        <source>Suit</source>
-        <translation>Skafander</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="663"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="878"/>
-        <source>Tags</source>
-        <translation>Tagi</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="652"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="894"/>
-        <source>O₂</source>
-        <translation>O₂</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="653"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="896"/>
-        <source>He</source>
-        <translation>He</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divelogimportdialog.ui" line="108"/>
         <location filename="../build/ui_divelogimportdialog.h" line="158"/>
         <source>Seconds</source>
@@ -2789,183 +2771,269 @@ GPS location:</source>
         <translation>Minuty:sekundy</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="654"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="860"/>
-        <source>Location</source>
-        <translation>Miejsce</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.ui" line="127"/>
+        <location filename="../build/ui_divelogimportdialog.h" line="164"/>
+        <source>Metric</source>
+        <translation>Metryczny</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.ui" line="132"/>
+        <location filename="../build/ui_divelogimportdialog.h" line="165"/>
+        <source>Imperial</source>
+        <translation>Imperialny</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.ui" line="155"/>
+        <location filename="../build/ui_divelogimportdialog.h" line="167"/>
+        <source>Drag the tags above to each corresponding column below</source>
+        <translation>Przeciągnij powyższe tagi do odpowiadających im kolumn poniżej</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="354"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="499"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="505"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="355"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="528"/>
         <source>Tab</source>
         <translation>Tab</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="575"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="598"/>
         <source>Some column headers were pre-populated; please drag and drop the headers so they match the column they are in.</source>
         <translation>Niektóre nagłówki kolumn zostały uzupełnione automatycznie; przeciągnij pozostałe nagłówki do odpowiadających im kolumn.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="613"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="731"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="782"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="848"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="636"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="761"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="857"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="925"/>
         <source>Sample time</source>
         <translation>Czas próbki</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="615"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="733"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="784"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="638"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="763"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="859"/>
         <source>Sample depth</source>
         <translation>Głębokość próbki</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="617"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="735"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="786"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="640"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="765"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="861"/>
         <source>Sample temperature</source>
         <translation>Temperatura próbki</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="621"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="739"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="790"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="642"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="767"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="863"/>
+        <source>Sample pO₂</source>
+        <translation>pO₂ próbki</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="644"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="769"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="865"/>
         <source>Sample sensor1 pO₂</source>
         <translation>1. czujnik pO₂</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="623"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="741"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="792"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="646"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="771"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="867"/>
         <source>Sample sensor2 pO₂</source>
         <translation>2. czujnik pO₂</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="625"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="743"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="794"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="648"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="773"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="869"/>
         <source>Sample sensor3 pO₂</source>
         <translation>3. czujnik pO₂</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="633"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="751"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="802"/>
-        <source>Sample stopdepth</source>
-        <translation>Przystanek próbki</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="637"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="755"/>
-        <source>Sample setpoint</source>
-        <translation>Setpoint</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="619"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="737"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="788"/>
-        <source>Sample pO₂</source>
-        <translation>pO₂ próbki</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="627"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="745"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="796"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="650"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="775"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="871"/>
         <source>Sample CNS</source>
         <translation>CNS próbki</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="629"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="747"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="798"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="652"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="777"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="873"/>
         <source>Sample NDL</source>
         <translation>NDL próbki</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="631"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="749"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="800"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="654"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="779"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="875"/>
         <source>Sample TTS</source>
         <translation>TTS próbki</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="635"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="753"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="804"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="656"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="781"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="877"/>
+        <source>Sample stopdepth</source>
+        <translation>Przystanek próbki</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="658"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="783"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="879"/>
         <source>Sample pressure</source>
         <translation>Ciśnienie próbki</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="656"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="868"/>
-        <source>Divemaster</source>
-        <translation>Divemaster</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="660"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="785"/>
+        <source>Sample setpoint</source>
+        <translation>Setpoint</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="657"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="870"/>
-        <source>Buddy</source>
-        <translation>Partner</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="664"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="759"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="929"/>
+        <source>Dive #</source>
+        <translation>Nurkowanie nr</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="659"/>
-        <source>Rating</source>
-        <translation>Ocena</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="665"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="753"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="931"/>
+        <source>Date</source>
+        <translation>Data</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="660"/>
-        <source>Visibility</source>
-        <translation>Widzialność</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="666"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="757"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="933"/>
+        <source>Time</source>
+        <translation>Czas</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="661"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="874"/>
-        <source>Notes</source>
-        <translation>Notatki</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="667"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="935"/>
+        <source>Duration</source>
+        <translation>Czas</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="662"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="876"/>
-        <source>Weight</source>
-        <translation>Balast</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="668"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="941"/>
+        <source>Max. depth</source>
+        <translation>Maks. głębokość</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="669"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="943"/>
+        <source>Avg. depth</source>
+        <translation>Śr. głębokość </translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="670"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="975"/>
+        <source>Air temp.</source>
+        <translation>Temp. powietrza</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="671"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="977"/>
+        <source>Water temp.</source>
+        <translation>Temp. wody</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="649"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="888"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="672"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="965"/>
         <source>Cyl. size</source>
         <translation>Rozmiar butli</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="650"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="890"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="673"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="967"/>
         <source>Start pressure</source>
         <translation>Ciśnienie początkowe</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="651"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="892"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="674"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="969"/>
         <source>End pressure</source>
         <translation>Ciśnienie końcowe</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="647"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="898"/>
-        <source>Air temp.</source>
-        <translation>Temp. powietrza</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="675"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="971"/>
+        <source>O₂</source>
+        <translation>O₂</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="648"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="900"/>
-        <source>Water temp.</source>
-        <translation>Temp. wody</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="676"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="973"/>
+        <source>He</source>
+        <translation>He</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="677"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="937"/>
+        <source>Location</source>
+        <translation>Miejsce</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="678"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="939"/>
+        <source>GPS</source>
+        <translation>GPS</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="679"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="945"/>
+        <source>Divemaster</source>
+        <translation>Divemaster</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="680"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="947"/>
+        <source>Buddy</source>
+        <translation>Partner</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="681"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="949"/>
+        <source>Suit</source>
+        <translation>Skafander</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="682"/>
+        <source>Rating</source>
+        <translation>Ocena</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="683"/>
+        <source>Visibility</source>
+        <translation>Widzialność</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="684"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="951"/>
+        <source>Notes</source>
+        <translation>Notatki</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="685"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="953"/>
+        <source>Weight</source>
+        <translation>Balast</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="686"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="955"/>
+        <source>Tags</source>
+        <translation>Tagi</translation>
     </message>
 </context>
 <context>
     <name>DiveObjectHelper</name>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="287"/>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="323"/>
         <source>%1 dive(s)</source>
         <translation type="unfinished"/>
     </message>
@@ -2973,18 +3041,18 @@ GPS location:</source>
 <context>
     <name>DivePlanner</name>
     <message>
-        <location filename="../desktop-widgets/diveplanner.ui" line="152"/>
-        <location filename="../build/ui_diveplanner.h" line="190"/>
-        <source>Altitude</source>
-        <translation>Wysokość</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/diveplanner.ui" line="109"/>
         <location filename="../build/ui_diveplanner.h" line="189"/>
         <source>Planned dive time</source>
         <translation>Planowany czas zanurzenia</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/diveplanner.ui" line="152"/>
+        <location filename="../build/ui_diveplanner.h" line="190"/>
+        <source>Altitude</source>
+        <translation>Wysokość</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/diveplanner.ui" line="159"/>
         <location filename="../build/ui_diveplanner.h" line="191"/>
         <source>ATM pressure</source>
@@ -3018,32 +3086,32 @@ GPS location:</source>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="134"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="136"/>
         <source>unknown</source>
         <translation>nieznana</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="312"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="326"/>
         <source>Final depth</source>
         <translation>Głębokość końcowa</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="314"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="328"/>
         <source>Run time</source>
         <translation>Czas</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="316"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="330"/>
         <source>Duration</source>
         <translation>Czas trwania</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="318"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="332"/>
         <source>Used gas</source>
         <translation>Używany gaz</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="320"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="334"/>
         <source>CC setpoint</source>
         <translation>CC setpoint</translation>
     </message>
@@ -3051,22 +3119,22 @@ GPS location:</source>
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="108"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="112"/>
         <source>Dive planner points</source>
         <translation>Plan nurkowy</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="112"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="116"/>
         <source>Available gases</source>
         <translation>Dostępne gazy</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="137"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="143"/>
         <source>Add dive data point</source>
         <translation>dodaj punkt do profilu</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="146"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="152"/>
         <source>Save new</source>
         <translation>Zapisz nowy</translation>
     </message>
@@ -3099,11 +3167,36 @@ GPS location:</source>
         <translation>Kolor</translation>
     </message>
     <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="124"/>
+        <source>User entered</source>
+        <translation>Podane przez użytkownika</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="126"/>
+        <source>Cylinder index</source>
+        <translation>Numer butli</translation>
+    </message>
+    <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="128"/>
         <source>Pressure S</source>
         <translation>Ciśnienie S</translation>
     </message>
     <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="130"/>
+        <source>Pressure I</source>
+        <translation>Ciśnienie I</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="132"/>
+        <source>Ceiling</source>
+        <translation>Sufit</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="134"/>
+        <source>SAC</source>
+        <translation>SAC</translation>
+    </message>
+    <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="136"/>
         <source>pN₂</source>
         <translation>pN₂</translation>
@@ -3139,49 +3232,24 @@ GPS location:</source>
         <translation>Czujnik 3</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="152"/>
-        <source>Heart rate</source>
-        <translation>Tętno</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="156"/>
-        <source>Mean depth @ s</source>
-        <translation>Głębokość średnia @ s</translation>
-    </message>
-    <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="150"/>
         <source>Ambient pressure</source>
         <translation>Cisnienie otoczenia</translation>
     </message>
     <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="152"/>
+        <source>Heart rate</source>
+        <translation>Tętno</translation>
+    </message>
+    <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="154"/>
         <source>Gradient factor</source>
         <translation>Gradient factor</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="130"/>
-        <source>Pressure I</source>
-        <translation>Ciśnienie I</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="124"/>
-        <source>User entered</source>
-        <translation>Podane przez użytkownika</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="126"/>
-        <source>Cylinder index</source>
-        <translation>Numer butli</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="132"/>
-        <source>Ceiling</source>
-        <translation>Sufit</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="134"/>
-        <source>SAC</source>
-        <translation>SAC</translation>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="156"/>
+        <source>Mean depth @ s</source>
+        <translation>Głębokość średnia @ s</translation>
     </message>
 </context>
 <context>
@@ -3252,311 +3320,315 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="395"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="441"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="434"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="483"/>
         <source>#</source>
         <translation>Nr</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="398"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="444"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="437"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="486"/>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="401"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="447"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="440"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="489"/>
         <source>Rating</source>
         <translation>Ocena</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="404"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="443"/>
         <source>Depth</source>
         <translation>Głębokość</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="410"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="446"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="495"/>
+        <source>Duration</source>
+        <translation>Czas trwania</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="449"/>
         <source>Temp</source>
         <translation>Temperatura</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="413"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="452"/>
         <source>Weight</source>
         <translation>Balast</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="425"/>
-        <source>SAC</source>
-        <translation>SAC</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
-        <source>m</source>
-        <translation>m</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
-        <source>ft</source>
-        <translation>ft</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
-        <source>Weight(%1)</source>
-        <translation>Balast(%1)</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="416"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="462"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="455"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="504"/>
         <source>Suit</source>
         <translation>Skafander</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="419"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="465"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="458"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="507"/>
         <source>Cyl</source>
         <translation>Butle</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="422"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="468"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="461"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="510"/>
         <source>Gas</source>
         <translation>Gaz</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
-        <source>SAC(%1)</source>
-        <translation>SAC(%1)</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="464"/>
+        <source>SAC</source>
+        <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
-        <source>/min</source>
-        <translation>/min</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="467"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="518"/>
+        <source>OTU</source>
+        <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="431"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="479"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="470"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="521"/>
         <source>Max CNS</source>
         <translation>Max CNS</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="434"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="482"/>
-        <source>Location</source>
-        <translation>Miejsce</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
+        <source>Photos</source>
+        <translation>Zdjęcia</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
-        <source>kg</source>
-        <translation>kg</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="476"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="527"/>
+        <source>Location</source>
+        <translation>Miejsce</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="492"/>
         <source>Depth(%1)</source>
         <translation>Głębokość(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="407"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="453"/>
-        <source>Duration</source>
-        <translation>Czas trwania</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="492"/>
+        <source>m</source>
+        <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="456"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="492"/>
+        <source>ft</source>
+        <translation>ft</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="498"/>
         <source>Temp(%1%2)</source>
         <translation>Temperatura(%1%2)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="501"/>
+        <source>Weight(%1)</source>
+        <translation>Balast(%1)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="501"/>
+        <source>kg</source>
+        <translation>kg</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="501"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="428"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="476"/>
-        <source>OTU</source>
-        <translation>OTU</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="515"/>
+        <source>SAC(%1)</source>
+        <translation>SAC(%1)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="515"/>
+        <source>/min</source>
+        <translation>/min</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="524"/>
+        <source>Photos before/during/after dive</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="164"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="165"/>
         <source>no dives were selected</source>
         <translation>nie wybrano żadnych nurkowań</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="174"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="175"/>
         <source>stylesheet to export to divelogs.de is not found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="184"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="185"/>
         <source>failed to create zip file for upload: %s</source>
         <translation>nie udało się utworzyć pliku zip do wysłania: %s</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="236"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="237"/>
         <source>internal error</source>
         <translation>błąd wewnętrzny</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="244"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="245"/>
         <source>Conversion of dive %1 to divelogs.de format failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="272"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="273"/>
         <source>error writing zip file: %s zip error %d system error %d - %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="745"/>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="935"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="936"/>
         <source>Done</source>
         <translation>Zakończ</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="778"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="779"/>
         <source>Uploading dive list...</source>
         <translation>Wysyłanie listy nurkowań...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="810"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="811"/>
         <source>Downloading dive list...</source>
         <translation>Pobieranie listy nurkowań...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="851"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="852"/>
         <source>Downloading %1 dives...</source>
         <translation>Pobieranie %1 nurkowań...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="885"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="886"/>
         <source>Download finished - %1</source>
         <translation>Zakończono pobieranie - %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="899"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="900"/>
         <source>Problem with download</source>
         <translation>Problem z pobieraniem</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="900"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="901"/>
         <source>The archive could not be opened:
 </source>
         <translation>Nie udało się otworzyć archiwum:
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="909"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="910"/>
         <source>Corrupted download</source>
         <translation>Pobrano uskodzone dane</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="910"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="911"/>
         <source>The archive could not be opened:
 %1</source>
         <translation>Archiwum nie mogło zostać otworzone:
 %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="937"/>
+        <source>Upload finished</source>
+        <translation>Wysyłanie zakończone</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="950"/>
         <source>Upload failed</source>
         <translation>Wysyłanie nieudane</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="952"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="953"/>
         <source>Upload successful</source>
         <translation>Wysyłanie zakończone sukcesem</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="955"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="956"/>
         <source>Login failed</source>
         <translation>Błąd logowania</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="958"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="959"/>
         <source>Cannot parse response</source>
         <translation>Nie można przetworzyć odpowiedzi</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="970"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="971"/>
         <source>Error: %1</source>
         <translation>Błąd: %1</translation>
     </message>
-    <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="936"/>
-        <source>Upload finished</source>
-        <translation>Wysyłanie zakończone</translation>
-    </message>
 </context>
 <context>
     <name>DownloadFromDCWidget</name>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="185"/>
-        <source>Error</source>
-        <translation>Błąd</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="436"/>
-        <source>Retry</source>
-        <translation>Ponów</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="280"/>
-        <source>Find Uemis dive computer</source>
-        <translation>Wykryj komputer Uemis</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="101"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="107"/>
         <source>Download</source>
         <translation>Pobierz</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="104"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="110"/>
         <source>Choose Bluetooth download mode</source>
         <translation>Wybierz tryb pobierania Bluetooth</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="382"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="191"/>
+        <source>Error</source>
+        <translation>Błąd</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="286"/>
+        <source>Find Uemis dive computer</source>
+        <translation>Wykryj komputer Uemis</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="392"/>
         <source>Choose file for divecomputer download logfile</source>
         <translation>Wybierz plik używany do logowania postępu pobierania danych</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="383"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="393"/>
         <source>Log files (*.log)</source>
         <translation>Pliki logów (*.log)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="398"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="408"/>
         <source>Warning</source>
         <translation>Ostrzeżenie</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="399"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="409"/>
         <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="../desktop-widgets/downloadfromdivecomputer.cpp" line="410"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="420"/>
         <source>Choose file for divecomputer binary dump file</source>
         <translation>Wybierz plik do którego zapisane zostaną dane binarne</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="411"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="421"/>
         <source>Dump files (*.bin)</source>
         <translation>Pliki binarne (*.bin)</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="446"/>
+        <source>Retry</source>
+        <translation>Ponów</translation>
+    </message>
 </context>
 <context>
     <name>DownloadFromDiveComputer</name>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="139"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="275"/>
-        <source>Vendor</source>
-        <translation>Producent</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="14"/>
         <location filename="../build/ui_downloadfromdivecomputer.h" line="265"/>
         <source>Download from dive computer</source>
@@ -3569,17 +3641,6 @@ p, li { white-space: pre-wrap; }
         <translation>Urządzenie lub punkt montowania</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="122"/>
-        <source>Choose Bluetooth download mode</source>
-        <translation>Wybierz tryb pobierania Bluetooth</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="149"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="276"/>
-        <source>Dive computer</source>
-        <translation>Komputer nurkowy</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="66"/>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="101"/>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="115"/>
@@ -3603,11 +3664,46 @@ p, li { white-space: pre-wrap; }
         <translation>Pobrane dane mają priorytet </translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="87"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="270"/>
+        <source>Download into new trip</source>
+        <translation>Dodaj do nowej grupy</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="94"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="271"/>
+        <source>Save libdivecomputer logfile</source>
+        <translation>Zapisz log postępu libdivecomputer </translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="108"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="273"/>
+        <source>Save libdivecomputer dumpfile</source>
+        <translation>Zapisz zrzut danych libdivecomputer</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="122"/>
+        <source>Choose Bluetooth download mode</source>
+        <translation>Wybierz tryb pobierania Bluetooth</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="129"/>
         <source>Select a remote Bluetooth device.</source>
         <translation>Wybierz zdalne urządzenie </translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="139"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="275"/>
+        <source>Vendor</source>
+        <translation>Producent</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="149"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="276"/>
+        <source>Dive computer</source>
+        <translation>Komputer nurkowy</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/>
         <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="52"/>
         <location filename="../build/ui_downloadfromdivecomputer.h" line="277"/>
@@ -3615,18 +3711,6 @@ p, li { white-space: pre-wrap; }
         <translation>Pobierz</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="284"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="281"/>
-        <source>OK</source>
-        <translation>OK</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="291"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="282"/>
-        <source>Cancel</source>
-        <translation>Anuluj</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="226"/>
         <location filename="../build/ui_downloadfromdivecomputer.h" line="278"/>
         <source>Downloaded dives</source>
@@ -3645,22 +3729,16 @@ p, li { white-space: pre-wrap; }
         <translation>Odznacz wszystko</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="94"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="271"/>
-        <source>Save libdivecomputer logfile</source>
-        <translation>Zapisz log postępu libdivecomputer </translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="108"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="273"/>
-        <source>Save libdivecomputer dumpfile</source>
-        <translation>Zapisz zrzut danych libdivecomputer</translation>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="284"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="281"/>
+        <source>OK</source>
+        <translation>OK</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="87"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="270"/>
-        <source>Download into new trip</source>
-        <translation>Dodaj do nowej grupy</translation>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="291"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="282"/>
+        <source>Cancel</source>
+        <translation>Anuluj</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="16"/>
@@ -3750,12 +3828,12 @@ p, li { white-space: pre-wrap; }
         <translation>Połącz z Facebook</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="297"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="242"/>
         <source>To disconnect Subsurface from your Facebook account, use the button below</source>
         <translation>Użyj przycisku poniżej, żeby odłączyć Subsurface od swojego konta na Facebooku</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="306"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="251"/>
         <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source>
         <translation>Zaloguj się, aby połączyć się z Facebookiem. Pozwoli to Subsurface publikować nurkowania na Twojej osi czasu.</translation>
     </message>
@@ -3763,22 +3841,22 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>FacebookManager</name>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="266"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="211"/>
         <source>Photo upload sucessfull</source>
         <translation>Wysyłanie zdjęć zakończone sukcesem</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="267"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="212"/>
         <source>Your dive profile was updated to Facebook.</source>
         <translation>Twój profil nurkowania został wysłany do Facebooka.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="271"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="216"/>
         <source>Photo upload failed</source>
         <translation>Wysyłanie zdjęć nieudane</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="272"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="217"/>
         <source>Your dive profile was not updated to Facebook, 
  please send the following to the developer. 
 </source>
@@ -3839,17 +3917,25 @@ Prześlij proszę poniższą informację programistom Subsurface.</translation>
 <context>
     <name>FirmwareUpdateThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1750"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1739"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Ta opcja nie jest jeszcze dostępna dla wybranego komputera.</translation>
     </message>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1755"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1744"/>
         <source>Firmware update failed!</source>
         <translation>Aktualizacja oprogramowania nieudana!</translation>
     </message>
 </context>
 <context>
+    <name>GlobalDrawer</name>
+    <message>
+        <location filename="../mobile-widgets/qml/kirigami/src/controls/GlobalDrawer.qml" line="364"/>
+        <source>Back</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>GlobeGPS</name>
     <message>
         <location filename="../desktop-widgets/globe.cpp" line="124"/>
@@ -3865,27 +3951,27 @@ Prześlij proszę poniższą informację programistom Subsurface.</translation>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="40"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="32"/>
         <source>Date: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="50"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="42"/>
         <source>Name: </source>
         <translation>Nazwa:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="60"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="52"/>
         <source>Latitude: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="69"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="61"/>
         <source>Longitude: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="113"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="105"/>
         <source>List of stored GPS fixes</source>
         <translation type="unfinished"/>
     </message>
@@ -3914,7 +4000,7 @@ Prześlij proszę poniższą informację programistom Subsurface.</translation>
 <context>
     <name>LocationFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="648"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="646"/>
         <source>Location: </source>
         <translation>Miejsce:</translation>
     </message>
@@ -3955,7 +4041,7 @@ Prześlij proszę poniższą informację programistom Subsurface.</translation>
 <context>
     <name>LocationFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="299"/>
+        <location filename="../qt-models/filtermodels.cpp" line="304"/>
         <source>No location set</source>
         <translation>nie podano miejsca</translation>
     </message>
@@ -4077,20 +4163,55 @@ Czy na pewno kontynuować?</translation>
     </message>
 </context>
 <context>
-    <name>MainForm.ui</name>
+    <name>MainTab</name>
     <message>
-        <location filename="../packaging/ios/Subsurface-mobile/MainForm.ui.qml" line="17"/>
-        <source>Press Me 1</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/maintab.ui" line="18"/>
+        <location filename="../desktop-widgets/maintab.ui" line="439"/>
+        <location filename="../build/ui_maintab.h" line="961"/>
+        <location filename="../build/ui_maintab.h" line="963"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="539"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="571"/>
+        <source>Notes</source>
+        <translation>Opis</translation>
     </message>
     <message>
-        <location filename="../packaging/ios/Subsurface-mobile/MainForm.ui.qml" line="22"/>
-        <source>Press Me 2</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/maintab.ui" line="21"/>
+        <location filename="../build/ui_maintab.h" line="964"/>
+        <source>General notes about the current selection</source>
+        <translation>Ogólny opis i notatki dotyczące tego nurkowania</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="92"/>
+        <location filename="../desktop-widgets/maintab.ui" line="646"/>
+        <location filename="../build/ui_maintab.h" line="947"/>
+        <location filename="../build/ui_maintab.h" line="967"/>
+        <source>Date</source>
+        <translation>Data</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="102"/>
+        <location filename="../build/ui_maintab.h" line="948"/>
+        <source>Time</source>
+        <translation>Czas</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="112"/>
+        <location filename="../desktop-widgets/maintab.ui" line="836"/>
+        <location filename="../build/ui_maintab.h" line="949"/>
+        <location filename="../build/ui_maintab.h" line="987"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="306"/>
+        <source>Air temp.</source>
+        <translation>Temp. powietrza</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="122"/>
+        <location filename="../desktop-widgets/maintab.ui" line="855"/>
+        <location filename="../build/ui_maintab.h" line="950"/>
+        <location filename="../build/ui_maintab.h" line="989"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="307"/>
+        <source>Water temp.</source>
+        <translation>Temp. wody</translation>
     </message>
-</context>
-<context>
-    <name>MainTab</name>
     <message>
         <location filename="../desktop-widgets/maintab.ui" line="184"/>
         <location filename="../build/ui_maintab.h" line="951"/>
@@ -4099,6 +4220,17 @@ Czy na pewno kontynuować?</translation>
         <translation>Miejsce</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="214"/>
+        <source>Edit dive site</source>
+        <translation>Edycja miejsca nurkowego</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="217"/>
+        <location filename="../build/ui_maintab.h" line="953"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="252"/>
         <location filename="../build/ui_maintab.h" line="954"/>
         <source>Divemaster</source>
@@ -4111,12 +4243,6 @@ Czy na pewno kontynuować?</translation>
         <translation>Partner</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.ui" line="387"/>
-        <location filename="../build/ui_maintab.h" line="959"/>
-        <source>Tags</source>
-        <translation>Tagi</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/maintab.ui" line="308"/>
         <location filename="../build/ui_maintab.h" line="956"/>
         <source>Rating</source>
@@ -4135,57 +4261,18 @@ Czy na pewno kontynuować?</translation>
         <translation>Skafander</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="387"/>
+        <location filename="../build/ui_maintab.h" line="959"/>
+        <source>Tags</source>
+        <translation>Tagi</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="397"/>
         <location filename="../build/ui_maintab.h" line="960"/>
         <source>Dive mode</source>
         <translation>Rodzaj</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.ui" line="112"/>
-        <location filename="../desktop-widgets/maintab.ui" line="836"/>
-        <location filename="../build/ui_maintab.h" line="949"/>
-        <location filename="../build/ui_maintab.h" line="987"/>
-        <location filename="../desktop-widgets/maintab.cpp" line="306"/>
-        <source>Air temp.</source>
-        <translation>Temp. powietrza</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="122"/>
-        <location filename="../desktop-widgets/maintab.ui" line="855"/>
-        <location filename="../build/ui_maintab.h" line="950"/>
-        <location filename="../build/ui_maintab.h" line="989"/>
-        <location filename="../desktop-widgets/maintab.cpp" line="307"/>
-        <source>Water temp.</source>
-        <translation>Temp. wody</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="18"/>
-        <location filename="../desktop-widgets/maintab.ui" line="439"/>
-        <location filename="../build/ui_maintab.h" line="961"/>
-        <location filename="../build/ui_maintab.h" line="963"/>
-        <location filename="../desktop-widgets/maintab.cpp" line="539"/>
-        <location filename="../desktop-widgets/maintab.cpp" line="571"/>
-        <source>Notes</source>
-        <translation>Opis</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="21"/>
-        <location filename="../build/ui_maintab.h" line="964"/>
-        <source>General notes about the current selection</source>
-        <translation>Ogólny opis i notatki dotyczące tego nurkowania</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="214"/>
-        <source>Edit dive site</source>
-        <translation>Edycja miejsca nurkowego</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="217"/>
-        <location filename="../build/ui_maintab.h" line="953"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/maintab.ui" line="491"/>
         <location filename="../build/ui_maintab.h" line="965"/>
         <source>Equipment</source>
@@ -4210,6 +4297,12 @@ Czy na pewno kontynuować?</translation>
         <translation>Informacje o nurkowaniu</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="665"/>
+        <location filename="../build/ui_maintab.h" line="969"/>
+        <source>Interval</source>
+        <translation>Przerwa powierzchniowa</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="684"/>
         <location filename="../build/ui_maintab.h" line="971"/>
         <source>Gases used</source>
@@ -4222,18 +4315,38 @@ Czy na pewno kontynuować?</translation>
         <translation>Zużyty gaz</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="722"/>
+        <location filename="../desktop-widgets/maintab.ui" line="1094"/>
+        <location filename="../build/ui_maintab.h" line="975"/>
+        <location filename="../build/ui_maintab.h" line="1003"/>
+        <source>SAC</source>
+        <translation>SAC</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="741"/>
         <location filename="../build/ui_maintab.h" line="977"/>
         <source>CNS</source>
         <translation>CNS</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="760"/>
+        <location filename="../build/ui_maintab.h" line="979"/>
+        <source>OTU</source>
+        <translation>OTU</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="779"/>
         <location filename="../build/ui_maintab.h" line="981"/>
         <source>Max. depth</source>
         <translation>Maks. głębokość</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="798"/>
+        <location filename="../build/ui_maintab.h" line="983"/>
+        <source>Avg. depth</source>
+        <translation>Śr. głębokość </translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="817"/>
         <location filename="../build/ui_maintab.h" line="985"/>
         <source>Air pressure</source>
@@ -4246,83 +4359,6 @@ Czy na pewno kontynuować?</translation>
         <translation>Czas nurkowania</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.ui" line="933"/>
-        <location filename="../build/ui_maintab.h" line="1007"/>
-        <source>Simple statistics about the selection</source>
-        <translation>Statystyka dla wybranych nurkowań</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1039"/>
-        <location filename="../build/ui_maintab.h" line="999"/>
-        <source>Total time</source>
-        <translation>Całkowity czas</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1106"/>
-        <location filename="../build/ui_maintab.h" line="1004"/>
-        <source>Gas consumption</source>
-        <translation>Zużycie gazu
-</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1151"/>
-        <location filename="../build/ui_maintab.h" line="1009"/>
-        <source>All photos from the current selection</source>
-        <translation>Wszystkie zdjęcia z wybranych nurkowań</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1177"/>
-        <location filename="../build/ui_maintab.h" line="1010"/>
-        <source>Extra data</source>
-        <translation>Dodatkowe</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1180"/>
-        <location filename="../build/ui_maintab.h" line="1011"/>
-        <source>Adittional data from the dive computer</source>
-        <translation>Dodatkowe dane z komputera nurkowego</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="92"/>
-        <location filename="../desktop-widgets/maintab.ui" line="646"/>
-        <location filename="../build/ui_maintab.h" line="947"/>
-        <location filename="../build/ui_maintab.h" line="967"/>
-        <source>Date</source>
-        <translation>Data</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="102"/>
-        <location filename="../build/ui_maintab.h" line="948"/>
-        <source>Time</source>
-        <translation>Czas</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="665"/>
-        <location filename="../build/ui_maintab.h" line="969"/>
-        <source>Interval</source>
-        <translation>Przerwa powierzchniowa</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="722"/>
-        <location filename="../desktop-widgets/maintab.ui" line="1094"/>
-        <location filename="../build/ui_maintab.h" line="975"/>
-        <location filename="../build/ui_maintab.h" line="1003"/>
-        <source>SAC</source>
-        <translation>SAC</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="798"/>
-        <location filename="../build/ui_maintab.h" line="983"/>
-        <source>Avg. depth</source>
-        <translation>Śr. głębokość </translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="760"/>
-        <location filename="../build/ui_maintab.h" line="979"/>
-        <source>OTU</source>
-        <translation>OTU</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/maintab.ui" line="893"/>
         <location filename="../build/ui_maintab.h" line="993"/>
         <source>Salinity</source>
@@ -4335,22 +4371,34 @@ Czy na pewno kontynuować?</translation>
         <translation>Statystyka</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="933"/>
+        <location filename="../build/ui_maintab.h" line="1007"/>
+        <source>Simple statistics about the selection</source>
+        <translation>Statystyka dla wybranych nurkowań</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="986"/>
         <location filename="../build/ui_maintab.h" line="996"/>
         <source>Depth</source>
         <translation>Głębokość</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="998"/>
+        <location filename="../build/ui_maintab.h" line="997"/>
+        <source>Duration</source>
+        <translation>Czas</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="1027"/>
         <location filename="../build/ui_maintab.h" line="998"/>
         <source>Temperature</source>
         <translation>Temperatura</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.ui" line="998"/>
-        <location filename="../build/ui_maintab.h" line="997"/>
-        <source>Duration</source>
-        <translation>Czas</translation>
+        <location filename="../desktop-widgets/maintab.ui" line="1039"/>
+        <location filename="../build/ui_maintab.h" line="999"/>
+        <source>Total time</source>
+        <translation>Całkowity czas</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/maintab.ui" line="1058"/>
@@ -4359,20 +4407,35 @@ Czy na pewno kontynuować?</translation>
         <translation>Nurkowania</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="1106"/>
+        <location filename="../build/ui_maintab.h" line="1004"/>
+        <source>Gas consumption</source>
+        <translation>Zużycie gazu
+</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="1148"/>
         <location filename="../build/ui_maintab.h" line="1008"/>
         <source>Photos</source>
         <translation>Zdjęcia</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.cpp" line="88"/>
-        <source>Cylinders</source>
-        <translation>Butle</translation>
+        <location filename="../desktop-widgets/maintab.ui" line="1151"/>
+        <location filename="../build/ui_maintab.h" line="1009"/>
+        <source>All photos from the current selection</source>
+        <translation>Wszystkie zdjęcia z wybranych nurkowań</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.cpp" line="92"/>
-        <source>Weights</source>
-        <translation>Balast</translation>
+        <location filename="../desktop-widgets/maintab.ui" line="1177"/>
+        <location filename="../build/ui_maintab.h" line="1010"/>
+        <source>Extra data</source>
+        <translation>Dodatkowe</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="1180"/>
+        <location filename="../build/ui_maintab.h" line="1011"/>
+        <source>Adittional data from the dive computer</source>
+        <translation>Dodatkowe dane z komputera nurkowego</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/maintab.cpp" line="63"/>
@@ -4385,11 +4448,21 @@ Czy na pewno kontynuować?</translation>
         <translation>Porzuć zmiany</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.cpp" line="88"/>
+        <source>Cylinders</source>
+        <translation>Butle</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.cpp" line="89"/>
         <source>Add cylinder</source>
         <translation>Dodaj butlę</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.cpp" line="92"/>
+        <source>Weights</source>
+        <translation>Balast</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.cpp" line="93"/>
         <source>Add weight system</source>
         <translation>Dodaj balast</translation>
@@ -4582,659 +4655,685 @@ z powietrza przy użyciu:
         <translation>Plik</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="455"/>
-        <location filename="../build/ui_mainwindow.h" line="534"/>
-        <source>Export dive logs</source>
-        <translation>Eksport nurkowań</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="510"/>
-        <location filename="../build/ui_mainwindow.h" line="542"/>
-        <source>Toggle pHe graph</source>
-        <translation>Pokazuj wykres pHe</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="546"/>
-        <location filename="../build/ui_mainwindow.h" line="545"/>
-        <source>Toggle calculating all tissues</source>
-        <translation>Obliczenia dla wszystkich tkanek</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="522"/>
-        <location filename="../build/ui_mainwindow.h" line="543"/>
-        <source>Toggle DC reported ceiling</source>
-        <translation>Pokazuj sufit z komputera nurkowego</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="534"/>
-        <location filename="../build/ui_mainwindow.h" line="544"/>
-        <source>Toggle calculated ceiling</source>
-        <translation>Pokazuj obliczony sufit</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="606"/>
-        <location filename="../build/ui_mainwindow.h" line="550"/>
-        <source>Toggle NDL, TTS</source>
-        <translation>Pokazuj NDL / TTS</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="558"/>
-        <location filename="../build/ui_mainwindow.h" line="546"/>
-        <source>Toggle calculated ceiling with 3m increments</source>
-        <translation>Pokazuj obliczony sufit z krokiem 3m</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="463"/>
-        <location filename="../build/ui_mainwindow.h" line="537"/>
-        <source>Configure &amp;dive computer</source>
-        <translation>Konfiguruj komputer nurkowy</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="570"/>
-        <location filename="../build/ui_mainwindow.h" line="547"/>
-        <source>Toggle heart rate</source>
-        <translation>Pokazuj tętno</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="582"/>
-        <location filename="../build/ui_mainwindow.h" line="548"/>
-        <source>Toggle MOD</source>
-        <translation>Pokazuj MOD</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="594"/>
-        <location filename="../build/ui_mainwindow.h" line="549"/>
-        <source>Toggle EAD, END, EADD</source>
-        <translation>Pokazuj EAD, END, EADD</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="618"/>
-        <location filename="../build/ui_mainwindow.h" line="551"/>
-        <source>Toggle SAC rate</source>
-        <translation>Pokazuj SAC</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="630"/>
-        <location filename="../build/ui_mainwindow.h" line="552"/>
-        <source>Toggle ruler</source>
-        <translation>Pokazuj linijkę</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="86"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="87"/>
         <location filename="../build/ui_mainwindow.h" line="569"/>
         <source>&amp;Log</source>
         <translation>Log</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="105"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="104"/>
         <location filename="../build/ui_mainwindow.h" line="570"/>
         <source>&amp;View</source>
         <translation>Widok</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="121"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="120"/>
         <location filename="../build/ui_mainwindow.h" line="571"/>
         <source>&amp;Help</source>
         <translation>Pomoc</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="130"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="129"/>
         <location filename="../build/ui_mainwindow.h" line="572"/>
         <source>&amp;Import</source>
         <translation>Import</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="139"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="138"/>
         <location filename="../build/ui_mainwindow.h" line="573"/>
         <source>&amp;Edit</source>
         <translation>Edytuj</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="144"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="143"/>
         <source>Share on</source>
         <translation>Publikuj na</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="158"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="157"/>
         <location filename="../build/ui_mainwindow.h" line="453"/>
         <source>&amp;New logbook</source>
         <translation>Nowy logbook</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="161"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="160"/>
         <location filename="../build/ui_mainwindow.h" line="455"/>
         <source>New</source>
         <translation>Nowy</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="164"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="163"/>
         <location filename="../build/ui_mainwindow.h" line="457"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="169"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="168"/>
         <location filename="../build/ui_mainwindow.h" line="458"/>
         <source>&amp;Open logbook</source>
         <translation>Otwórz logbook</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="172"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="171"/>
         <location filename="../build/ui_mainwindow.h" line="460"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="508"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="502"/>
         <source>Open</source>
         <translation>Otwórz</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="175"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="174"/>
         <location filename="../build/ui_mainwindow.h" line="462"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="180"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="179"/>
         <location filename="../build/ui_mainwindow.h" line="463"/>
         <source>&amp;Save</source>
         <translation>Zapisz</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="183"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="182"/>
         <location filename="../build/ui_mainwindow.h" line="465"/>
         <source>Save</source>
         <translation>Zapisz</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="186"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="185"/>
         <location filename="../build/ui_mainwindow.h" line="467"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="191"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="190"/>
         <location filename="../build/ui_mainwindow.h" line="468"/>
         <source>Sa&amp;ve as</source>
         <translation>Zapisz jako</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="194"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="193"/>
         <location filename="../build/ui_mainwindow.h" line="470"/>
         <source>Save as</source>
         <translation>Zapisz jako</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="197"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="196"/>
         <location filename="../build/ui_mainwindow.h" line="472"/>
         <source>Ctrl+Shift+S</source>
         <translation>Ctrl+Shift+S</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="202"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="201"/>
         <location filename="../build/ui_mainwindow.h" line="473"/>
         <source>&amp;Close</source>
         <translation>Zamknij</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="205"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="204"/>
         <location filename="../build/ui_mainwindow.h" line="475"/>
         <source>Close</source>
         <translation>Zamknij</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="208"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="207"/>
         <location filename="../build/ui_mainwindow.h" line="477"/>
         <source>Ctrl+W</source>
         <translation>Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="221"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="212"/>
+        <location filename="../build/ui_mainwindow.h" line="478"/>
+        <source>&amp;Print</source>
+        <translation>Drukuj</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="215"/>
+        <location filename="../build/ui_mainwindow.h" line="479"/>
+        <source>Ctrl+P</source>
+        <translation>Ctrl+P</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="220"/>
         <location filename="../build/ui_mainwindow.h" line="480"/>
         <source>P&amp;references</source>
         <translation>Ustawienia</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="251"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="223"/>
+        <location filename="../build/ui_mainwindow.h" line="481"/>
+        <source>Ctrl+,</source>
+        <translation>Ctrl+,</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="231"/>
+        <location filename="../build/ui_mainwindow.h" line="482"/>
+        <source>&amp;Quit</source>
+        <translation>Wyjdź</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="234"/>
+        <location filename="../build/ui_mainwindow.h" line="483"/>
+        <source>Ctrl+Q</source>
+        <translation>Ctrl+Q</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="242"/>
+        <location filename="../build/ui_mainwindow.h" line="484"/>
+        <source>Import from &amp;dive computer</source>
+        <translation>Importuj z komputera nurkowego</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="245"/>
+        <location filename="../build/ui_mainwindow.h" line="485"/>
+        <source>Ctrl+D</source>
+        <translation>Ctrl+D</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="250"/>
         <location filename="../build/ui_mainwindow.h" line="486"/>
         <source>Import &amp;GPS data from Subsurface web service</source>
         <translation>Importuj dane GPS z usługi sieciowej Subsurface</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="259"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="253"/>
+        <location filename="../build/ui_mainwindow.h" line="487"/>
+        <source>Ctrl+G</source>
+        <translation>Ctrl+G</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="258"/>
         <location filename="../build/ui_mainwindow.h" line="488"/>
         <source>Edit device &amp;names</source>
         <translation>Edycja nazw komputerów nurkowych</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="272"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="263"/>
+        <location filename="../build/ui_mainwindow.h" line="489"/>
+        <source>&amp;Add dive</source>
+        <translation>Dodaj nurkowanie</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="266"/>
+        <location filename="../build/ui_mainwindow.h" line="490"/>
+        <source>Ctrl++</source>
+        <translation>Ctrl++</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="271"/>
         <location filename="../build/ui_mainwindow.h" line="491"/>
         <source>&amp;Edit dive</source>
         <translation>Edytuj nurkowanie</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="277"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="276"/>
         <location filename="../build/ui_mainwindow.h" line="492"/>
         <source>&amp;Copy dive components</source>
         <translation>Kopiuj parametry nurkowania</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="280"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="279"/>
         <location filename="../build/ui_mainwindow.h" line="493"/>
         <source>Ctrl+C</source>
         <translation>Ctrl+C</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="285"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="284"/>
         <location filename="../build/ui_mainwindow.h" line="494"/>
         <source>&amp;Paste dive components</source>
         <translation>Wklej parametry nurkowania</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="288"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="287"/>
         <location filename="../build/ui_mainwindow.h" line="495"/>
         <source>Ctrl+V</source>
         <translation>Ctrl+V</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="325"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="292"/>
+        <location filename="../build/ui_mainwindow.h" line="496"/>
+        <source>&amp;Renumber</source>
+        <translation>Zmień numerację</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="295"/>
+        <location filename="../build/ui_mainwindow.h" line="497"/>
+        <source>Ctrl+R</source>
+        <translation>Ctrl+R</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="303"/>
+        <location filename="../build/ui_mainwindow.h" line="498"/>
+        <source>Auto &amp;group</source>
+        <translation>Automatycznie grupuj</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="308"/>
+        <location filename="../build/ui_mainwindow.h" line="499"/>
+        <source>&amp;Yearly statistics</source>
+        <translation>Statystyka roczna</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="311"/>
+        <location filename="../build/ui_mainwindow.h" line="500"/>
+        <source>Ctrl+Y</source>
+        <translation>Ctrl+Y</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="316"/>
+        <location filename="../build/ui_mainwindow.h" line="501"/>
+        <source>&amp;Dive list</source>
+        <translation>Lista nurkowań</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="319"/>
+        <location filename="../build/ui_mainwindow.h" line="502"/>
+        <source>Ctrl+2</source>
+        <translation>Ctrl+2</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="324"/>
         <location filename="../build/ui_mainwindow.h" line="503"/>
         <source>&amp;Profile</source>
         <translation>Profil</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="333"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="327"/>
+        <location filename="../build/ui_mainwindow.h" line="504"/>
+        <source>Ctrl+3</source>
+        <translation>Ctrl+3</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="332"/>
         <location filename="../build/ui_mainwindow.h" line="505"/>
         <source>&amp;Info</source>
         <translation>Info</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="341"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="335"/>
+        <location filename="../build/ui_mainwindow.h" line="506"/>
+        <source>Ctrl+4</source>
+        <translation>Ctrl+4</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="340"/>
         <location filename="../build/ui_mainwindow.h" line="507"/>
         <source>&amp;All</source>
         <translation>Wszystko</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="357"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="343"/>
+        <location filename="../build/ui_mainwindow.h" line="508"/>
+        <source>Ctrl+1</source>
+        <translation>Ctrl+1</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="348"/>
+        <location filename="../build/ui_mainwindow.h" line="509"/>
+        <source>P&amp;revious DC</source>
+        <translation>Poprzedni komputer</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="351"/>
+        <location filename="../build/ui_mainwindow.h" line="510"/>
+        <source>Left</source>
+        <translation>W lewo</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="356"/>
         <location filename="../build/ui_mainwindow.h" line="511"/>
         <source>&amp;Next DC</source>
         <translation>Następny komputer</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="365"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="359"/>
+        <location filename="../build/ui_mainwindow.h" line="512"/>
+        <source>Right</source>
+        <translation>W prawo</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="364"/>
         <location filename="../build/ui_mainwindow.h" line="513"/>
         <source>&amp;About Subsurface</source>
         <translation>O Subsurface</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="381"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="372"/>
+        <location filename="../build/ui_mainwindow.h" line="514"/>
+        <source>User &amp;manual</source>
+        <translation>Instrukcja obsługi</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="375"/>
+        <location filename="../build/ui_mainwindow.h" line="515"/>
+        <source>F1</source>
+        <translation>F1</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="380"/>
         <location filename="../build/ui_mainwindow.h" line="516"/>
         <source>&amp;Globe</source>
         <translation>Mapa</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="403"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="383"/>
+        <location filename="../build/ui_mainwindow.h" line="517"/>
+        <source>Ctrl+5</source>
+        <translation>Ctrl+5</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="388"/>
+        <location filename="../build/ui_mainwindow.h" line="518"/>
+        <source>P&amp;lan dive</source>
+        <translation>Zaplanuj nurkowanie</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="391"/>
+        <location filename="../build/ui_mainwindow.h" line="519"/>
+        <source>Ctrl+L</source>
+        <translation>Ctrl+L</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="396"/>
+        <location filename="../build/ui_mainwindow.h" line="520"/>
+        <source>&amp;Import log files</source>
+        <translation>Importowanie logów nurkowych</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="399"/>
+        <location filename="../build/ui_mainwindow.h" line="522"/>
+        <source>Import divelog files from other applications</source>
+        <translation>Importuj logi z innej aplikacji</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="402"/>
         <location filename="../build/ui_mainwindow.h" line="524"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="408"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="407"/>
         <location filename="../build/ui_mainwindow.h" line="525"/>
         <source>Import &amp;from divelogs.de</source>
         <translation>Importuj z divelogs.de</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="416"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="415"/>
         <location filename="../build/ui_mainwindow.h" line="526"/>
         <source>&amp;Full screen</source>
         <translation>Pełen ekran</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="419"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="418"/>
         <location filename="../build/ui_mainwindow.h" line="528"/>
         <source>Toggle full screen</source>
         <translation>Przełącz pełen ekran</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="447"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="421"/>
+        <location filename="../build/ui_mainwindow.h" line="530"/>
+        <source>F11</source>
+        <translation>F11</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="446"/>
         <location filename="../build/ui_mainwindow.h" line="531"/>
         <source>&amp;Check for updates</source>
         <translation>Sprawdź aktualizacje</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="452"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="451"/>
         <location filename="../build/ui_mainwindow.h" line="532"/>
         <source>&amp;Export</source>
         <translation>Eksport</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="458"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="454"/>
+        <location filename="../build/ui_mainwindow.h" line="534"/>
+        <source>Export dive logs</source>
+        <translation>Eksport nurkowań</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="457"/>
         <location filename="../build/ui_mainwindow.h" line="536"/>
         <source>Ctrl+E</source>
         <translation>Ctrl+E</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="466"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="462"/>
+        <location filename="../build/ui_mainwindow.h" line="537"/>
+        <source>Configure &amp;dive computer</source>
+        <translation>Konfiguruj komputer nurkowy</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="465"/>
         <location filename="../build/ui_mainwindow.h" line="538"/>
         <source>Ctrl+Shift+C</source>
         <translation>Ctrl+Shift+C</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="474"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="473"/>
         <location filename="../build/ui_mainwindow.h" line="539"/>
         <source>Edit &amp;dive in planner</source>
         <translation>Edytuj w planerze</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="486"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="485"/>
         <location filename="../build/ui_mainwindow.h" line="540"/>
         <source>Toggle pO₂ graph</source>
         <translation>Pokazuj wykres pO₂</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="498"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="497"/>
         <location filename="../build/ui_mainwindow.h" line="541"/>
         <source>Toggle pN₂ graph</source>
         <translation>Pokazuj wykres pN₂</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="642"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="509"/>
+        <location filename="../build/ui_mainwindow.h" line="542"/>
+        <source>Toggle pHe graph</source>
+        <translation>Pokazuj wykres pHe</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="521"/>
+        <location filename="../build/ui_mainwindow.h" line="543"/>
+        <source>Toggle DC reported ceiling</source>
+        <translation>Pokazuj sufit z komputera nurkowego</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="533"/>
+        <location filename="../build/ui_mainwindow.h" line="544"/>
+        <source>Toggle calculated ceiling</source>
+        <translation>Pokazuj obliczony sufit</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="545"/>
+        <location filename="../build/ui_mainwindow.h" line="545"/>
+        <source>Toggle calculating all tissues</source>
+        <translation>Obliczenia dla wszystkich tkanek</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="557"/>
+        <location filename="../build/ui_mainwindow.h" line="546"/>
+        <source>Toggle calculated ceiling with 3m increments</source>
+        <translation>Pokazuj obliczony sufit z krokiem 3m</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="569"/>
+        <location filename="../build/ui_mainwindow.h" line="547"/>
+        <source>Toggle heart rate</source>
+        <translation>Pokazuj tętno</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="581"/>
+        <location filename="../build/ui_mainwindow.h" line="548"/>
+        <source>Toggle MOD</source>
+        <translation>Pokazuj MOD</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="593"/>
+        <location filename="../build/ui_mainwindow.h" line="549"/>
+        <source>Toggle EAD, END, EADD</source>
+        <translation>Pokazuj EAD, END, EADD</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="605"/>
+        <location filename="../build/ui_mainwindow.h" line="550"/>
+        <source>Toggle NDL, TTS</source>
+        <translation>Pokazuj NDL / TTS</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="617"/>
+        <location filename="../build/ui_mainwindow.h" line="551"/>
+        <source>Toggle SAC rate</source>
+        <translation>Pokazuj SAC</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="629"/>
+        <location filename="../build/ui_mainwindow.h" line="552"/>
+        <source>Toggle ruler</source>
+        <translation>Pokazuj linijkę</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="641"/>
         <location filename="../build/ui_mainwindow.h" line="553"/>
         <source>Scale graph</source>
         <translation>Skalowanie wykresu</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="654"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="653"/>
         <location filename="../build/ui_mainwindow.h" line="554"/>
         <source>Toggle pictures</source>
         <translation>Pokazuj zdjęcia</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="666"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="665"/>
         <location filename="../build/ui_mainwindow.h" line="555"/>
         <source>Toggle tank bar</source>
         <translation>Pokazuj pasek gazu</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="674"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="673"/>
         <location filename="../build/ui_mainwindow.h" line="556"/>
         <source>&amp;Filter divelist</source>
         <translation>Filtrowanie nurkowań</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="689"/>
-        <location filename="../build/ui_mainwindow.h" line="558"/>
-        <source>Toggle tissue graph</source>
-        <translation>Pokazuj nasycenie tkanek</translation>
+        <location filename="../desktop-widgets/mainwindow.ui" line="676"/>
+        <location filename="../build/ui_mainwindow.h" line="557"/>
+        <source>Ctrl+F</source>
+        <translation>Ctrl+F</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="688"/>
+        <source>Toggle tissue heat-map</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="694"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="693"/>
         <location filename="../build/ui_mainwindow.h" line="559"/>
         <source>User &amp;survey</source>
         <translation>Ankieta</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="699"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="698"/>
         <location filename="../build/ui_mainwindow.h" line="560"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="238"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="231"/>
         <source>&amp;Undo</source>
         <translation>Cofnij</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="702"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="701"/>
         <location filename="../build/ui_mainwindow.h" line="561"/>
         <source>Ctrl+Z</source>
         <translation>Ctrl+Z</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="707"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="706"/>
         <location filename="../build/ui_mainwindow.h" line="562"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="239"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="232"/>
         <source>&amp;Redo</source>
         <translation>Ponów</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="710"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="709"/>
         <location filename="../build/ui_mainwindow.h" line="563"/>
         <source>Ctrl+Shift+Z</source>
         <translation>Ctrl+Shift+Z</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="715"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="714"/>
         <location filename="../build/ui_mainwindow.h" line="564"/>
         <source>&amp;Find moved images</source>
         <translation>Znajdź przeniesione zdjecia</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="720"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="719"/>
         <source>Open c&amp;loud storage</source>
         <translation>Otwórz dane z chmury</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="725"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="724"/>
         <source>Save to clo&amp;ud storage</source>
         <translation>Zapisz do chmury</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="730"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="729"/>
         <location filename="../build/ui_mainwindow.h" line="567"/>
         <source>&amp;Manage dive sites</source>
         <translation>Zarządzaj miejscami nurkowymi</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="735"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="734"/>
         <source>Dive Site &amp;Edit</source>
         <translation>Edycja miejsc nurkowych</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="740"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="739"/>
         <source>Facebook</source>
         <translation>Facebook</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="745"/>
-        <source>Add GPS location here</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="744"/>
+        <source>Take cloud storage online</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="677"/>
-        <location filename="../build/ui_mainwindow.h" line="557"/>
-        <source>Ctrl+F</source>
-        <translation>Ctrl+F</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="213"/>
-        <location filename="../build/ui_mainwindow.h" line="478"/>
-        <source>&amp;Print</source>
-        <translation>Drukuj</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="224"/>
-        <location filename="../build/ui_mainwindow.h" line="481"/>
-        <source>Ctrl+,</source>
-        <translation>Ctrl+,</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="232"/>
-        <location filename="../build/ui_mainwindow.h" line="482"/>
-        <source>&amp;Quit</source>
-        <translation>Wyjdź</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="243"/>
-        <location filename="../build/ui_mainwindow.h" line="484"/>
-        <source>Import from &amp;dive computer</source>
-        <translation>Importuj z komputera nurkowego</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="254"/>
-        <location filename="../build/ui_mainwindow.h" line="487"/>
-        <source>Ctrl+G</source>
-        <translation>Ctrl+G</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="267"/>
-        <location filename="../build/ui_mainwindow.h" line="490"/>
-        <source>Ctrl++</source>
-        <translation>Ctrl++</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="293"/>
-        <location filename="../build/ui_mainwindow.h" line="496"/>
-        <source>&amp;Renumber</source>
-        <translation>Zmień numerację</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="296"/>
-        <location filename="../build/ui_mainwindow.h" line="497"/>
-        <source>Ctrl+R</source>
-        <translation>Ctrl+R</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="312"/>
-        <location filename="../build/ui_mainwindow.h" line="500"/>
-        <source>Ctrl+Y</source>
-        <translation>Ctrl+Y</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="392"/>
-        <location filename="../build/ui_mainwindow.h" line="519"/>
-        <source>Ctrl+L</source>
-        <translation>Ctrl+L</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="216"/>
-        <location filename="../build/ui_mainwindow.h" line="479"/>
-        <source>Ctrl+P</source>
-        <translation>Ctrl+P</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="235"/>
-        <location filename="../build/ui_mainwindow.h" line="483"/>
-        <source>Ctrl+Q</source>
-        <translation>Ctrl+Q</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="246"/>
-        <location filename="../build/ui_mainwindow.h" line="485"/>
-        <source>Ctrl+D</source>
-        <translation>Ctrl+D</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="264"/>
-        <location filename="../build/ui_mainwindow.h" line="489"/>
-        <source>&amp;Add dive</source>
-        <translation>Dodaj nurkowanie</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="304"/>
-        <location filename="../build/ui_mainwindow.h" line="498"/>
-        <source>Auto &amp;group</source>
-        <translation>Automatycznie grupuj</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="309"/>
-        <location filename="../build/ui_mainwindow.h" line="499"/>
-        <source>&amp;Yearly statistics</source>
-        <translation>Statystyka roczna</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="317"/>
-        <location filename="../build/ui_mainwindow.h" line="501"/>
-        <source>&amp;Dive list</source>
-        <translation>Lista nurkowań</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="320"/>
-        <location filename="../build/ui_mainwindow.h" line="502"/>
-        <source>Ctrl+2</source>
-        <translation>Ctrl+2</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="328"/>
-        <location filename="../build/ui_mainwindow.h" line="504"/>
-        <source>Ctrl+3</source>
-        <translation>Ctrl+3</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="336"/>
-        <location filename="../build/ui_mainwindow.h" line="506"/>
-        <source>Ctrl+4</source>
-        <translation>Ctrl+4</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="344"/>
-        <location filename="../build/ui_mainwindow.h" line="508"/>
-        <source>Ctrl+1</source>
-        <translation>Ctrl+1</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="349"/>
-        <location filename="../build/ui_mainwindow.h" line="509"/>
-        <source>P&amp;revious DC</source>
-        <translation>Poprzedni komputer</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="352"/>
-        <location filename="../build/ui_mainwindow.h" line="510"/>
-        <source>Left</source>
-        <translation>W lewo</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="360"/>
-        <location filename="../build/ui_mainwindow.h" line="512"/>
-        <source>Right</source>
-        <translation>W prawo</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="373"/>
-        <location filename="../build/ui_mainwindow.h" line="514"/>
-        <source>User &amp;manual</source>
-        <translation>Instrukcja obsługi</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="376"/>
-        <location filename="../build/ui_mainwindow.h" line="515"/>
-        <source>F1</source>
-        <translation>F1</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="384"/>
-        <location filename="../build/ui_mainwindow.h" line="517"/>
-        <source>Ctrl+5</source>
-        <translation>Ctrl+5</translation>
+        <location filename="../build/ui_mainwindow.h" line="558"/>
+        <source>Toggle tissue graph</source>
+        <translation>Pokazuj nasycenie tkanek</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="389"/>
-        <location filename="../build/ui_mainwindow.h" line="518"/>
-        <source>P&amp;lan dive</source>
-        <translation>Zaplanuj nurkowanie</translation>
+        <location filename="../build/ui_mainwindow.h" line="565"/>
+        <source>Open cloud storage</source>
+        <translation>Otwórz dane z chmury</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="397"/>
-        <location filename="../build/ui_mainwindow.h" line="520"/>
-        <source>&amp;Import log files</source>
-        <translation>Importowanie logów nurkowych</translation>
+        <location filename="../build/ui_mainwindow.h" line="566"/>
+        <source>Save to cloud storage</source>
+        <translation>Zapisz do chmury</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="400"/>
-        <location filename="../build/ui_mainwindow.h" line="522"/>
-        <source>Import divelog files from other applications</source>
-        <translation>Importuj logi z innej aplikacji</translation>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="331"/>
+        <source>Connect to</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="422"/>
-        <location filename="../build/ui_mainwindow.h" line="530"/>
-        <source>F11</source>
-        <translation>F11</translation>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="493"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="538"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1545"/>
+        <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="../desktop-widgets/mainwindow.cpp" line="505"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="499"/>
         <source>Open file</source>
         <translation>Otwórz plik</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="509"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="503"/>
         <location filename="../desktop-widgets/mainwindow.cpp" line="614"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1972"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1978"/>
         <source>Cancel</source>
         <translation>Anuluj</translation>
     </message>
@@ -5254,6 +5353,16 @@ z powietrza przy użyciu:
         <translation>Skanowanie zdjeć... (to chwilę potrwa)</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="649"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="796"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="977"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="983"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1849"/>
+        <source>Warning</source>
+        <translation>Ostrzeżenie</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="674"/>
         <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>
@@ -5269,125 +5378,98 @@ z powietrza przy użyciu:
         <translation>Drukowanie planu nurkowego</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="982"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
+        <source>Trying to replan a dive that&apos;s not a planned dive.</source>
+        <translation>Próba zmiany planu nurkowania, które nie zostało utworzone przez planer.</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="977"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1849"/>
+        <source>Please, first finish the current edition before trying to do another.</source>
+        <translation>Proszę dokończyć edycję tego nurkowania przed rozpoczęciem kolejnej. </translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="983"/>
         <source>Trying to edit a dive that&apos;s not a manually added dive.</source>
         <translation>Próba edycji nurkowania, które nie zostało dodane ręcznie.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1243"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1030"/>
+        <source>Yearly statistics</source>
+        <translation>Statystyka roczna</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1244"/>
         <source>Do you want to save the changes that you made in the file %1?</source>
         <translation>Czy chcesz zapisać zmiany dokonane w pliku %1?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1246"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1247"/>
         <source>Do you want to save the changes that you made in the data file?</source>
         <translation>Czy chcesz zapisać wprowadzone zmiany?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1251"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1252"/>
         <source>Save changes?</source>
         <translation>Zapisać zmiany?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1587"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1253"/>
+        <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="../desktop-widgets/mainwindow.cpp" line="1572"/>
         <source>Save file as</source>
         <translation>Zapisz plik jako</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1682"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1573"/>
+        <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
+        <translation>Pliki Subsurface XML  (*.ssrf *.xml *.XML)</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1670"/>
+        <source>[local cache for] %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1672"/>
         <source>[cloud storage for] %1</source>
         <translation>[zapis w chmurze dla] %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1782"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1788"/>
         <source>Opening datafile from older version</source>
         <translation>Otwarto plik ze starszej wersji</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1783"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1789"/>
         <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly.
 Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source>
         <translation>Otworzony plik pochodzi ze starszej wersji Subsurface. Zalecamy zapoznać się z instrukcją i opisanymi tam zmianami w najnowszej wersji programu, szczególnie z nowym sposobem zarządzania miejscami nurkowymi.
 Subsurface zaimportował informacje o miejscach nurkowych, ale może warto poświęcić chwilę na przejrzenia tych danych i upewnienie się, że wszytko wygląda poprawnie.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1794"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1800"/>
         <source>Open dive log file</source>
         <translation>Otwórz plik z logiem</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1795"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1801"/>
         <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1972"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1978"/>
         <source>Contacting cloud service...</source>
         <translation>Łączenie się z chmurą...</translation>
     </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1252"/>
-        <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="../desktop-widgets/mainwindow.cpp" line="649"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="796"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="976"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="982"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/>
-        <source>Warning</source>
-        <translation>Ostrzeżenie</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="499"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="544"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1560"/>
-        <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="../desktop-widgets/mainwindow.cpp" line="338"/>
-        <source>Connect to</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
-        <source>Trying to replan a dive that&apos;s not a planned dive.</source>
-        <translation>Próba zmiany planu nurkowania, które nie zostało utworzone przez planer.</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1029"/>
-        <source>Yearly statistics</source>
-        <translation>Statystyka roczna</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1588"/>
-        <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
-        <translation>Pliki Subsurface XML  (*.ssrf *.xml *.XML)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="976"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/>
-        <source>Please, first finish the current edition before trying to do another.</source>
-        <translation>Proszę dokończyć edycję tego nurkowania przed rozpoczęciem kolejnej. </translation>
-    </message>
-    <message>
-        <location filename="../build/ui_mainwindow.h" line="565"/>
-        <source>Open cloud storage</source>
-        <translation>Otwórz dane z chmury</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_mainwindow.h" line="566"/>
-        <source>Save to cloud storage</source>
-        <translation>Zapisz do chmury</translation>
-    </message>
 </context>
 <context>
     <name>MultiFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="733"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="731"/>
         <source>Filter shows %1 (of %2) dives</source>
         <translation>Filtr pokazuje %1 (z %2) nurkowań</translation>
     </message>
@@ -5395,12 +5477,12 @@ Subsurface zaimportował informacje o miejscach nurkowych, ale może warto pośw
 <context>
     <name>OstcFirmwareCheck</name>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="269"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="271"/>
         <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source>
         <translation>Możesz zaktualizować oprogramowanie w swoim komputerze nurkowym: masz wersję %1 a najnowsza stabilna wersja to %2</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="273"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="275"/>
         <source>
 
 Please start Bluetooth on your OSTC Sport and do the same preparations as for a logbook download before continuing with the update</source>
@@ -5409,27 +5491,27 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 Uaktywnij bluetooth na swoim OSTC Sport i przed kontynuowaniem aktualizacji wykonaj na komputerze nurkowym te same kroki co przy przygotowywaniu się do zgrania danych z logbooka.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="274"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="276"/>
         <source>Not now</source>
         <translation>Nie teraz</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="275"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="277"/>
         <source>Update firmware</source>
         <translation>Aktualizuj oprogramowanie</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="277"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="279"/>
         <source>Firmware upgrade notice</source>
         <translation>Informacja o aktualizacji oprogramowania</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="295"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="297"/>
         <source>Save the downloaded firmware as</source>
         <translation>Zapisz pobrany firmware jako</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="296"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="298"/>
         <source>HEX files (*.hex)</source>
         <translation>Pliki HEX (*.hex)</translation>
     </message>
@@ -5437,79 +5519,89 @@ Uaktywnij bluetooth na swoim OSTC Sport i przed kontynuowaniem aktualizacji wyko
 <context>
     <name>PlannerSettingsWidget</name>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="322"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="302"/>
         <source>Open circuit</source>
         <translation>Obieg otwarty</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="322"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="302"/>
         <source>CCR</source>
         <translation>CCR</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="322"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="302"/>
         <source>pSCR</source>
         <translation>pSCR</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="421"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="388"/>
         <source>ft/min</source>
         <translation>ft/min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="422"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="389"/>
         <source>Last stop at 20ft</source>
         <translation>Ostatni przystanek na gł. 20 stóp</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="423"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="390"/>
         <source>50% avg. depth to 20ft</source>
         <translation>50% śr. głębokości do 20ft</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="424"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="391"/>
         <source>20ft to surface</source>
         <translation>20ft do powierzchni</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="426"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="392"/>
+        <source>ft</source>
+        <translation>ft</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="394"/>
         <source>m/min</source>
         <translation>m/min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="427"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="395"/>
         <source>Last stop at 6m</source>
         <translation>Ostatni przystanek na 6m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="428"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="396"/>
         <source>50% avg. depth to 6m</source>
         <translation>50% śr. głębokości do 6m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="429"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="397"/>
         <source>6m to surface</source>
         <translation>6m do powierzchni</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="432"/>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="433"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="398"/>
+        <source>m</source>
+        <translation>m</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="401"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="402"/>
         <source>cuft/min</source>
         <translation>cuft/min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="441"/>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="442"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="410"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="411"/>
         <source>ℓ/min</source>
         <translation>ℓ/min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="451"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="420"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="456"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="425"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
@@ -5659,6 +5751,11 @@ Uaktywnij bluetooth na swoim OSTC Sport i przed kontynuowaniem aktualizacji wyko
 <context>
     <name>PreferencesDialog</name>
     <message>
+        <location filename="../build/ui_preferences.h" line="1283"/>
+        <source>Preferences</source>
+        <translation>Ustawienia</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1288"/>
         <source>Defaults</source>
         <translation>Ogólne</translation>
@@ -5694,6 +5791,11 @@ Uaktywnij bluetooth na swoim OSTC Sport i przed kontynuowaniem aktualizacji wyko
         <translation>Geolokalizacja</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1303"/>
+        <source>Lists and tables</source>
+        <translation>Listy i tabele</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1304"/>
         <source>Font</source>
         <translation>Czcionka</translation>
@@ -5709,6 +5811,11 @@ Uaktywnij bluetooth na swoim OSTC Sport i przed kontynuowaniem aktualizacji wyko
         <translation>Nurkowania</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1307"/>
+        <source>Default dive log file</source>
+        <translation>Domyślny plik nurkowań</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1308"/>
         <source>No default file</source>
         <translation>Brak domyślnego pliku</translation>
@@ -5739,6 +5846,21 @@ Uaktywnij bluetooth na swoim OSTC Sport i przed kontynuowaniem aktualizacji wyko
         <translation>...</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1314"/>
+        <source>Display invalid</source>
+        <translation>Pokazuj niepoprawne nurkowania</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1316"/>
+        <source>Default cylinder</source>
+        <translation>Domyślna butla</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1317"/>
+        <source>Use default cylinder</source>
+        <translation>Użyj domyślnej butli</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1318"/>
         <source>Animations</source>
         <translation>Animacje</translation>
@@ -5769,40 +5891,24 @@ Uaktywnij bluetooth na swoim OSTC Sport i przed kontynuowaniem aktualizacji wyko
         <translation>System</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1401"/>
-        <source>Dive site geo lookup</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1402"/>
-        <source>Enable geocoding for dive site management</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1403"/>
-        <source>Parse site without GPS data</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1404"/>
-        <source>Same format for existing dives</source>
-        <translation type="unfinished"/>
+        <location filename="../build/ui_preferences.h" line="1324"/>
+        <source>&amp;Metric</source>
+        <translation>Metryczny</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1405"/>
-        <source>Dive Site Layout</source>
-        <translation>Układ miejsc nurkowych</translation>
+        <location filename="../build/ui_preferences.h" line="1325"/>
+        <source>Imperial</source>
+        <translation>Imperialny</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1406"/>
-        <location filename="../build/ui_preferences.h" line="1407"/>
-        <source>/</source>
-        <translation>/</translation>
+        <location filename="../build/ui_preferences.h" line="1326"/>
+        <source>Personali&amp;ze</source>
+        <translation>Dostosuj</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1325"/>
-        <source>Imperial</source>
-        <translation>Imperialny</translation>
+        <location filename="../build/ui_preferences.h" line="1327"/>
+        <source>Individual settings</source>
+        <translation>Wybór szczegółowy</translation>
     </message>
     <message>
         <location filename="../build/ui_preferences.h" line="1328"/>
@@ -5820,6 +5926,11 @@ Uaktywnij bluetooth na swoim OSTC Sport i przed kontynuowaniem aktualizacji wyko
         <translation>stopy</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1331"/>
+        <source>Pressure</source>
+        <translation>Ciśnienie</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1332"/>
         <location filename="../build/ui_preferences.h" line="1366"/>
         <source>bar</source>
@@ -5831,11 +5942,26 @@ Uaktywnij bluetooth na swoim OSTC Sport i przed kontynuowaniem aktualizacji wyko
         <translation>psi</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1334"/>
+        <source>Volume</source>
+        <translation>Objętość</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1335"/>
+        <source>&amp;liter</source>
+        <translation>litr</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1336"/>
         <source>cu ft</source>
         <translation>stopy sześcienne (cu ft)</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1337"/>
+        <source>Temperature</source>
+        <translation>Temperatura</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1338"/>
         <source>celsius</source>
         <translation>stopnie Celsjusza</translation>
@@ -5846,11 +5972,121 @@ Uaktywnij bluetooth na swoim OSTC Sport i przed kontynuowaniem aktualizacji wyko
         <translation>stopnie Fahrenheita</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1340"/>
+        <source>Weight</source>
+        <translation>Balast</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1341"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1342"/>
+        <source>lbs</source>
+        <translation>lbs</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1343"/>
+        <source>Time units</source>
+        <translation>Jednostki czasu</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1344"/>
+        <source>Ascent/descent speed denominator</source>
+        <translation>Mianownik szybkości zanurzania/wynurzania </translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1345"/>
+        <source>Minutes</source>
+        <translation>minuty</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1346"/>
+        <source>Seconds</source>
+        <translation>sekundy</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1347"/>
+        <source>GPS coordinates</source>
+        <translation>Współrzędne GPS</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1348"/>
+        <source>Location Display</source>
+        <translation>Wyświetlanie współrzędnych</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1349"/>
+        <source>traditional (dms)</source>
+        <translation>tradycyjne</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1350"/>
+        <source>decimal</source>
+        <translation>dziesiętne</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1351"/>
+        <source>Show</source>
+        <translation>Pokaż</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1352"/>
+        <source>Threshold when showing pO₂</source>
+        <translation>Próg ostrzeżenia dla  pO₂</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1353"/>
+        <source>Threshold when showing pN₂</source>
+        <translation>Próg ostrzeżenia dla  pN₂</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1354"/>
+        <source>Threshold when showing pHe</source>
+        <translation>Próg ostrzeżenia dla  pHe</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1355"/>
+        <source>Max pO₂ when showing MOD</source>
+        <translation>Max ppO₂ gdy wyświetlany jest MOD</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1356"/>
+        <source>Draw dive computer reported ceiling red</source>
+        <translation>Pokazuj sufit z komputera nurkowego na czerwono</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1357"/>
+        <source>Show unused cylinders in Equipment tab</source>
+        <translation>Pokazju nieużywane butle w zakładce Wyposażenie</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1358"/>
+        <source>Show average depth</source>
+        <translation>Pokazuj głębokość średnią</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1359"/>
+        <source>Misc</source>
+        <translation>Różne</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1360"/>
+        <source>GFLow</source>
+        <translation>GFLow</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1361"/>
+        <source>GFHigh</source>
+        <translation>GFHigh</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1362"/>
+        <source>GFLow at max depth</source>
+        <translation>GFLow na maksymalnej głębokości</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1363"/>
         <source>CCR: show setpoints when viewing pO₂</source>
         <translation>CCR: pokazuj setpointy przy wyświetlaniu pO₂</translation>
@@ -5896,14 +6132,19 @@ Uaktywnij bluetooth na swoim OSTC Sport i przed kontynuowaniem aktualizacji wyko
         <translation>Domyślne ustawienia systemu</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1374"/>
+        <source>Filter</source>
+        <translation>Filtr</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1375"/>
         <source>Proxy</source>
         <translation>Proxy</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1379"/>
-        <source>Proxy type</source>
-        <translation>Rodzaj proxy</translation>
+        <location filename="../build/ui_preferences.h" line="1376"/>
+        <source>Port</source>
+        <translation>Port</translation>
     </message>
     <message>
         <location filename="../build/ui_preferences.h" line="1377"/>
@@ -5911,16 +6152,16 @@ Uaktywnij bluetooth na swoim OSTC Sport i przed kontynuowaniem aktualizacji wyko
         <translation>Host</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1376"/>
-        <source>Port</source>
-        <translation>Port</translation>
-    </message>
-    <message>
         <location filename="../build/ui_preferences.h" line="1378"/>
         <source>Requires authentication</source>
         <translation>Wymaga autentykacji</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1379"/>
+        <source>Proxy type</source>
+        <translation>Rodzaj proxy</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1380"/>
         <source>Username</source>
         <translation>Użytkownik</translation>
@@ -5932,46 +6173,6 @@ Uaktywnij bluetooth na swoim OSTC Sport i przed kontynuowaniem aktualizacji wyko
         <translation>Hasło</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1400"/>
-        <source>Disconnect from Facebook</source>
-        <translation>Rozłącz z Facebookiem</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1374"/>
-        <source>Filter</source>
-        <translation>Filtr</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1331"/>
-        <source>Pressure</source>
-        <translation>Ciśnienie</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1303"/>
-        <source>Lists and tables</source>
-        <translation>Listy i tabele</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1307"/>
-        <source>Default dive log file</source>
-        <translation>Domyślny plik nurkowań</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1314"/>
-        <source>Display invalid</source>
-        <translation>Pokazuj niepoprawne nurkowania</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1316"/>
-        <source>Default cylinder</source>
-        <translation>Domyślna butla</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1317"/>
-        <source>Use default cylinder</source>
-        <translation>Użyj domyślnej butli</translation>
-    </message>
-    <message>
         <location filename="../build/ui_preferences.h" line="1382"/>
         <source>Subsurface cloud storage</source>
         <translation>Pzechowywanie danych w chmurze</translation>
@@ -6012,149 +6213,40 @@ Uaktywnij bluetooth na swoim OSTC Sport i przed kontynuowaniem aktualizacji wyko
         <translation>Zapisywać ID użytkownika do pliku?</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1334"/>
-        <source>Volume</source>
-        <translation>Objętość</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1337"/>
-        <source>Temperature</source>
-        <translation>Temperatura</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1340"/>
-        <source>Weight</source>
-        <translation>Balast</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1342"/>
-        <source>lbs</source>
-        <translation>lbs</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1343"/>
-        <source>Time units</source>
-        <translation>Jednostki czasu</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1345"/>
-        <source>Minutes</source>
-        <translation>minuty</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1346"/>
-        <source>Seconds</source>
-        <translation>sekundy</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1351"/>
-        <source>Show</source>
-        <translation>Pokaż</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1362"/>
-        <source>GFLow at max depth</source>
-        <translation>GFLow na maksymalnej głębokości</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1359"/>
-        <source>Misc</source>
-        <translation>Różne</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1283"/>
-        <source>Preferences</source>
-        <translation>Ustawienia</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1324"/>
-        <source>&amp;Metric</source>
-        <translation>Metryczny</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1326"/>
-        <source>Personali&amp;ze</source>
-        <translation>Dostosuj</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1327"/>
-        <source>Individual settings</source>
-        <translation>Wybór szczegółowy</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1335"/>
-        <source>&amp;liter</source>
-        <translation>litr</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1344"/>
-        <source>Ascent/descent speed denominator</source>
-        <translation>Mianownik szybkości zanurzania/wynurzania </translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1347"/>
-        <source>GPS coordinates</source>
-        <translation>Współrzędne GPS</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1348"/>
-        <source>Location Display</source>
-        <translation>Wyświetlanie współrzędnych</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1349"/>
-        <source>traditional (dms)</source>
-        <translation>tradycyjne</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1350"/>
-        <source>decimal</source>
-        <translation>dziesiętne</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1352"/>
-        <source>Threshold when showing pO₂</source>
-        <translation>Próg ostrzeżenia dla  pO₂</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1353"/>
-        <source>Threshold when showing pN₂</source>
-        <translation>Próg ostrzeżenia dla  pN₂</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1354"/>
-        <source>Threshold when showing pHe</source>
-        <translation>Próg ostrzeżenia dla  pHe</translation>
+        <location filename="../build/ui_preferences.h" line="1400"/>
+        <source>Disconnect from Facebook</source>
+        <translation>Rozłącz z Facebookiem</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1355"/>
-        <source>Max pO₂ when showing MOD</source>
-        <translation>Max ppO₂ gdy wyświetlany jest MOD</translation>
+        <location filename="../build/ui_preferences.h" line="1401"/>
+        <source>Dive site geo lookup</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1356"/>
-        <source>Draw dive computer reported ceiling red</source>
-        <translation>Pokazuj sufit z komputera nurkowego na czerwono</translation>
+        <location filename="../build/ui_preferences.h" line="1402"/>
+        <source>Enable geocoding for dive site management</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1357"/>
-        <source>Show unused cylinders in Equipment tab</source>
-        <translation>Pokazju nieużywane butle w zakładce Wyposażenie</translation>
+        <location filename="../build/ui_preferences.h" line="1403"/>
+        <source>Parse site without GPS data</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1358"/>
-        <source>Show average depth</source>
-        <translation>Pokazuj głębokość średnią</translation>
+        <location filename="../build/ui_preferences.h" line="1404"/>
+        <source>Same format for existing dives</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1360"/>
-        <source>GFLow</source>
-        <translation>GFLow</translation>
+        <location filename="../build/ui_preferences.h" line="1405"/>
+        <source>Dive Site Layout</source>
+        <translation>Układ miejsc nurkowych</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1361"/>
-        <source>GFHigh</source>
-        <translation>GFHigh</translation>
+        <location filename="../build/ui_preferences.h" line="1406"/>
+        <location filename="../build/ui_preferences.h" line="1407"/>
+        <source>/</source>
+        <translation>/</translation>
     </message>
 </context>
 <context>
@@ -6210,106 +6302,136 @@ Uaktywnij bluetooth na swoim OSTC Sport i przed kontynuowaniem aktualizacji wyko
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="20"/>
-        <source>Show</source>
-        <translation>Pokaż</translation>
+        <source>Gas pressure display setup</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="29"/>
-        <source>Threshold when showing pO₂</source>
-        <translation>Próg ostrzeżenia dla  pO₂</translation>
+        <source>Threshold for pO₂ (bar)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="49"/>
-        <source>Threshold when showing pN₂</source>
-        <translation>Próg ostrzeżenia dla  pN₂</translation>
+        <source>Threshold for pN₂ (bar)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="69"/>
-        <source>Threshold when showing pHe</source>
-        <translation>Próg ostrzeżenia dla  pHe</translation>
+        <source>Threshold for pHe (bar)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="89"/>
-        <source>Max pO₂ when showing MOD</source>
-        <translation>Max ppO₂ gdy wyświetlany jest MOD</translation>
+        <source>pO₂ in calculating MOD (bar)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="106"/>
+        <source>CCR options:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="113"/>
+        <source>Dive planner default setpoint (bar)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="133"/>
+        <source>Show setpoints when viewing pO₂</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="109"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="140"/>
+        <source>Show individual O₂ sensor values when viewing pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="150"/>
+        <source>Ceiling display setup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="159"/>
         <source>Draw dive computer reported ceiling red</source>
         <translation>Pokazuj sufit z komputera nurkowego na czerwono</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="116"/>
-        <source>Show unused cylinders in Equipment tab</source>
-        <translation>Pokazju nieużywane butle w zakładce Wyposażenie</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="169"/>
+        <source>Algorithm for calculated ceiling:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="123"/>
-        <source>Show mean depth</source>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="176"/>
+        <source>VPM-B</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="133"/>
-        <source>Misc</source>
-        <translation>Różne</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="183"/>
+        <source>VPM-B Conservatism</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="149"/>
-        <source>bar</source>
-        <translation>bar</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="193"/>
+        <source>+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="165"/>
-        <source>Default CCR set-point for dive planning</source>
-        <translation>Domyślny setpoint CCR dla planowania nurkowań </translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="206"/>
+        <source>Bühlmann</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="172"/>
-        <source>pSCR O₂ metabolism rate</source>
-        <translation>pSCR tempo metabolizmu O₂</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="216"/>
+        <source>GFHigh</source>
+        <translation>GFHigh</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="179"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="236"/>
         <source>GFLow</source>
         <translation>GFLow</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="186"/>
-        <source>GFHigh</source>
-        <translation>GFHigh</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="256"/>
+        <source>GFLow at max depth</source>
+        <translation>GFLow na maksymalnej głębokości</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="203"/>
-        <source>ℓ/min</source>
-        <translation>ℓ/min</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="263"/>
+        <source>pSCR options:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="213"/>
-        <source>pSCR ratio</source>
-        <translation>pSCR współczynnik wymiany</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="270"/>
+        <source>Metabolic rate (ℓ O₂/min)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="223"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="287"/>
+        <source>Dilution ratio</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="300"/>
         <source>1:</source>
         <translation>1:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="230"/>
-        <source>CCR: show individual O₂ sensor values when viewing pO₂</source>
-        <translation>CCR: pokazuj odczyty poszczególnych sensorów O₂ przy wyświetlaniu pO₂</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="310"/>
+        <source>Misc</source>
+        <translation>Różne</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="237"/>
-        <source>CCR: show setpoints when viewing pO₂</source>
-        <translation>CCR: pokazuj setpointy przy wyświetlaniu pO₂</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="316"/>
+        <source>Show unused cylinders in Equipment tab</source>
+        <translation>Pokazju nieużywane butle w zakładce Wyposażenie</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="244"/>
-        <source>GFLow at max depth</source>
-        <translation>GFLow na maksymalnej głębokości</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="323"/>
+        <source>Show mean depth in Profile</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="10"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="9"/>
         <source>Graph</source>
         <translation>Wykres</translation>
     </message>
@@ -6378,15 +6500,29 @@ Uaktywnij bluetooth na swoim OSTC Sport i przed kontynuowaniem aktualizacji wyko
         <translation>Język</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="57"/>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="53"/>
         <source>Restart required</source>
         <translation>Wymagane ponowne uruchomienie</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="58"/>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="54"/>
         <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="../desktop-widgets/preferences/preferences_language.cpp" line="76"/>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="82"/>
+        <source>Literal characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="77"/>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="83"/>
+        <source>Non-special character(s) in time format.
+These will be used as is. This might not be what you intended.
+See http://doc.qt.io/qt-5/qdatetime.html#toString</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PreferencesNetwork</name>
@@ -6433,7 +6569,7 @@ Uaktywnij bluetooth na swoim OSTC Sport i przed kontynuowaniem aktualizacji wyko
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_network.ui" line="156"/>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="148"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="134"/>
         <source>Subsurface cloud storage</source>
         <translation>Pzechowywanie danych w chmurze</translation>
     </message>
@@ -6478,39 +6614,39 @@ Uaktywnij bluetooth na swoim OSTC Sport i przed kontynuowaniem aktualizacji wyko
         <translation>Zapisywać ID użytkownika do pliku?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="11"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="10"/>
         <source>Network</source>
         <translation>Sieć</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="15"/>
         <source>No proxy</source>
         <translation>Bez proxy</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/>
         <source>System proxy</source>
         <translation>Systemowe proxy</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/>
         <source>HTTP proxy</source>
         <translation>Proxy HTTP</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="19"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/>
         <source>SOCKS proxy</source>
         <translation>Proxy SOCKS</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="75"/>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="97"/>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="110"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="72"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="93"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="106"/>
         <source>Cloud storage email and password can only consist of letters, numbers, and &apos;.&apos;, &apos;-&apos;, &apos;_&apos;, and &apos;+&apos;.</source>
         <translation>Adres email i hasło do przechowywania danych w chmurze może zawierać jedynie litery, cyfry oraz znaki &apos;.&apos;, &apos;-&apos;, &apos;_&apos;, &apos;+&apos;.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="146"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="132"/>
         <source>Subsurface cloud storage (credentials verified)</source>
         <translation>Przechowywanie danych w chmurze (uwierzytelniony)</translation>
     </message>
@@ -6668,7 +6804,7 @@ Uaktywnij bluetooth na swoim OSTC Sport i przed kontynuowaniem aktualizacji wyko
         <translation>dziesiętne</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="8"/>
+        <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="7"/>
         <source>Units</source>
         <translation>Jednostki</translation>
     </message>
@@ -6676,17 +6812,17 @@ Uaktywnij bluetooth na swoim OSTC Sport i przed kontynuowaniem aktualizacji wyko
 <context>
     <name>PrintDialog</name>
     <message>
-        <location filename="../desktop-widgets/printdialog.cpp" line="118"/>
-        <source>&amp;Preview</source>
-        <translation>Podgląd</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/printdialog.cpp" line="115"/>
+        <location filename="../desktop-widgets/printdialog.cpp" line="102"/>
         <source>P&amp;rint</source>
         <translation>Drukuj</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/printdialog.cpp" line="130"/>
+        <location filename="../desktop-widgets/printdialog.cpp" line="105"/>
+        <source>&amp;Preview</source>
+        <translation>Podgląd</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/printdialog.cpp" line="117"/>
         <source>Print</source>
         <translation>Drukuj</translation>
     </message>
@@ -6694,19 +6830,10 @@ Uaktywnij bluetooth na swoim OSTC Sport i przed kontynuowaniem aktualizacji wyko
 <context>
     <name>PrintOptions</name>
     <message>
-        <location filename="../build/ui_printoptions.h" line="150"/>
-        <source>&amp;Table print</source>
-        <translation>&amp;Tabela</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_printoptions.h" line="158"/>
-        <source>One dive per page</source>
-        <translation>Jedno nurkowanie na stronę</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_printoptions.h" line="159"/>
-        <source>Two dives per page</source>
-        <translation>Dwa nurkowania na stronę</translation>
+        <location filename="../desktop-widgets/printoptions.ui" line="29"/>
+        <location filename="../build/ui_printoptions.h" line="148"/>
+        <source>Print type</source>
+        <translation>Rodzaj wydruku</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/printoptions.ui" line="41"/>
@@ -6766,10 +6893,19 @@ Uaktywnij bluetooth na swoim OSTC Sport i przed kontynuowaniem aktualizacji wyko
         <translation>Import</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/printoptions.ui" line="29"/>
-        <location filename="../build/ui_printoptions.h" line="148"/>
-        <source>Print type</source>
-        <translation>Rodzaj wydruku</translation>
+        <location filename="../build/ui_printoptions.h" line="150"/>
+        <source>&amp;Table print</source>
+        <translation>&amp;Tabela</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_printoptions.h" line="158"/>
+        <source>One dive per page</source>
+        <translation>Jedno nurkowanie na stronę</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_printoptions.h" line="159"/>
+        <source>Two dives per page</source>
+        <translation>Dwa nurkowania na stronę</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/printoptions.cpp" line="128"/>
@@ -6811,103 +6947,103 @@ Uaktywnij bluetooth na swoim OSTC Sport i przed kontynuowaniem aktualizacji wyko
         <translation>Nieznany komputer nurkowy</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="755"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="752"/>
         <source>Show NDL / TTS was disabled because of excessive processing time</source>
         <translation>Pokazywanie NDL / TTS zostało wyłączone z powodu zbyt długiego czasu obliczeń.</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1344"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1338"/>
         <source>Make first divecomputer</source>
         <translation>Ustaw jako pierwszy komputer nurkowy</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1346"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1340"/>
         <source>Delete this divecomputer</source>
         <translation>Usuń ten komputer nurkowy</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1360"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1354"/>
         <source>Add gas change</source>
         <translation>Dodaj zmianę gazu</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1363"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1357"/>
         <source> (Tank %1)</source>
         <translation> (Butla %1)</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1371"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1365"/>
         <source>Add set-point change</source>
         <translation>Dodaj zmianę set-point</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1373"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1367"/>
         <source>Add bookmark</source>
         <translation>Dodaj notatkę</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1377"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1371"/>
         <source>Edit the profile</source>
         <translation>Edytuj profil</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1381"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1375"/>
         <source>Remove event</source>
         <translation>Usuń znacznik</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1386"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1380"/>
         <source>Hide similar events</source>
         <translation>Ukryj podobne znaczniki</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1393"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1387"/>
         <source>Edit name</source>
         <translation>Zmień nazwę</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1422"/>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1429"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1416"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1423"/>
         <source>Adjust pressure of tank %1 (currently interpolated as %2)</source>
         <translation>Zmień ciśnienie w butli %1 (obecnie interpolowane jako %2)</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1444"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1438"/>
         <source>Unhide all events</source>
         <translation>Odkryj wszystkie znaczniki</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1479"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1473"/>
         <source>Hide events</source>
         <translation>Ukrywanie wydarzeń</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1479"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1473"/>
         <source>Hide all %1 events?</source>
         <translation>Ukyć wszystkie wydarzenia typu %1?</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1514"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1508"/>
         <source>Remove the selected event?</source>
         <translation>Usunąć wybrane wydarzenie?</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1515"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1509"/>
         <source>%1 @ %2:%3</source>
         <translation>%1 @ %2:%3</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1638"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1632"/>
         <source>Edit name of bookmark</source>
         <translation>Zmień nazwę wydarzenia</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1639"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1633"/>
         <source>Custom name:</source>
         <translation>Własna nazwa:</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1644"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1638"/>
         <source>Name is too long!</source>
         <translation>Nazwa jest za długa!</translation>
     </message>
@@ -6915,91 +7051,101 @@ Uaktywnij bluetooth na swoim OSTC Sport i przed kontynuowaniem aktualizacji wyko
 <context>
     <name>QMLManager</name>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="95"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="97"/>
         <source>Starting...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="202"/>
         <source>working in no-cloud mode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="213"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="216"/>
         <source>no cloud credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="214"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="270"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="217"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="269"/>
         <source>Please enter valid cloud credentials.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="285"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="284"/>
         <source>Attempting to open cloud storage with new credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="304"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="306"/>
         <source>Testing cloud credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="331"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="320"/>
+        <source>No response from cloud server to validate the credentials</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="329"/>
+        <source>Cannot connect to cloud storage - cloud account not verified</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="361"/>
         <source>Cloud credentials are invalid</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="344"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="374"/>
         <source>Cannot open cloud storage: Error creating https connection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="357"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="387"/>
         <source>Cannot open cloud storage: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="369"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="399"/>
         <source>Cannot connect to cloud storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="411"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="441"/>
         <source>Cloud storage error: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="501"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="531"/>
         <source>Failed to connect to cloud server, reverting to no cloud status</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="520"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="550"/>
         <source>Cloud storage open successfully. No dives in dive list.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="689"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="690"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="721"/>
         <source>h</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="689"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="690"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="691"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="721"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="722"/>
         <source>min</source>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="689"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/>
         <source>sec</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="1041"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="1102"/>
         <source>Unknown GPS location</source>
         <translation type="unfinished"/>
     </message>
@@ -7007,126 +7153,126 @@ Uaktywnij bluetooth na swoim OSTC Sport i przed kontynuowaniem aktualizacji wyko
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../core/qthelper.cpp" line="866"/>
-        <location filename="../core/qthelper.cpp" line="1214"/>
-        <source>AIR</source>
-        <translation>POWIETRZE</translation>
+        <location filename="../core/gpslocation.h" line="13"/>
+        <source>Waiting to aquire GPS location</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="1214"/>
-        <source>OXYGEN</source>
-        <translation>TLEN</translation>
+        <location filename="../core/qthelper.cpp" line="766"/>
+        <location filename="../core/qthelper.cpp" line="1275"/>
+        <source>m</source>
+        <translation>m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="59"/>
-        <source>Remove this point</source>
-        <translation>Usuń ten punkt</translation>
+        <location filename="../core/qthelper.cpp" line="768"/>
+        <location filename="../core/qthelper.cpp" line="1274"/>
+        <source>ft</source>
+        <translation>ft</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="32"/>
-        <source>Average</source>
-        <translation>średnia</translation>
+        <location filename="../core/qthelper.cpp" line="794"/>
+        <source>C</source>
+        <translation>C</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="35"/>
-        <source>Minimum</source>
-        <translation>min.</translation>
+        <location filename="../core/qthelper.cpp" line="796"/>
+        <source>F</source>
+        <translation>F</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="38"/>
-        <source>Maximum</source>
-        <translation>max.</translation>
+        <location filename="../core/qthelper.cpp" line="821"/>
+        <location filename="../core/qthelper.cpp" line="1250"/>
+        <source>kg</source>
+        <translation>kg</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/globe.cpp" line="327"/>
-        <source>Move the map and double-click to set the dive location</source>
-        <translation>Przesuń mapę i wskaż lokalizację dwuklikiem</translation>
+        <location filename="../core/qthelper.cpp" line="823"/>
+        <location filename="../core/qthelper.cpp" line="1251"/>
+        <source>lbs</source>
+        <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="28"/>
-        <source>unknown</source>
-        <translation>nieznana</translation>
+        <location filename="../core/qthelper.cpp" line="848"/>
+        <location filename="../core/qthelper.cpp" line="1300"/>
+        <source>bar</source>
+        <translation>bar</translation>
     </message>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="105"/>
-        <source>h:</source>
-        <translation>h:</translation>
+        <location filename="../core/qthelper.cpp" line="850"/>
+        <location filename="../core/qthelper.cpp" line="1299"/>
+        <source>psi</source>
+        <translation>psi</translation>
     </message>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="105"/>
-        <source>min</source>
-        <translation>min</translation>
+        <location filename="../core/qthelper.cpp" line="871"/>
+        <location filename="../core/qthelper.cpp" line="1235"/>
+        <source>AIR</source>
+        <translation>POWIETRZE</translation>
     </message>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="337"/>
-        <source>Multiple</source>
+        <location filename="../core/qthelper.cpp" line="873"/>
+        <source>EAN</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="../core/qthelper.cpp" line="957"/>
+        <location filename="../core/qthelper.cpp" line="962"/>
         <source>(%n dive(s))</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="816"/>
-        <location filename="../core/qthelper.cpp" line="1228"/>
-        <source>kg</source>
-        <translation>kg</translation>
+        <location filename="../core/qthelper.cpp" line="1235"/>
+        <source>OXYGEN</source>
+        <translation>TLEN</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="818"/>
-        <location filename="../core/qthelper.cpp" line="1229"/>
-        <source>lbs</source>
-        <translation>lbs</translation>
+        <location filename="../core/qthelper.cpp" line="1322"/>
+        <source>l</source>
+        <translation>l</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="763"/>
-        <location filename="../core/qthelper.cpp" line="1252"/>
-        <source>ft</source>
-        <translation>ft</translation>
+        <location filename="../core/qthelper.cpp" line="1323"/>
+        <source>cuft</source>
+        <translation>cuft</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="761"/>
-        <location filename="../core/qthelper.cpp" line="1253"/>
-        <source>m</source>
-        <translation>m</translation>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="29"/>
+        <source>unknown</source>
+        <translation>nieznana</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="789"/>
-        <source>C</source>
-        <translation>C</translation>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="114"/>
+        <source>h:</source>
+        <translation>h:</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="791"/>
-        <source>F</source>
-        <translation>F</translation>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="114"/>
+        <source>min</source>
+        <translation>min</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="845"/>
-        <location filename="../core/qthelper.cpp" line="1275"/>
-        <source>psi</source>
-        <translation>psi</translation>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="63"/>
+        <source>Remove this point</source>
+        <translation>Usuń ten punkt</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="843"/>
-        <location filename="../core/qthelper.cpp" line="1276"/>
-        <source>bar</source>
-        <translation>bar</translation>
+        <location filename="../desktop-widgets/globe.cpp" line="327"/>
+        <source>Move the map and double-click to set the dive location</source>
+        <translation>Przesuń mapę i wskaż lokalizację dwuklikiem</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="868"/>
-        <source>EAN</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="32"/>
+        <source>Average</source>
+        <translation>średnia</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="1298"/>
-        <source>l</source>
-        <translation>l</translation>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="35"/>
+        <source>Minimum</source>
+        <translation>min.</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="1299"/>
-        <source>cuft</source>
-        <translation>cuft</translation>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="38"/>
+        <source>Maximum</source>
+        <translation>max.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="625"/>
@@ -7148,17 +7294,12 @@ Uaktywnij bluetooth na swoim OSTC Sport i przed kontynuowaniem aktualizacji wyko
         <source>Malformed XML response. Line %1: %2</source>
         <translation>Uszkodzona odpowiedź XML. Linia  %1: %2</translation>
     </message>
-    <message>
-        <location filename="../core/gpslocation.h" line="13"/>
-        <source>Waiting to aquire GPS location</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>ReadSettingsThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1651"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1676"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1640"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1665"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Ta opcja nie jest jeszcze dostępna dla wybranego komputera.</translation>
     </message>
@@ -7187,7 +7328,7 @@ Uaktywnij bluetooth na swoim OSTC Sport i przed kontynuowaniem aktualizacji wyko
 <context>
     <name>ResetSettingsThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1775"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1764"/>
         <source>Reset settings failed!</source>
         <translation>Przywracanie ustawień nie powiodło się!</translation>
     </message>
@@ -7225,6 +7366,12 @@ Uaktywnij bluetooth na swoim OSTC Sport i przed kontynuowaniem aktualizacji wyko
 <context>
     <name>ShiftImageTimesDialog</name>
     <message>
+        <location filename="../desktop-widgets/shiftimagetimes.ui" line="23"/>
+        <location filename="../build/ui_shiftimagetimes.h" line="184"/>
+        <source>Shift selected image times</source>
+        <translation>Zmiana czasów nurkowań</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/shiftimagetimes.ui" line="34"/>
         <location filename="../build/ui_shiftimagetimes.h" line="185"/>
         <source>Shift times of image(s) by</source>
@@ -7237,12 +7384,6 @@ Uaktywnij bluetooth na swoim OSTC Sport i przed kontynuowaniem aktualizacji wyko
         <translation>h:mm</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/shiftimagetimes.ui" line="23"/>
-        <location filename="../build/ui_shiftimagetimes.h" line="184"/>
-        <source>Shift selected image times</source>
-        <translation>Zmiana czasów nurkowań</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/shiftimagetimes.ui" line="105"/>
         <location filename="../build/ui_shiftimagetimes.h" line="187"/>
         <source>Earlier</source>
@@ -7294,12 +7435,12 @@ Nie wszystkie zdjęcia mają czas w zakresie pomiędzy
         <translation>Jaka data i godzina jest na zdjęciu?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="297"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="296"/>
         <source>Open image file</source>
         <translation>Otwórz zdjęcie</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="299"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="298"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>Pliki graficzne (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -7457,54 +7598,54 @@ Nie wszystkie zdjęcia mają czas w zakresie pomiędzy
 <context>
     <name>SocialNetworkDialog</name>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="339"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="284"/>
         <source>Dive date: %1 
 </source>
         <translation>Data nurkowania: %1 
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="342"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="287"/>
         <source>Duration: %1 
 </source>
         <translation>Czas: %1 
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="343"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="288"/>
         <source>h:</source>
         <comment>abbreviation for hours plus separator</comment>
         <translation>h:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="344"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="289"/>
         <source>min</source>
         <comment>abbreviation for minutes</comment>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="347"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="292"/>
         <source>Dive location: %1 
 </source>
         <translation>Miejsce nurkowania: %1
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="350"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="295"/>
         <source>Buddy: %1 
 </source>
         <translation>Partner: %1 
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="353"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="298"/>
         <source>Divemaster: %1 
 </source>
         <translation>Divemaster: %1 
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="356"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="301"/>
         <source>
 %1</source>
         <translation>
@@ -7590,9 +7731,20 @@ Nie wszystkie zdjęcia mają czas w zakresie pomiędzy
     <name>StartPage</name>
     <message>
         <location filename="../mobile-widgets/qml/StartPage.qml" line="19"/>
-        <source>To use Subsurface-mobile with Subsurface cloud storage, please enteryour cloud credentials.
+        <source>To use Subsurface-mobile with Subsurface cloud storage, please enter your cloud credentials.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/StartPage.qml" line="20"/>
+        <source>If this is the first time you use Subsurface cloud storage, enter a valid email (all lower case) and a password of your choice (letters and numbers). The server will send a PIN to the email address provided that you will have to enter here.
 
-To use Subsurface-mobile only with local data on this device, tap on the no cloud icon below.</source>
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/StartPage.qml" line="23"/>
+        <source>To use Subsurface-mobile only with local data on this device, tap on the no cloud icon below.</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -7631,7 +7783,12 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>SubsurfaceWebServices</name>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="419"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="395"/>
+        <source>Enter User ID and click Download</source>
+        <translation>Podaj ID użytkownika i wciśnij Pobierz</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="417"/>
         <source>Webservice</source>
         <translation>Usługa Internetowa</translation>
     </message>
@@ -7656,30 +7813,25 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
         <translation>Błąd połączenia:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="557"/>
-        <source>Download successful</source>
-        <translation>Pobieranie zakończone sukcesem</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="551"/>
         <source>Invalid user identifier!</source>
         <translation>Niepoprawny identyfikator użytkownika!</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="397"/>
-        <source>Enter User ID and click Download</source>
-        <translation>Podaj ID użytkownika i wciśnij Pobierz</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="554"/>
         <source>Cannot parse response!</source>
         <translation>Nie można przetworzyć odpowiedzi!</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="557"/>
+        <source>Download successful</source>
+        <translation>Pobieranie zakończone sukcesem</translation>
+    </message>
 </context>
 <context>
     <name>SuitFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="674"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="672"/>
         <source>Suits: </source>
         <translation>Skafandry:</translation>
     </message>
@@ -7687,7 +7839,7 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>SuitsFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="123"/>
+        <location filename="../qt-models/filtermodels.cpp" line="128"/>
         <source>No suit set</source>
         <translation>nie podano skafandra</translation>
     </message>
@@ -7706,7 +7858,7 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>TagFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="595"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="593"/>
         <source>Tags: </source>
         <translation>Tagi:</translation>
     </message>
@@ -7714,7 +7866,7 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>TagFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="148"/>
+        <location filename="../qt-models/filtermodels.cpp" line="153"/>
         <source>Empty tags</source>
         <translation>brak tagów</translation>
     </message>
@@ -7740,6 +7892,11 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>TemplateEdit</name>
     <message>
+        <location filename="../desktop-widgets/templateedit.ui" line="14"/>
+        <source>Edit template</source>
+        <translation>Edytuj szablon</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/templateedit.ui" line="37"/>
         <source>Preview</source>
         <translation>Podgląd</translation>
@@ -7785,11 +7942,6 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
         <translation>Rozmiar czcionki</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/templateedit.ui" line="14"/>
-        <source>Edit template</source>
-        <translation>Edytuj szablon</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/templateedit.ui" line="165"/>
         <source>Color palette</source>
         <translation>Paleta kolorów</translation>
@@ -7971,85 +8123,12 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>TextHyperlinkEventFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="817"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="815"/>
         <source>%1click to visit %2</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>ThemeTest</name>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="29"/>
-        <source>Theme Information</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="33"/>
-        <source>Screen</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="42"/>
-        <source>Geometry (pixels):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="49"/>
-        <source>Geometry (gridUnits):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="56"/>
-        <source>Units.gridUnit:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="63"/>
-        <source>Units.devicePixelRatio:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="70"/>
-        <source>Font Metrics</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="76"/>
-        <source>FontMetrics pointSize:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="83"/>
-        <source>FontMetrics pixelSize:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="90"/>
-        <source>FontMetrics devicePixelRatio:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="97"/>
-        <source>Text item pixelSize:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="104"/>
-        <source>Text item pointSize:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="111"/>
-        <source>Pixel density:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="118"/>
-        <source>Height of default font:</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
     <name>ToolTipItem</name>
     <message>
         <location filename="../profile-widget/divetooltipitem.cpp" line="136"/>
@@ -8060,102 +8139,107 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>TripItem</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="67"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="68"/>
         <source>(%1 shown)</source>
         <translation> (%1 pokazane)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="194"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
         <source>#</source>
         <translation>Nr</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="197"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="215"/>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="200"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="218"/>
         <source>Rating</source>
         <translation>Ocena</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
         <source>Depth(%1)</source>
         <translation>Głębokość(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="206"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="224"/>
         <source>Duration</source>
         <translation>Czas trwania</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="209"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="227"/>
         <source>Temp(%1%2)</source>
         <translation>Temperatura(%1%2)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
         <source>Weight(%1)</source>
         <translation>Balast(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="215"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="233"/>
         <source>Suit</source>
         <translation>Skafander</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="218"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="236"/>
         <source>Cyl</source>
         <translation>Butle</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="239"/>
         <source>Gas</source>
         <translation>Gaz</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="244"/>
         <source>SAC(%1)</source>
         <translation>SAC(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="244"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="229"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="247"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="232"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="250"/>
         <source>Max CNS</source>
         <translation>Max CNS</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="235"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="253"/>
+        <source>Photos before/during/after dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="256"/>
         <source>Location</source>
         <translation>Miejsce</translation>
     </message>
@@ -8178,72 +8262,73 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>UpdateManager</name>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="69"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="61"/>
         <source>Check for updates.</source>
         <translation>Sprawdzanie dostępności aktualizacji.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="70"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="62"/>
         <source>Subsurface was unable to check for updates.</source>
         <translation>Nie udało się sprawdzić dostępności aktualizacji.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="75"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="67"/>
         <source>The following error occurred:</source>
         <translation>Natrafiono na następujący błąd:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="76"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="68"/>
         <source>Please check your internet connection.</source>
         <translation>Sprawdź proszę swoje połączenie z Internetem.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="86"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="78"/>
         <source>You are using the latest version of Subsurface.</source>
         <translation>Używasz najnowszej wersji Subsurface.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="89"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="81"/>
         <source>A new version of Subsurface is available.&lt;br/&gt;Click on:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; to download it.</source>
         <translation>Nowa wersja Subsurface jest dostępna.&lt;br/&gt;Kliknij na:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; aby ją pobrać.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="95"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="87"/>
         <source>A new version of Subsurface is available.</source>
         <translation>Nowsza wersja Subsurface jest dostępna.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="96"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="88"/>
         <source>Latest version is %1, please check %2 our download page %3 for information in how to update.</source>
         <translation>Najnowsza wersja to %1,  informacje jak zaktualizować aplikację znajdziesz na %2 naszej stronie %3</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="106"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="98"/>
         <source>Newest release version is </source>
         <translation>Najnowsza wersja to </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="107"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="99"/>
         <source>The server returned the following information:</source>
         <translation>Serwer zwrócił następującą informację:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="125"/>
-        <source>Subsurface is checking every two weeks if a new version is available. If you don&apos;t want Subsurface to continue checking, please click Decline.</source>
-        <translation>Subsurface sprawdza dostępność nowej wersji co dwa tygodnie. Jeśli nie chcesz, żeby Subsurface kontynuował sprawdzanie kliknij Przestań.</translation>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="117"/>
+        <source>Subsurface is checking every two weeks if a new version is available. 
+ If you don&apos;t want Subsurface to continue checking, please click Decline.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="126"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="119"/>
         <source>Decline</source>
         <translation>Przestań</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="127"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="120"/>
         <source>Accept</source>
         <translation>Zatwierdź</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="129"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="122"/>
         <source>Automatic check for updates</source>
         <translation>Automatyczne sprawdzanie aktualizacji </translation>
     </message>
@@ -8265,24 +8350,6 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>UserSurvey</name>
     <message>
-        <location filename="../desktop-widgets/usersurvey.ui" line="44"/>
-        <location filename="../build/ui_usersurvey.h" line="151"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;We would love to learn more about our users, their preferences and their usage habits. Please spare a minute to fill out this form and submit it to the Subsurface team.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Chcielibyśmy dowiedzieć się więcej o naszych użytkownikach, ich preferencjach i sposobie korzystania z programu Subsurface. Prosimy Cię o poświęcenie kilku chwil na wypełnienie tej ankiety i podzielenie się informacjami z ekipą Subsurface.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/usersurvey.ui" line="115"/>
-        <location filename="../build/ui_usersurvey.h" line="156"/>
-        <source>Other software/sources</source>
-        <translation>Z inne źródeł / innego programu</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/usersurvey.ui" line="128"/>
-        <location filename="../build/ui_usersurvey.h" line="157"/>
-        <source>Manually entering dives</source>
-        <translation>Wprowadzam nurkowania ręcznie</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="14"/>
         <location filename="../build/ui_usersurvey.h" line="149"/>
         <source>User survey</source>
@@ -8295,6 +8362,12 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
         <translation>Ankieta Subsurface</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/usersurvey.ui" line="44"/>
+        <location filename="../build/ui_usersurvey.h" line="151"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;We would love to learn more about our users, their preferences and their usage habits. Please spare a minute to fill out this form and submit it to the Subsurface team.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Chcielibyśmy dowiedzieć się więcej o naszych użytkownikach, ich preferencjach i sposobie korzystania z programu Subsurface. Prosimy Cię o poświęcenie kilku chwil na wypełnienie tej ankiety i podzielenie się informacjami z ekipą Subsurface.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="63"/>
         <location filename="../build/ui_usersurvey.h" line="152"/>
         <source>Technical diver</source>
@@ -8319,6 +8392,18 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
         <translation>Pobieram ze wspieranego komputera nurkowego</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/usersurvey.ui" line="115"/>
+        <location filename="../build/ui_usersurvey.h" line="156"/>
+        <source>Other software/sources</source>
+        <translation>Z inne źródeł / innego programu</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/usersurvey.ui" line="128"/>
+        <location filename="../build/ui_usersurvey.h" line="157"/>
+        <source>Manually entering dives</source>
+        <translation>Wprowadzam nurkowania ręcznie</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="141"/>
         <location filename="../build/ui_usersurvey.h" line="158"/>
         <source>Android/iPhone companion app</source>
@@ -8349,6 +8434,11 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
         <translation>Skąd pochodzą Twoje nurkowania?</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/usersurvey.cpp" line="18"/>
+        <source>Send</source>
+        <translation>Wyślij</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/usersurvey.cpp" line="43"/>
         <source>
 Operating system: %1</source>
@@ -8392,19 +8482,14 @@ Język: %1</translation>
         <translation>Zapytaj później</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/usersurvey.cpp" line="101"/>
-        <source>Submit user survey.</source>
-        <translation>Wysyłanie ankiety.</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/usersurvey.cpp" line="82"/>
         <source>Ask again?</source>
         <translation>Zapytać ponownie?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/usersurvey.cpp" line="18"/>
-        <source>Send</source>
-        <translation>Wyślij</translation>
+        <location filename="../desktop-widgets/usersurvey.cpp" line="101"/>
+        <source>Submit user survey.</source>
+        <translation>Wysyłanie ankiety.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/usersurvey.cpp" line="102"/>
@@ -8496,12 +8581,12 @@ Język: %1</translation>
         <translation>Wyślij</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="324"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="325"/>
         <source>Operation timed out</source>
         <translation>Przekroczony czas</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="345"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="346"/>
         <source>Transferring data...</source>
         <translation>Transfer danych...</translation>
     </message>
@@ -8536,18 +8621,18 @@ Język: %1</translation>
 <context>
     <name>WriteSettingsThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1702"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1709"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1718"/>
-        <source>Failed!</source>
-        <translation>Niepowodzenie!</translation>
-    </message>
-    <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1700"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1721"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1689"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1710"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Ta opcja nie jest jeszcze dostępna dla wybranego komputera.</translation>
     </message>
+    <message>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1691"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1698"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1707"/>
+        <source>Failed!</source>
+        <translation>Niepowodzenie!</translation>
+    </message>
 </context>
 <context>
     <name>YearlyStatisticsModel</name>
@@ -8667,7 +8752,7 @@ Maximum</source>
 <context>
     <name>getextFromC</name>
     <message>
-        <location filename="../core/libdivecomputer.c" line="674"/>
+        <location filename="../core/libdivecomputer.c" line="737"/>
         <source>Error parsing the header</source>
         <translation>Błąd podczas przetwarzania nagłówka</translation>
     </message>
@@ -8675,38 +8760,377 @@ Maximum</source>
 <context>
     <name>gettextFromC</name>
     <message>
+        <location filename="../core/cochran.c" line="309"/>
+        <location filename="../core/cochran.c" line="315"/>
+        <location filename="../core/cochran.c" line="385"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>deco stop</source>
+        <translation>przystanek deco</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="336"/>
+        <location filename="../core/cochran.c" line="390"/>
+        <location filename="../core/file.c" line="777"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>ascent</source>
+        <translation>wynurzanie</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="342"/>
+        <location filename="../core/file.c" line="755"/>
+        <source>battery</source>
+        <translation>bateria</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="348"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
+        <source>OLF</source>
+        <translation>OLF</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="353"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
+        <source>maxdepth</source>
+        <translation>Max głębokość</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="358"/>
+        <location filename="../core/cochran.c" line="404"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
+        <source>pO₂</source>
+        <translation>pO₂</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="365"/>
+        <location filename="../core/cochran.c" line="414"/>
+        <location filename="../core/cochran.c" line="421"/>
+        <location filename="../core/file.c" line="868"/>
+        <location filename="../core/libdivecomputer.c" line="225"/>
+        <location filename="../core/libdivecomputer.c" line="228"/>
+        <source>gaschange</source>
+        <translation>zmiana gazu</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="370"/>
+        <location filename="../core/cochran.c" line="409"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>rbt</source>
+        <translation>pozostały czas denny</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="379"/>
+        <location filename="../core/cochran.c" line="426"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>ceiling</source>
+        <translation>sufit</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="395"/>
+        <location filename="../core/libdivecomputer.c" line="224"/>
+        <source>transmitter</source>
+        <translation>nadajnik</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="153"/>
+        <source>Error: the file does not appear to be a DATATRAK divelog</source>
+        <translation>Błąd: plik nie wygląda na log w formacie DATATRAK</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="286"/>
+        <source>clear</source>
+        <translation>pogodnie</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="289"/>
+        <source>misty</source>
+        <translation>mglisto</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="292"/>
+        <source>fog</source>
+        <translation>mgła</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="295"/>
+        <source>rain</source>
+        <translation>deszcz</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="298"/>
+        <source>storm</source>
+        <translation>burza</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="301"/>
+        <source>snow</source>
+        <translation>śnieg</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="321"/>
+        <source>No suit</source>
+        <translation>Bez skafandra</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="324"/>
+        <source>Shorty</source>
+        <translation>Krótki skafander</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="327"/>
+        <source>Combi</source>
+        <translation>Jednoczęściowy skafander</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="330"/>
+        <source>Wet suit</source>
+        <translation>Mokry skafander</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="333"/>
+        <source>Semidry suit</source>
+        <translation>Półsuchy</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="336"/>
+        <source>Dry suit</source>
+        <translation>Suchy skafander</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="396"/>
+        <source>no stop</source>
+        <translation>bez przystanku</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="398"/>
+        <location filename="../core/dive.c" line="29"/>
+        <source>deco</source>
+        <translation>deco</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="400"/>
+        <source>single ascent</source>
+        <translation>pojedyncze wynurzenie</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="402"/>
+        <source>multiple ascent</source>
+        <translation>wielokrotne wynurzenie</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="404"/>
+        <location filename="../core/dive.c" line="27"/>
+        <source>fresh</source>
+        <translation>słodka</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="406"/>
+        <source>salt water</source>
+        <translation>woda słona</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="431"/>
+        <source>sight seeing</source>
+        <translation>zwiedzanie</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="433"/>
+        <source>club dive</source>
+        <translation>nurkowanie klubowe</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="435"/>
+        <location filename="../core/dive.c" line="28"/>
+        <source>instructor</source>
+        <translation>instruktor</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="437"/>
+        <source>instruction</source>
+        <translation>szkolenie</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="439"/>
+        <location filename="../core/dive.c" line="27"/>
+        <source>night</source>
+        <translation>nocne</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="441"/>
+        <location filename="../core/dive.c" line="25"/>
+        <source>cave</source>
+        <translation>jaskiniowe</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="443"/>
+        <location filename="../core/dive.c" line="24"/>
+        <source>ice</source>
+        <translation>podlodowe</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="445"/>
+        <source>search</source>
+        <translation>poszukiwanie</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="455"/>
+        <location filename="../core/dive.c" line="25"/>
+        <source>wreck</source>
+        <translation>wrakowe</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="457"/>
+        <location filename="../core/dive.c" line="26"/>
+        <source>river</source>
+        <translation>rzeka</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="459"/>
+        <location filename="../core/dive.c" line="23"/>
+        <source>drift</source>
+        <translation>dryf</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="461"/>
+        <location filename="../core/dive.c" line="28"/>
+        <source>photo</source>
+        <translation>fotografia</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="463"/>
+        <source>other</source>
+        <translation>inne</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="474"/>
+        <source>Other activities</source>
+        <translation>Inne czynności</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="498"/>
+        <source>Datatrak/Wlog notes</source>
+        <translation>notatki Datatrak/Wlog</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="537"/>
+        <source>Manually entered dive</source>
+        <translation>Nurkowanie dodane ręcznie</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="588"/>
+        <source>Unknown</source>
+        <translation>Nieznany</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="674"/>
+        <source>Error: couldn&apos;t open the file %s</source>
+        <translation>Błąd: Nie można otworzyć pliku %s</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="687"/>
+        <source>Error: no dive</source>
+        <translation>Błąd: brak nurkowania</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="23"/>
+        <source>boat</source>
+        <translation>z łodzi</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="23"/>
+        <source>shore</source>
+        <translation>z brzegu</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="24"/>
+        <source>deep</source>
+        <translation>głębokie</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="24"/>
+        <source>cavern</source>
+        <translation>kawerna</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="25"/>
+        <source>altitude</source>
+        <translation>wysokość</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="26"/>
+        <source>pool</source>
+        <translation>basen</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="26"/>
+        <source>lake</source>
+        <translation>jezioro</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="27"/>
+        <source>student</source>
+        <translation>uczeń</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="28"/>
+        <source>video</source>
+        <translation>video</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="33"/>
+        <source>OC-gas</source>
+        <translation>gaz OC</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="33"/>
+        <source>diluent</source>
+        <translation>diluent</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="33"/>
+        <location filename="../core/equipment.c" line="88"/>
+        <location filename="../core/planner.c" line="1436"/>
+        <location filename="../core/planner.c" line="1439"/>
+        <source>oxygen</source>
+        <translation>tlen</translation>
+    </message>
+    <message>
         <location filename="../core/dive.c" line="181"/>
         <source>pascal</source>
         <translation>pascal</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="186"/>
-        <location filename="../core/qthelper.cpp" line="669"/>
+        <location filename="../core/qthelper.cpp" line="674"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="190"/>
-        <location filename="../core/qthelper.cpp" line="672"/>
+        <location filename="../core/qthelper.cpp" line="677"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
+        <location filename="../core/dive.c" line="227"/>
+        <source>ℓ</source>
+        <translation>ℓ</translation>
+    </message>
+    <message>
         <location filename="../core/dive.c" line="232"/>
         <source>cuft</source>
         <translation>cuft</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="269"/>
-        <location filename="../core/qthelper.cpp" line="590"/>
-        <location filename="../core/qthelper.cpp" line="605"/>
+        <location filename="../core/qthelper.cpp" line="595"/>
+        <location filename="../core/qthelper.cpp" line="610"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="274"/>
-        <location filename="../core/qthelper.cpp" line="593"/>
-        <location filename="../core/qthelper.cpp" line="607"/>
+        <location filename="../core/qthelper.cpp" line="598"/>
+        <location filename="../core/qthelper.cpp" line="612"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
@@ -8732,53 +9156,58 @@ Maximum</source>
     </message>
     <message>
         <location filename="../core/dive.c" line="325"/>
-        <location filename="../core/qthelper.cpp" line="616"/>
-        <location filename="../core/qthelper.cpp" line="626"/>
+        <location filename="../core/qthelper.cpp" line="621"/>
+        <location filename="../core/qthelper.cpp" line="631"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="329"/>
-        <location filename="../core/qthelper.cpp" line="614"/>
-        <location filename="../core/qthelper.cpp" line="624"/>
+        <location filename="../core/qthelper.cpp" line="619"/>
+        <location filename="../core/qthelper.cpp" line="629"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="1772"/>
+        <location filename="../core/dive.c" line="1751"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) lub (%s)</translation>
     </message>
     <message>
-        <location filename="../core/divelist.c" line="484"/>
+        <location filename="../core/divelist.c" line="487"/>
         <location filename="../core/equipment.c" line="84"/>
-        <location filename="../core/planner.c" line="1411"/>
-        <location filename="../core/planner.c" line="1414"/>
+        <location filename="../core/planner.c" line="1432"/>
+        <location filename="../core/planner.c" line="1435"/>
         <source>air</source>
         <translation>powietrze</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="197"/>
+        <location filename="../core/equipment.c" line="86"/>
+        <source>EAN%d</source>
+        <translation>EAN%d</translation>
+    </message>
+    <message>
+        <location filename="../core/equipment.c" line="198"/>
         <source>integrated</source>
         <translation>zintegrowany</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="198"/>
+        <location filename="../core/equipment.c" line="199"/>
         <source>belt</source>
         <translation>pas balastowy</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="199"/>
+        <location filename="../core/equipment.c" line="200"/>
         <source>ankle</source>
         <translation>na kostkach</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="200"/>
+        <location filename="../core/equipment.c" line="201"/>
         <source>backplate weight</source>
         <translation>na płycie</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="201"/>
+        <location filename="../core/equipment.c" line="202"/>
         <source>clip-on</source>
         <translation>doczepiany</translation>
     </message>
@@ -8791,8 +9220,8 @@ Maximum</source>
         <location filename="../core/file.c" line="121"/>
         <location filename="../core/file.c" line="512"/>
         <location filename="../core/file.c" line="597"/>
-        <location filename="../core/file.c" line="924"/>
-        <location filename="../core/file.c" line="1056"/>
+        <location filename="../core/file.c" line="909"/>
+        <location filename="../core/file.c" line="1092"/>
         <location filename="../core/ostctools.c" line="80"/>
         <source>Failed to read &apos;%s&apos;</source>
         <translation>Błąd odczytu &apos;%s&apos;</translation>
@@ -8850,486 +9279,496 @@ Maximum</source>
         <translation>Kalibracja O₂ </translation>
     </message>
     <message>
-        <location filename="../core/file.c" line="887"/>
-        <source>No matching DC found for file &apos;%s&apos;</source>
-        <translation>Nie znaleziono komputera nurkowego pasującego do pliku &apos;%s&apos;</translation>
+        <location filename="../core/git-access.c" line="134"/>
+        <source>Local cache directory %s corrupted - can&apos;t sync with Subsurface cloud storage</source>
+        <translation>Lokalny katalog podręczny %s został uszkodzony - nie można zsynchronizować się z chmurą</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>none</source>
-        <translation>brak</translation>
+        <location filename="../core/git-access.c" line="157"/>
+        <location filename="../core/git-access.c" line="177"/>
+        <source>Could not update local cache to newer remote data</source>
+        <translation>Nie można zaktualizować zdalnych danych lokalnymi - zdalne dane są nowsze.</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="309"/>
-        <location filename="../core/cochran.c" line="315"/>
-        <location filename="../core/cochran.c" line="385"/>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>deco stop</source>
-        <translation>przystanek deco</translation>
+        <location filename="../core/git-access.c" line="170"/>
+        <source>Subsurface cloud storage corrupted</source>
+        <translation>Dane w chmurze zostały uszkodzone</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="342"/>
-        <location filename="../core/file.c" line="755"/>
-        <source>battery</source>
-        <translation>bateria</translation>
+        <location filename="../core/git-access.c" line="284"/>
+        <source>Could not update Subsurface cloud storage, try again later</source>
+        <translation>Nie można zaktualizować danych w chmurze Subsurface, spróbuj później.</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="370"/>
-        <location filename="../core/cochran.c" line="409"/>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>rbt</source>
-        <translation>pozostały czas denny</translation>
+        <location filename="../core/git-access.c" line="344"/>
+        <source>Remote storage and local data diverged. Error: merge failed (%s)</source>
+        <translation>Dane zdalne i dane lokalne utraciły synchronizację. Nie udało się ich scalić (%s)</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="336"/>
-        <location filename="../core/cochran.c" line="390"/>
-        <location filename="../core/file.c" line="777"/>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>ascent</source>
-        <translation>wynurzanie</translation>
+        <location filename="../core/git-access.c" line="374"/>
+        <source>Remote storage and local data diverged. Cannot combine local and remote changes</source>
+        <translation>Dane zdalne i dane lokalne rozeszły się. Nie można połączyć zdalnych i lokalnych zmian.</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="379"/>
-        <location filename="../core/cochran.c" line="426"/>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>ceiling</source>
-        <translation>sufit</translation>
+        <location filename="../core/git-access.c" line="408"/>
+        <source>Remote storage and local data diverged</source>
+        <translation>Dane zdalne i dane lokalne rozeszły się</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>workload</source>
-        <translation>wysiłek</translation>
+        <location filename="../core/git-access.c" line="411"/>
+        <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source>
+        <translation>Dane zdalne i dane lokalne rozeszły się. Błąd przy zapisywaniu danych (%s)</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="395"/>
-        <location filename="../core/libdivecomputer.c" line="203"/>
-        <source>transmitter</source>
-        <translation>nadajnik</translation>
+        <location filename="../core/git-access.c" line="420"/>
+        <source>Problems with local cache of Subsurface cloud data</source>
+        <translation>Problem z lokalną pamięcią podręczna danych z chmury</translation>
+    </message>
+    <message>
+        <location filename="../core/git-access.c" line="421"/>
+        <source>Moved cache data to %s. Please try the operation again.</source>
+        <translation>Pamięć podręczna przeniesiona do %s. Spróbuj ponownie.</translation>
+    </message>
+    <message>
+        <location filename="../core/git-access.c" line="743"/>
+        <source>Error connecting to Subsurface cloud storage</source>
+        <translation>Nie udało się połączyć z chmurą Subsurface</translation>
+    </message>
+    <message>
+        <location filename="../core/git-access.c" line="746"/>
+        <source>git clone of %s failed (%s)</source>
+        <translation>Nieudana operacja git clone dla %s (%s)</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="210"/>
+        <location filename="../core/parse-xml.c" line="3317"/>
+        <location filename="../core/uemis-downloader.c" line="134"/>
+        <source>unknown</source>
+        <translation>nieznana</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>none</source>
+        <translation>brak</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="203"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>workload</source>
+        <translation>wysiłek</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="224"/>
         <source>violation</source>
         <translation>naruszenie</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="203"/>
+        <location filename="../core/libdivecomputer.c" line="224"/>
         <source>bookmark</source>
         <translation>notatka</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="203"/>
+        <location filename="../core/libdivecomputer.c" line="224"/>
         <source>surface</source>
         <translation>powierzchnia</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="203"/>
+        <location filename="../core/libdivecomputer.c" line="224"/>
         <source>safety stop</source>
         <translation>przystanek bezpieczeństwa</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="365"/>
-        <location filename="../core/cochran.c" line="414"/>
-        <location filename="../core/cochran.c" line="421"/>
-        <location filename="../core/file.c" line="868"/>
-        <location filename="../core/libdivecomputer.c" line="204"/>
-        <location filename="../core/libdivecomputer.c" line="207"/>
-        <source>gaschange</source>
-        <translation>zmiana gazu</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="204"/>
+        <location filename="../core/libdivecomputer.c" line="225"/>
         <source>safety stop (voluntary)</source>
         <translation>przystanek bezpieczeństwa (opcjonalny)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="204"/>
+        <location filename="../core/libdivecomputer.c" line="225"/>
         <source>safety stop (mandatory)</source>
         <translation>przystanek bezpieczeństwa (obowiązkowy)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="205"/>
+        <location filename="../core/libdivecomputer.c" line="226"/>
         <source>deepstop</source>
         <translation>deepstop</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="205"/>
+        <location filename="../core/libdivecomputer.c" line="226"/>
         <source>ceiling (safety stop)</source>
         <translation>sufit (przystanek bezpieczeństwa)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="205"/>
-        <source>divetime</source>
-        <translation>czas nurkowania</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="205"/>
+        <location filename="../core/libdivecomputer.c" line="226"/>
         <source>below floor</source>
         <comment>event showing dive is below deco floor and adding deco time</comment>
         <translation>poniżej podłogi deco</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="353"/>
-        <location filename="../core/libdivecomputer.c" line="206"/>
-        <source>maxdepth</source>
-        <translation>Max głębokość</translation>
-    </message>
-    <message>
-        <location filename="../core/cochran.c" line="348"/>
-        <location filename="../core/libdivecomputer.c" line="206"/>
-        <source>OLF</source>
-        <translation>OLF</translation>
+        <location filename="../core/libdivecomputer.c" line="226"/>
+        <source>divetime</source>
+        <translation>czas nurkowania</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="206"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
         <source>airtime</source>
         <translation>Pozostały czas oddychania</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="206"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
         <source>rgbm</source>
         <translation>rgbm</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="206"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
         <source>heading</source>
         <translation>kierunek</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="358"/>
-        <location filename="../core/cochran.c" line="404"/>
-        <location filename="../core/libdivecomputer.c" line="206"/>
-        <source>pO₂</source>
-        <translation>pO₂</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="207"/>
+        <location filename="../core/libdivecomputer.c" line="228"/>
         <source>tissue level warning</source>
         <translation>Ostrzeżenie: poziom nasycenia tkanek</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="207"/>
+        <location filename="../core/libdivecomputer.c" line="228"/>
         <source>non stop time</source>
         <translation>czas bezdekompresyjny</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="224"/>
+        <location filename="../core/libdivecomputer.c" line="237"/>
         <source>invalid event number</source>
         <translation>niepoprawny znacznik</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="658"/>
-        <source>Unable to create parser for %s %s</source>
-        <translation>Nie udało się utworzyć parsera dla %s %s</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="664"/>
-        <source>Error registering the data</source>
-        <translation>Błąd podczas przetwarzania danych</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="495"/>
+        <location filename="../core/libdivecomputer.c" line="553"/>
         <source>Error parsing the datetime</source>
         <translation>Błąd podczas przetwarzania daty i czasu</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="513"/>
+        <location filename="../core/libdivecomputer.c" line="571"/>
         <source>Dive %d: %s</source>
         <translation>Nurkowanie %d: %s</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="519"/>
+        <location filename="../core/libdivecomputer.c" line="577"/>
         <source>Error parsing the divetime</source>
         <translation>Błąd podczas przetwarzania czasu nurkowania</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="529"/>
+        <location filename="../core/libdivecomputer.c" line="587"/>
         <source>Error parsing the maxdepth</source>
         <translation>Błąd podczas przetwarzania głębokości</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="548"/>
+        <location filename="../core/libdivecomputer.c" line="606"/>
         <source>Error parsing temperature</source>
         <translation>Błąd przy przetwarzaniu temperatury</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="568"/>
+        <location filename="../core/libdivecomputer.c" line="626"/>
         <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="../core/libdivecomputer.c" line="580"/>
+        <location filename="../core/libdivecomputer.c" line="638"/>
         <source>Error obtaining water salinity</source>
         <translation>Błąd podczas przetwarzania danych o zasoleniu</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="589"/>
+        <location filename="../core/libdivecomputer.c" line="647"/>
         <source>Error obtaining surface pressure</source>
         <translation>Błąd podczas przetwarzania danych o cienieniu atmosferycznym</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="614"/>
+        <location filename="../core/libdivecomputer.c" line="672"/>
         <source>Error obtaining divemode</source>
         <translation>Błąd odczytywania trybu pracy komputera nurkowego </translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="634"/>
+        <location filename="../core/libdivecomputer.c" line="692"/>
         <source>Error parsing the gas mix</source>
         <translation>Błąd podczas przetwarzania danych o użytym rodzaju gazu</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="684"/>
+        <location filename="../core/libdivecomputer.c" line="717"/>
+        <source>Unable to create parser for %s %s</source>
+        <translation>Nie udało się utworzyć parsera dla %s %s</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="723"/>
+        <source>Error registering the data</source>
+        <translation>Błąd podczas przetwarzania danych</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="744"/>
         <source>Error parsing the samples</source>
         <translation>Błąd podczas przetwarzania próbek</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="822"/>
+        <location filename="../core/libdivecomputer.c" line="882"/>
         <source>Event: waiting for user action</source>
         <translation>Oczekiwanie na działanie użytkownika</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="830"/>
+        <location filename="../core/libdivecomputer.c" line="890"/>
         <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="../core/libdivecomputer.c" line="894"/>
+        <location filename="../core/libdivecomputer.c" line="954"/>
         <source>Error registering the event handler.</source>
         <translation>Błąd rejestracji uchwytu (event handler)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="899"/>
+        <location filename="../core/libdivecomputer.c" line="959"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Błąd rejestracji uchwytu (cancellation handler)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="920"/>
+        <location filename="../core/libdivecomputer.c" line="980"/>
         <source>Dive data import error</source>
         <translation>Błąd podczas importowania danych</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="959"/>
+        <location filename="../core/libdivecomputer.c" line="1019"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Nie można utworzyć kontekstu libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="966"/>
+        <location filename="../core/libdivecomputer.c" line="1026"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Nie udało się otworzyć %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="992"/>
+        <location filename="../core/libdivecomputer.c" line="1048"/>
         <source>Insufficient privileges to open the device %s %s (%s)</source>
         <translation>Brak uprawnień by otworzyć urządzenie %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../core/parse-xml.c" line="517"/>
-        <source>Strange percentage reading %s
+        <location filename="../core/load-git.c" line="194"/>
+        <location filename="../core/parse-xml.c" line="1242"/>
+        <source>multiple GPS locations for this dive site; also %s
 </source>
-        <translation>Podejrzany skład procentowy %s
+        <translation>jest kilka lokalizacji GPS dla tego miejsca; także %s
 </translation>
     </message>
     <message>
-        <location filename="../core/load-git.c" line="194"/>
-        <location filename="../core/parse-xml.c" line="1238"/>
-        <source>multiple GPS locations for this dive site; also %s
+        <location filename="../core/load-git.c" line="222"/>
+        <location filename="../core/parse-xml.c" line="1304"/>
+        <source>additional name for site: %s
 </source>
-        <translation>jest kilka lokalizacji GPS dla tego miejsca; także %s
+        <translation>dodatkowa nazwa dla miejsca: %s
 </translation>
     </message>
     <message>
-        <location filename="../core/parse-xml.c" line="2044"/>
+        <location filename="../core/ostctools.c" line="120"/>
+        <location filename="../core/ostctools.c" line="152"/>
+        <source>Unknown DC in dive %d</source>
+        <translation>Nieznany komputer nurkowy w nurkowaniu %d</translation>
+    </message>
+    <message>
+        <location filename="../core/ostctools.c" line="165"/>
+        <source>Error - %s - parsing dive %d</source>
+        <translation>Błąd - %s - przetwarzanie nurkowania %d</translation>
+    </message>
+    <message>
+        <location filename="../core/parse-xml.c" line="517"/>
+        <source>Strange percentage reading %s
+</source>
+        <translation>Podejrzany skład procentowy %s
+</translation>
+    </message>
+    <message>
+        <location filename="../core/parse-xml.c" line="2051"/>
         <source>Failed to parse &apos;%s&apos;</source>
         <translation>Nie udało się przetworzyć &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../core/parse-xml.c" line="3741"/>
+        <location filename="../core/parse-xml.c" line="3774"/>
         <source>Can&apos;t open stylesheet %s</source>
         <translation>Nie można otworzyć arkusza stylów %s</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="86"/>
-        <source>EAN%d</source>
-        <translation>EAN%d</translation>
+        <location filename="../core/planner.c" line="555"/>
+        <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE %s ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source>
+        <translation>OSTRZEŻENIE: TEN PLANER UŻYWA IMPLEMENTACJI ALGORYTMU %s, KTÓRA JEST NOWA I ZOSTAŁA PRZETESTOWANA W BARDZO OGRANICZONYM ZAKRESIE. ZDECYDOWANIE ODRADZAMY PLANOWANIE NURKOWANIA JEDYNIE W OPARCIU O REZULTATY DZIAŁANIA TEGO PROGRAMU.</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="1032"/>
-        <location filename="../core/planner.c" line="1184"/>
-        <source>Can&apos;t find gas %s</source>
-        <translation>Nie można znaleźć gazu %s</translation>
+        <location filename="../core/planner.c" line="569"/>
+        <source>Decompression calculation aborted due to excessive time</source>
+        <translation>Obliczanie dekompresji przerwane z powodu zbyt długiego czasu.</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="368"/>
-        <source>Too many gas mixes</source>
-        <translation>Zbyt wiele rodzajów gazu</translation>
+        <location filename="../core/planner.c" line="571"/>
+        <location filename="../core/planner.c" line="829"/>
+        <location filename="../core/planner.c" line="834"/>
+        <location filename="../core/planner.c" line="860"/>
+        <location filename="../core/planner.c" line="870"/>
+        <source>Warning:</source>
+        <translation>Ostrzeżenie:</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="568"/>
-        <source>Decompression calculation aborted due to excessive time</source>
-        <translation>Obliczanie dekompresji przerwane z powodu zbyt długiego czasu.</translation>
+        <location filename="../core/planner.c" line="581"/>
+        <source>based on Bühlmann ZHL-16C with GFlow = %d and GFhigh = %d</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="586"/>
+        <source>based on VPM-B at nominal conservatism</source>
+        <translation>w oparciu o VPM-B z nominalnym konserwatyzmem </translation>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="588"/>
+        <source>based on VPM-B at +%d conservatism</source>
+        <translation>w oparciu o VPM-B z konserwatyzmem +%d</translation>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="590"/>
+        <source>, effective GF=%d/%d</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="594"/>
+        <source>recreational mode based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source>
+        <translation>tryb rekreacyjny w oparciu o Bühlmann ZHL-16B z GFlow = %d i GFhigh = %d</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="592"/>
+        <location filename="../core/planner.c" line="598"/>
         <source>Subsurface dive plan</source>
         <translation>Plan nurkowania Subsurface </translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="596"/>
-        <source>depth</source>
-        <translation>głębokość</translation>
+        <location filename="../core/planner.c" line="599"/>
+        <source>&lt;div&gt;Runtime: %dmin&lt;/div&gt;&lt;br&gt;</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="602"/>
-        <source>runtime</source>
-        <translation>runtime</translation>
+        <location filename="../core/planner.c" line="604"/>
+        <source>depth</source>
+        <translation>głębokość</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="599"/>
+        <location filename="../core/planner.c" line="607"/>
         <source>duration</source>
         <translation>czas trwania</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="554"/>
-        <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE %s ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source>
-        <translation>OSTRZEŻENIE: TEN PLANER UŻYWA IMPLEMENTACJI ALGORYTMU %s, KTÓRA JEST NOWA I ZOSTAŁA PRZETESTOWANA W BARDZO OGRANICZONYM ZAKRESIE. ZDECYDOWANIE ODRADZAMY PLANOWANIE NURKOWANIA JEDYNIE W OPARCIU O REZULTATY DZIAŁANIA TEGO PROGRAMU.</translation>
+        <location filename="../core/planner.c" line="610"/>
+        <source>runtime</source>
+        <translation>runtime</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="605"/>
+        <location filename="../core/planner.c" line="613"/>
         <source>gas</source>
         <translation>gaz</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="648"/>
+        <location filename="../core/planner.c" line="656"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation>Przejście do %.*f %s w %d:%02d min - runtime %d:%02u z %s (SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="656"/>
+        <location filename="../core/planner.c" line="664"/>
         <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="../core/planner.c" line="669"/>
+        <location filename="../core/planner.c" line="677"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation>Pozostań na %.*f %s przez %d:%02d min - runtime %d:%02u z %s (SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="676"/>
+        <location filename="../core/planner.c" line="684"/>
         <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="../core/planner.c" line="721"/>
+        <location filename="../core/planner.c" line="729"/>
         <source>%3.0f%s</source>
         <translation>%3.0f%s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="724"/>
-        <location filename="../core/planner.c" line="728"/>
+        <location filename="../core/planner.c" line="732"/>
+        <location filename="../core/planner.c" line="736"/>
         <source>%3dmin</source>
         <translation>%3dmin</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="737"/>
-        <location filename="../core/planner.c" line="749"/>
+        <location filename="../core/planner.c" line="745"/>
+        <location filename="../core/planner.c" line="757"/>
         <source>(SP = %.1fbar)</source>
         <translation>(SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="772"/>
+        <location filename="../core/planner.c" line="780"/>
         <source>Switch gas to %s (SP = %.1fbar)</source>
         <translation>Zmiana gazu na %s (SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="774"/>
+        <location filename="../core/planner.c" line="782"/>
         <source>Switch gas to %s</source>
         <translation>Zmiana gazu na %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="793"/>
+        <location filename="../core/planner.c" line="801"/>
         <source>CNS</source>
         <translation>CNS</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="795"/>
+        <location filename="../core/planner.c" line="803"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="799"/>
+        <location filename="../core/planner.c" line="807"/>
         <source>Gas consumption (CCR legs excluded):</source>
         <translation>Zużycie gazu (nie uwzględnia CCR):</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="801"/>
+        <location filename="../core/planner.c" line="809"/>
         <source>Gas consumption:</source>
         <translation>Zużycie gazu:</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="570"/>
-        <location filename="../core/planner.c" line="821"/>
-        <location filename="../core/planner.c" line="826"/>
-        <location filename="../core/planner.c" line="851"/>
-        <location filename="../core/planner.c" line="861"/>
-        <source>Warning:</source>
-        <translation>Ostrzeżenie:</translation>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="580"/>
-        <source>based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source>
-        <translation>w oparciu o Bühlmann ZHL-16B z GFlow = %d i GFhigh = %d</translation>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="584"/>
-        <source>based on VPM-B at nominal conservatism</source>
-        <translation>w oparciu o VPM-B z nominalnym konserwatyzmem </translation>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="586"/>
-        <source>based on VPM-B at +%d conservatism</source>
-        <translation>w oparciu o VPM-B z konserwatyzmem +%d</translation>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="588"/>
-        <source>recreational mode based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source>
-        <translation>tryb rekreacyjny w oparciu o Bühlmann ZHL-16B z GFlow = %d i GFhigh = %d</translation>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="822"/>
+        <location filename="../core/planner.c" line="830"/>
         <source>this is more gas than available in the specified cylinder!</source>
         <translation>to więcej gazu niż masz w dostępnych butlach!</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="827"/>
+        <location filename="../core/planner.c" line="835"/>
         <source>not enough reserve for gas sharing on ascent!</source>
         <translation>brak rezerwy na dzielenie się gazem z partnerem przy wynurzaniu!</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="829"/>
+        <location filename="../core/planner.c" line="837"/>
         <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source>
         <translation>%.0f%s/%.0f%s gazu %s (%.0f%s/%.0f%s podczas wynurzania)</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="831"/>
+        <location filename="../core/planner.c" line="839"/>
         <source>%.0f%s (%.0f%s during planned ascent) of %s</source>
         <translation>%.0f%s (%.0f%s podczas wynurzania) gazu %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="848"/>
+        <location filename="../core/planner.c" line="857"/>
         <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
         <translation>wysoki pO₂ o wartości %.2f w %d:%02u przy użyciu %s na głębokości %.*f %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="858"/>
+        <location filename="../core/planner.c" line="867"/>
         <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
         <translation>niska wartość pO₂ %.2f o %d:%02u gaz %s na głębokości %.*f %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="1419"/>
+        <location filename="../core/planner.c" line="1194"/>
+        <source>Can&apos;t find gas %s</source>
+        <translation>Nie można znaleźć gazu %s</translation>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="1440"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1280"/>
+        <location filename="../core/profile.c" line="1298"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
@@ -9338,70 +9777,70 @@ D: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1283"/>
+        <location filename="../core/profile.c" line="1301"/>
         <source>P: %d%s
 </source>
         <translation>P: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1287"/>
+        <location filename="../core/profile.c" line="1305"/>
         <source>T: %.1f%s
 </source>
         <translation>T: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1293"/>
+        <location filename="../core/profile.c" line="1311"/>
         <source>V: %.1f%s
 </source>
         <translation>V: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1296"/>
+        <location filename="../core/profile.c" line="1314"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation>SAC: %.*f%s/min
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1298"/>
+        <location filename="../core/profile.c" line="1316"/>
         <source>CNS: %u%%
 </source>
         <translation>CNS: %u%%
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1300"/>
+        <location filename="../core/profile.c" line="1318"/>
         <source>pO%s: %.2fbar
 </source>
         <translation>pO%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1302"/>
+        <location filename="../core/profile.c" line="1320"/>
         <source>pN%s: %.2fbar
 </source>
         <translation>pN%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1304"/>
+        <location filename="../core/profile.c" line="1322"/>
         <source>pHe: %.2fbar
 </source>
         <translation>pHe: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1307"/>
+        <location filename="../core/profile.c" line="1325"/>
         <source>MOD: %d%s
 </source>
         <translation>MOD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1314"/>
+        <location filename="../core/profile.c" line="1332"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
@@ -9410,7 +9849,7 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1318"/>
+        <location filename="../core/profile.c" line="1336"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
@@ -9419,35 +9858,35 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1331"/>
+        <location filename="../core/profile.c" line="1349"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation>Przystanek bezp.: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1334"/>
+        <location filename="../core/profile.c" line="1352"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation>Przystanek bezp.: nieznany czas @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1339"/>
+        <location filename="../core/profile.c" line="1357"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation>Deco: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1342"/>
+        <location filename="../core/profile.c" line="1360"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation>Deco: nieznany czas @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1346"/>
+        <location filename="../core/profile.c" line="1364"/>
         <source>In deco
 </source>
         <translation>dekompresja
@@ -9455,139 +9894,144 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1348"/>
+        <location filename="../core/profile.c" line="1366"/>
         <source>NDL: %umin
 </source>
         <translation>NDL: %umin
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1351"/>
+        <location filename="../core/profile.c" line="1369"/>
         <source>TTS: %umin
 </source>
         <translation>TTS: %umin
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1354"/>
+        <location filename="../core/profile.c" line="1372"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation>Deco: %umin @ %.0f%s (obliczone)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1362"/>
+        <location filename="../core/profile.c" line="1380"/>
         <source>In deco (calc)
 </source>
         <translation>dekompresja (obliczone)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1365"/>
+        <location filename="../core/profile.c" line="1383"/>
         <source>NDL: %umin (calc)
 </source>
         <translation>NDL: %umin (calc)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1367"/>
+        <location filename="../core/profile.c" line="1385"/>
         <source>NDL: &gt;2h (calc)
 </source>
         <translation>NDL: &gt;2h
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1371"/>
+        <location filename="../core/profile.c" line="1389"/>
         <source>TTS: %umin (calc)
 </source>
         <translation>TTS: %umin (calc)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1373"/>
+        <location filename="../core/profile.c" line="1391"/>
         <source>TTS: &gt;2h (calc)
 </source>
         <translation>TTS: &gt;2h
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1376"/>
+        <location filename="../core/profile.c" line="1394"/>
         <source>RBT: %umin
 </source>
         <translation>RBT: %umin
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1379"/>
+        <location filename="../core/profile.c" line="1397"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation>Obliczony sufit:  %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1385"/>
+        <location filename="../core/profile.c" line="1403"/>
         <source>Tissue %.0fmin: %.1f%s
 </source>
         <translation>Tkanka %.0fmin: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1391"/>
+        <location filename="../core/profile.c" line="1409"/>
         <source>heartbeat: %d
 </source>
         <translation>tętno: %d
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1393"/>
+        <location filename="../core/profile.c" line="1411"/>
         <source>bearing: %d
 </source>
         <translation>kurs: %d
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1396"/>
+        <location filename="../core/profile.c" line="1414"/>
         <source>mean depth to here %.1f%s
 </source>
         <translation>gł. średnia do teraz %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1491"/>
+        <location filename="../core/profile.c" line="1515"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1495"/>
-        <location filename="../core/profile.c" line="1499"/>
-        <location filename="../core/profile.c" line="1503"/>
+        <location filename="../core/profile.c" line="1519"/>
+        <location filename="../core/profile.c" line="1523"/>
+        <location filename="../core/profile.c" line="1527"/>
         <source>%s %sD:%.1f%s</source>
         <translation>%s %sGł:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1507"/>
+        <location filename="../core/profile.c" line="1531"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sGł:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1511"/>
+        <location filename="../core/profile.c" line="1535"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1515"/>
-        <location filename="../core/profile.c" line="1519"/>
+        <location filename="../core/profile.c" line="1539"/>
+        <location filename="../core/profile.c" line="1543"/>
         <source>%s %sV:%.2f%s</source>
         <translation>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1526"/>
+        <location filename="../core/profile.c" line="1550"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s</translation>
     </message>
     <message>
+        <location filename="../core/profile.c" line="1575"/>
+        <source>%s SAC:%.*f %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../core/qthelper.cpp" line="67"/>
         <source>%1km</source>
         <translation>%1km</translation>
@@ -9608,446 +10052,460 @@ EADD: %d%s
         <translation>%1yd</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="635"/>
+        <location filename="../core/qthelper.cpp" line="91"/>
+        <location filename="../core/qthelper.cpp" line="226"/>
+        <source>N</source>
+        <translation>N</translation>
+    </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="91"/>
+        <location filename="../core/qthelper.cpp" line="227"/>
+        <source>S</source>
+        <translation>S</translation>
+    </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="92"/>
+        <location filename="../core/qthelper.cpp" line="228"/>
+        <source>E</source>
+        <translation>E</translation>
+    </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="92"/>
+        <location filename="../core/qthelper.cpp" line="229"/>
+        <source>W</source>
+        <translation>W</translation>
+    </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="640"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="638"/>
+        <location filename="../core/qthelper.cpp" line="643"/>
         <source>F</source>
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="23"/>
-        <source>boat</source>
-        <translation>z łodzi</translation>
+        <location filename="../core/save-html.c" line="469"/>
+        <location filename="../core/save-html.c" line="553"/>
+        <location filename="../core/worldmap-save.c" line="111"/>
+        <source>Can&apos;t open file %s</source>
+        <translation>Nie można otworzyć pliku %s</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="23"/>
-        <source>shore</source>
-        <translation>z brzegu</translation>
+        <location filename="../core/save-html.c" line="488"/>
+        <source>Number</source>
+        <translation>Numer</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="459"/>
-        <location filename="../core/dive.c" line="23"/>
-        <source>drift</source>
-        <translation>dryf</translation>
+        <location filename="../core/save-html.c" line="489"/>
+        <source>Date</source>
+        <translation>Data</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="24"/>
-        <source>deep</source>
-        <translation>głębokie</translation>
+        <location filename="../core/save-html.c" line="490"/>
+        <source>Time</source>
+        <translation>Czas</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="24"/>
-        <source>cavern</source>
-        <translation>kawerna</translation>
+        <location filename="../core/save-html.c" line="491"/>
+        <source>Location</source>
+        <translation>Miejsce</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="443"/>
-        <location filename="../core/dive.c" line="24"/>
-        <source>ice</source>
-        <translation>podlodowe</translation>
+        <location filename="../core/save-html.c" line="492"/>
+        <source>Air temp.</source>
+        <translation>Temp. powietrza</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="445"/>
-        <source>search</source>
-        <translation>poszukiwanie</translation>
+        <location filename="../core/save-html.c" line="493"/>
+        <source>Water temp.</source>
+        <translation>Temp. wody</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="455"/>
-        <location filename="../core/dive.c" line="25"/>
-        <source>wreck</source>
-        <translation>wrakowe</translation>
+        <location filename="../core/save-html.c" line="494"/>
+        <source>Dives</source>
+        <translation>Nurkowania</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="441"/>
-        <location filename="../core/dive.c" line="25"/>
-        <source>cave</source>
-        <translation>jaskiniowe</translation>
+        <location filename="../core/save-html.c" line="495"/>
+        <source>Expand all</source>
+        <translation>Rozwiń wszystkie</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="25"/>
-        <source>altitude</source>
-        <translation>wysokość</translation>
+        <location filename="../core/save-html.c" line="496"/>
+        <source>Collapse all</source>
+        <translation>Zwiń wszystkie</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="26"/>
-        <source>pool</source>
-        <translation>basen</translation>
+        <location filename="../core/save-html.c" line="497"/>
+        <source>Trips</source>
+        <translation>Grupy</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="26"/>
-        <source>lake</source>
-        <translation>jezioro</translation>
+        <location filename="../core/save-html.c" line="498"/>
+        <source>Statistics</source>
+        <translation>Statystyka</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="457"/>
-        <location filename="../core/dive.c" line="26"/>
-        <source>river</source>
-        <translation>rzeka</translation>
+        <location filename="../core/save-html.c" line="499"/>
+        <source>Advanced search</source>
+        <translation>Wyszukiwanie zaawansowane</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="439"/>
-        <location filename="../core/dive.c" line="27"/>
-        <source>night</source>
-        <translation>nocne</translation>
+        <location filename="../core/save-html.c" line="502"/>
+        <source>Rating</source>
+        <translation>Ocena</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="153"/>
-        <source>Error: the file does not appear to be a DATATRAK divelog</source>
-        <translation>Błąd: plik nie wygląda na log w formacie DATATRAK</translation>
+        <location filename="../core/save-html.c" line="503"/>
+        <source>Visibility</source>
+        <translation>Widzialność</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="286"/>
-        <source>clear</source>
-        <translation>pogodnie</translation>
+        <location filename="../core/save-html.c" line="504"/>
+        <source>Duration</source>
+        <translation>Czas trwania</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="289"/>
-        <source>misty</source>
-        <translation>mglisto</translation>
+        <location filename="../core/save-html.c" line="505"/>
+        <source>Divemaster</source>
+        <translation>Divemaster</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="292"/>
-        <source>fog</source>
-        <translation>mgła</translation>
+        <location filename="../core/save-html.c" line="506"/>
+        <source>Buddy</source>
+        <translation>Partner</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="295"/>
-        <source>rain</source>
-        <translation>deszcz</translation>
+        <location filename="../core/save-html.c" line="507"/>
+        <source>Suit</source>
+        <translation>Skafander</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="298"/>
-        <source>storm</source>
-        <translation>burza</translation>
+        <location filename="../core/save-html.c" line="508"/>
+        <source>Tags</source>
+        <translation>Tagi</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="301"/>
-        <source>snow</source>
-        <translation>śnieg</translation>
+        <location filename="../core/save-html.c" line="509"/>
+        <location filename="../smtk-import/smartrak.c" line="251"/>
+        <location filename="../smtk-import/smartrak.c" line="321"/>
+        <source>Notes</source>
+        <translation>Notatki</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="321"/>
-        <source>No suit</source>
-        <translation>Bez skafandra</translation>
+        <location filename="../core/save-html.c" line="510"/>
+        <source>Show more details</source>
+        <translation>Pokaż więcej szczegółów</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="324"/>
-        <source>Shorty</source>
-        <translation>Krótki skafander</translation>
+        <location filename="../core/save-html.c" line="513"/>
+        <source>Yearly statistics</source>
+        <translation>Statystyka roczna</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="327"/>
-        <source>Combi</source>
-        <translation>Jednoczęściowy skafander</translation>
+        <location filename="../core/save-html.c" line="514"/>
+        <source>Year</source>
+        <translation>Rok</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="330"/>
-        <source>Wet suit</source>
-        <translation>Mokry skafander</translation>
+        <location filename="../core/save-html.c" line="515"/>
+        <source>Total time</source>
+        <translation>Całkowity czas</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="333"/>
-        <source>Semidry suit</source>
-        <translation>Półsuchy</translation>
+        <location filename="../core/save-html.c" line="516"/>
+        <source>Average time</source>
+        <translation>Średnia długość</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="336"/>
-        <source>Dry suit</source>
-        <translation>Suchy skafander</translation>
+        <location filename="../core/save-html.c" line="517"/>
+        <source>Shortest time</source>
+        <translation>Najmniejsza długość</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="396"/>
-        <source>no stop</source>
-        <translation>bez przystanku</translation>
+        <location filename="../core/save-html.c" line="518"/>
+        <source>Longest time</source>
+        <translation>Największa długość</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="400"/>
-        <source>single ascent</source>
-        <translation>pojedyncze wynurzenie</translation>
+        <location filename="../core/save-html.c" line="519"/>
+        <source>Average depth</source>
+        <translation>Średnia głębokość</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="402"/>
-        <source>multiple ascent</source>
-        <translation>wielokrotne wynurzenie</translation>
+        <location filename="../core/save-html.c" line="520"/>
+        <source>Min. depth</source>
+        <translation>Min głębokość </translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="404"/>
-        <location filename="../core/dive.c" line="27"/>
-        <source>fresh</source>
-        <translation>słodka</translation>
+        <location filename="../core/save-html.c" line="521"/>
+        <source>Max. depth</source>
+        <translation>Maks. głębokość</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="406"/>
-        <source>salt water</source>
-        <translation>woda słona</translation>
+        <location filename="../core/save-html.c" line="522"/>
+        <source>Average SAC</source>
+        <translation>Średni SAC</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="431"/>
-        <source>sight seeing</source>
-        <translation>zwiedzanie</translation>
+        <location filename="../core/save-html.c" line="523"/>
+        <source>Min. SAC</source>
+        <translation>Min SAC</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="433"/>
-        <source>club dive</source>
-        <translation>nurkowanie klubowe</translation>
+        <location filename="../core/save-html.c" line="524"/>
+        <source>Max. SAC</source>
+        <translation>Max SAC</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="437"/>
-        <source>instruction</source>
-        <translation>szkolenie</translation>
+        <location filename="../core/save-html.c" line="525"/>
+        <source>Average temp.</source>
+        <translation>Średnia temperatura </translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="463"/>
-        <source>other</source>
-        <translation>inne</translation>
+        <location filename="../core/save-html.c" line="526"/>
+        <source>Min. temp.</source>
+        <translation>Min. temp.</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="474"/>
-        <source>Other activities</source>
-        <translation>Inne czynności</translation>
+        <location filename="../core/save-html.c" line="527"/>
+        <source>Max. temp.</source>
+        <translation>Max. temp.</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="498"/>
-        <source>Datatrak/Wlog notes</source>
-        <translation>notatki Datatrak/Wlog</translation>
+        <location filename="../core/save-html.c" line="528"/>
+        <source>Back to list</source>
+        <translation>Powrót do listy</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="537"/>
-        <source>Manually entered dive</source>
-        <translation>Nurkowanie dodane ręcznie</translation>
+        <location filename="../core/save-html.c" line="531"/>
+        <source>Dive No.</source>
+        <translation>Nurkowanie nr</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="588"/>
-        <source>Unknown</source>
-        <translation>Nieznany</translation>
+        <location filename="../core/save-html.c" line="532"/>
+        <source>Dive profile</source>
+        <translation>Profil</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="674"/>
-        <source>Error: couldn&apos;t open the file %s</source>
-        <translation>Błąd: Nie można otworzyć pliku %s</translation>
+        <location filename="../core/save-html.c" line="533"/>
+        <source>Dive information</source>
+        <translation>Informacje</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="687"/>
-        <source>Error: no dive</source>
-        <translation>Błąd: brak nurkowania</translation>
+        <location filename="../core/save-html.c" line="534"/>
+        <source>Dive equipment</source>
+        <translation>Wyposażenie</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="27"/>
-        <source>student</source>
-        <translation>uczeń</translation>
+        <location filename="../core/save-html.c" line="535"/>
+        <location filename="../core/save-html.c" line="542"/>
+        <source>Type</source>
+        <translation>Rodzaj</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="461"/>
-        <location filename="../core/dive.c" line="28"/>
-        <source>photo</source>
-        <translation>fotografia</translation>
+        <location filename="../core/save-html.c" line="536"/>
+        <source>Size</source>
+        <translation>Pojemność</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="28"/>
-        <source>video</source>
-        <translation>video</translation>
+        <location filename="../core/save-html.c" line="537"/>
+        <source>Work pressure</source>
+        <translation>Ciśnienie robocze</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="435"/>
-        <location filename="../core/dive.c" line="28"/>
-        <source>instructor</source>
-        <translation>instruktor</translation>
+        <location filename="../core/save-html.c" line="538"/>
+        <source>Start pressure</source>
+        <translation>Ciśnienie początkowe</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="398"/>
-        <location filename="../core/dive.c" line="29"/>
-        <source>deco</source>
-        <translation>deco</translation>
+        <location filename="../core/save-html.c" line="539"/>
+        <source>End pressure</source>
+        <translation>Ciśnienie końcowe</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="33"/>
-        <source>OC-gas</source>
-        <translation>gaz OC</translation>
+        <location filename="../core/save-html.c" line="540"/>
+        <source>Gas</source>
+        <translation>Gaz</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="33"/>
-        <source>diluent</source>
-        <translation>diluent</translation>
+        <location filename="../core/save-html.c" line="541"/>
+        <source>Weight</source>
+        <translation>Balast</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="33"/>
-        <location filename="../core/equipment.c" line="88"/>
-        <location filename="../core/planner.c" line="1415"/>
-        <location filename="../core/planner.c" line="1418"/>
-        <source>oxygen</source>
-        <translation>tlen</translation>
+        <location filename="../core/save-html.c" line="543"/>
+        <source>Events</source>
+        <translation>Zdarzenia</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="227"/>
-        <source>ℓ</source>
-        <translation>ℓ</translation>
+        <location filename="../core/save-html.c" line="544"/>
+        <source>Name</source>
+        <translation>Nazwa</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="239"/>
+        <location filename="../core/save-html.c" line="545"/>
+        <source>Value</source>
+        <translation>Wartość</translation>
+    </message>
+    <message>
+        <location filename="../core/save-html.c" line="546"/>
+        <source>Coordinates</source>
+        <translation>Współrzędne</translation>
+    </message>
+    <message>
+        <location filename="../core/save-html.c" line="547"/>
+        <source>Dive status</source>
+        <translation>Status nurkowania</translation>
+    </message>
+    <message>
+        <location filename="../core/statistics.c" line="242"/>
         <source>more than %d days</source>
         <translation>więcej niż %d dni</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="246"/>
+        <location filename="../core/statistics.c" line="249"/>
         <source>%dd %dh %dmin</source>
         <translation>%dd %dh %dmin</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="249"/>
+        <location filename="../core/statistics.c" line="252"/>
         <source>%dmin %dsecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="251"/>
+        <location filename="../core/statistics.c" line="254"/>
         <source>%dh %dmin</source>
         <translation>%dh %dmin</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="263"/>
+        <location filename="../core/statistics.c" line="266"/>
         <source>for dives #</source>
         <translation>dla nurkowania nr</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="269"/>
+        <location filename="../core/statistics.c" line="272"/>
         <source>for selected dives</source>
         <translation>dla wybranych nurkowań</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="304"/>
+        <location filename="../core/statistics.c" line="307"/>
         <source>for dive #%d</source>
         <translation>dla nurkowania #%d</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="306"/>
+        <location filename="../core/statistics.c" line="309"/>
         <source>for selected dive</source>
         <translation>dla wybranego nurkowania</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="308"/>
+        <location filename="../core/statistics.c" line="311"/>
         <source>for all dives</source>
         <translation>dla wszystkich nurkowań</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="310"/>
+        <location filename="../core/statistics.c" line="313"/>
         <source>(no dives)</source>
         <translation>(brak nurkowań)</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Sun</source>
         <translation>Nie</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Mon</source>
         <translation>Pon</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Tue</source>
         <translation>Wto</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Wed</source>
         <translation>Śro</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Thu</source>
         <translation>Czw</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Fri</source>
         <translation>Pią</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Sat</source>
         <translation>Sob</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Jan</source>
         <translation>Sty</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Feb</source>
         <translation>Lut</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Mar</source>
         <translation>Mar</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Apr</source>
         <translation>Kwi</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>May</source>
         <translation>Maj</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Jun</source>
         <translation>Cze</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Jul</source>
         <translation>Lip</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Aug</source>
         <translation>Sie</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Sep</source>
         <translation>Wrz</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Oct</source>
         <translation>Paź</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Nov</source>
         <translation>Lis</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Dec</source>
         <translation>Gru</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="191"/>
-        <location filename="../core/parse-xml.c" line="3284"/>
-        <location filename="../core/uemis-downloader.c" line="134"/>
-        <source>unknown</source>
-        <translation>nieznana</translation>
-    </message>
-    <message>
-        <location filename="../core/uemis-downloader.c" line="467"/>
-        <source>data</source>
-        <translation>dane</translation>
-    </message>
-    <message>
-        <location filename="../core/uemis-downloader.c" line="447"/>
-        <source>%s %s</source>
-        <translation>%s %s</translation>
-    </message>
-    <message>
         <location filename="../core/uemis-downloader.c" line="27"/>
         <source>Uemis Zurich: the file system is almost full.
 Disconnect/reconnect the dive computer
@@ -10078,6 +10536,16 @@ Czy Uemis Zurich jest podłączony poprawnie?</translation>
         <translation>Brak nurkowań do pobrania.</translation>
     </message>
     <message>
+        <location filename="../core/uemis-downloader.c" line="447"/>
+        <source>%s %s</source>
+        <translation>%s %s</translation>
+    </message>
+    <message>
+        <location filename="../core/uemis-downloader.c" line="467"/>
+        <source>data</source>
+        <translation>dane</translation>
+    </message>
+    <message>
         <location filename="../core/uemis-downloader.c" line="495"/>
         <source>divelog #</source>
         <translation>log #</translation>
@@ -10248,281 +10716,6 @@ Czy Uemis Zurich jest podłączony poprawnie?</translation>
         <translation>Alarm: niski poziom baterii</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="469"/>
-        <location filename="../core/save-html.c" line="553"/>
-        <location filename="../core/worldmap-save.c" line="111"/>
-        <source>Can&apos;t open file %s</source>
-        <translation>Nie można otworzyć pliku %s</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="488"/>
-        <source>Number</source>
-        <translation>Numer</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="489"/>
-        <source>Date</source>
-        <translation>Data</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="490"/>
-        <source>Time</source>
-        <translation>Czas</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="491"/>
-        <source>Location</source>
-        <translation>Miejsce</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="492"/>
-        <source>Air temp.</source>
-        <translation>Temp. powietrza</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="493"/>
-        <source>Water temp.</source>
-        <translation>Temp. wody</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="498"/>
-        <source>Statistics</source>
-        <translation>Statystyka</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="502"/>
-        <source>Rating</source>
-        <translation>Ocena</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="503"/>
-        <source>Visibility</source>
-        <translation>Widzialność</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="504"/>
-        <source>Duration</source>
-        <translation>Czas trwania</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="494"/>
-        <source>Dives</source>
-        <translation>Nurkowania</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="495"/>
-        <source>Expand all</source>
-        <translation>Rozwiń wszystkie</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="496"/>
-        <source>Collapse all</source>
-        <translation>Zwiń wszystkie</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="497"/>
-        <source>Trips</source>
-        <translation>Grupy</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="499"/>
-        <source>Advanced search</source>
-        <translation>Wyszukiwanie zaawansowane</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="505"/>
-        <source>Divemaster</source>
-        <translation>Divemaster</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="506"/>
-        <source>Buddy</source>
-        <translation>Partner</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="507"/>
-        <source>Suit</source>
-        <translation>Skafander</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="508"/>
-        <source>Tags</source>
-        <translation>Tagi</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="509"/>
-        <location filename="../smtk-import/smartrak.c" line="251"/>
-        <location filename="../smtk-import/smartrak.c" line="321"/>
-        <source>Notes</source>
-        <translation>Notatki</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="510"/>
-        <source>Show more details</source>
-        <translation>Pokaż więcej szczegółów</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="513"/>
-        <source>Yearly statistics</source>
-        <translation>Statystyka roczna</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="514"/>
-        <source>Year</source>
-        <translation>Rok</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="515"/>
-        <source>Total time</source>
-        <translation>Całkowity czas</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="516"/>
-        <source>Average time</source>
-        <translation>Średnia długość</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="517"/>
-        <source>Shortest time</source>
-        <translation>Najmniejsza długość</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="518"/>
-        <source>Longest time</source>
-        <translation>Największa długość</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="519"/>
-        <source>Average depth</source>
-        <translation>Średnia głębokość</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="520"/>
-        <source>Min. depth</source>
-        <translation>Min głębokość </translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="521"/>
-        <source>Max. depth</source>
-        <translation>Maks. głębokość</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="523"/>
-        <source>Min. SAC</source>
-        <translation>Min SAC</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="524"/>
-        <source>Max. SAC</source>
-        <translation>Max SAC</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="525"/>
-        <source>Average temp.</source>
-        <translation>Średnia temperatura </translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="526"/>
-        <source>Min. temp.</source>
-        <translation>Min. temp.</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="527"/>
-        <source>Max. temp.</source>
-        <translation>Max. temp.</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="528"/>
-        <source>Back to list</source>
-        <translation>Powrót do listy</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="534"/>
-        <source>Dive equipment</source>
-        <translation>Wyposażenie</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="537"/>
-        <source>Work pressure</source>
-        <translation>Ciśnienie robocze</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="538"/>
-        <source>Start pressure</source>
-        <translation>Ciśnienie początkowe</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="539"/>
-        <source>End pressure</source>
-        <translation>Ciśnienie końcowe</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="547"/>
-        <source>Dive status</source>
-        <translation>Status nurkowania</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="522"/>
-        <source>Average SAC</source>
-        <translation>Średni SAC</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="531"/>
-        <source>Dive No.</source>
-        <translation>Nurkowanie nr</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="532"/>
-        <source>Dive profile</source>
-        <translation>Profil</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="533"/>
-        <source>Dive information</source>
-        <translation>Informacje</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="535"/>
-        <location filename="../core/save-html.c" line="542"/>
-        <source>Type</source>
-        <translation>Rodzaj</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="536"/>
-        <source>Size</source>
-        <translation>Pojemność</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="540"/>
-        <source>Gas</source>
-        <translation>Gaz</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="541"/>
-        <source>Weight</source>
-        <translation>Balast</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="543"/>
-        <source>Events</source>
-        <translation>Zdarzenia</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="544"/>
-        <source>Name</source>
-        <translation>Nazwa</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="545"/>
-        <source>Value</source>
-        <translation>Wartość</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="546"/>
-        <source>Coordinates</source>
-        <translation>Współrzędne</translation>
-    </message>
-    <message>
         <location filename="../core/worldmap-save.c" line="39"/>
         <source>Date:</source>
         <translation>Data:</translation>
@@ -10568,110 +10761,6 @@ Czy Uemis Zurich jest podłączony poprawnie?</translation>
         <translation>Notatki:</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="91"/>
-        <location filename="../core/qthelper.cpp" line="226"/>
-        <source>N</source>
-        <translation>N</translation>
-    </message>
-    <message>
-        <location filename="../core/qthelper.cpp" line="91"/>
-        <location filename="../core/qthelper.cpp" line="227"/>
-        <source>S</source>
-        <translation>S</translation>
-    </message>
-    <message>
-        <location filename="../core/qthelper.cpp" line="92"/>
-        <location filename="../core/qthelper.cpp" line="228"/>
-        <source>E</source>
-        <translation>E</translation>
-    </message>
-    <message>
-        <location filename="../core/qthelper.cpp" line="92"/>
-        <location filename="../core/qthelper.cpp" line="229"/>
-        <source>W</source>
-        <translation>W</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="341"/>
-        <source>Remote storage and local data diverged. Error: merge failed (%s)</source>
-        <translation>Dane zdalne i dane lokalne utraciły synchronizację. Nie udało się ich scalić (%s)</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="134"/>
-        <source>Local cache directory %s corrupted - can&apos;t sync with Subsurface cloud storage</source>
-        <translation>Lokalny katalog podręczny %s został uszkodzony - nie można zsynchronizować się z chmurą</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="157"/>
-        <location filename="../core/git-access.c" line="177"/>
-        <source>Could not update local cache to newer remote data</source>
-        <translation>Nie można zaktualizować zdalnych danych lokalnymi - zdalne dane są nowsze.</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="170"/>
-        <source>Subsurface cloud storage corrupted</source>
-        <translation>Dane w chmurze zostały uszkodzone</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="285"/>
-        <source>Could not update Subsurface cloud storage, try again later</source>
-        <translation>Nie można zaktualizować danych w chmurze Subsurface, spróbuj później.</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="371"/>
-        <source>Remote storage and local data diverged. Cannot combine local and remote changes</source>
-        <translation>Dane zdalne i dane lokalne rozeszły się. Nie można połączyć zdalnych i lokalnych zmian.</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="405"/>
-        <source>Remote storage and local data diverged</source>
-        <translation>Dane zdalne i dane lokalne rozeszły się</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="408"/>
-        <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source>
-        <translation>Dane zdalne i dane lokalne rozeszły się. Błąd przy zapisywaniu danych (%s)</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="417"/>
-        <source>Problems with local cache of Subsurface cloud data</source>
-        <translation>Problem z lokalną pamięcią podręczna danych z chmury</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="418"/>
-        <source>Moved cache data to %s. Please try the operation again.</source>
-        <translation>Pamięć podręczna przeniesiona do %s. Spróbuj ponownie.</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="737"/>
-        <source>Error connecting to Subsurface cloud storage</source>
-        <translation>Nie udało się połączyć z chmurą Subsurface</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="740"/>
-        <source>git clone of %s failed (%s)</source>
-        <translation>Nieudana operacja git clone dla %s (%s)</translation>
-    </message>
-    <message>
-        <location filename="../core/load-git.c" line="222"/>
-        <location filename="../core/parse-xml.c" line="1300"/>
-        <source>additional name for site: %s
-</source>
-        <translation>dodatkowa nazwa dla miejsca: %s
-</translation>
-    </message>
-    <message>
-        <location filename="../core/ostctools.c" line="120"/>
-        <location filename="../core/ostctools.c" line="152"/>
-        <source>Unknown DC in dive %d</source>
-        <translation>Nieznany komputer nurkowy w nurkowaniu %d</translation>
-    </message>
-    <message>
-        <location filename="../core/ostctools.c" line="165"/>
-        <source>Error - %s - parsing dive %d</source>
-        <translation>Błąd - %s - przetwarzanie nurkowania %d</translation>
-    </message>
-    <message>
         <location filename="../smtk-import/smartrak.c" line="247"/>
         <source>Built</source>
         <translation type="unfinished"/>
@@ -10755,155 +10844,120 @@ Czy Uemis Zurich jest podłączony poprawnie?</translation>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="91"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="103"/>
         <source>Subsurface</source>
         <translation>Subsurface</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="97"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="110"/>
         <source>Dive list</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="112"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="125"/>
         <source>Cloud credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="126"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="139"/>
         <source>Manage dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="138"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="141"/>
         <source>Add dive manually</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="146"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="149"/>
         <source>Manual sync with cloud</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="164"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="167"/>
         <source>Offline mode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="164"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="167"/>
         <source>Enable auto cloud sync</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="182"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="187"/>
         <source>GPS</source>
         <translation>GPS</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="185"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="190"/>
         <source>GPS-tag dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="192"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="197"/>
         <source>Upload GPS data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="199"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="204"/>
         <source>Download GPS data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="206"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="211"/>
         <source>Show GPS fixes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="215"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="220"/>
         <source>Clear GPS cache</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="221"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="226"/>
         <source>Preferences</source>
         <translation>Ustawienia</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="230"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="237"/>
         <source>Developer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="232"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="239"/>
         <source>App log</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="239"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="246"/>
         <source>Theme information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="246"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="253"/>
         <source>User manual</source>
         <translation>Instrukcja obsługi</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="252"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="259"/>
         <source>About</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="283"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="304"/>
         <source>Run location service</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="283"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="304"/>
         <source>No GPS source available</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="295"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="316"/>
         <source>Actions</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="9"/>
-        <source>Hello World</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="13"/>
-        <source>File</source>
-        <translation>Plik</translation>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="15"/>
-        <source>&amp;Open</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="19"/>
-        <source>Exit</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="27"/>
-        <source>Button 1 pressed</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="28"/>
-        <source>Button 2 pressed</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="33"/>
-        <source>May I have your attention, please?</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>plannerDetails</name>
@@ -10981,6 +11035,24 @@ p, li { white-space: pre-wrap; }
         <translation>m/min</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="121"/>
+        <location filename="../build/ui_plannerSettings.h" line="425"/>
+        <source>75% to 50% avg. depth</source>
+        <translation>75% do 50% śr. głębokości</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="138"/>
+        <location filename="../build/ui_plannerSettings.h" line="427"/>
+        <source>50% avg. depth to 6m</source>
+        <translation>50% śr. głębokości do 6m</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="155"/>
+        <location filename="../build/ui_plannerSettings.h" line="429"/>
+        <source>6m to surface</source>
+        <translation>6m do powierzchni</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="175"/>
         <location filename="../build/ui_plannerSettings.h" line="431"/>
         <source>Descent</source>
@@ -11004,12 +11076,35 @@ p, li { white-space: pre-wrap; }
         <translation>algorytm VPM-B</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="268"/>
+        <source>Bühlmann deco</source>
+        <translation>algorytm Bühlmann</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="278"/>
         <location filename="../build/ui_plannerSettings.h" line="445"/>
         <source>Reserve gas</source>
         <translation>Rezerwa</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="288"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="549"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="578"/>
+        <location filename="../build/ui_plannerSettings.h" line="446"/>
+        <location filename="../build/ui_plannerSettings.h" line="459"/>
+        <location filename="../build/ui_plannerSettings.h" line="461"/>
+        <source>bar</source>
+        <translation>bar</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="307"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="416"/>
+        <location filename="../build/ui_plannerSettings.h" line="437"/>
+        <location filename="../build/ui_plannerSettings.h" line="440"/>
+        <source>%</source>
+        <translation>%</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="320"/>
         <location filename="../build/ui_plannerSettings.h" line="449"/>
         <source>Postpone gas change if a stop is not required</source>
@@ -11028,12 +11123,10 @@ p, li { white-space: pre-wrap; }
         <translation>GF low</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="307"/>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="416"/>
-        <location filename="../build/ui_plannerSettings.h" line="437"/>
-        <location filename="../build/ui_plannerSettings.h" line="440"/>
-        <source>%</source>
-        <translation>%</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="353"/>
+        <location filename="../build/ui_plannerSettings.h" line="436"/>
+        <source>Plan backgas breaks</source>
+        <translation>Przerwy powietrzne</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="360"/>
@@ -11042,10 +11135,10 @@ p, li { white-space: pre-wrap; }
         <translation>GF high</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="429"/>
-        <location filename="../build/ui_plannerSettings.h" line="441"/>
-        <source>Drop to first depth</source>
-        <translation>Spadnij do pierwszej głębokości</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="370"/>
+        <location filename="../build/ui_plannerSettings.h" line="453"/>
+        <source>min</source>
+        <translation>min</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="389"/>
@@ -11054,163 +11147,139 @@ p, li { white-space: pre-wrap; }
         <translation>Ostatni przystanek na 6m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="353"/>
-        <location filename="../build/ui_plannerSettings.h" line="436"/>
-        <source>Plan backgas breaks</source>
-        <translation>Przerwy powietrzne</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="396"/>
+        <source>Maximize bottom time allowed by gas and no decompression limits</source>
+        <translation>Maksymalny czas denny ograniczony przez ilość posiadanego gazu i limit bezdekompresyjny</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="515"/>
-        <location filename="../build/ui_plannerSettings.h" line="455"/>
-        <source>Gas options</source>
-        <translation>Ustawienia gazu</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="399"/>
+        <location filename="../build/ui_plannerSettings.h" line="443"/>
+        <source>Recreational mode</source>
+        <translation>Tryb rekreacyjny</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="594"/>
-        <location filename="../build/ui_plannerSettings.h" line="456"/>
-        <source>Bottom SAC</source>
-        <translation>SAC przy dnie</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="429"/>
+        <location filename="../build/ui_plannerSettings.h" line="441"/>
+        <source>Drop to first depth</source>
+        <translation>Spadnij do pierwszej głębokości</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="692"/>
-        <location filename="../build/ui_plannerSettings.h" line="457"/>
-        <source>Deco SAC</source>
-        <translation>Deco SAC</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="436"/>
+        <location filename="../build/ui_plannerSettings.h" line="452"/>
+        <source>Min. switch duration</source>
+        <translation>Min. czas na zmianę gazu</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="601"/>
-        <location filename="../build/ui_plannerSettings.h" line="458"/>
-        <source>Bottom pO₂</source>
-        <translation>pO₂ przy dnie</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="459"/>
+        <location filename="../build/ui_plannerSettings.h" line="444"/>
+        <source>Safety stop</source>
+        <translation>Przystanek bezpieczeństwa</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="685"/>
-        <location filename="../build/ui_plannerSettings.h" line="460"/>
-        <source>Deco pO₂</source>
-        <translation>pO₂ podczas deco</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="495"/>
+        <source>Conservatism level</source>
+        <translation>Poziom konserwatyzmu</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="515"/>
+        <location filename="../build/ui_plannerSettings.h" line="455"/>
+        <source>Gas options</source>
+        <translation>Ustawienia gazu</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="565"/>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="672"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="698"/>
         <location filename="../build/ui_plannerSettings.h" line="462"/>
         <location filename="../build/ui_plannerSettings.h" line="463"/>
         <source>ℓ/min</source>
         <translation>ℓ/min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="632"/>
-        <location filename="../build/ui_plannerSettings.h" line="468"/>
-        <source>Display runtime</source>
-        <translation>Pokazuj runtime</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="645"/>
-        <location filename="../build/ui_plannerSettings.h" line="472"/>
-        <source>Display segment duration</source>
-        <translation>Pokazuj czas trwania segmentu</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="655"/>
-        <location filename="../build/ui_plannerSettings.h" line="476"/>
-        <source>Display transitions in deco</source>
-        <translation>Pokazuj przejścia między przystankami</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="662"/>
-        <location filename="../build/ui_plannerSettings.h" line="477"/>
-        <source>Verbatim dive plan</source>
-        <translation>Plan opisowy</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="288"/>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="549"/>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="578"/>
-        <location filename="../build/ui_plannerSettings.h" line="446"/>
-        <location filename="../build/ui_plannerSettings.h" line="459"/>
-        <location filename="../build/ui_plannerSettings.h" line="461"/>
-        <source>bar</source>
-        <translation>bar</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="121"/>
-        <location filename="../build/ui_plannerSettings.h" line="425"/>
-        <source>75% to 50% avg. depth</source>
-        <translation>75% do 50% śr. głębokości</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="138"/>
-        <location filename="../build/ui_plannerSettings.h" line="427"/>
-        <source>50% avg. depth to 6m</source>
-        <translation>50% śr. głębokości do 6m</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="155"/>
-        <location filename="../build/ui_plannerSettings.h" line="429"/>
-        <source>6m to surface</source>
-        <translation>6m do powierzchni</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="268"/>
-        <source>Bühlmann deco</source>
-        <translation>algorytm Bühlmann</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="370"/>
-        <location filename="../build/ui_plannerSettings.h" line="453"/>
-        <source>min</source>
-        <translation>min</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="396"/>
-        <source>Maximize bottom time allowed by gas and no decompression limits</source>
-        <translation>Maksymalny czas denny ograniczony przez ilość posiadanego gazu i limit bezdekompresyjny</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="594"/>
+        <source>m</source>
+        <translation>m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="399"/>
-        <location filename="../build/ui_plannerSettings.h" line="443"/>
-        <source>Recreational mode</source>
-        <translation>Tryb rekreacyjny</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="606"/>
+        <source>Used to calculate best mix. Select best mix depth in &apos;Available gases&apos; table by entering gas depth, followed by &quot;B&quot; (best trimix mix) or &quot;BN&quot; (best nitrox mix)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="436"/>
-        <location filename="../build/ui_plannerSettings.h" line="452"/>
-        <source>Min. switch duration</source>
-        <translation>Min. czas na zmianę gazu</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="613"/>
+        <location filename="../build/ui_plannerSettings.h" line="456"/>
+        <source>Bottom SAC</source>
+        <translation>SAC przy dnie</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="459"/>
-        <location filename="../build/ui_plannerSettings.h" line="444"/>
-        <source>Safety stop</source>
-        <translation>Przystanek bezpieczeństwa</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="620"/>
+        <location filename="../build/ui_plannerSettings.h" line="458"/>
+        <source>Bottom pO₂</source>
+        <translation>pO₂ przy dnie</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="495"/>
-        <source>Conservatism level</source>
-        <translation>Poziom konserwatyzmu</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="627"/>
+        <source>Best mix END</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="608"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="634"/>
         <location filename="../build/ui_plannerSettings.h" line="464"/>
         <source>Notes</source>
         <translation>Notatki</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="629"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="655"/>
         <location filename="../build/ui_plannerSettings.h" line="466"/>
         <source>In dive plan, show runtime (absolute time) of stops</source>
         <translation>Pokazuj runtime, czyli całkowity czas dla przystanku</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="642"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="658"/>
+        <location filename="../build/ui_plannerSettings.h" line="468"/>
+        <source>Display runtime</source>
+        <translation>Pokazuj runtime</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="668"/>
         <location filename="../build/ui_plannerSettings.h" line="470"/>
         <source>In dive plan, show duration (relative time) of stops</source>
         <translation>Pokazuj czas trwania (względny czas) przystanku</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="652"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="671"/>
+        <location filename="../build/ui_plannerSettings.h" line="472"/>
+        <source>Display segment duration</source>
+        <translation>Pokazuj czas trwania segmentu</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="678"/>
         <location filename="../build/ui_plannerSettings.h" line="474"/>
         <source>In diveplan, list transitions or treat them as implicit</source>
         <translation>Pokazuj lub ukrywaj listę przejść </translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="681"/>
+        <location filename="../build/ui_plannerSettings.h" line="476"/>
+        <source>Display transitions in deco</source>
+        <translation>Pokazuj przejścia między przystankami</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="688"/>
+        <location filename="../build/ui_plannerSettings.h" line="477"/>
+        <source>Verbatim dive plan</source>
+        <translation>Plan opisowy</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="711"/>
+        <location filename="../build/ui_plannerSettings.h" line="460"/>
+        <source>Deco pO₂</source>
+        <translation>pO₂ podczas deco</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="718"/>
+        <location filename="../build/ui_plannerSettings.h" line="457"/>
+        <source>Deco SAC</source>
+        <translation>Deco SAC</translation>
+    </message>
 </context>
 </TS>
\ No newline at end of file
diff --git a/translations/subsurface_pt_BR.ts b/translations/subsurface_pt_BR.ts
index 965203125..41eadb97e 100644
--- a/translations/subsurface_pt_BR.ts
+++ b/translations/subsurface_pt_BR.ts
@@ -105,6 +105,11 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="56"/>
+        <source>Could not initialize Winsock version 2.2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="134"/>
         <source>Trying to turn on the local Bluetooth device...</source>
         <translation type="unfinished"/>
@@ -115,6 +120,11 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="167"/>
+        <source>Remote devices list was cleared.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="183"/>
         <source>Scanning for remote devices...</source>
         <translation type="unfinished"/>
@@ -125,6 +135,22 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="208"/>
+        <source>The local Bluetooth device was %1.</source>
+        <extracomment>%1 will be replaced with &quot;turned on&quot; or &quot;turned off&quot;</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
+        <source>turned on</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
+        <source>turned off</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="225"/>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="339"/>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="359"/>
@@ -172,37 +198,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="352"/>
-        <source>Device %1 was paired and is authorized.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="56"/>
-        <source>Could not initialize Winsock version 2.2</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="167"/>
-        <source>Remote devices list was cleared.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="208"/>
-        <source>The local Bluetooth device was %1.</source>
-        <extracomment>%1 will be replaced with &quot;turned on&quot; or &quot;turned off&quot;</extracomment>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
-        <source>turned on</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
-        <source>turned off</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="307"/>
         <source>Remove pairing</source>
         <translation type="unfinished"/>
@@ -228,6 +223,11 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="352"/>
+        <source>Device %1 was paired and is authorized.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="378"/>
         <source>The device %1 can now be used for connection. You can press the Save button.</source>
         <translation type="unfinished"/>
@@ -286,12 +286,12 @@
 <context>
     <name>BuddyFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="621"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="619"/>
         <source>Person: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="622"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="620"/>
         <source>Searches for buddies and divemasters</source>
         <translation type="unfinished"/>
     </message>
@@ -299,7 +299,7 @@
 <context>
     <name>BuddyFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="243"/>
+        <location filename="../qt-models/filtermodels.cpp" line="248"/>
         <source>No buddies</source>
         <translation type="unfinished"/>
     </message>
@@ -307,25 +307,30 @@
 <context>
     <name>CloudCredentials</name>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="49"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="50"/>
         <source>Cloud credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="55"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="56"/>
         <source>Email</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="67"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="68"/>
         <source>Password</source>
         <translation>Senha</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="90"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="92"/>
         <source>Show password</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="97"/>
+        <source>PIN</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>ColumnNameProvider</name>
@@ -381,6 +386,16 @@
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
+        <source>Max. depth</source>
+        <translation>Profundidade máxima</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
+        <source>Avg. depth</source>
+        <translation>Profundidade Média</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
         <source>Divemaster</source>
         <translation>Divemaster</translation>
     </message>
@@ -391,6 +406,11 @@
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
+        <source>Suit</source>
+        <translation>Roupa</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
         <source>Notes</source>
         <translation>Notas</translation>
     </message>
@@ -410,21 +430,6 @@
         <translation>Temperatura da água</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
-        <source>Max. depth</source>
-        <translation>Profundidade máxima</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
-        <source>Avg. depth</source>
-        <translation>Profundidade Média</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
-        <source>Suit</source>
-        <translation>Roupa</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="44"/>
         <source>O₂</source>
         <translation>O₂</translation>
@@ -538,7 +543,7 @@
         <translation>Não é possivel criar contexto da libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../core/configuredivecomputer.cpp" line="660"/>
+        <location filename="../core/configuredivecomputer.cpp" line="656"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation type="unfinished"/>
     </message>
@@ -558,11 +563,19 @@
         <translation>Disco ou ponto de montágem</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="170"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1520"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1533"/>
-        <source>...</source>
-        <translation>...</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="47"/>
+        <source>Connect via Bluetooth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="54"/>
+        <source>Connect</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="64"/>
+        <source>Disconnect</source>
+        <translation>Desconectar</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="80"/>
@@ -571,12 +584,24 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="90"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1523"/>
+        <source>Read settings from backup file or from device before writing to the device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="93"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1525"/>
         <source>Save changes to device</source>
         <translation>Salvar alterações no dispositivo</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="116"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1527"/>
+        <source>Read settings from backup file or from device before writing to a backup file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="119"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1529"/>
         <source>Backup</source>
@@ -595,14 +620,39 @@
         <translation>Atualizar firmware</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="163"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1532"/>
+        <source>Save libdivecomputer logfile</source>
+        <translation>Salvar arquivo de log da biblioteca libdivecomputer</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="170"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1520"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1533"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="177"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1534"/>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
     <message>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1539"/>
-        <source>OSTC 3</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="214"/>
+        <source>OSTC 3,Sport,Cr,2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="223"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1541"/>
+        <source>Suunto Vyper family</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="232"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1543"/>
+        <source>OSTC, Mk.2/2N/2C</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -616,40 +666,56 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="326"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1656"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1943"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1546"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1726"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1766"/>
-        <source>Serial No.</source>
-        <translation>No. Serial</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="260"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1575"/>
+        <source>Eco</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="349"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1679"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1980"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1547"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1727"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1767"/>
-        <source>Firmware version</source>
-        <translation>Versão da firmware</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="265"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1576"/>
+        <source>Medium</source>
+        <translation>Médio</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="538"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1713"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1990"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1548"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1729"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1768"/>
-        <source>Custom text</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="270"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1577"/>
+        <source>High</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="385"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1549"/>
-        <source>Language</source>
-        <translation>Língua</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="278"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="826"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="849"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="875"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="927"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="993"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1019"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1101"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1117"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1450"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2278"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2382"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2408"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2434"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2474"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2497"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1586"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1621"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1623"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1625"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1628"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1637"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1638"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1710"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1785"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1789"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1801"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1803"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1806"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1807"/>
+        <source>%</source>
+        <translation>%</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="289"/>
@@ -676,44 +742,36 @@
         <translation>Italiano</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="579"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1557"/>
-        <source>Dive mode</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="556"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1560"/>
-        <source>OC</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="561"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1561"/>
-        <source>CC</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="313"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1582"/>
+        <source>m/°C</source>
+        <translation>m/°C</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="566"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2336"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1562"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1793"/>
-        <source>Gauge</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="318"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1583"/>
+        <source>ft/°F</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="571"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1563"/>
-        <source>Apnea</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="326"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1656"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1943"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1546"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1726"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1766"/>
+        <source>Serial No.</source>
+        <translation>No. Serial</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="395"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2063"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1565"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1780"/>
-        <source>Date format</source>
-        <translation>Formato da data</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="349"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1679"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1980"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1547"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1727"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1767"/>
+        <source>Firmware version</source>
+        <translation>Versão da firmware</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="360"/>
@@ -734,107 +792,146 @@
         <translation>AAMMDD</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1042"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2457"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1639"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1805"/>
-        <source>Saturation</source>
-        <translation>Saturação</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="385"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1549"/>
+        <source>Language</source>
+        <translation>Língua</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="278"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="826"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="849"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="875"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="927"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="993"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1019"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1101"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1117"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1450"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2278"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2382"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2408"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2434"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2474"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2497"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1586"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1621"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1623"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1625"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1628"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1637"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1638"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1710"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1785"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1789"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1801"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1803"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1806"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1807"/>
-        <source>%</source>
-        <translation>%</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="395"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2063"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1565"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1780"/>
+        <source>Date format</source>
+        <translation>Formato da data</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="865"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2261"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1624"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1784"/>
-        <source>Desaturation</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="405"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1572"/>
+        <source>Brightness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="983"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2398"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1636"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1800"/>
-        <source>Last deco</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="415"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1850"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1579"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1753"/>
+        <source>Units</source>
+        <translation>Unidades</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="425"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1585"/>
+        <source>Salinity (0-5%)</source>
+        <translation>Salinidade (0-5%)</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="438"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1615"/>
+        <source>Reset device to default settings</source>
+        <translation>Restaurar para configurações padrão</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="452"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1590"/>
+        <source>230LSB/Gauss</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="711"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="736"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="758"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="904"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2181"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2206"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2228"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2307"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1626"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1786"/>
-        <source> m</source>
-        <translation>m</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="457"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1591"/>
+        <source>330LSB/Gauss</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="405"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1572"/>
-        <source>Brightness</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="462"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1592"/>
+        <source>390LSB/Gauss</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="260"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1575"/>
-        <source>Eco</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="467"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1593"/>
+        <source>440LSB/Gauss</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="265"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1576"/>
-        <source>Medium</source>
-        <translation>Médio</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="472"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1594"/>
+        <source>660LSB/Gauss</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="270"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1577"/>
-        <source>High</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="477"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1595"/>
+        <source>820LSB/Gauss</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="603"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2034"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1599"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1779"/>
-        <source>Sampling rate</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="482"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1596"/>
+        <source>1090LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="487"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1597"/>
+        <source>1370LSB/Gauss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="521"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1587"/>
+        <source>Compass gain</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="531"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1799"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1745"/>
+        <source>Computer model</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="538"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1713"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1990"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1548"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1729"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1768"/>
+        <source>Custom text</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="556"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1560"/>
+        <source>OC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="561"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1561"/>
+        <source>CC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="566"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2336"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1562"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1793"/>
+        <source>Gauge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="571"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1563"/>
+        <source>Apnea</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="579"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1557"/>
+        <source>Dive mode</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -852,29 +949,11 @@
         <translation>10s</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="415"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1850"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1579"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1753"/>
-        <source>Units</source>
-        <translation>Unidades</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="313"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1582"/>
-        <source>m/°C</source>
-        <translation>m/°C</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="318"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1583"/>
-        <source>ft/°F</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="644"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1605"/>
-        <source>Dive mode color</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="603"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2034"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1599"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1779"/>
+        <source>Sampling rate</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -902,12 +981,6 @@
         <translation>Azul</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="425"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1585"/>
-        <source>Salinity (0-5%)</source>
-        <translation>Salinidade (0-5%)</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="637"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2092"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1613"/>
@@ -916,92 +989,82 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="521"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1587"/>
-        <source>Compass gain</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="90"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1523"/>
-        <source>Read settings from backup file or from device before writing to the device</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="116"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1527"/>
-        <source>Read settings from backup file or from device before writing to a backup file</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="644"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1605"/>
+        <source>Dive mode color</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="232"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1543"/>
-        <source>OSTC, Mk.2/2N/2C</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="654"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2020"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1614"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1771"/>
+        <source>Show safety stop</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="452"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1590"/>
-        <source>230LSB/Gauss</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="661"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2145"/>
+        <source>End Depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="457"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1591"/>
-        <source>330LSB/Gauss</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="671"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2162"/>
+        <source> s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="462"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1592"/>
-        <source>390LSB/Gauss</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="687"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1953"/>
+        <source>Length</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="467"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1593"/>
-        <source>440LSB/Gauss</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="694"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2138"/>
+        <source>Start Depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="472"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1594"/>
-        <source>660LSB/Gauss</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="701"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2152"/>
+        <source>Reset Depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="477"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1595"/>
-        <source>820LSB/Gauss</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="711"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="736"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="758"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="904"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2181"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2206"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2228"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2307"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1626"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1786"/>
+        <source> m</source>
+        <translation>m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="482"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1596"/>
-        <source>1090LSB/Gauss</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="778"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2248"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1643"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1810"/>
+        <source>Advanced settings</source>
+        <translation>Configurações avançadas</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="487"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1597"/>
-        <source>1370LSB/Gauss</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="784"/>
+        <source>Left button sensitivity</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="654"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2020"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1614"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1771"/>
-        <source>Show safety stop</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="791"/>
+        <source>Always show ppO2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="438"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1615"/>
-        <source>Reset device to default settings</source>
-        <translation>Restaurar para configurações padrão</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="798"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2254"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1617"/>
@@ -1010,20 +1073,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="223"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1541"/>
-        <source>Suunto Vyper family</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="778"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2248"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1643"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1810"/>
-        <source>Advanced settings</source>
-        <translation>Configurações avançadas</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="805"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2271"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1618"/>
@@ -1054,6 +1103,14 @@
         <translation>GFHigh</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="865"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2261"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1624"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1784"/>
+        <source>Desaturation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="917"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2320"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1627"/>
@@ -1068,14 +1125,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="973"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2369"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1630"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1788"/>
-        <source> min</source>
-        <translation>min</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="960"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2331"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1633"/>
@@ -1084,60 +1133,25 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="47"/>
-        <source>Connect via Bluetooth</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="163"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1532"/>
-        <source>Save libdivecomputer logfile</source>
-        <translation>Salvar arquivo de log da biblioteca libdivecomputer</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="661"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2145"/>
-        <source>End Depth</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="671"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2162"/>
-        <source> s</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="687"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1953"/>
-        <source>Length</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="694"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2138"/>
-        <source>Start Depth</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="701"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2152"/>
-        <source>Reset Depth</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="784"/>
-        <source>Left button sensitivity</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="965"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1634"/>
+        <source>ZH-L16+GF</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="791"/>
-        <source>Always show ppO2</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="973"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2369"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1630"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1788"/>
+        <source> min</source>
+        <translation>min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="965"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1634"/>
-        <source>ZH-L16+GF</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="983"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2398"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1636"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1800"/>
+        <source>Last deco</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1157,6 +1171,14 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1042"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2457"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1639"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1805"/>
+        <source>Saturation</source>
+        <translation>Saturação</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1052"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1642"/>
         <source>Flip screen</source>
@@ -1168,12 +1190,22 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1066"/>
+        <source>MOD warning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1073"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2513"/>
         <source>Graphical speed indicator</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1080"/>
+        <source>Dynamic ascent rate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1087"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2552"/>
         <source>Bottom gas consumption</source>
@@ -1186,6 +1218,14 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1133"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1149"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2520"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2536"/>
+        <source> ℓ/min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1165"/>
         <source>Temperature sensor offset</source>
         <translation type="unfinished"/>
@@ -1204,6 +1244,18 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1235"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1320"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2610"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2695"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1645"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1668"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1812"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1835"/>
+        <source>%O₂</source>
+        <translation>%O₂</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1240"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1325"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2615"/>
@@ -1322,15 +1374,9 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1691"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1858"/>
-        <source>Set point [cbar]</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1693"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1860"/>
-        <source>Change depth [m]</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1405"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2770"/>
+        <source>Setpoint</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1370,6 +1416,12 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1443"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1709"/>
+        <source>O₂ in calibration gas</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1467"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1713"/>
         <source>Fixed setpoint</source>
@@ -1400,101 +1452,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1748"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1733"/>
-        <source>P1 (medium)</source>
-        <extracomment>Suunto safety level</extracomment>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1753"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1734"/>
-        <source>P2 (high)</source>
-        <extracomment>Suunto safety level</extracomment>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1792"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1744"/>
-        <source>Total dive time</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2109"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1769"/>
-        <source>kg/ℓ</source>
-        <translation>kg/ℓ</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2346"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1795"/>
-        <source>Apnoea</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1583"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1722"/>
-        <source>Safety level</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="54"/>
-        <source>Connect</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="64"/>
-        <source>Disconnect</source>
-        <translation>Desconectar</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="214"/>
-        <source>OSTC 3,Sport,Cr,2</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1066"/>
-        <source>MOD warning</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1080"/>
-        <source>Dynamic ascent rate</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1133"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1149"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2520"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2536"/>
-        <source> ℓ/min</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1235"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1320"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2610"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2695"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1645"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1668"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1812"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1835"/>
-        <source>%O₂</source>
-        <translation>%O₂</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1405"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2770"/>
-        <source>Setpoint</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1443"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1709"/>
-        <source>O₂ in calibration gas</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1535"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2843"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1719"/>
@@ -1511,6 +1468,12 @@
         <translation>pO₂ min</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1583"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1722"/>
+        <source>Safety level</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1609"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1723"/>
         <source>Altitude range</source>
@@ -1544,6 +1507,20 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1748"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1733"/>
+        <source>P1 (medium)</source>
+        <extracomment>Suunto safety level</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1753"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1734"/>
+        <source>P2 (high)</source>
+        <extracomment>Suunto safety level</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1761"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1736"/>
         <source>Sample rate</source>
@@ -1568,10 +1545,9 @@
         <translation>60s</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="531"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1799"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1745"/>
-        <source>Computer model</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1792"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1744"/>
+        <source>Total dive time</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1637,12 +1613,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2099"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1765"/>
-        <source>Salinity</source>
-        <translation>Salinidade</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2074"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1774"/>
         <source>MM/DD/YY</source>
@@ -1661,12 +1631,30 @@
         <translation>AA/MM/DD</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2099"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1765"/>
+        <source>Salinity</source>
+        <translation>Salinidade</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2109"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1769"/>
+        <source>kg/ℓ</source>
+        <translation>kg/ℓ</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2341"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1794"/>
         <source>ZH-L16 CC</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2346"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1795"/>
+        <source>Apnoea</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2351"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1796"/>
         <source>L16-GF OC</source>
@@ -1685,85 +1673,110 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1108"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1129"/>
-        <source>Backup files (*.xml)</source>
-        <translation>Arquivos de backup (*.xml)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1113"/>
-        <source>An error occurred while saving the backup file.
-%1</source>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1539"/>
+        <source>OSTC 3</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1116"/>
-        <source>Backup succeeded</source>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1691"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1858"/>
+        <source>Set point [cbar]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1117"/>
-        <source>Your settings have been saved to: %1</source>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1693"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1860"/>
+        <source>Change depth [m]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1107"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1110"/>
         <source>Backup dive computer settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1112"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1111"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1132"/>
+        <source>Backup files (*.xml)</source>
+        <translation>Arquivos de backup (*.xml)</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1115"/>
         <source>XML backup error</source>
         <translation>Erro no XML de backup</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1128"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1116"/>
+        <source>An error occurred while saving the backup file.
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1119"/>
+        <source>Backup succeeded</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1120"/>
+        <source>Your settings have been saved to: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1131"/>
         <source>Restore dive computer settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1134"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1137"/>
         <source>XML restore error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1135"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1138"/>
         <source>An error occurred while restoring the backup file.
 %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1139"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1142"/>
         <source>Restore succeeded</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1140"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1143"/>
         <source>Your settings have been restored successfully.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1150"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1153"/>
         <source>Select firmware file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1151"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1154"/>
         <source>All files (*.*)</source>
         <translation>Todos arquivos (*.*)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1207"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1210"/>
         <source>Choose file for divecomputer download logfile</source>
         <translation>Escolha o arquivo para recebimento do arquivo de log do computador de mergulho</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1208"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1211"/>
         <source>Log files (*.log)</source>
         <translation>Arquivos de log (*.log)</translation>
     </message>
 </context>
 <context>
+    <name>ContextDrawer</name>
+    <message>
+        <location filename="../mobile-widgets/qml/kirigami/src/controls/ContextDrawer.qml" line="76"/>
+        <source>Actions</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>CylindersModel</name>
     <message>
         <location filename="../qt-models/cylindermodel.cpp" line="16"/>
@@ -1777,11 +1790,6 @@
     </message>
     <message>
         <location filename="../qt-models/cylindermodel.cpp" line="16"/>
-        <source>He%</source>
-        <translation>He%</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="16"/>
         <source>Work press.</source>
         <translation>Pressão de trabalho</translation>
     </message>
@@ -1801,9 +1809,24 @@
         <translation>O₂%</translation>
     </message>
     <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="16"/>
+        <source>He%</source>
+        <translation>He%</translation>
+    </message>
+    <message>
         <location filename="../qt-models/cylindermodel.cpp" line="17"/>
-        <source>Switch at</source>
-        <translation>Trocar aos</translation>
+        <source>Deco switch at</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
+        <source>Bot. MOD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
+        <source>MND</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-models/cylindermodel.cpp" line="17"/>
@@ -1821,17 +1844,32 @@
         <translation>ℓ</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="161"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="177"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation>Ao clicar aqui irá eliminar este cilindro.</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="383"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="180"/>
+        <source>Switch depth for deco gas. Calculated using Deco pO₂ preference, unless set manually.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="183"/>
+        <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to &apos;*&apos; for best O₂% for max depth.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="186"/>
+        <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to &apos;*&apos; for best He% for max depth.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="444"/>
         <source>Cylinder cannot be removed</source>
         <translation>Cilindro não pode ser eliminado</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="384"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="445"/>
         <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source>
         <translation>Esse gás está em uso, Apenas cilindros que não estão sendo usados podem ser removidos.</translation>
     </message>
@@ -1851,42 +1889,24 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="73"/>
+        <location filename="../build/ui_divecomponentselection.h" line="141"/>
+        <source>Dive site</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="80"/>
         <location filename="../build/ui_divecomponentselection.h" line="142"/>
         <source>Suit</source>
         <translation>Roupa</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="122"/>
-        <location filename="../build/ui_divecomponentselection.h" line="148"/>
-        <source>Divemaster</source>
-        <translation>Divemaster</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="129"/>
-        <location filename="../build/ui_divecomponentselection.h" line="149"/>
-        <source>Buddy</source>
-        <translation>Parceiro</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="136"/>
-        <location filename="../build/ui_divecomponentselection.h" line="150"/>
-        <source>Rating</source>
-        <translation>Classificação</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="87"/>
         <location filename="../build/ui_divecomponentselection.h" line="143"/>
         <source>Visibility</source>
         <translation>Visibilidade</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="73"/>
-        <location filename="../build/ui_divecomponentselection.h" line="141"/>
-        <source>Dive site</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="94"/>
         <location filename="../build/ui_divecomponentselection.h" line="144"/>
         <source>Notes</source>
@@ -1910,10 +1930,34 @@
         <source>Cylinders</source>
         <translation>Cilindros</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="122"/>
+        <location filename="../build/ui_divecomponentselection.h" line="148"/>
+        <source>Divemaster</source>
+        <translation>Divemaster</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="129"/>
+        <location filename="../build/ui_divecomponentselection.h" line="149"/>
+        <source>Buddy</source>
+        <translation>Parceiro</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="136"/>
+        <location filename="../build/ui_divecomponentselection.h" line="150"/>
+        <source>Rating</source>
+        <translation>Classificação</translation>
+    </message>
 </context>
 <context>
     <name>DiveComputerManagementDialog</name>
     <message>
+        <location filename="../desktop-widgets/divecomputermanagementdialog.ui" line="17"/>
+        <location filename="../build/ui_divecomputermanagementdialog.h" line="65"/>
+        <source>Edit dive computer nicknames</source>
+        <translation>Editar o apelido dos computadores de mergulho</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divecomputermanagementdialog.cpp" line="49"/>
         <source>Remove the selected dive computer?</source>
         <translation>Remover o computador de mergulho selecionado?</translation>
@@ -1925,12 +1969,6 @@
         <translation>Tem a certeza que deseja remover
 o computador de mergulho selecionado?</translation>
     </message>
-    <message>
-        <location filename="../desktop-widgets/divecomputermanagementdialog.ui" line="17"/>
-        <location filename="../build/ui_divecomputermanagementdialog.h" line="65"/>
-        <source>Edit dive computer nicknames</source>
-        <translation>Editar o apelido dos computadores de mergulho</translation>
-    </message>
 </context>
 <context>
     <name>DiveComputerModel</name>
@@ -1958,17 +1996,17 @@ o computador de mergulho selecionado?</translation>
 <context>
     <name>DiveDetails</name>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="33"/>
+        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="38"/>
         <source>Dive details</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="67"/>
+        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="72"/>
         <source>Delete dive</source>
         <translation>Remover mergulho</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="84"/>
+        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="89"/>
         <source>Show on map</source>
         <translation type="unfinished"/>
     </message>
@@ -1976,88 +2014,93 @@ o computador de mergulho selecionado?</translation>
 <context>
     <name>DiveDetailsEdit</name>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="74"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="80"/>
         <source>Dive %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="78"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="84"/>
         <source>Date:</source>
         <translation>Data:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="86"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="92"/>
         <source>Location:</source>
         <translation>Localidade:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="95"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="101"/>
         <source>Coordinates:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="104"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="110"/>
         <source>Use current
 GPS location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="118"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="124"/>
         <source>Depth:</source>
         <translation>Profundidade:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="127"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="133"/>
         <source>Duration:</source>
         <translation>Duração:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="137"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="143"/>
         <source>Air Temp:</source>
         <translation>Temperatura do ar:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="146"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="152"/>
         <source>Water Temp:</source>
         <translation>Temperatura da água:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="155"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="161"/>
         <source>Suit:</source>
         <translation>Roupa:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="164"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="176"/>
         <source>Buddy:</source>
         <translation>Companheiro:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="173"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="191"/>
         <source>Dive Master:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="182"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="206"/>
         <source>Weight:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="192"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="216"/>
+        <source>Cylinder:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="231"/>
         <source>Gas mix:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="203"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="241"/>
         <source>Start Pressure:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="213"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="250"/>
         <source>End Pressure:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="224"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="260"/>
         <source>Notes:</source>
         <translation>Notas:</translation>
     </message>
@@ -2095,42 +2138,42 @@ GPS location:</source>
         <translation>Roupa:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="159"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="158"/>
         <source>Air Temp:</source>
         <translation>Temperatura do ar:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="175"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="172"/>
         <source>Cylinder:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="189"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="185"/>
         <source>Water Temp:</source>
         <translation>Temperatura da água:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="205"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="198"/>
         <source>Dive Master:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="220"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="211"/>
         <source>Weight:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="249"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="224"/>
         <source>Buddy:</source>
         <translation>Companheiro:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="263"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="237"/>
         <source>SAC:</source>
         <translation>SAC:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="280"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="252"/>
         <source>Notes</source>
         <translation>Notas</translation>
     </message>
@@ -2138,18 +2181,18 @@ GPS location:</source>
 <context>
     <name>DiveEventItem</name>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="134"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="165"/>
         <source>Manual switch to OC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="136"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="167"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation>início</translation>
     </message>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="137"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="168"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation>fim</translation>
@@ -2158,27 +2201,27 @@ GPS location:</source>
 <context>
     <name>DiveImportedModel</name>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="646"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="656"/>
         <source>Date/time</source>
         <translation>Data/hora</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="648"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="658"/>
         <source>Duration</source>
         <translation>Duração</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="650"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="660"/>
         <source>Depth</source>
         <translation>Profundidade</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="672"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="682"/>
         <source>h:</source>
         <translation>h:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="672"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="682"/>
         <source>min</source>
         <translation>min</translation>
     </message>
@@ -2187,8 +2230,8 @@ GPS location:</source>
     <name>DiveList</name>
     <message>
         <location filename="../mobile-widgets/qml/DiveList.qml" line="12"/>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="226"/>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="232"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="227"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="233"/>
         <source>Dive list</source>
         <translation type="unfinished"/>
     </message>
@@ -2203,110 +2246,115 @@ GPS location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="222"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="223"/>
         <source>Cloud credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="228"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="229"/>
         <source>Please tap the &apos;+&apos; button to add a dive</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="248"/>
+        <source>No dives in dive list</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DiveListView</name>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="846"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="849"/>
         <source>Expand all</source>
         <translation>Expandir todos</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="848"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="851"/>
         <source>Collapse all</source>
         <translation>Esconder todos</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="852"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="855"/>
         <source>Collapse others</source>
         <translation>Esconder outros</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="856"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="859"/>
         <source>Remove dive(s) from trip</source>
         <translation>Remover mergulhos de viagem</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="857"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="860"/>
         <source>Create new trip above</source>
         <translation>Criar viagem acima</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="871"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="874"/>
         <source>Add dive(s) to trip immediately above</source>
         <translation>Adicionar mergulhos para a viagem acima</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="873"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="876"/>
         <source>Add dive(s) to trip immediately below</source>
         <translation>Adicionar mergulhos para viagem abaixo</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="877"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="880"/>
         <source>Merge trip with trip above</source>
         <translation>Juntar viagem com viagem acima</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="878"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="881"/>
         <source>Merge trip with trip below</source>
         <translation>Juntar viagem com viagem abaixo</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="882"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="885"/>
         <source>Delete dive(s)</source>
         <translation>Apagar mergulho(s)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="884"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="887"/>
         <source>Mark dive(s) invalid</source>
         <translation>Marcar megulho(s) como inválidos</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="888"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="891"/>
         <source>Merge selected dives</source>
         <translation>Juntar mergulhos selecionados</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="890"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="893"/>
         <source>Renumber dive(s)</source>
         <translation>Renumerar mergulho(s)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="891"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="894"/>
         <source>Shift dive times</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="892"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="895"/>
         <source>Split selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="893"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="896"/>
         <source>Load image(s) from file(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="894"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="897"/>
         <source>Load image(s) from web</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="917"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="919"/>
         <source>Open image files</source>
         <translation>Abrir imagens</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="917"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="919"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>Imagens (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -2327,56 +2375,6 @@ GPS location:</source>
 <context>
     <name>DiveLogExportDialog</name>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="103"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="351"/>
-        <source>Export format</source>
-        <translation>Formato de exportação</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="134"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="353"/>
-        <source>UDDF</source>
-        <translation>UDDF</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="187"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="358"/>
-        <source>Worldmap</source>
-        <translation>Globo</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="197"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="359"/>
-        <source>I&amp;mage depths</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="243"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="360"/>
-        <source>Selection</source>
-        <translation>Seleção</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="252"/>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="346"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="361"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="372"/>
-        <source>Selected dives</source>
-        <translation>Mergulhos selecionados</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="262"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="362"/>
-        <source>All dives</source>
-        <translation>Todos os mergulhos</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="306"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="396"/>
-        <source>HTML</source>
-        <translation>HTML</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="14"/>
         <location filename="../build/ui_divelogexportdialog.h" line="349"/>
         <source>Export dive log files</source>
@@ -2389,12 +2387,24 @@ GPS location:</source>
         <translation>Exportações Gerais</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="103"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="351"/>
+        <source>Export format</source>
+        <translation>Formato de exportação</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="115"/>
         <location filename="../build/ui_divelogexportdialog.h" line="352"/>
         <source>Subsurface &amp;XML</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="134"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="353"/>
+        <source>UDDF</source>
+        <translation>UDDF</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="147"/>
         <location filename="../build/ui_divelogexportdialog.h" line="354"/>
         <source>di&amp;velogs.de</source>
@@ -2419,238 +2429,297 @@ GPS location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="275"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="187"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="358"/>
+        <source>Worldmap</source>
+        <translation>Globo</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="197"/>
+        <source>TeX</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="207"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="359"/>
+        <source>I&amp;mage depths</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="253"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="360"/>
+        <source>Selection</source>
+        <translation>Seleção</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="262"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="356"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="361"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="372"/>
+        <source>Selected dives</source>
+        <translation>Mergulhos selecionados</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="272"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="362"/>
+        <source>All dives</source>
+        <translation>Todos os mergulhos</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="285"/>
         <location filename="../build/ui_divelogexportdialog.h" line="363"/>
         <source>CSV units</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="288"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="298"/>
         <location filename="../build/ui_divelogexportdialog.h" line="366"/>
         <source>Metric</source>
         <translation>Métrico</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="293"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="303"/>
         <location filename="../build/ui_divelogexportdialog.h" line="367"/>
         <source>Imperial</source>
         <translation>Imperial</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="324"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="316"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="396"/>
+        <source>HTML</source>
+        <translation>HTML</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="334"/>
         <location filename="../build/ui_divelogexportdialog.h" line="370"/>
         <source>General settings</source>
         <translation>Configurações Gerais</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="330"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="340"/>
         <location filename="../build/ui_divelogexportdialog.h" line="371"/>
         <source>Subsurface numbers</source>
         <translation>Numeros do Subsurface</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="359"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="369"/>
         <location filename="../build/ui_divelogexportdialog.h" line="373"/>
         <source>Export yearly statistics</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="375"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="385"/>
         <location filename="../build/ui_divelogexportdialog.h" line="374"/>
         <source>All di&amp;ves</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="385"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="395"/>
         <location filename="../build/ui_divelogexportdialog.h" line="375"/>
         <source>Export list only</source>
         <translation>Exportar apenas a lista</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="392"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="402"/>
         <location filename="../build/ui_divelogexportdialog.h" line="376"/>
         <source>Export photos</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="408"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="418"/>
         <location filename="../build/ui_divelogexportdialog.h" line="377"/>
         <source>Style options</source>
         <translation>Opções de estilo</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="423"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="433"/>
         <location filename="../build/ui_divelogexportdialog.h" line="378"/>
         <source>Font</source>
         <translation>Fonte</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="433"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="443"/>
         <location filename="../build/ui_divelogexportdialog.h" line="379"/>
         <source>Font size</source>
         <translation>Tamanho da fonte</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="444"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="454"/>
         <location filename="../build/ui_divelogexportdialog.h" line="382"/>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="449"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="459"/>
         <location filename="../build/ui_divelogexportdialog.h" line="383"/>
         <source>10</source>
         <translation>10</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="454"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="464"/>
         <location filename="../build/ui_divelogexportdialog.h" line="384"/>
         <source>12</source>
         <translation>12</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="459"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="469"/>
         <location filename="../build/ui_divelogexportdialog.h" line="385"/>
         <source>14</source>
         <translation>14</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="464"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="474"/>
         <location filename="../build/ui_divelogexportdialog.h" line="386"/>
         <source>16</source>
         <translation>16</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="469"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="479"/>
         <location filename="../build/ui_divelogexportdialog.h" line="387"/>
         <source>18</source>
         <translation>18</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="474"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="484"/>
         <location filename="../build/ui_divelogexportdialog.h" line="388"/>
         <source>20</source>
         <translation>20</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="482"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="492"/>
         <location filename="../build/ui_divelogexportdialog.h" line="390"/>
         <source>Theme</source>
         <translation>Tema</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="493"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="503"/>
         <location filename="../build/ui_divelogexportdialog.h" line="393"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="95"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="99"/>
         <source>Light</source>
         <translation>Leve</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="498"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="508"/>
         <location filename="../build/ui_divelogexportdialog.h" line="394"/>
         <source>Sand</source>
         <translation>Areia</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="134"/>
-        <source>UDDF files (*.uddf *.UDDF)</source>
-        <translation>Arquivos UDDF  (*.uddf *.UDDF)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="142"/>
-        <source>CSV files (*.csv *.CSV)</source>
-        <translation>Arquivos CSV (*.csv *.CSV)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="74"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="76"/>
         <source>Generic format that is used for data exchange between a variety of diving related programs.</source>
         <translation>Formato genérico que é utilizado para troca de dados em uma variedade de programas de mergulho</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="76"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="78"/>
         <source>Comma separated values describing the dive profile.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="78"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="80"/>
         <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="80"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="82"/>
         <source>Send the dive data to divelogs.de website.</source>
         <translation>Enviar os dados para o site do divelogs.de</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="82"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="84"/>
         <source>Send the dive data to dive-share.appspot.com website</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="84"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="86"/>
         <source>HTML export of the dive locations, visualized on a world map.</source>
         <translation>Exportação HTML de pontos de mergulho visualizados no mundo</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="86"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="88"/>
         <source>Subsurface native XML format.</source>
         <translation>Formato nativo do Subsurface</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="88"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="90"/>
         <source>Write depths of images to file.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="133"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="92"/>
+        <source>Write dive as TeX macros to file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="137"/>
         <source>Export UDDF file as</source>
         <translation>Exportar arquivo UDDF como</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="137"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/>
+        <source>UDDF files (*.uddf *.UDDF)</source>
+        <translation>Arquivos UDDF  (*.uddf *.UDDF)</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divelogexportdialog.cpp" line="141"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="145"/>
         <source>Export CSV file as</source>
         <translation>Exportar arquivo CSV como</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="148"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="142"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="146"/>
+        <source>CSV files (*.csv *.CSV)</source>
+        <translation>Arquivos CSV (*.csv *.CSV)</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="152"/>
         <source>Export world map</source>
         <translation>Exportar mapa do mundo</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="149"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="169"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="153"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="177"/>
         <source>HTML files (*.html)</source>
         <translation>Arquivos HTML (*.html)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="153"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="157"/>
         <source>Export Subsurface XML</source>
         <translation>Exportar XML do Subsurface</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="158"/>
         <source>XML files (*.xml *.ssrf)</source>
         <translation>Arquivos XML (*.xml *.ssrf)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="162"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="166"/>
         <source>Save image depths</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="168"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="170"/>
+        <source>Export to TeX file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="170"/>
+        <source>TeX files (*.tex)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="176"/>
         <source>Export HTML files as</source>
         <translation>Exportar arquivo HTML como</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="184"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="192"/>
         <source>Please wait, exporting...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="219"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="227"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="311"/>
         <source>Can&apos;t open file %s</source>
         <translation>Não é possivel abrir o arquivo %s</translation>
     </message>
@@ -2664,25 +2733,6 @@ GPS location:</source>
         <translation>Importar arquivo com log de mergulho</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="643"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="727"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="856"/>
-        <source>Time</source>
-        <translation>Horário</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.ui" line="127"/>
-        <location filename="../build/ui_divelogimportdialog.h" line="164"/>
-        <source>Metric</source>
-        <translation>Métrico</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.ui" line="132"/>
-        <location filename="../build/ui_divelogimportdialog.h" line="165"/>
-        <source>Imperial</source>
-        <translation>Imperial</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divelogimportdialog.ui" line="89"/>
         <location filename="../build/ui_divelogimportdialog.h" line="152"/>
         <source>dd.mm.yyyy</source>
@@ -2701,74 +2751,6 @@ GPS location:</source>
         <translation>aaaa-mm-dd</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.ui" line="155"/>
-        <location filename="../build/ui_divelogimportdialog.h" line="167"/>
-        <source>Drag the tags above to each corresponding column below</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="641"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="729"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="852"/>
-        <source>Dive #</source>
-        <translation>Mergulho nº</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="642"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="723"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="854"/>
-        <source>Date</source>
-        <translation>Data</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="644"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="858"/>
-        <source>Duration</source>
-        <translation>Duração</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="655"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="862"/>
-        <source>GPS</source>
-        <translation>GPS</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="645"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="864"/>
-        <source>Max. depth</source>
-        <translation>Profundidade máxima</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="646"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="866"/>
-        <source>Avg. depth</source>
-        <translation>Profundidade Média</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="658"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="872"/>
-        <source>Suit</source>
-        <translation>Roupa</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="663"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="878"/>
-        <source>Tags</source>
-        <translation>Rótulos</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="652"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="894"/>
-        <source>O₂</source>
-        <translation>O₂</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="653"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="896"/>
-        <source>He</source>
-        <translation>He</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divelogimportdialog.ui" line="108"/>
         <location filename="../build/ui_divelogimportdialog.h" line="158"/>
         <source>Seconds</source>
@@ -2787,183 +2769,269 @@ GPS location:</source>
         <translation>Minutos:segundos</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="654"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="860"/>
-        <source>Location</source>
-        <translation>Local</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.ui" line="127"/>
+        <location filename="../build/ui_divelogimportdialog.h" line="164"/>
+        <source>Metric</source>
+        <translation>Métrico</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="354"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="499"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="505"/>
+        <location filename="../desktop-widgets/divelogimportdialog.ui" line="132"/>
+        <location filename="../build/ui_divelogimportdialog.h" line="165"/>
+        <source>Imperial</source>
+        <translation>Imperial</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.ui" line="155"/>
+        <location filename="../build/ui_divelogimportdialog.h" line="167"/>
+        <source>Drag the tags above to each corresponding column below</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="355"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="528"/>
         <source>Tab</source>
         <translation>Tab</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="575"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="598"/>
         <source>Some column headers were pre-populated; please drag and drop the headers so they match the column they are in.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="613"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="731"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="782"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="848"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="636"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="761"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="857"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="925"/>
         <source>Sample time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="615"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="733"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="784"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="638"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="763"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="859"/>
         <source>Sample depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="617"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="735"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="786"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="640"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="765"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="861"/>
         <source>Sample temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="621"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="739"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="790"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="642"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="767"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="863"/>
+        <source>Sample pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="644"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="769"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="865"/>
         <source>Sample sensor1 pO₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="623"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="741"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="792"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="646"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="771"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="867"/>
         <source>Sample sensor2 pO₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="625"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="743"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="794"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="648"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="773"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="869"/>
         <source>Sample sensor3 pO₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="633"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="751"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="802"/>
-        <source>Sample stopdepth</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="650"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="775"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="871"/>
+        <source>Sample CNS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="637"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="755"/>
-        <source>Sample setpoint</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="652"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="777"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="873"/>
+        <source>Sample NDL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="619"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="737"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="788"/>
-        <source>Sample pO₂</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="654"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="779"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="875"/>
+        <source>Sample TTS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="627"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="745"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="796"/>
-        <source>Sample CNS</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="656"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="781"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="877"/>
+        <source>Sample stopdepth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="629"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="747"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="798"/>
-        <source>Sample NDL</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="658"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="783"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="879"/>
+        <source>Sample pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="631"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="749"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="800"/>
-        <source>Sample TTS</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="660"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="785"/>
+        <source>Sample setpoint</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="635"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="664"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="759"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="929"/>
+        <source>Dive #</source>
+        <translation>Mergulho nº</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="665"/>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="753"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="804"/>
-        <source>Sample pressure</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="931"/>
+        <source>Date</source>
+        <translation>Data</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="656"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="868"/>
-        <source>Divemaster</source>
-        <translation>Divemaster</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="666"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="757"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="933"/>
+        <source>Time</source>
+        <translation>Horário</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="657"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="870"/>
-        <source>Buddy</source>
-        <translation>Parceiro</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="667"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="935"/>
+        <source>Duration</source>
+        <translation>Duração</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="659"/>
-        <source>Rating</source>
-        <translation>Classificação</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="668"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="941"/>
+        <source>Max. depth</source>
+        <translation>Profundidade máxima</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="660"/>
-        <source>Visibility</source>
-        <translation>Visibilidade</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="669"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="943"/>
+        <source>Avg. depth</source>
+        <translation>Profundidade Média</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="661"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="874"/>
-        <source>Notes</source>
-        <translation>Notas</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="670"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="975"/>
+        <source>Air temp.</source>
+        <translation>Temperatura do ar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="662"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="876"/>
-        <source>Weight</source>
-        <translation>Peso</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="671"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="977"/>
+        <source>Water temp.</source>
+        <translation>Temperatura da água</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="649"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="888"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="672"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="965"/>
         <source>Cyl. size</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="650"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="890"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="673"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="967"/>
         <source>Start pressure</source>
         <translation>Pressão inicial</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="651"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="892"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="674"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="969"/>
         <source>End pressure</source>
         <translation>Pressão final</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="647"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="898"/>
-        <source>Air temp.</source>
-        <translation>Temperatura do ar</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="675"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="971"/>
+        <source>O₂</source>
+        <translation>O₂</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="648"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="900"/>
-        <source>Water temp.</source>
-        <translation>Temperatura da água</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="676"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="973"/>
+        <source>He</source>
+        <translation>He</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="677"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="937"/>
+        <source>Location</source>
+        <translation>Local</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="678"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="939"/>
+        <source>GPS</source>
+        <translation>GPS</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="679"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="945"/>
+        <source>Divemaster</source>
+        <translation>Divemaster</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="680"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="947"/>
+        <source>Buddy</source>
+        <translation>Parceiro</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="681"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="949"/>
+        <source>Suit</source>
+        <translation>Roupa</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="682"/>
+        <source>Rating</source>
+        <translation>Classificação</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="683"/>
+        <source>Visibility</source>
+        <translation>Visibilidade</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="684"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="951"/>
+        <source>Notes</source>
+        <translation>Notas</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="685"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="953"/>
+        <source>Weight</source>
+        <translation>Peso</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="686"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="955"/>
+        <source>Tags</source>
+        <translation>Rótulos</translation>
     </message>
 </context>
 <context>
     <name>DiveObjectHelper</name>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="287"/>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="323"/>
         <source>%1 dive(s)</source>
         <translation type="unfinished"/>
     </message>
@@ -2971,18 +3039,18 @@ GPS location:</source>
 <context>
     <name>DivePlanner</name>
     <message>
-        <location filename="../desktop-widgets/diveplanner.ui" line="152"/>
-        <location filename="../build/ui_diveplanner.h" line="190"/>
-        <source>Altitude</source>
-        <translation>Altitude</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/diveplanner.ui" line="109"/>
         <location filename="../build/ui_diveplanner.h" line="189"/>
         <source>Planned dive time</source>
         <translation>Tempo do mergulho planejado</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/diveplanner.ui" line="152"/>
+        <location filename="../build/ui_diveplanner.h" line="190"/>
+        <source>Altitude</source>
+        <translation>Altitude</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/diveplanner.ui" line="159"/>
         <location filename="../build/ui_diveplanner.h" line="191"/>
         <source>ATM pressure</source>
@@ -3016,32 +3084,32 @@ GPS location:</source>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="134"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="136"/>
         <source>unknown</source>
         <translation>desconhecido</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="312"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="326"/>
         <source>Final depth</source>
         <translation>Profundidade final</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="314"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="328"/>
         <source>Run time</source>
         <translation>Tempo</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="316"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="330"/>
         <source>Duration</source>
         <translation>Duração</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="318"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="332"/>
         <source>Used gas</source>
         <translation>Gás usado</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="320"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="334"/>
         <source>CC setpoint</source>
         <translation type="unfinished"/>
     </message>
@@ -3049,22 +3117,22 @@ GPS location:</source>
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="108"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="112"/>
         <source>Dive planner points</source>
         <translation>Pontos planejados</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="112"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="116"/>
         <source>Available gases</source>
         <translation>Gases disponiveis</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="137"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="143"/>
         <source>Add dive data point</source>
         <translation>Adicionar ponto</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="146"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="152"/>
         <source>Save new</source>
         <translation type="unfinished"/>
     </message>
@@ -3097,11 +3165,36 @@ GPS location:</source>
         <translation>Cor</translation>
     </message>
     <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="124"/>
+        <source>User entered</source>
+        <translation>Entrado pelo usuário</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="126"/>
+        <source>Cylinder index</source>
+        <translation>Indice do Cilindro</translation>
+    </message>
+    <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="128"/>
         <source>Pressure S</source>
         <translation>Pressão S</translation>
     </message>
     <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="130"/>
+        <source>Pressure I</source>
+        <translation>Pressão I</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="132"/>
+        <source>Ceiling</source>
+        <translation>Teto</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="134"/>
+        <source>SAC</source>
+        <translation>SAC</translation>
+    </message>
+    <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="136"/>
         <source>pN₂</source>
         <translation>pN₂</translation>
@@ -3137,18 +3230,13 @@ GPS location:</source>
         <translation>Sensor 3</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="152"/>
-        <source>Heart rate</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="156"/>
-        <source>Mean depth @ s</source>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="150"/>
+        <source>Ambient pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="150"/>
-        <source>Ambient pressure</source>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="152"/>
+        <source>Heart rate</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -3157,29 +3245,9 @@ GPS location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="130"/>
-        <source>Pressure I</source>
-        <translation>Pressão I</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="124"/>
-        <source>User entered</source>
-        <translation>Entrado pelo usuário</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="126"/>
-        <source>Cylinder index</source>
-        <translation>Indice do Cilindro</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="132"/>
-        <source>Ceiling</source>
-        <translation>Teto</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="134"/>
-        <source>SAC</source>
-        <translation>SAC</translation>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="156"/>
+        <source>Mean depth @ s</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3246,310 +3314,314 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="395"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="441"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="434"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="483"/>
         <source>#</source>
         <translation>nº</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="398"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="444"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="437"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="486"/>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="401"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="447"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="440"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="489"/>
         <source>Rating</source>
         <translation>Classificação</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="404"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="443"/>
         <source>Depth</source>
         <translation>Profundidade</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="410"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="446"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="495"/>
+        <source>Duration</source>
+        <translation>Duração</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="449"/>
         <source>Temp</source>
         <translation>Temp</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="413"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="452"/>
         <source>Weight</source>
         <translation>Peso</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="425"/>
-        <source>SAC</source>
-        <translation>SAC</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
-        <source>m</source>
-        <translation>m</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
-        <source>ft</source>
-        <translation>pé(s)</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
-        <source>Weight(%1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="416"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="462"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="455"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="504"/>
         <source>Suit</source>
         <translation>Roupa</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="419"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="465"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="458"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="507"/>
         <source>Cyl</source>
         <translation>Cilindro</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="422"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="468"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="461"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="510"/>
         <source>Gas</source>
         <translation>Gás</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
-        <source>SAC(%1)</source>
-        <translation type="unfinished"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="464"/>
+        <source>SAC</source>
+        <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
-        <source>/min</source>
-        <translation>/min</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="467"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="518"/>
+        <source>OTU</source>
+        <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="431"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="479"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="470"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="521"/>
         <source>Max CNS</source>
         <translation>CNS Máximo</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="434"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="482"/>
-        <source>Location</source>
-        <translation>Local</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
+        <source>Photos</source>
+        <translation>Fotos</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
-        <source>kg</source>
-        <translation>kg</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="476"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="527"/>
+        <source>Location</source>
+        <translation>Local</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="492"/>
         <source>Depth(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="407"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="453"/>
-        <source>Duration</source>
-        <translation>Duração</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="492"/>
+        <source>m</source>
+        <translation>m</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="492"/>
+        <source>ft</source>
+        <translation>pé(s)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="456"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="498"/>
         <source>Temp(%1%2)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="501"/>
+        <source>Weight(%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="501"/>
+        <source>kg</source>
+        <translation>kg</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="501"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="428"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="476"/>
-        <source>OTU</source>
-        <translation>OTU</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="515"/>
+        <source>SAC(%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="515"/>
+        <source>/min</source>
+        <translation>/min</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="524"/>
+        <source>Photos before/during/after dive</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="164"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="165"/>
         <source>no dives were selected</source>
         <translation>nenhum mergulho selecionado</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="174"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="175"/>
         <source>stylesheet to export to divelogs.de is not found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="184"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="185"/>
         <source>failed to create zip file for upload: %s</source>
         <translation>falha ao criar arquivo zip para upload: %s</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="236"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="237"/>
         <source>internal error</source>
         <translation>erro interno</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="244"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="245"/>
         <source>Conversion of dive %1 to divelogs.de format failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="272"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="273"/>
         <source>error writing zip file: %s zip error %d system error %d - %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="745"/>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="935"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="936"/>
         <source>Done</source>
         <translation>Finalizado</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="778"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="779"/>
         <source>Uploading dive list...</source>
         <translation>Enviando lista de mergulhos...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="810"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="811"/>
         <source>Downloading dive list...</source>
         <translation>Recebendo lista de mergulhos...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="851"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="852"/>
         <source>Downloading %1 dives...</source>
         <translation>Recebendo %1 mergulhos...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="885"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="886"/>
         <source>Download finished - %1</source>
         <translation>Recebimento terminado - %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="899"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="900"/>
         <source>Problem with download</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="900"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="901"/>
         <source>The archive could not be opened:
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="909"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="910"/>
         <source>Corrupted download</source>
         <translation>Recebimento inválido</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="910"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="911"/>
         <source>The archive could not be opened:
 %1</source>
         <translation>O arquivo não pode ser aberto:
 %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="937"/>
+        <source>Upload finished</source>
+        <translation>Enviado finalizado</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="950"/>
         <source>Upload failed</source>
         <translation>Envio falhou</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="952"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="953"/>
         <source>Upload successful</source>
         <translation>Envio bem sucedido</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="955"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="956"/>
         <source>Login failed</source>
         <translation>Abertura de sessão (login) falhou</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="958"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="959"/>
         <source>Cannot parse response</source>
         <translation>Falha na análise da resposta</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="970"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="971"/>
         <source>Error: %1</source>
         <translation>Erro: %1</translation>
     </message>
-    <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="936"/>
-        <source>Upload finished</source>
-        <translation>Enviado finalizado</translation>
-    </message>
 </context>
 <context>
     <name>DownloadFromDCWidget</name>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="185"/>
-        <source>Error</source>
-        <translation>Erro</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="436"/>
-        <source>Retry</source>
-        <translation>Tentar novamente</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="280"/>
-        <source>Find Uemis dive computer</source>
-        <translation>Encontrar computador de mergulho Uemis</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="101"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="107"/>
         <source>Download</source>
         <translation>Receber</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="104"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="110"/>
         <source>Choose Bluetooth download mode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="382"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="191"/>
+        <source>Error</source>
+        <translation>Erro</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="286"/>
+        <source>Find Uemis dive computer</source>
+        <translation>Encontrar computador de mergulho Uemis</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="392"/>
         <source>Choose file for divecomputer download logfile</source>
         <translation>Escolha o arquivo para recebimento do arquivo de log do computador de mergulho</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="383"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="393"/>
         <source>Log files (*.log)</source>
         <translation>Arquivos de log (*.log)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="398"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="408"/>
         <source>Warning</source>
         <translation>Aviso</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="399"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="409"/>
         <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source>
         <translation>Ao salvar a saída da biblioteca libdivecomputer as informações dos mergulhos recebidos NÃO serão gravadas na lista de mergulhos.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="410"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="420"/>
         <source>Choose file for divecomputer binary dump file</source>
         <translation>Escolha o arquivo onde gravar a saída binária do computador de mergulho</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="411"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="421"/>
         <source>Dump files (*.bin)</source>
         <translation>Arquivos de saída (*.bin)</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="446"/>
+        <source>Retry</source>
+        <translation>Tentar novamente</translation>
+    </message>
 </context>
 <context>
     <name>DownloadFromDiveComputer</name>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="139"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="275"/>
-        <source>Vendor</source>
-        <translation>Fabricante</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="14"/>
         <location filename="../build/ui_downloadfromdivecomputer.h" line="265"/>
         <source>Download from dive computer</source>
@@ -3562,17 +3634,6 @@ p, li { white-space: pre-wrap; }
         <translation>Disco ou ponto de montágem</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="122"/>
-        <source>Choose Bluetooth download mode</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="149"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="276"/>
-        <source>Dive computer</source>
-        <translation>Computador de mergulho</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="66"/>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="101"/>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="115"/>
@@ -3596,11 +3657,46 @@ p, li { white-space: pre-wrap; }
         <translation>Sempre preferir mergulhos baixados</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="87"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="270"/>
+        <source>Download into new trip</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="94"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="271"/>
+        <source>Save libdivecomputer logfile</source>
+        <translation>Salvar arquivo de log da biblioteca libdivecomputer</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="108"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="273"/>
+        <source>Save libdivecomputer dumpfile</source>
+        <translation>Salvar arquivo de saída da biblioteca libdivecomputer</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="122"/>
+        <source>Choose Bluetooth download mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="129"/>
         <source>Select a remote Bluetooth device.</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="139"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="275"/>
+        <source>Vendor</source>
+        <translation>Fabricante</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="149"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="276"/>
+        <source>Dive computer</source>
+        <translation>Computador de mergulho</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/>
         <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="52"/>
         <location filename="../build/ui_downloadfromdivecomputer.h" line="277"/>
@@ -3608,18 +3704,6 @@ p, li { white-space: pre-wrap; }
         <translation>Receber</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="284"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="281"/>
-        <source>OK</source>
-        <translation>OK</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="291"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="282"/>
-        <source>Cancel</source>
-        <translation>Cancelar</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="226"/>
         <location filename="../build/ui_downloadfromdivecomputer.h" line="278"/>
         <source>Downloaded dives</source>
@@ -3638,22 +3722,16 @@ p, li { white-space: pre-wrap; }
         <translation>Desfazer seleções</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="94"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="271"/>
-        <source>Save libdivecomputer logfile</source>
-        <translation>Salvar arquivo de log da biblioteca libdivecomputer</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="108"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="273"/>
-        <source>Save libdivecomputer dumpfile</source>
-        <translation>Salvar arquivo de saída da biblioteca libdivecomputer</translation>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="284"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="281"/>
+        <source>OK</source>
+        <translation>OK</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="87"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="270"/>
-        <source>Download into new trip</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="291"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="282"/>
+        <source>Cancel</source>
+        <translation>Cancelar</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="16"/>
@@ -3743,12 +3821,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="297"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="242"/>
         <source>To disconnect Subsurface from your Facebook account, use the button below</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="306"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="251"/>
         <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source>
         <translation type="unfinished"/>
     </message>
@@ -3756,22 +3834,22 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>FacebookManager</name>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="266"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="211"/>
         <source>Photo upload sucessfull</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="267"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="212"/>
         <source>Your dive profile was updated to Facebook.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="271"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="216"/>
         <source>Photo upload failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="272"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="217"/>
         <source>Your dive profile was not updated to Facebook, 
  please send the following to the developer. 
 </source>
@@ -3831,17 +3909,25 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>FirmwareUpdateThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1750"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1739"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1755"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1744"/>
         <source>Firmware update failed!</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
+    <name>GlobalDrawer</name>
+    <message>
+        <location filename="../mobile-widgets/qml/kirigami/src/controls/GlobalDrawer.qml" line="364"/>
+        <source>Back</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>GlobeGPS</name>
     <message>
         <location filename="../desktop-widgets/globe.cpp" line="124"/>
@@ -3857,27 +3943,27 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="40"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="32"/>
         <source>Date: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="50"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="42"/>
         <source>Name: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="60"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="52"/>
         <source>Latitude: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="69"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="61"/>
         <source>Longitude: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="113"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="105"/>
         <source>List of stored GPS fixes</source>
         <translation type="unfinished"/>
     </message>
@@ -3906,7 +3992,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>LocationFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="648"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="646"/>
         <source>Location: </source>
         <translation type="unfinished"/>
     </message>
@@ -3947,7 +4033,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>LocationFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="299"/>
+        <location filename="../qt-models/filtermodels.cpp" line="304"/>
         <source>No location set</source>
         <translation type="unfinished"/>
     </message>
@@ -4068,20 +4154,55 @@ p, li { white-space: pre-wrap; }
     </message>
 </context>
 <context>
-    <name>MainForm.ui</name>
+    <name>MainTab</name>
     <message>
-        <location filename="../packaging/ios/Subsurface-mobile/MainForm.ui.qml" line="17"/>
-        <source>Press Me 1</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/maintab.ui" line="18"/>
+        <location filename="../desktop-widgets/maintab.ui" line="439"/>
+        <location filename="../build/ui_maintab.h" line="961"/>
+        <location filename="../build/ui_maintab.h" line="963"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="539"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="571"/>
+        <source>Notes</source>
+        <translation>Notas</translation>
     </message>
     <message>
-        <location filename="../packaging/ios/Subsurface-mobile/MainForm.ui.qml" line="22"/>
-        <source>Press Me 2</source>
+        <location filename="../desktop-widgets/maintab.ui" line="21"/>
+        <location filename="../build/ui_maintab.h" line="964"/>
+        <source>General notes about the current selection</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>MainTab</name>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="92"/>
+        <location filename="../desktop-widgets/maintab.ui" line="646"/>
+        <location filename="../build/ui_maintab.h" line="947"/>
+        <location filename="../build/ui_maintab.h" line="967"/>
+        <source>Date</source>
+        <translation>Data</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="102"/>
+        <location filename="../build/ui_maintab.h" line="948"/>
+        <source>Time</source>
+        <translation>Horário</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="112"/>
+        <location filename="../desktop-widgets/maintab.ui" line="836"/>
+        <location filename="../build/ui_maintab.h" line="949"/>
+        <location filename="../build/ui_maintab.h" line="987"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="306"/>
+        <source>Air temp.</source>
+        <translation>Temperatura do ar</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="122"/>
+        <location filename="../desktop-widgets/maintab.ui" line="855"/>
+        <location filename="../build/ui_maintab.h" line="950"/>
+        <location filename="../build/ui_maintab.h" line="989"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="307"/>
+        <source>Water temp.</source>
+        <translation>Temperatura da água</translation>
+    </message>
     <message>
         <location filename="../desktop-widgets/maintab.ui" line="184"/>
         <location filename="../build/ui_maintab.h" line="951"/>
@@ -4090,6 +4211,17 @@ p, li { white-space: pre-wrap; }
         <translation>Local</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="214"/>
+        <source>Edit dive site</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="217"/>
+        <location filename="../build/ui_maintab.h" line="953"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="252"/>
         <location filename="../build/ui_maintab.h" line="954"/>
         <source>Divemaster</source>
@@ -4102,12 +4234,6 @@ p, li { white-space: pre-wrap; }
         <translation>Parceiro</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.ui" line="387"/>
-        <location filename="../build/ui_maintab.h" line="959"/>
-        <source>Tags</source>
-        <translation>Rótulos</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/maintab.ui" line="308"/>
         <location filename="../build/ui_maintab.h" line="956"/>
         <source>Rating</source>
@@ -4126,57 +4252,18 @@ p, li { white-space: pre-wrap; }
         <translation>Roupa</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="387"/>
+        <location filename="../build/ui_maintab.h" line="959"/>
+        <source>Tags</source>
+        <translation>Rótulos</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="397"/>
         <location filename="../build/ui_maintab.h" line="960"/>
         <source>Dive mode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.ui" line="112"/>
-        <location filename="../desktop-widgets/maintab.ui" line="836"/>
-        <location filename="../build/ui_maintab.h" line="949"/>
-        <location filename="../build/ui_maintab.h" line="987"/>
-        <location filename="../desktop-widgets/maintab.cpp" line="306"/>
-        <source>Air temp.</source>
-        <translation>Temperatura do ar</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="122"/>
-        <location filename="../desktop-widgets/maintab.ui" line="855"/>
-        <location filename="../build/ui_maintab.h" line="950"/>
-        <location filename="../build/ui_maintab.h" line="989"/>
-        <location filename="../desktop-widgets/maintab.cpp" line="307"/>
-        <source>Water temp.</source>
-        <translation>Temperatura da água</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="18"/>
-        <location filename="../desktop-widgets/maintab.ui" line="439"/>
-        <location filename="../build/ui_maintab.h" line="961"/>
-        <location filename="../build/ui_maintab.h" line="963"/>
-        <location filename="../desktop-widgets/maintab.cpp" line="539"/>
-        <location filename="../desktop-widgets/maintab.cpp" line="571"/>
-        <source>Notes</source>
-        <translation>Notas</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="21"/>
-        <location filename="../build/ui_maintab.h" line="964"/>
-        <source>General notes about the current selection</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="214"/>
-        <source>Edit dive site</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="217"/>
-        <location filename="../build/ui_maintab.h" line="953"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/maintab.ui" line="491"/>
         <location filename="../build/ui_maintab.h" line="965"/>
         <source>Equipment</source>
@@ -4201,6 +4288,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="665"/>
+        <location filename="../build/ui_maintab.h" line="969"/>
+        <source>Interval</source>
+        <translation>Intervalo</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="684"/>
         <location filename="../build/ui_maintab.h" line="971"/>
         <source>Gases used</source>
@@ -4213,18 +4306,38 @@ p, li { white-space: pre-wrap; }
         <translation>Gas consumido</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="722"/>
+        <location filename="../desktop-widgets/maintab.ui" line="1094"/>
+        <location filename="../build/ui_maintab.h" line="975"/>
+        <location filename="../build/ui_maintab.h" line="1003"/>
+        <source>SAC</source>
+        <translation>SAC</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="741"/>
         <location filename="../build/ui_maintab.h" line="977"/>
         <source>CNS</source>
         <translation>CNS</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="760"/>
+        <location filename="../build/ui_maintab.h" line="979"/>
+        <source>OTU</source>
+        <translation>OTU</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="779"/>
         <location filename="../build/ui_maintab.h" line="981"/>
         <source>Max. depth</source>
         <translation>Profundidade máxima</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="798"/>
+        <location filename="../build/ui_maintab.h" line="983"/>
+        <source>Avg. depth</source>
+        <translation>Profundidade Média</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="817"/>
         <location filename="../build/ui_maintab.h" line="985"/>
         <source>Air pressure</source>
@@ -4237,82 +4350,6 @@ p, li { white-space: pre-wrap; }
         <translation>Tempo de mergulho</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.ui" line="933"/>
-        <location filename="../build/ui_maintab.h" line="1007"/>
-        <source>Simple statistics about the selection</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1039"/>
-        <location filename="../build/ui_maintab.h" line="999"/>
-        <source>Total time</source>
-        <translation>Tempo total</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1106"/>
-        <location filename="../build/ui_maintab.h" line="1004"/>
-        <source>Gas consumption</source>
-        <translation>Consumo de gás</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1151"/>
-        <location filename="../build/ui_maintab.h" line="1009"/>
-        <source>All photos from the current selection</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1177"/>
-        <location filename="../build/ui_maintab.h" line="1010"/>
-        <source>Extra data</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1180"/>
-        <location filename="../build/ui_maintab.h" line="1011"/>
-        <source>Adittional data from the dive computer</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="92"/>
-        <location filename="../desktop-widgets/maintab.ui" line="646"/>
-        <location filename="../build/ui_maintab.h" line="947"/>
-        <location filename="../build/ui_maintab.h" line="967"/>
-        <source>Date</source>
-        <translation>Data</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="102"/>
-        <location filename="../build/ui_maintab.h" line="948"/>
-        <source>Time</source>
-        <translation>Horário</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="665"/>
-        <location filename="../build/ui_maintab.h" line="969"/>
-        <source>Interval</source>
-        <translation>Intervalo</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="722"/>
-        <location filename="../desktop-widgets/maintab.ui" line="1094"/>
-        <location filename="../build/ui_maintab.h" line="975"/>
-        <location filename="../build/ui_maintab.h" line="1003"/>
-        <source>SAC</source>
-        <translation>SAC</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="798"/>
-        <location filename="../build/ui_maintab.h" line="983"/>
-        <source>Avg. depth</source>
-        <translation>Profundidade Média</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="760"/>
-        <location filename="../build/ui_maintab.h" line="979"/>
-        <source>OTU</source>
-        <translation>OTU</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/maintab.ui" line="893"/>
         <location filename="../build/ui_maintab.h" line="993"/>
         <source>Salinity</source>
@@ -4325,22 +4362,34 @@ p, li { white-space: pre-wrap; }
         <translation>Estatísticas</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="933"/>
+        <location filename="../build/ui_maintab.h" line="1007"/>
+        <source>Simple statistics about the selection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="986"/>
         <location filename="../build/ui_maintab.h" line="996"/>
         <source>Depth</source>
         <translation>Profundidade</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="998"/>
+        <location filename="../build/ui_maintab.h" line="997"/>
+        <source>Duration</source>
+        <translation>Duração</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="1027"/>
         <location filename="../build/ui_maintab.h" line="998"/>
         <source>Temperature</source>
         <translation>Temperatura</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.ui" line="998"/>
-        <location filename="../build/ui_maintab.h" line="997"/>
-        <source>Duration</source>
-        <translation>Duração</translation>
+        <location filename="../desktop-widgets/maintab.ui" line="1039"/>
+        <location filename="../build/ui_maintab.h" line="999"/>
+        <source>Total time</source>
+        <translation>Tempo total</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/maintab.ui" line="1058"/>
@@ -4349,20 +4398,34 @@ p, li { white-space: pre-wrap; }
         <translation>Mergulhos</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="1106"/>
+        <location filename="../build/ui_maintab.h" line="1004"/>
+        <source>Gas consumption</source>
+        <translation>Consumo de gás</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="1148"/>
         <location filename="../build/ui_maintab.h" line="1008"/>
         <source>Photos</source>
         <translation>Fotos</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.cpp" line="88"/>
-        <source>Cylinders</source>
-        <translation>Cilindros</translation>
+        <location filename="../desktop-widgets/maintab.ui" line="1151"/>
+        <location filename="../build/ui_maintab.h" line="1009"/>
+        <source>All photos from the current selection</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.cpp" line="92"/>
-        <source>Weights</source>
-        <translation>Lastro</translation>
+        <location filename="../desktop-widgets/maintab.ui" line="1177"/>
+        <location filename="../build/ui_maintab.h" line="1010"/>
+        <source>Extra data</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="1180"/>
+        <location filename="../build/ui_maintab.h" line="1011"/>
+        <source>Adittional data from the dive computer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/maintab.cpp" line="63"/>
@@ -4375,11 +4438,21 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.cpp" line="88"/>
+        <source>Cylinders</source>
+        <translation>Cilindros</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.cpp" line="89"/>
         <source>Add cylinder</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.cpp" line="92"/>
+        <source>Weights</source>
+        <translation>Lastro</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.cpp" line="93"/>
         <source>Add weight system</source>
         <translation type="unfinished"/>
@@ -4572,659 +4645,685 @@ misturados com ar usando:
         <translation>A&amp;rquivo</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="455"/>
-        <location filename="../build/ui_mainwindow.h" line="534"/>
-        <source>Export dive logs</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="510"/>
-        <location filename="../build/ui_mainwindow.h" line="542"/>
-        <source>Toggle pHe graph</source>
-        <translation>Alterna gráfico pHe</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="546"/>
-        <location filename="../build/ui_mainwindow.h" line="545"/>
-        <source>Toggle calculating all tissues</source>
-        <translation>Alterna calcular todos os tecidos</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="522"/>
-        <location filename="../build/ui_mainwindow.h" line="543"/>
-        <source>Toggle DC reported ceiling</source>
-        <translation>Alterna teto calculado pelo computador</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="534"/>
-        <location filename="../build/ui_mainwindow.h" line="544"/>
-        <source>Toggle calculated ceiling</source>
-        <translation>Alterna teto calculado</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="606"/>
-        <location filename="../build/ui_mainwindow.h" line="550"/>
-        <source>Toggle NDL, TTS</source>
-        <translation>Alterna NDL, TTS</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="558"/>
-        <location filename="../build/ui_mainwindow.h" line="546"/>
-        <source>Toggle calculated ceiling with 3m increments</source>
-        <translation>Alterna teto calculado com incrementos de 3m</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="463"/>
-        <location filename="../build/ui_mainwindow.h" line="537"/>
-        <source>Configure &amp;dive computer</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="570"/>
-        <location filename="../build/ui_mainwindow.h" line="547"/>
-        <source>Toggle heart rate</source>
-        <translation>Alterna batimentos cardiacos</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="582"/>
-        <location filename="../build/ui_mainwindow.h" line="548"/>
-        <source>Toggle MOD</source>
-        <translation>alterna MOD</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="594"/>
-        <location filename="../build/ui_mainwindow.h" line="549"/>
-        <source>Toggle EAD, END, EADD</source>
-        <translation>Alterna EAD, END, EADD</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="618"/>
-        <location filename="../build/ui_mainwindow.h" line="551"/>
-        <source>Toggle SAC rate</source>
-        <translation>alterna taxa SAC</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="630"/>
-        <location filename="../build/ui_mainwindow.h" line="552"/>
-        <source>Toggle ruler</source>
-        <translation>Anternar visualização da régua</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="86"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="87"/>
         <location filename="../build/ui_mainwindow.h" line="569"/>
         <source>&amp;Log</source>
         <translation>&amp;Log</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="105"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="104"/>
         <location filename="../build/ui_mainwindow.h" line="570"/>
         <source>&amp;View</source>
         <translation>&amp;Ver</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="121"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="120"/>
         <location filename="../build/ui_mainwindow.h" line="571"/>
         <source>&amp;Help</source>
         <translation>&amp;Ajuda</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="130"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="129"/>
         <location filename="../build/ui_mainwindow.h" line="572"/>
         <source>&amp;Import</source>
         <translation>&amp;Importar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="139"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="138"/>
         <location filename="../build/ui_mainwindow.h" line="573"/>
         <source>&amp;Edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="144"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="143"/>
         <source>Share on</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="158"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="157"/>
         <location filename="../build/ui_mainwindow.h" line="453"/>
         <source>&amp;New logbook</source>
         <translation>&amp;Novo logbook</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="161"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="160"/>
         <location filename="../build/ui_mainwindow.h" line="455"/>
         <source>New</source>
         <translation>Novo</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="164"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="163"/>
         <location filename="../build/ui_mainwindow.h" line="457"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="169"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="168"/>
         <location filename="../build/ui_mainwindow.h" line="458"/>
         <source>&amp;Open logbook</source>
         <translation>&amp;Abrir logbook</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="172"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="171"/>
         <location filename="../build/ui_mainwindow.h" line="460"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="508"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="502"/>
         <source>Open</source>
         <translation>Abrir</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="175"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="174"/>
         <location filename="../build/ui_mainwindow.h" line="462"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="180"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="179"/>
         <location filename="../build/ui_mainwindow.h" line="463"/>
         <source>&amp;Save</source>
         <translation>&amp;Gravar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="183"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="182"/>
         <location filename="../build/ui_mainwindow.h" line="465"/>
         <source>Save</source>
         <translation>Salvar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="186"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="185"/>
         <location filename="../build/ui_mainwindow.h" line="467"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="191"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="190"/>
         <location filename="../build/ui_mainwindow.h" line="468"/>
         <source>Sa&amp;ve as</source>
         <translation>Sal&amp;var como</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="194"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="193"/>
         <location filename="../build/ui_mainwindow.h" line="470"/>
         <source>Save as</source>
         <translation>Salvar como</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="197"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="196"/>
         <location filename="../build/ui_mainwindow.h" line="472"/>
         <source>Ctrl+Shift+S</source>
         <translation>Ctrl+Shift+S</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="202"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="201"/>
         <location filename="../build/ui_mainwindow.h" line="473"/>
         <source>&amp;Close</source>
         <translation>Fe&amp;char</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="205"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="204"/>
         <location filename="../build/ui_mainwindow.h" line="475"/>
         <source>Close</source>
         <translation>Fechar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="208"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="207"/>
         <location filename="../build/ui_mainwindow.h" line="477"/>
         <source>Ctrl+W</source>
         <translation>Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="221"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="212"/>
+        <location filename="../build/ui_mainwindow.h" line="478"/>
+        <source>&amp;Print</source>
+        <translation>&amp;Imprimir</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="215"/>
+        <location filename="../build/ui_mainwindow.h" line="479"/>
+        <source>Ctrl+P</source>
+        <translation>Ctrl+P</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="220"/>
         <location filename="../build/ui_mainwindow.h" line="480"/>
         <source>P&amp;references</source>
         <translation>P&amp;referencias</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="251"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="223"/>
+        <location filename="../build/ui_mainwindow.h" line="481"/>
+        <source>Ctrl+,</source>
+        <translation>Ctrl+,</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="231"/>
+        <location filename="../build/ui_mainwindow.h" line="482"/>
+        <source>&amp;Quit</source>
+        <translation>&amp;Fechar</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="234"/>
+        <location filename="../build/ui_mainwindow.h" line="483"/>
+        <source>Ctrl+Q</source>
+        <translation>Ctrl+Q</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="242"/>
+        <location filename="../build/ui_mainwindow.h" line="484"/>
+        <source>Import from &amp;dive computer</source>
+        <translation>Importar do &amp;computador de mergulho</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="245"/>
+        <location filename="../build/ui_mainwindow.h" line="485"/>
+        <source>Ctrl+D</source>
+        <translation>Ctrl+D</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="250"/>
         <location filename="../build/ui_mainwindow.h" line="486"/>
         <source>Import &amp;GPS data from Subsurface web service</source>
         <translation>Importar dados de &amp;GPS pelo web service do Subsurface</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="259"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="253"/>
+        <location filename="../build/ui_mainwindow.h" line="487"/>
+        <source>Ctrl+G</source>
+        <translation>Ctrl+G</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="258"/>
         <location filename="../build/ui_mainwindow.h" line="488"/>
         <source>Edit device &amp;names</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="272"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="263"/>
+        <location filename="../build/ui_mainwindow.h" line="489"/>
+        <source>&amp;Add dive</source>
+        <translation>&amp;Adicionar mergulho</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="266"/>
+        <location filename="../build/ui_mainwindow.h" line="490"/>
+        <source>Ctrl++</source>
+        <translation>Ctrl++</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="271"/>
         <location filename="../build/ui_mainwindow.h" line="491"/>
         <source>&amp;Edit dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="277"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="276"/>
         <location filename="../build/ui_mainwindow.h" line="492"/>
         <source>&amp;Copy dive components</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="280"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="279"/>
         <location filename="../build/ui_mainwindow.h" line="493"/>
         <source>Ctrl+C</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="285"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="284"/>
         <location filename="../build/ui_mainwindow.h" line="494"/>
         <source>&amp;Paste dive components</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="288"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="287"/>
         <location filename="../build/ui_mainwindow.h" line="495"/>
         <source>Ctrl+V</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="325"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="292"/>
+        <location filename="../build/ui_mainwindow.h" line="496"/>
+        <source>&amp;Renumber</source>
+        <translation>&amp;Renumerar</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="295"/>
+        <location filename="../build/ui_mainwindow.h" line="497"/>
+        <source>Ctrl+R</source>
+        <translation>Ctrl+R</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="303"/>
+        <location filename="../build/ui_mainwindow.h" line="498"/>
+        <source>Auto &amp;group</source>
+        <translation>Auto a&amp;grupar</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="308"/>
+        <location filename="../build/ui_mainwindow.h" line="499"/>
+        <source>&amp;Yearly statistics</source>
+        <translation>Estatisticas Anuais</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="311"/>
+        <location filename="../build/ui_mainwindow.h" line="500"/>
+        <source>Ctrl+Y</source>
+        <translation>Ctrl+Y</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="316"/>
+        <location filename="../build/ui_mainwindow.h" line="501"/>
+        <source>&amp;Dive list</source>
+        <translation>Lista de Mergulho</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="319"/>
+        <location filename="../build/ui_mainwindow.h" line="502"/>
+        <source>Ctrl+2</source>
+        <translation>Ctrl+2</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="324"/>
         <location filename="../build/ui_mainwindow.h" line="503"/>
         <source>&amp;Profile</source>
         <translation>&amp;Perfil</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="333"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="327"/>
+        <location filename="../build/ui_mainwindow.h" line="504"/>
+        <source>Ctrl+3</source>
+        <translation>Ctrl+3</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="332"/>
         <location filename="../build/ui_mainwindow.h" line="505"/>
         <source>&amp;Info</source>
         <translation>&amp;Informações</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="341"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="335"/>
+        <location filename="../build/ui_mainwindow.h" line="506"/>
+        <source>Ctrl+4</source>
+        <translation>Ctrl+4</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="340"/>
         <location filename="../build/ui_mainwindow.h" line="507"/>
         <source>&amp;All</source>
         <translation>&amp;Todos</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="357"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="343"/>
+        <location filename="../build/ui_mainwindow.h" line="508"/>
+        <source>Ctrl+1</source>
+        <translation>Ctrl+1</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="348"/>
+        <location filename="../build/ui_mainwindow.h" line="509"/>
+        <source>P&amp;revious DC</source>
+        <translation>Computador de mergulho anterior</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="351"/>
+        <location filename="../build/ui_mainwindow.h" line="510"/>
+        <source>Left</source>
+        <translation>Esquerda</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="356"/>
         <location filename="../build/ui_mainwindow.h" line="511"/>
         <source>&amp;Next DC</source>
         <translation>Próximo Computador</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="365"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="359"/>
+        <location filename="../build/ui_mainwindow.h" line="512"/>
+        <source>Right</source>
+        <translation>Direita</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="364"/>
         <location filename="../build/ui_mainwindow.h" line="513"/>
         <source>&amp;About Subsurface</source>
         <translation>&amp;Sobre o Subsurface</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="381"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="372"/>
+        <location filename="../build/ui_mainwindow.h" line="514"/>
+        <source>User &amp;manual</source>
+        <translation>Manual</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="375"/>
+        <location filename="../build/ui_mainwindow.h" line="515"/>
+        <source>F1</source>
+        <translation>F1</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="380"/>
         <location filename="../build/ui_mainwindow.h" line="516"/>
         <source>&amp;Globe</source>
         <translation>&amp;Globo</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="403"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="383"/>
+        <location filename="../build/ui_mainwindow.h" line="517"/>
+        <source>Ctrl+5</source>
+        <translation>Ctrl+5</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="388"/>
+        <location filename="../build/ui_mainwindow.h" line="518"/>
+        <source>P&amp;lan dive</source>
+        <translation>Planejador</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="391"/>
+        <location filename="../build/ui_mainwindow.h" line="519"/>
+        <source>Ctrl+L</source>
+        <translation>Ctrl+L</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="396"/>
+        <location filename="../build/ui_mainwindow.h" line="520"/>
+        <source>&amp;Import log files</source>
+        <translation>Importar arquivos de mergulho</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="399"/>
+        <location filename="../build/ui_mainwindow.h" line="522"/>
+        <source>Import divelog files from other applications</source>
+        <translation>Importar arquivos de mergulho de outros programas</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="402"/>
         <location filename="../build/ui_mainwindow.h" line="524"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="408"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="407"/>
         <location filename="../build/ui_mainwindow.h" line="525"/>
         <source>Import &amp;from divelogs.de</source>
         <translation>Importar de &amp;divelogs.de</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="416"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="415"/>
         <location filename="../build/ui_mainwindow.h" line="526"/>
         <source>&amp;Full screen</source>
         <translation>&amp;F Tela Cheia</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="419"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="418"/>
         <location filename="../build/ui_mainwindow.h" line="528"/>
         <source>Toggle full screen</source>
         <translation>Alternar em Tela Cheia</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="447"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="421"/>
+        <location filename="../build/ui_mainwindow.h" line="530"/>
+        <source>F11</source>
+        <translation>F11</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="446"/>
         <location filename="../build/ui_mainwindow.h" line="531"/>
         <source>&amp;Check for updates</source>
         <translation>&amp;Buscar atualizações</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="452"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="451"/>
         <location filename="../build/ui_mainwindow.h" line="532"/>
         <source>&amp;Export</source>
         <translation>&amp;Exportar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="458"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="454"/>
+        <location filename="../build/ui_mainwindow.h" line="534"/>
+        <source>Export dive logs</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="457"/>
         <location filename="../build/ui_mainwindow.h" line="536"/>
         <source>Ctrl+E</source>
         <translation>Ctrl+E</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="466"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="462"/>
+        <location filename="../build/ui_mainwindow.h" line="537"/>
+        <source>Configure &amp;dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="465"/>
         <location filename="../build/ui_mainwindow.h" line="538"/>
         <source>Ctrl+Shift+C</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="474"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="473"/>
         <location filename="../build/ui_mainwindow.h" line="539"/>
         <source>Edit &amp;dive in planner</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="486"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="485"/>
         <location filename="../build/ui_mainwindow.h" line="540"/>
         <source>Toggle pO₂ graph</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="498"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="497"/>
         <location filename="../build/ui_mainwindow.h" line="541"/>
         <source>Toggle pN₂ graph</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="642"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="509"/>
+        <location filename="../build/ui_mainwindow.h" line="542"/>
+        <source>Toggle pHe graph</source>
+        <translation>Alterna gráfico pHe</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="521"/>
+        <location filename="../build/ui_mainwindow.h" line="543"/>
+        <source>Toggle DC reported ceiling</source>
+        <translation>Alterna teto calculado pelo computador</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="533"/>
+        <location filename="../build/ui_mainwindow.h" line="544"/>
+        <source>Toggle calculated ceiling</source>
+        <translation>Alterna teto calculado</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="545"/>
+        <location filename="../build/ui_mainwindow.h" line="545"/>
+        <source>Toggle calculating all tissues</source>
+        <translation>Alterna calcular todos os tecidos</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="557"/>
+        <location filename="../build/ui_mainwindow.h" line="546"/>
+        <source>Toggle calculated ceiling with 3m increments</source>
+        <translation>Alterna teto calculado com incrementos de 3m</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="569"/>
+        <location filename="../build/ui_mainwindow.h" line="547"/>
+        <source>Toggle heart rate</source>
+        <translation>Alterna batimentos cardiacos</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="581"/>
+        <location filename="../build/ui_mainwindow.h" line="548"/>
+        <source>Toggle MOD</source>
+        <translation>alterna MOD</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="593"/>
+        <location filename="../build/ui_mainwindow.h" line="549"/>
+        <source>Toggle EAD, END, EADD</source>
+        <translation>Alterna EAD, END, EADD</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="605"/>
+        <location filename="../build/ui_mainwindow.h" line="550"/>
+        <source>Toggle NDL, TTS</source>
+        <translation>Alterna NDL, TTS</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="617"/>
+        <location filename="../build/ui_mainwindow.h" line="551"/>
+        <source>Toggle SAC rate</source>
+        <translation>alterna taxa SAC</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="629"/>
+        <location filename="../build/ui_mainwindow.h" line="552"/>
+        <source>Toggle ruler</source>
+        <translation>Anternar visualização da régua</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="641"/>
         <location filename="../build/ui_mainwindow.h" line="553"/>
         <source>Scale graph</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="654"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="653"/>
         <location filename="../build/ui_mainwindow.h" line="554"/>
         <source>Toggle pictures</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="666"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="665"/>
         <location filename="../build/ui_mainwindow.h" line="555"/>
         <source>Toggle tank bar</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="674"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="673"/>
         <location filename="../build/ui_mainwindow.h" line="556"/>
         <source>&amp;Filter divelist</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="689"/>
-        <location filename="../build/ui_mainwindow.h" line="558"/>
-        <source>Toggle tissue graph</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="676"/>
+        <location filename="../build/ui_mainwindow.h" line="557"/>
+        <source>Ctrl+F</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="694"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="688"/>
+        <source>Toggle tissue heat-map</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="693"/>
         <location filename="../build/ui_mainwindow.h" line="559"/>
         <source>User &amp;survey</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="699"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="698"/>
         <location filename="../build/ui_mainwindow.h" line="560"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="238"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="231"/>
         <source>&amp;Undo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="702"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="701"/>
         <location filename="../build/ui_mainwindow.h" line="561"/>
         <source>Ctrl+Z</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="707"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="706"/>
         <location filename="../build/ui_mainwindow.h" line="562"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="239"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="232"/>
         <source>&amp;Redo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="710"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="709"/>
         <location filename="../build/ui_mainwindow.h" line="563"/>
         <source>Ctrl+Shift+Z</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="715"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="714"/>
         <location filename="../build/ui_mainwindow.h" line="564"/>
         <source>&amp;Find moved images</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="720"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="719"/>
         <source>Open c&amp;loud storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="725"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="724"/>
         <source>Save to clo&amp;ud storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="730"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="729"/>
         <location filename="../build/ui_mainwindow.h" line="567"/>
         <source>&amp;Manage dive sites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="735"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="734"/>
         <source>Dive Site &amp;Edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="740"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="739"/>
         <source>Facebook</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="745"/>
-        <source>Add GPS location here</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="744"/>
+        <source>Take cloud storage online</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="677"/>
-        <location filename="../build/ui_mainwindow.h" line="557"/>
-        <source>Ctrl+F</source>
+        <location filename="../build/ui_mainwindow.h" line="558"/>
+        <source>Toggle tissue graph</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="213"/>
-        <location filename="../build/ui_mainwindow.h" line="478"/>
-        <source>&amp;Print</source>
-        <translation>&amp;Imprimir</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="224"/>
-        <location filename="../build/ui_mainwindow.h" line="481"/>
-        <source>Ctrl+,</source>
-        <translation>Ctrl+,</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="232"/>
-        <location filename="../build/ui_mainwindow.h" line="482"/>
-        <source>&amp;Quit</source>
-        <translation>&amp;Fechar</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="243"/>
-        <location filename="../build/ui_mainwindow.h" line="484"/>
-        <source>Import from &amp;dive computer</source>
-        <translation>Importar do &amp;computador de mergulho</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="254"/>
-        <location filename="../build/ui_mainwindow.h" line="487"/>
-        <source>Ctrl+G</source>
-        <translation>Ctrl+G</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="267"/>
-        <location filename="../build/ui_mainwindow.h" line="490"/>
-        <source>Ctrl++</source>
-        <translation>Ctrl++</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="293"/>
-        <location filename="../build/ui_mainwindow.h" line="496"/>
-        <source>&amp;Renumber</source>
-        <translation>&amp;Renumerar</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="296"/>
-        <location filename="../build/ui_mainwindow.h" line="497"/>
-        <source>Ctrl+R</source>
-        <translation>Ctrl+R</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="312"/>
-        <location filename="../build/ui_mainwindow.h" line="500"/>
-        <source>Ctrl+Y</source>
-        <translation>Ctrl+Y</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="392"/>
-        <location filename="../build/ui_mainwindow.h" line="519"/>
-        <source>Ctrl+L</source>
-        <translation>Ctrl+L</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="216"/>
-        <location filename="../build/ui_mainwindow.h" line="479"/>
-        <source>Ctrl+P</source>
-        <translation>Ctrl+P</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="235"/>
-        <location filename="../build/ui_mainwindow.h" line="483"/>
-        <source>Ctrl+Q</source>
-        <translation>Ctrl+Q</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="246"/>
-        <location filename="../build/ui_mainwindow.h" line="485"/>
-        <source>Ctrl+D</source>
-        <translation>Ctrl+D</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="264"/>
-        <location filename="../build/ui_mainwindow.h" line="489"/>
-        <source>&amp;Add dive</source>
-        <translation>&amp;Adicionar mergulho</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="304"/>
-        <location filename="../build/ui_mainwindow.h" line="498"/>
-        <source>Auto &amp;group</source>
-        <translation>Auto a&amp;grupar</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="309"/>
-        <location filename="../build/ui_mainwindow.h" line="499"/>
-        <source>&amp;Yearly statistics</source>
-        <translation>Estatisticas Anuais</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="317"/>
-        <location filename="../build/ui_mainwindow.h" line="501"/>
-        <source>&amp;Dive list</source>
-        <translation>Lista de Mergulho</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="320"/>
-        <location filename="../build/ui_mainwindow.h" line="502"/>
-        <source>Ctrl+2</source>
-        <translation>Ctrl+2</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="328"/>
-        <location filename="../build/ui_mainwindow.h" line="504"/>
-        <source>Ctrl+3</source>
-        <translation>Ctrl+3</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="336"/>
-        <location filename="../build/ui_mainwindow.h" line="506"/>
-        <source>Ctrl+4</source>
-        <translation>Ctrl+4</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="344"/>
-        <location filename="../build/ui_mainwindow.h" line="508"/>
-        <source>Ctrl+1</source>
-        <translation>Ctrl+1</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="349"/>
-        <location filename="../build/ui_mainwindow.h" line="509"/>
-        <source>P&amp;revious DC</source>
-        <translation>Computador de mergulho anterior</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="352"/>
-        <location filename="../build/ui_mainwindow.h" line="510"/>
-        <source>Left</source>
-        <translation>Esquerda</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="360"/>
-        <location filename="../build/ui_mainwindow.h" line="512"/>
-        <source>Right</source>
-        <translation>Direita</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="373"/>
-        <location filename="../build/ui_mainwindow.h" line="514"/>
-        <source>User &amp;manual</source>
-        <translation>Manual</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="376"/>
-        <location filename="../build/ui_mainwindow.h" line="515"/>
-        <source>F1</source>
-        <translation>F1</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="384"/>
-        <location filename="../build/ui_mainwindow.h" line="517"/>
-        <source>Ctrl+5</source>
-        <translation>Ctrl+5</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="389"/>
-        <location filename="../build/ui_mainwindow.h" line="518"/>
-        <source>P&amp;lan dive</source>
-        <translation>Planejador</translation>
+        <location filename="../build/ui_mainwindow.h" line="565"/>
+        <source>Open cloud storage</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="397"/>
-        <location filename="../build/ui_mainwindow.h" line="520"/>
-        <source>&amp;Import log files</source>
-        <translation>Importar arquivos de mergulho</translation>
+        <location filename="../build/ui_mainwindow.h" line="566"/>
+        <source>Save to cloud storage</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="400"/>
-        <location filename="../build/ui_mainwindow.h" line="522"/>
-        <source>Import divelog files from other applications</source>
-        <translation>Importar arquivos de mergulho de outros programas</translation>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="331"/>
+        <source>Connect to</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="422"/>
-        <location filename="../build/ui_mainwindow.h" line="530"/>
-        <source>F11</source>
-        <translation>F11</translation>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="493"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="538"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1545"/>
+        <source>Please save or cancel the current dive edit before opening a new file.</source>
+        <translation>Por favor, salve ou cancele a edição atual do mergulho antes de abrir um novo arquivo.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="505"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="499"/>
         <source>Open file</source>
         <translation>Abrir arquivo</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="509"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="503"/>
         <location filename="../desktop-widgets/mainwindow.cpp" line="614"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1972"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1978"/>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
@@ -5244,6 +5343,16 @@ misturados com ar usando:
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="649"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="796"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="977"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="983"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1849"/>
+        <source>Warning</source>
+        <translation>Aviso</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="674"/>
         <source>Please save or cancel the current dive edit before closing the file.</source>
         <translation>Por favor, salve ou cancele a edição atual do mergulho antes de fechar o arquivo.</translation>
@@ -5259,124 +5368,97 @@ misturados com ar usando:
         <translation>Imprimir tabela</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="982"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
+        <source>Trying to replan a dive that&apos;s not a planned dive.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="977"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1849"/>
+        <source>Please, 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="../desktop-widgets/mainwindow.cpp" line="983"/>
         <source>Trying to edit a dive that&apos;s not a manually added dive.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1243"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1030"/>
+        <source>Yearly statistics</source>
+        <translation>Estatisticas Anuais</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1244"/>
         <source>Do you want to save the changes that you made in the file %1?</source>
         <translation>Você quer salvar as alterações que fez no arquivo %1?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1246"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1247"/>
         <source>Do you want to save the changes that you made in the data file?</source>
         <translation>Você quer salvar as alterações feitas no arquivo?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1251"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1252"/>
         <source>Save changes?</source>
         <translation>Salvar Alteraḉões?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1587"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1253"/>
+        <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="../desktop-widgets/mainwindow.cpp" line="1572"/>
         <source>Save file as</source>
         <translation>Salvar arquivo como</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1682"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1573"/>
+        <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
+        <translation>Arquivos XML do Subsurface (*.ssrf *.xml *.XML)</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1670"/>
+        <source>[local cache for] %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1672"/>
         <source>[cloud storage for] %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1782"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1788"/>
         <source>Opening datafile from older version</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1783"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1789"/>
         <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly.
 Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1794"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1800"/>
         <source>Open dive log file</source>
         <translation>Abrir arquivo</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1795"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1801"/>
         <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1972"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1978"/>
         <source>Contacting cloud service...</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1252"/>
-        <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="../desktop-widgets/mainwindow.cpp" line="649"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="796"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="976"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="982"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/>
-        <source>Warning</source>
-        <translation>Aviso</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="499"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="544"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1560"/>
-        <source>Please save or cancel the current dive edit before opening a new file.</source>
-        <translation>Por favor, salve ou cancele a edição atual do mergulho antes de abrir um novo arquivo.</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="338"/>
-        <source>Connect to</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
-        <source>Trying to replan a dive that&apos;s not a planned dive.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1029"/>
-        <source>Yearly statistics</source>
-        <translation>Estatisticas Anuais</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1588"/>
-        <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
-        <translation>Arquivos XML do Subsurface (*.ssrf *.xml *.XML)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="976"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/>
-        <source>Please, 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="../build/ui_mainwindow.h" line="565"/>
-        <source>Open cloud storage</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../build/ui_mainwindow.h" line="566"/>
-        <source>Save to cloud storage</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>MultiFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="733"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="731"/>
         <source>Filter shows %1 (of %2) dives</source>
         <translation type="unfinished"/>
     </message>
@@ -5384,39 +5466,39 @@ Subsurface has already tried to pre-populate the data but it might be worth whil
 <context>
     <name>OstcFirmwareCheck</name>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="269"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="271"/>
         <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="273"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="275"/>
         <source>
 
 Please start Bluetooth on your OSTC Sport and do the same preparations as for a logbook download before continuing with the update</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="274"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="276"/>
         <source>Not now</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="275"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="277"/>
         <source>Update firmware</source>
         <translation>Atualizar firmware</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="277"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="279"/>
         <source>Firmware upgrade notice</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="295"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="297"/>
         <source>Save the downloaded firmware as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="296"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="298"/>
         <source>HEX files (*.hex)</source>
         <translation type="unfinished"/>
     </message>
@@ -5424,79 +5506,89 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PlannerSettingsWidget</name>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="322"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="302"/>
         <source>Open circuit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="322"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="302"/>
         <source>CCR</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="322"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="302"/>
         <source>pSCR</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="421"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="388"/>
         <source>ft/min</source>
         <translation>pés/min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="422"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="389"/>
         <source>Last stop at 20ft</source>
         <translation>Ultima parada em 20 pés</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="423"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="390"/>
         <source>50% avg. depth to 20ft</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="424"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="391"/>
         <source>20ft to surface</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="426"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="392"/>
+        <source>ft</source>
+        <translation>pé(s)</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="394"/>
         <source>m/min</source>
         <translation>m/min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="427"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="395"/>
         <source>Last stop at 6m</source>
         <translation>Ultima parada em 6m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="428"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="396"/>
         <source>50% avg. depth to 6m</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="429"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="397"/>
         <source>6m to surface</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="432"/>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="433"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="398"/>
+        <source>m</source>
+        <translation>m</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="401"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="402"/>
         <source>cuft/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="441"/>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="442"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="410"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="411"/>
         <source>ℓ/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="451"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="420"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="456"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="425"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
@@ -5646,6 +5738,11 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PreferencesDialog</name>
     <message>
+        <location filename="../build/ui_preferences.h" line="1283"/>
+        <source>Preferences</source>
+        <translation>Preferências</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1288"/>
         <source>Defaults</source>
         <translation>Padrões</translation>
@@ -5681,6 +5778,11 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1303"/>
+        <source>Lists and tables</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1304"/>
         <source>Font</source>
         <translation>Fonte</translation>
@@ -5696,6 +5798,11 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>Mergulhos</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1307"/>
+        <source>Default dive log file</source>
+        <translation>Arquivo de log padrão</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1308"/>
         <source>No default file</source>
         <translation type="unfinished"/>
@@ -5726,6 +5833,21 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>...</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1314"/>
+        <source>Display invalid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1316"/>
+        <source>Default cylinder</source>
+        <translation>Cilindro padrão</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1317"/>
+        <source>Use default cylinder</source>
+        <translation>Usar o cilindro padrão</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1318"/>
         <source>Animations</source>
         <translation>Animações</translation>
@@ -5756,42 +5878,26 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>Sistema</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1401"/>
-        <source>Dive site geo lookup</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1402"/>
-        <source>Enable geocoding for dive site management</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1403"/>
-        <source>Parse site without GPS data</source>
+        <location filename="../build/ui_preferences.h" line="1324"/>
+        <source>&amp;Metric</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1404"/>
-        <source>Same format for existing dives</source>
-        <translation type="unfinished"/>
+        <location filename="../build/ui_preferences.h" line="1325"/>
+        <source>Imperial</source>
+        <translation>Imperial</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1405"/>
-        <source>Dive Site Layout</source>
+        <location filename="../build/ui_preferences.h" line="1326"/>
+        <source>Personali&amp;ze</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1406"/>
-        <location filename="../build/ui_preferences.h" line="1407"/>
-        <source>/</source>
+        <location filename="../build/ui_preferences.h" line="1327"/>
+        <source>Individual settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1325"/>
-        <source>Imperial</source>
-        <translation>Imperial</translation>
-    </message>
-    <message>
         <location filename="../build/ui_preferences.h" line="1328"/>
         <source>Depth</source>
         <translation>Profundidade</translation>
@@ -5807,6 +5913,11 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>pé</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1331"/>
+        <source>Pressure</source>
+        <translation>Pressão</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1332"/>
         <location filename="../build/ui_preferences.h" line="1366"/>
         <source>bar</source>
@@ -5818,11 +5929,26 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>psi</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1334"/>
+        <source>Volume</source>
+        <translation>Volume</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1335"/>
+        <source>&amp;liter</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1336"/>
         <source>cu ft</source>
         <translation>pé cúbico</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1337"/>
+        <source>Temperature</source>
+        <translation>Temperatura</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1338"/>
         <source>celsius</source>
         <translation>celsius</translation>
@@ -5833,11 +5959,121 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>fahrenheit</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1340"/>
+        <source>Weight</source>
+        <translation>Peso</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1341"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1342"/>
+        <source>lbs</source>
+        <translation>lbs</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1343"/>
+        <source>Time units</source>
+        <translation>Unidades de tempo</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1344"/>
+        <source>Ascent/descent speed denominator</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1345"/>
+        <source>Minutes</source>
+        <translation>Minutos</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1346"/>
+        <source>Seconds</source>
+        <translation>Segundos</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1347"/>
+        <source>GPS coordinates</source>
+        <translation>Coordenadas do GPS</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1348"/>
+        <source>Location Display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1349"/>
+        <source>traditional (dms)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1350"/>
+        <source>decimal</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1351"/>
+        <source>Show</source>
+        <translation>Mostrar</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1352"/>
+        <source>Threshold when showing pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1353"/>
+        <source>Threshold when showing pN₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1354"/>
+        <source>Threshold when showing pHe</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1355"/>
+        <source>Max pO₂ when showing MOD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1356"/>
+        <source>Draw dive computer reported ceiling red</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1357"/>
+        <source>Show unused cylinders in Equipment tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1358"/>
+        <source>Show average depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1359"/>
+        <source>Misc</source>
+        <translation>Diversos</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1360"/>
+        <source>GFLow</source>
+        <translation>GFlow</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1361"/>
+        <source>GFHigh</source>
+        <translation>GFHigh</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1362"/>
+        <source>GFLow at max depth</source>
+        <translation>GFlow à profundidade máxima</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1363"/>
         <source>CCR: show setpoints when viewing pO₂</source>
         <translation type="unfinished"/>
@@ -5883,14 +6119,19 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>Padrão do sistema</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1374"/>
+        <source>Filter</source>
+        <translation>Filtro</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1375"/>
         <source>Proxy</source>
         <translation>Proxy</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1379"/>
-        <source>Proxy type</source>
-        <translation>Tipo de Proxy</translation>
+        <location filename="../build/ui_preferences.h" line="1376"/>
+        <source>Port</source>
+        <translation>Porta</translation>
     </message>
     <message>
         <location filename="../build/ui_preferences.h" line="1377"/>
@@ -5898,16 +6139,16 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>Host</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1376"/>
-        <source>Port</source>
-        <translation>Porta</translation>
-    </message>
-    <message>
         <location filename="../build/ui_preferences.h" line="1378"/>
         <source>Requires authentication</source>
         <translation>Requer Autenticação</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1379"/>
+        <source>Proxy type</source>
+        <translation>Tipo de Proxy</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1380"/>
         <source>Username</source>
         <translation>Nome de usuario</translation>
@@ -5919,46 +6160,6 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>Senha</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1400"/>
-        <source>Disconnect from Facebook</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1374"/>
-        <source>Filter</source>
-        <translation>Filtro</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1331"/>
-        <source>Pressure</source>
-        <translation>Pressão</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1303"/>
-        <source>Lists and tables</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1307"/>
-        <source>Default dive log file</source>
-        <translation>Arquivo de log padrão</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1314"/>
-        <source>Display invalid</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1316"/>
-        <source>Default cylinder</source>
-        <translation>Cilindro padrão</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1317"/>
-        <source>Use default cylinder</source>
-        <translation>Usar o cilindro padrão</translation>
-    </message>
-    <message>
         <location filename="../build/ui_preferences.h" line="1382"/>
         <source>Subsurface cloud storage</source>
         <translation type="unfinished"/>
@@ -5999,150 +6200,41 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1334"/>
-        <source>Volume</source>
-        <translation>Volume</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1337"/>
-        <source>Temperature</source>
-        <translation>Temperatura</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1340"/>
-        <source>Weight</source>
-        <translation>Peso</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1342"/>
-        <source>lbs</source>
-        <translation>lbs</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1343"/>
-        <source>Time units</source>
-        <translation>Unidades de tempo</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1345"/>
-        <source>Minutes</source>
-        <translation>Minutos</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1346"/>
-        <source>Seconds</source>
-        <translation>Segundos</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1351"/>
-        <source>Show</source>
-        <translation>Mostrar</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1362"/>
-        <source>GFLow at max depth</source>
-        <translation>GFlow à profundidade máxima</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1359"/>
-        <source>Misc</source>
-        <translation>Diversos</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1283"/>
-        <source>Preferences</source>
-        <translation>Preferências</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1324"/>
-        <source>&amp;Metric</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1326"/>
-        <source>Personali&amp;ze</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1327"/>
-        <source>Individual settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1335"/>
-        <source>&amp;liter</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1344"/>
-        <source>Ascent/descent speed denominator</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1347"/>
-        <source>GPS coordinates</source>
-        <translation>Coordenadas do GPS</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1348"/>
-        <source>Location Display</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1349"/>
-        <source>traditional (dms)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1350"/>
-        <source>decimal</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1352"/>
-        <source>Threshold when showing pO₂</source>
+        <location filename="../build/ui_preferences.h" line="1400"/>
+        <source>Disconnect from Facebook</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1353"/>
-        <source>Threshold when showing pN₂</source>
+        <location filename="../build/ui_preferences.h" line="1401"/>
+        <source>Dive site geo lookup</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1354"/>
-        <source>Threshold when showing pHe</source>
+        <location filename="../build/ui_preferences.h" line="1402"/>
+        <source>Enable geocoding for dive site management</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1355"/>
-        <source>Max pO₂ when showing MOD</source>
+        <location filename="../build/ui_preferences.h" line="1403"/>
+        <source>Parse site without GPS data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1356"/>
-        <source>Draw dive computer reported ceiling red</source>
+        <location filename="../build/ui_preferences.h" line="1404"/>
+        <source>Same format for existing dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1357"/>
-        <source>Show unused cylinders in Equipment tab</source>
+        <location filename="../build/ui_preferences.h" line="1405"/>
+        <source>Dive Site Layout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1358"/>
-        <source>Show average depth</source>
+        <location filename="../build/ui_preferences.h" line="1406"/>
+        <location filename="../build/ui_preferences.h" line="1407"/>
+        <source>/</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1360"/>
-        <source>GFLow</source>
-        <translation>GFlow</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1361"/>
-        <source>GFHigh</source>
-        <translation>GFHigh</translation>
-    </message>
 </context>
 <context>
     <name>PreferencesGeoreference</name>
@@ -6197,106 +6289,136 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="20"/>
-        <source>Show</source>
-        <translation>Mostrar</translation>
+        <source>Gas pressure display setup</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="29"/>
-        <source>Threshold when showing pO₂</source>
+        <source>Threshold for pO₂ (bar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="49"/>
-        <source>Threshold when showing pN₂</source>
+        <source>Threshold for pN₂ (bar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="69"/>
-        <source>Threshold when showing pHe</source>
+        <source>Threshold for pHe (bar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="89"/>
-        <source>Max pO₂ when showing MOD</source>
+        <source>pO₂ in calculating MOD (bar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="109"/>
-        <source>Draw dive computer reported ceiling red</source>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="106"/>
+        <source>CCR options:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="116"/>
-        <source>Show unused cylinders in Equipment tab</source>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="113"/>
+        <source>Dive planner default setpoint (bar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="123"/>
-        <source>Show mean depth</source>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="133"/>
+        <source>Show setpoints when viewing pO₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="133"/>
-        <source>Misc</source>
-        <translation>Diversos</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="140"/>
+        <source>Show individual O₂ sensor values when viewing pO₂</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="149"/>
-        <source>bar</source>
-        <translation>bar</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="150"/>
+        <source>Ceiling display setup</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="165"/>
-        <source>Default CCR set-point for dive planning</source>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="159"/>
+        <source>Draw dive computer reported ceiling red</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="172"/>
-        <source>pSCR O₂ metabolism rate</source>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="169"/>
+        <source>Algorithm for calculated ceiling:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="179"/>
-        <source>GFLow</source>
-        <translation>GFlow</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="176"/>
+        <source>VPM-B</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="186"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="183"/>
+        <source>VPM-B Conservatism</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="193"/>
+        <source>+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="206"/>
+        <source>Bühlmann</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="216"/>
         <source>GFHigh</source>
         <translation>GFHigh</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="203"/>
-        <source>ℓ/min</source>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="236"/>
+        <source>GFLow</source>
+        <translation>GFlow</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="256"/>
+        <source>GFLow at max depth</source>
+        <translation>GFlow à profundidade máxima</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="263"/>
+        <source>pSCR options:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="213"/>
-        <source>pSCR ratio</source>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="270"/>
+        <source>Metabolic rate (ℓ O₂/min)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="223"/>
-        <source>1:</source>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="287"/>
+        <source>Dilution ratio</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="230"/>
-        <source>CCR: show individual O₂ sensor values when viewing pO₂</source>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="300"/>
+        <source>1:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="237"/>
-        <source>CCR: show setpoints when viewing pO₂</source>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="310"/>
+        <source>Misc</source>
+        <translation>Diversos</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="316"/>
+        <source>Show unused cylinders in Equipment tab</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="244"/>
-        <source>GFLow at max depth</source>
-        <translation>GFlow à profundidade máxima</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="323"/>
+        <source>Show mean depth in Profile</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="10"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="9"/>
         <source>Graph</source>
         <translation>Gráfico</translation>
     </message>
@@ -6365,15 +6487,29 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>Língua</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="57"/>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="53"/>
         <source>Restart required</source>
         <translation>Reinicialização necessária</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="58"/>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="54"/>
         <source>To correctly load a new language you must restart Subsurface.</source>
         <translation>Para carregar corretamente uma nova língua você deve reiniciar o Subsurface.</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="76"/>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="82"/>
+        <source>Literal characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="77"/>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="83"/>
+        <source>Non-special character(s) in time format.
+These will be used as is. This might not be what you intended.
+See http://doc.qt.io/qt-5/qdatetime.html#toString</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PreferencesNetwork</name>
@@ -6420,7 +6556,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_network.ui" line="156"/>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="148"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="134"/>
         <source>Subsurface cloud storage</source>
         <translation type="unfinished"/>
     </message>
@@ -6465,39 +6601,39 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="11"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="10"/>
         <source>Network</source>
         <translation>Rede</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="15"/>
         <source>No proxy</source>
         <translation>Sem proxy</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/>
         <source>System proxy</source>
         <translation>Proxy do sistema</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/>
         <source>HTTP proxy</source>
         <translation>Proxy HTTP</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="19"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/>
         <source>SOCKS proxy</source>
         <translation>Proxy SOCKS</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="75"/>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="97"/>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="110"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="72"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="93"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="106"/>
         <source>Cloud storage email and password can only consist of letters, numbers, and &apos;.&apos;, &apos;-&apos;, &apos;_&apos;, and &apos;+&apos;.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="146"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="132"/>
         <source>Subsurface cloud storage (credentials verified)</source>
         <translation type="unfinished"/>
     </message>
@@ -6655,7 +6791,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="8"/>
+        <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="7"/>
         <source>Units</source>
         <translation>Unidades</translation>
     </message>
@@ -6663,17 +6799,17 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PrintDialog</name>
     <message>
-        <location filename="../desktop-widgets/printdialog.cpp" line="118"/>
-        <source>&amp;Preview</source>
-        <translation>&amp;Prévisualizar</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/printdialog.cpp" line="115"/>
+        <location filename="../desktop-widgets/printdialog.cpp" line="102"/>
         <source>P&amp;rint</source>
         <translation>Imp&amp;rimir</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/printdialog.cpp" line="130"/>
+        <location filename="../desktop-widgets/printdialog.cpp" line="105"/>
+        <source>&amp;Preview</source>
+        <translation>&amp;Prévisualizar</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/printdialog.cpp" line="117"/>
         <source>Print</source>
         <translation>Imprimir</translation>
     </message>
@@ -6681,19 +6817,10 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PrintOptions</name>
     <message>
-        <location filename="../build/ui_printoptions.h" line="150"/>
-        <source>&amp;Table print</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../build/ui_printoptions.h" line="158"/>
-        <source>One dive per page</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../build/ui_printoptions.h" line="159"/>
-        <source>Two dives per page</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/printoptions.ui" line="29"/>
+        <location filename="../build/ui_printoptions.h" line="148"/>
+        <source>Print type</source>
+        <translation>Tipo de impressão</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/printoptions.ui" line="41"/>
@@ -6753,10 +6880,19 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/printoptions.ui" line="29"/>
-        <location filename="../build/ui_printoptions.h" line="148"/>
-        <source>Print type</source>
-        <translation>Tipo de impressão</translation>
+        <location filename="../build/ui_printoptions.h" line="150"/>
+        <source>&amp;Table print</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../build/ui_printoptions.h" line="158"/>
+        <source>One dive per page</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../build/ui_printoptions.h" line="159"/>
+        <source>Two dives per page</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/printoptions.cpp" line="128"/>
@@ -6798,103 +6934,103 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="755"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="752"/>
         <source>Show NDL / TTS was disabled because of excessive processing time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1344"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1338"/>
         <source>Make first divecomputer</source>
         <translation>Marcar como primeiro computador de mergulho</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1346"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1340"/>
         <source>Delete this divecomputer</source>
         <translation>Apagar este computador de mergulho</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1360"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1354"/>
         <source>Add gas change</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1363"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1357"/>
         <source> (Tank %1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1371"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1365"/>
         <source>Add set-point change</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1373"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1367"/>
         <source>Add bookmark</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1377"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1371"/>
         <source>Edit the profile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1381"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1375"/>
         <source>Remove event</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1386"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1380"/>
         <source>Hide similar events</source>
         <translation>Esconder eventos semelhantes</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1393"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1387"/>
         <source>Edit name</source>
         <translation>Editar nome</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1422"/>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1429"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1416"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1423"/>
         <source>Adjust pressure of tank %1 (currently interpolated as %2)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1444"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1438"/>
         <source>Unhide all events</source>
         <translation>Mostrar todos os eventos</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1479"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1473"/>
         <source>Hide events</source>
         <translation>Ocultar eventos</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1479"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1473"/>
         <source>Hide all %1 events?</source>
         <translation>Esconder todos os %1 eventos?</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1514"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1508"/>
         <source>Remove the selected event?</source>
         <translation>Remover o evento selecionado?</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1515"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1509"/>
         <source>%1 @ %2:%3</source>
         <translation>%1 @ %2:%3</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1638"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1632"/>
         <source>Edit name of bookmark</source>
         <translation>Editar nome do favorito</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1639"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1633"/>
         <source>Custom name:</source>
         <translation>Apelido:</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1644"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1638"/>
         <source>Name is too long!</source>
         <translation type="unfinished"/>
     </message>
@@ -6902,91 +7038,101 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>QMLManager</name>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="95"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="97"/>
         <source>Starting...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="202"/>
         <source>working in no-cloud mode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="213"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="216"/>
         <source>no cloud credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="214"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="270"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="217"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="269"/>
         <source>Please enter valid cloud credentials.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="285"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="284"/>
         <source>Attempting to open cloud storage with new credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="304"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="306"/>
         <source>Testing cloud credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="331"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="320"/>
+        <source>No response from cloud server to validate the credentials</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="329"/>
+        <source>Cannot connect to cloud storage - cloud account not verified</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="361"/>
         <source>Cloud credentials are invalid</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="344"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="374"/>
         <source>Cannot open cloud storage: Error creating https connection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="357"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="387"/>
         <source>Cannot open cloud storage: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="369"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="399"/>
         <source>Cannot connect to cloud storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="411"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="441"/>
         <source>Cloud storage error: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="501"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="531"/>
         <source>Failed to connect to cloud server, reverting to no cloud status</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="520"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="550"/>
         <source>Cloud storage open successfully. No dives in dive list.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="689"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="690"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="721"/>
         <source>h</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="689"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="690"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="691"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="721"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="722"/>
         <source>min</source>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="689"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/>
         <source>sec</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="1041"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="1102"/>
         <source>Unknown GPS location</source>
         <translation type="unfinished"/>
     </message>
@@ -6994,126 +7140,126 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../core/qthelper.cpp" line="866"/>
-        <location filename="../core/qthelper.cpp" line="1214"/>
-        <source>AIR</source>
-        <translation>AR</translation>
+        <location filename="../core/gpslocation.h" line="13"/>
+        <source>Waiting to aquire GPS location</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="1214"/>
-        <source>OXYGEN</source>
-        <translation type="unfinished"/>
+        <location filename="../core/qthelper.cpp" line="766"/>
+        <location filename="../core/qthelper.cpp" line="1275"/>
+        <source>m</source>
+        <translation>m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="59"/>
-        <source>Remove this point</source>
-        <translation type="unfinished"/>
+        <location filename="../core/qthelper.cpp" line="768"/>
+        <location filename="../core/qthelper.cpp" line="1274"/>
+        <source>ft</source>
+        <translation>pé(s)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="32"/>
-        <source>Average</source>
-        <translation>Média</translation>
+        <location filename="../core/qthelper.cpp" line="794"/>
+        <source>C</source>
+        <translation>C</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="35"/>
-        <source>Minimum</source>
-        <translation>Mínimo</translation>
+        <location filename="../core/qthelper.cpp" line="796"/>
+        <source>F</source>
+        <translation>F</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="38"/>
-        <source>Maximum</source>
-        <translation>Máximo</translation>
+        <location filename="../core/qthelper.cpp" line="821"/>
+        <location filename="../core/qthelper.cpp" line="1250"/>
+        <source>kg</source>
+        <translation>kg</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/globe.cpp" line="327"/>
-        <source>Move the map and double-click to set the dive location</source>
-        <translation>Mova o mapa e dê um duplo clique para definir a localização do ponto de mergulho.</translation>
+        <location filename="../core/qthelper.cpp" line="823"/>
+        <location filename="../core/qthelper.cpp" line="1251"/>
+        <source>lbs</source>
+        <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="28"/>
-        <source>unknown</source>
-        <translation>desconhecido</translation>
+        <location filename="../core/qthelper.cpp" line="848"/>
+        <location filename="../core/qthelper.cpp" line="1300"/>
+        <source>bar</source>
+        <translation>bar</translation>
     </message>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="105"/>
-        <source>h:</source>
-        <translation>h:</translation>
+        <location filename="../core/qthelper.cpp" line="850"/>
+        <location filename="../core/qthelper.cpp" line="1299"/>
+        <source>psi</source>
+        <translation>psi</translation>
     </message>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="105"/>
-        <source>min</source>
-        <translation>min</translation>
+        <location filename="../core/qthelper.cpp" line="871"/>
+        <location filename="../core/qthelper.cpp" line="1235"/>
+        <source>AIR</source>
+        <translation>AR</translation>
     </message>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="337"/>
-        <source>Multiple</source>
+        <location filename="../core/qthelper.cpp" line="873"/>
+        <source>EAN</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="../core/qthelper.cpp" line="957"/>
+        <location filename="../core/qthelper.cpp" line="962"/>
         <source>(%n dive(s))</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="816"/>
-        <location filename="../core/qthelper.cpp" line="1228"/>
-        <source>kg</source>
-        <translation>kg</translation>
+        <location filename="../core/qthelper.cpp" line="1235"/>
+        <source>OXYGEN</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="818"/>
-        <location filename="../core/qthelper.cpp" line="1229"/>
-        <source>lbs</source>
-        <translation>lbs</translation>
+        <location filename="../core/qthelper.cpp" line="1322"/>
+        <source>l</source>
+        <translation>l</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="763"/>
-        <location filename="../core/qthelper.cpp" line="1252"/>
-        <source>ft</source>
-        <translation>pé(s)</translation>
+        <location filename="../core/qthelper.cpp" line="1323"/>
+        <source>cuft</source>
+        <translation>pés cúbicos</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="761"/>
-        <location filename="../core/qthelper.cpp" line="1253"/>
-        <source>m</source>
-        <translation>m</translation>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="29"/>
+        <source>unknown</source>
+        <translation>desconhecido</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="789"/>
-        <source>C</source>
-        <translation>C</translation>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="114"/>
+        <source>h:</source>
+        <translation>h:</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="791"/>
-        <source>F</source>
-        <translation>F</translation>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="114"/>
+        <source>min</source>
+        <translation>min</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="845"/>
-        <location filename="../core/qthelper.cpp" line="1275"/>
-        <source>psi</source>
-        <translation>psi</translation>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="63"/>
+        <source>Remove this point</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="843"/>
-        <location filename="../core/qthelper.cpp" line="1276"/>
-        <source>bar</source>
-        <translation>bar</translation>
+        <location filename="../desktop-widgets/globe.cpp" line="327"/>
+        <source>Move the map and double-click to set the dive location</source>
+        <translation>Mova o mapa e dê um duplo clique para definir a localização do ponto de mergulho.</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="868"/>
-        <source>EAN</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="32"/>
+        <source>Average</source>
+        <translation>Média</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="1298"/>
-        <source>l</source>
-        <translation>l</translation>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="35"/>
+        <source>Minimum</source>
+        <translation>Mínimo</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="1299"/>
-        <source>cuft</source>
-        <translation>pés cúbicos</translation>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="38"/>
+        <source>Maximum</source>
+        <translation>Máximo</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="625"/>
@@ -7135,17 +7281,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <source>Malformed XML response. Line %1: %2</source>
         <translation>Resposta XML defeituosa. Linha %1: %2</translation>
     </message>
-    <message>
-        <location filename="../core/gpslocation.h" line="13"/>
-        <source>Waiting to aquire GPS location</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>ReadSettingsThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1651"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1676"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1640"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1665"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation type="unfinished"/>
     </message>
@@ -7174,7 +7315,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ResetSettingsThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1775"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1764"/>
         <source>Reset settings failed!</source>
         <translation type="unfinished"/>
     </message>
@@ -7212,6 +7353,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ShiftImageTimesDialog</name>
     <message>
+        <location filename="../desktop-widgets/shiftimagetimes.ui" line="23"/>
+        <location filename="../build/ui_shiftimagetimes.h" line="184"/>
+        <source>Shift selected image times</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/shiftimagetimes.ui" line="34"/>
         <location filename="../build/ui_shiftimagetimes.h" line="185"/>
         <source>Shift times of image(s) by</source>
@@ -7224,12 +7371,6 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>h:mm</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/shiftimagetimes.ui" line="23"/>
-        <location filename="../build/ui_shiftimagetimes.h" line="184"/>
-        <source>Shift selected image times</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/shiftimagetimes.ui" line="105"/>
         <location filename="../build/ui_shiftimagetimes.h" line="187"/>
         <source>Earlier</source>
@@ -7279,12 +7420,12 @@ Not all images have timestamps in the range between
         <translation>Qual dia e hora são mostrados na imagem?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="297"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="296"/>
         <source>Open image file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="299"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="298"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>Imagens (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -7442,49 +7583,49 @@ Not all images have timestamps in the range between
 <context>
     <name>SocialNetworkDialog</name>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="339"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="284"/>
         <source>Dive date: %1 
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="342"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="287"/>
         <source>Duration: %1 
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="343"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="288"/>
         <source>h:</source>
         <comment>abbreviation for hours plus separator</comment>
         <translation>h:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="344"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="289"/>
         <source>min</source>
         <comment>abbreviation for minutes</comment>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="347"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="292"/>
         <source>Dive location: %1 
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="350"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="295"/>
         <source>Buddy: %1 
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="353"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="298"/>
         <source>Divemaster: %1 
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="356"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="301"/>
         <source>
 %1</source>
         <translation type="unfinished"/>
@@ -7569,9 +7710,20 @@ Not all images have timestamps in the range between
     <name>StartPage</name>
     <message>
         <location filename="../mobile-widgets/qml/StartPage.qml" line="19"/>
-        <source>To use Subsurface-mobile with Subsurface cloud storage, please enteryour cloud credentials.
+        <source>To use Subsurface-mobile with Subsurface cloud storage, please enter your cloud credentials.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/StartPage.qml" line="20"/>
+        <source>If this is the first time you use Subsurface cloud storage, enter a valid email (all lower case) and a password of your choice (letters and numbers). The server will send a PIN to the email address provided that you will have to enter here.
 
-To use Subsurface-mobile only with local data on this device, tap on the no cloud icon below.</source>
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/StartPage.qml" line="23"/>
+        <source>To use Subsurface-mobile only with local data on this device, tap on the no cloud icon below.</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -7610,7 +7762,12 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>SubsurfaceWebServices</name>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="419"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="395"/>
+        <source>Enter User ID and click Download</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="417"/>
         <source>Webservice</source>
         <translation>Serviço web</translation>
     </message>
@@ -7635,30 +7792,25 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="557"/>
-        <source>Download successful</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="551"/>
         <source>Invalid user identifier!</source>
         <translation>Identificador de usuário inválido!</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="397"/>
-        <source>Enter User ID and click Download</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="554"/>
         <source>Cannot parse response!</source>
         <translation>Não é possível analisar a resposta!</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="557"/>
+        <source>Download successful</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>SuitFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="674"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="672"/>
         <source>Suits: </source>
         <translation type="unfinished"/>
     </message>
@@ -7666,7 +7818,7 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>SuitsFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="123"/>
+        <location filename="../qt-models/filtermodels.cpp" line="128"/>
         <source>No suit set</source>
         <translation type="unfinished"/>
     </message>
@@ -7685,7 +7837,7 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>TagFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="595"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="593"/>
         <source>Tags: </source>
         <translation type="unfinished"/>
     </message>
@@ -7693,7 +7845,7 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>TagFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="148"/>
+        <location filename="../qt-models/filtermodels.cpp" line="153"/>
         <source>Empty tags</source>
         <translation type="unfinished"/>
     </message>
@@ -7719,6 +7871,11 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>TemplateEdit</name>
     <message>
+        <location filename="../desktop-widgets/templateedit.ui" line="14"/>
+        <source>Edit template</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/templateedit.ui" line="37"/>
         <source>Preview</source>
         <translation type="unfinished"/>
@@ -7764,11 +7921,6 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
         <translation>Tamanho da fonte</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/templateedit.ui" line="14"/>
-        <source>Edit template</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/templateedit.ui" line="165"/>
         <source>Color palette</source>
         <translation type="unfinished"/>
@@ -7950,85 +8102,12 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>TextHyperlinkEventFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="817"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="815"/>
         <source>%1click to visit %2</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>ThemeTest</name>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="29"/>
-        <source>Theme Information</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="33"/>
-        <source>Screen</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="42"/>
-        <source>Geometry (pixels):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="49"/>
-        <source>Geometry (gridUnits):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="56"/>
-        <source>Units.gridUnit:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="63"/>
-        <source>Units.devicePixelRatio:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="70"/>
-        <source>Font Metrics</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="76"/>
-        <source>FontMetrics pointSize:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="83"/>
-        <source>FontMetrics pixelSize:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="90"/>
-        <source>FontMetrics devicePixelRatio:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="97"/>
-        <source>Text item pixelSize:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="104"/>
-        <source>Text item pointSize:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="111"/>
-        <source>Pixel density:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="118"/>
-        <source>Height of default font:</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
     <name>ToolTipItem</name>
     <message>
         <location filename="../profile-widget/divetooltipitem.cpp" line="136"/>
@@ -8039,102 +8118,107 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>TripItem</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="67"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="68"/>
         <source>(%1 shown)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="194"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
         <source>#</source>
         <translation>nº</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="197"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="215"/>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="200"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="218"/>
         <source>Rating</source>
         <translation>Classificação</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
         <source>Depth(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
         <source>ft</source>
         <translation>pé(s)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="206"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="224"/>
         <source>Duration</source>
         <translation>Duração</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="209"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="227"/>
         <source>Temp(%1%2)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
         <source>Weight(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="215"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="233"/>
         <source>Suit</source>
         <translation>Roupa</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="218"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="236"/>
         <source>Cyl</source>
         <translation>Cilindro</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="239"/>
         <source>Gas</source>
         <translation>Gás</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="244"/>
         <source>SAC(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="244"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="229"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="247"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="232"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="250"/>
         <source>Max CNS</source>
         <translation>CNS Máximo</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="235"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="253"/>
+        <source>Photos before/during/after dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="256"/>
         <source>Location</source>
         <translation>Local</translation>
     </message>
@@ -8157,72 +8241,73 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>UpdateManager</name>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="69"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="61"/>
         <source>Check for updates.</source>
         <translation>Buscar atualizações.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="70"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="62"/>
         <source>Subsurface was unable to check for updates.</source>
         <translation>Subsurface não conseguiu localizar atualizações</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="75"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="67"/>
         <source>The following error occurred:</source>
         <translation>O seguinte erro ocorreu</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="76"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="68"/>
         <source>Please check your internet connection.</source>
         <translation>Por favor, verifique sua conexão a internet</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="86"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="78"/>
         <source>You are using the latest version of Subsurface.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="89"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="81"/>
         <source>A new version of Subsurface is available.&lt;br/&gt;Click on:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; to download it.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="95"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="87"/>
         <source>A new version of Subsurface is available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="96"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="88"/>
         <source>Latest version is %1, please check %2 our download page %3 for information in how to update.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="106"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="98"/>
         <source>Newest release version is </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="107"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="99"/>
         <source>The server returned the following information:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="125"/>
-        <source>Subsurface is checking every two weeks if a new version is available. If you don&apos;t want Subsurface to continue checking, please click Decline.</source>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="117"/>
+        <source>Subsurface is checking every two weeks if a new version is available. 
+ If you don&apos;t want Subsurface to continue checking, please click Decline.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="126"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="119"/>
         <source>Decline</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="127"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="120"/>
         <source>Accept</source>
         <translation>Aceitar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="129"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="122"/>
         <source>Automatic check for updates</source>
         <translation>Buscar atualizações automaticamente</translation>
     </message>
@@ -8244,24 +8329,6 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>UserSurvey</name>
     <message>
-        <location filename="../desktop-widgets/usersurvey.ui" line="44"/>
-        <location filename="../build/ui_usersurvey.h" line="151"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;We would love to learn more about our users, their preferences and their usage habits. Please spare a minute to fill out this form and submit it to the Subsurface team.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/usersurvey.ui" line="115"/>
-        <location filename="../build/ui_usersurvey.h" line="156"/>
-        <source>Other software/sources</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/usersurvey.ui" line="128"/>
-        <location filename="../build/ui_usersurvey.h" line="157"/>
-        <source>Manually entering dives</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="14"/>
         <location filename="../build/ui_usersurvey.h" line="149"/>
         <source>User survey</source>
@@ -8274,6 +8341,12 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/usersurvey.ui" line="44"/>
+        <location filename="../build/ui_usersurvey.h" line="151"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;We would love to learn more about our users, their preferences and their usage habits. Please spare a minute to fill out this form and submit it to the Subsurface team.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="63"/>
         <location filename="../build/ui_usersurvey.h" line="152"/>
         <source>Technical diver</source>
@@ -8298,6 +8371,18 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/usersurvey.ui" line="115"/>
+        <location filename="../build/ui_usersurvey.h" line="156"/>
+        <source>Other software/sources</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/usersurvey.ui" line="128"/>
+        <location filename="../build/ui_usersurvey.h" line="157"/>
+        <source>Manually entering dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="141"/>
         <location filename="../build/ui_usersurvey.h" line="158"/>
         <source>Android/iPhone companion app</source>
@@ -8328,6 +8413,11 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/usersurvey.cpp" line="18"/>
+        <source>Send</source>
+        <translation>Enviar</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/usersurvey.cpp" line="43"/>
         <source>
 Operating system: %1</source>
@@ -8368,19 +8458,14 @@ Lingua: %1</translation>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/usersurvey.cpp" line="101"/>
-        <source>Submit user survey.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/usersurvey.cpp" line="82"/>
         <source>Ask again?</source>
         <translation>Perguntar depois?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/usersurvey.cpp" line="18"/>
-        <source>Send</source>
-        <translation>Enviar</translation>
+        <location filename="../desktop-widgets/usersurvey.cpp" line="101"/>
+        <source>Submit user survey.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/usersurvey.cpp" line="102"/>
@@ -8472,12 +8557,12 @@ Lingua: %1</translation>
         <translation>Enviar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="324"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="325"/>
         <source>Operation timed out</source>
         <translation>Tempo limite para operação estourou</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="345"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="346"/>
         <source>Transferring data...</source>
         <translation type="unfinished"/>
     </message>
@@ -8512,16 +8597,16 @@ Lingua: %1</translation>
 <context>
     <name>WriteSettingsThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1702"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1709"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1718"/>
-        <source>Failed!</source>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1689"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1710"/>
+        <source>This feature is not yet available for the selected dive computer.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1700"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1721"/>
-        <source>This feature is not yet available for the selected dive computer.</source>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1691"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1698"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1707"/>
+        <source>Failed!</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -8648,7 +8733,7 @@ Médio</translation>
 <context>
     <name>getextFromC</name>
     <message>
-        <location filename="../core/libdivecomputer.c" line="674"/>
+        <location filename="../core/libdivecomputer.c" line="737"/>
         <source>Error parsing the header</source>
         <translation type="unfinished"/>
     </message>
@@ -8656,38 +8741,377 @@ Médio</translation>
 <context>
     <name>gettextFromC</name>
     <message>
+        <location filename="../core/cochran.c" line="309"/>
+        <location filename="../core/cochran.c" line="315"/>
+        <location filename="../core/cochran.c" line="385"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>deco stop</source>
+        <translation>parada de deco</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="336"/>
+        <location filename="../core/cochran.c" line="390"/>
+        <location filename="../core/file.c" line="777"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>ascent</source>
+        <translation>subida</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="342"/>
+        <location filename="../core/file.c" line="755"/>
+        <source>battery</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="348"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
+        <source>OLF</source>
+        <translation>OLF</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="353"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
+        <source>maxdepth</source>
+        <translation>prof máx</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="358"/>
+        <location filename="../core/cochran.c" line="404"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
+        <source>pO₂</source>
+        <translation>pO₂</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="365"/>
+        <location filename="../core/cochran.c" line="414"/>
+        <location filename="../core/cochran.c" line="421"/>
+        <location filename="../core/file.c" line="868"/>
+        <location filename="../core/libdivecomputer.c" line="225"/>
+        <location filename="../core/libdivecomputer.c" line="228"/>
+        <source>gaschange</source>
+        <translation>troca de gás</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="370"/>
+        <location filename="../core/cochran.c" line="409"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>rbt</source>
+        <translation>rbt</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="379"/>
+        <location filename="../core/cochran.c" line="426"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>ceiling</source>
+        <translation>teto</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="395"/>
+        <location filename="../core/libdivecomputer.c" line="224"/>
+        <source>transmitter</source>
+        <translation>transmissor</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="153"/>
+        <source>Error: the file does not appear to be a DATATRAK divelog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="286"/>
+        <source>clear</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="289"/>
+        <source>misty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="292"/>
+        <source>fog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="295"/>
+        <source>rain</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="298"/>
+        <source>storm</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="301"/>
+        <source>snow</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="321"/>
+        <source>No suit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="324"/>
+        <source>Shorty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="327"/>
+        <source>Combi</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="330"/>
+        <source>Wet suit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="333"/>
+        <source>Semidry suit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="336"/>
+        <source>Dry suit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="396"/>
+        <source>no stop</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="398"/>
+        <location filename="../core/dive.c" line="29"/>
+        <source>deco</source>
+        <translation>deco</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="400"/>
+        <source>single ascent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="402"/>
+        <source>multiple ascent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="404"/>
+        <location filename="../core/dive.c" line="27"/>
+        <source>fresh</source>
+        <translation>água doce</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="406"/>
+        <source>salt water</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="431"/>
+        <source>sight seeing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="433"/>
+        <source>club dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="435"/>
+        <location filename="../core/dive.c" line="28"/>
+        <source>instructor</source>
+        <translation>instrutor</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="437"/>
+        <source>instruction</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="439"/>
+        <location filename="../core/dive.c" line="27"/>
+        <source>night</source>
+        <translation>noturno</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="441"/>
+        <location filename="../core/dive.c" line="25"/>
+        <source>cave</source>
+        <translation>caverna</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="443"/>
+        <location filename="../core/dive.c" line="24"/>
+        <source>ice</source>
+        <translation>gelo</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="445"/>
+        <source>search</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="455"/>
+        <location filename="../core/dive.c" line="25"/>
+        <source>wreck</source>
+        <translation>naufrágio</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="457"/>
+        <location filename="../core/dive.c" line="26"/>
+        <source>river</source>
+        <translation>rio</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="459"/>
+        <location filename="../core/dive.c" line="23"/>
+        <source>drift</source>
+        <translation>correnteza</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="461"/>
+        <location filename="../core/dive.c" line="28"/>
+        <source>photo</source>
+        <translation>foto</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="463"/>
+        <source>other</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="474"/>
+        <source>Other activities</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="498"/>
+        <source>Datatrak/Wlog notes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="537"/>
+        <source>Manually entered dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="588"/>
+        <source>Unknown</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="674"/>
+        <source>Error: couldn&apos;t open the file %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="687"/>
+        <source>Error: no dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="23"/>
+        <source>boat</source>
+        <translation>barco</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="23"/>
+        <source>shore</source>
+        <translation>costa</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="24"/>
+        <source>deep</source>
+        <translation>profundo</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="24"/>
+        <source>cavern</source>
+        <translation>gruta (com luz natural)</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="25"/>
+        <source>altitude</source>
+        <translation>altitude</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="26"/>
+        <source>pool</source>
+        <translation>piscina</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="26"/>
+        <source>lake</source>
+        <translation>lago</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="27"/>
+        <source>student</source>
+        <translation>aluno</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="28"/>
+        <source>video</source>
+        <translation>vídeo</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="33"/>
+        <source>OC-gas</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="33"/>
+        <source>diluent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="33"/>
+        <location filename="../core/equipment.c" line="88"/>
+        <location filename="../core/planner.c" line="1436"/>
+        <location filename="../core/planner.c" line="1439"/>
+        <source>oxygen</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../core/dive.c" line="181"/>
         <source>pascal</source>
         <translation>pascal</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="186"/>
-        <location filename="../core/qthelper.cpp" line="669"/>
+        <location filename="../core/qthelper.cpp" line="674"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="190"/>
-        <location filename="../core/qthelper.cpp" line="672"/>
+        <location filename="../core/qthelper.cpp" line="677"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
+        <location filename="../core/dive.c" line="227"/>
+        <source>ℓ</source>
+        <translation>ℓ</translation>
+    </message>
+    <message>
         <location filename="../core/dive.c" line="232"/>
         <source>cuft</source>
         <translation>pés cúbicos</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="269"/>
-        <location filename="../core/qthelper.cpp" line="590"/>
-        <location filename="../core/qthelper.cpp" line="605"/>
+        <location filename="../core/qthelper.cpp" line="595"/>
+        <location filename="../core/qthelper.cpp" line="610"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="274"/>
-        <location filename="../core/qthelper.cpp" line="593"/>
-        <location filename="../core/qthelper.cpp" line="607"/>
+        <location filename="../core/qthelper.cpp" line="598"/>
+        <location filename="../core/qthelper.cpp" line="612"/>
         <source>ft</source>
         <translation>pé(s)</translation>
     </message>
@@ -8713,53 +9137,58 @@ Médio</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="325"/>
-        <location filename="../core/qthelper.cpp" line="616"/>
-        <location filename="../core/qthelper.cpp" line="626"/>
+        <location filename="../core/qthelper.cpp" line="621"/>
+        <location filename="../core/qthelper.cpp" line="631"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="329"/>
-        <location filename="../core/qthelper.cpp" line="614"/>
-        <location filename="../core/qthelper.cpp" line="624"/>
+        <location filename="../core/qthelper.cpp" line="619"/>
+        <location filename="../core/qthelper.cpp" line="629"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="1772"/>
+        <location filename="../core/dive.c" line="1751"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) ou (%s)</translation>
     </message>
     <message>
-        <location filename="../core/divelist.c" line="484"/>
+        <location filename="../core/divelist.c" line="487"/>
         <location filename="../core/equipment.c" line="84"/>
-        <location filename="../core/planner.c" line="1411"/>
-        <location filename="../core/planner.c" line="1414"/>
+        <location filename="../core/planner.c" line="1432"/>
+        <location filename="../core/planner.c" line="1435"/>
         <source>air</source>
         <translation>ar</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="197"/>
+        <location filename="../core/equipment.c" line="86"/>
+        <source>EAN%d</source>
+        <translation>EAN%d</translation>
+    </message>
+    <message>
+        <location filename="../core/equipment.c" line="198"/>
         <source>integrated</source>
         <translation>integrado</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="198"/>
+        <location filename="../core/equipment.c" line="199"/>
         <source>belt</source>
         <translation>cinto</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="199"/>
+        <location filename="../core/equipment.c" line="200"/>
         <source>ankle</source>
         <translation>tornozelo</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="200"/>
+        <location filename="../core/equipment.c" line="201"/>
         <source>backplate weight</source>
         <translation>lastro no arnês</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="201"/>
+        <location filename="../core/equipment.c" line="202"/>
         <source>clip-on</source>
         <translation>clip-on</translation>
     </message>
@@ -8772,8 +9201,8 @@ Médio</translation>
         <location filename="../core/file.c" line="121"/>
         <location filename="../core/file.c" line="512"/>
         <location filename="../core/file.c" line="597"/>
-        <location filename="../core/file.c" line="924"/>
-        <location filename="../core/file.c" line="1056"/>
+        <location filename="../core/file.c" line="909"/>
+        <location filename="../core/file.c" line="1092"/>
         <location filename="../core/ostctools.c" line="80"/>
         <source>Failed to read &apos;%s&apos;</source>
         <translation>Falha na leitura de &apos;%s&apos;</translation>
@@ -8831,278 +9260,295 @@ Médio</translation>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/file.c" line="887"/>
-        <source>No matching DC found for file &apos;%s&apos;</source>
+        <location filename="../core/git-access.c" line="134"/>
+        <source>Local cache directory %s corrupted - can&apos;t sync with Subsurface cloud storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>none</source>
-        <translation>nenhum</translation>
+        <location filename="../core/git-access.c" line="157"/>
+        <location filename="../core/git-access.c" line="177"/>
+        <source>Could not update local cache to newer remote data</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="309"/>
-        <location filename="../core/cochran.c" line="315"/>
-        <location filename="../core/cochran.c" line="385"/>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>deco stop</source>
-        <translation>parada de deco</translation>
+        <location filename="../core/git-access.c" line="170"/>
+        <source>Subsurface cloud storage corrupted</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="342"/>
-        <location filename="../core/file.c" line="755"/>
-        <source>battery</source>
+        <location filename="../core/git-access.c" line="284"/>
+        <source>Could not update Subsurface cloud storage, try again later</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="370"/>
-        <location filename="../core/cochran.c" line="409"/>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>rbt</source>
-        <translation>rbt</translation>
+        <location filename="../core/git-access.c" line="344"/>
+        <source>Remote storage and local data diverged. Error: merge failed (%s)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="336"/>
-        <location filename="../core/cochran.c" line="390"/>
-        <location filename="../core/file.c" line="777"/>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>ascent</source>
-        <translation>subida</translation>
+        <location filename="../core/git-access.c" line="374"/>
+        <source>Remote storage and local data diverged. Cannot combine local and remote changes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="379"/>
-        <location filename="../core/cochran.c" line="426"/>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>ceiling</source>
-        <translation>teto</translation>
+        <location filename="../core/git-access.c" line="408"/>
+        <source>Remote storage and local data diverged</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>workload</source>
-        <translation>nível de esforço</translation>
+        <location filename="../core/git-access.c" line="411"/>
+        <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="395"/>
-        <location filename="../core/libdivecomputer.c" line="203"/>
-        <source>transmitter</source>
-        <translation>transmissor</translation>
+        <location filename="../core/git-access.c" line="420"/>
+        <source>Problems with local cache of Subsurface cloud data</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/git-access.c" line="421"/>
+        <source>Moved cache data to %s. Please try the operation again.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/git-access.c" line="743"/>
+        <source>Error connecting to Subsurface cloud storage</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="203"/>
+        <location filename="../core/git-access.c" line="746"/>
+        <source>git clone of %s failed (%s)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="210"/>
+        <location filename="../core/parse-xml.c" line="3317"/>
+        <location filename="../core/uemis-downloader.c" line="134"/>
+        <source>unknown</source>
+        <translation>desconhecido</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>none</source>
+        <translation>nenhum</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>workload</source>
+        <translation>nível de esforço</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="224"/>
         <source>violation</source>
         <translation>violação</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="203"/>
+        <location filename="../core/libdivecomputer.c" line="224"/>
         <source>bookmark</source>
         <translation>favorito</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="203"/>
+        <location filename="../core/libdivecomputer.c" line="224"/>
         <source>surface</source>
         <translation>superfície</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="203"/>
+        <location filename="../core/libdivecomputer.c" line="224"/>
         <source>safety stop</source>
         <translation>parada de segurança</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="365"/>
-        <location filename="../core/cochran.c" line="414"/>
-        <location filename="../core/cochran.c" line="421"/>
-        <location filename="../core/file.c" line="868"/>
-        <location filename="../core/libdivecomputer.c" line="204"/>
-        <location filename="../core/libdivecomputer.c" line="207"/>
-        <source>gaschange</source>
-        <translation>troca de gás</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="204"/>
+        <location filename="../core/libdivecomputer.c" line="225"/>
         <source>safety stop (voluntary)</source>
         <translation>parada de segurança (voluntária)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="204"/>
+        <location filename="../core/libdivecomputer.c" line="225"/>
         <source>safety stop (mandatory)</source>
         <translation>parada de segurança (obrigatória)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="205"/>
+        <location filename="../core/libdivecomputer.c" line="226"/>
         <source>deepstop</source>
         <translation>parada profunda</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="205"/>
+        <location filename="../core/libdivecomputer.c" line="226"/>
         <source>ceiling (safety stop)</source>
         <translation>teto (parada de segurança)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="205"/>
-        <source>divetime</source>
-        <translation>duração do mergulho</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="205"/>
+        <location filename="../core/libdivecomputer.c" line="226"/>
         <source>below floor</source>
         <comment>event showing dive is below deco floor and adding deco time</comment>
         <translation>abaixo da zona de descompressão</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="353"/>
-        <location filename="../core/libdivecomputer.c" line="206"/>
-        <source>maxdepth</source>
-        <translation>prof máx</translation>
-    </message>
-    <message>
-        <location filename="../core/cochran.c" line="348"/>
-        <location filename="../core/libdivecomputer.c" line="206"/>
-        <source>OLF</source>
-        <translation>OLF</translation>
+        <location filename="../core/libdivecomputer.c" line="226"/>
+        <source>divetime</source>
+        <translation>duração do mergulho</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="206"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
         <source>airtime</source>
         <translation>tempo de ar</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="206"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
         <source>rgbm</source>
         <translation>rgbm</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="206"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
         <source>heading</source>
         <translation>direção</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="358"/>
-        <location filename="../core/cochran.c" line="404"/>
-        <location filename="../core/libdivecomputer.c" line="206"/>
-        <source>pO₂</source>
-        <translation>pO₂</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="207"/>
+        <location filename="../core/libdivecomputer.c" line="228"/>
         <source>tissue level warning</source>
         <translation>Alarme do nível nos tecidos</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="207"/>
+        <location filename="../core/libdivecomputer.c" line="228"/>
         <source>non stop time</source>
         <translation>tempo sem parada</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="224"/>
+        <location filename="../core/libdivecomputer.c" line="237"/>
         <source>invalid event number</source>
         <translation>número de evento inválido</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="658"/>
-        <source>Unable to create parser for %s %s</source>
-        <translation>Não é possivel criar o analisador para %s %s</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="664"/>
-        <source>Error registering the data</source>
-        <translation>Erro no registo dos dados</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="495"/>
+        <location filename="../core/libdivecomputer.c" line="553"/>
         <source>Error parsing the datetime</source>
         <translation>Erro na análise da data/horário</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="513"/>
+        <location filename="../core/libdivecomputer.c" line="571"/>
         <source>Dive %d: %s</source>
         <translation>Mergulho nº %d: %s</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="519"/>
+        <location filename="../core/libdivecomputer.c" line="577"/>
         <source>Error parsing the divetime</source>
         <translation>Erro na análise da duração do mergulho</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="529"/>
+        <location filename="../core/libdivecomputer.c" line="587"/>
         <source>Error parsing the maxdepth</source>
         <translation>Erro na análise da profundidade máxima</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="548"/>
+        <location filename="../core/libdivecomputer.c" line="606"/>
         <source>Error parsing temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="568"/>
+        <location filename="../core/libdivecomputer.c" line="626"/>
         <source>Error parsing the gas mix count</source>
         <translation>Erro na análise da contagem de misturas de gases</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="580"/>
+        <location filename="../core/libdivecomputer.c" line="638"/>
         <source>Error obtaining water salinity</source>
         <translation>Erro na obtenção da salinidade da água</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="589"/>
+        <location filename="../core/libdivecomputer.c" line="647"/>
         <source>Error obtaining surface pressure</source>
         <translation>Erro na obtenção da pressão na superfície</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="614"/>
+        <location filename="../core/libdivecomputer.c" line="672"/>
         <source>Error obtaining divemode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="634"/>
+        <location filename="../core/libdivecomputer.c" line="692"/>
         <source>Error parsing the gas mix</source>
         <translation>Erro na análise da mistura de gás</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="684"/>
+        <location filename="../core/libdivecomputer.c" line="717"/>
+        <source>Unable to create parser for %s %s</source>
+        <translation>Não é possivel criar o analisador para %s %s</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="723"/>
+        <source>Error registering the data</source>
+        <translation>Erro no registo dos dados</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="744"/>
         <source>Error parsing the samples</source>
         <translation>Erro na análise das amostras</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="822"/>
+        <location filename="../core/libdivecomputer.c" line="882"/>
         <source>Event: waiting for user action</source>
         <translation>Evento: aguardando ação do usuário</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="830"/>
+        <location filename="../core/libdivecomputer.c" line="890"/>
         <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="../core/libdivecomputer.c" line="894"/>
+        <location filename="../core/libdivecomputer.c" line="954"/>
         <source>Error registering the event handler.</source>
         <translation>Erro no registo do rótulo do evento.</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="899"/>
+        <location filename="../core/libdivecomputer.c" line="959"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Erro no registo do rótulo de cancelamento.</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="920"/>
+        <location filename="../core/libdivecomputer.c" line="980"/>
         <source>Dive data import error</source>
         <translation>Erro ao importar os dados do mergulho</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="959"/>
+        <location filename="../core/libdivecomputer.c" line="1019"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Não é possivel criar contexto da libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="966"/>
+        <location filename="../core/libdivecomputer.c" line="1026"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Não se consegue abrir  %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="992"/>
+        <location filename="../core/libdivecomputer.c" line="1048"/>
         <source>Insufficient privileges to open the device %s %s (%s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../core/load-git.c" line="194"/>
+        <location filename="../core/parse-xml.c" line="1242"/>
+        <source>multiple GPS locations for this dive site; also %s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/load-git.c" line="222"/>
+        <location filename="../core/parse-xml.c" line="1304"/>
+        <source>additional name for site: %s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/ostctools.c" line="120"/>
+        <location filename="../core/ostctools.c" line="152"/>
+        <source>Unknown DC in dive %d</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/ostctools.c" line="165"/>
+        <source>Error - %s - parsing dive %d</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../core/parse-xml.c" line="517"/>
         <source>Strange percentage reading %s
 </source>
@@ -9111,206 +9557,198 @@ Médio</translation>
 </translation>
     </message>
     <message>
-        <location filename="../core/load-git.c" line="194"/>
-        <location filename="../core/parse-xml.c" line="1238"/>
-        <source>multiple GPS locations for this dive site; also %s
-</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/parse-xml.c" line="2044"/>
+        <location filename="../core/parse-xml.c" line="2051"/>
         <source>Failed to parse &apos;%s&apos;</source>
         <translation>Falha na análise de &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../core/parse-xml.c" line="3741"/>
+        <location filename="../core/parse-xml.c" line="3774"/>
         <source>Can&apos;t open stylesheet %s</source>
         <translation>Falha na abertura da folha de estilo %s</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="86"/>
-        <source>EAN%d</source>
-        <translation>EAN%d</translation>
+        <location filename="../core/planner.c" line="555"/>
+        <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE %s ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="1032"/>
-        <location filename="../core/planner.c" line="1184"/>
-        <source>Can&apos;t find gas %s</source>
-        <translation>Não é possivel achar gas o %s</translation>
+        <location filename="../core/planner.c" line="569"/>
+        <source>Decompression calculation aborted due to excessive time</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="368"/>
-        <source>Too many gas mixes</source>
-        <translation>Misturas de gás em excesso</translation>
+        <location filename="../core/planner.c" line="571"/>
+        <location filename="../core/planner.c" line="829"/>
+        <location filename="../core/planner.c" line="834"/>
+        <location filename="../core/planner.c" line="860"/>
+        <location filename="../core/planner.c" line="870"/>
+        <source>Warning:</source>
+        <translation>Aviso:</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="568"/>
-        <source>Decompression calculation aborted due to excessive time</source>
+        <location filename="../core/planner.c" line="581"/>
+        <source>based on Bühlmann ZHL-16C with GFlow = %d and GFhigh = %d</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="586"/>
+        <source>based on VPM-B at nominal conservatism</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="592"/>
+        <location filename="../core/planner.c" line="588"/>
+        <source>based on VPM-B at +%d conservatism</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="590"/>
+        <source>, effective GF=%d/%d</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="594"/>
+        <source>recreational mode based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="598"/>
         <source>Subsurface dive plan</source>
         <translation>Plano de mergulho do subsurface</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="596"/>
-        <source>depth</source>
-        <translation>profundidade</translation>
+        <location filename="../core/planner.c" line="599"/>
+        <source>&lt;div&gt;Runtime: %dmin&lt;/div&gt;&lt;br&gt;</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="602"/>
-        <source>runtime</source>
-        <translation>tempo</translation>
+        <location filename="../core/planner.c" line="604"/>
+        <source>depth</source>
+        <translation>profundidade</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="599"/>
+        <location filename="../core/planner.c" line="607"/>
         <source>duration</source>
         <translation>duração</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="554"/>
-        <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE %s ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source>
-        <translation type="unfinished"/>
+        <location filename="../core/planner.c" line="610"/>
+        <source>runtime</source>
+        <translation>tempo</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="605"/>
+        <location filename="../core/planner.c" line="613"/>
         <source>gas</source>
         <translation>gás</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="648"/>
+        <location filename="../core/planner.c" line="656"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="656"/>
+        <location filename="../core/planner.c" line="664"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source>
         <translation>Transição pra %.*f %s em %d:%02d min - tempo %d:%02u em %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="669"/>
+        <location filename="../core/planner.c" line="677"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="676"/>
+        <location filename="../core/planner.c" line="684"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source>
         <translation>Fique em %.*f %s por %d:%02d min - durante %d:%02u em %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="721"/>
+        <location filename="../core/planner.c" line="729"/>
         <source>%3.0f%s</source>
         <translation>%3.0f%s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="724"/>
-        <location filename="../core/planner.c" line="728"/>
+        <location filename="../core/planner.c" line="732"/>
+        <location filename="../core/planner.c" line="736"/>
         <source>%3dmin</source>
         <translation>%3dmin</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="737"/>
-        <location filename="../core/planner.c" line="749"/>
+        <location filename="../core/planner.c" line="745"/>
+        <location filename="../core/planner.c" line="757"/>
         <source>(SP = %.1fbar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="772"/>
+        <location filename="../core/planner.c" line="780"/>
         <source>Switch gas to %s (SP = %.1fbar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="774"/>
+        <location filename="../core/planner.c" line="782"/>
         <source>Switch gas to %s</source>
         <translation>Trocar o gás por %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="793"/>
+        <location filename="../core/planner.c" line="801"/>
         <source>CNS</source>
         <translation>CNS</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="795"/>
+        <location filename="../core/planner.c" line="803"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="799"/>
+        <location filename="../core/planner.c" line="807"/>
         <source>Gas consumption (CCR legs excluded):</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="801"/>
+        <location filename="../core/planner.c" line="809"/>
         <source>Gas consumption:</source>
         <translation>Consumo de gás</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="570"/>
-        <location filename="../core/planner.c" line="821"/>
-        <location filename="../core/planner.c" line="826"/>
-        <location filename="../core/planner.c" line="851"/>
-        <location filename="../core/planner.c" line="861"/>
-        <source>Warning:</source>
-        <translation>Aviso:</translation>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="580"/>
-        <source>based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="584"/>
-        <source>based on VPM-B at nominal conservatism</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="586"/>
-        <source>based on VPM-B at +%d conservatism</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="588"/>
-        <source>recreational mode based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="822"/>
+        <location filename="../core/planner.c" line="830"/>
         <source>this is more gas than available in the specified cylinder!</source>
         <translation>Isso é mais gás que a capacidade do cilindro especificado</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="827"/>
+        <location filename="../core/planner.c" line="835"/>
         <source>not enough reserve for gas sharing on ascent!</source>
         <translation>Sem reserva para compartilhar ar na subida</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="829"/>
+        <location filename="../core/planner.c" line="837"/>
         <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="831"/>
+        <location filename="../core/planner.c" line="839"/>
         <source>%.0f%s (%.0f%s during planned ascent) of %s</source>
         <translation>%.0f%s (%.0f%s durante a subida planejada) de %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="848"/>
+        <location filename="../core/planner.c" line="857"/>
         <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
         <translation>valor pO₂ alto %.2f em %d:%02u com gás %s na profundidade %.*f %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="858"/>
+        <location filename="../core/planner.c" line="867"/>
         <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="1419"/>
+        <location filename="../core/planner.c" line="1194"/>
+        <source>Can&apos;t find gas %s</source>
+        <translation>Não é possivel achar gas o %s</translation>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="1440"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1280"/>
+        <location filename="../core/profile.c" line="1298"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
@@ -9319,70 +9757,70 @@ D: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1283"/>
+        <location filename="../core/profile.c" line="1301"/>
         <source>P: %d%s
 </source>
         <translation>P: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1287"/>
+        <location filename="../core/profile.c" line="1305"/>
         <source>T: %.1f%s
 </source>
         <translation>T: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1293"/>
+        <location filename="../core/profile.c" line="1311"/>
         <source>V: %.1f%s
 </source>
         <translation>V: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1296"/>
+        <location filename="../core/profile.c" line="1314"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation>SAC: %.*f%s/min
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1298"/>
+        <location filename="../core/profile.c" line="1316"/>
         <source>CNS: %u%%
 </source>
         <translation>CNS: %u%%
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1300"/>
+        <location filename="../core/profile.c" line="1318"/>
         <source>pO%s: %.2fbar
 </source>
         <translation>pO%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1302"/>
+        <location filename="../core/profile.c" line="1320"/>
         <source>pN%s: %.2fbar
 </source>
         <translation>pN%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1304"/>
+        <location filename="../core/profile.c" line="1322"/>
         <source>pHe: %.2fbar
 </source>
         <translation>pHe: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1307"/>
+        <location filename="../core/profile.c" line="1325"/>
         <source>MOD: %d%s
 </source>
         <translation>MOD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1314"/>
+        <location filename="../core/profile.c" line="1332"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
@@ -9391,7 +9829,7 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1318"/>
+        <location filename="../core/profile.c" line="1336"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
@@ -9400,168 +9838,173 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1331"/>
+        <location filename="../core/profile.c" line="1349"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation>Parada de segurança:  %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1334"/>
+        <location filename="../core/profile.c" line="1352"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation>Parada de segurança: tempo desconhecido @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1339"/>
+        <location filename="../core/profile.c" line="1357"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1342"/>
+        <location filename="../core/profile.c" line="1360"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation>Deco: tempo desconhecido @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1346"/>
+        <location filename="../core/profile.c" line="1364"/>
         <source>In deco
 </source>
         <translation>Em deco
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1348"/>
+        <location filename="../core/profile.c" line="1366"/>
         <source>NDL: %umin
 </source>
         <translation>NDL: %umin
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1351"/>
+        <location filename="../core/profile.c" line="1369"/>
         <source>TTS: %umin
 </source>
         <translation>TTS: %umin
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1354"/>
+        <location filename="../core/profile.c" line="1372"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation>Deco: %umin @ %.0f%s (calc)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1362"/>
+        <location filename="../core/profile.c" line="1380"/>
         <source>In deco (calc)
 </source>
         <translation>Em deco (calc)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1365"/>
+        <location filename="../core/profile.c" line="1383"/>
         <source>NDL: %umin (calc)
 </source>
         <translation>NDL: %umin (calc)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1367"/>
+        <location filename="../core/profile.c" line="1385"/>
         <source>NDL: &gt;2h (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1371"/>
+        <location filename="../core/profile.c" line="1389"/>
         <source>TTS: %umin (calc)
 </source>
         <translation>TTS: %umin (calc)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1373"/>
+        <location filename="../core/profile.c" line="1391"/>
         <source>TTS: &gt;2h (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1376"/>
+        <location filename="../core/profile.c" line="1394"/>
         <source>RBT: %umin
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1379"/>
+        <location filename="../core/profile.c" line="1397"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation>Teto calculado %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1385"/>
+        <location filename="../core/profile.c" line="1403"/>
         <source>Tissue %.0fmin: %.1f%s
 </source>
         <translation>Tecido %.0fmin: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1391"/>
+        <location filename="../core/profile.c" line="1409"/>
         <source>heartbeat: %d
 </source>
         <translation>Cardio: %d
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1393"/>
+        <location filename="../core/profile.c" line="1411"/>
         <source>bearing: %d
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1396"/>
+        <location filename="../core/profile.c" line="1414"/>
         <source>mean depth to here %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1491"/>
+        <location filename="../core/profile.c" line="1515"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1495"/>
-        <location filename="../core/profile.c" line="1499"/>
-        <location filename="../core/profile.c" line="1503"/>
+        <location filename="../core/profile.c" line="1519"/>
+        <location filename="../core/profile.c" line="1523"/>
+        <location filename="../core/profile.c" line="1527"/>
         <source>%s %sD:%.1f%s</source>
         <translation>%s %sD:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1507"/>
+        <location filename="../core/profile.c" line="1531"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sD:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1511"/>
+        <location filename="../core/profile.c" line="1535"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1515"/>
-        <location filename="../core/profile.c" line="1519"/>
+        <location filename="../core/profile.c" line="1539"/>
+        <location filename="../core/profile.c" line="1543"/>
         <source>%s %sV:%.2f%s</source>
         <translation>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1526"/>
+        <location filename="../core/profile.c" line="1550"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s</translation>
     </message>
     <message>
+        <location filename="../core/profile.c" line="1575"/>
+        <source>%s SAC:%.*f %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../core/qthelper.cpp" line="67"/>
         <source>%1km</source>
         <translation type="unfinished"/>
@@ -9582,446 +10025,460 @@ EADD: %d%s
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="635"/>
+        <location filename="../core/qthelper.cpp" line="91"/>
+        <location filename="../core/qthelper.cpp" line="226"/>
+        <source>N</source>
+        <translation>N</translation>
+    </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="91"/>
+        <location filename="../core/qthelper.cpp" line="227"/>
+        <source>S</source>
+        <translation>S</translation>
+    </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="92"/>
+        <location filename="../core/qthelper.cpp" line="228"/>
+        <source>E</source>
+        <translation>L</translation>
+    </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="92"/>
+        <location filename="../core/qthelper.cpp" line="229"/>
+        <source>W</source>
+        <translation>O</translation>
+    </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="640"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="638"/>
+        <location filename="../core/qthelper.cpp" line="643"/>
         <source>F</source>
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="23"/>
-        <source>boat</source>
-        <translation>barco</translation>
+        <location filename="../core/save-html.c" line="469"/>
+        <location filename="../core/save-html.c" line="553"/>
+        <location filename="../core/worldmap-save.c" line="111"/>
+        <source>Can&apos;t open file %s</source>
+        <translation>Não é possivel abrir o arquivo %s</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="23"/>
-        <source>shore</source>
-        <translation>costa</translation>
+        <location filename="../core/save-html.c" line="488"/>
+        <source>Number</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="459"/>
-        <location filename="../core/dive.c" line="23"/>
-        <source>drift</source>
-        <translation>correnteza</translation>
+        <location filename="../core/save-html.c" line="489"/>
+        <source>Date</source>
+        <translation>Data</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="24"/>
-        <source>deep</source>
-        <translation>profundo</translation>
+        <location filename="../core/save-html.c" line="490"/>
+        <source>Time</source>
+        <translation>Horário</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="24"/>
-        <source>cavern</source>
-        <translation>gruta (com luz natural)</translation>
+        <location filename="../core/save-html.c" line="491"/>
+        <source>Location</source>
+        <translation>Local</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="443"/>
-        <location filename="../core/dive.c" line="24"/>
-        <source>ice</source>
-        <translation>gelo</translation>
+        <location filename="../core/save-html.c" line="492"/>
+        <source>Air temp.</source>
+        <translation>Temperatura do ar</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="445"/>
-        <source>search</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="493"/>
+        <source>Water temp.</source>
+        <translation>Temperatura da água</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="455"/>
-        <location filename="../core/dive.c" line="25"/>
-        <source>wreck</source>
-        <translation>naufrágio</translation>
+        <location filename="../core/save-html.c" line="494"/>
+        <source>Dives</source>
+        <translation>Mergulhos</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="441"/>
-        <location filename="../core/dive.c" line="25"/>
-        <source>cave</source>
-        <translation>caverna</translation>
+        <location filename="../core/save-html.c" line="495"/>
+        <source>Expand all</source>
+        <translation>Expandir todos</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="25"/>
-        <source>altitude</source>
-        <translation>altitude</translation>
+        <location filename="../core/save-html.c" line="496"/>
+        <source>Collapse all</source>
+        <translation>Esconder todos</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="26"/>
-        <source>pool</source>
-        <translation>piscina</translation>
+        <location filename="../core/save-html.c" line="497"/>
+        <source>Trips</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/dive.c" line="26"/>
-        <source>lake</source>
-        <translation>lago</translation>
+        <location filename="../core/save-html.c" line="498"/>
+        <source>Statistics</source>
+        <translation>Estatísticas</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="457"/>
-        <location filename="../core/dive.c" line="26"/>
-        <source>river</source>
-        <translation>rio</translation>
+        <location filename="../core/save-html.c" line="499"/>
+        <source>Advanced search</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="439"/>
-        <location filename="../core/dive.c" line="27"/>
-        <source>night</source>
-        <translation>noturno</translation>
+        <location filename="../core/save-html.c" line="502"/>
+        <source>Rating</source>
+        <translation>Classificação</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="153"/>
-        <source>Error: the file does not appear to be a DATATRAK divelog</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="503"/>
+        <source>Visibility</source>
+        <translation>Visibilidade</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="286"/>
-        <source>clear</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="504"/>
+        <source>Duration</source>
+        <translation>Duração</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="289"/>
-        <source>misty</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="505"/>
+        <source>Divemaster</source>
+        <translation>Divemaster</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="292"/>
-        <source>fog</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="506"/>
+        <source>Buddy</source>
+        <translation>Parceiro</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="295"/>
-        <source>rain</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="507"/>
+        <source>Suit</source>
+        <translation>Roupa</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="298"/>
-        <source>storm</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="508"/>
+        <source>Tags</source>
+        <translation>Rótulos</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="301"/>
-        <source>snow</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="509"/>
+        <location filename="../smtk-import/smartrak.c" line="251"/>
+        <location filename="../smtk-import/smartrak.c" line="321"/>
+        <source>Notes</source>
+        <translation>Notas</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="321"/>
-        <source>No suit</source>
+        <location filename="../core/save-html.c" line="510"/>
+        <source>Show more details</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="324"/>
-        <source>Shorty</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="513"/>
+        <source>Yearly statistics</source>
+        <translation>Estatisticas Anuais</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="327"/>
-        <source>Combi</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="514"/>
+        <source>Year</source>
+        <translation>Ano</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="330"/>
-        <source>Wet suit</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="515"/>
+        <source>Total time</source>
+        <translation>Tempo total</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="333"/>
-        <source>Semidry suit</source>
+        <location filename="../core/save-html.c" line="516"/>
+        <source>Average time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="336"/>
-        <source>Dry suit</source>
+        <location filename="../core/save-html.c" line="517"/>
+        <source>Shortest time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="396"/>
-        <source>no stop</source>
+        <location filename="../core/save-html.c" line="518"/>
+        <source>Longest time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="400"/>
-        <source>single ascent</source>
+        <location filename="../core/save-html.c" line="519"/>
+        <source>Average depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="402"/>
-        <source>multiple ascent</source>
+        <location filename="../core/save-html.c" line="520"/>
+        <source>Min. depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="404"/>
-        <location filename="../core/dive.c" line="27"/>
-        <source>fresh</source>
-        <translation>água doce</translation>
+        <location filename="../core/save-html.c" line="521"/>
+        <source>Max. depth</source>
+        <translation>Profundidade máxima</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="406"/>
-        <source>salt water</source>
+        <location filename="../core/save-html.c" line="522"/>
+        <source>Average SAC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="431"/>
-        <source>sight seeing</source>
+        <location filename="../core/save-html.c" line="523"/>
+        <source>Min. SAC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="433"/>
-        <source>club dive</source>
+        <location filename="../core/save-html.c" line="524"/>
+        <source>Max. SAC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="437"/>
-        <source>instruction</source>
+        <location filename="../core/save-html.c" line="525"/>
+        <source>Average temp.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="463"/>
-        <source>other</source>
+        <location filename="../core/save-html.c" line="526"/>
+        <source>Min. temp.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="474"/>
-        <source>Other activities</source>
+        <location filename="../core/save-html.c" line="527"/>
+        <source>Max. temp.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="498"/>
-        <source>Datatrak/Wlog notes</source>
+        <location filename="../core/save-html.c" line="528"/>
+        <source>Back to list</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="537"/>
-        <source>Manually entered dive</source>
+        <location filename="../core/save-html.c" line="531"/>
+        <source>Dive No.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="588"/>
-        <source>Unknown</source>
+        <location filename="../core/save-html.c" line="532"/>
+        <source>Dive profile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="674"/>
-        <source>Error: couldn&apos;t open the file %s</source>
+        <location filename="../core/save-html.c" line="533"/>
+        <source>Dive information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="687"/>
-        <source>Error: no dive</source>
+        <location filename="../core/save-html.c" line="534"/>
+        <source>Dive equipment</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/dive.c" line="27"/>
-        <source>student</source>
-        <translation>aluno</translation>
+        <location filename="../core/save-html.c" line="535"/>
+        <location filename="../core/save-html.c" line="542"/>
+        <source>Type</source>
+        <translation>Tipo</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="461"/>
-        <location filename="../core/dive.c" line="28"/>
-        <source>photo</source>
-        <translation>foto</translation>
+        <location filename="../core/save-html.c" line="536"/>
+        <source>Size</source>
+        <translation>Tamanho</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="28"/>
-        <source>video</source>
-        <translation>vídeo</translation>
+        <location filename="../core/save-html.c" line="537"/>
+        <source>Work pressure</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="435"/>
-        <location filename="../core/dive.c" line="28"/>
-        <source>instructor</source>
-        <translation>instrutor</translation>
+        <location filename="../core/save-html.c" line="538"/>
+        <source>Start pressure</source>
+        <translation>Pressão inicial</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="398"/>
-        <location filename="../core/dive.c" line="29"/>
-        <source>deco</source>
-        <translation>deco</translation>
+        <location filename="../core/save-html.c" line="539"/>
+        <source>End pressure</source>
+        <translation>Pressão final</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="33"/>
-        <source>OC-gas</source>
+        <location filename="../core/save-html.c" line="540"/>
+        <source>Gas</source>
+        <translation>Gás</translation>
+    </message>
+    <message>
+        <location filename="../core/save-html.c" line="541"/>
+        <source>Weight</source>
+        <translation>Peso</translation>
+    </message>
+    <message>
+        <location filename="../core/save-html.c" line="543"/>
+        <source>Events</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/dive.c" line="33"/>
-        <source>diluent</source>
+        <location filename="../core/save-html.c" line="544"/>
+        <source>Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/dive.c" line="33"/>
-        <location filename="../core/equipment.c" line="88"/>
-        <location filename="../core/planner.c" line="1415"/>
-        <location filename="../core/planner.c" line="1418"/>
-        <source>oxygen</source>
+        <location filename="../core/save-html.c" line="545"/>
+        <source>Value</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/dive.c" line="227"/>
-        <source>ℓ</source>
-        <translation>ℓ</translation>
+        <location filename="../core/save-html.c" line="546"/>
+        <source>Coordinates</source>
+        <translation>Coordenadas</translation>
+    </message>
+    <message>
+        <location filename="../core/save-html.c" line="547"/>
+        <source>Dive status</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="239"/>
+        <location filename="../core/statistics.c" line="242"/>
         <source>more than %d days</source>
         <translation>mais que %d dias</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="246"/>
+        <location filename="../core/statistics.c" line="249"/>
         <source>%dd %dh %dmin</source>
         <translation>%dd %dh %dmin</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="249"/>
+        <location filename="../core/statistics.c" line="252"/>
         <source>%dmin %dsecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="251"/>
+        <location filename="../core/statistics.c" line="254"/>
         <source>%dh %dmin</source>
         <translation>%dh %dmin</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="263"/>
+        <location filename="../core/statistics.c" line="266"/>
         <source>for dives #</source>
         <translation>para mergulhos nº</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="269"/>
+        <location filename="../core/statistics.c" line="272"/>
         <source>for selected dives</source>
         <translation>para mergulhos selecionados</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="304"/>
+        <location filename="../core/statistics.c" line="307"/>
         <source>for dive #%d</source>
         <translation>para mergulho nº %d</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="306"/>
+        <location filename="../core/statistics.c" line="309"/>
         <source>for selected dive</source>
         <translation>para mergulho selecionado</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="308"/>
+        <location filename="../core/statistics.c" line="311"/>
         <source>for all dives</source>
         <translation>para todos os mergulhos</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="310"/>
+        <location filename="../core/statistics.c" line="313"/>
         <source>(no dives)</source>
         <translation>(nenhum mergulho)</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Sun</source>
         <translation>Dom</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Mon</source>
         <translation>Seg</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Tue</source>
         <translation>Ter</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Wed</source>
         <translation>Qua</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Thu</source>
         <translation>Qui</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Fri</source>
         <translation>Sex</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Sat</source>
         <translation>Sáb</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Jan</source>
         <translation>Jan</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Feb</source>
         <translation>Fev</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Mar</source>
         <translation>Mar</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Apr</source>
         <translation>Abr</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>May</source>
         <translation>Mai</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Jun</source>
         <translation>Jun</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Jul</source>
         <translation>Jul</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Aug</source>
         <translation>Ago</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Sep</source>
         <translation>Set</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Oct</source>
         <translation>Out</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Nov</source>
         <translation>Nov</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Dec</source>
         <translation>Dez</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="191"/>
-        <location filename="../core/parse-xml.c" line="3284"/>
-        <location filename="../core/uemis-downloader.c" line="134"/>
-        <source>unknown</source>
-        <translation>desconhecido</translation>
-    </message>
-    <message>
-        <location filename="../core/uemis-downloader.c" line="467"/>
-        <source>data</source>
-        <translation>dados</translation>
-    </message>
-    <message>
-        <location filename="../core/uemis-downloader.c" line="447"/>
-        <source>%s %s</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../core/uemis-downloader.c" line="27"/>
         <source>Uemis Zurich: the file system is almost full.
 Disconnect/reconnect the dive computer
@@ -10047,6 +10504,16 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../core/uemis-downloader.c" line="447"/>
+        <source>%s %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/uemis-downloader.c" line="467"/>
+        <source>data</source>
+        <translation>dados</translation>
+    </message>
+    <message>
         <location filename="../core/uemis-downloader.c" line="495"/>
         <source>divelog #</source>
         <translation type="unfinished"/>
@@ -10217,281 +10684,6 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="469"/>
-        <location filename="../core/save-html.c" line="553"/>
-        <location filename="../core/worldmap-save.c" line="111"/>
-        <source>Can&apos;t open file %s</source>
-        <translation>Não é possivel abrir o arquivo %s</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="488"/>
-        <source>Number</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="489"/>
-        <source>Date</source>
-        <translation>Data</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="490"/>
-        <source>Time</source>
-        <translation>Horário</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="491"/>
-        <source>Location</source>
-        <translation>Local</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="492"/>
-        <source>Air temp.</source>
-        <translation>Temperatura do ar</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="493"/>
-        <source>Water temp.</source>
-        <translation>Temperatura da água</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="498"/>
-        <source>Statistics</source>
-        <translation>Estatísticas</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="502"/>
-        <source>Rating</source>
-        <translation>Classificação</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="503"/>
-        <source>Visibility</source>
-        <translation>Visibilidade</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="504"/>
-        <source>Duration</source>
-        <translation>Duração</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="494"/>
-        <source>Dives</source>
-        <translation>Mergulhos</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="495"/>
-        <source>Expand all</source>
-        <translation>Expandir todos</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="496"/>
-        <source>Collapse all</source>
-        <translation>Esconder todos</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="497"/>
-        <source>Trips</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="499"/>
-        <source>Advanced search</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="505"/>
-        <source>Divemaster</source>
-        <translation>Divemaster</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="506"/>
-        <source>Buddy</source>
-        <translation>Parceiro</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="507"/>
-        <source>Suit</source>
-        <translation>Roupa</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="508"/>
-        <source>Tags</source>
-        <translation>Rótulos</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="509"/>
-        <location filename="../smtk-import/smartrak.c" line="251"/>
-        <location filename="../smtk-import/smartrak.c" line="321"/>
-        <source>Notes</source>
-        <translation>Notas</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="510"/>
-        <source>Show more details</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="513"/>
-        <source>Yearly statistics</source>
-        <translation>Estatisticas Anuais</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="514"/>
-        <source>Year</source>
-        <translation>Ano</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="515"/>
-        <source>Total time</source>
-        <translation>Tempo total</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="516"/>
-        <source>Average time</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="517"/>
-        <source>Shortest time</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="518"/>
-        <source>Longest time</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="519"/>
-        <source>Average depth</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="520"/>
-        <source>Min. depth</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="521"/>
-        <source>Max. depth</source>
-        <translation>Profundidade máxima</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="523"/>
-        <source>Min. SAC</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="524"/>
-        <source>Max. SAC</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="525"/>
-        <source>Average temp.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="526"/>
-        <source>Min. temp.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="527"/>
-        <source>Max. temp.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="528"/>
-        <source>Back to list</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="534"/>
-        <source>Dive equipment</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="537"/>
-        <source>Work pressure</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="538"/>
-        <source>Start pressure</source>
-        <translation>Pressão inicial</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="539"/>
-        <source>End pressure</source>
-        <translation>Pressão final</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="547"/>
-        <source>Dive status</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="522"/>
-        <source>Average SAC</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="531"/>
-        <source>Dive No.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="532"/>
-        <source>Dive profile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="533"/>
-        <source>Dive information</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="535"/>
-        <location filename="../core/save-html.c" line="542"/>
-        <source>Type</source>
-        <translation>Tipo</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="536"/>
-        <source>Size</source>
-        <translation>Tamanho</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="540"/>
-        <source>Gas</source>
-        <translation>Gás</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="541"/>
-        <source>Weight</source>
-        <translation>Peso</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="543"/>
-        <source>Events</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="544"/>
-        <source>Name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="545"/>
-        <source>Value</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="546"/>
-        <source>Coordinates</source>
-        <translation>Coordenadas</translation>
-    </message>
-    <message>
         <location filename="../core/worldmap-save.c" line="39"/>
         <source>Date:</source>
         <translation>Data:</translation>
@@ -10537,109 +10729,6 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation>Notas:</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="91"/>
-        <location filename="../core/qthelper.cpp" line="226"/>
-        <source>N</source>
-        <translation>N</translation>
-    </message>
-    <message>
-        <location filename="../core/qthelper.cpp" line="91"/>
-        <location filename="../core/qthelper.cpp" line="227"/>
-        <source>S</source>
-        <translation>S</translation>
-    </message>
-    <message>
-        <location filename="../core/qthelper.cpp" line="92"/>
-        <location filename="../core/qthelper.cpp" line="228"/>
-        <source>E</source>
-        <translation>L</translation>
-    </message>
-    <message>
-        <location filename="../core/qthelper.cpp" line="92"/>
-        <location filename="../core/qthelper.cpp" line="229"/>
-        <source>W</source>
-        <translation>O</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="341"/>
-        <source>Remote storage and local data diverged. Error: merge failed (%s)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="134"/>
-        <source>Local cache directory %s corrupted - can&apos;t sync with Subsurface cloud storage</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="157"/>
-        <location filename="../core/git-access.c" line="177"/>
-        <source>Could not update local cache to newer remote data</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="170"/>
-        <source>Subsurface cloud storage corrupted</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="285"/>
-        <source>Could not update Subsurface cloud storage, try again later</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="371"/>
-        <source>Remote storage and local data diverged. Cannot combine local and remote changes</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="405"/>
-        <source>Remote storage and local data diverged</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="408"/>
-        <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="417"/>
-        <source>Problems with local cache of Subsurface cloud data</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="418"/>
-        <source>Moved cache data to %s. Please try the operation again.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="737"/>
-        <source>Error connecting to Subsurface cloud storage</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="740"/>
-        <source>git clone of %s failed (%s)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/load-git.c" line="222"/>
-        <location filename="../core/parse-xml.c" line="1300"/>
-        <source>additional name for site: %s
-</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/ostctools.c" line="120"/>
-        <location filename="../core/ostctools.c" line="152"/>
-        <source>Unknown DC in dive %d</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/ostctools.c" line="165"/>
-        <source>Error - %s - parsing dive %d</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../smtk-import/smartrak.c" line="247"/>
         <source>Built</source>
         <translation type="unfinished"/>
@@ -10723,155 +10812,120 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="91"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="103"/>
         <source>Subsurface</source>
         <translation>Subsurface</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="97"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="110"/>
         <source>Dive list</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="112"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="125"/>
         <source>Cloud credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="126"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="139"/>
         <source>Manage dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="138"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="141"/>
         <source>Add dive manually</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="146"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="149"/>
         <source>Manual sync with cloud</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="164"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="167"/>
         <source>Offline mode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="164"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="167"/>
         <source>Enable auto cloud sync</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="182"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="187"/>
         <source>GPS</source>
         <translation>GPS</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="185"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="190"/>
         <source>GPS-tag dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="192"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="197"/>
         <source>Upload GPS data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="199"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="204"/>
         <source>Download GPS data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="206"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="211"/>
         <source>Show GPS fixes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="215"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="220"/>
         <source>Clear GPS cache</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="221"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="226"/>
         <source>Preferences</source>
         <translation>Preferências</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="230"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="237"/>
         <source>Developer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="232"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="239"/>
         <source>App log</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="239"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="246"/>
         <source>Theme information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="246"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="253"/>
         <source>User manual</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="252"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="259"/>
         <source>About</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="283"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="304"/>
         <source>Run location service</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="283"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="304"/>
         <source>No GPS source available</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="295"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="316"/>
         <source>Actions</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="9"/>
-        <source>Hello World</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="13"/>
-        <source>File</source>
-        <translation>Arquivo</translation>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="15"/>
-        <source>&amp;Open</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="19"/>
-        <source>Exit</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="27"/>
-        <source>Button 1 pressed</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="28"/>
-        <source>Button 2 pressed</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="33"/>
-        <source>May I have your attention, please?</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>plannerDetails</name>
@@ -10949,6 +11003,24 @@ p, li { white-space: pre-wrap; }
         <translation>m/min</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="121"/>
+        <location filename="../build/ui_plannerSettings.h" line="425"/>
+        <source>75% to 50% avg. depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="138"/>
+        <location filename="../build/ui_plannerSettings.h" line="427"/>
+        <source>50% avg. depth to 6m</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="155"/>
+        <location filename="../build/ui_plannerSettings.h" line="429"/>
+        <source>6m to surface</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="175"/>
         <location filename="../build/ui_plannerSettings.h" line="431"/>
         <source>Descent</source>
@@ -10972,12 +11044,35 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="268"/>
+        <source>Bühlmann deco</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="278"/>
         <location filename="../build/ui_plannerSettings.h" line="445"/>
         <source>Reserve gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="288"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="549"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="578"/>
+        <location filename="../build/ui_plannerSettings.h" line="446"/>
+        <location filename="../build/ui_plannerSettings.h" line="459"/>
+        <location filename="../build/ui_plannerSettings.h" line="461"/>
+        <source>bar</source>
+        <translation>bar</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="307"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="416"/>
+        <location filename="../build/ui_plannerSettings.h" line="437"/>
+        <location filename="../build/ui_plannerSettings.h" line="440"/>
+        <source>%</source>
+        <translation>%</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="320"/>
         <location filename="../build/ui_plannerSettings.h" line="449"/>
         <source>Postpone gas change if a stop is not required</source>
@@ -10996,12 +11091,10 @@ p, li { white-space: pre-wrap; }
         <translation>GF baixo</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="307"/>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="416"/>
-        <location filename="../build/ui_plannerSettings.h" line="437"/>
-        <location filename="../build/ui_plannerSettings.h" line="440"/>
-        <source>%</source>
-        <translation>%</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="353"/>
+        <location filename="../build/ui_plannerSettings.h" line="436"/>
+        <source>Plan backgas breaks</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="360"/>
@@ -11010,10 +11103,10 @@ p, li { white-space: pre-wrap; }
         <translation>GF alto</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="429"/>
-        <location filename="../build/ui_plannerSettings.h" line="441"/>
-        <source>Drop to first depth</source>
-        <translation>Descer até o primeiro ponto</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="370"/>
+        <location filename="../build/ui_plannerSettings.h" line="453"/>
+        <source>min</source>
+        <translation>min</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="389"/>
@@ -11022,163 +11115,139 @@ p, li { white-space: pre-wrap; }
         <translation>Ultima parada em 6m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="353"/>
-        <location filename="../build/ui_plannerSettings.h" line="436"/>
-        <source>Plan backgas breaks</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="396"/>
+        <source>Maximize bottom time allowed by gas and no decompression limits</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="515"/>
-        <location filename="../build/ui_plannerSettings.h" line="455"/>
-        <source>Gas options</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="399"/>
+        <location filename="../build/ui_plannerSettings.h" line="443"/>
+        <source>Recreational mode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="594"/>
-        <location filename="../build/ui_plannerSettings.h" line="456"/>
-        <source>Bottom SAC</source>
-        <translation>SAC no fundo</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="429"/>
+        <location filename="../build/ui_plannerSettings.h" line="441"/>
+        <source>Drop to first depth</source>
+        <translation>Descer até o primeiro ponto</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="692"/>
-        <location filename="../build/ui_plannerSettings.h" line="457"/>
-        <source>Deco SAC</source>
-        <translation>Deco SAC</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="436"/>
+        <location filename="../build/ui_plannerSettings.h" line="452"/>
+        <source>Min. switch duration</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="601"/>
-        <location filename="../build/ui_plannerSettings.h" line="458"/>
-        <source>Bottom pO₂</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="459"/>
+        <location filename="../build/ui_plannerSettings.h" line="444"/>
+        <source>Safety stop</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="685"/>
-        <location filename="../build/ui_plannerSettings.h" line="460"/>
-        <source>Deco pO₂</source>
-        <translation>Deco pO₂</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="495"/>
+        <source>Conservatism level</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="515"/>
+        <location filename="../build/ui_plannerSettings.h" line="455"/>
+        <source>Gas options</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="565"/>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="672"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="698"/>
         <location filename="../build/ui_plannerSettings.h" line="462"/>
         <location filename="../build/ui_plannerSettings.h" line="463"/>
         <source>ℓ/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="632"/>
-        <location filename="../build/ui_plannerSettings.h" line="468"/>
-        <source>Display runtime</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="594"/>
+        <source>m</source>
+        <translation>m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="645"/>
-        <location filename="../build/ui_plannerSettings.h" line="472"/>
-        <source>Display segment duration</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="606"/>
+        <source>Used to calculate best mix. Select best mix depth in &apos;Available gases&apos; table by entering gas depth, followed by &quot;B&quot; (best trimix mix) or &quot;BN&quot; (best nitrox mix)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="655"/>
-        <location filename="../build/ui_plannerSettings.h" line="476"/>
-        <source>Display transitions in deco</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="613"/>
+        <location filename="../build/ui_plannerSettings.h" line="456"/>
+        <source>Bottom SAC</source>
+        <translation>SAC no fundo</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="662"/>
-        <location filename="../build/ui_plannerSettings.h" line="477"/>
-        <source>Verbatim dive plan</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="620"/>
+        <location filename="../build/ui_plannerSettings.h" line="458"/>
+        <source>Bottom pO₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="288"/>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="549"/>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="578"/>
-        <location filename="../build/ui_plannerSettings.h" line="446"/>
-        <location filename="../build/ui_plannerSettings.h" line="459"/>
-        <location filename="../build/ui_plannerSettings.h" line="461"/>
-        <source>bar</source>
-        <translation>bar</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="121"/>
-        <location filename="../build/ui_plannerSettings.h" line="425"/>
-        <source>75% to 50% avg. depth</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="627"/>
+        <source>Best mix END</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="138"/>
-        <location filename="../build/ui_plannerSettings.h" line="427"/>
-        <source>50% avg. depth to 6m</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="634"/>
+        <location filename="../build/ui_plannerSettings.h" line="464"/>
+        <source>Notes</source>
+        <translation>Notas</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="155"/>
-        <location filename="../build/ui_plannerSettings.h" line="429"/>
-        <source>6m to surface</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="655"/>
+        <location filename="../build/ui_plannerSettings.h" line="466"/>
+        <source>In dive plan, show runtime (absolute time) of stops</source>
+        <translation>No planejador, mostrar tempo de mergulho absoluto das paradas</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="268"/>
-        <source>Bühlmann deco</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="658"/>
+        <location filename="../build/ui_plannerSettings.h" line="468"/>
+        <source>Display runtime</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="370"/>
-        <location filename="../build/ui_plannerSettings.h" line="453"/>
-        <source>min</source>
-        <translation>min</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="396"/>
-        <source>Maximize bottom time allowed by gas and no decompression limits</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="668"/>
+        <location filename="../build/ui_plannerSettings.h" line="470"/>
+        <source>In dive plan, show duration (relative time) of stops</source>
+        <translation>No planejador mostrar tempo relativo das paradas</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="399"/>
-        <location filename="../build/ui_plannerSettings.h" line="443"/>
-        <source>Recreational mode</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="671"/>
+        <location filename="../build/ui_plannerSettings.h" line="472"/>
+        <source>Display segment duration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="436"/>
-        <location filename="../build/ui_plannerSettings.h" line="452"/>
-        <source>Min. switch duration</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="678"/>
+        <location filename="../build/ui_plannerSettings.h" line="474"/>
+        <source>In diveplan, list transitions or treat them as implicit</source>
+        <translation>No planejador, listar transições ou tratar elas de forma implicita</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="459"/>
-        <location filename="../build/ui_plannerSettings.h" line="444"/>
-        <source>Safety stop</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="681"/>
+        <location filename="../build/ui_plannerSettings.h" line="476"/>
+        <source>Display transitions in deco</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="495"/>
-        <source>Conservatism level</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="688"/>
+        <location filename="../build/ui_plannerSettings.h" line="477"/>
+        <source>Verbatim dive plan</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="608"/>
-        <location filename="../build/ui_plannerSettings.h" line="464"/>
-        <source>Notes</source>
-        <translation>Notas</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="629"/>
-        <location filename="../build/ui_plannerSettings.h" line="466"/>
-        <source>In dive plan, show runtime (absolute time) of stops</source>
-        <translation>No planejador, mostrar tempo de mergulho absoluto das paradas</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="642"/>
-        <location filename="../build/ui_plannerSettings.h" line="470"/>
-        <source>In dive plan, show duration (relative time) of stops</source>
-        <translation>No planejador mostrar tempo relativo das paradas</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="711"/>
+        <location filename="../build/ui_plannerSettings.h" line="460"/>
+        <source>Deco pO₂</source>
+        <translation>Deco pO₂</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="652"/>
-        <location filename="../build/ui_plannerSettings.h" line="474"/>
-        <source>In diveplan, list transitions or treat them as implicit</source>
-        <translation>No planejador, listar transições ou tratar elas de forma implicita</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="718"/>
+        <location filename="../build/ui_plannerSettings.h" line="457"/>
+        <source>Deco SAC</source>
+        <translation>Deco SAC</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 02a64250e..609bd849f 100644
--- a/translations/subsurface_pt_PT.ts
+++ b/translations/subsurface_pt_PT.ts
@@ -5,18 +5,19 @@
         <location filename="../mobile-widgets/qml/About.qml" line="10"/>
         <location filename="../mobile-widgets/qml/About.qml" line="19"/>
         <source>About Subsurface-mobile</source>
-        <translation type="unfinished"/>
+        <translation>Sobre Subsurface-mobile</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/About.qml" line="36"/>
         <source>A mobile version of the free Subsurface divelog software.
 </source>
-        <translation type="unfinished"/>
+        <translation>Uma versão móvel do logbook livre e gratuito Subsurface
+</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/About.qml" line="37"/>
         <source>View your dive logs while on the go.</source>
-        <translation type="unfinished"/>
+        <translation>Veja os seus registos de mergulho longe de casa.</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/About.qml" line="48"/>
@@ -24,7 +25,10 @@
 
 © Subsurface developer team
 2011-2016</source>
-        <translation type="unfinished"/>
+        <translation>Versão: %1
+
+© Subsurface developer team
+2011-2016</translation>
     </message>
 </context>
 <context>
@@ -105,6 +109,11 @@
         <translation>Nome:</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="56"/>
+        <source>Could not initialize Winsock version 2.2</source>
+        <translation>Não foi possível inicializar a versão 2.2. do Winsock</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="134"/>
         <source>Trying to turn on the local Bluetooth device...</source>
         <translation>A tentar ligar o dispositivo bluetooth local...</translation>
@@ -115,6 +124,11 @@
         <translation>A tentar desligar o dispositivo bluetooth local...</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="167"/>
+        <source>Remote devices list was cleared.</source>
+        <translation>A lista de dispositivos remotos foi limpa.</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="183"/>
         <source>Scanning for remote devices...</source>
         <translation>A procurar dispositivos remotos...</translation>
@@ -125,6 +139,22 @@
         <translation>A busca terminou com sucesso.</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="208"/>
+        <source>The local Bluetooth device was %1.</source>
+        <extracomment>%1 will be replaced with &quot;turned on&quot; or &quot;turned off&quot;</extracomment>
+        <translation>O dispositivo Bluetooth local foi %1.</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
+        <source>turned on</source>
+        <translation>ligado</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
+        <source>turned off</source>
+        <translation>desligado</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="225"/>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="339"/>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="359"/>
@@ -172,37 +202,6 @@
         <translation>Emparelhar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="352"/>
-        <source>Device %1 was paired and is authorized.</source>
-        <translation>O dispositivo %1 foi emparelhado e está autorizado.</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="56"/>
-        <source>Could not initialize Winsock version 2.2</source>
-        <translation>Não foi possível inicializar a versão 2.2. do Winsock</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="167"/>
-        <source>Remote devices list was cleared.</source>
-        <translation>A lista de dispositivos remotos foi limpa.</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="208"/>
-        <source>The local Bluetooth device was %1.</source>
-        <extracomment>%1 will be replaced with &quot;turned on&quot; or &quot;turned off&quot;</extracomment>
-        <translation>O dispositivo Bluetooth local foi %1.</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
-        <source>turned on</source>
-        <translation>ligado</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
-        <source>turned off</source>
-        <translation>desligado</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="307"/>
         <source>Remove pairing</source>
         <translation>Remover emparelhamento</translation>
@@ -228,6 +227,11 @@
         <translation>O dispositivo %1 foi emparelhado.</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="352"/>
+        <source>Device %1 was paired and is authorized.</source>
+        <translation>O dispositivo %1 foi emparelhado e está autorizado.</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="378"/>
         <source>The device %1 can now be used for connection. You can press the Save button.</source>
         <translation>O dispositivo %1  já pode ser usado para a ligação. Pode premir o botão Gravar.</translation>
@@ -286,12 +290,12 @@
 <context>
     <name>BuddyFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="621"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="619"/>
         <source>Person: </source>
         <translation>Companheiro:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="622"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="620"/>
         <source>Searches for buddies and divemasters</source>
         <translation>Busca por companheiros e guias de mergulho</translation>
     </message>
@@ -299,7 +303,7 @@
 <context>
     <name>BuddyFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="243"/>
+        <location filename="../qt-models/filtermodels.cpp" line="248"/>
         <source>No buddies</source>
         <translation>Sem companheiros</translation>
     </message>
@@ -307,23 +311,28 @@
 <context>
     <name>CloudCredentials</name>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="49"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="50"/>
         <source>Cloud credentials</source>
-        <translation type="unfinished"/>
+        <translation>Credenciais da nuvem</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="55"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="56"/>
         <source>Email</source>
-        <translation type="unfinished"/>
+        <translation>Email</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="67"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="68"/>
         <source>Password</source>
         <translation>Palavra-passe</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="90"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="92"/>
         <source>Show password</source>
+        <translation>Mostrar password</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="97"/>
+        <source>PIN</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -381,6 +390,16 @@
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
+        <source>Max. depth</source>
+        <translation>Prof. Max.</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
+        <source>Avg. depth</source>
+        <translation>Prof. média</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
         <source>Divemaster</source>
         <translation>Guia de mergulho</translation>
     </message>
@@ -391,6 +410,11 @@
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
+        <source>Suit</source>
+        <translation>Fato</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
         <source>Notes</source>
         <translation>Notas</translation>
     </message>
@@ -410,21 +434,6 @@
         <translation>Temp. da água</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
-        <source>Max. depth</source>
-        <translation>Prof. Max.</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
-        <source>Avg. depth</source>
-        <translation>Prof. média</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
-        <source>Suit</source>
-        <translation>Fato</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="44"/>
         <source>O₂</source>
         <translation>O₂</translation>
@@ -538,7 +547,7 @@
         <translation>Não é possivel criar contexto do libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../core/configuredivecomputer.cpp" line="660"/>
+        <location filename="../core/configuredivecomputer.cpp" line="656"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation>Não foi possível estabelecer uma ligação ao computador de mergulho.</translation>
     </message>
@@ -558,11 +567,19 @@
         <translation>Dispositivo ou ponto de montagem</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="170"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1520"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1533"/>
-        <source>...</source>
-        <translation>...</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="47"/>
+        <source>Connect via Bluetooth</source>
+        <translation>Ligar via Bluetooth</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="54"/>
+        <source>Connect</source>
+        <translation>Ligar</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="64"/>
+        <source>Disconnect</source>
+        <translation>Desligar</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="80"/>
@@ -571,12 +588,24 @@
         <translation>Recuperar detalhes disponíveis</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="90"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1523"/>
+        <source>Read settings from backup file or from device before writing to the device</source>
+        <translation>Ler configurações da cópia de segurança ou do dispositivo antes de carregá-las para o dispositivo</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="93"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1525"/>
         <source>Save changes to device</source>
         <translation>Gravar alterações no dispositivo</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="116"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1527"/>
+        <source>Read settings from backup file or from device before writing to a backup file</source>
+        <translation>Ler configurações do ficheiro de backup ou do dispositivo antes de criar uma cópia de segurança</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="119"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1529"/>
         <source>Backup</source>
@@ -595,15 +624,40 @@
         <translation>Actualizar firmware</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="163"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1532"/>
+        <source>Save libdivecomputer logfile</source>
+        <translation>Gravar registo do libdivecomputer</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="170"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1520"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1533"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="177"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1534"/>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
     <message>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1539"/>
-        <source>OSTC 3</source>
-        <translation>OSTC 3</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="214"/>
+        <source>OSTC 3,Sport,Cr,2</source>
+        <translation>OSTC 3,Sport,Cr,2</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="223"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1541"/>
+        <source>Suunto Vyper family</source>
+        <translation>Família Suunto Vyper</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="232"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1543"/>
+        <source>OSTC, Mk.2/2N/2C</source>
+        <translation>OSTC, Mk.2/2N/2C</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="253"/>
@@ -616,40 +670,56 @@
         <translation>Configurações básicas</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="326"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1656"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1943"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1546"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1726"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1766"/>
-        <source>Serial No.</source>
-        <translation>Número de série</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="260"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1575"/>
+        <source>Eco</source>
+        <translation>Eco</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="349"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1679"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1980"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1547"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1727"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1767"/>
-        <source>Firmware version</source>
-        <translation>Versão do firmware</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="265"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1576"/>
+        <source>Medium</source>
+        <translation>Médio</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="538"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1713"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1990"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1548"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1729"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1768"/>
-        <source>Custom text</source>
-        <translation>Texto personalizado</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="270"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1577"/>
+        <source>High</source>
+        <translation>Alto</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="385"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1549"/>
-        <source>Language</source>
-        <translation>Língua</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="278"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="826"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="849"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="875"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="927"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="993"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1019"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1101"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1117"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1450"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2278"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2382"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2408"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2434"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2474"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2497"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1586"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1621"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1623"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1625"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1628"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1637"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1638"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1710"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1785"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1789"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1801"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1803"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1806"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1807"/>
+        <source>%</source>
+        <translation>%</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="289"/>
@@ -676,44 +746,36 @@
         <translation>Italiano</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="579"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1557"/>
-        <source>Dive mode</source>
-        <translation>Modo de mergulho</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="556"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1560"/>
-        <source>OC</source>
-        <translation>Circuito aberto</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="561"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1561"/>
-        <source>CC</source>
-        <translation>Circuito fechado</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="313"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1582"/>
+        <source>m/°C</source>
+        <translation>m/°C</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="566"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2336"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1562"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1793"/>
-        <source>Gauge</source>
-        <translation>Profundímetro</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="318"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1583"/>
+        <source>ft/°F</source>
+        <translation>ft/°F</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="571"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1563"/>
-        <source>Apnea</source>
-        <translation>Apneia</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="326"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1656"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1943"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1546"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1726"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1766"/>
+        <source>Serial No.</source>
+        <translation>Número de série</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="395"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2063"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1565"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1780"/>
-        <source>Date format</source>
-        <translation>Formato para a data</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="349"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1679"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1980"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1547"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1727"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1767"/>
+        <source>Firmware version</source>
+        <translation>Versão do firmware</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="360"/>
@@ -734,108 +796,147 @@
         <translation>AAMMDD</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1042"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2457"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1639"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1805"/>
-        <source>Saturation</source>
-        <translation>Saturação</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="385"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1549"/>
+        <source>Language</source>
+        <translation>Língua</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="278"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="826"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="849"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="875"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="927"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="993"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1019"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1101"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1117"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1450"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2278"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2382"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2408"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2434"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2474"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2497"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1586"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1621"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1623"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1625"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1628"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1637"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1638"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1710"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1785"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1789"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1801"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1803"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1806"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1807"/>
-        <source>%</source>
-        <translation>%</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="395"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2063"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1565"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1780"/>
+        <source>Date format</source>
+        <translation>Formato para a data</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="865"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2261"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1624"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1784"/>
-        <source>Desaturation</source>
-        <translation>Dessaturação</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="405"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1572"/>
+        <source>Brightness</source>
+        <translation>Brilho</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="983"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2398"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1636"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1800"/>
-        <source>Last deco</source>
-        <translation>Último patamar</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="415"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1850"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1579"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1753"/>
+        <source>Units</source>
+        <translation>Unidades</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="711"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="736"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="758"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="904"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2181"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2206"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2228"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2307"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1626"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1786"/>
-        <source> m</source>
-        <translation>m</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="425"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1585"/>
+        <source>Salinity (0-5%)</source>
+        <translation>Salinidade (0-5%)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="405"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1572"/>
-        <source>Brightness</source>
-        <translation>Brilho</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="438"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1615"/>
+        <source>Reset device to default settings</source>
+        <translation>Reinicializar dispositivo para as configurações padrão</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="260"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1575"/>
-        <source>Eco</source>
-        <translation>Eco</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="452"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1590"/>
+        <source>230LSB/Gauss</source>
+        <translation>230LSB/Gauss</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="265"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1576"/>
-        <source>Medium</source>
-        <translation>Médio</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="457"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1591"/>
+        <source>330LSB/Gauss</source>
+        <translation>330LSB/Gauss</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="270"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1577"/>
-        <source>High</source>
-        <translation>Alto</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="462"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1592"/>
+        <source>390LSB/Gauss</source>
+        <translation>390LSB/Gauss</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="603"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2034"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1599"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1779"/>
-        <source>Sampling rate</source>
-        <translation>Taxa de amostragem</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="467"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1593"/>
+        <source>440LSB/Gauss</source>
+        <translation>440LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="472"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1594"/>
+        <source>660LSB/Gauss</source>
+        <translation>660LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="477"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1595"/>
+        <source>820LSB/Gauss</source>
+        <translation>820LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="482"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1596"/>
+        <source>1090LSB/Gauss</source>
+        <translation>1090LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="487"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1597"/>
+        <source>1370LSB/Gauss</source>
+        <translation>1370LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="521"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1587"/>
+        <source>Compass gain</source>
+        <translation>Resolução da bússola</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="531"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1799"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1745"/>
+        <source>Computer model</source>
+        <translation>Modelo do computador de mergulho</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="538"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1713"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1990"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1548"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1729"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1768"/>
+        <source>Custom text</source>
+        <translation>Texto personalizado</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="556"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1560"/>
+        <source>OC</source>
+        <translation>Circuito aberto</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="561"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1561"/>
+        <source>CC</source>
+        <translation>Circuito fechado</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="566"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2336"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1562"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1793"/>
+        <source>Gauge</source>
+        <translation>Profundímetro</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="571"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1563"/>
+        <source>Apnea</source>
+        <translation>Apneia</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="579"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1557"/>
+        <source>Dive mode</source>
+        <translation>Modo de mergulho</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="590"/>
@@ -852,30 +953,12 @@
         <translation>10 s</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="415"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1850"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1579"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1753"/>
-        <source>Units</source>
-        <translation>Unidades</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="313"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1582"/>
-        <source>m/°C</source>
-        <translation>m/°C</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="318"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1583"/>
-        <source>ft/°F</source>
-        <translation>ft/°F</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="644"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1605"/>
-        <source>Dive mode color</source>
-        <translation>Cor para o modo de mergulho</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="603"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2034"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1599"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1779"/>
+        <source>Sampling rate</source>
+        <translation>Taxa de amostragem</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="614"/>
@@ -902,12 +985,6 @@
         <translation>Azul</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="425"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1585"/>
-        <source>Salinity (0-5%)</source>
-        <translation>Salinidade (0-5%)</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="637"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2092"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1613"/>
@@ -916,90 +993,80 @@
         <translation>Sincronizar computador de mergulho com um PC</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="521"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1587"/>
-        <source>Compass gain</source>
-        <translation>Resolução da bússola</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="90"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1523"/>
-        <source>Read settings from backup file or from device before writing to the device</source>
-        <translation>Ler configurações da cópia de segurança ou do dispositivo antes de carregá-las para o dispositivo</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="116"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1527"/>
-        <source>Read settings from backup file or from device before writing to a backup file</source>
-        <translation>Ler configurações do ficheiro de backup ou do dispositivo antes de criar uma cópia de segurança</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="232"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1543"/>
-        <source>OSTC, Mk.2/2N/2C</source>
-        <translation>OSTC, Mk.2/2N/2C</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="644"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1605"/>
+        <source>Dive mode color</source>
+        <translation>Cor para o modo de mergulho</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="452"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1590"/>
-        <source>230LSB/Gauss</source>
-        <translation>230LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="654"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2020"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1614"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1771"/>
+        <source>Show safety stop</source>
+        <translation>Mostrar paragem de segurança</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="457"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1591"/>
-        <source>330LSB/Gauss</source>
-        <translation>330LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="661"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2145"/>
+        <source>End Depth</source>
+        <translation>Profundidade final</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="462"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1592"/>
-        <source>390LSB/Gauss</source>
-        <translation>390LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="671"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2162"/>
+        <source> s</source>
+        <translation>s</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="467"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1593"/>
-        <source>440LSB/Gauss</source>
-        <translation>440LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="687"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1953"/>
+        <source>Length</source>
+        <translation>Comprimento</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="472"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1594"/>
-        <source>660LSB/Gauss</source>
-        <translation>660LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="694"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2138"/>
+        <source>Start Depth</source>
+        <translation>Profundidade inicial</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="477"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1595"/>
-        <source>820LSB/Gauss</source>
-        <translation>820LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="701"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2152"/>
+        <source>Reset Depth</source>
+        <translation>Reinicializar a profundidade</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="482"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1596"/>
-        <source>1090LSB/Gauss</source>
-        <translation>1090LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="711"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="736"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="758"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="904"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2181"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2206"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2228"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2307"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1626"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1786"/>
+        <source> m</source>
+        <translation>m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="487"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1597"/>
-        <source>1370LSB/Gauss</source>
-        <translation>1370LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="778"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2248"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1643"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1810"/>
+        <source>Advanced settings</source>
+        <translation>Configurações avançadas</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="654"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2020"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1614"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1771"/>
-        <source>Show safety stop</source>
-        <translation>Mostrar paragem de segurança</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="784"/>
+        <source>Left button sensitivity</source>
+        <translation>Sensibilidade do botão esquerdo</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="438"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1615"/>
-        <source>Reset device to default settings</source>
-        <translation>Reinicializar dispositivo para as configurações padrão</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="791"/>
+        <source>Always show ppO2</source>
+        <translation>Mostrar sempre a ppO2</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="798"/>
@@ -1010,20 +1077,6 @@
         <translation>Alt GF pode ser seleccionado debaixo de água</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="223"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1541"/>
-        <source>Suunto Vyper family</source>
-        <translation>Família Suunto Vyper</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="778"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2248"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1643"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1810"/>
-        <source>Advanced settings</source>
-        <translation>Configurações avançadas</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="805"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2271"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1618"/>
@@ -1054,6 +1107,14 @@
         <translation>GFHigh</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="865"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2261"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1624"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1784"/>
+        <source>Desaturation</source>
+        <translation>Dessaturação</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="917"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2320"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1627"/>
@@ -1068,14 +1129,6 @@
         <translation>mbar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="973"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2369"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1630"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1788"/>
-        <source> min</source>
-        <translation>min</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="960"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2331"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1633"/>
@@ -1084,63 +1137,28 @@
         <translation>ZH-L16</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="47"/>
-        <source>Connect via Bluetooth</source>
-        <translation>Ligar via Bluetooth</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="163"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1532"/>
-        <source>Save libdivecomputer logfile</source>
-        <translation>Gravar registo do libdivecomputer</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="661"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2145"/>
-        <source>End Depth</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="671"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2162"/>
-        <source> s</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="687"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1953"/>
-        <source>Length</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="694"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2138"/>
-        <source>Start Depth</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="701"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2152"/>
-        <source>Reset Depth</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="784"/>
-        <source>Left button sensitivity</source>
-        <translation>Sensibilidade do botão esquerdo</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="791"/>
-        <source>Always show ppO2</source>
-        <translation>Mostrar sempre a ppO2</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="965"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1634"/>
         <source>ZH-L16+GF</source>
         <translation>ZH-L16+GF</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="973"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2369"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1630"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1788"/>
+        <source> min</source>
+        <translation>min</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="983"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2398"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1636"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1800"/>
+        <source>Last deco</source>
+        <translation>Último patamar</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1009"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2424"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1640"/>
@@ -1157,6 +1175,14 @@
         <translation>Alt GFHigh</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1042"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2457"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1639"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1805"/>
+        <source>Saturation</source>
+        <translation>Saturação</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1052"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1642"/>
         <source>Flip screen</source>
@@ -1168,12 +1194,22 @@
         <translation>Sensibilidade do botão direito</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1066"/>
+        <source>MOD warning</source>
+        <translation>Aviso MOD</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1073"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2513"/>
         <source>Graphical speed indicator</source>
         <translation>Indicador gráfico da velocidade</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1080"/>
+        <source>Dynamic ascent rate</source>
+        <translation>Velocidade de subida dinâmica</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1087"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2552"/>
         <source>Bottom gas consumption</source>
@@ -1186,14 +1222,22 @@
         <translation>Consumo de gás durante a descompressão</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1133"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1149"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2520"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2536"/>
+        <source> ℓ/min</source>
+        <translation> ℓ/min</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1165"/>
         <source>Temperature sensor offset</source>
-        <translation type="unfinished"/>
+        <translation>Desvio do sensor de temperatura</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1172"/>
         <source>°C</source>
-        <translation type="unfinished"/>
+        <translation>°C</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1192"/>
@@ -1204,6 +1248,18 @@
         <translation>Definições dos gases</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1235"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1320"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2610"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2695"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1645"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1668"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1812"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1835"/>
+        <source>%O₂</source>
+        <translation>%O₂</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1240"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1325"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2615"/>
@@ -1322,16 +1378,10 @@
         <translation>Dil 5</translation>
     </message>
     <message>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1691"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1858"/>
-        <source>Set point [cbar]</source>
-        <translation>Set point [cbar]</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1693"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1860"/>
-        <source>Change depth [m]</source>
-        <translation>Mudar profundidade [m]</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1405"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2770"/>
+        <source>Setpoint</source>
+        <translation>Setpoint fixo</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1415"/>
@@ -1370,6 +1420,12 @@
         <translation>SP 5</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1443"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1709"/>
+        <source>O₂ in calibration gas</source>
+        <translation>O₂ no gás de calibração</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1467"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1713"/>
         <source>Fixed setpoint</source>
@@ -1400,101 +1456,6 @@
         <translation>cbar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1748"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1733"/>
-        <source>P1 (medium)</source>
-        <extracomment>Suunto safety level</extracomment>
-        <translation>P1 (médio)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1753"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1734"/>
-        <source>P2 (high)</source>
-        <extracomment>Suunto safety level</extracomment>
-        <translation>P2 (alto)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1792"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1744"/>
-        <source>Total dive time</source>
-        <translation>Tempo total de mergulho</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2109"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1769"/>
-        <source>kg/ℓ</source>
-        <translation>kg/ℓ</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2346"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1795"/>
-        <source>Apnoea</source>
-        <translation>Apneia</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1583"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1722"/>
-        <source>Safety level</source>
-        <translation>Nível de segurança</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="54"/>
-        <source>Connect</source>
-        <translation>Ligar</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="64"/>
-        <source>Disconnect</source>
-        <translation>Desligar</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="214"/>
-        <source>OSTC 3,Sport,Cr,2</source>
-        <translation>OSTC 3,Sport,Cr,2</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1066"/>
-        <source>MOD warning</source>
-        <translation>Aviso MOD</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1080"/>
-        <source>Dynamic ascent rate</source>
-        <translation>Velocidade de subida dinâmica</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1133"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1149"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2520"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2536"/>
-        <source> ℓ/min</source>
-        <translation> ℓ/min</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1235"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1320"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2610"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2695"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1645"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1668"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1812"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1835"/>
-        <source>%O₂</source>
-        <translation>%O₂</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1405"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2770"/>
-        <source>Setpoint</source>
-        <translation>Setpoint fixo</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1443"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1709"/>
-        <source>O₂ in calibration gas</source>
-        <translation>O₂ no gás de calibração</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1535"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2843"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1719"/>
@@ -1511,6 +1472,12 @@
         <translation>pO₂ min</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1583"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1722"/>
+        <source>Safety level</source>
+        <translation>Nível de segurança</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1609"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1723"/>
         <source>Altitude range</source>
@@ -1544,6 +1511,20 @@
         <translation>P0 (nenhum)</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1748"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1733"/>
+        <source>P1 (medium)</source>
+        <extracomment>Suunto safety level</extracomment>
+        <translation>P1 (médio)</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1753"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1734"/>
+        <source>P2 (high)</source>
+        <extracomment>Suunto safety level</extracomment>
+        <translation>P2 (alto)</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1761"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1736"/>
         <source>Sample rate</source>
@@ -1568,11 +1549,10 @@
         <translation>60 s</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="531"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1799"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1745"/>
-        <source>Computer model</source>
-        <translation>Modelo do computador de mergulho</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1792"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1744"/>
+        <source>Total dive time</source>
+        <translation>Tempo total de mergulho</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1816"/>
@@ -1637,12 +1617,6 @@
         <translation>Alarme de tempo</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2099"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1765"/>
-        <source>Salinity</source>
-        <translation>Salinidade</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2074"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1774"/>
         <source>MM/DD/YY</source>
@@ -1661,12 +1635,30 @@
         <translation>AA/MM/DD</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2099"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1765"/>
+        <source>Salinity</source>
+        <translation>Salinidade</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2109"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1769"/>
+        <source>kg/ℓ</source>
+        <translation>kg/ℓ</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2341"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1794"/>
         <source>ZH-L16 CC</source>
         <translation>ZH-L16 Circuito fechado</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2346"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1795"/>
+        <source>Apnoea</source>
+        <translation>Apneia</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2351"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1796"/>
         <source>L16-GF OC</source>
@@ -1685,87 +1677,112 @@
         <translation>PSCR-GF</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1108"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1129"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1539"/>
+        <source>OSTC 3</source>
+        <translation>OSTC 3</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1691"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1858"/>
+        <source>Set point [cbar]</source>
+        <translation>Set point [cbar]</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1693"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1860"/>
+        <source>Change depth [m]</source>
+        <translation>Mudar profundidade [m]</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1110"/>
+        <source>Backup dive computer settings</source>
+        <translation>Cópia de segurança das configurações do computador de mergulho</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1111"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1132"/>
         <source>Backup files (*.xml)</source>
         <translation>Cópias de segurança (*.xml)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1113"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1115"/>
+        <source>XML backup error</source>
+        <translation>Erro na cópia de segurança XML</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1116"/>
         <source>An error occurred while saving the backup file.
 %1</source>
         <translation>Ocorreu um erro ao efectuar a cópia de segurança.
 %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1116"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1119"/>
         <source>Backup succeeded</source>
         <translation>Cópia de segurança efectuada com sucesso</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1117"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1120"/>
         <source>Your settings have been saved to: %1</source>
         <translation>As suas configurações foram gravadas em: %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1107"/>
-        <source>Backup dive computer settings</source>
-        <translation>Cópia de segurança das configurações do computador de mergulho</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1112"/>
-        <source>XML backup error</source>
-        <translation>Erro na cópia de segurança XML</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1128"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1131"/>
         <source>Restore dive computer settings</source>
         <translation>Restaurar configurações do computador de mergulho</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1134"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1137"/>
         <source>XML restore error</source>
         <translation>Erro ao restaurar XML</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1135"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1138"/>
         <source>An error occurred while restoring the backup file.
 %1</source>
         <translation>Ocorreu um erro ao restaurar a cópia de segurança.
 %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1139"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1142"/>
         <source>Restore succeeded</source>
         <translation>Reposição efectuada com sucesso</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1140"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1143"/>
         <source>Your settings have been restored successfully.</source>
         <translation>As suas definições foram restauradas com sucesso.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1150"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1153"/>
         <source>Select firmware file</source>
         <translation>Seleccionar ficheiro de firmware</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1151"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1154"/>
         <source>All files (*.*)</source>
         <translation>Todos os ficheiros (*.*)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1207"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1210"/>
         <source>Choose file for divecomputer download logfile</source>
         <translation>Seleccione o ficheiro para transferir os mergulhos do computador de mergulho</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1208"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1211"/>
         <source>Log files (*.log)</source>
         <translation>Ficheiros log (*.log)</translation>
     </message>
 </context>
 <context>
+    <name>ContextDrawer</name>
+    <message>
+        <location filename="../mobile-widgets/qml/kirigami/src/controls/ContextDrawer.qml" line="76"/>
+        <source>Actions</source>
+        <translation>Acções</translation>
+    </message>
+</context>
+<context>
     <name>CylindersModel</name>
     <message>
         <location filename="../qt-models/cylindermodel.cpp" line="16"/>
@@ -1779,11 +1796,6 @@
     </message>
     <message>
         <location filename="../qt-models/cylindermodel.cpp" line="16"/>
-        <source>He%</source>
-        <translation>He%</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="16"/>
         <source>Work press.</source>
         <translation>Pressão de serviço</translation>
     </message>
@@ -1803,9 +1815,24 @@
         <translation>%O₂</translation>
     </message>
     <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="16"/>
+        <source>He%</source>
+        <translation>He%</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
+        <source>Deco switch at</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
+        <source>Bot. MOD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../qt-models/cylindermodel.cpp" line="17"/>
-        <source>Switch at</source>
-        <translation>Mudar aos</translation>
+        <source>MND</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-models/cylindermodel.cpp" line="17"/>
@@ -1823,17 +1850,32 @@
         <translation>ℓ</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="161"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="177"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation>Ao clicar aqui irá eliminar esta garrafa.</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="383"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="180"/>
+        <source>Switch depth for deco gas. Calculated using Deco pO₂ preference, unless set manually.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="183"/>
+        <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to &apos;*&apos; for best O₂% for max depth.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="186"/>
+        <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to &apos;*&apos; for best He% for max depth.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="444"/>
         <source>Cylinder cannot be removed</source>
         <translation>A garrafa não pode ser eliminada</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="384"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="445"/>
         <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source>
         <translation>Este gás está a ser usado. Apenas podem ser removidas as garrafas que não foram usadas durante o mergulho.</translation>
     </message>
@@ -1853,42 +1895,24 @@
         <translation>Quais os componentes que deseja copiar</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="73"/>
+        <location filename="../build/ui_divecomponentselection.h" line="141"/>
+        <source>Dive site</source>
+        <translation>Local de mergulho</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="80"/>
         <location filename="../build/ui_divecomponentselection.h" line="142"/>
         <source>Suit</source>
         <translation>Fato</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="122"/>
-        <location filename="../build/ui_divecomponentselection.h" line="148"/>
-        <source>Divemaster</source>
-        <translation>Guia de mergulho</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="129"/>
-        <location filename="../build/ui_divecomponentselection.h" line="149"/>
-        <source>Buddy</source>
-        <translation>Companheiros</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="136"/>
-        <location filename="../build/ui_divecomponentselection.h" line="150"/>
-        <source>Rating</source>
-        <translation>Classificação</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="87"/>
         <location filename="../build/ui_divecomponentselection.h" line="143"/>
         <source>Visibility</source>
         <translation>Visibilidade</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="73"/>
-        <location filename="../build/ui_divecomponentselection.h" line="141"/>
-        <source>Dive site</source>
-        <translation>Local de mergulho</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="94"/>
         <location filename="../build/ui_divecomponentselection.h" line="144"/>
         <source>Notes</source>
@@ -1912,10 +1936,34 @@
         <source>Cylinders</source>
         <translation>Garrafas</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="122"/>
+        <location filename="../build/ui_divecomponentselection.h" line="148"/>
+        <source>Divemaster</source>
+        <translation>Guia de mergulho</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="129"/>
+        <location filename="../build/ui_divecomponentselection.h" line="149"/>
+        <source>Buddy</source>
+        <translation>Companheiros</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="136"/>
+        <location filename="../build/ui_divecomponentselection.h" line="150"/>
+        <source>Rating</source>
+        <translation>Classificação</translation>
+    </message>
 </context>
 <context>
     <name>DiveComputerManagementDialog</name>
     <message>
+        <location filename="../desktop-widgets/divecomputermanagementdialog.ui" line="17"/>
+        <location filename="../build/ui_divecomputermanagementdialog.h" line="65"/>
+        <source>Edit dive computer nicknames</source>
+        <translation>Editar nome do computador de mergulho</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divecomputermanagementdialog.cpp" line="49"/>
         <source>Remove the selected dive computer?</source>
         <translation>Remover o computador de mergulho seleccionado?</translation>
@@ -1927,12 +1975,6 @@
         <translation>Tem a certeza que deseja
 remover o computador de mergulho seleccionado?</translation>
     </message>
-    <message>
-        <location filename="../desktop-widgets/divecomputermanagementdialog.ui" line="17"/>
-        <location filename="../build/ui_divecomputermanagementdialog.h" line="65"/>
-        <source>Edit dive computer nicknames</source>
-        <translation>Editar nome do computador de mergulho</translation>
-    </message>
 </context>
 <context>
     <name>DiveComputerModel</name>
@@ -1960,106 +2002,112 @@ remover o computador de mergulho seleccionado?</translation>
 <context>
     <name>DiveDetails</name>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="33"/>
+        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="38"/>
         <source>Dive details</source>
-        <translation type="unfinished"/>
+        <translation>Detalhes do mergulho</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="67"/>
+        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="72"/>
         <source>Delete dive</source>
         <translation>Eliminar mergulho</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="84"/>
+        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="89"/>
         <source>Show on map</source>
-        <translation type="unfinished"/>
+        <translation>Mostrar no mapa</translation>
     </message>
 </context>
 <context>
     <name>DiveDetailsEdit</name>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="74"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="80"/>
         <source>Dive %1</source>
-        <translation type="unfinished"/>
+        <translation>Mergulho %1</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="78"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="84"/>
         <source>Date:</source>
         <translation>Data:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="86"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="92"/>
         <source>Location:</source>
         <translation>Local:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="95"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="101"/>
         <source>Coordinates:</source>
-        <translation type="unfinished"/>
+        <translation>Coordenadas:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="104"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="110"/>
         <source>Use current
 GPS location:</source>
-        <translation type="unfinished"/>
+        <translation>Usar a localização
+do GPS actual:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="118"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="124"/>
         <source>Depth:</source>
         <translation>Profundidade:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="127"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="133"/>
         <source>Duration:</source>
         <translation>Duração:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="137"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="143"/>
         <source>Air Temp:</source>
         <translation>Temperatura do ar:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="146"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="152"/>
         <source>Water Temp:</source>
         <translation>Temperatura da água:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="155"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="161"/>
         <source>Suit:</source>
         <translation>Fato:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="164"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="176"/>
         <source>Buddy:</source>
         <translation>Companheiros:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="173"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="191"/>
         <source>Dive Master:</source>
-        <translation type="unfinished"/>
+        <translation>Guia de mergulho:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="182"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="206"/>
         <source>Weight:</source>
         <translation>Peso:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="192"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="216"/>
+        <source>Cylinder:</source>
+        <translation>Garrafa:</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="231"/>
         <source>Gas mix:</source>
-        <translation type="unfinished"/>
+        <translation>Mistura respiratória:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="203"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="241"/>
         <source>Start Pressure:</source>
-        <translation type="unfinished"/>
+        <translation>Pressão inicial:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="213"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="250"/>
         <source>End Pressure:</source>
-        <translation type="unfinished"/>
+        <translation>Pressão final:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="224"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="260"/>
         <source>Notes:</source>
         <translation>Notas:</translation>
     </message>
@@ -2069,27 +2117,27 @@ GPS location:</source>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="63"/>
         <source>Date: </source>
-        <translation type="unfinished"/>
+        <translation>Data:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="80"/>
         <source>Depth: </source>
-        <translation type="unfinished"/>
+        <translation>Profundidade:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="89"/>
         <source>Duration: </source>
-        <translation type="unfinished"/>
+        <translation>Duração:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="121"/>
         <source>No profile to show</source>
-        <translation type="unfinished"/>
+        <translation>Não existe perfil para mostrar</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="139"/>
         <source>Dive Details</source>
-        <translation type="unfinished"/>
+        <translation>Detalhes do mergulho</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="144"/>
@@ -2097,42 +2145,42 @@ GPS location:</source>
         <translation>Fato:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="159"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="158"/>
         <source>Air Temp:</source>
         <translation>Temperatura do ar:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="175"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="172"/>
         <source>Cylinder:</source>
-        <translation type="unfinished"/>
+        <translation>Garrafa:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="189"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="185"/>
         <source>Water Temp:</source>
         <translation>Temperatura da água:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="205"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="198"/>
         <source>Dive Master:</source>
-        <translation type="unfinished"/>
+        <translation>Guia de mergulho:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="220"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="211"/>
         <source>Weight:</source>
         <translation>Peso:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="249"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="224"/>
         <source>Buddy:</source>
         <translation>Companheiros:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="263"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="237"/>
         <source>SAC:</source>
         <translation>Consumo:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="280"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="252"/>
         <source>Notes</source>
         <translation>Notas</translation>
     </message>
@@ -2140,18 +2188,18 @@ GPS location:</source>
 <context>
     <name>DiveEventItem</name>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="134"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="165"/>
         <source>Manual switch to OC</source>
         <translation>Mudança manual para circuito aberto</translation>
     </message>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="136"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="167"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation>iniciar</translation>
     </message>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="137"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="168"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation>fim</translation>
@@ -2160,27 +2208,27 @@ GPS location:</source>
 <context>
     <name>DiveImportedModel</name>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="646"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="656"/>
         <source>Date/time</source>
         <translation>Data e hora</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="648"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="658"/>
         <source>Duration</source>
         <translation>Duração</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="650"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="660"/>
         <source>Depth</source>
         <translation>Profundidade</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="672"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="682"/>
         <source>h:</source>
         <translation>h:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="672"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="682"/>
         <source>min</source>
         <translation>min</translation>
     </message>
@@ -2189,126 +2237,131 @@ GPS location:</source>
     <name>DiveList</name>
     <message>
         <location filename="../mobile-widgets/qml/DiveList.qml" line="12"/>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="226"/>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="232"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="227"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="233"/>
         <source>Dive list</source>
-        <translation type="unfinished"/>
+        <translation>Lista de mergulhos</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveList.qml" line="95"/>
         <source>Depth: </source>
-        <translation type="unfinished"/>
+        <translation>Profundidade:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveList.qml" line="106"/>
         <source>Duration: </source>
-        <translation type="unfinished"/>
+        <translation>Duração:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="222"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="223"/>
         <source>Cloud credentials</source>
-        <translation type="unfinished"/>
+        <translation>Credenciais da nuvem</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="228"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="229"/>
         <source>Please tap the &apos;+&apos; button to add a dive</source>
+        <translation>Por favor toque no botão &apos;+&apos; para adicionar um mergulho</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="248"/>
+        <source>No dives in dive list</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DiveListView</name>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="846"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="849"/>
         <source>Expand all</source>
         <translation>Expandir todos</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="848"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="851"/>
         <source>Collapse all</source>
         <translation>Colapsar todos</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="852"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="855"/>
         <source>Collapse others</source>
         <translation>Colapsar outros</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="856"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="859"/>
         <source>Remove dive(s) from trip</source>
         <translation>Remover mergulho(s) desta viagem</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="857"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="860"/>
         <source>Create new trip above</source>
         <translation>Criar uma nova viagem acima</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="871"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="874"/>
         <source>Add dive(s) to trip immediately above</source>
         <translation>Adicionar mergulho(s) à viagem imediatamente acima</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="873"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="876"/>
         <source>Add dive(s) to trip immediately below</source>
         <translation>Adicionar mergulho(s) à viagem imediatamente abaixo</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="877"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="880"/>
         <source>Merge trip with trip above</source>
         <translation>Juntar esta viagem com a viagem acima</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="878"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="881"/>
         <source>Merge trip with trip below</source>
         <translation>Juntar esta viagem com a viagem abaixo</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="882"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="885"/>
         <source>Delete dive(s)</source>
         <translation>Eliminar mergulho(s)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="884"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="887"/>
         <source>Mark dive(s) invalid</source>
         <translation>Marcar mergulho(s) como inválido(s)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="888"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="891"/>
         <source>Merge selected dives</source>
         <translation>Juntar os mergulhos seleccionados</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="890"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="893"/>
         <source>Renumber dive(s)</source>
         <translation>Renumerar mergulho(s)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="891"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="894"/>
         <source>Shift dive times</source>
         <translation>Deslocar os tempos de mergulho</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="892"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="895"/>
         <source>Split selected dives</source>
         <translation>Dividir os mergulhos seleccionados</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="893"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="896"/>
         <source>Load image(s) from file(s)</source>
         <translation>Carregar imagens do(s) ficheiro(s)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="894"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="897"/>
         <source>Load image(s) from web</source>
         <translation>Carregar imagens da web</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="917"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="919"/>
         <source>Open image files</source>
         <translation>Abrir ficheiros de imagens</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="917"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="919"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>Ficheiros de imagem (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -2329,56 +2382,6 @@ GPS location:</source>
 <context>
     <name>DiveLogExportDialog</name>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="103"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="351"/>
-        <source>Export format</source>
-        <translation>Exportar formato</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="134"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="353"/>
-        <source>UDDF</source>
-        <translation>UDDF</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="187"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="358"/>
-        <source>Worldmap</source>
-        <translation>Mapa mundo</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="197"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="359"/>
-        <source>I&amp;mage depths</source>
-        <translation>Profundidades das I&amp;magens</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="243"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="360"/>
-        <source>Selection</source>
-        <translation>Selecção</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="252"/>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="346"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="361"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="372"/>
-        <source>Selected dives</source>
-        <translation>Mergulhos seleccionados</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="262"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="362"/>
-        <source>All dives</source>
-        <translation>Todos os mergulhos</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="306"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="396"/>
-        <source>HTML</source>
-        <translation>HTML</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="14"/>
         <location filename="../build/ui_divelogexportdialog.h" line="349"/>
         <source>Export dive log files</source>
@@ -2391,12 +2394,24 @@ GPS location:</source>
         <translation>Definições</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="103"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="351"/>
+        <source>Export format</source>
+        <translation>Exportar formato</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="115"/>
         <location filename="../build/ui_divelogexportdialog.h" line="352"/>
         <source>Subsurface &amp;XML</source>
         <translation>&amp;XML do Subsurface</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="134"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="353"/>
+        <source>UDDF</source>
+        <translation>UDDF</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="147"/>
         <location filename="../build/ui_divelogexportdialog.h" line="354"/>
         <source>di&amp;velogs.de</source>
@@ -2421,238 +2436,297 @@ GPS location:</source>
         <translation>Detalhes de mergulho em CSV</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="275"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="187"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="358"/>
+        <source>Worldmap</source>
+        <translation>Mapa mundo</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="197"/>
+        <source>TeX</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="207"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="359"/>
+        <source>I&amp;mage depths</source>
+        <translation>Profundidades das I&amp;magens</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="253"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="360"/>
+        <source>Selection</source>
+        <translation>Selecção</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="262"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="356"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="361"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="372"/>
+        <source>Selected dives</source>
+        <translation>Mergulhos seleccionados</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="272"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="362"/>
+        <source>All dives</source>
+        <translation>Todos os mergulhos</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="285"/>
         <location filename="../build/ui_divelogexportdialog.h" line="363"/>
         <source>CSV units</source>
         <translation>Unidades CSV</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="288"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="298"/>
         <location filename="../build/ui_divelogexportdialog.h" line="366"/>
         <source>Metric</source>
         <translation>Métrico</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="293"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="303"/>
         <location filename="../build/ui_divelogexportdialog.h" line="367"/>
         <source>Imperial</source>
         <translation>Imperial</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="324"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="316"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="396"/>
+        <source>HTML</source>
+        <translation>HTML</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="334"/>
         <location filename="../build/ui_divelogexportdialog.h" line="370"/>
         <source>General settings</source>
         <translation>Definições Gerais</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="330"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="340"/>
         <location filename="../build/ui_divelogexportdialog.h" line="371"/>
         <source>Subsurface numbers</source>
         <translation>Números do Subsurface</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="359"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="369"/>
         <location filename="../build/ui_divelogexportdialog.h" line="373"/>
         <source>Export yearly statistics</source>
         <translation>Exportar estatísticas anuais</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="375"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="385"/>
         <location filename="../build/ui_divelogexportdialog.h" line="374"/>
         <source>All di&amp;ves</source>
         <translation>Todos os me&amp;rgulhos</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="385"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="395"/>
         <location filename="../build/ui_divelogexportdialog.h" line="375"/>
         <source>Export list only</source>
         <translation>Exportar apenas a lista</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="392"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="402"/>
         <location filename="../build/ui_divelogexportdialog.h" line="376"/>
         <source>Export photos</source>
         <translation>Exportar fotos</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="408"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="418"/>
         <location filename="../build/ui_divelogexportdialog.h" line="377"/>
         <source>Style options</source>
         <translation>Opções de estilo</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="423"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="433"/>
         <location filename="../build/ui_divelogexportdialog.h" line="378"/>
         <source>Font</source>
         <translation>Fonte</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="433"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="443"/>
         <location filename="../build/ui_divelogexportdialog.h" line="379"/>
         <source>Font size</source>
         <translation>Tamanho da fonte</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="444"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="454"/>
         <location filename="../build/ui_divelogexportdialog.h" line="382"/>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="449"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="459"/>
         <location filename="../build/ui_divelogexportdialog.h" line="383"/>
         <source>10</source>
         <translation>10</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="454"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="464"/>
         <location filename="../build/ui_divelogexportdialog.h" line="384"/>
         <source>12</source>
         <translation>12</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="459"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="469"/>
         <location filename="../build/ui_divelogexportdialog.h" line="385"/>
         <source>14</source>
         <translation>14</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="464"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="474"/>
         <location filename="../build/ui_divelogexportdialog.h" line="386"/>
         <source>16</source>
         <translation>16</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="469"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="479"/>
         <location filename="../build/ui_divelogexportdialog.h" line="387"/>
         <source>18</source>
         <translation>18</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="474"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="484"/>
         <location filename="../build/ui_divelogexportdialog.h" line="388"/>
         <source>20</source>
         <translation>20</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="482"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="492"/>
         <location filename="../build/ui_divelogexportdialog.h" line="390"/>
         <source>Theme</source>
         <translation>Tema</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="493"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="503"/>
         <location filename="../build/ui_divelogexportdialog.h" line="393"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="95"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="99"/>
         <source>Light</source>
         <translation>Leve</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="498"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="508"/>
         <location filename="../build/ui_divelogexportdialog.h" line="394"/>
         <source>Sand</source>
         <translation>Areia</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="134"/>
-        <source>UDDF files (*.uddf *.UDDF)</source>
-        <translation>Ficheiros UDDF  (*.uddf *.UDDF)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="142"/>
-        <source>CSV files (*.csv *.CSV)</source>
-        <translation>Ficheiros CSV (*.csv *.CSV)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="74"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="76"/>
         <source>Generic format that is used for data exchange between a variety of diving related programs.</source>
         <translation>Formato de uso genérico para trocar dados entre vários programas relacionados com o mergulho.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="76"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="78"/>
         <source>Comma separated values describing the dive profile.</source>
         <translation>Valores separados por vírgulas que descrevem o perfil do mergulho.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="78"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="80"/>
         <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source>
         <translation>Valores separados por vírgulas que descrevem dados sobre o mergulho. Incluem a maior parte dos dados de mergulho mas não informações sobre o perfil,</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="80"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="82"/>
         <source>Send the dive data to divelogs.de website.</source>
         <translation>Enviar dados de mergulho para o sítio da web do divelogs.de.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="82"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="84"/>
         <source>Send the dive data to dive-share.appspot.com website</source>
         <translation>Enviar dados do mergulho para dive-share.appspot.com</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="84"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="86"/>
         <source>HTML export of the dive locations, visualized on a world map.</source>
         <translation>Exportar HTML dos locais de mergulho, visualizados num mapa mundo.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="86"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="88"/>
         <source>Subsurface native XML format.</source>
         <translation>Formato XML nativo do Subsurface.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="88"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="90"/>
         <source>Write depths of images to file.</source>
         <translation>Gravar as profundidades das imagens para um ficheiro</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="133"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="92"/>
+        <source>Write dive as TeX macros to file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="137"/>
         <source>Export UDDF file as</source>
         <translation>Exportar ficheiro UDDF como</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="137"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/>
+        <source>UDDF files (*.uddf *.UDDF)</source>
+        <translation>Ficheiros UDDF  (*.uddf *.UDDF)</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divelogexportdialog.cpp" line="141"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="145"/>
         <source>Export CSV file as</source>
         <translation>Exportar ficheiro CSV como</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="148"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="142"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="146"/>
+        <source>CSV files (*.csv *.CSV)</source>
+        <translation>Ficheiros CSV (*.csv *.CSV)</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="152"/>
         <source>Export world map</source>
         <translation>Exportar mapa mundo</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="149"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="169"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="153"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="177"/>
         <source>HTML files (*.html)</source>
         <translation>Ficheiros HTML (*.html)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="153"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="157"/>
         <source>Export Subsurface XML</source>
         <translation>Exportar XML do Subsurface</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="158"/>
         <source>XML files (*.xml *.ssrf)</source>
         <translation>Ficheiros XML (*.xml *.ssrf)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="162"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="166"/>
         <source>Save image depths</source>
         <translation>Gravar profundidades das imagens</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="168"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="170"/>
+        <source>Export to TeX file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="170"/>
+        <source>TeX files (*.tex)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="176"/>
         <source>Export HTML files as</source>
         <translation>Exportar ficheiros HTML como</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="184"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="192"/>
         <source>Please wait, exporting...</source>
         <translation>A exportar. Por favor aguarde...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="219"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="227"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="311"/>
         <source>Can&apos;t open file %s</source>
         <translation>Não é possível abrir o ficheiro %s</translation>
     </message>
@@ -2666,25 +2740,6 @@ GPS location:</source>
         <translation>Importar ficheiro de livro de registos</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="643"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="727"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="856"/>
-        <source>Time</source>
-        <translation>Tempo</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.ui" line="127"/>
-        <location filename="../build/ui_divelogimportdialog.h" line="164"/>
-        <source>Metric</source>
-        <translation>Métrico</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.ui" line="132"/>
-        <location filename="../build/ui_divelogimportdialog.h" line="165"/>
-        <source>Imperial</source>
-        <translation>Imperial</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divelogimportdialog.ui" line="89"/>
         <location filename="../build/ui_divelogimportdialog.h" line="152"/>
         <source>dd.mm.yyyy</source>
@@ -2703,74 +2758,6 @@ GPS location:</source>
         <translation>aaaa-mm-dd</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.ui" line="155"/>
-        <location filename="../build/ui_divelogimportdialog.h" line="167"/>
-        <source>Drag the tags above to each corresponding column below</source>
-        <translation>Arraste as etiquetas acima para cada uma das colunas abaixo</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="641"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="729"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="852"/>
-        <source>Dive #</source>
-        <translation>Mergulho #</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="642"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="723"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="854"/>
-        <source>Date</source>
-        <translation>Data</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="644"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="858"/>
-        <source>Duration</source>
-        <translation>Duração</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="655"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="862"/>
-        <source>GPS</source>
-        <translation>GPS</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="645"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="864"/>
-        <source>Max. depth</source>
-        <translation>Prof. Max.</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="646"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="866"/>
-        <source>Avg. depth</source>
-        <translation>Prof. média</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="658"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="872"/>
-        <source>Suit</source>
-        <translation>Fato</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="663"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="878"/>
-        <source>Tags</source>
-        <translation>Etiquetas</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="652"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="894"/>
-        <source>O₂</source>
-        <translation>O₂</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="653"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="896"/>
-        <source>He</source>
-        <translation>He</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divelogimportdialog.ui" line="108"/>
         <location filename="../build/ui_divelogimportdialog.h" line="158"/>
         <source>Seconds</source>
@@ -2789,202 +2776,288 @@ GPS location:</source>
         <translation>Minutos:segundos</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="654"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="860"/>
-        <source>Location</source>
-        <translation>Local</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.ui" line="127"/>
+        <location filename="../build/ui_divelogimportdialog.h" line="164"/>
+        <source>Metric</source>
+        <translation>Métrico</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.ui" line="132"/>
+        <location filename="../build/ui_divelogimportdialog.h" line="165"/>
+        <source>Imperial</source>
+        <translation>Imperial</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.ui" line="155"/>
+        <location filename="../build/ui_divelogimportdialog.h" line="167"/>
+        <source>Drag the tags above to each corresponding column below</source>
+        <translation>Arraste as etiquetas acima para cada uma das colunas abaixo</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="354"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="499"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="505"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="355"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="528"/>
         <source>Tab</source>
         <translation>Tab</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="575"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="598"/>
         <source>Some column headers were pre-populated; please drag and drop the headers so they match the column they are in.</source>
         <translation>Alguns cabeçalhos foram previamente preenchidos; por favor arraste e largue os cabeçalhos de modo a que correspondam às colunas em questão.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="613"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="731"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="782"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="848"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="636"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="761"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="857"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="925"/>
         <source>Sample time</source>
         <translation>Hora</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="615"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="733"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="784"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="638"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="763"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="859"/>
         <source>Sample depth</source>
         <translation>Profundidade</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="617"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="735"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="786"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="640"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="765"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="861"/>
         <source>Sample temperature</source>
         <translation>Temperatura</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="621"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="739"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="790"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="642"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="767"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="863"/>
+        <source>Sample pO₂</source>
+        <translation>pO₂</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="644"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="769"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="865"/>
         <source>Sample sensor1 pO₂</source>
         <translation>Amostrar o sensor de pO₂ #1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="623"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="741"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="792"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="646"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="771"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="867"/>
         <source>Sample sensor2 pO₂</source>
         <translation>Amostrar o sensor de pO₂ #2</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="625"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="743"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="794"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="648"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="773"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="869"/>
         <source>Sample sensor3 pO₂</source>
         <translation>Amostrar o sensor de pO₂ #3</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="633"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="751"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="802"/>
-        <source>Sample stopdepth</source>
-        <translation>Profundidade da paragem</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="637"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="755"/>
-        <source>Sample setpoint</source>
-        <translation>Amostrar o setpoint</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="619"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="737"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="788"/>
-        <source>Sample pO₂</source>
-        <translation>pO₂</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="627"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="745"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="796"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="650"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="775"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="871"/>
         <source>Sample CNS</source>
         <translation>CNS</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="629"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="747"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="798"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="652"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="777"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="873"/>
         <source>Sample NDL</source>
         <translation>NDL</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="631"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="749"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="800"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="654"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="779"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="875"/>
         <source>Sample TTS</source>
         <translation>TTS</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="635"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="753"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="804"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="656"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="781"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="877"/>
+        <source>Sample stopdepth</source>
+        <translation>Profundidade da paragem</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="658"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="783"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="879"/>
         <source>Sample pressure</source>
         <translation>Pressão</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="656"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="868"/>
-        <source>Divemaster</source>
-        <translation>Guia de mergulho</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="660"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="785"/>
+        <source>Sample setpoint</source>
+        <translation>Amostrar o setpoint</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="657"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="870"/>
-        <source>Buddy</source>
-        <translation>Companheiros</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="664"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="759"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="929"/>
+        <source>Dive #</source>
+        <translation>Mergulho #</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="659"/>
-        <source>Rating</source>
-        <translation>Classificação</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="665"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="753"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="931"/>
+        <source>Date</source>
+        <translation>Data</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="660"/>
-        <source>Visibility</source>
-        <translation>Visibilidade</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="666"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="757"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="933"/>
+        <source>Time</source>
+        <translation>Tempo</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="661"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="874"/>
-        <source>Notes</source>
-        <translation>Notas</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="667"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="935"/>
+        <source>Duration</source>
+        <translation>Duração</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="662"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="876"/>
-        <source>Weight</source>
-        <translation>Peso</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="668"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="941"/>
+        <source>Max. depth</source>
+        <translation>Prof. Max.</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="669"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="943"/>
+        <source>Avg. depth</source>
+        <translation>Prof. média</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="670"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="975"/>
+        <source>Air temp.</source>
+        <translation>Temp. do ar</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="671"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="977"/>
+        <source>Water temp.</source>
+        <translation>Temp. da água</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="649"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="888"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="672"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="965"/>
         <source>Cyl. size</source>
         <translation>Tamanho da garrafa</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="650"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="890"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="673"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="967"/>
         <source>Start pressure</source>
         <translation>Pressão inicial</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="651"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="892"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="674"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="969"/>
         <source>End pressure</source>
         <translation>Pressão final</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="647"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="898"/>
-        <source>Air temp.</source>
-        <translation>Temp. do ar</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="675"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="971"/>
+        <source>O₂</source>
+        <translation>O₂</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="648"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="900"/>
-        <source>Water temp.</source>
-        <translation>Temp. da água</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="676"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="973"/>
+        <source>He</source>
+        <translation>He</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="677"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="937"/>
+        <source>Location</source>
+        <translation>Local</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="678"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="939"/>
+        <source>GPS</source>
+        <translation>GPS</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="679"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="945"/>
+        <source>Divemaster</source>
+        <translation>Guia de mergulho</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="680"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="947"/>
+        <source>Buddy</source>
+        <translation>Companheiros</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="681"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="949"/>
+        <source>Suit</source>
+        <translation>Fato</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="682"/>
+        <source>Rating</source>
+        <translation>Classificação</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="683"/>
+        <source>Visibility</source>
+        <translation>Visibilidade</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="684"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="951"/>
+        <source>Notes</source>
+        <translation>Notas</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="685"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="953"/>
+        <source>Weight</source>
+        <translation>Peso</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="686"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="955"/>
+        <source>Tags</source>
+        <translation>Etiquetas</translation>
     </message>
 </context>
 <context>
     <name>DiveObjectHelper</name>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="287"/>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="323"/>
         <source>%1 dive(s)</source>
-        <translation type="unfinished"/>
+        <translation>%1 mergulho(s)</translation>
     </message>
 </context>
 <context>
     <name>DivePlanner</name>
     <message>
-        <location filename="../desktop-widgets/diveplanner.ui" line="152"/>
-        <location filename="../build/ui_diveplanner.h" line="190"/>
-        <source>Altitude</source>
-        <translation>Altitude</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/diveplanner.ui" line="109"/>
         <location filename="../build/ui_diveplanner.h" line="189"/>
         <source>Planned dive time</source>
         <translation>Data e hora </translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/diveplanner.ui" line="152"/>
+        <location filename="../build/ui_diveplanner.h" line="190"/>
+        <source>Altitude</source>
+        <translation>Altitude</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/diveplanner.ui" line="159"/>
         <location filename="../build/ui_diveplanner.h" line="191"/>
         <source>ATM pressure</source>
@@ -3018,32 +3091,32 @@ GPS location:</source>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="134"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="136"/>
         <source>unknown</source>
         <translation>desconhecido</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="312"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="326"/>
         <source>Final depth</source>
         <translation>Profundidade final</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="314"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="328"/>
         <source>Run time</source>
         <translation>Tempo de mergulho</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="316"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="330"/>
         <source>Duration</source>
         <translation>Duração</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="318"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="332"/>
         <source>Used gas</source>
         <translation>Gás usado</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="320"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="334"/>
         <source>CC setpoint</source>
         <translation>Setpoint Circuito fechado</translation>
     </message>
@@ -3051,22 +3124,22 @@ GPS location:</source>
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="108"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="112"/>
         <source>Dive planner points</source>
         <translation>Pontos do plano de mergulho</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="112"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="116"/>
         <source>Available gases</source>
         <translation>Gases disponíveis</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="137"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="143"/>
         <source>Add dive data point</source>
         <translation>Adicionar ponto ao mergulho</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="146"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="152"/>
         <source>Save new</source>
         <translation>Gravar novo</translation>
     </message>
@@ -3099,11 +3172,36 @@ GPS location:</source>
         <translation>Côr</translation>
     </message>
     <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="124"/>
+        <source>User entered</source>
+        <translation>Inserido pelo utilizador</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="126"/>
+        <source>Cylinder index</source>
+        <translation>Lista de garrafas</translation>
+    </message>
+    <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="128"/>
         <source>Pressure S</source>
         <translation>Pressão S</translation>
     </message>
     <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="130"/>
+        <source>Pressure I</source>
+        <translation>Pressão I</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="132"/>
+        <source>Ceiling</source>
+        <translation>Tecto</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="134"/>
+        <source>SAC</source>
+        <translation>Consumo</translation>
+    </message>
+    <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="136"/>
         <source>pN₂</source>
         <translation>pN₂</translation>
@@ -3139,49 +3237,24 @@ GPS location:</source>
         <translation>Sensor 3</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="152"/>
-        <source>Heart rate</source>
-        <translation>Frequência cardíaca</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="156"/>
-        <source>Mean depth @ s</source>
-        <translation>Profundidade média @ s</translation>
-    </message>
-    <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="150"/>
         <source>Ambient pressure</source>
         <translation>Pressão ambiente</translation>
     </message>
     <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="152"/>
+        <source>Heart rate</source>
+        <translation>Frequência cardíaca</translation>
+    </message>
+    <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="154"/>
         <source>Gradient factor</source>
         <translation>Factor de gradiente</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="130"/>
-        <source>Pressure I</source>
-        <translation>Pressão I</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="124"/>
-        <source>User entered</source>
-        <translation>Inserido pelo utilizador</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="126"/>
-        <source>Cylinder index</source>
-        <translation>Lista de garrafas</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="132"/>
-        <source>Ceiling</source>
-        <translation>Tecto</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="134"/>
-        <source>SAC</source>
-        <translation>Consumo</translation>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="156"/>
+        <source>Mean depth @ s</source>
+        <translation>Profundidade média @ s</translation>
     </message>
 </context>
 <context>
@@ -3252,311 +3325,315 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="395"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="441"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="434"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="483"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="398"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="444"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="437"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="486"/>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="401"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="447"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="440"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="489"/>
         <source>Rating</source>
         <translation>Classificação</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="404"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="443"/>
         <source>Depth</source>
         <translation>Profundidade</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="410"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="446"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="495"/>
+        <source>Duration</source>
+        <translation>Duração</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="449"/>
         <source>Temp</source>
         <translation>Temp</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="413"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="452"/>
         <source>Weight</source>
         <translation>Peso</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="425"/>
-        <source>SAC</source>
-        <translation>Consumo</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
-        <source>m</source>
-        <translation>m</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
-        <source>ft</source>
-        <translation>pés</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
-        <source>Weight(%1)</source>
-        <translation>Peso(%1)</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="416"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="462"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="455"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="504"/>
         <source>Suit</source>
         <translation>Fato</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="419"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="465"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="458"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="507"/>
         <source>Cyl</source>
         <translation>Garrafa</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="422"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="468"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="461"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="510"/>
         <source>Gas</source>
         <translation>Gás</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
-        <source>SAC(%1)</source>
-        <translation>SAC(%1)</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="464"/>
+        <source>SAC</source>
+        <translation>Consumo</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
-        <source>/min</source>
-        <translation>/min</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="467"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="518"/>
+        <source>OTU</source>
+        <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="431"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="479"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="470"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="521"/>
         <source>Max CNS</source>
         <translation>CNS Máx</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="434"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="482"/>
-        <source>Location</source>
-        <translation>Local</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
+        <source>Photos</source>
+        <translation>Fotos</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
-        <source>kg</source>
-        <translation>kg</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="476"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="527"/>
+        <source>Location</source>
+        <translation>Local</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="492"/>
         <source>Depth(%1)</source>
         <translation>Profundidade(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="407"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="453"/>
-        <source>Duration</source>
-        <translation>Duração</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="492"/>
+        <source>m</source>
+        <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="456"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="492"/>
+        <source>ft</source>
+        <translation>pés</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="498"/>
         <source>Temp(%1%2)</source>
         <translation>Temperatura(%1%2)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="501"/>
+        <source>Weight(%1)</source>
+        <translation>Peso(%1)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="501"/>
+        <source>kg</source>
+        <translation>kg</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="501"/>
         <source>lbs</source>
         <translation>libras</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="428"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="476"/>
-        <source>OTU</source>
-        <translation>OTU</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="515"/>
+        <source>SAC(%1)</source>
+        <translation>SAC(%1)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="515"/>
+        <source>/min</source>
+        <translation>/min</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="524"/>
+        <source>Photos before/during/after dive</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="164"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="165"/>
         <source>no dives were selected</source>
         <translation>não foram seleccionados nenhuns mergulhos</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="174"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="175"/>
         <source>stylesheet to export to divelogs.de is not found</source>
         <translation>não foi possível encontrar a folha de estilos para exportar para divelogs.de</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="184"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="185"/>
         <source>failed to create zip file for upload: %s</source>
         <translation>erro ao criar um ficheiro zip para upload&gt; %s</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="236"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="237"/>
         <source>internal error</source>
         <translation>erro interno</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="244"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="245"/>
         <source>Conversion of dive %1 to divelogs.de format failed</source>
         <translation>A conversão do mergulho %1 para o formato divelogs.de falhou</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="272"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="273"/>
         <source>error writing zip file: %s zip error %d system error %d - %s</source>
         <translation>erro na escrita do ficheiro zip: %s erro zip %d erro de sistema %d - %s</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="745"/>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="935"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="936"/>
         <source>Done</source>
         <translation>Concluído</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="778"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="779"/>
         <source>Uploading dive list...</source>
         <translation>A carregar a lista dos mergulhos...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="810"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="811"/>
         <source>Downloading dive list...</source>
         <translation>A transferir a lista dos mergulhos...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="851"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="852"/>
         <source>Downloading %1 dives...</source>
         <translation>A transferir %1 mergulhos...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="885"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="886"/>
         <source>Download finished - %1</source>
         <translation>Transferência terminada - %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="899"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="900"/>
         <source>Problem with download</source>
         <translation>Problema ao descarregar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="900"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="901"/>
         <source>The archive could not be opened:
 </source>
         <translation>Não foi possível abrir o ficheiro:
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="909"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="910"/>
         <source>Corrupted download</source>
         <translation>Transferência corrompida</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="910"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="911"/>
         <source>The archive could not be opened:
 %1</source>
         <translation>Não foi possível abrir o ficheiro:
 %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="937"/>
+        <source>Upload finished</source>
+        <translation>Carregamento terminado</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="950"/>
         <source>Upload failed</source>
         <translation>A exportação falhou</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="952"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="953"/>
         <source>Upload successful</source>
         <translation>Exportação bem sucedida</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="955"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="956"/>
         <source>Login failed</source>
         <translation>O login falhou</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="958"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="959"/>
         <source>Cannot parse response</source>
         <translation>Não foi possível analisar a resposta</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="970"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="971"/>
         <source>Error: %1</source>
         <translation>Erro: %1</translation>
     </message>
-    <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="936"/>
-        <source>Upload finished</source>
-        <translation>Carregamento terminado</translation>
-    </message>
 </context>
 <context>
     <name>DownloadFromDCWidget</name>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="185"/>
-        <source>Error</source>
-        <translation>Erro</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="436"/>
-        <source>Retry</source>
-        <translation>Tentar novamente</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="280"/>
-        <source>Find Uemis dive computer</source>
-        <translation>Procurar computador de mergulho Uemis</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="101"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="107"/>
         <source>Download</source>
         <translation>Transferir</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="104"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="110"/>
         <source>Choose Bluetooth download mode</source>
         <translation>Seleccione o modo de descarga Bluetooth</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="382"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="191"/>
+        <source>Error</source>
+        <translation>Erro</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="286"/>
+        <source>Find Uemis dive computer</source>
+        <translation>Procurar computador de mergulho Uemis</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="392"/>
         <source>Choose file for divecomputer download logfile</source>
         <translation>Seleccione o ficheiro para transferir os mergulhos do computador de mergulho</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="383"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="393"/>
         <source>Log files (*.log)</source>
         <translation>Ficheiros log (*.log)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="398"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="408"/>
         <source>Warning</source>
         <translation>Aviso</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="399"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="409"/>
         <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source>
         <translation>Gravar a descarga do libdivecomputer não transfere os mergulhos para a lista</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="410"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="420"/>
         <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="../desktop-widgets/downloadfromdivecomputer.cpp" line="411"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="421"/>
         <source>Dump files (*.bin)</source>
         <translation>Ficheiros dump (*.bin)</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="446"/>
+        <source>Retry</source>
+        <translation>Tentar novamente</translation>
+    </message>
 </context>
 <context>
     <name>DownloadFromDiveComputer</name>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="139"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="275"/>
-        <source>Vendor</source>
-        <translation>Marca</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="14"/>
         <location filename="../build/ui_downloadfromdivecomputer.h" line="265"/>
         <source>Download from dive computer</source>
@@ -3569,17 +3646,6 @@ p, li { white-space: pre-wrap; }
         <translation>Dispositivo ou ponto de montagem</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="122"/>
-        <source>Choose Bluetooth download mode</source>
-        <translation>Seleccione o modo de descarga Bluetooth</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="149"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="276"/>
-        <source>Dive computer</source>
-        <translation>Computador de mergulho</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="66"/>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="101"/>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="115"/>
@@ -3603,11 +3669,46 @@ p, li { white-space: pre-wrap; }
         <translation>Preferir sempre os mergulhos já transferidos</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="87"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="270"/>
+        <source>Download into new trip</source>
+        <translation>Transferir para uma nova viagem</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="94"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="271"/>
+        <source>Save libdivecomputer logfile</source>
+        <translation>Gravar registo do libdivecomputer</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="108"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="273"/>
+        <source>Save libdivecomputer dumpfile</source>
+        <translation>Gravar ficheiro em bruto do libdivecomputer</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="122"/>
+        <source>Choose Bluetooth download mode</source>
+        <translation>Seleccione o modo de descarga Bluetooth</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="129"/>
         <source>Select a remote Bluetooth device.</source>
         <translation>Seleccione um dispositivo Bluetooth remoto.</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="139"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="275"/>
+        <source>Vendor</source>
+        <translation>Marca</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="149"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="276"/>
+        <source>Dive computer</source>
+        <translation>Computador de mergulho</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/>
         <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="52"/>
         <location filename="../build/ui_downloadfromdivecomputer.h" line="277"/>
@@ -3615,18 +3716,6 @@ p, li { white-space: pre-wrap; }
         <translation>Transferir</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="284"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="281"/>
-        <source>OK</source>
-        <translation>OK</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="291"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="282"/>
-        <source>Cancel</source>
-        <translation>Cancelar</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="226"/>
         <location filename="../build/ui_downloadfromdivecomputer.h" line="278"/>
         <source>Downloaded dives</source>
@@ -3645,22 +3734,16 @@ p, li { white-space: pre-wrap; }
         <translation>Não seleccionar tudo</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="94"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="271"/>
-        <source>Save libdivecomputer logfile</source>
-        <translation>Gravar registo do libdivecomputer</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="108"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="273"/>
-        <source>Save libdivecomputer dumpfile</source>
-        <translation>Gravar ficheiro em bruto do libdivecomputer</translation>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="284"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="281"/>
+        <source>OK</source>
+        <translation>OK</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="87"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="270"/>
-        <source>Download into new trip</source>
-        <translation>Transferir para uma nova viagem</translation>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="291"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="282"/>
+        <source>Cancel</source>
+        <translation>Cancelar</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="16"/>
@@ -3670,12 +3753,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="38"/>
         <source> Vendor name : </source>
-        <translation type="unfinished"/>
+        <translation>Marca:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="42"/>
         <source> Dive Computer:</source>
-        <translation type="unfinished"/>
+        <translation>Computador de mergulho:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="54"/>
@@ -3691,12 +3774,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="68"/>
         <source> Downloaded dives</source>
-        <translation type="unfinished"/>
+        <translation>Mergulhos descarregados</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="79"/>
         <source>Date / Time</source>
-        <translation type="unfinished"/>
+        <translation>Data / hora</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="84"/>
@@ -3721,7 +3804,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="115"/>
         <source>Unselect All</source>
-        <translation type="unfinished"/>
+        <translation>Desmarcar todos</translation>
     </message>
 </context>
 <context>
@@ -3750,12 +3833,12 @@ p, li { white-space: pre-wrap; }
         <translation>Ligar à caixa de texto do Facebook</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="297"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="242"/>
         <source>To disconnect Subsurface from your Facebook account, use the button below</source>
         <translation>Para desassociar o Subsurface da sua conta do Facebook, usar o botão em baixo</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="306"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="251"/>
         <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source>
         <translation>Para ligar ao Facebook, por favor inicie a sessão (login). Isto permite ao Subsurface publicar os mergulhos na sua Cronologia (timeline)</translation>
     </message>
@@ -3763,22 +3846,22 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>FacebookManager</name>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="266"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="211"/>
         <source>Photo upload sucessfull</source>
         <translation>As fotografias foram carregadas correctamente</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="267"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="212"/>
         <source>Your dive profile was updated to Facebook.</source>
         <translation>O seu perfil de mergulho foi carregado para o facebook</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="271"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="216"/>
         <source>Photo upload failed</source>
         <translation>O carregamento das fotos falhou</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="272"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="217"/>
         <source>Your dive profile was not updated to Facebook, 
  please send the following to the developer. 
 </source>
@@ -3840,17 +3923,25 @@ por favor envie a seguinte informação aos desenvolvedores do Subsurface.
 <context>
     <name>FirmwareUpdateThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1750"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1739"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Esta característica não está ainda disponível para o computador de mergulho seleccionado.</translation>
     </message>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1755"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1744"/>
         <source>Firmware update failed!</source>
         <translation>A actualização do firmware falhou!</translation>
     </message>
 </context>
 <context>
+    <name>GlobalDrawer</name>
+    <message>
+        <location filename="../mobile-widgets/qml/kirigami/src/controls/GlobalDrawer.qml" line="364"/>
+        <source>Back</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>GlobeGPS</name>
     <message>
         <location filename="../desktop-widgets/globe.cpp" line="124"/>
@@ -3863,32 +3954,32 @@ por favor envie a seguinte informação aos desenvolvedores do Subsurface.
     <message>
         <location filename="../mobile-widgets/qml/GpsList.qml" line="16"/>
         <source>GPS Fixes</source>
-        <translation type="unfinished"/>
+        <translation>Pontos de GPS</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="40"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="32"/>
         <source>Date: </source>
-        <translation type="unfinished"/>
+        <translation>Data:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="50"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="42"/>
         <source>Name: </source>
         <translation>Nome:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="60"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="52"/>
         <source>Latitude: </source>
-        <translation type="unfinished"/>
+        <translation>Latitude:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="69"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="61"/>
         <source>Longitude: </source>
-        <translation type="unfinished"/>
+        <translation>Longitude:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="113"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="105"/>
         <source>List of stored GPS fixes</source>
-        <translation type="unfinished"/>
+        <translation>Lista de pontos GPS armazenados</translation>
     </message>
 </context>
 <context>
@@ -3896,7 +3987,7 @@ por favor envie a seguinte informação aos desenvolvedores do Subsurface.
     <message>
         <location filename="../core/gpslocation.cpp" line="121"/>
         <source>Unknown GPS location</source>
-        <translation type="unfinished"/>
+        <translation>Localização GPS desconhecida</translation>
     </message>
 </context>
 <context>
@@ -3915,7 +4006,7 @@ por favor envie a seguinte informação aos desenvolvedores do Subsurface.
 <context>
     <name>LocationFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="648"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="646"/>
         <source>Location: </source>
         <translation>Local:</translation>
     </message>
@@ -3956,7 +4047,7 @@ por favor envie a seguinte informação aos desenvolvedores do Subsurface.
 <context>
     <name>LocationFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="299"/>
+        <location filename="../qt-models/filtermodels.cpp" line="304"/>
         <source>No location set</source>
         <translation>Não foi definido um local</translation>
     </message>
@@ -4074,24 +4165,59 @@ Tem a certeza que quer continuar?</translation>
         <location filename="../mobile-widgets/qml/Log.qml" line="15"/>
         <location filename="../mobile-widgets/qml/Log.qml" line="23"/>
         <source>Application Log</source>
-        <translation type="unfinished"/>
+        <translation>Registo da aplicação</translation>
     </message>
 </context>
 <context>
-    <name>MainForm.ui</name>
+    <name>MainTab</name>
     <message>
-        <location filename="../packaging/ios/Subsurface-mobile/MainForm.ui.qml" line="17"/>
-        <source>Press Me 1</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/maintab.ui" line="18"/>
+        <location filename="../desktop-widgets/maintab.ui" line="439"/>
+        <location filename="../build/ui_maintab.h" line="961"/>
+        <location filename="../build/ui_maintab.h" line="963"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="539"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="571"/>
+        <source>Notes</source>
+        <translation>Notas</translation>
     </message>
     <message>
-        <location filename="../packaging/ios/Subsurface-mobile/MainForm.ui.qml" line="22"/>
-        <source>Press Me 2</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/maintab.ui" line="21"/>
+        <location filename="../build/ui_maintab.h" line="964"/>
+        <source>General notes about the current selection</source>
+        <translation>Notas gerais sobre os mergulhos seleccionados</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="92"/>
+        <location filename="../desktop-widgets/maintab.ui" line="646"/>
+        <location filename="../build/ui_maintab.h" line="947"/>
+        <location filename="../build/ui_maintab.h" line="967"/>
+        <source>Date</source>
+        <translation>Data</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="102"/>
+        <location filename="../build/ui_maintab.h" line="948"/>
+        <source>Time</source>
+        <translation>Hora</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="112"/>
+        <location filename="../desktop-widgets/maintab.ui" line="836"/>
+        <location filename="../build/ui_maintab.h" line="949"/>
+        <location filename="../build/ui_maintab.h" line="987"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="306"/>
+        <source>Air temp.</source>
+        <translation>Temp. do ar</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="122"/>
+        <location filename="../desktop-widgets/maintab.ui" line="855"/>
+        <location filename="../build/ui_maintab.h" line="950"/>
+        <location filename="../build/ui_maintab.h" line="989"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="307"/>
+        <source>Water temp.</source>
+        <translation>Temp. da água</translation>
     </message>
-</context>
-<context>
-    <name>MainTab</name>
     <message>
         <location filename="../desktop-widgets/maintab.ui" line="184"/>
         <location filename="../build/ui_maintab.h" line="951"/>
@@ -4100,6 +4226,17 @@ Tem a certeza que quer continuar?</translation>
         <translation>Local</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="214"/>
+        <source>Edit dive site</source>
+        <translation>Editar local de mergulho</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="217"/>
+        <location filename="../build/ui_maintab.h" line="953"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="252"/>
         <location filename="../build/ui_maintab.h" line="954"/>
         <source>Divemaster</source>
@@ -4112,12 +4249,6 @@ Tem a certeza que quer continuar?</translation>
         <translation>Companheiros</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.ui" line="387"/>
-        <location filename="../build/ui_maintab.h" line="959"/>
-        <source>Tags</source>
-        <translation>Etiquetas</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/maintab.ui" line="308"/>
         <location filename="../build/ui_maintab.h" line="956"/>
         <source>Rating</source>
@@ -4136,57 +4267,18 @@ Tem a certeza que quer continuar?</translation>
         <translation>Fato</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="387"/>
+        <location filename="../build/ui_maintab.h" line="959"/>
+        <source>Tags</source>
+        <translation>Etiquetas</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="397"/>
         <location filename="../build/ui_maintab.h" line="960"/>
         <source>Dive mode</source>
         <translation>Modo de mergulho</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.ui" line="112"/>
-        <location filename="../desktop-widgets/maintab.ui" line="836"/>
-        <location filename="../build/ui_maintab.h" line="949"/>
-        <location filename="../build/ui_maintab.h" line="987"/>
-        <location filename="../desktop-widgets/maintab.cpp" line="306"/>
-        <source>Air temp.</source>
-        <translation>Temp. do ar</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="122"/>
-        <location filename="../desktop-widgets/maintab.ui" line="855"/>
-        <location filename="../build/ui_maintab.h" line="950"/>
-        <location filename="../build/ui_maintab.h" line="989"/>
-        <location filename="../desktop-widgets/maintab.cpp" line="307"/>
-        <source>Water temp.</source>
-        <translation>Temp. da água</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="18"/>
-        <location filename="../desktop-widgets/maintab.ui" line="439"/>
-        <location filename="../build/ui_maintab.h" line="961"/>
-        <location filename="../build/ui_maintab.h" line="963"/>
-        <location filename="../desktop-widgets/maintab.cpp" line="539"/>
-        <location filename="../desktop-widgets/maintab.cpp" line="571"/>
-        <source>Notes</source>
-        <translation>Notas</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="21"/>
-        <location filename="../build/ui_maintab.h" line="964"/>
-        <source>General notes about the current selection</source>
-        <translation>Notas gerais sobre os mergulhos seleccionados</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="214"/>
-        <source>Edit dive site</source>
-        <translation>Editar local de mergulho</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="217"/>
-        <location filename="../build/ui_maintab.h" line="953"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/maintab.ui" line="491"/>
         <location filename="../build/ui_maintab.h" line="965"/>
         <source>Equipment</source>
@@ -4211,6 +4303,12 @@ Tem a certeza que quer continuar?</translation>
         <translation>Informações sobre o mergulhoq</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="665"/>
+        <location filename="../build/ui_maintab.h" line="969"/>
+        <source>Interval</source>
+        <translation>Intervalo de superfície</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="684"/>
         <location filename="../build/ui_maintab.h" line="971"/>
         <source>Gases used</source>
@@ -4223,18 +4321,38 @@ Tem a certeza que quer continuar?</translation>
         <translation>Gás consumido</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="722"/>
+        <location filename="../desktop-widgets/maintab.ui" line="1094"/>
+        <location filename="../build/ui_maintab.h" line="975"/>
+        <location filename="../build/ui_maintab.h" line="1003"/>
+        <source>SAC</source>
+        <translation>Consumo</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="741"/>
         <location filename="../build/ui_maintab.h" line="977"/>
         <source>CNS</source>
         <translation>CNS</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="760"/>
+        <location filename="../build/ui_maintab.h" line="979"/>
+        <source>OTU</source>
+        <translation>OTU</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="779"/>
         <location filename="../build/ui_maintab.h" line="981"/>
         <source>Max. depth</source>
         <translation>Prof. Max.</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="798"/>
+        <location filename="../build/ui_maintab.h" line="983"/>
+        <source>Avg. depth</source>
+        <translation>Prof. média</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="817"/>
         <location filename="../build/ui_maintab.h" line="985"/>
         <source>Air pressure</source>
@@ -4247,82 +4365,6 @@ Tem a certeza que quer continuar?</translation>
         <translation>Duração do mergulho</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.ui" line="933"/>
-        <location filename="../build/ui_maintab.h" line="1007"/>
-        <source>Simple statistics about the selection</source>
-        <translation>Estatísticas simples relativas aos mergulhos seleccionados</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1039"/>
-        <location filename="../build/ui_maintab.h" line="999"/>
-        <source>Total time</source>
-        <translation>Tempo total</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1106"/>
-        <location filename="../build/ui_maintab.h" line="1004"/>
-        <source>Gas consumption</source>
-        <translation>Consumo de gás</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1151"/>
-        <location filename="../build/ui_maintab.h" line="1009"/>
-        <source>All photos from the current selection</source>
-        <translation>Todas as fotos dos mergulhos seleccionados</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1177"/>
-        <location filename="../build/ui_maintab.h" line="1010"/>
-        <source>Extra data</source>
-        <translation>Dados extra</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1180"/>
-        <location filename="../build/ui_maintab.h" line="1011"/>
-        <source>Adittional data from the dive computer</source>
-        <translation>Dados adicionais do computador de mergulho</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="92"/>
-        <location filename="../desktop-widgets/maintab.ui" line="646"/>
-        <location filename="../build/ui_maintab.h" line="947"/>
-        <location filename="../build/ui_maintab.h" line="967"/>
-        <source>Date</source>
-        <translation>Data</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="102"/>
-        <location filename="../build/ui_maintab.h" line="948"/>
-        <source>Time</source>
-        <translation>Hora</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="665"/>
-        <location filename="../build/ui_maintab.h" line="969"/>
-        <source>Interval</source>
-        <translation>Intervalo de superfície</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="722"/>
-        <location filename="../desktop-widgets/maintab.ui" line="1094"/>
-        <location filename="../build/ui_maintab.h" line="975"/>
-        <location filename="../build/ui_maintab.h" line="1003"/>
-        <source>SAC</source>
-        <translation>Consumo</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="798"/>
-        <location filename="../build/ui_maintab.h" line="983"/>
-        <source>Avg. depth</source>
-        <translation>Prof. média</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="760"/>
-        <location filename="../build/ui_maintab.h" line="979"/>
-        <source>OTU</source>
-        <translation>OTU</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/maintab.ui" line="893"/>
         <location filename="../build/ui_maintab.h" line="993"/>
         <source>Salinity</source>
@@ -4335,22 +4377,34 @@ Tem a certeza que quer continuar?</translation>
         <translation>Estatísticas</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="933"/>
+        <location filename="../build/ui_maintab.h" line="1007"/>
+        <source>Simple statistics about the selection</source>
+        <translation>Estatísticas simples relativas aos mergulhos seleccionados</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="986"/>
         <location filename="../build/ui_maintab.h" line="996"/>
         <source>Depth</source>
         <translation>Profundidade</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="998"/>
+        <location filename="../build/ui_maintab.h" line="997"/>
+        <source>Duration</source>
+        <translation>Duração</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="1027"/>
         <location filename="../build/ui_maintab.h" line="998"/>
         <source>Temperature</source>
         <translation>Temperatura</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.ui" line="998"/>
-        <location filename="../build/ui_maintab.h" line="997"/>
-        <source>Duration</source>
-        <translation>Duração</translation>
+        <location filename="../desktop-widgets/maintab.ui" line="1039"/>
+        <location filename="../build/ui_maintab.h" line="999"/>
+        <source>Total time</source>
+        <translation>Tempo total</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/maintab.ui" line="1058"/>
@@ -4359,20 +4413,34 @@ Tem a certeza que quer continuar?</translation>
         <translation>Mergulhos</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="1106"/>
+        <location filename="../build/ui_maintab.h" line="1004"/>
+        <source>Gas consumption</source>
+        <translation>Consumo de gás</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="1148"/>
         <location filename="../build/ui_maintab.h" line="1008"/>
         <source>Photos</source>
         <translation>Fotos</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.cpp" line="88"/>
-        <source>Cylinders</source>
-        <translation>Garrafas</translation>
+        <location filename="../desktop-widgets/maintab.ui" line="1151"/>
+        <location filename="../build/ui_maintab.h" line="1009"/>
+        <source>All photos from the current selection</source>
+        <translation>Todas as fotos dos mergulhos seleccionados</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.cpp" line="92"/>
-        <source>Weights</source>
-        <translation>Lastro</translation>
+        <location filename="../desktop-widgets/maintab.ui" line="1177"/>
+        <location filename="../build/ui_maintab.h" line="1010"/>
+        <source>Extra data</source>
+        <translation>Dados extra</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="1180"/>
+        <location filename="../build/ui_maintab.h" line="1011"/>
+        <source>Adittional data from the dive computer</source>
+        <translation>Dados adicionais do computador de mergulho</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/maintab.cpp" line="63"/>
@@ -4385,11 +4453,21 @@ Tem a certeza que quer continuar?</translation>
         <translation>Descartar alterações</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.cpp" line="88"/>
+        <source>Cylinders</source>
+        <translation>Garrafas</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.cpp" line="89"/>
         <source>Add cylinder</source>
         <translation>Adicionar garrafa</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.cpp" line="92"/>
+        <source>Weights</source>
+        <translation>Lastro</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.cpp" line="93"/>
         <source>Add weight system</source>
         <translation>Adicionar sistema de lastro</translation>
@@ -4545,12 +4623,12 @@ obtidos a partir do ar usando:
     <message>
         <location filename="../desktop-widgets/maintab.cpp" line="1594"/>
         <source>Deleting Images</source>
-        <translation type="unfinished"/>
+        <translation>A eliminar imagens</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/maintab.cpp" line="1594"/>
         <source>Are you sure you want to delete all images?</source>
-        <translation type="unfinished"/>
+        <translation>Tem a certeza que quer apagar todas as imagens?</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/maintab.cpp" line="1653"/>
@@ -4565,12 +4643,12 @@ obtidos a partir do ar usando:
     <message>
         <location filename="../desktop-widgets/maintab.cpp" line="1656"/>
         <source>Delete selected images</source>
-        <translation type="unfinished"/>
+        <translation>Apagar imagens seleccionadas</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/maintab.cpp" line="1657"/>
         <source>Delete all images</source>
-        <translation type="unfinished"/>
+        <translation>Apagar todas as imagens</translation>
     </message>
 </context>
 <context>
@@ -4582,659 +4660,685 @@ obtidos a partir do ar usando:
         <translation>&amp;Ficheiro</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="455"/>
-        <location filename="../build/ui_mainwindow.h" line="534"/>
-        <source>Export dive logs</source>
-        <translation>Exportar logbook</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="510"/>
-        <location filename="../build/ui_mainwindow.h" line="542"/>
-        <source>Toggle pHe graph</source>
-        <translation>Mostrar/ocultar gráfico de pHe</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="546"/>
-        <location filename="../build/ui_mainwindow.h" line="545"/>
-        <source>Toggle calculating all tissues</source>
-        <translation>Mostrar/ocultar cálculo para todos os tecidos</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="522"/>
-        <location filename="../build/ui_mainwindow.h" line="543"/>
-        <source>Toggle DC reported ceiling</source>
-        <translation>Mostrar/ocultar o tecto indicado pelo computador de mergulho</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="534"/>
-        <location filename="../build/ui_mainwindow.h" line="544"/>
-        <source>Toggle calculated ceiling</source>
-        <translation>Mostrar/ocultar o tecto calculado</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="606"/>
-        <location filename="../build/ui_mainwindow.h" line="550"/>
-        <source>Toggle NDL, TTS</source>
-        <translation>Mostrar/ocultar NDL, TTS</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="558"/>
-        <location filename="../build/ui_mainwindow.h" line="546"/>
-        <source>Toggle calculated ceiling with 3m increments</source>
-        <translation>Mostrar/ocultar tecto calculado com intervalos de 3 m</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="463"/>
-        <location filename="../build/ui_mainwindow.h" line="537"/>
-        <source>Configure &amp;dive computer</source>
-        <translation>Configurar &amp;computador de mergulho</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="570"/>
-        <location filename="../build/ui_mainwindow.h" line="547"/>
-        <source>Toggle heart rate</source>
-        <translation>Mostrar/ocultar ritmo cardíaco</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="582"/>
-        <location filename="../build/ui_mainwindow.h" line="548"/>
-        <source>Toggle MOD</source>
-        <translation>Mostrar/ocultar MOD</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="594"/>
-        <location filename="../build/ui_mainwindow.h" line="549"/>
-        <source>Toggle EAD, END, EADD</source>
-        <translation>Mostrar/ocultar EAD, END, EADD</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="618"/>
-        <location filename="../build/ui_mainwindow.h" line="551"/>
-        <source>Toggle SAC rate</source>
-        <translation>Mostrar/ocultar taxa de consumo</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="630"/>
-        <location filename="../build/ui_mainwindow.h" line="552"/>
-        <source>Toggle ruler</source>
-        <translation>Mostrar/ocultar régua</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="86"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="87"/>
         <location filename="../build/ui_mainwindow.h" line="569"/>
         <source>&amp;Log</source>
         <translation>&amp;Log</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="105"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="104"/>
         <location filename="../build/ui_mainwindow.h" line="570"/>
         <source>&amp;View</source>
         <translation>&amp;Ver</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="121"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="120"/>
         <location filename="../build/ui_mainwindow.h" line="571"/>
         <source>&amp;Help</source>
         <translation>&amp;Ajuda</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="130"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="129"/>
         <location filename="../build/ui_mainwindow.h" line="572"/>
         <source>&amp;Import</source>
         <translation>&amp;Importar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="139"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="138"/>
         <location filename="../build/ui_mainwindow.h" line="573"/>
         <source>&amp;Edit</source>
         <translation>&amp;Editar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="144"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="143"/>
         <source>Share on</source>
         <translation>Ligar partilha</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="158"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="157"/>
         <location filename="../build/ui_mainwindow.h" line="453"/>
         <source>&amp;New logbook</source>
         <translation>&amp;Novo logbook</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="161"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="160"/>
         <location filename="../build/ui_mainwindow.h" line="455"/>
         <source>New</source>
         <translation>Novo</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="164"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="163"/>
         <location filename="../build/ui_mainwindow.h" line="457"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="169"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="168"/>
         <location filename="../build/ui_mainwindow.h" line="458"/>
         <source>&amp;Open logbook</source>
         <translation>&amp;Abrir logbook</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="172"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="171"/>
         <location filename="../build/ui_mainwindow.h" line="460"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="508"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="502"/>
         <source>Open</source>
         <translation>Abrir</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="175"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="174"/>
         <location filename="../build/ui_mainwindow.h" line="462"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="180"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="179"/>
         <location filename="../build/ui_mainwindow.h" line="463"/>
         <source>&amp;Save</source>
         <translation>&amp;Gravar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="183"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="182"/>
         <location filename="../build/ui_mainwindow.h" line="465"/>
         <source>Save</source>
         <translation>Gravar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="186"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="185"/>
         <location filename="../build/ui_mainwindow.h" line="467"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="191"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="190"/>
         <location filename="../build/ui_mainwindow.h" line="468"/>
         <source>Sa&amp;ve as</source>
         <translation>G&amp;ravar como</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="194"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="193"/>
         <location filename="../build/ui_mainwindow.h" line="470"/>
         <source>Save as</source>
         <translation>Guardar como</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="197"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="196"/>
         <location filename="../build/ui_mainwindow.h" line="472"/>
         <source>Ctrl+Shift+S</source>
         <translation>Ctrl+Shift+S</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="202"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="201"/>
         <location filename="../build/ui_mainwindow.h" line="473"/>
         <source>&amp;Close</source>
         <translation>&amp;Fechar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="205"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="204"/>
         <location filename="../build/ui_mainwindow.h" line="475"/>
         <source>Close</source>
         <translation>Encerrar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="208"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="207"/>
         <location filename="../build/ui_mainwindow.h" line="477"/>
         <source>Ctrl+W</source>
         <translation>Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="221"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="212"/>
+        <location filename="../build/ui_mainwindow.h" line="478"/>
+        <source>&amp;Print</source>
+        <translation>&amp;Imprimir</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="215"/>
+        <location filename="../build/ui_mainwindow.h" line="479"/>
+        <source>Ctrl+P</source>
+        <translation>Ctrl+P</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="220"/>
         <location filename="../build/ui_mainwindow.h" line="480"/>
         <source>P&amp;references</source>
         <translation>P&amp;referências</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="251"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="223"/>
+        <location filename="../build/ui_mainwindow.h" line="481"/>
+        <source>Ctrl+,</source>
+        <translation>Ctrl+,</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="231"/>
+        <location filename="../build/ui_mainwindow.h" line="482"/>
+        <source>&amp;Quit</source>
+        <translation>&amp;Fechar</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="234"/>
+        <location filename="../build/ui_mainwindow.h" line="483"/>
+        <source>Ctrl+Q</source>
+        <translation>Ctrl+Q</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="242"/>
+        <location filename="../build/ui_mainwindow.h" line="484"/>
+        <source>Import from &amp;dive computer</source>
+        <translation>Importar do &amp;computador de mergulho</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="245"/>
+        <location filename="../build/ui_mainwindow.h" line="485"/>
+        <source>Ctrl+D</source>
+        <translation>Ctrl+D</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="250"/>
         <location filename="../build/ui_mainwindow.h" line="486"/>
         <source>Import &amp;GPS data from Subsurface web service</source>
         <translation>Importar dados de &amp;GPS a partir do serviço Subsurface</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="259"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="253"/>
+        <location filename="../build/ui_mainwindow.h" line="487"/>
+        <source>Ctrl+G</source>
+        <translation>Ctrl+G</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="258"/>
         <location filename="../build/ui_mainwindow.h" line="488"/>
         <source>Edit device &amp;names</source>
         <translation>Editar &amp;nomes dos dispositivos</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="272"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="263"/>
+        <location filename="../build/ui_mainwindow.h" line="489"/>
+        <source>&amp;Add dive</source>
+        <translation>&amp;Adicionar mergulho</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="266"/>
+        <location filename="../build/ui_mainwindow.h" line="490"/>
+        <source>Ctrl++</source>
+        <translation>Ctrl++</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="271"/>
         <location filename="../build/ui_mainwindow.h" line="491"/>
         <source>&amp;Edit dive</source>
         <translation>&amp;Editar mergulho</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="277"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="276"/>
         <location filename="../build/ui_mainwindow.h" line="492"/>
         <source>&amp;Copy dive components</source>
         <translation>&amp;Copiar detalhes do mergulho</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="280"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="279"/>
         <location filename="../build/ui_mainwindow.h" line="493"/>
         <source>Ctrl+C</source>
         <translation>Ctrl+C</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="285"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="284"/>
         <location filename="../build/ui_mainwindow.h" line="494"/>
         <source>&amp;Paste dive components</source>
         <translation>Colar detalhes do mergulho</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="288"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="287"/>
         <location filename="../build/ui_mainwindow.h" line="495"/>
         <source>Ctrl+V</source>
         <translation>Ctrl+V</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="325"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="292"/>
+        <location filename="../build/ui_mainwindow.h" line="496"/>
+        <source>&amp;Renumber</source>
+        <translation>&amp;Renumerar</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="295"/>
+        <location filename="../build/ui_mainwindow.h" line="497"/>
+        <source>Ctrl+R</source>
+        <translation>Ctrl+R</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="303"/>
+        <location filename="../build/ui_mainwindow.h" line="498"/>
+        <source>Auto &amp;group</source>
+        <translation>Agrupar &amp;automaticamente</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="308"/>
+        <location filename="../build/ui_mainwindow.h" line="499"/>
+        <source>&amp;Yearly statistics</source>
+        <translation>&amp;Estatísticas anuais</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="311"/>
+        <location filename="../build/ui_mainwindow.h" line="500"/>
+        <source>Ctrl+Y</source>
+        <translation>Ctrl+Y</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="316"/>
+        <location filename="../build/ui_mainwindow.h" line="501"/>
+        <source>&amp;Dive list</source>
+        <translation>&amp;Lista de mergulhos</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="319"/>
+        <location filename="../build/ui_mainwindow.h" line="502"/>
+        <source>Ctrl+2</source>
+        <translation>Ctrl+2</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="324"/>
         <location filename="../build/ui_mainwindow.h" line="503"/>
         <source>&amp;Profile</source>
         <translation>&amp;Perfil</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="333"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="327"/>
+        <location filename="../build/ui_mainwindow.h" line="504"/>
+        <source>Ctrl+3</source>
+        <translation>Ctrl+3</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="332"/>
         <location filename="../build/ui_mainwindow.h" line="505"/>
         <source>&amp;Info</source>
         <translation>&amp;Informações</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="341"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="335"/>
+        <location filename="../build/ui_mainwindow.h" line="506"/>
+        <source>Ctrl+4</source>
+        <translation>Ctrl+4</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="340"/>
         <location filename="../build/ui_mainwindow.h" line="507"/>
         <source>&amp;All</source>
         <translation>&amp;Todos os painéis</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="357"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="343"/>
+        <location filename="../build/ui_mainwindow.h" line="508"/>
+        <source>Ctrl+1</source>
+        <translation>Ctrl+1</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="348"/>
+        <location filename="../build/ui_mainwindow.h" line="509"/>
+        <source>P&amp;revious DC</source>
+        <translation>Computador de mergulho &amp;anterior</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="351"/>
+        <location filename="../build/ui_mainwindow.h" line="510"/>
+        <source>Left</source>
+        <translation>Esquerda</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="356"/>
         <location filename="../build/ui_mainwindow.h" line="511"/>
         <source>&amp;Next DC</source>
         <translation>&amp;Próximo computador de mergulho</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="365"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="359"/>
+        <location filename="../build/ui_mainwindow.h" line="512"/>
+        <source>Right</source>
+        <translation>Direita</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="364"/>
         <location filename="../build/ui_mainwindow.h" line="513"/>
         <source>&amp;About Subsurface</source>
         <translation>&amp;Acerca do Subsurface</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="381"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="372"/>
+        <location filename="../build/ui_mainwindow.h" line="514"/>
+        <source>User &amp;manual</source>
+        <translation>&amp;Manual do utilizador</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="375"/>
+        <location filename="../build/ui_mainwindow.h" line="515"/>
+        <source>F1</source>
+        <translation>F1</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="380"/>
         <location filename="../build/ui_mainwindow.h" line="516"/>
         <source>&amp;Globe</source>
         <translation>&amp;Globo</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="403"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="383"/>
+        <location filename="../build/ui_mainwindow.h" line="517"/>
+        <source>Ctrl+5</source>
+        <translation>Ctrl+5</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="388"/>
+        <location filename="../build/ui_mainwindow.h" line="518"/>
+        <source>P&amp;lan dive</source>
+        <translation>P&amp;lanear mergulho</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="391"/>
+        <location filename="../build/ui_mainwindow.h" line="519"/>
+        <source>Ctrl+L</source>
+        <translation>Ctrl+L</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="396"/>
+        <location filename="../build/ui_mainwindow.h" line="520"/>
+        <source>&amp;Import log files</source>
+        <translation>&amp;Importar ficheiros de registo de mergulhos</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="399"/>
+        <location filename="../build/ui_mainwindow.h" line="522"/>
+        <source>Import divelog files from other applications</source>
+        <translation>Importar logbooks de outros programas</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="402"/>
         <location filename="../build/ui_mainwindow.h" line="524"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="408"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="407"/>
         <location filename="../build/ui_mainwindow.h" line="525"/>
         <source>Import &amp;from divelogs.de</source>
         <translation>Importar &amp;de Divelogs.de</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="416"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="415"/>
         <location filename="../build/ui_mainwindow.h" line="526"/>
         <source>&amp;Full screen</source>
         <translation>&amp;Ecrã completo</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="419"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="418"/>
         <location filename="../build/ui_mainwindow.h" line="528"/>
         <source>Toggle full screen</source>
         <translation>Ligar/desligar ecrã completo</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="447"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="421"/>
+        <location filename="../build/ui_mainwindow.h" line="530"/>
+        <source>F11</source>
+        <translation>F11</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="446"/>
         <location filename="../build/ui_mainwindow.h" line="531"/>
         <source>&amp;Check for updates</source>
         <translation>&amp;Procurar actualizações</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="452"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="451"/>
         <location filename="../build/ui_mainwindow.h" line="532"/>
         <source>&amp;Export</source>
         <translation>&amp;Exportar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="458"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="454"/>
+        <location filename="../build/ui_mainwindow.h" line="534"/>
+        <source>Export dive logs</source>
+        <translation>Exportar logbook</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="457"/>
         <location filename="../build/ui_mainwindow.h" line="536"/>
         <source>Ctrl+E</source>
         <translation>Ctrl+E</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="466"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="462"/>
+        <location filename="../build/ui_mainwindow.h" line="537"/>
+        <source>Configure &amp;dive computer</source>
+        <translation>Configurar &amp;computador de mergulho</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="465"/>
         <location filename="../build/ui_mainwindow.h" line="538"/>
         <source>Ctrl+Shift+C</source>
         <translation>Ctrl+Shift+C</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="474"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="473"/>
         <location filename="../build/ui_mainwindow.h" line="539"/>
         <source>Edit &amp;dive in planner</source>
         <translation>E&amp;ditar mergulho no planeador</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="486"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="485"/>
         <location filename="../build/ui_mainwindow.h" line="540"/>
         <source>Toggle pO₂ graph</source>
         <translation>Mostrar/ocultar gráfico da pO₂ </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="498"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="497"/>
         <location filename="../build/ui_mainwindow.h" line="541"/>
         <source>Toggle pN₂ graph</source>
         <translation>Mostrar/ocultar gráfico da pN₂ </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="642"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="509"/>
+        <location filename="../build/ui_mainwindow.h" line="542"/>
+        <source>Toggle pHe graph</source>
+        <translation>Mostrar/ocultar gráfico de pHe</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="521"/>
+        <location filename="../build/ui_mainwindow.h" line="543"/>
+        <source>Toggle DC reported ceiling</source>
+        <translation>Mostrar/ocultar o tecto indicado pelo computador de mergulho</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="533"/>
+        <location filename="../build/ui_mainwindow.h" line="544"/>
+        <source>Toggle calculated ceiling</source>
+        <translation>Mostrar/ocultar o tecto calculado</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="545"/>
+        <location filename="../build/ui_mainwindow.h" line="545"/>
+        <source>Toggle calculating all tissues</source>
+        <translation>Mostrar/ocultar cálculo para todos os tecidos</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="557"/>
+        <location filename="../build/ui_mainwindow.h" line="546"/>
+        <source>Toggle calculated ceiling with 3m increments</source>
+        <translation>Mostrar/ocultar tecto calculado com intervalos de 3 m</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="569"/>
+        <location filename="../build/ui_mainwindow.h" line="547"/>
+        <source>Toggle heart rate</source>
+        <translation>Mostrar/ocultar ritmo cardíaco</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="581"/>
+        <location filename="../build/ui_mainwindow.h" line="548"/>
+        <source>Toggle MOD</source>
+        <translation>Mostrar/ocultar MOD</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="593"/>
+        <location filename="../build/ui_mainwindow.h" line="549"/>
+        <source>Toggle EAD, END, EADD</source>
+        <translation>Mostrar/ocultar EAD, END, EADD</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="605"/>
+        <location filename="../build/ui_mainwindow.h" line="550"/>
+        <source>Toggle NDL, TTS</source>
+        <translation>Mostrar/ocultar NDL, TTS</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="617"/>
+        <location filename="../build/ui_mainwindow.h" line="551"/>
+        <source>Toggle SAC rate</source>
+        <translation>Mostrar/ocultar taxa de consumo</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="629"/>
+        <location filename="../build/ui_mainwindow.h" line="552"/>
+        <source>Toggle ruler</source>
+        <translation>Mostrar/ocultar régua</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="641"/>
         <location filename="../build/ui_mainwindow.h" line="553"/>
         <source>Scale graph</source>
         <translation>Escalar gráfico</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="654"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="653"/>
         <location filename="../build/ui_mainwindow.h" line="554"/>
         <source>Toggle pictures</source>
         <translation>Mostrar/ocultar imagens</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="666"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="665"/>
         <location filename="../build/ui_mainwindow.h" line="555"/>
         <source>Toggle tank bar</source>
         <translation>Mostrar/ocultar garrafas</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="674"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="673"/>
         <location filename="../build/ui_mainwindow.h" line="556"/>
         <source>&amp;Filter divelist</source>
         <translation>&amp;Filtrar lista mergulhos</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="689"/>
-        <location filename="../build/ui_mainwindow.h" line="558"/>
-        <source>Toggle tissue graph</source>
-        <translation>Mostrar/ocultar gráfico dos tecidos</translation>
+        <location filename="../desktop-widgets/mainwindow.ui" line="676"/>
+        <location filename="../build/ui_mainwindow.h" line="557"/>
+        <source>Ctrl+F</source>
+        <translation>Ctrl+F</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="694"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="688"/>
+        <source>Toggle tissue heat-map</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="693"/>
         <location filename="../build/ui_mainwindow.h" line="559"/>
         <source>User &amp;survey</source>
         <translation>&amp;Questionário ao utilizador</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="699"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="698"/>
         <location filename="../build/ui_mainwindow.h" line="560"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="238"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="231"/>
         <source>&amp;Undo</source>
         <translation>&amp;Reverter</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="702"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="701"/>
         <location filename="../build/ui_mainwindow.h" line="561"/>
         <source>Ctrl+Z</source>
         <translation>Ctrl+Z</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="707"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="706"/>
         <location filename="../build/ui_mainwindow.h" line="562"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="239"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="232"/>
         <source>&amp;Redo</source>
         <translation>&amp;Refazer</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="710"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="709"/>
         <location filename="../build/ui_mainwindow.h" line="563"/>
         <source>Ctrl+Shift+Z</source>
         <translation>Ctrl+Shift+Z</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="715"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="714"/>
         <location filename="../build/ui_mainwindow.h" line="564"/>
         <source>&amp;Find moved images</source>
         <translation>&amp;Encontrar imagens que foram movidas</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="720"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="719"/>
         <source>Open c&amp;loud storage</source>
         <translation>Abrir armazenamento &amp;remoto</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="725"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="724"/>
         <source>Save to clo&amp;ud storage</source>
         <translation>Gravar rem&amp;otamente</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="730"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="729"/>
         <location filename="../build/ui_mainwindow.h" line="567"/>
         <source>&amp;Manage dive sites</source>
         <translation>&amp;Gerir locais de mergulho</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="735"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="734"/>
         <source>Dive Site &amp;Edit</source>
         <translation>&amp;Editar locais de mergulho</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="740"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="739"/>
         <source>Facebook</source>
         <translation>Facebook</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="745"/>
-        <source>Add GPS location here</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="744"/>
+        <source>Take cloud storage online</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="677"/>
-        <location filename="../build/ui_mainwindow.h" line="557"/>
-        <source>Ctrl+F</source>
-        <translation>Ctrl+F</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="213"/>
-        <location filename="../build/ui_mainwindow.h" line="478"/>
-        <source>&amp;Print</source>
-        <translation>&amp;Imprimir</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="224"/>
-        <location filename="../build/ui_mainwindow.h" line="481"/>
-        <source>Ctrl+,</source>
-        <translation>Ctrl+,</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="232"/>
-        <location filename="../build/ui_mainwindow.h" line="482"/>
-        <source>&amp;Quit</source>
-        <translation>&amp;Fechar</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="243"/>
-        <location filename="../build/ui_mainwindow.h" line="484"/>
-        <source>Import from &amp;dive computer</source>
-        <translation>Importar do &amp;computador de mergulho</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="254"/>
-        <location filename="../build/ui_mainwindow.h" line="487"/>
-        <source>Ctrl+G</source>
-        <translation>Ctrl+G</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="267"/>
-        <location filename="../build/ui_mainwindow.h" line="490"/>
-        <source>Ctrl++</source>
-        <translation>Ctrl++</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="293"/>
-        <location filename="../build/ui_mainwindow.h" line="496"/>
-        <source>&amp;Renumber</source>
-        <translation>&amp;Renumerar</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="296"/>
-        <location filename="../build/ui_mainwindow.h" line="497"/>
-        <source>Ctrl+R</source>
-        <translation>Ctrl+R</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="312"/>
-        <location filename="../build/ui_mainwindow.h" line="500"/>
-        <source>Ctrl+Y</source>
-        <translation>Ctrl+Y</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="392"/>
-        <location filename="../build/ui_mainwindow.h" line="519"/>
-        <source>Ctrl+L</source>
-        <translation>Ctrl+L</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="216"/>
-        <location filename="../build/ui_mainwindow.h" line="479"/>
-        <source>Ctrl+P</source>
-        <translation>Ctrl+P</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="235"/>
-        <location filename="../build/ui_mainwindow.h" line="483"/>
-        <source>Ctrl+Q</source>
-        <translation>Ctrl+Q</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="246"/>
-        <location filename="../build/ui_mainwindow.h" line="485"/>
-        <source>Ctrl+D</source>
-        <translation>Ctrl+D</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="264"/>
-        <location filename="../build/ui_mainwindow.h" line="489"/>
-        <source>&amp;Add dive</source>
-        <translation>&amp;Adicionar mergulho</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="304"/>
-        <location filename="../build/ui_mainwindow.h" line="498"/>
-        <source>Auto &amp;group</source>
-        <translation>Agrupar &amp;automaticamente</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="309"/>
-        <location filename="../build/ui_mainwindow.h" line="499"/>
-        <source>&amp;Yearly statistics</source>
-        <translation>&amp;Estatísticas anuais</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="317"/>
-        <location filename="../build/ui_mainwindow.h" line="501"/>
-        <source>&amp;Dive list</source>
-        <translation>&amp;Lista de mergulhos</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="320"/>
-        <location filename="../build/ui_mainwindow.h" line="502"/>
-        <source>Ctrl+2</source>
-        <translation>Ctrl+2</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="328"/>
-        <location filename="../build/ui_mainwindow.h" line="504"/>
-        <source>Ctrl+3</source>
-        <translation>Ctrl+3</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="336"/>
-        <location filename="../build/ui_mainwindow.h" line="506"/>
-        <source>Ctrl+4</source>
-        <translation>Ctrl+4</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="344"/>
-        <location filename="../build/ui_mainwindow.h" line="508"/>
-        <source>Ctrl+1</source>
-        <translation>Ctrl+1</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="349"/>
-        <location filename="../build/ui_mainwindow.h" line="509"/>
-        <source>P&amp;revious DC</source>
-        <translation>Computador de mergulho &amp;anterior</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="352"/>
-        <location filename="../build/ui_mainwindow.h" line="510"/>
-        <source>Left</source>
-        <translation>Esquerda</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="360"/>
-        <location filename="../build/ui_mainwindow.h" line="512"/>
-        <source>Right</source>
-        <translation>Direita</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="373"/>
-        <location filename="../build/ui_mainwindow.h" line="514"/>
-        <source>User &amp;manual</source>
-        <translation>&amp;Manual do utilizador</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="376"/>
-        <location filename="../build/ui_mainwindow.h" line="515"/>
-        <source>F1</source>
-        <translation>F1</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="384"/>
-        <location filename="../build/ui_mainwindow.h" line="517"/>
-        <source>Ctrl+5</source>
-        <translation>Ctrl+5</translation>
+        <location filename="../build/ui_mainwindow.h" line="558"/>
+        <source>Toggle tissue graph</source>
+        <translation>Mostrar/ocultar gráfico dos tecidos</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="389"/>
-        <location filename="../build/ui_mainwindow.h" line="518"/>
-        <source>P&amp;lan dive</source>
-        <translation>P&amp;lanear mergulho</translation>
+        <location filename="../build/ui_mainwindow.h" line="565"/>
+        <source>Open cloud storage</source>
+        <translation>Abrir armazenamento remoto</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="397"/>
-        <location filename="../build/ui_mainwindow.h" line="520"/>
-        <source>&amp;Import log files</source>
-        <translation>&amp;Importar ficheiros de registo de mergulhos</translation>
+        <location filename="../build/ui_mainwindow.h" line="566"/>
+        <source>Save to cloud storage</source>
+        <translation>Gravar remotamente</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="400"/>
-        <location filename="../build/ui_mainwindow.h" line="522"/>
-        <source>Import divelog files from other applications</source>
-        <translation>Importar logbooks de outros programas</translation>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="331"/>
+        <source>Connect to</source>
+        <translation>Ligar a</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="422"/>
-        <location filename="../build/ui_mainwindow.h" line="530"/>
-        <source>F11</source>
-        <translation>F11</translation>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="493"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="538"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1545"/>
+        <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="../desktop-widgets/mainwindow.cpp" line="505"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="499"/>
         <source>Open file</source>
         <translation>Abrir Ficheiro</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="509"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="503"/>
         <location filename="../desktop-widgets/mainwindow.cpp" line="614"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1972"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1978"/>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
@@ -5254,6 +5358,16 @@ obtidos a partir do ar usando:
         <translation>A procurar imagens... (pode demorar um pouco)</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="649"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="796"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="977"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="983"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1849"/>
+        <source>Warning</source>
+        <translation>Aviso</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="674"/>
         <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>
@@ -5269,125 +5383,98 @@ obtidos a partir do ar usando:
         <translation>Imprimir tabela de runtime</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="982"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
+        <source>Trying to replan a dive that&apos;s not a planned dive.</source>
+        <translation>Está a tentar planear novamente um mergulho que não foi criado no planeador de mergulhos</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="977"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1849"/>
+        <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>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="983"/>
         <source>Trying to edit a dive that&apos;s not a manually added dive.</source>
         <translation>A tentar editar um mergulho que não foi criado manualmente.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1243"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1030"/>
+        <source>Yearly statistics</source>
+        <translation>Estatísticas anuais</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1244"/>
         <source>Do you want to save the changes that you made in the file %1?</source>
         <translation>Deseja gravar as alterações feitas no ficheiro %1?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1246"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1247"/>
         <source>Do you want to save the changes that you made in the data file?</source>
         <translation>Deseja gravar as alterações feitas no ficheiro de dados?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1251"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1252"/>
         <source>Save changes?</source>
         <translation>Guardar alterações?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1587"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1253"/>
+        <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="../desktop-widgets/mainwindow.cpp" line="1572"/>
         <source>Save file as</source>
         <translation>Guardar ficheiro como</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1682"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1573"/>
+        <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
+        <translation>Ficheiro XML do Subsurface (*.ssrf *.xml *.XML)</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1670"/>
+        <source>[local cache for] %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1672"/>
         <source>[cloud storage for] %1</source>
         <translation>[armazenamento remoto para] %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1782"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1788"/>
         <source>Opening datafile from older version</source>
         <translation>A abrir ficheiro de uma versão mais antiga</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1783"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1789"/>
         <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly.
 Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source>
         <translation>Abriu  um ficheiro de uma versão antiga do Subsurface. Recomendamos que leia o manual para saber mais sobre as alterações para esta nova versão, especialmente no que respeita a gestão de locais de mergulho, que sofreu alterações importantes.
 O Subsurface tentou preencher os dados, mas pode ser importante rever o novo sistema de gestão dos locais de mergulho para garantir que tudo está correcto.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1794"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1800"/>
         <source>Open dive log file</source>
         <translation>Abrir ficheiro de registo de mergulhos</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1795"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1801"/>
         <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;All files (*)</source>
-        <translation type="unfinished"/>
+        <translation>Ficheiros de Dive log (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Ficheiros Cochran (*.can *.CAN);;CSV files (*.csv *.CSV);;Ficheiros DiveLog.de (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Ficheiros Liquivision  (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Ficheiros Suunto (*.sde *.db *.SDE *.DB);;Ficheiros Divesoft (*.dlf *.DLF);;Ficheiros UDDF/UDCF  (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Ficheiros Datatrak/WLog (*.log *.LOG);;Ficheiros OSTCtools (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;Todos os ficheiros (*)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1972"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1978"/>
         <source>Contacting cloud service...</source>
         <translation>A contactar o serviço remoto...</translation>
     </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1252"/>
-        <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="../desktop-widgets/mainwindow.cpp" line="649"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="796"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="976"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="982"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/>
-        <source>Warning</source>
-        <translation>Aviso</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="499"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="544"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1560"/>
-        <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="../desktop-widgets/mainwindow.cpp" line="338"/>
-        <source>Connect to</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
-        <source>Trying to replan a dive that&apos;s not a planned dive.</source>
-        <translation>Está a tentar planear novamente um mergulho que não foi criado no planeador de mergulhos</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1029"/>
-        <source>Yearly statistics</source>
-        <translation>Estatísticas anuais</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1588"/>
-        <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
-        <translation>Ficheiro XML do Subsurface (*.ssrf *.xml *.XML)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="976"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/>
-        <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>
-    <message>
-        <location filename="../build/ui_mainwindow.h" line="565"/>
-        <source>Open cloud storage</source>
-        <translation>Abrir armazenamento remoto</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_mainwindow.h" line="566"/>
-        <source>Save to cloud storage</source>
-        <translation>Gravar remotamente</translation>
-    </message>
 </context>
 <context>
     <name>MultiFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="733"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="731"/>
         <source>Filter shows %1 (of %2) dives</source>
         <translation>O filtro mostra %1 (de %2) mergulhos</translation>
     </message>
@@ -5395,12 +5482,12 @@ O Subsurface tentou preencher os dados, mas pode ser importante rever o novo sis
 <context>
     <name>OstcFirmwareCheck</name>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="269"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="271"/>
         <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source>
         <translation>Deve actualizar o firmware no seu computador de mergulho: tem a versão %1 mas a última versão estável é a %2</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="273"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="275"/>
         <source>
 
 Please start Bluetooth on your OSTC Sport and do the same preparations as for a logbook download before continuing with the update</source>
@@ -5409,27 +5496,27 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 Por favor inicie o Bluetooth no seu OSTC Sport e siga o mesmo procedimento que para a transferência de um logbook antes de continuar com a actualização</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="274"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="276"/>
         <source>Not now</source>
         <translation>Agora não</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="275"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="277"/>
         <source>Update firmware</source>
         <translation>Actualizar firmware</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="277"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="279"/>
         <source>Firmware upgrade notice</source>
         <translation>Alerta de upgrade de firmware</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="295"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="297"/>
         <source>Save the downloaded firmware as</source>
         <translation>Gravar o firmware transferido como</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="296"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="298"/>
         <source>HEX files (*.hex)</source>
         <translation>Ficheiros HEX (*.hex)</translation>
     </message>
@@ -5437,79 +5524,89 @@ Por favor inicie o Bluetooth no seu OSTC Sport e siga o mesmo procedimento que p
 <context>
     <name>PlannerSettingsWidget</name>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="322"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="302"/>
         <source>Open circuit</source>
         <translation>Circuito aberto</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="322"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="302"/>
         <source>CCR</source>
         <translation>CCR</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="322"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="302"/>
         <source>pSCR</source>
         <translation>pSCR</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="421"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="388"/>
         <source>ft/min</source>
         <translation>ft/min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="422"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="389"/>
         <source>Last stop at 20ft</source>
         <translation>Última paragem aos 20 ft</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="423"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="390"/>
         <source>50% avg. depth to 20ft</source>
         <translation>50% da profundidade média para 6 m/20 ft</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="424"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="391"/>
         <source>20ft to surface</source>
         <translation>6 m/20 ft para a superfície</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="426"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="392"/>
+        <source>ft</source>
+        <translation>pé</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="394"/>
         <source>m/min</source>
         <translation>m/min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="427"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="395"/>
         <source>Last stop at 6m</source>
         <translation>Última paragem aos 6 m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="428"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="396"/>
         <source>50% avg. depth to 6m</source>
         <translation>50% da profundidade média para 6 m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="429"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="397"/>
         <source>6m to surface</source>
         <translation>6 m para a superfície</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="432"/>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="433"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="398"/>
+        <source>m</source>
+        <translation>m</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="401"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="402"/>
         <source>cuft/min</source>
         <translation>cuft/min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="441"/>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="442"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="410"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="411"/>
         <source>ℓ/min</source>
         <translation>ℓ/min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="451"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="420"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="456"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="425"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
@@ -5530,17 +5627,17 @@ Por favor inicie o Bluetooth no seu OSTC Sport e siga o mesmo procedimento que p
     <message>
         <location filename="../mobile-widgets/qml/Preferences.qml" line="43"/>
         <source>Subsurface GPS data webservice</source>
-        <translation type="unfinished"/>
+        <translation>Serviço web de dados GPS do Subsurface</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/Preferences.qml" line="51"/>
         <source>Distance threshold (meters)</source>
-        <translation type="unfinished"/>
+        <translation>Distância mínima (m)</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/Preferences.qml" line="62"/>
         <source>Time threshold (minutes)</source>
-        <translation type="unfinished"/>
+        <translation>Duração mínima (minuto)</translation>
     </message>
 </context>
 <context>
@@ -5659,6 +5756,11 @@ Por favor inicie o Bluetooth no seu OSTC Sport e siga o mesmo procedimento que p
 <context>
     <name>PreferencesDialog</name>
     <message>
+        <location filename="../build/ui_preferences.h" line="1283"/>
+        <source>Preferences</source>
+        <translation>Preferências</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1288"/>
         <source>Defaults</source>
         <translation>Definições padrão</translation>
@@ -5694,6 +5796,11 @@ Por favor inicie o Bluetooth no seu OSTC Sport e siga o mesmo procedimento que p
         <translation>Georreferenciar</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1303"/>
+        <source>Lists and tables</source>
+        <translation>Listas e tabelas</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1304"/>
         <source>Font</source>
         <translation>Fonte</translation>
@@ -5709,6 +5816,11 @@ Por favor inicie o Bluetooth no seu OSTC Sport e siga o mesmo procedimento que p
         <translation>Mergulhos</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1307"/>
+        <source>Default dive log file</source>
+        <translation>Ficheiro de mergulho</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1308"/>
         <source>No default file</source>
         <translation>Não existe ficheiro padrão</translation>
@@ -5739,6 +5851,21 @@ Por favor inicie o Bluetooth no seu OSTC Sport e siga o mesmo procedimento que p
         <translation>...</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1314"/>
+        <source>Display invalid</source>
+        <translation>Mostrar inválidos</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1316"/>
+        <source>Default cylinder</source>
+        <translation>Garrafa padrão</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1317"/>
+        <source>Use default cylinder</source>
+        <translation>Usar a garrafa padrão</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1318"/>
         <source>Animations</source>
         <translation>Animações</translation>
@@ -5769,40 +5896,24 @@ Por favor inicie o Bluetooth no seu OSTC Sport e siga o mesmo procedimento que p
         <translation>Sistema</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1401"/>
-        <source>Dive site geo lookup</source>
-        <translation>Procura geográfica do local de mergulho</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1402"/>
-        <source>Enable geocoding for dive site management</source>
-        <translation>Usar locais de mergulho codificados geograficamente</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1403"/>
-        <source>Parse site without GPS data</source>
-        <translation>Analisar local sem dados GPS</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1404"/>
-        <source>Same format for existing dives</source>
-        <translation>Usar o mesmo formato para os mergulhos existentes</translation>
+        <location filename="../build/ui_preferences.h" line="1324"/>
+        <source>&amp;Metric</source>
+        <translation>&amp;Métrico</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1405"/>
-        <source>Dive Site Layout</source>
-        <translation>Layout dos locais de mergulho</translation>
+        <location filename="../build/ui_preferences.h" line="1325"/>
+        <source>Imperial</source>
+        <translation>Imperial</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1406"/>
-        <location filename="../build/ui_preferences.h" line="1407"/>
-        <source>/</source>
-        <translation>/</translation>
+        <location filename="../build/ui_preferences.h" line="1326"/>
+        <source>Personali&amp;ze</source>
+        <translation>Personali&amp;zar</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1325"/>
-        <source>Imperial</source>
-        <translation>Imperial</translation>
+        <location filename="../build/ui_preferences.h" line="1327"/>
+        <source>Individual settings</source>
+        <translation>Configurações individuais</translation>
     </message>
     <message>
         <location filename="../build/ui_preferences.h" line="1328"/>
@@ -5820,6 +5931,11 @@ Por favor inicie o Bluetooth no seu OSTC Sport e siga o mesmo procedimento que p
         <translation>pés</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1331"/>
+        <source>Pressure</source>
+        <translation>Pressão</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1332"/>
         <location filename="../build/ui_preferences.h" line="1366"/>
         <source>bar</source>
@@ -5831,11 +5947,26 @@ Por favor inicie o Bluetooth no seu OSTC Sport e siga o mesmo procedimento que p
         <translation>psi</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1334"/>
+        <source>Volume</source>
+        <translation>Volume</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1335"/>
+        <source>&amp;liter</source>
+        <translation>&amp;litro</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1336"/>
         <source>cu ft</source>
         <translation>pés cúbicos</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1337"/>
+        <source>Temperature</source>
+        <translation>Temperatura</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1338"/>
         <source>celsius</source>
         <translation>celsius</translation>
@@ -5846,11 +5977,121 @@ Por favor inicie o Bluetooth no seu OSTC Sport e siga o mesmo procedimento que p
         <translation>fahrenheit</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1340"/>
+        <source>Weight</source>
+        <translation>Peso</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1341"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1342"/>
+        <source>lbs</source>
+        <translation>libra</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1343"/>
+        <source>Time units</source>
+        <translation>Unidades de tempo</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1344"/>
+        <source>Ascent/descent speed denominator</source>
+        <translation>Denominador para a velocidades de subida/descida</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1345"/>
+        <source>Minutes</source>
+        <translation>Minutos</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1346"/>
+        <source>Seconds</source>
+        <translation>Segundos</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1347"/>
+        <source>GPS coordinates</source>
+        <translation>Coordenadas GPS</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1348"/>
+        <source>Location Display</source>
+        <translation>Apresentação dos locais</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1349"/>
+        <source>traditional (dms)</source>
+        <translation>tradicional (gms)</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1350"/>
+        <source>decimal</source>
+        <translation>decimal</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1351"/>
+        <source>Show</source>
+        <translation>Mostrar</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1352"/>
+        <source>Threshold when showing pO₂</source>
+        <translation>Limite quando mostrar pO₂</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1353"/>
+        <source>Threshold when showing pN₂</source>
+        <translation>Limite quando mostrar pN₂</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1354"/>
+        <source>Threshold when showing pHe</source>
+        <translation>Limite quando mostrar pHe</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1355"/>
+        <source>Max pO₂ when showing MOD</source>
+        <translation>pO₂ Max quando mostrar MOD</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1356"/>
+        <source>Draw dive computer reported ceiling red</source>
+        <translation>Desenhar a vermelho o tecto calculado  pelo computador de mergulho </translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1357"/>
+        <source>Show unused cylinders in Equipment tab</source>
+        <translation>Mostrar garrafas não usadas na tab do equipamento</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1358"/>
+        <source>Show average depth</source>
+        <translation>Mostrar profundidade média</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1359"/>
+        <source>Misc</source>
+        <translation>Diversos</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1360"/>
+        <source>GFLow</source>
+        <translation>GFlow</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1361"/>
+        <source>GFHigh</source>
+        <translation>GFHigh</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1362"/>
+        <source>GFLow at max depth</source>
+        <translation>GFlow à profundidade máxima</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1363"/>
         <source>CCR: show setpoints when viewing pO₂</source>
         <translation>CCR: mostrar setpoints quando visualizar pO₂</translation>
@@ -5896,14 +6137,19 @@ Por favor inicie o Bluetooth no seu OSTC Sport e siga o mesmo procedimento que p
         <translation>Linguagem do sistema</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1374"/>
+        <source>Filter</source>
+        <translation>Filtros</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1375"/>
         <source>Proxy</source>
         <translation>Proxy</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1379"/>
-        <source>Proxy type</source>
-        <translation>Tipo de proxy</translation>
+        <location filename="../build/ui_preferences.h" line="1376"/>
+        <source>Port</source>
+        <translation>Porta</translation>
     </message>
     <message>
         <location filename="../build/ui_preferences.h" line="1377"/>
@@ -5911,16 +6157,16 @@ Por favor inicie o Bluetooth no seu OSTC Sport e siga o mesmo procedimento que p
         <translation>Servidor</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1376"/>
-        <source>Port</source>
-        <translation>Porta</translation>
-    </message>
-    <message>
         <location filename="../build/ui_preferences.h" line="1378"/>
         <source>Requires authentication</source>
         <translation>Requer autenticação</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1379"/>
+        <source>Proxy type</source>
+        <translation>Tipo de proxy</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1380"/>
         <source>Username</source>
         <translation>Nome de utilizador</translation>
@@ -5932,46 +6178,6 @@ Por favor inicie o Bluetooth no seu OSTC Sport e siga o mesmo procedimento que p
         <translation>Palavra-passe</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1400"/>
-        <source>Disconnect from Facebook</source>
-        <translation>Desligar do Facebook</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1374"/>
-        <source>Filter</source>
-        <translation>Filtros</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1331"/>
-        <source>Pressure</source>
-        <translation>Pressão</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1303"/>
-        <source>Lists and tables</source>
-        <translation>Listas e tabelas</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1307"/>
-        <source>Default dive log file</source>
-        <translation>Ficheiro de mergulho</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1314"/>
-        <source>Display invalid</source>
-        <translation>Mostrar inválidos</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1316"/>
-        <source>Default cylinder</source>
-        <translation>Garrafa padrão</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1317"/>
-        <source>Use default cylinder</source>
-        <translation>Usar a garrafa padrão</translation>
-    </message>
-    <message>
         <location filename="../build/ui_preferences.h" line="1382"/>
         <source>Subsurface cloud storage</source>
         <translation>Armazenamento remoto do Subsurface</translation>
@@ -6012,149 +6218,40 @@ Por favor inicie o Bluetooth no seu OSTC Sport e siga o mesmo procedimento que p
         <translation>Gravar o ID do utilizador localmente?</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1334"/>
-        <source>Volume</source>
-        <translation>Volume</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1337"/>
-        <source>Temperature</source>
-        <translation>Temperatura</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1340"/>
-        <source>Weight</source>
-        <translation>Peso</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1342"/>
-        <source>lbs</source>
-        <translation>libra</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1343"/>
-        <source>Time units</source>
-        <translation>Unidades de tempo</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1345"/>
-        <source>Minutes</source>
-        <translation>Minutos</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1346"/>
-        <source>Seconds</source>
-        <translation>Segundos</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1351"/>
-        <source>Show</source>
-        <translation>Mostrar</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1362"/>
-        <source>GFLow at max depth</source>
-        <translation>GFlow à profundidade máxima</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1359"/>
-        <source>Misc</source>
-        <translation>Diversos</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1283"/>
-        <source>Preferences</source>
-        <translation>Preferências</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1324"/>
-        <source>&amp;Metric</source>
-        <translation>&amp;Métrico</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1326"/>
-        <source>Personali&amp;ze</source>
-        <translation>Personali&amp;zar</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1327"/>
-        <source>Individual settings</source>
-        <translation>Configurações individuais</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1335"/>
-        <source>&amp;liter</source>
-        <translation>&amp;litro</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1344"/>
-        <source>Ascent/descent speed denominator</source>
-        <translation>Denominador para a velocidades de subida/descida</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1347"/>
-        <source>GPS coordinates</source>
-        <translation>Coordenadas GPS</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1348"/>
-        <source>Location Display</source>
-        <translation>Apresentação dos locais</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1349"/>
-        <source>traditional (dms)</source>
-        <translation>tradicional (gms)</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1350"/>
-        <source>decimal</source>
-        <translation>decimal</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1352"/>
-        <source>Threshold when showing pO₂</source>
-        <translation>Limite quando mostrar pO₂</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1353"/>
-        <source>Threshold when showing pN₂</source>
-        <translation>Limite quando mostrar pN₂</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1354"/>
-        <source>Threshold when showing pHe</source>
-        <translation>Limite quando mostrar pHe</translation>
+        <location filename="../build/ui_preferences.h" line="1400"/>
+        <source>Disconnect from Facebook</source>
+        <translation>Desligar do Facebook</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1355"/>
-        <source>Max pO₂ when showing MOD</source>
-        <translation>pO₂ Max quando mostrar MOD</translation>
+        <location filename="../build/ui_preferences.h" line="1401"/>
+        <source>Dive site geo lookup</source>
+        <translation>Procura geográfica do local de mergulho</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1356"/>
-        <source>Draw dive computer reported ceiling red</source>
-        <translation>Desenhar a vermelho o tecto calculado  pelo computador de mergulho </translation>
+        <location filename="../build/ui_preferences.h" line="1402"/>
+        <source>Enable geocoding for dive site management</source>
+        <translation>Usar locais de mergulho codificados geograficamente</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1357"/>
-        <source>Show unused cylinders in Equipment tab</source>
-        <translation>Mostrar garrafas não usadas na tab do equipamento</translation>
+        <location filename="../build/ui_preferences.h" line="1403"/>
+        <source>Parse site without GPS data</source>
+        <translation>Analisar local sem dados GPS</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1358"/>
-        <source>Show average depth</source>
-        <translation>Mostrar profundidade média</translation>
+        <location filename="../build/ui_preferences.h" line="1404"/>
+        <source>Same format for existing dives</source>
+        <translation>Usar o mesmo formato para os mergulhos existentes</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1360"/>
-        <source>GFLow</source>
-        <translation>GFlow</translation>
+        <location filename="../build/ui_preferences.h" line="1405"/>
+        <source>Dive Site Layout</source>
+        <translation>Layout dos locais de mergulho</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1361"/>
-        <source>GFHigh</source>
-        <translation>GFHigh</translation>
+        <location filename="../build/ui_preferences.h" line="1406"/>
+        <location filename="../build/ui_preferences.h" line="1407"/>
+        <source>/</source>
+        <translation>/</translation>
     </message>
 </context>
 <context>
@@ -6210,106 +6307,136 @@ Por favor inicie o Bluetooth no seu OSTC Sport e siga o mesmo procedimento que p
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="20"/>
-        <source>Show</source>
-        <translation>Mostrar</translation>
+        <source>Gas pressure display setup</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="29"/>
-        <source>Threshold when showing pO₂</source>
-        <translation>Limite quando mostrar pO₂</translation>
+        <source>Threshold for pO₂ (bar)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="49"/>
-        <source>Threshold when showing pN₂</source>
-        <translation>Limite quando mostrar pN₂</translation>
+        <source>Threshold for pN₂ (bar)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="69"/>
-        <source>Threshold when showing pHe</source>
-        <translation>Limite quando mostrar pHe</translation>
+        <source>Threshold for pHe (bar)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="89"/>
-        <source>Max pO₂ when showing MOD</source>
-        <translation>pO₂ Max quando mostrar MOD</translation>
+        <source>pO₂ in calculating MOD (bar)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="106"/>
+        <source>CCR options:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="113"/>
+        <source>Dive planner default setpoint (bar)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="133"/>
+        <source>Show setpoints when viewing pO₂</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="109"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="140"/>
+        <source>Show individual O₂ sensor values when viewing pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="150"/>
+        <source>Ceiling display setup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="159"/>
         <source>Draw dive computer reported ceiling red</source>
         <translation>Desenhar a vermelho o tecto calculado  pelo computador de mergulho </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="116"/>
-        <source>Show unused cylinders in Equipment tab</source>
-        <translation>Mostrar garrafas não usadas na tab do equipamento</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="169"/>
+        <source>Algorithm for calculated ceiling:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="123"/>
-        <source>Show mean depth</source>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="176"/>
+        <source>VPM-B</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="133"/>
-        <source>Misc</source>
-        <translation>Diversos</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="183"/>
+        <source>VPM-B Conservatism</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="149"/>
-        <source>bar</source>
-        <translation>bar</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="193"/>
+        <source>+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="165"/>
-        <source>Default CCR set-point for dive planning</source>
-        <translation>setpoint padrão para planeamento de mergulhos com CCR</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="206"/>
+        <source>Bühlmann</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="172"/>
-        <source>pSCR O₂ metabolism rate</source>
-        <translation>Taxa de metabolismo com pSCR</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="216"/>
+        <source>GFHigh</source>
+        <translation>GFHigh</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="179"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="236"/>
         <source>GFLow</source>
         <translation>GFlow</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="186"/>
-        <source>GFHigh</source>
-        <translation>GFHigh</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="256"/>
+        <source>GFLow at max depth</source>
+        <translation>GFlow à profundidade máxima</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="203"/>
-        <source>ℓ/min</source>
-        <translation>ℓ/min</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="263"/>
+        <source>pSCR options:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="213"/>
-        <source>pSCR ratio</source>
-        <translation>pSCR ratio</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="270"/>
+        <source>Metabolic rate (ℓ O₂/min)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="287"/>
+        <source>Dilution ratio</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="223"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="300"/>
         <source>1:</source>
         <translation>1:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="230"/>
-        <source>CCR: show individual O₂ sensor values when viewing pO₂</source>
-        <translation>CCR: mostrar valores de cada um dos sensores de O₂ quando visualizar a pO₂</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="310"/>
+        <source>Misc</source>
+        <translation>Diversos</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="237"/>
-        <source>CCR: show setpoints when viewing pO₂</source>
-        <translation>CCR: mostrar setpoints quando visualizar pO₂</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="316"/>
+        <source>Show unused cylinders in Equipment tab</source>
+        <translation>Mostrar garrafas não usadas na tab do equipamento</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="244"/>
-        <source>GFLow at max depth</source>
-        <translation>GFlow à profundidade máxima</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="323"/>
+        <source>Show mean depth in Profile</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="10"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="9"/>
         <source>Graph</source>
         <translation>Gráfico</translation>
     </message>
@@ -6329,7 +6456,7 @@ Por favor inicie o Bluetooth no seu OSTC Sport e siga o mesmo procedimento que p
     <message>
         <location filename="../desktop-widgets/preferences/prefs_language.ui" line="32"/>
         <source>Use system default</source>
-        <translation type="unfinished"/>
+        <translation>Usar o padrão do sistema</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/prefs_language.ui" line="55"/>
@@ -6344,23 +6471,23 @@ Por favor inicie o Bluetooth no seu OSTC Sport e siga o mesmo procedimento que p
     <message>
         <location filename="../desktop-widgets/preferences/prefs_language.ui" line="80"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Preferred date format. Commonly used fields are&lt;/p&gt;&lt;p&gt;d (day of month)&lt;/p&gt;&lt;p&gt;ddd (abbr. day name)&lt;/p&gt;&lt;p&gt;M (month number)&lt;/p&gt;&lt;p&gt;MMM (abbr. month name)&lt;/p&gt;&lt;p&gt;yy/yyyy (2/4 digit year)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Formato de data preferido. Campos mais utilizados&lt;/p&gt;&lt;p&gt;d (dia do mês)&lt;/p&gt;&lt;p&gt;ddd (abreviatura do dia)&lt;/p&gt;&lt;p&gt;M (número do mês)&lt;/p&gt;&lt;p&gt;MMM (abreviatura do mês)&lt;/p&gt;&lt;p&gt;yy/yyyy (anp em 2/4 dígitos)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/prefs_language.ui" line="87"/>
         <location filename="../desktop-widgets/preferences/prefs_language.ui" line="135"/>
         <source>Use UI language default</source>
-        <translation type="unfinished"/>
+        <translation>Usar a língua do interface de utilizador</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/prefs_language.ui" line="97"/>
         <source>This is used in places where there is less space to show the full date</source>
-        <translation type="unfinished"/>
+        <translation>Isto é usado em locais onde existe menos espaço para mostrar a data completa</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/prefs_language.ui" line="100"/>
         <source>Short format</source>
-        <translation type="unfinished"/>
+        <translation>Formato curto</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/prefs_language.ui" line="129"/>
@@ -6370,7 +6497,7 @@ Por favor inicie o Bluetooth no seu OSTC Sport e siga o mesmo procedimento que p
     <message>
         <location filename="../desktop-widgets/preferences/prefs_language.ui" line="142"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Preferred time format&lt;/p&gt;&lt;p&gt;Commonly used format specifiers are&lt;/p&gt;&lt;p&gt;h (hours in 12h format)&lt;/p&gt;&lt;p&gt;H (hours in 24h format)&lt;/p&gt;&lt;p&gt;mm (2 digit minutes)&lt;/p&gt;&lt;p&gt;ss (2 digit seconds)&lt;/p&gt;&lt;p&gt;t/tt (a/p or am/pm)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Formato de hora preferido&lt;/p&gt;&lt;p&gt;Formatos mais comuns são&lt;/p&gt;&lt;p&gt;h (horas no formato 12 h)&lt;/p&gt;&lt;p&gt;H (horas no formato 24 h)&lt;/p&gt;&lt;p&gt;mm (minutos em 2 dígitos)&lt;/p&gt;&lt;p&gt;ss (segundos em 2 dígitos)&lt;/p&gt;&lt;p&gt;t/tt (a/p ou am/pm)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="12"/>
@@ -6378,15 +6505,29 @@ Por favor inicie o Bluetooth no seu OSTC Sport e siga o mesmo procedimento que p
         <translation>Língua</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="57"/>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="53"/>
         <source>Restart required</source>
         <translation>É necessário reiniciar a aplicação</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="58"/>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="54"/>
         <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="../desktop-widgets/preferences/preferences_language.cpp" line="76"/>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="82"/>
+        <source>Literal characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="77"/>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="83"/>
+        <source>Non-special character(s) in time format.
+These will be used as is. This might not be what you intended.
+See http://doc.qt.io/qt-5/qdatetime.html#toString</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PreferencesNetwork</name>
@@ -6433,7 +6574,7 @@ Por favor inicie o Bluetooth no seu OSTC Sport e siga o mesmo procedimento que p
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_network.ui" line="156"/>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="148"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="134"/>
         <source>Subsurface cloud storage</source>
         <translation>Armazenamento remoto do Subsurface</translation>
     </message>
@@ -6478,39 +6619,39 @@ Por favor inicie o Bluetooth no seu OSTC Sport e siga o mesmo procedimento que p
         <translation>Gravar o ID do utilizador localmente?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="11"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="10"/>
         <source>Network</source>
         <translation>Rede</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="15"/>
         <source>No proxy</source>
         <translation>Sem proxy</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/>
         <source>System proxy</source>
         <translation>Proxy do sistema</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/>
         <source>HTTP proxy</source>
         <translation>Proxy HTTP</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="19"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/>
         <source>SOCKS proxy</source>
         <translation>Proxy SOCKS</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="75"/>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="97"/>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="110"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="72"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="93"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="106"/>
         <source>Cloud storage email and password can only consist of letters, numbers, and &apos;.&apos;, &apos;-&apos;, &apos;_&apos;, and &apos;+&apos;.</source>
         <translation>O endereço de email e a palavra-chave para o armazenamento remoto apenas pode conter letras, números e &apos;.&apos;, &apos;-&apos;, &apos;_&apos;, e &apos;+&apos;.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="146"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="132"/>
         <source>Subsurface cloud storage (credentials verified)</source>
         <translation>Armazenamento remoto do Subsurface (credenciais verificadas)</translation>
     </message>
@@ -6668,7 +6809,7 @@ Por favor inicie o Bluetooth no seu OSTC Sport e siga o mesmo procedimento que p
         <translation>decimal</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="8"/>
+        <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="7"/>
         <source>Units</source>
         <translation>Unidades</translation>
     </message>
@@ -6676,17 +6817,17 @@ Por favor inicie o Bluetooth no seu OSTC Sport e siga o mesmo procedimento que p
 <context>
     <name>PrintDialog</name>
     <message>
-        <location filename="../desktop-widgets/printdialog.cpp" line="118"/>
-        <source>&amp;Preview</source>
-        <translation>&amp;Previsão</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/printdialog.cpp" line="115"/>
+        <location filename="../desktop-widgets/printdialog.cpp" line="102"/>
         <source>P&amp;rint</source>
         <translation>Im&amp;primir</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/printdialog.cpp" line="130"/>
+        <location filename="../desktop-widgets/printdialog.cpp" line="105"/>
+        <source>&amp;Preview</source>
+        <translation>&amp;Previsão</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/printdialog.cpp" line="117"/>
         <source>Print</source>
         <translation>Imprimir</translation>
     </message>
@@ -6694,19 +6835,10 @@ Por favor inicie o Bluetooth no seu OSTC Sport e siga o mesmo procedimento que p
 <context>
     <name>PrintOptions</name>
     <message>
-        <location filename="../build/ui_printoptions.h" line="150"/>
-        <source>&amp;Table print</source>
-        <translation>Impressão em &amp;Tabela</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_printoptions.h" line="158"/>
-        <source>One dive per page</source>
-        <translation>Um mergulho por página</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_printoptions.h" line="159"/>
-        <source>Two dives per page</source>
-        <translation>Dois mergulhos por página</translation>
+        <location filename="../desktop-widgets/printoptions.ui" line="29"/>
+        <location filename="../build/ui_printoptions.h" line="148"/>
+        <source>Print type</source>
+        <translation>Tipo de impressão</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/printoptions.ui" line="41"/>
@@ -6766,10 +6898,19 @@ Por favor inicie o Bluetooth no seu OSTC Sport e siga o mesmo procedimento que p
         <translation>Importar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/printoptions.ui" line="29"/>
-        <location filename="../build/ui_printoptions.h" line="148"/>
-        <source>Print type</source>
-        <translation>Tipo de impressão</translation>
+        <location filename="../build/ui_printoptions.h" line="150"/>
+        <source>&amp;Table print</source>
+        <translation>Impressão em &amp;Tabela</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_printoptions.h" line="158"/>
+        <source>One dive per page</source>
+        <translation>Um mergulho por página</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_printoptions.h" line="159"/>
+        <source>Two dives per page</source>
+        <translation>Dois mergulhos por página</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/printoptions.cpp" line="128"/>
@@ -6811,103 +6952,103 @@ Por favor inicie o Bluetooth no seu OSTC Sport e siga o mesmo procedimento que p
         <translation>Computador de mergulho desconhecido</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="755"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="752"/>
         <source>Show NDL / TTS was disabled because of excessive processing time</source>
         <translation>A visualização do NDL /TTS foi desactivada devido ao excessivo tempo de processamento</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1344"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1338"/>
         <source>Make first divecomputer</source>
         <translation>Tornar como primeiro computador de mergulho</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1346"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1340"/>
         <source>Delete this divecomputer</source>
         <translation>Eliminar este computador de mergulho</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1360"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1354"/>
         <source>Add gas change</source>
         <translation>Adicionar mudança de gás</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1363"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1357"/>
         <source> (Tank %1)</source>
         <translation>(Garrafa %1)</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1371"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1365"/>
         <source>Add set-point change</source>
         <translation>Adicionar alteração do set-point</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1373"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1367"/>
         <source>Add bookmark</source>
         <translation>Adicionar marcador</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1377"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1371"/>
         <source>Edit the profile</source>
         <translation>Editar o perfil</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1381"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1375"/>
         <source>Remove event</source>
         <translation>Remover evento</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1386"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1380"/>
         <source>Hide similar events</source>
         <translation>Esconder eventos semelhantes</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1393"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1387"/>
         <source>Edit name</source>
         <translation>Editar nome</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1422"/>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1429"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1416"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1423"/>
         <source>Adjust pressure of tank %1 (currently interpolated as %2)</source>
         <translation>Ajustar pressão da garrafa %1 (actualmente interpolada como %2)</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1444"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1438"/>
         <source>Unhide all events</source>
         <translation>Mostrar todos os eventos</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1479"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1473"/>
         <source>Hide events</source>
         <translation>Ocultar eventos</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1479"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1473"/>
         <source>Hide all %1 events?</source>
         <translation>Ocultar todos os %1 eventos?</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1514"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1508"/>
         <source>Remove the selected event?</source>
         <translation>Remover o evento seleccionado?</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1515"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1509"/>
         <source>%1 @ %2:%3</source>
         <translation>%1 @ %2:%3</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1638"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1632"/>
         <source>Edit name of bookmark</source>
         <translation>Editar nome do marcador</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1639"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1633"/>
         <source>Custom name:</source>
         <translation>Nome personalizado:</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1644"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1638"/>
         <source>Name is too long!</source>
         <translation>O nome é demasiado comprido!</translation>
     </message>
@@ -6915,218 +7056,228 @@ Por favor inicie o Bluetooth no seu OSTC Sport e siga o mesmo procedimento que p
 <context>
     <name>QMLManager</name>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="95"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="97"/>
         <source>Starting...</source>
-        <translation type="unfinished"/>
+        <translation>A inicial...</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="202"/>
         <source>working in no-cloud mode</source>
-        <translation type="unfinished"/>
+        <translation>A trabalhar em modo local</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="213"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="216"/>
         <source>no cloud credentials</source>
-        <translation type="unfinished"/>
+        <translation>Não existem credenciais da nuvem</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="214"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="270"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="217"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="269"/>
         <source>Please enter valid cloud credentials.</source>
-        <translation type="unfinished"/>
+        <translation>Por favor insira credenciais de nuvem válidas</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="285"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="284"/>
         <source>Attempting to open cloud storage with new credentials</source>
-        <translation type="unfinished"/>
+        <translation>A tentar abrir o armazenamento remoto com as novas credenciais</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="304"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="306"/>
         <source>Testing cloud credentials</source>
+        <translation>A testar as credenciais da nuvem</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="320"/>
+        <source>No response from cloud server to validate the credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="331"/>
-        <source>Cloud credentials are invalid</source>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="329"/>
+        <source>Cannot connect to cloud storage - cloud account not verified</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="344"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="361"/>
+        <source>Cloud credentials are invalid</source>
+        <translation>As credenciais são inválidas</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="374"/>
         <source>Cannot open cloud storage: Error creating https connection</source>
-        <translation type="unfinished"/>
+        <translation>Não foi possível abrir o armazenamento remoto: erro ao criar a ligação HTTPS</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="357"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="387"/>
         <source>Cannot open cloud storage: %1</source>
-        <translation type="unfinished"/>
+        <translation>Não é possível abrir o armazenamento remoto: %1</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="369"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="399"/>
         <source>Cannot connect to cloud storage</source>
-        <translation type="unfinished"/>
+        <translation>Não é possível ligar-se com o armazenamento remoto</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="411"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="441"/>
         <source>Cloud storage error: %1</source>
-        <translation type="unfinished"/>
+        <translation>Erro no armazenamento remoto: %1</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="501"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="531"/>
         <source>Failed to connect to cloud server, reverting to no cloud status</source>
-        <translation type="unfinished"/>
+        <translation>Falha na ligação ao servidor remoto. A passar para modo local</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="520"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="550"/>
         <source>Cloud storage open successfully. No dives in dive list.</source>
-        <translation type="unfinished"/>
+        <translation>Armazenamento remoto aberto com sucesso. Não existem mergulhos na lista.</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="689"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="690"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="721"/>
         <source>h</source>
-        <translation type="unfinished"/>
+        <translation>h</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="689"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="690"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="691"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="721"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="722"/>
         <source>min</source>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="689"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/>
         <source>sec</source>
-        <translation type="unfinished"/>
+        <translation>seg</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="1041"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="1102"/>
         <source>Unknown GPS location</source>
-        <translation type="unfinished"/>
+        <translation>Localização GPS desconhecida</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../core/qthelper.cpp" line="866"/>
-        <location filename="../core/qthelper.cpp" line="1214"/>
-        <source>AIR</source>
-        <translation>Ar</translation>
+        <location filename="../core/gpslocation.h" line="13"/>
+        <source>Waiting to aquire GPS location</source>
+        <translation>À espera para adquirir uma localização de GPS</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="1214"/>
-        <source>OXYGEN</source>
-        <translation>OXIGÉNIO</translation>
+        <location filename="../core/qthelper.cpp" line="766"/>
+        <location filename="../core/qthelper.cpp" line="1275"/>
+        <source>m</source>
+        <translation>m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="59"/>
-        <source>Remove this point</source>
-        <translation>Remover este ponto</translation>
+        <location filename="../core/qthelper.cpp" line="768"/>
+        <location filename="../core/qthelper.cpp" line="1274"/>
+        <source>ft</source>
+        <translation>pé</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="32"/>
-        <source>Average</source>
-        <translation>Média</translation>
+        <location filename="../core/qthelper.cpp" line="794"/>
+        <source>C</source>
+        <translation>C</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="35"/>
-        <source>Minimum</source>
-        <translation>Mínima</translation>
+        <location filename="../core/qthelper.cpp" line="796"/>
+        <source>F</source>
+        <translation>F</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="38"/>
-        <source>Maximum</source>
-        <translation>Máxima</translation>
+        <location filename="../core/qthelper.cpp" line="821"/>
+        <location filename="../core/qthelper.cpp" line="1250"/>
+        <source>kg</source>
+        <translation>kg</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/globe.cpp" line="327"/>
-        <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>
+        <location filename="../core/qthelper.cpp" line="823"/>
+        <location filename="../core/qthelper.cpp" line="1251"/>
+        <source>lbs</source>
+        <translation>libra</translation>
     </message>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="28"/>
-        <source>unknown</source>
-        <translation>desconhecido</translation>
+        <location filename="../core/qthelper.cpp" line="848"/>
+        <location filename="../core/qthelper.cpp" line="1300"/>
+        <source>bar</source>
+        <translation>bar</translation>
     </message>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="105"/>
-        <source>h:</source>
-        <translation>h:</translation>
+        <location filename="../core/qthelper.cpp" line="850"/>
+        <location filename="../core/qthelper.cpp" line="1299"/>
+        <source>psi</source>
+        <translation>psi</translation>
     </message>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="105"/>
-        <source>min</source>
-        <translation>min</translation>
+        <location filename="../core/qthelper.cpp" line="871"/>
+        <location filename="../core/qthelper.cpp" line="1235"/>
+        <source>AIR</source>
+        <translation>Ar</translation>
     </message>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="337"/>
-        <source>Multiple</source>
-        <translation type="unfinished"/>
+        <location filename="../core/qthelper.cpp" line="873"/>
+        <source>EAN</source>
+        <translation>EANx</translation>
     </message>
     <message numerus="yes">
-        <location filename="../core/qthelper.cpp" line="957"/>
+        <location filename="../core/qthelper.cpp" line="962"/>
         <source>(%n dive(s))</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="816"/>
-        <location filename="../core/qthelper.cpp" line="1228"/>
-        <source>kg</source>
-        <translation>kg</translation>
+        <location filename="../core/qthelper.cpp" line="1235"/>
+        <source>OXYGEN</source>
+        <translation>OXIGÉNIO</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="818"/>
-        <location filename="../core/qthelper.cpp" line="1229"/>
-        <source>lbs</source>
-        <translation>libra</translation>
+        <location filename="../core/qthelper.cpp" line="1322"/>
+        <source>l</source>
+        <translation>l</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="763"/>
-        <location filename="../core/qthelper.cpp" line="1252"/>
-        <source>ft</source>
-        <translation>pé</translation>
+        <location filename="../core/qthelper.cpp" line="1323"/>
+        <source>cuft</source>
+        <translation>pé cúbico</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="761"/>
-        <location filename="../core/qthelper.cpp" line="1253"/>
-        <source>m</source>
-        <translation>m</translation>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="29"/>
+        <source>unknown</source>
+        <translation>desconhecido</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="789"/>
-        <source>C</source>
-        <translation>C</translation>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="114"/>
+        <source>h:</source>
+        <translation>h:</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="791"/>
-        <source>F</source>
-        <translation>F</translation>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="114"/>
+        <source>min</source>
+        <translation>min</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="845"/>
-        <location filename="../core/qthelper.cpp" line="1275"/>
-        <source>psi</source>
-        <translation>psi</translation>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="63"/>
+        <source>Remove this point</source>
+        <translation>Remover este ponto</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="843"/>
-        <location filename="../core/qthelper.cpp" line="1276"/>
-        <source>bar</source>
-        <translation>bar</translation>
+        <location filename="../desktop-widgets/globe.cpp" line="327"/>
+        <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>
     <message>
-        <location filename="../core/qthelper.cpp" line="868"/>
-        <source>EAN</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="32"/>
+        <source>Average</source>
+        <translation>Média</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="1298"/>
-        <source>l</source>
-        <translation>l</translation>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="35"/>
+        <source>Minimum</source>
+        <translation>Mínima</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="1299"/>
-        <source>cuft</source>
-        <translation>pé cúbico</translation>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="38"/>
+        <source>Maximum</source>
+        <translation>Máxima</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="625"/>
@@ -7148,17 +7299,12 @@ Por favor inicie o Bluetooth no seu OSTC Sport e siga o mesmo procedimento que p
         <source>Malformed XML response. Line %1: %2</source>
         <translation>Resposta XML mal formada. Linha %1: %2</translation>
     </message>
-    <message>
-        <location filename="../core/gpslocation.h" line="13"/>
-        <source>Waiting to aquire GPS location</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>ReadSettingsThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1651"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1676"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1640"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1665"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Esta característica não está ainda disponível para o computador de mergulho seleccionado.</translation>
     </message>
@@ -7187,7 +7333,7 @@ Por favor inicie o Bluetooth no seu OSTC Sport e siga o mesmo procedimento que p
 <context>
     <name>ResetSettingsThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1775"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1764"/>
         <source>Reset settings failed!</source>
         <translation>A reinicialização das configurações falhou!</translation>
     </message>
@@ -7225,6 +7371,12 @@ Por favor inicie o Bluetooth no seu OSTC Sport e siga o mesmo procedimento que p
 <context>
     <name>ShiftImageTimesDialog</name>
     <message>
+        <location filename="../desktop-widgets/shiftimagetimes.ui" line="23"/>
+        <location filename="../build/ui_shiftimagetimes.h" line="184"/>
+        <source>Shift selected image times</source>
+        <translation>Deslocar os tempos seleccionados</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/shiftimagetimes.ui" line="34"/>
         <location filename="../build/ui_shiftimagetimes.h" line="185"/>
         <source>Shift times of image(s) by</source>
@@ -7237,12 +7389,6 @@ Por favor inicie o Bluetooth no seu OSTC Sport e siga o mesmo procedimento que p
         <translation>h:mm</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/shiftimagetimes.ui" line="23"/>
-        <location filename="../build/ui_shiftimagetimes.h" line="184"/>
-        <source>Shift selected image times</source>
-        <translation>Deslocar os tempos seleccionados</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/shiftimagetimes.ui" line="105"/>
         <location filename="../build/ui_shiftimagetimes.h" line="187"/>
         <source>Earlier</source>
@@ -7294,12 +7440,12 @@ Nem todas as imagens foram obtidas no entervalo entre
         <translation>Que data e hora estão representados na imagem?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="297"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="296"/>
         <source>Open image file</source>
         <translation>Abrir imagem</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="299"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="298"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>Ficheiros de imagem (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -7395,28 +7541,28 @@ Nem todas as imagens foram obtidas no entervalo entre
     <message>
         <location filename="../smtk-import/smrtk2ssrfc_window.ui" line="20"/>
         <source>SmartTrak files importer</source>
-        <translation type="unfinished"/>
+        <translation>Importador de ficheiros SmartTrak</translation>
     </message>
     <message>
         <location filename="../smtk-import/smrtk2ssrfc_window.ui" line="79"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#6ebeb9;&quot;&gt;Subsurface divelog&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#6ebeb9;&quot;&gt;Subsurface divelog&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location filename="../smtk-import/smrtk2ssrfc_window.ui" line="111"/>
         <location filename="../smtk-import/smrtk2ssrfc_window.ui" line="177"/>
         <source>Choose</source>
-        <translation type="unfinished"/>
+        <translation>Escolha</translation>
     </message>
     <message>
         <location filename="../smtk-import/smrtk2ssrfc_window.ui" line="133"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#6ebeb9;&quot;&gt;Smartrak divelog&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#6ebeb9;&quot;&gt;Smartrak divelog&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location filename="../smtk-import/smrtk2ssrfc_window.ui" line="242"/>
         <source>Exit</source>
-        <translation type="unfinished"/>
+        <translation>Sair</translation>
     </message>
     <message>
         <location filename="../smtk-import/smrtk2ssrfc_window.ui" line="270"/>
@@ -7426,85 +7572,85 @@ Nem todas as imagens foram obtidas no entervalo entre
     <message>
         <location filename="../smtk-import/smrtk2ssrfc_window.ui" line="295"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600; color:#6ebeb9;&quot;&gt;Select the .slg file(s) you want to import to Subsurface format, and the exported .xml file. It&apos;s advisable to use a new output file, as its actual content will be erased.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600; color:#6ebeb9;&quot;&gt;Seleccione o(s) ficheiro(s) .slg que pretende importar para o formato Subsurface, e o ficheiro.xml a exportar. É aconselhável usar um ficheiro de saída novo, já que os seus conteúdos irão ser eliminados.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location filename="../smtk-import/smrtk2ssrfc_window.ui" line="377"/>
         <source>Import messages (Errors, warnings, etc)</source>
-        <translation type="unfinished"/>
+        <translation>Importar mensagens (Erros, avisos, etc.)</translation>
     </message>
     <message>
         <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="50"/>
         <source>Open SmartTrak files</source>
-        <translation type="unfinished"/>
+        <translation>Abril ficheiros Smarttrak</translation>
     </message>
     <message>
         <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="51"/>
         <source>SmartTrak files (*.slg *.SLG);;All files (*)</source>
-        <translation type="unfinished"/>
+        <translation>Ficheiros SmartTrak (*.slg *.SLG);;Todos os ficheiros (*)</translation>
     </message>
     <message>
         <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="62"/>
         <source>Open Subsurface files</source>
-        <translation type="unfinished"/>
+        <translation>Abrir ficheiros Subsurface</translation>
     </message>
     <message>
         <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="63"/>
         <source>Subsurface files (*.ssrf *SSRF *.xml *.XML);;All files (*)</source>
-        <translation type="unfinished"/>
+        <translation>Ficheiros Subsurface (*.ssrf *SSRF *.xml *.XML);;Todos os ficheiros (*)</translation>
     </message>
 </context>
 <context>
     <name>SocialNetworkDialog</name>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="339"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="284"/>
         <source>Dive date: %1 
 </source>
         <translation>Data do mergulho: %1
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="342"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="287"/>
         <source>Duration: %1 
 </source>
         <translation>Duração: %1
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="343"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="288"/>
         <source>h:</source>
         <comment>abbreviation for hours plus separator</comment>
         <translation>h:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="344"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="289"/>
         <source>min</source>
         <comment>abbreviation for minutes</comment>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="347"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="292"/>
         <source>Dive location: %1 
 </source>
         <translation>Local do mergulho: %1
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="350"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="295"/>
         <source>Buddy: %1 
 </source>
         <translation>Companheiro: %1
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="353"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="298"/>
         <source>Divemaster: %1 
 </source>
         <translation>Guia de mergulho: %1
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="356"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="301"/>
         <source>
 %1</source>
         <translation>
@@ -7590,9 +7736,20 @@ Nem todas as imagens foram obtidas no entervalo entre
     <name>StartPage</name>
     <message>
         <location filename="../mobile-widgets/qml/StartPage.qml" line="19"/>
-        <source>To use Subsurface-mobile with Subsurface cloud storage, please enteryour cloud credentials.
+        <source>To use Subsurface-mobile with Subsurface cloud storage, please enter your cloud credentials.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/StartPage.qml" line="20"/>
+        <source>If this is the first time you use Subsurface cloud storage, enter a valid email (all lower case) and a password of your choice (letters and numbers). The server will send a PIN to the email address provided that you will have to enter here.
 
-To use Subsurface-mobile only with local data on this device, tap on the no cloud icon below.</source>
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/StartPage.qml" line="23"/>
+        <source>To use Subsurface-mobile only with local data on this device, tap on the no cloud icon below.</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -7625,13 +7782,18 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
     <message>
         <location filename="../desktop-widgets/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, Tomaz Canabrava, and others, 2011-2016&lt;/span&gt;</source>
-        <translation type="unfinished"/>
+        <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 multi-plataforma de registo de mergulhos&lt;br&gt;&lt;span style=&apos;font-size: 8pt&apos;&gt;Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, e outros, 2011-2016&lt;/span&gt;</translation>
     </message>
 </context>
 <context>
     <name>SubsurfaceWebServices</name>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="419"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="395"/>
+        <source>Enter User ID and click Download</source>
+        <translation>Introduza o ID do utilizador e clique em &quot;Download&quot;</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="417"/>
         <source>Webservice</source>
         <translation>Serviço web</translation>
     </message>
@@ -7656,30 +7818,25 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
         <translation>Erro de ligação:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="557"/>
-        <source>Download successful</source>
-        <translation>Transferência bem sucedida</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="551"/>
         <source>Invalid user identifier!</source>
         <translation>Identificação de utilizador inválida !</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="397"/>
-        <source>Enter User ID and click Download</source>
-        <translation>Introduza o ID do utilizador e clique em &quot;Download&quot;</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="554"/>
         <source>Cannot parse response!</source>
         <translation>Não foi possível analisar a resposta !</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="557"/>
+        <source>Download successful</source>
+        <translation>Transferência bem sucedida</translation>
+    </message>
 </context>
 <context>
     <name>SuitFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="674"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="672"/>
         <source>Suits: </source>
         <translation>Fatos:</translation>
     </message>
@@ -7687,7 +7844,7 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>SuitsFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="123"/>
+        <location filename="../qt-models/filtermodels.cpp" line="128"/>
         <source>No suit set</source>
         <translation>Fato não definido</translation>
     </message>
@@ -7706,7 +7863,7 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>TagFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="595"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="593"/>
         <source>Tags: </source>
         <translation>Etiquetas:</translation>
     </message>
@@ -7714,7 +7871,7 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>TagFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="148"/>
+        <location filename="../qt-models/filtermodels.cpp" line="153"/>
         <source>Empty tags</source>
         <translation>Sem etiquetas</translation>
     </message>
@@ -7740,6 +7897,11 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>TemplateEdit</name>
     <message>
+        <location filename="../desktop-widgets/templateedit.ui" line="14"/>
+        <source>Edit template</source>
+        <translation>Editar modelo</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/templateedit.ui" line="37"/>
         <source>Preview</source>
         <translation>Prever</translation>
@@ -7785,11 +7947,6 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
         <translation>Tamanho da fonte</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/templateedit.ui" line="14"/>
-        <source>Edit template</source>
-        <translation>Editar modelo</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/templateedit.ui" line="165"/>
         <source>Color palette</source>
         <translation>Paleta de cores</translation>
@@ -7971,82 +8128,9 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>TextHyperlinkEventFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="817"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="815"/>
         <source>%1click to visit %2</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>ThemeTest</name>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="29"/>
-        <source>Theme Information</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="33"/>
-        <source>Screen</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="42"/>
-        <source>Geometry (pixels):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="49"/>
-        <source>Geometry (gridUnits):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="56"/>
-        <source>Units.gridUnit:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="63"/>
-        <source>Units.devicePixelRatio:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="70"/>
-        <source>Font Metrics</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="76"/>
-        <source>FontMetrics pointSize:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="83"/>
-        <source>FontMetrics pixelSize:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="90"/>
-        <source>FontMetrics devicePixelRatio:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="97"/>
-        <source>Text item pixelSize:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="104"/>
-        <source>Text item pointSize:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="111"/>
-        <source>Pixel density:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="118"/>
-        <source>Height of default font:</source>
-        <translation type="unfinished"/>
+        <translation>%1clicar para visitar %2</translation>
     </message>
 </context>
 <context>
@@ -8060,102 +8144,107 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>TripItem</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="67"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="68"/>
         <source>(%1 shown)</source>
         <translation>(%1 mostrados)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="194"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="197"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="215"/>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="200"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="218"/>
         <source>Rating</source>
         <translation>Classificação</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
         <source>Depth(%1)</source>
         <translation>Profundidade(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
         <source>ft</source>
         <translation>pé</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="206"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="224"/>
         <source>Duration</source>
         <translation>Duração</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="209"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="227"/>
         <source>Temp(%1%2)</source>
         <translation>Temperatura(%1%2)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
         <source>Weight(%1)</source>
         <translation>Peso(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
         <source>lbs</source>
         <translation>libra</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="215"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="233"/>
         <source>Suit</source>
         <translation>Fato</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="218"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="236"/>
         <source>Cyl</source>
         <translation>Garrafa</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="239"/>
         <source>Gas</source>
         <translation>Gás</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="244"/>
         <source>SAC(%1)</source>
         <translation>SAC(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="244"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="229"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="247"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="232"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="250"/>
         <source>Max CNS</source>
         <translation>CNS Máx</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="235"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="253"/>
+        <source>Photos before/during/after dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="256"/>
         <source>Location</source>
         <translation>Local</translation>
     </message>
@@ -8178,72 +8267,73 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>UpdateManager</name>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="69"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="61"/>
         <source>Check for updates.</source>
         <translation>Procurar actualizações</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="70"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="62"/>
         <source>Subsurface was unable to check for updates.</source>
         <translation>Não foi possível encontrar actualizações para o Subsurface.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="75"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="67"/>
         <source>The following error occurred:</source>
         <translation>Ocorreu o seguinte erro :</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="76"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="68"/>
         <source>Please check your internet connection.</source>
         <translation>Por favor, verifique a ligação à Internet</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="86"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="78"/>
         <source>You are using the latest version of Subsurface.</source>
         <translation>Está a usar a última versão do Subsurface.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="89"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="81"/>
         <source>A new version of Subsurface is available.&lt;br/&gt;Click on:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; to download it.</source>
         <translation>Está disponível uma nova versão do Subsurface.&lt;br/&gt;Clique em:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; para a transferir.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="95"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="87"/>
         <source>A new version of Subsurface is available.</source>
         <translation>Está disponível uma nova versão do Subsurface.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="96"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="88"/>
         <source>Latest version is %1, please check %2 our download page %3 for information in how to update.</source>
         <translation>A última versão é %1. Por favor verifique %2 a nossa página de downloads %3 para obter informações sobre como actualizar.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="106"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="98"/>
         <source>Newest release version is </source>
         <translation>A última versão lançada foi </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="107"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="99"/>
         <source>The server returned the following information:</source>
         <translation>O servidor retornou a informação seguinte:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="125"/>
-        <source>Subsurface is checking every two weeks if a new version is available. If you don&apos;t want Subsurface to continue checking, please click Decline.</source>
-        <translation>O Subsurface verifica a existência de novas versões a cada duas semanas. Se não desejar que tal aconteça, por favor clique em Declinar.</translation>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="117"/>
+        <source>Subsurface is checking every two weeks if a new version is available. 
+ If you don&apos;t want Subsurface to continue checking, please click Decline.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="126"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="119"/>
         <source>Decline</source>
         <translation>Declinar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="127"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="120"/>
         <source>Accept</source>
         <translation>Aceitar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="129"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="122"/>
         <source>Automatic check for updates</source>
         <translation>Verificar automaticamente a existência de actualizações</translation>
     </message>
@@ -8265,24 +8355,6 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>UserSurvey</name>
     <message>
-        <location filename="../desktop-widgets/usersurvey.ui" line="44"/>
-        <location filename="../build/ui_usersurvey.h" line="151"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;We would love to learn more about our users, their preferences and their usage habits. Please spare a minute to fill out this form and submit it to the Subsurface team.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Gostaríamos de saber mais sobre os utilizadores do nosso programa, as suas preferências e os seus hábitos de utilização. Por faver dispenda alguns momentos a preencher e enviar este formulário para a equipe do Subsurface.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/usersurvey.ui" line="115"/>
-        <location filename="../build/ui_usersurvey.h" line="156"/>
-        <source>Other software/sources</source>
-        <translation>Outras fontes/aplicações</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/usersurvey.ui" line="128"/>
-        <location filename="../build/ui_usersurvey.h" line="157"/>
-        <source>Manually entering dives</source>
-        <translation>Preenchimento manual dos mergulhos</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="14"/>
         <location filename="../build/ui_usersurvey.h" line="149"/>
         <source>User survey</source>
@@ -8295,6 +8367,12 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
         <translation>Inquérito aos utilizadores do Subsurface</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/usersurvey.ui" line="44"/>
+        <location filename="../build/ui_usersurvey.h" line="151"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;We would love to learn more about our users, their preferences and their usage habits. Please spare a minute to fill out this form and submit it to the Subsurface team.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Gostaríamos de saber mais sobre os utilizadores do nosso programa, as suas preferências e os seus hábitos de utilização. Por faver dispenda alguns momentos a preencher e enviar este formulário para a equipe do Subsurface.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="63"/>
         <location filename="../build/ui_usersurvey.h" line="152"/>
         <source>Technical diver</source>
@@ -8319,6 +8397,18 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
         <translation>Computador de mergulho suportado</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/usersurvey.ui" line="115"/>
+        <location filename="../build/ui_usersurvey.h" line="156"/>
+        <source>Other software/sources</source>
+        <translation>Outras fontes/aplicações</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/usersurvey.ui" line="128"/>
+        <location filename="../build/ui_usersurvey.h" line="157"/>
+        <source>Manually entering dives</source>
+        <translation>Preenchimento manual dos mergulhos</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="141"/>
         <location filename="../build/ui_usersurvey.h" line="158"/>
         <source>Android/iPhone companion app</source>
@@ -8349,6 +8439,11 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
         <translation>De onde importa os seus dados de mergulho?</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/usersurvey.cpp" line="18"/>
+        <source>Send</source>
+        <translation>Enviar</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/usersurvey.cpp" line="43"/>
         <source>
 Operating system: %1</source>
@@ -8392,19 +8487,14 @@ Linguagem: %1</translation>
         <translation>Perguntar mais tarde</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/usersurvey.cpp" line="101"/>
-        <source>Submit user survey.</source>
-        <translation>Enviar questionário do utilizador.</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/usersurvey.cpp" line="82"/>
         <source>Ask again?</source>
         <translation>Perguntar novamente?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/usersurvey.cpp" line="18"/>
-        <source>Send</source>
-        <translation>Enviar</translation>
+        <location filename="../desktop-widgets/usersurvey.cpp" line="101"/>
+        <source>Submit user survey.</source>
+        <translation>Enviar questionário do utilizador.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/usersurvey.cpp" line="102"/>
@@ -8496,12 +8586,12 @@ Linguagem: %1</translation>
         <translation>Carregar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="324"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="325"/>
         <source>Operation timed out</source>
         <translation>A operação demorou demasiado tempo</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="345"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="346"/>
         <source>Transferring data...</source>
         <translation>A transferir dados...</translation>
     </message>
@@ -8536,18 +8626,18 @@ Linguagem: %1</translation>
 <context>
     <name>WriteSettingsThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1702"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1709"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1718"/>
-        <source>Failed!</source>
-        <translation>Falhou!</translation>
-    </message>
-    <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1700"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1721"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1689"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1710"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Esta característica não está ainda disponível para o computador de mergulho seleccionado.</translation>
     </message>
+    <message>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1691"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1698"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1707"/>
+        <source>Failed!</source>
+        <translation>Falhou!</translation>
+    </message>
 </context>
 <context>
     <name>YearlyStatisticsModel</name>
@@ -8672,7 +8762,7 @@ Média</translation>
 <context>
     <name>getextFromC</name>
     <message>
-        <location filename="../core/libdivecomputer.c" line="674"/>
+        <location filename="../core/libdivecomputer.c" line="737"/>
         <source>Error parsing the header</source>
         <translation>Erro ao analisar o cabeçalho</translation>
     </message>
@@ -8680,38 +8770,377 @@ Média</translation>
 <context>
     <name>gettextFromC</name>
     <message>
+        <location filename="../core/cochran.c" line="309"/>
+        <location filename="../core/cochran.c" line="315"/>
+        <location filename="../core/cochran.c" line="385"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>deco stop</source>
+        <translation>paragem de deco</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="336"/>
+        <location filename="../core/cochran.c" line="390"/>
+        <location filename="../core/file.c" line="777"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>ascent</source>
+        <translation>subida</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="342"/>
+        <location filename="../core/file.c" line="755"/>
+        <source>battery</source>
+        <translation>bateria</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="348"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
+        <source>OLF</source>
+        <translation>OLF</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="353"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
+        <source>maxdepth</source>
+        <translation>Profundidade máxima</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="358"/>
+        <location filename="../core/cochran.c" line="404"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
+        <source>pO₂</source>
+        <translation>pO₂</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="365"/>
+        <location filename="../core/cochran.c" line="414"/>
+        <location filename="../core/cochran.c" line="421"/>
+        <location filename="../core/file.c" line="868"/>
+        <location filename="../core/libdivecomputer.c" line="225"/>
+        <location filename="../core/libdivecomputer.c" line="228"/>
+        <source>gaschange</source>
+        <translation>troca de gás</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="370"/>
+        <location filename="../core/cochran.c" line="409"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>rbt</source>
+        <translation>rbt</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="379"/>
+        <location filename="../core/cochran.c" line="426"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>ceiling</source>
+        <translation>tecto</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="395"/>
+        <location filename="../core/libdivecomputer.c" line="224"/>
+        <source>transmitter</source>
+        <translation>transmissor</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="153"/>
+        <source>Error: the file does not appear to be a DATATRAK divelog</source>
+        <translation>Erro: o ficheiro não parece ser um ficheiro DATATRAK</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="286"/>
+        <source>clear</source>
+        <translation>limpar</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="289"/>
+        <source>misty</source>
+        <translation>nebuloso</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="292"/>
+        <source>fog</source>
+        <translation>nevoeiro</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="295"/>
+        <source>rain</source>
+        <translation>chuva</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="298"/>
+        <source>storm</source>
+        <translation>tempestade</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="301"/>
+        <source>snow</source>
+        <translation>neve</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="321"/>
+        <source>No suit</source>
+        <translation>Sem fato</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="324"/>
+        <source>Shorty</source>
+        <translation>Fato curto</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="327"/>
+        <source>Combi</source>
+        <translation>Combi</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="330"/>
+        <source>Wet suit</source>
+        <translation>Fato húmido</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="333"/>
+        <source>Semidry suit</source>
+        <translation>Fato semi-seco</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="336"/>
+        <source>Dry suit</source>
+        <translation>Fato seco</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="396"/>
+        <source>no stop</source>
+        <translation>sem paragens</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="398"/>
+        <location filename="../core/dive.c" line="29"/>
+        <source>deco</source>
+        <translation>descompressão</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="400"/>
+        <source>single ascent</source>
+        <translation>subida única</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="402"/>
+        <source>multiple ascent</source>
+        <translation>multiplas subidas</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="404"/>
+        <location filename="../core/dive.c" line="27"/>
+        <source>fresh</source>
+        <translation>água doce</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="406"/>
+        <source>salt water</source>
+        <translation>água salgada</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="431"/>
+        <source>sight seeing</source>
+        <translation>&quot;ver as vistas&quot;</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="433"/>
+        <source>club dive</source>
+        <translation>mergulho de clube</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="435"/>
+        <location filename="../core/dive.c" line="28"/>
+        <source>instructor</source>
+        <translation>instrutor</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="437"/>
+        <source>instruction</source>
+        <translation>instrução</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="439"/>
+        <location filename="../core/dive.c" line="27"/>
+        <source>night</source>
+        <translation>nocturno</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="441"/>
+        <location filename="../core/dive.c" line="25"/>
+        <source>cave</source>
+        <translation>gruta</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="443"/>
+        <location filename="../core/dive.c" line="24"/>
+        <source>ice</source>
+        <translation>gelo</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="445"/>
+        <source>search</source>
+        <translation>busca</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="455"/>
+        <location filename="../core/dive.c" line="25"/>
+        <source>wreck</source>
+        <translation>naufrágio</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="457"/>
+        <location filename="../core/dive.c" line="26"/>
+        <source>river</source>
+        <translation>rio</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="459"/>
+        <location filename="../core/dive.c" line="23"/>
+        <source>drift</source>
+        <translation>à deriva</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="461"/>
+        <location filename="../core/dive.c" line="28"/>
+        <source>photo</source>
+        <translation>foto</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="463"/>
+        <source>other</source>
+        <translation>outro</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="474"/>
+        <source>Other activities</source>
+        <translation>Outras actividades</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="498"/>
+        <source>Datatrak/Wlog notes</source>
+        <translation>Notas Datatrak/Wlog</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="537"/>
+        <source>Manually entered dive</source>
+        <translation>Mergulho introduzido manualmente</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="588"/>
+        <source>Unknown</source>
+        <translation>Desconhecido</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="674"/>
+        <source>Error: couldn&apos;t open the file %s</source>
+        <translation>Erro: Não foi possível abrir o ficheiro %s</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="687"/>
+        <source>Error: no dive</source>
+        <translation>Erro: sem mergulho</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="23"/>
+        <source>boat</source>
+        <translation>barco</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="23"/>
+        <source>shore</source>
+        <translation>costa</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="24"/>
+        <source>deep</source>
+        <translation>profundo</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="24"/>
+        <source>cavern</source>
+        <translation>caverna</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="25"/>
+        <source>altitude</source>
+        <translation>em altitude</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="26"/>
+        <source>pool</source>
+        <translation>piscina</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="26"/>
+        <source>lake</source>
+        <translation>lago</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="27"/>
+        <source>student</source>
+        <translation>aluno</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="28"/>
+        <source>video</source>
+        <translation>vídeo</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="33"/>
+        <source>OC-gas</source>
+        <translation>gás-circuito aberto</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="33"/>
+        <source>diluent</source>
+        <translation>diluente</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="33"/>
+        <location filename="../core/equipment.c" line="88"/>
+        <location filename="../core/planner.c" line="1436"/>
+        <location filename="../core/planner.c" line="1439"/>
+        <source>oxygen</source>
+        <translation>oxigénio</translation>
+    </message>
+    <message>
         <location filename="../core/dive.c" line="181"/>
         <source>pascal</source>
         <translation>pascal</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="186"/>
-        <location filename="../core/qthelper.cpp" line="669"/>
+        <location filename="../core/qthelper.cpp" line="674"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="190"/>
-        <location filename="../core/qthelper.cpp" line="672"/>
+        <location filename="../core/qthelper.cpp" line="677"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
+        <location filename="../core/dive.c" line="227"/>
+        <source>ℓ</source>
+        <translation>ℓ</translation>
+    </message>
+    <message>
         <location filename="../core/dive.c" line="232"/>
         <source>cuft</source>
         <translation>pés cúbicos</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="269"/>
-        <location filename="../core/qthelper.cpp" line="590"/>
-        <location filename="../core/qthelper.cpp" line="605"/>
+        <location filename="../core/qthelper.cpp" line="595"/>
+        <location filename="../core/qthelper.cpp" line="610"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="274"/>
-        <location filename="../core/qthelper.cpp" line="593"/>
-        <location filename="../core/qthelper.cpp" line="607"/>
+        <location filename="../core/qthelper.cpp" line="598"/>
+        <location filename="../core/qthelper.cpp" line="612"/>
         <source>ft</source>
         <translation>pés</translation>
     </message>
@@ -8737,53 +9166,58 @@ Média</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="325"/>
-        <location filename="../core/qthelper.cpp" line="616"/>
-        <location filename="../core/qthelper.cpp" line="626"/>
+        <location filename="../core/qthelper.cpp" line="621"/>
+        <location filename="../core/qthelper.cpp" line="631"/>
         <source>lbs</source>
         <translation>libras</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="329"/>
-        <location filename="../core/qthelper.cpp" line="614"/>
-        <location filename="../core/qthelper.cpp" line="624"/>
+        <location filename="../core/qthelper.cpp" line="619"/>
+        <location filename="../core/qthelper.cpp" line="629"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="1772"/>
+        <location filename="../core/dive.c" line="1751"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) ou (%s)</translation>
     </message>
     <message>
-        <location filename="../core/divelist.c" line="484"/>
+        <location filename="../core/divelist.c" line="487"/>
         <location filename="../core/equipment.c" line="84"/>
-        <location filename="../core/planner.c" line="1411"/>
-        <location filename="../core/planner.c" line="1414"/>
+        <location filename="../core/planner.c" line="1432"/>
+        <location filename="../core/planner.c" line="1435"/>
         <source>air</source>
         <translation>ar</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="197"/>
+        <location filename="../core/equipment.c" line="86"/>
+        <source>EAN%d</source>
+        <translation>EAN%d</translation>
+    </message>
+    <message>
+        <location filename="../core/equipment.c" line="198"/>
         <source>integrated</source>
         <translation>integrado</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="198"/>
+        <location filename="../core/equipment.c" line="199"/>
         <source>belt</source>
         <translation>cinto</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="199"/>
+        <location filename="../core/equipment.c" line="200"/>
         <source>ankle</source>
         <translation>tornozelo</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="200"/>
+        <location filename="../core/equipment.c" line="201"/>
         <source>backplate weight</source>
         <translation>lastro no arnês</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="201"/>
+        <location filename="../core/equipment.c" line="202"/>
         <source>clip-on</source>
         <translation>clip-on</translation>
     </message>
@@ -8796,8 +9230,8 @@ Média</translation>
         <location filename="../core/file.c" line="121"/>
         <location filename="../core/file.c" line="512"/>
         <location filename="../core/file.c" line="597"/>
-        <location filename="../core/file.c" line="924"/>
-        <location filename="../core/file.c" line="1056"/>
+        <location filename="../core/file.c" line="909"/>
+        <location filename="../core/file.c" line="1092"/>
         <location filename="../core/ostctools.c" line="80"/>
         <source>Failed to read &apos;%s&apos;</source>
         <translation>Falha na leitura de &apos;%s&apos;</translation>
@@ -8855,486 +9289,496 @@ Média</translation>
         <translation>Calibração de O₂ </translation>
     </message>
     <message>
-        <location filename="../core/file.c" line="887"/>
-        <source>No matching DC found for file &apos;%s&apos;</source>
-        <translation>Não foi possível encontrar um computador de mergulho correspondente ao ficheiro &apos;%s&apos;</translation>
+        <location filename="../core/git-access.c" line="134"/>
+        <source>Local cache directory %s corrupted - can&apos;t sync with Subsurface cloud storage</source>
+        <translation>A cache da pasta %s está corrompida - não é possível sincronizar com o armazenamento remoto do Subsurface</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>none</source>
-        <translation>nenhum</translation>
+        <location filename="../core/git-access.c" line="157"/>
+        <location filename="../core/git-access.c" line="177"/>
+        <source>Could not update local cache to newer remote data</source>
+        <translation>Não foi possível actualizar a cache local com os novos dados no servidor remoto</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="309"/>
-        <location filename="../core/cochran.c" line="315"/>
-        <location filename="../core/cochran.c" line="385"/>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>deco stop</source>
-        <translation>paragem de deco</translation>
+        <location filename="../core/git-access.c" line="170"/>
+        <source>Subsurface cloud storage corrupted</source>
+        <translation>O armazenamento remoto do Subsurface está corrompido</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="342"/>
-        <location filename="../core/file.c" line="755"/>
-        <source>battery</source>
-        <translation>bateria</translation>
+        <location filename="../core/git-access.c" line="284"/>
+        <source>Could not update Subsurface cloud storage, try again later</source>
+        <translation>Não foi possível actualizar o armazenamento remoto do Subsurface. Tente novamente mais tarde</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="370"/>
-        <location filename="../core/cochran.c" line="409"/>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>rbt</source>
-        <translation>rbt</translation>
+        <location filename="../core/git-access.c" line="344"/>
+        <source>Remote storage and local data diverged. Error: merge failed (%s)</source>
+        <translation>O dados remotos divergem dos dados locais. Erro: falha na junção (%s)</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="336"/>
-        <location filename="../core/cochran.c" line="390"/>
-        <location filename="../core/file.c" line="777"/>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>ascent</source>
-        <translation>subida</translation>
+        <location filename="../core/git-access.c" line="374"/>
+        <source>Remote storage and local data diverged. Cannot combine local and remote changes</source>
+        <translation>Os dados no servidor remoto divergem dos dados locais. Não é possível combinar as diferenças.</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="379"/>
-        <location filename="../core/cochran.c" line="426"/>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>ceiling</source>
-        <translation>tecto</translation>
+        <location filename="../core/git-access.c" line="408"/>
+        <source>Remote storage and local data diverged</source>
+        <translation>Os dados no servidor remoto divergem dos dados locais.</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>workload</source>
-        <translation>esforço</translation>
+        <location filename="../core/git-access.c" line="411"/>
+        <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source>
+        <translation>Os dados no servidor remoto divergem dos dados locais. Erro: a escrita dos dados falhou (%s)</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="395"/>
-        <location filename="../core/libdivecomputer.c" line="203"/>
-        <source>transmitter</source>
-        <translation>transmissor</translation>
+        <location filename="../core/git-access.c" line="420"/>
+        <source>Problems with local cache of Subsurface cloud data</source>
+        <translation>Problemas com a cache local dos dados remotos do Subsurface</translation>
+    </message>
+    <message>
+        <location filename="../core/git-access.c" line="421"/>
+        <source>Moved cache data to %s. Please try the operation again.</source>
+        <translation>Cache movida para %s. Tente novamente a operação.</translation>
+    </message>
+    <message>
+        <location filename="../core/git-access.c" line="743"/>
+        <source>Error connecting to Subsurface cloud storage</source>
+        <translation>Erro ao ligar ao armazenamento remodo do Subsurface</translation>
+    </message>
+    <message>
+        <location filename="../core/git-access.c" line="746"/>
+        <source>git clone of %s failed (%s)</source>
+        <translation>Falha (%s) no git clone %s </translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="210"/>
+        <location filename="../core/parse-xml.c" line="3317"/>
+        <location filename="../core/uemis-downloader.c" line="134"/>
+        <source>unknown</source>
+        <translation>desconhecido</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="203"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>none</source>
+        <translation>nenhum</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>workload</source>
+        <translation>esforço</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="224"/>
         <source>violation</source>
         <translation>transgressão</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="203"/>
+        <location filename="../core/libdivecomputer.c" line="224"/>
         <source>bookmark</source>
         <translation>marcador</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="203"/>
+        <location filename="../core/libdivecomputer.c" line="224"/>
         <source>surface</source>
         <translation>superfície</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="203"/>
+        <location filename="../core/libdivecomputer.c" line="224"/>
         <source>safety stop</source>
         <translation>paragem de segurança</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="365"/>
-        <location filename="../core/cochran.c" line="414"/>
-        <location filename="../core/cochran.c" line="421"/>
-        <location filename="../core/file.c" line="868"/>
-        <location filename="../core/libdivecomputer.c" line="204"/>
-        <location filename="../core/libdivecomputer.c" line="207"/>
-        <source>gaschange</source>
-        <translation>troca de gás</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="204"/>
+        <location filename="../core/libdivecomputer.c" line="225"/>
         <source>safety stop (voluntary)</source>
         <translation>paragem de segurança (voluntária)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="204"/>
+        <location filename="../core/libdivecomputer.c" line="225"/>
         <source>safety stop (mandatory)</source>
         <translation>paragem de segurança (obrigatória)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="205"/>
+        <location filename="../core/libdivecomputer.c" line="226"/>
         <source>deepstop</source>
         <translation>paragem funda</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="205"/>
+        <location filename="../core/libdivecomputer.c" line="226"/>
         <source>ceiling (safety stop)</source>
         <translation>tecto (paragem de segurança)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="205"/>
-        <source>divetime</source>
-        <translation>Tempo de mergulho</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="205"/>
+        <location filename="../core/libdivecomputer.c" line="226"/>
         <source>below floor</source>
         <comment>event showing dive is below deco floor and adding deco time</comment>
         <translation>abaixo da zona de descompressão</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="353"/>
-        <location filename="../core/libdivecomputer.c" line="206"/>
-        <source>maxdepth</source>
-        <translation>Profundidade máxima</translation>
-    </message>
-    <message>
-        <location filename="../core/cochran.c" line="348"/>
-        <location filename="../core/libdivecomputer.c" line="206"/>
-        <source>OLF</source>
-        <translation>OLF</translation>
+        <location filename="../core/libdivecomputer.c" line="226"/>
+        <source>divetime</source>
+        <translation>Tempo de mergulho</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="206"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
         <source>airtime</source>
         <translation>autonomia</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="206"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
         <source>rgbm</source>
         <translation>rgbm</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="206"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
         <source>heading</source>
         <translation>cabeçalho</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="358"/>
-        <location filename="../core/cochran.c" line="404"/>
-        <location filename="../core/libdivecomputer.c" line="206"/>
-        <source>pO₂</source>
-        <translation>pO₂</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="207"/>
+        <location filename="../core/libdivecomputer.c" line="228"/>
         <source>tissue level warning</source>
         <translation>Alarme de tensão de azoto nos tecidos</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="207"/>
+        <location filename="../core/libdivecomputer.c" line="228"/>
         <source>non stop time</source>
         <translation>tempo sem paragem</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="224"/>
+        <location filename="../core/libdivecomputer.c" line="237"/>
         <source>invalid event number</source>
         <translation>Número de evento inválido</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="658"/>
-        <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="../core/libdivecomputer.c" line="664"/>
-        <source>Error registering the data</source>
-        <translation>Erro no registo de dados</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="495"/>
+        <location filename="../core/libdivecomputer.c" line="553"/>
         <source>Error parsing the datetime</source>
         <translation>Erro na análise da data/tempo</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="513"/>
+        <location filename="../core/libdivecomputer.c" line="571"/>
         <source>Dive %d: %s</source>
         <translation>Mergulho nº %d: %s</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="519"/>
+        <location filename="../core/libdivecomputer.c" line="577"/>
         <source>Error parsing the divetime</source>
         <translation>Erro na análise do tempo de mergulho</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="529"/>
+        <location filename="../core/libdivecomputer.c" line="587"/>
         <source>Error parsing the maxdepth</source>
         <translation>Erro na análise da profundidade máxima</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="548"/>
+        <location filename="../core/libdivecomputer.c" line="606"/>
         <source>Error parsing temperature</source>
         <translation>Erro ao analisar tempetaturas</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="568"/>
+        <location filename="../core/libdivecomputer.c" line="626"/>
         <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="../core/libdivecomputer.c" line="580"/>
+        <location filename="../core/libdivecomputer.c" line="638"/>
         <source>Error obtaining water salinity</source>
         <translation>Erro na obtenção da salinidade da água</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="589"/>
+        <location filename="../core/libdivecomputer.c" line="647"/>
         <source>Error obtaining surface pressure</source>
         <translation>Erro na obtenção da pressão atmosférica</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="614"/>
+        <location filename="../core/libdivecomputer.c" line="672"/>
         <source>Error obtaining divemode</source>
         <translation>Erro na obtenção do modo de mergulho</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="634"/>
+        <location filename="../core/libdivecomputer.c" line="692"/>
         <source>Error parsing the gas mix</source>
         <translation>Erro na análise da mistura de gás</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="684"/>
+        <location filename="../core/libdivecomputer.c" line="717"/>
+        <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="../core/libdivecomputer.c" line="723"/>
+        <source>Error registering the data</source>
+        <translation>Erro no registo de dados</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="744"/>
         <source>Error parsing the samples</source>
         <translation>Erro na análise das amostras</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="822"/>
+        <location filename="../core/libdivecomputer.c" line="882"/>
         <source>Event: waiting for user action</source>
         <translation>Evento: à espera de acção do utilizador</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="830"/>
+        <location filename="../core/libdivecomputer.c" line="890"/>
         <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="../core/libdivecomputer.c" line="894"/>
+        <location filename="../core/libdivecomputer.c" line="954"/>
         <source>Error registering the event handler.</source>
         <translation>Erro no registo do &quot;event handler&quot;.</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="899"/>
+        <location filename="../core/libdivecomputer.c" line="959"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Erro no registo do &quot;cancellation handler&quot;.</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="920"/>
+        <location filename="../core/libdivecomputer.c" line="980"/>
         <source>Dive data import error</source>
         <translation>Erro a importar os dados do mergulho</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="959"/>
+        <location filename="../core/libdivecomputer.c" line="1019"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Não é possivel criar contexto do libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="966"/>
+        <location filename="../core/libdivecomputer.c" line="1026"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Não se consegue abrir  %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="992"/>
+        <location filename="../core/libdivecomputer.c" line="1048"/>
         <source>Insufficient privileges to open the device %s %s (%s)</source>
         <translation>Não possui previlégios suficientes para abrir o dispositivo %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../core/parse-xml.c" line="517"/>
-        <source>Strange percentage reading %s
+        <location filename="../core/load-git.c" line="194"/>
+        <location filename="../core/parse-xml.c" line="1242"/>
+        <source>multiple GPS locations for this dive site; also %s
 </source>
-        <translation>Leitura estranha das percentagens %s
+        <translation>várias posições GPS para este local; ver também %s
 </translation>
     </message>
     <message>
-        <location filename="../core/load-git.c" line="194"/>
-        <location filename="../core/parse-xml.c" line="1238"/>
-        <source>multiple GPS locations for this dive site; also %s
+        <location filename="../core/load-git.c" line="222"/>
+        <location filename="../core/parse-xml.c" line="1304"/>
+        <source>additional name for site: %s
 </source>
-        <translation>várias posições GPS para este local; ver também %s
+        <translation>nome adicional para o local: %s
+</translation>
+    </message>
+    <message>
+        <location filename="../core/ostctools.c" line="120"/>
+        <location filename="../core/ostctools.c" line="152"/>
+        <source>Unknown DC in dive %d</source>
+        <translation>Computador de mergulho desconhecido no mergulho %d</translation>
+    </message>
+    <message>
+        <location filename="../core/ostctools.c" line="165"/>
+        <source>Error - %s - parsing dive %d</source>
+        <translation>Erro - %s - ao analisar o mergulho %d</translation>
+    </message>
+    <message>
+        <location filename="../core/parse-xml.c" line="517"/>
+        <source>Strange percentage reading %s
+</source>
+        <translation>Leitura estranha das percentagens %s
 </translation>
     </message>
     <message>
-        <location filename="../core/parse-xml.c" line="2044"/>
+        <location filename="../core/parse-xml.c" line="2051"/>
         <source>Failed to parse &apos;%s&apos;</source>
         <translation>Falha na análise de &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../core/parse-xml.c" line="3741"/>
+        <location filename="../core/parse-xml.c" line="3774"/>
         <source>Can&apos;t open stylesheet %s</source>
         <translation>Não é possível abrir a folha de estilos %s</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="86"/>
-        <source>EAN%d</source>
-        <translation>EAN%d</translation>
+        <location filename="../core/planner.c" line="555"/>
+        <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE %s ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source>
+        <translation>AVISO: ESTA É UMA NOVA IMPLEMENTAÇÃO DO ALGORITMO %s E UMA NOVA IMPLEMENTAÇÃO DE UM PLANEADOR NELE BASEADO. APESAR DE TER SIDO ALVO DE ALGUNS TESTES, ESTES NÃO FORAM EXAUSTIVOS. RECOMENDA-SE VIVAMENTE QUE NÃO PLANEIE MERGULHOS APENAS COM BASE NOS RESULTADOS AQUI APRESENTADOR.</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="1032"/>
-        <location filename="../core/planner.c" line="1184"/>
-        <source>Can&apos;t find gas %s</source>
-        <translation>Não foi possível encontrar o gás %s</translation>
+        <location filename="../core/planner.c" line="569"/>
+        <source>Decompression calculation aborted due to excessive time</source>
+        <translation>O cálculo da descompressão foi terminado por esta ser demasiado longa</translation>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="571"/>
+        <location filename="../core/planner.c" line="829"/>
+        <location filename="../core/planner.c" line="834"/>
+        <location filename="../core/planner.c" line="860"/>
+        <location filename="../core/planner.c" line="870"/>
+        <source>Warning:</source>
+        <translation>Aviso:</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="368"/>
-        <source>Too many gas mixes</source>
-        <translation>Demasiadas misturas de gás</translation>
+        <location filename="../core/planner.c" line="581"/>
+        <source>based on Bühlmann ZHL-16C with GFlow = %d and GFhigh = %d</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="568"/>
-        <source>Decompression calculation aborted due to excessive time</source>
-        <translation>O cálculo da descompressão foi terminado por esta ser demasiado longa</translation>
+        <location filename="../core/planner.c" line="586"/>
+        <source>based on VPM-B at nominal conservatism</source>
+        <translation>baseado no conservacionismo nominal do VPM-B</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="592"/>
+        <location filename="../core/planner.c" line="588"/>
+        <source>based on VPM-B at +%d conservatism</source>
+        <translation>baseado no VPM-B com conservacionismo +%d </translation>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="590"/>
+        <source>, effective GF=%d/%d</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="594"/>
+        <source>recreational mode based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source>
+        <translation>modo recreartivo baseado no algoritmo Bühlmann ZHL-16B com GFlow = %d e GFhigh = %d</translation>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="598"/>
         <source>Subsurface dive plan</source>
         <translation>Plano de mergulho Subsurface</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="596"/>
-        <source>depth</source>
-        <translation>profundidade</translation>
+        <location filename="../core/planner.c" line="599"/>
+        <source>&lt;div&gt;Runtime: %dmin&lt;/div&gt;&lt;br&gt;</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="602"/>
-        <source>runtime</source>
-        <translation>runtime</translation>
+        <location filename="../core/planner.c" line="604"/>
+        <source>depth</source>
+        <translation>profundidade</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="599"/>
+        <location filename="../core/planner.c" line="607"/>
         <source>duration</source>
         <translation>duração</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="554"/>
-        <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE %s ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source>
-        <translation>AVISO: ESTA É UMA NOVA IMPLEMENTAÇÃO DO ALGORITMO %s E UMA NOVA IMPLEMENTAÇÃO DE UM PLANEADOR NELE BASEADO. APESAR DE TER SIDO ALVO DE ALGUNS TESTES, ESTES NÃO FORAM EXAUSTIVOS. RECOMENDA-SE VIVAMENTE QUE NÃO PLANEIE MERGULHOS APENAS COM BASE NOS RESULTADOS AQUI APRESENTADOR.</translation>
+        <location filename="../core/planner.c" line="610"/>
+        <source>runtime</source>
+        <translation>runtime</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="605"/>
+        <location filename="../core/planner.c" line="613"/>
         <source>gas</source>
         <translation>gás</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="648"/>
+        <location filename="../core/planner.c" line="656"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation>Transição para %.*f %s em %d:%02d min - runtime %d:%02u a %s (SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="656"/>
+        <location filename="../core/planner.c" line="664"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source>
         <translation>Transição para %.*f %s em %d:%02d min - runtime %d:%02u com %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="669"/>
+        <location filename="../core/planner.c" line="677"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation>Permanecer a at %.*f %s durante %d:%02d min - runtime %d:%02u a %s (SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="676"/>
+        <location filename="../core/planner.c" line="684"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source>
         <translation>Permanecer a %.*f %s for %d:%02d min - runtime %d:%02u com %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="721"/>
+        <location filename="../core/planner.c" line="729"/>
         <source>%3.0f%s</source>
         <translation>%3.0f%s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="724"/>
-        <location filename="../core/planner.c" line="728"/>
+        <location filename="../core/planner.c" line="732"/>
+        <location filename="../core/planner.c" line="736"/>
         <source>%3dmin</source>
         <translation>%3dmin</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="737"/>
-        <location filename="../core/planner.c" line="749"/>
+        <location filename="../core/planner.c" line="745"/>
+        <location filename="../core/planner.c" line="757"/>
         <source>(SP = %.1fbar)</source>
         <translation>(SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="772"/>
+        <location filename="../core/planner.c" line="780"/>
         <source>Switch gas to %s (SP = %.1fbar)</source>
         <translation>Trocar gás para %s (SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="774"/>
+        <location filename="../core/planner.c" line="782"/>
         <source>Switch gas to %s</source>
         <translation>Mudar para %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="793"/>
+        <location filename="../core/planner.c" line="801"/>
         <source>CNS</source>
         <translation>CNS</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="795"/>
+        <location filename="../core/planner.c" line="803"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="799"/>
+        <location filename="../core/planner.c" line="807"/>
         <source>Gas consumption (CCR legs excluded):</source>
         <translation>Consumo de gás (excluídas as fases c/CCR):</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="801"/>
+        <location filename="../core/planner.c" line="809"/>
         <source>Gas consumption:</source>
         <translation>Consumo de gás:</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="570"/>
-        <location filename="../core/planner.c" line="821"/>
-        <location filename="../core/planner.c" line="826"/>
-        <location filename="../core/planner.c" line="851"/>
-        <location filename="../core/planner.c" line="861"/>
-        <source>Warning:</source>
-        <translation>Aviso:</translation>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="580"/>
-        <source>based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source>
-        <translation>baseado no algoritmo Bühlmann ZHL-16B com GFlow = %d e GFhigh = %d</translation>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="584"/>
-        <source>based on VPM-B at nominal conservatism</source>
-        <translation>baseado no conservacionismo nominal do VPM-B</translation>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="586"/>
-        <source>based on VPM-B at +%d conservatism</source>
-        <translation>baseado no VPM-B com conservacionismo +%d </translation>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="588"/>
-        <source>recreational mode based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source>
-        <translation>modo recreartivo baseado no algoritmo Bühlmann ZHL-16B com GFlow = %d e GFhigh = %d</translation>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="822"/>
+        <location filename="../core/planner.c" line="830"/>
         <source>this is more gas than available in the specified cylinder!</source>
         <translation>a quantidade de gás necessária excede a quantidade disponível na garrafa!</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="827"/>
+        <location filename="../core/planner.c" line="835"/>
         <source>not enough reserve for gas sharing on ascent!</source>
         <translation>a reserva de gás não é suficiente para ser partilhada durante a subida!</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="829"/>
+        <location filename="../core/planner.c" line="837"/>
         <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source>
         <translation>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s na subida planeada)</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="831"/>
+        <location filename="../core/planner.c" line="839"/>
         <source>%.0f%s (%.0f%s during planned ascent) of %s</source>
         <translation>%.0f%s (%.0f%s durante a subida planeada) de %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="848"/>
+        <location filename="../core/planner.c" line="857"/>
         <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
         <translation>valor pO₂ elevado %.2f em %d:%02u com gás %s à profundidade de %.*f %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="858"/>
+        <location filename="../core/planner.c" line="867"/>
         <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
         <translation>valor de pO₂ baixo %.2f em %d:%02u com gás %s à profundidade de %.*f %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="1419"/>
+        <location filename="../core/planner.c" line="1194"/>
+        <source>Can&apos;t find gas %s</source>
+        <translation>Não foi possível encontrar o gás %s</translation>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="1440"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1280"/>
+        <location filename="../core/profile.c" line="1298"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
@@ -9343,70 +9787,70 @@ D: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1283"/>
+        <location filename="../core/profile.c" line="1301"/>
         <source>P: %d%s
 </source>
         <translation>P: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1287"/>
+        <location filename="../core/profile.c" line="1305"/>
         <source>T: %.1f%s
 </source>
         <translation>T: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1293"/>
+        <location filename="../core/profile.c" line="1311"/>
         <source>V: %.1f%s
 </source>
         <translation>V: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1296"/>
+        <location filename="../core/profile.c" line="1314"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation>SAC: %.*f%s/min
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1298"/>
+        <location filename="../core/profile.c" line="1316"/>
         <source>CNS: %u%%
 </source>
         <translation>CNS: %u%%
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1300"/>
+        <location filename="../core/profile.c" line="1318"/>
         <source>pO%s: %.2fbar
 </source>
         <translation>pO%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1302"/>
+        <location filename="../core/profile.c" line="1320"/>
         <source>pN%s: %.2fbar
 </source>
         <translation>pN%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1304"/>
+        <location filename="../core/profile.c" line="1322"/>
         <source>pHe: %.2fbar
 </source>
         <translation>pHe: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1307"/>
+        <location filename="../core/profile.c" line="1325"/>
         <source>MOD: %d%s
 </source>
         <translation>MOD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1314"/>
+        <location filename="../core/profile.c" line="1332"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
@@ -9415,7 +9859,7 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1318"/>
+        <location filename="../core/profile.c" line="1336"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
@@ -9424,174 +9868,179 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1331"/>
+        <location filename="../core/profile.c" line="1349"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation>Paragem de segurança: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1334"/>
+        <location filename="../core/profile.c" line="1352"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation>Paragem de segurança: tempo desconhecido @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1339"/>
+        <location filename="../core/profile.c" line="1357"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation>Descompressão: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1342"/>
+        <location filename="../core/profile.c" line="1360"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation>Descompressão: tempo desconhecido @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1346"/>
+        <location filename="../core/profile.c" line="1364"/>
         <source>In deco
 </source>
         <translation>Em descompressão
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1348"/>
+        <location filename="../core/profile.c" line="1366"/>
         <source>NDL: %umin
 </source>
         <translation>NDL: %umin
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1351"/>
+        <location filename="../core/profile.c" line="1369"/>
         <source>TTS: %umin
 </source>
         <translation>TTS: %umin
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1354"/>
+        <location filename="../core/profile.c" line="1372"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation>Descompressão:  %umin @ %.0f%s (calc)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1362"/>
+        <location filename="../core/profile.c" line="1380"/>
         <source>In deco (calc)
 </source>
         <translation>Em descompressão (calc)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1365"/>
+        <location filename="../core/profile.c" line="1383"/>
         <source>NDL: %umin (calc)
 </source>
         <translation>NDL: %umin (calc)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1367"/>
+        <location filename="../core/profile.c" line="1385"/>
         <source>NDL: &gt;2h (calc)
 </source>
         <translation>NDL: &gt;2h (calc)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1371"/>
+        <location filename="../core/profile.c" line="1389"/>
         <source>TTS: %umin (calc)
 </source>
         <translation>TTS: %umin (calc)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1373"/>
+        <location filename="../core/profile.c" line="1391"/>
         <source>TTS: &gt;2h (calc)
 </source>
         <translation>TTS: &gt;2h (calc)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1376"/>
+        <location filename="../core/profile.c" line="1394"/>
         <source>RBT: %umin
 </source>
         <translation>RBT: %umin
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1379"/>
+        <location filename="../core/profile.c" line="1397"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation>Tecto calculado %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1385"/>
+        <location filename="../core/profile.c" line="1403"/>
         <source>Tissue %.0fmin: %.1f%s
 </source>
         <translation>Compartimento %.0fmin: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1391"/>
+        <location filename="../core/profile.c" line="1409"/>
         <source>heartbeat: %d
 </source>
         <translation>frequência cardíaca: %d
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1393"/>
+        <location filename="../core/profile.c" line="1411"/>
         <source>bearing: %d
 </source>
         <translation>enfiamento: %d
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1396"/>
+        <location filename="../core/profile.c" line="1414"/>
         <source>mean depth to here %.1f%s
 </source>
         <translation>profundidade média até aqui %.1f%f
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1491"/>
+        <location filename="../core/profile.c" line="1515"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1495"/>
-        <location filename="../core/profile.c" line="1499"/>
-        <location filename="../core/profile.c" line="1503"/>
+        <location filename="../core/profile.c" line="1519"/>
+        <location filename="../core/profile.c" line="1523"/>
+        <location filename="../core/profile.c" line="1527"/>
         <source>%s %sD:%.1f%s</source>
         <translation>%s %sD:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1507"/>
+        <location filename="../core/profile.c" line="1531"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sD:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1511"/>
+        <location filename="../core/profile.c" line="1535"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1515"/>
-        <location filename="../core/profile.c" line="1519"/>
+        <location filename="../core/profile.c" line="1539"/>
+        <location filename="../core/profile.c" line="1543"/>
         <source>%s %sV:%.2f%s</source>
         <translation>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1526"/>
+        <location filename="../core/profile.c" line="1550"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s</translation>
     </message>
     <message>
+        <location filename="../core/profile.c" line="1575"/>
+        <source>%s SAC:%.*f %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../core/qthelper.cpp" line="67"/>
         <source>%1km</source>
         <translation>%1km</translation>
@@ -9612,446 +10061,460 @@ EADD: %d%s
         <translation>%1yd</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="635"/>
+        <location filename="../core/qthelper.cpp" line="91"/>
+        <location filename="../core/qthelper.cpp" line="226"/>
+        <source>N</source>
+        <translation>N</translation>
+    </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="91"/>
+        <location filename="../core/qthelper.cpp" line="227"/>
+        <source>S</source>
+        <translation>S</translation>
+    </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="92"/>
+        <location filename="../core/qthelper.cpp" line="228"/>
+        <source>E</source>
+        <translation>E</translation>
+    </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="92"/>
+        <location filename="../core/qthelper.cpp" line="229"/>
+        <source>W</source>
+        <translation>O</translation>
+    </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="640"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="638"/>
+        <location filename="../core/qthelper.cpp" line="643"/>
         <source>F</source>
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="23"/>
-        <source>boat</source>
-        <translation>barco</translation>
+        <location filename="../core/save-html.c" line="469"/>
+        <location filename="../core/save-html.c" line="553"/>
+        <location filename="../core/worldmap-save.c" line="111"/>
+        <source>Can&apos;t open file %s</source>
+        <translation>Não é possível abrir o ficheiro %s</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="23"/>
-        <source>shore</source>
-        <translation>costa</translation>
+        <location filename="../core/save-html.c" line="488"/>
+        <source>Number</source>
+        <translation>Número</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="459"/>
-        <location filename="../core/dive.c" line="23"/>
-        <source>drift</source>
-        <translation>à deriva</translation>
+        <location filename="../core/save-html.c" line="489"/>
+        <source>Date</source>
+        <translation>Data</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="24"/>
-        <source>deep</source>
-        <translation>profundo</translation>
+        <location filename="../core/save-html.c" line="490"/>
+        <source>Time</source>
+        <translation>Tempo</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="24"/>
-        <source>cavern</source>
-        <translation>caverna</translation>
+        <location filename="../core/save-html.c" line="491"/>
+        <source>Location</source>
+        <translation>Local</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="443"/>
-        <location filename="../core/dive.c" line="24"/>
-        <source>ice</source>
-        <translation>gelo</translation>
+        <location filename="../core/save-html.c" line="492"/>
+        <source>Air temp.</source>
+        <translation>Temp. do ar</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="445"/>
-        <source>search</source>
-        <translation>busca</translation>
+        <location filename="../core/save-html.c" line="493"/>
+        <source>Water temp.</source>
+        <translation>Temp. da água</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="455"/>
-        <location filename="../core/dive.c" line="25"/>
-        <source>wreck</source>
-        <translation>naufrágio</translation>
+        <location filename="../core/save-html.c" line="494"/>
+        <source>Dives</source>
+        <translation>Mergulhos</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="441"/>
-        <location filename="../core/dive.c" line="25"/>
-        <source>cave</source>
-        <translation>gruta</translation>
+        <location filename="../core/save-html.c" line="495"/>
+        <source>Expand all</source>
+        <translation>Expandir todos</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="25"/>
-        <source>altitude</source>
-        <translation>em altitude</translation>
+        <location filename="../core/save-html.c" line="496"/>
+        <source>Collapse all</source>
+        <translation>Colapsar todos</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="26"/>
-        <source>pool</source>
-        <translation>piscina</translation>
+        <location filename="../core/save-html.c" line="497"/>
+        <source>Trips</source>
+        <translation>Viagens</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="26"/>
-        <source>lake</source>
-        <translation>lago</translation>
+        <location filename="../core/save-html.c" line="498"/>
+        <source>Statistics</source>
+        <translation>Estatísticas</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="457"/>
-        <location filename="../core/dive.c" line="26"/>
-        <source>river</source>
-        <translation>rio</translation>
+        <location filename="../core/save-html.c" line="499"/>
+        <source>Advanced search</source>
+        <translation>Pesquisa avançada</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="439"/>
-        <location filename="../core/dive.c" line="27"/>
-        <source>night</source>
-        <translation>nocturno</translation>
+        <location filename="../core/save-html.c" line="502"/>
+        <source>Rating</source>
+        <translation>Classificação</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="153"/>
-        <source>Error: the file does not appear to be a DATATRAK divelog</source>
-        <translation>Erro: o ficheiro não parece ser um ficheiro DATATRAK</translation>
+        <location filename="../core/save-html.c" line="503"/>
+        <source>Visibility</source>
+        <translation>Visibilidade</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="286"/>
-        <source>clear</source>
-        <translation>limpar</translation>
+        <location filename="../core/save-html.c" line="504"/>
+        <source>Duration</source>
+        <translation>Duração</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="289"/>
-        <source>misty</source>
-        <translation>nebuloso</translation>
+        <location filename="../core/save-html.c" line="505"/>
+        <source>Divemaster</source>
+        <translation>Guia de mergulho</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="292"/>
-        <source>fog</source>
-        <translation>nevoeiro</translation>
+        <location filename="../core/save-html.c" line="506"/>
+        <source>Buddy</source>
+        <translation>Companheiros</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="295"/>
-        <source>rain</source>
-        <translation>chuva</translation>
+        <location filename="../core/save-html.c" line="507"/>
+        <source>Suit</source>
+        <translation>Fato</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="298"/>
-        <source>storm</source>
-        <translation>tempestade</translation>
+        <location filename="../core/save-html.c" line="508"/>
+        <source>Tags</source>
+        <translation>Etiquetas</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="301"/>
-        <source>snow</source>
-        <translation>neve</translation>
+        <location filename="../core/save-html.c" line="509"/>
+        <location filename="../smtk-import/smartrak.c" line="251"/>
+        <location filename="../smtk-import/smartrak.c" line="321"/>
+        <source>Notes</source>
+        <translation>Notas</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="321"/>
-        <source>No suit</source>
-        <translation>Sem fato</translation>
+        <location filename="../core/save-html.c" line="510"/>
+        <source>Show more details</source>
+        <translation>Mostrar mais detalhes</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="324"/>
-        <source>Shorty</source>
-        <translation>Fato curto</translation>
+        <location filename="../core/save-html.c" line="513"/>
+        <source>Yearly statistics</source>
+        <translation>Estatísticas anuais</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="327"/>
-        <source>Combi</source>
-        <translation>Combi</translation>
+        <location filename="../core/save-html.c" line="514"/>
+        <source>Year</source>
+        <translation>Ano</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="330"/>
-        <source>Wet suit</source>
-        <translation>Fato húmido</translation>
+        <location filename="../core/save-html.c" line="515"/>
+        <source>Total time</source>
+        <translation>Tempo total</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="333"/>
-        <source>Semidry suit</source>
-        <translation>Fato semi-seco</translation>
+        <location filename="../core/save-html.c" line="516"/>
+        <source>Average time</source>
+        <translation>Duração média</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="336"/>
-        <source>Dry suit</source>
-        <translation>Fato seco</translation>
+        <location filename="../core/save-html.c" line="517"/>
+        <source>Shortest time</source>
+        <translation>Duração mais curta</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="396"/>
-        <source>no stop</source>
-        <translation>sem paragens</translation>
+        <location filename="../core/save-html.c" line="518"/>
+        <source>Longest time</source>
+        <translation>Duração mais longa</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="400"/>
-        <source>single ascent</source>
-        <translation>subida única</translation>
+        <location filename="../core/save-html.c" line="519"/>
+        <source>Average depth</source>
+        <translation>Profundidade média</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="402"/>
-        <source>multiple ascent</source>
-        <translation>multiplas subidas</translation>
+        <location filename="../core/save-html.c" line="520"/>
+        <source>Min. depth</source>
+        <translation>Prof. mínima</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="404"/>
-        <location filename="../core/dive.c" line="27"/>
-        <source>fresh</source>
-        <translation>água doce</translation>
+        <location filename="../core/save-html.c" line="521"/>
+        <source>Max. depth</source>
+        <translation>Prof. Max.</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="406"/>
-        <source>salt water</source>
-        <translation>água salgada</translation>
+        <location filename="../core/save-html.c" line="522"/>
+        <source>Average SAC</source>
+        <translation>Consumo médio à superfície</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="431"/>
-        <source>sight seeing</source>
-        <translation>&quot;ver as vistas&quot;</translation>
+        <location filename="../core/save-html.c" line="523"/>
+        <source>Min. SAC</source>
+        <translation>Consumo mínimo</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="433"/>
-        <source>club dive</source>
-        <translation>mergulho de clube</translation>
+        <location filename="../core/save-html.c" line="524"/>
+        <source>Max. SAC</source>
+        <translation>Consumo máximo</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="437"/>
-        <source>instruction</source>
-        <translation>instrução</translation>
+        <location filename="../core/save-html.c" line="525"/>
+        <source>Average temp.</source>
+        <translation>Temperatura média</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="463"/>
-        <source>other</source>
-        <translation>outro</translation>
+        <location filename="../core/save-html.c" line="526"/>
+        <source>Min. temp.</source>
+        <translation>Temperatura mínima</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="474"/>
-        <source>Other activities</source>
-        <translation>Outras actividades</translation>
+        <location filename="../core/save-html.c" line="527"/>
+        <source>Max. temp.</source>
+        <translation>Temperatura máxima</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="498"/>
-        <source>Datatrak/Wlog notes</source>
-        <translation>Notas Datatrak/Wlog</translation>
+        <location filename="../core/save-html.c" line="528"/>
+        <source>Back to list</source>
+        <translation>Regressar à lista</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="537"/>
-        <source>Manually entered dive</source>
-        <translation>Mergulho introduzido manualmente</translation>
+        <location filename="../core/save-html.c" line="531"/>
+        <source>Dive No.</source>
+        <translation>Mergulho nº</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="588"/>
-        <source>Unknown</source>
-        <translation>Desconhecido</translation>
+        <location filename="../core/save-html.c" line="532"/>
+        <source>Dive profile</source>
+        <translation>Perfil de mergulho</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="674"/>
-        <source>Error: couldn&apos;t open the file %s</source>
-        <translation>Erro: Não foi possível abrir o ficheiro %s</translation>
+        <location filename="../core/save-html.c" line="533"/>
+        <source>Dive information</source>
+        <translation>Informações sobre o mergulhoq</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="687"/>
-        <source>Error: no dive</source>
-        <translation>Erro: sem mergulho</translation>
+        <location filename="../core/save-html.c" line="534"/>
+        <source>Dive equipment</source>
+        <translation>Equipamento de mergulho</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="27"/>
-        <source>student</source>
-        <translation>aluno</translation>
+        <location filename="../core/save-html.c" line="535"/>
+        <location filename="../core/save-html.c" line="542"/>
+        <source>Type</source>
+        <translation>Tipo</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="461"/>
-        <location filename="../core/dive.c" line="28"/>
-        <source>photo</source>
-        <translation>foto</translation>
+        <location filename="../core/save-html.c" line="536"/>
+        <source>Size</source>
+        <translation>Capacidade</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="28"/>
-        <source>video</source>
-        <translation>vídeo</translation>
+        <location filename="../core/save-html.c" line="537"/>
+        <source>Work pressure</source>
+        <translation>Pressão de serviço</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="435"/>
-        <location filename="../core/dive.c" line="28"/>
-        <source>instructor</source>
-        <translation>instrutor</translation>
+        <location filename="../core/save-html.c" line="538"/>
+        <source>Start pressure</source>
+        <translation>Pressão inicial</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="398"/>
-        <location filename="../core/dive.c" line="29"/>
-        <source>deco</source>
-        <translation>descompressão</translation>
+        <location filename="../core/save-html.c" line="539"/>
+        <source>End pressure</source>
+        <translation>Pressão final</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="33"/>
-        <source>OC-gas</source>
-        <translation>gás-circuito aberto</translation>
+        <location filename="../core/save-html.c" line="540"/>
+        <source>Gas</source>
+        <translation>Gás</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="33"/>
-        <source>diluent</source>
-        <translation>diluente</translation>
+        <location filename="../core/save-html.c" line="541"/>
+        <source>Weight</source>
+        <translation>Peso</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="33"/>
-        <location filename="../core/equipment.c" line="88"/>
-        <location filename="../core/planner.c" line="1415"/>
-        <location filename="../core/planner.c" line="1418"/>
-        <source>oxygen</source>
-        <translation>oxigénio</translation>
+        <location filename="../core/save-html.c" line="543"/>
+        <source>Events</source>
+        <translation>Eventos</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="227"/>
-        <source>ℓ</source>
-        <translation>ℓ</translation>
+        <location filename="../core/save-html.c" line="544"/>
+        <source>Name</source>
+        <translation>Nome</translation>
+    </message>
+    <message>
+        <location filename="../core/save-html.c" line="545"/>
+        <source>Value</source>
+        <translation>Valor</translation>
+    </message>
+    <message>
+        <location filename="../core/save-html.c" line="546"/>
+        <source>Coordinates</source>
+        <translation>Coordenadas</translation>
+    </message>
+    <message>
+        <location filename="../core/save-html.c" line="547"/>
+        <source>Dive status</source>
+        <translation>Estado do mergulho</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="239"/>
+        <location filename="../core/statistics.c" line="242"/>
         <source>more than %d days</source>
         <translation>mais de %d dias</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="246"/>
+        <location filename="../core/statistics.c" line="249"/>
         <source>%dd %dh %dmin</source>
         <translation>%dd, %dh %dmin</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="249"/>
+        <location filename="../core/statistics.c" line="252"/>
         <source>%dmin %dsecs</source>
         <translation>%dmin %dseg</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="251"/>
+        <location filename="../core/statistics.c" line="254"/>
         <source>%dh %dmin</source>
         <translation>%dh %dmin</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="263"/>
+        <location filename="../core/statistics.c" line="266"/>
         <source>for dives #</source>
         <translation>para mergulhos #</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="269"/>
+        <location filename="../core/statistics.c" line="272"/>
         <source>for selected dives</source>
         <translation>para mergulhos seleccionados</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="304"/>
+        <location filename="../core/statistics.c" line="307"/>
         <source>for dive #%d</source>
         <translation>para mergulho #%d</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="306"/>
+        <location filename="../core/statistics.c" line="309"/>
         <source>for selected dive</source>
         <translation>para o mergulho seleccionado</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="308"/>
+        <location filename="../core/statistics.c" line="311"/>
         <source>for all dives</source>
         <translation>para todos os mergulhos</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="310"/>
+        <location filename="../core/statistics.c" line="313"/>
         <source>(no dives)</source>
         <translation>(nenhum mergulho)</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Sun</source>
         <translation>Dom</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Mon</source>
         <translation>Seg</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Tue</source>
         <translation>Ter</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Wed</source>
         <translation>Qua</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Thu</source>
         <translation>Qui</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Fri</source>
         <translation>Sex</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Sat</source>
         <translation>Sáb</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Jan</source>
         <translation>Jan</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Feb</source>
         <translation>Fev</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Mar</source>
         <translation>Mar</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Apr</source>
         <translation>Abr</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>May</source>
         <translation>Mai</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Jun</source>
         <translation>Jun</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Jul</source>
         <translation>Jul</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Aug</source>
         <translation>Ago</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Sep</source>
         <translation>Set</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Oct</source>
         <translation>Out</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Nov</source>
         <translation>Nov</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Dec</source>
         <translation>Dez</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="191"/>
-        <location filename="../core/parse-xml.c" line="3284"/>
-        <location filename="../core/uemis-downloader.c" line="134"/>
-        <source>unknown</source>
-        <translation>desconhecido</translation>
-    </message>
-    <message>
-        <location filename="../core/uemis-downloader.c" line="467"/>
-        <source>data</source>
-        <translation>dados</translation>
-    </message>
-    <message>
-        <location filename="../core/uemis-downloader.c" line="447"/>
-        <source>%s %s</source>
-        <translation>%s %s</translation>
-    </message>
-    <message>
         <location filename="../core/uemis-downloader.c" line="27"/>
         <source>Uemis Zurich: the file system is almost full.
 Disconnect/reconnect the dive computer
@@ -10082,6 +10545,16 @@ O Uemis Zurich está correctamente ligado?</translation>
         <translation>Sem mergulhos para descarregar.</translation>
     </message>
     <message>
+        <location filename="../core/uemis-downloader.c" line="447"/>
+        <source>%s %s</source>
+        <translation>%s %s</translation>
+    </message>
+    <message>
+        <location filename="../core/uemis-downloader.c" line="467"/>
+        <source>data</source>
+        <translation>dados</translation>
+    </message>
+    <message>
         <location filename="../core/uemis-downloader.c" line="495"/>
         <source>divelog #</source>
         <translation>Divelog #</translation>
@@ -10252,281 +10725,6 @@ O Uemis Zurich está correctamente ligado?</translation>
         <translation>Alerta de bateria baixa</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="469"/>
-        <location filename="../core/save-html.c" line="553"/>
-        <location filename="../core/worldmap-save.c" line="111"/>
-        <source>Can&apos;t open file %s</source>
-        <translation>Não é possível abrir o ficheiro %s</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="488"/>
-        <source>Number</source>
-        <translation>Número</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="489"/>
-        <source>Date</source>
-        <translation>Data</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="490"/>
-        <source>Time</source>
-        <translation>Tempo</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="491"/>
-        <source>Location</source>
-        <translation>Local</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="492"/>
-        <source>Air temp.</source>
-        <translation>Temp. do ar</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="493"/>
-        <source>Water temp.</source>
-        <translation>Temp. da água</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="498"/>
-        <source>Statistics</source>
-        <translation>Estatísticas</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="502"/>
-        <source>Rating</source>
-        <translation>Classificação</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="503"/>
-        <source>Visibility</source>
-        <translation>Visibilidade</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="504"/>
-        <source>Duration</source>
-        <translation>Duração</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="494"/>
-        <source>Dives</source>
-        <translation>Mergulhos</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="495"/>
-        <source>Expand all</source>
-        <translation>Expandir todos</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="496"/>
-        <source>Collapse all</source>
-        <translation>Colapsar todos</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="497"/>
-        <source>Trips</source>
-        <translation>Viagens</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="499"/>
-        <source>Advanced search</source>
-        <translation>Pesquisa avançada</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="505"/>
-        <source>Divemaster</source>
-        <translation>Guia de mergulho</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="506"/>
-        <source>Buddy</source>
-        <translation>Companheiros</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="507"/>
-        <source>Suit</source>
-        <translation>Fato</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="508"/>
-        <source>Tags</source>
-        <translation>Etiquetas</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="509"/>
-        <location filename="../smtk-import/smartrak.c" line="251"/>
-        <location filename="../smtk-import/smartrak.c" line="321"/>
-        <source>Notes</source>
-        <translation>Notas</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="510"/>
-        <source>Show more details</source>
-        <translation>Mostrar mais detalhes</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="513"/>
-        <source>Yearly statistics</source>
-        <translation>Estatísticas anuais</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="514"/>
-        <source>Year</source>
-        <translation>Ano</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="515"/>
-        <source>Total time</source>
-        <translation>Tempo total</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="516"/>
-        <source>Average time</source>
-        <translation>Duração média</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="517"/>
-        <source>Shortest time</source>
-        <translation>Duração mais curta</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="518"/>
-        <source>Longest time</source>
-        <translation>Duração mais longa</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="519"/>
-        <source>Average depth</source>
-        <translation>Profundidade média</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="520"/>
-        <source>Min. depth</source>
-        <translation>Prof. mínima</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="521"/>
-        <source>Max. depth</source>
-        <translation>Prof. Max.</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="523"/>
-        <source>Min. SAC</source>
-        <translation>Consumo mínimo</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="524"/>
-        <source>Max. SAC</source>
-        <translation>Consumo máximo</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="525"/>
-        <source>Average temp.</source>
-        <translation>Temperatura média</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="526"/>
-        <source>Min. temp.</source>
-        <translation>Temperatura mínima</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="527"/>
-        <source>Max. temp.</source>
-        <translation>Temperatura máxima</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="528"/>
-        <source>Back to list</source>
-        <translation>Regressar à lista</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="534"/>
-        <source>Dive equipment</source>
-        <translation>Equipamento de mergulho</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="537"/>
-        <source>Work pressure</source>
-        <translation>Pressão de serviço</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="538"/>
-        <source>Start pressure</source>
-        <translation>Pressão inicial</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="539"/>
-        <source>End pressure</source>
-        <translation>Pressão final</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="547"/>
-        <source>Dive status</source>
-        <translation>Estado do mergulho</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="522"/>
-        <source>Average SAC</source>
-        <translation>Consumo médio à superfície</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="531"/>
-        <source>Dive No.</source>
-        <translation>Mergulho nº</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="532"/>
-        <source>Dive profile</source>
-        <translation>Perfil de mergulho</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="533"/>
-        <source>Dive information</source>
-        <translation>Informações sobre o mergulhoq</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="535"/>
-        <location filename="../core/save-html.c" line="542"/>
-        <source>Type</source>
-        <translation>Tipo</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="536"/>
-        <source>Size</source>
-        <translation>Capacidade</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="540"/>
-        <source>Gas</source>
-        <translation>Gás</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="541"/>
-        <source>Weight</source>
-        <translation>Peso</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="543"/>
-        <source>Events</source>
-        <translation>Eventos</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="544"/>
-        <source>Name</source>
-        <translation>Nome</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="545"/>
-        <source>Value</source>
-        <translation>Valor</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="546"/>
-        <source>Coordinates</source>
-        <translation>Coordenadas</translation>
-    </message>
-    <message>
         <location filename="../core/worldmap-save.c" line="39"/>
         <source>Date:</source>
         <translation>Data:</translation>
@@ -10572,173 +10770,69 @@ O Uemis Zurich está correctamente ligado?</translation>
         <translation>Notas:</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="91"/>
-        <location filename="../core/qthelper.cpp" line="226"/>
-        <source>N</source>
-        <translation>N</translation>
-    </message>
-    <message>
-        <location filename="../core/qthelper.cpp" line="91"/>
-        <location filename="../core/qthelper.cpp" line="227"/>
-        <source>S</source>
-        <translation>S</translation>
-    </message>
-    <message>
-        <location filename="../core/qthelper.cpp" line="92"/>
-        <location filename="../core/qthelper.cpp" line="228"/>
-        <source>E</source>
-        <translation>E</translation>
-    </message>
-    <message>
-        <location filename="../core/qthelper.cpp" line="92"/>
-        <location filename="../core/qthelper.cpp" line="229"/>
-        <source>W</source>
-        <translation>O</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="341"/>
-        <source>Remote storage and local data diverged. Error: merge failed (%s)</source>
-        <translation>O dados remotos divergem dos dados locais. Erro: falha na junção (%s)</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="134"/>
-        <source>Local cache directory %s corrupted - can&apos;t sync with Subsurface cloud storage</source>
-        <translation>A cache da pasta %s está corrompida - não é possível sincronizar com o armazenamento remoto do Subsurface</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="157"/>
-        <location filename="../core/git-access.c" line="177"/>
-        <source>Could not update local cache to newer remote data</source>
-        <translation>Não foi possível actualizar a cache local com os novos dados no servidor remoto</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="170"/>
-        <source>Subsurface cloud storage corrupted</source>
-        <translation>O armazenamento remoto do Subsurface está corrompido</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="285"/>
-        <source>Could not update Subsurface cloud storage, try again later</source>
-        <translation>Não foi possível actualizar o armazenamento remoto do Subsurface. Tente novamente mais tarde</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="371"/>
-        <source>Remote storage and local data diverged. Cannot combine local and remote changes</source>
-        <translation>Os dados no servidor remoto divergem dos dados locais. Não é possível combinar as diferenças.</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="405"/>
-        <source>Remote storage and local data diverged</source>
-        <translation>Os dados no servidor remoto divergem dos dados locais.</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="408"/>
-        <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source>
-        <translation>Os dados no servidor remoto divergem dos dados locais. Erro: a escrita dos dados falhou (%s)</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="417"/>
-        <source>Problems with local cache of Subsurface cloud data</source>
-        <translation>Problemas com a cache local dos dados remotos do Subsurface</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="418"/>
-        <source>Moved cache data to %s. Please try the operation again.</source>
-        <translation>Cache movida para %s. Tente novamente a operação.</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="737"/>
-        <source>Error connecting to Subsurface cloud storage</source>
-        <translation>Erro ao ligar ao armazenamento remodo do Subsurface</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="740"/>
-        <source>git clone of %s failed (%s)</source>
-        <translation>Falha (%s) no git clone %s </translation>
-    </message>
-    <message>
-        <location filename="../core/load-git.c" line="222"/>
-        <location filename="../core/parse-xml.c" line="1300"/>
-        <source>additional name for site: %s
-</source>
-        <translation>nome adicional para o local: %s
-</translation>
-    </message>
-    <message>
-        <location filename="../core/ostctools.c" line="120"/>
-        <location filename="../core/ostctools.c" line="152"/>
-        <source>Unknown DC in dive %d</source>
-        <translation>Computador de mergulho desconhecido no mergulho %d</translation>
-    </message>
-    <message>
-        <location filename="../core/ostctools.c" line="165"/>
-        <source>Error - %s - parsing dive %d</source>
-        <translation>Erro - %s - ao analisar o mergulho %d</translation>
-    </message>
-    <message>
         <location filename="../smtk-import/smartrak.c" line="247"/>
         <source>Built</source>
-        <translation type="unfinished"/>
+        <translation>Construído</translation>
     </message>
     <message>
         <location filename="../smtk-import/smartrak.c" line="247"/>
         <source>Sank</source>
-        <translation type="unfinished"/>
+        <translation>Afundado</translation>
     </message>
     <message>
         <location filename="../smtk-import/smartrak.c" line="247"/>
         <source>SankTime</source>
-        <translation type="unfinished"/>
+        <translation>Hora de afundamento</translation>
     </message>
     <message>
         <location filename="../smtk-import/smartrak.c" line="248"/>
         <source>Reason</source>
-        <translation type="unfinished"/>
+        <translation>Razão</translation>
     </message>
     <message>
         <location filename="../smtk-import/smartrak.c" line="248"/>
         <source>Nationality</source>
-        <translation type="unfinished"/>
+        <translation>Nacionalidade</translation>
     </message>
     <message>
         <location filename="../smtk-import/smartrak.c" line="248"/>
         <source>Shipyard</source>
-        <translation type="unfinished"/>
+        <translation>Estaleiro</translation>
     </message>
     <message>
         <location filename="../smtk-import/smartrak.c" line="249"/>
         <source>ShipType</source>
-        <translation type="unfinished"/>
+        <translation>Tipo de navio</translation>
     </message>
     <message>
         <location filename="../smtk-import/smartrak.c" line="249"/>
         <source>Length</source>
-        <translation type="unfinished"/>
+        <translation>Comprimento</translation>
     </message>
     <message>
         <location filename="../smtk-import/smartrak.c" line="249"/>
         <source>Beam</source>
-        <translation type="unfinished"/>
+        <translation>Boca</translation>
     </message>
     <message>
         <location filename="../smtk-import/smartrak.c" line="250"/>
         <source>Draught</source>
-        <translation type="unfinished"/>
+        <translation>Calado</translation>
     </message>
     <message>
         <location filename="../smtk-import/smartrak.c" line="250"/>
         <source>Displacement</source>
-        <translation type="unfinished"/>
+        <translation>Deslocamento</translation>
     </message>
     <message>
         <location filename="../smtk-import/smartrak.c" line="250"/>
         <source>Cargo</source>
-        <translation type="unfinished"/>
+        <translation>Carga</translation>
     </message>
     <message>
         <location filename="../smtk-import/smartrak.c" line="263"/>
         <source>Wreck Data</source>
-        <translation type="unfinished"/>
+        <translation>Dados do naufrágio</translation>
     </message>
     <message>
         <location filename="../smtk-import/smartrak.c" line="320"/>
@@ -10756,157 +10850,122 @@ O Uemis Zurich está correctamente ligado?</translation>
     <message>
         <location filename="../mobile-widgets/qml/main.qml" line="13"/>
         <source>Subsurface-mobile</source>
-        <translation type="unfinished"/>
+        <translation>Subsurface-mobile</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="91"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="103"/>
         <source>Subsurface</source>
         <translation>Subsurface</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="97"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="110"/>
         <source>Dive list</source>
-        <translation type="unfinished"/>
+        <translation>Lista de mergulhos</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="112"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="125"/>
         <source>Cloud credentials</source>
-        <translation type="unfinished"/>
+        <translation>Credenciais da nuvem</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="126"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="139"/>
         <source>Manage dives</source>
-        <translation type="unfinished"/>
+        <translation>Gerir mergulhos</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="138"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="141"/>
         <source>Add dive manually</source>
-        <translation type="unfinished"/>
+        <translation>Adicionar um mergulho manualmente</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="146"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="149"/>
         <source>Manual sync with cloud</source>
-        <translation type="unfinished"/>
+        <translation>Sincronizar manualmente com a nuvem </translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="164"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="167"/>
         <source>Offline mode</source>
-        <translation type="unfinished"/>
+        <translation>Modo offline</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="164"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="167"/>
         <source>Enable auto cloud sync</source>
-        <translation type="unfinished"/>
+        <translation>Ligar sincronização automática com a nuvem</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="182"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="187"/>
         <source>GPS</source>
         <translation>GPS</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="185"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="190"/>
         <source>GPS-tag dives</source>
-        <translation type="unfinished"/>
+        <translation>Mergulhos com etiqueta GPS</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="192"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="197"/>
         <source>Upload GPS data</source>
-        <translation type="unfinished"/>
+        <translation>Carregar dados GPS</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="199"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="204"/>
         <source>Download GPS data</source>
-        <translation type="unfinished"/>
+        <translation>Descarregar dados GPS</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="206"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="211"/>
         <source>Show GPS fixes</source>
-        <translation type="unfinished"/>
+        <translation>Mostrar pontos GPS</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="215"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="220"/>
         <source>Clear GPS cache</source>
-        <translation type="unfinished"/>
+        <translation>Limpar a memória GPS</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="221"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="226"/>
         <source>Preferences</source>
         <translation>Preferências</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="230"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="237"/>
         <source>Developer</source>
-        <translation type="unfinished"/>
+        <translation>Desenvolvedores</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="232"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="239"/>
         <source>App log</source>
-        <translation type="unfinished"/>
+        <translation>Registo da app</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="239"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="246"/>
         <source>Theme information</source>
-        <translation type="unfinished"/>
+        <translation>Informações sobre o tema</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="246"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="253"/>
         <source>User manual</source>
         <translation>Manual do utilizador</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="252"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="259"/>
         <source>About</source>
-        <translation type="unfinished"/>
+        <translation>Sobre</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="283"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="304"/>
         <source>Run location service</source>
-        <translation type="unfinished"/>
+        <translation>Activar serviço de localização</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="283"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="304"/>
         <source>No GPS source available</source>
-        <translation type="unfinished"/>
+        <translation>Não existem fontes de GPS disponíveis</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="295"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="316"/>
         <source>Actions</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="9"/>
-        <source>Hello World</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="13"/>
-        <source>File</source>
-        <translation>Ficheiro</translation>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="15"/>
-        <source>&amp;Open</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="19"/>
-        <source>Exit</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="27"/>
-        <source>Button 1 pressed</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="28"/>
-        <source>Button 2 pressed</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="33"/>
-        <source>May I have your attention, please?</source>
-        <translation type="unfinished"/>
+        <translation>Acções</translation>
     </message>
 </context>
 <context>
@@ -10985,6 +11044,24 @@ p, li { white-space: pre-wrap; }
         <translation>m/min</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="121"/>
+        <location filename="../build/ui_plannerSettings.h" line="425"/>
+        <source>75% to 50% avg. depth</source>
+        <translation>75%-50% da profundidade média</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="138"/>
+        <location filename="../build/ui_plannerSettings.h" line="427"/>
+        <source>50% avg. depth to 6m</source>
+        <translation>50% da profundidade média para 6 m</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="155"/>
+        <location filename="../build/ui_plannerSettings.h" line="429"/>
+        <source>6m to surface</source>
+        <translation>6 m para a superfície</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="175"/>
         <location filename="../build/ui_plannerSettings.h" line="431"/>
         <source>Descent</source>
@@ -11008,12 +11085,35 @@ p, li { white-space: pre-wrap; }
         <translation>Descompressão VPM-B</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="268"/>
+        <source>Bühlmann deco</source>
+        <translation>Descompressão Bühlmann</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="278"/>
         <location filename="../build/ui_plannerSettings.h" line="445"/>
         <source>Reserve gas</source>
         <translation>Gás de reserva</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="288"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="549"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="578"/>
+        <location filename="../build/ui_plannerSettings.h" line="446"/>
+        <location filename="../build/ui_plannerSettings.h" line="459"/>
+        <location filename="../build/ui_plannerSettings.h" line="461"/>
+        <source>bar</source>
+        <translation>bar</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="307"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="416"/>
+        <location filename="../build/ui_plannerSettings.h" line="437"/>
+        <location filename="../build/ui_plannerSettings.h" line="440"/>
+        <source>%</source>
+        <translation>%</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="320"/>
         <location filename="../build/ui_plannerSettings.h" line="449"/>
         <source>Postpone gas change if a stop is not required</source>
@@ -11032,12 +11132,10 @@ p, li { white-space: pre-wrap; }
         <translation>GF low</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="307"/>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="416"/>
-        <location filename="../build/ui_plannerSettings.h" line="437"/>
-        <location filename="../build/ui_plannerSettings.h" line="440"/>
-        <source>%</source>
-        <translation>%</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="353"/>
+        <location filename="../build/ui_plannerSettings.h" line="436"/>
+        <source>Plan backgas breaks</source>
+        <translation>Planear intervalos na mistura de fundo</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="360"/>
@@ -11046,10 +11144,10 @@ p, li { white-space: pre-wrap; }
         <translation>GF high</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="429"/>
-        <location filename="../build/ui_plannerSettings.h" line="441"/>
-        <source>Drop to first depth</source>
-        <translation>Descer para a primeira profundidade</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="370"/>
+        <location filename="../build/ui_plannerSettings.h" line="453"/>
+        <source>min</source>
+        <translation>min</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="389"/>
@@ -11058,163 +11156,139 @@ p, li { white-space: pre-wrap; }
         <translation>Última paragem aos 6 m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="353"/>
-        <location filename="../build/ui_plannerSettings.h" line="436"/>
-        <source>Plan backgas breaks</source>
-        <translation>Planear intervalos na mistura de fundo</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="396"/>
+        <source>Maximize bottom time allowed by gas and no decompression limits</source>
+        <translation>Maximizar to tempo de fundo permitido pelo gás disponível e pelos limites de descompressão mínima</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="515"/>
-        <location filename="../build/ui_plannerSettings.h" line="455"/>
-        <source>Gas options</source>
-        <translation>Opções de gás</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="399"/>
+        <location filename="../build/ui_plannerSettings.h" line="443"/>
+        <source>Recreational mode</source>
+        <translation>Modo recreativo</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="594"/>
-        <location filename="../build/ui_plannerSettings.h" line="456"/>
-        <source>Bottom SAC</source>
-        <translation>Consumo no fundo</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="429"/>
+        <location filename="../build/ui_plannerSettings.h" line="441"/>
+        <source>Drop to first depth</source>
+        <translation>Descer para a primeira profundidade</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="692"/>
-        <location filename="../build/ui_plannerSettings.h" line="457"/>
-        <source>Deco SAC</source>
-        <translation>Consumo durante a descompressão</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="436"/>
+        <location filename="../build/ui_plannerSettings.h" line="452"/>
+        <source>Min. switch duration</source>
+        <translation>Duração mínima das paragens</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="601"/>
-        <location filename="../build/ui_plannerSettings.h" line="458"/>
-        <source>Bottom pO₂</source>
-        <translation>pO₂ no fundo</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="459"/>
+        <location filename="../build/ui_plannerSettings.h" line="444"/>
+        <source>Safety stop</source>
+        <translation>Paragem de segurança</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="685"/>
-        <location filename="../build/ui_plannerSettings.h" line="460"/>
-        <source>Deco pO₂</source>
-        <translation>pO₂ na descompressão</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="495"/>
+        <source>Conservatism level</source>
+        <translation>Nível de conservacionismo</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="515"/>
+        <location filename="../build/ui_plannerSettings.h" line="455"/>
+        <source>Gas options</source>
+        <translation>Opções de gás</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="565"/>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="672"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="698"/>
         <location filename="../build/ui_plannerSettings.h" line="462"/>
         <location filename="../build/ui_plannerSettings.h" line="463"/>
         <source>ℓ/min</source>
         <translation>ℓ/min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="632"/>
-        <location filename="../build/ui_plannerSettings.h" line="468"/>
-        <source>Display runtime</source>
-        <translation>Mostrar runtime</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="645"/>
-        <location filename="../build/ui_plannerSettings.h" line="472"/>
-        <source>Display segment duration</source>
-        <translation>Mostrar duração dos segmentos</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="655"/>
-        <location filename="../build/ui_plannerSettings.h" line="476"/>
-        <source>Display transitions in deco</source>
-        <translation>Mostrar transições na descompressão</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="662"/>
-        <location filename="../build/ui_plannerSettings.h" line="477"/>
-        <source>Verbatim dive plan</source>
-        <translation>Plano de mergulho textual</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="288"/>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="549"/>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="578"/>
-        <location filename="../build/ui_plannerSettings.h" line="446"/>
-        <location filename="../build/ui_plannerSettings.h" line="459"/>
-        <location filename="../build/ui_plannerSettings.h" line="461"/>
-        <source>bar</source>
-        <translation>bar</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="121"/>
-        <location filename="../build/ui_plannerSettings.h" line="425"/>
-        <source>75% to 50% avg. depth</source>
-        <translation>75%-50% da profundidade média</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="138"/>
-        <location filename="../build/ui_plannerSettings.h" line="427"/>
-        <source>50% avg. depth to 6m</source>
-        <translation>50% da profundidade média para 6 m</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="155"/>
-        <location filename="../build/ui_plannerSettings.h" line="429"/>
-        <source>6m to surface</source>
-        <translation>6 m para a superfície</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="268"/>
-        <source>Bühlmann deco</source>
-        <translation>Descompressão Bühlmann</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="370"/>
-        <location filename="../build/ui_plannerSettings.h" line="453"/>
-        <source>min</source>
-        <translation>min</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="396"/>
-        <source>Maximize bottom time allowed by gas and no decompression limits</source>
-        <translation>Maximizar to tempo de fundo permitido pelo gás disponível e pelos limites de descompressão mínima</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="594"/>
+        <source>m</source>
+        <translation>m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="399"/>
-        <location filename="../build/ui_plannerSettings.h" line="443"/>
-        <source>Recreational mode</source>
-        <translation>Modo recreativo</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="606"/>
+        <source>Used to calculate best mix. Select best mix depth in &apos;Available gases&apos; table by entering gas depth, followed by &quot;B&quot; (best trimix mix) or &quot;BN&quot; (best nitrox mix)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="436"/>
-        <location filename="../build/ui_plannerSettings.h" line="452"/>
-        <source>Min. switch duration</source>
-        <translation>Duração mínima das paragens</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="613"/>
+        <location filename="../build/ui_plannerSettings.h" line="456"/>
+        <source>Bottom SAC</source>
+        <translation>Consumo no fundo</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="459"/>
-        <location filename="../build/ui_plannerSettings.h" line="444"/>
-        <source>Safety stop</source>
-        <translation>Paragem de segurança</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="620"/>
+        <location filename="../build/ui_plannerSettings.h" line="458"/>
+        <source>Bottom pO₂</source>
+        <translation>pO₂ no fundo</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="495"/>
-        <source>Conservatism level</source>
-        <translation>Nível de conservacionismo</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="627"/>
+        <source>Best mix END</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="608"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="634"/>
         <location filename="../build/ui_plannerSettings.h" line="464"/>
         <source>Notes</source>
         <translation>Notas</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="629"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="655"/>
         <location filename="../build/ui_plannerSettings.h" line="466"/>
         <source>In dive plan, show runtime (absolute time) of stops</source>
         <translation>Mostrar runtime (tempo absoluto) das paragens no plano de mergulho </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="642"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="658"/>
+        <location filename="../build/ui_plannerSettings.h" line="468"/>
+        <source>Display runtime</source>
+        <translation>Mostrar runtime</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="668"/>
         <location filename="../build/ui_plannerSettings.h" line="470"/>
         <source>In dive plan, show duration (relative time) of stops</source>
         <translation>Mostrar duração (tempo relativo) das paragens no plano de mergulho</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="652"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="671"/>
+        <location filename="../build/ui_plannerSettings.h" line="472"/>
+        <source>Display segment duration</source>
+        <translation>Mostrar duração dos segmentos</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="678"/>
         <location filename="../build/ui_plannerSettings.h" line="474"/>
         <source>In diveplan, list transitions or treat them as implicit</source>
         <translation>Listar as transições no plano de mergulho ou tratá-las como implícitas</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="681"/>
+        <location filename="../build/ui_plannerSettings.h" line="476"/>
+        <source>Display transitions in deco</source>
+        <translation>Mostrar transições na descompressão</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="688"/>
+        <location filename="../build/ui_plannerSettings.h" line="477"/>
+        <source>Verbatim dive plan</source>
+        <translation>Plano de mergulho textual</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="711"/>
+        <location filename="../build/ui_plannerSettings.h" line="460"/>
+        <source>Deco pO₂</source>
+        <translation>pO₂ na descompressão</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="718"/>
+        <location filename="../build/ui_plannerSettings.h" line="457"/>
+        <source>Deco SAC</source>
+        <translation>Consumo durante a descompressão</translation>
+    </message>
 </context>
 </TS>
\ No newline at end of file
diff --git a/translations/subsurface_ro_RO.ts b/translations/subsurface_ro_RO.ts
index c0db2d1ac..fa0f687f1 100644
--- a/translations/subsurface_ro_RO.ts
+++ b/translations/subsurface_ro_RO.ts
@@ -105,6 +105,11 @@
         <translation>Nume:</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="56"/>
+        <source>Could not initialize Winsock version 2.2</source>
+        <translation>Nu s-a putut initializa Winsock versiunea 2.2</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="134"/>
         <source>Trying to turn on the local Bluetooth device...</source>
         <translation>Se încearcă pornirea dispozitivului Bluetooth local...</translation>
@@ -115,6 +120,11 @@
         <translation>Se încearcă oprirea dispozitivului Bluetooth local...</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="167"/>
+        <source>Remote devices list was cleared.</source>
+        <translation>Lista cu dispozitivele descoperite a fost golită.</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="183"/>
         <source>Scanning for remote devices...</source>
         <translation>Scanare după alte dispozitive...</translation>
@@ -125,6 +135,22 @@
         <translation>Scanarea s-a terminat cu succes</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="208"/>
+        <source>The local Bluetooth device was %1.</source>
+        <extracomment>%1 will be replaced with &quot;turned on&quot; or &quot;turned off&quot;</extracomment>
+        <translation>Dispozitivul local Bluetooth a fost %1.</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
+        <source>turned on</source>
+        <translation>pornit</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
+        <source>turned off</source>
+        <translation>oprit</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="225"/>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="339"/>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="359"/>
@@ -172,37 +198,6 @@
         <translation>Împerechere</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="352"/>
-        <source>Device %1 was paired and is authorized.</source>
-        <translation>Dispozitivul %1 a fost împerecheat cu autorizare.</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="56"/>
-        <source>Could not initialize Winsock version 2.2</source>
-        <translation>Nu s-a putut initializa Winsock versiunea 2.2</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="167"/>
-        <source>Remote devices list was cleared.</source>
-        <translation>Lista cu dispozitivele descoperite a fost golită.</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="208"/>
-        <source>The local Bluetooth device was %1.</source>
-        <extracomment>%1 will be replaced with &quot;turned on&quot; or &quot;turned off&quot;</extracomment>
-        <translation>Dispozitivul local Bluetooth a fost %1.</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
-        <source>turned on</source>
-        <translation>pornit</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
-        <source>turned off</source>
-        <translation>oprit</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="307"/>
         <source>Remove pairing</source>
         <translation>Desperechere</translation>
@@ -228,6 +223,11 @@
         <translation>Dispozitivul %1 a fost împerecheat.</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="352"/>
+        <source>Device %1 was paired and is authorized.</source>
+        <translation>Dispozitivul %1 a fost împerecheat cu autorizare.</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="378"/>
         <source>The device %1 can now be used for connection. You can press the Save button.</source>
         <translation>Dispozitivul %1 poate fi folosit pentru conexiune. Pentru a continua apăsați butonul de salvare.</translation>
@@ -286,12 +286,12 @@
 <context>
     <name>BuddyFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="621"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="619"/>
         <source>Person: </source>
         <translation>Persoană: </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="622"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="620"/>
         <source>Searches for buddies and divemasters</source>
         <translation>Căutare de însoțitori și experți în scufundări</translation>
     </message>
@@ -299,7 +299,7 @@
 <context>
     <name>BuddyFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="243"/>
+        <location filename="../qt-models/filtermodels.cpp" line="248"/>
         <source>No buddies</source>
         <translation>Niciun însoțitor</translation>
     </message>
@@ -307,25 +307,30 @@
 <context>
     <name>CloudCredentials</name>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="49"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="50"/>
         <source>Cloud credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="55"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="56"/>
         <source>Email</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="67"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="68"/>
         <source>Password</source>
         <translation>Parola</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="90"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="92"/>
         <source>Show password</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="97"/>
+        <source>PIN</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>ColumnNameProvider</name>
@@ -381,6 +386,16 @@
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
+        <source>Max. depth</source>
+        <translation>Adâncime maximă</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
+        <source>Avg. depth</source>
+        <translation>Adâncime medie</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
         <source>Divemaster</source>
         <translation>Maestru scufundare</translation>
     </message>
@@ -391,6 +406,11 @@
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
+        <source>Suit</source>
+        <translation>Costum</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
         <source>Notes</source>
         <translation>Notițe</translation>
     </message>
@@ -410,21 +430,6 @@
         <translation>Temperatura apei</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
-        <source>Max. depth</source>
-        <translation>Adâncime maximă</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
-        <source>Avg. depth</source>
-        <translation>Adâncime medie</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
-        <source>Suit</source>
-        <translation>Costum</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="44"/>
         <source>O₂</source>
         <translation>O₂</translation>
@@ -538,7 +543,7 @@
         <translation>Nu s-a putut crea contextul libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../core/configuredivecomputer.cpp" line="660"/>
+        <location filename="../core/configuredivecomputer.cpp" line="656"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation>Nu s-a putut realiza conexiunea cu calculatorul de scufundări.</translation>
     </message>
@@ -558,11 +563,19 @@
         <translation>Dispozitiv sau punct de montare</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="170"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1520"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1533"/>
-        <source>...</source>
-        <translation>...</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="47"/>
+        <source>Connect via Bluetooth</source>
+        <translation>Conectare prin Bluetooth</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="54"/>
+        <source>Connect</source>
+        <translation>Conectare</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="64"/>
+        <source>Disconnect</source>
+        <translation>Deconectare</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="80"/>
@@ -571,12 +584,24 @@
         <translation>Extrage informațiile disponibile</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="90"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1523"/>
+        <source>Read settings from backup file or from device before writing to the device</source>
+        <translation>Citește setările din copia de rezervă sau de pe dispozitiv înainte de a scrie pe el</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="93"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1525"/>
         <source>Save changes to device</source>
         <translation>Salvează modificările pe dispozitiv</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="116"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1527"/>
+        <source>Read settings from backup file or from device before writing to a backup file</source>
+        <translation>Citește setările din copia de rezervă sau de pe dispozitiv înainte de a scrie o nouă copie</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="119"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1529"/>
         <source>Backup</source>
@@ -595,15 +620,40 @@
         <translation>Actualizare firmware</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="163"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1532"/>
+        <source>Save libdivecomputer logfile</source>
+        <translation>Salvați fișierul jurnal al libdivecomputer</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="170"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1520"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1533"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="177"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1534"/>
         <source>Cancel</source>
         <translation>Anulează</translation>
     </message>
     <message>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1539"/>
-        <source>OSTC 3</source>
-        <translation>OSTC 3</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="214"/>
+        <source>OSTC 3,Sport,Cr,2</source>
+        <translation>OSTC 3,Sport,Cr,2</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="223"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1541"/>
+        <source>Suunto Vyper family</source>
+        <translation>Familia Suunto Vyper</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="232"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1543"/>
+        <source>OSTC, Mk.2/2N/2C</source>
+        <translation>OSTC, Mk.2/2N/2C</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="253"/>
@@ -616,40 +666,56 @@
         <translation>Setări de bază</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="326"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1656"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1943"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1546"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1726"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1766"/>
-        <source>Serial No.</source>
-        <translation>Număr de identificare</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="260"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1575"/>
+        <source>Eco</source>
+        <translation>Eco</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="349"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1679"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1980"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1547"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1727"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1767"/>
-        <source>Firmware version</source>
-        <translation>Versiune firmware</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="265"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1576"/>
+        <source>Medium</source>
+        <translation>Mediu</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="538"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1713"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1990"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1548"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1729"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1768"/>
-        <source>Custom text</source>
-        <translation>Mesaj personalizat</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="270"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1577"/>
+        <source>High</source>
+        <translation>Mare</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="385"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1549"/>
-        <source>Language</source>
-        <translation>Limbă</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="278"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="826"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="849"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="875"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="927"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="993"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1019"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1101"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1117"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1450"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2278"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2382"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2408"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2434"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2474"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2497"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1586"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1621"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1623"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1625"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1628"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1637"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1638"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1710"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1785"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1789"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1801"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1803"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1806"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1807"/>
+        <source>%</source>
+        <translation>%</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="289"/>
@@ -676,44 +742,36 @@
         <translation>Italiană</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="579"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1557"/>
-        <source>Dive mode</source>
-        <translation>Mod de scufundare</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="556"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1560"/>
-        <source>OC</source>
-        <translation>OC</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="561"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1561"/>
-        <source>CC</source>
-        <translation>CC</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="313"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1582"/>
+        <source>m/°C</source>
+        <translation>m/°C</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="566"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2336"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1562"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1793"/>
-        <source>Gauge</source>
-        <translation>Calibru</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="318"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1583"/>
+        <source>ft/°F</source>
+        <translation>ft/°F</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="571"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1563"/>
-        <source>Apnea</source>
-        <translation>Apnee</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="326"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1656"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1943"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1546"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1726"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1766"/>
+        <source>Serial No.</source>
+        <translation>Număr de identificare</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="395"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2063"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1565"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1780"/>
-        <source>Date format</source>
-        <translation>Format dată</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="349"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1679"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1980"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1547"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1727"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1767"/>
+        <source>Firmware version</source>
+        <translation>Versiune firmware</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="360"/>
@@ -734,108 +792,147 @@
         <translation>AALLZZ</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1042"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2457"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1639"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1805"/>
-        <source>Saturation</source>
-        <translation>Saturație</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="385"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1549"/>
+        <source>Language</source>
+        <translation>Limbă</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="278"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="826"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="849"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="875"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="927"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="993"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1019"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1101"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1117"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1450"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2278"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2382"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2408"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2434"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2474"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2497"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1586"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1621"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1623"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1625"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1628"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1637"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1638"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1710"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1785"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1789"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1801"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1803"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1806"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1807"/>
-        <source>%</source>
-        <translation>%</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="395"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2063"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1565"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1780"/>
+        <source>Date format</source>
+        <translation>Format dată</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="865"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2261"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1624"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1784"/>
-        <source>Desaturation</source>
-        <translation>Desaturație</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="405"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1572"/>
+        <source>Brightness</source>
+        <translation>Luminozitate</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="983"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2398"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1636"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1800"/>
-        <source>Last deco</source>
-        <translation>Ultima decompresie</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="415"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1850"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1579"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1753"/>
+        <source>Units</source>
+        <translation>Unități</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="711"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="736"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="758"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="904"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2181"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2206"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2228"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2307"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1626"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1786"/>
-        <source> m</source>
-        <translation>m</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="425"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1585"/>
+        <source>Salinity (0-5%)</source>
+        <translation>Salinitate (0-5%)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="405"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1572"/>
-        <source>Brightness</source>
-        <translation>Luminozitate</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="438"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1615"/>
+        <source>Reset device to default settings</source>
+        <translation>Resetează dispozitivul la setările de bază</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="260"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1575"/>
-        <source>Eco</source>
-        <translation>Eco</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="452"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1590"/>
+        <source>230LSB/Gauss</source>
+        <translation>230LSB/Gauss</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="265"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1576"/>
-        <source>Medium</source>
-        <translation>Mediu</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="457"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1591"/>
+        <source>330LSB/Gauss</source>
+        <translation>330LSB/Gauss</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="270"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1577"/>
-        <source>High</source>
-        <translation>Mare</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="462"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1592"/>
+        <source>390LSB/Gauss</source>
+        <translation>390LSB/Gauss</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="603"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2034"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1599"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1779"/>
-        <source>Sampling rate</source>
-        <translation>Rata de eșantionare</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="467"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1593"/>
+        <source>440LSB/Gauss</source>
+        <translation>440LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="472"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1594"/>
+        <source>660LSB/Gauss</source>
+        <translation>660LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="477"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1595"/>
+        <source>820LSB/Gauss</source>
+        <translation>820LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="482"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1596"/>
+        <source>1090LSB/Gauss</source>
+        <translation>1090LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="487"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1597"/>
+        <source>1370LSB/Gauss</source>
+        <translation>1370LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="521"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1587"/>
+        <source>Compass gain</source>
+        <translation>Avantaj compas</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="531"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1799"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1745"/>
+        <source>Computer model</source>
+        <translation>Modelul calculatorului</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="538"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1713"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1990"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1548"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1729"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1768"/>
+        <source>Custom text</source>
+        <translation>Mesaj personalizat</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="556"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1560"/>
+        <source>OC</source>
+        <translation>OC</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="561"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1561"/>
+        <source>CC</source>
+        <translation>CC</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="566"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2336"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1562"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1793"/>
+        <source>Gauge</source>
+        <translation>Calibru</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="571"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1563"/>
+        <source>Apnea</source>
+        <translation>Apnee</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="579"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1557"/>
+        <source>Dive mode</source>
+        <translation>Mod de scufundare</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="590"/>
@@ -852,30 +949,12 @@
         <translation>10s</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="415"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1850"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1579"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1753"/>
-        <source>Units</source>
-        <translation>Unități</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="313"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1582"/>
-        <source>m/°C</source>
-        <translation>m/°C</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="318"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1583"/>
-        <source>ft/°F</source>
-        <translation>ft/°F</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="644"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1605"/>
-        <source>Dive mode color</source>
-        <translation>Culoarea modului de scufundare</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="603"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2034"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1599"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1779"/>
+        <source>Sampling rate</source>
+        <translation>Rata de eșantionare</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="614"/>
@@ -902,12 +981,6 @@
         <translation>Albastru</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="425"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1585"/>
-        <source>Salinity (0-5%)</source>
-        <translation>Salinitate (0-5%)</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="637"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2092"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1613"/>
@@ -916,90 +989,80 @@
         <translation>Sincronizează timpul dispozitivului de scufundări cu cel al calculatorului</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="521"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1587"/>
-        <source>Compass gain</source>
-        <translation>Avantaj compas</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="90"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1523"/>
-        <source>Read settings from backup file or from device before writing to the device</source>
-        <translation>Citește setările din copia de rezervă sau de pe dispozitiv înainte de a scrie pe el</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="116"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1527"/>
-        <source>Read settings from backup file or from device before writing to a backup file</source>
-        <translation>Citește setările din copia de rezervă sau de pe dispozitiv înainte de a scrie o nouă copie</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="232"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1543"/>
-        <source>OSTC, Mk.2/2N/2C</source>
-        <translation>OSTC, Mk.2/2N/2C</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="644"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1605"/>
+        <source>Dive mode color</source>
+        <translation>Culoarea modului de scufundare</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="452"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1590"/>
-        <source>230LSB/Gauss</source>
-        <translation>230LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="654"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2020"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1614"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1771"/>
+        <source>Show safety stop</source>
+        <translation>Afișează oprirea de siguranță</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="457"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1591"/>
-        <source>330LSB/Gauss</source>
-        <translation>330LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="661"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2145"/>
+        <source>End Depth</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="462"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1592"/>
-        <source>390LSB/Gauss</source>
-        <translation>390LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="671"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2162"/>
+        <source> s</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="467"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1593"/>
-        <source>440LSB/Gauss</source>
-        <translation>440LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="687"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1953"/>
+        <source>Length</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="472"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1594"/>
-        <source>660LSB/Gauss</source>
-        <translation>660LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="694"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2138"/>
+        <source>Start Depth</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="477"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1595"/>
-        <source>820LSB/Gauss</source>
-        <translation>820LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="701"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2152"/>
+        <source>Reset Depth</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="482"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1596"/>
-        <source>1090LSB/Gauss</source>
-        <translation>1090LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="711"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="736"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="758"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="904"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2181"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2206"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2228"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2307"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1626"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1786"/>
+        <source> m</source>
+        <translation>m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="487"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1597"/>
-        <source>1370LSB/Gauss</source>
-        <translation>1370LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="778"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2248"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1643"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1810"/>
+        <source>Advanced settings</source>
+        <translation>Setări avansate</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="654"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2020"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1614"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1771"/>
-        <source>Show safety stop</source>
-        <translation>Afișează oprirea de siguranță</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="784"/>
+        <source>Left button sensitivity</source>
+        <translation>Senzitivitatea butonului stâng</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="438"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1615"/>
-        <source>Reset device to default settings</source>
-        <translation>Resetează dispozitivul la setările de bază</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="791"/>
+        <source>Always show ppO2</source>
+        <translation>Afișează întotdeauna ppO2</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="798"/>
@@ -1010,20 +1073,6 @@
         <translation>Alt. GF poate fi selectat sub apă</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="223"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1541"/>
-        <source>Suunto Vyper family</source>
-        <translation>Familia Suunto Vyper</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="778"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2248"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1643"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1810"/>
-        <source>Advanced settings</source>
-        <translation>Setări avansate</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="805"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2271"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1618"/>
@@ -1054,6 +1103,14 @@
         <translation>GF ridicat</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="865"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2261"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1624"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1784"/>
+        <source>Desaturation</source>
+        <translation>Desaturație</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="917"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2320"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1627"/>
@@ -1068,14 +1125,6 @@
         <translation> mbar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="973"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2369"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1630"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1788"/>
-        <source> min</source>
-        <translation> min</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="960"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2331"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1633"/>
@@ -1084,63 +1133,28 @@
         <translation>ZH-L16</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="47"/>
-        <source>Connect via Bluetooth</source>
-        <translation>Conectare prin Bluetooth</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="163"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1532"/>
-        <source>Save libdivecomputer logfile</source>
-        <translation>Salvați fișierul jurnal al libdivecomputer</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="661"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2145"/>
-        <source>End Depth</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="671"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2162"/>
-        <source> s</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="687"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1953"/>
-        <source>Length</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="694"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2138"/>
-        <source>Start Depth</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="701"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2152"/>
-        <source>Reset Depth</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="784"/>
-        <source>Left button sensitivity</source>
-        <translation>Senzitivitatea butonului stâng</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="791"/>
-        <source>Always show ppO2</source>
-        <translation>Afișează întotdeauna ppO2</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="965"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1634"/>
         <source>ZH-L16+GF</source>
         <translation>ZH-L16+GF</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="973"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2369"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1630"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1788"/>
+        <source> min</source>
+        <translation> min</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="983"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2398"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1636"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1800"/>
+        <source>Last deco</source>
+        <translation>Ultima decompresie</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1009"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2424"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1640"/>
@@ -1157,6 +1171,14 @@
         <translation>Alt GFHigh</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1042"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2457"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1639"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1805"/>
+        <source>Saturation</source>
+        <translation>Saturație</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1052"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1642"/>
         <source>Flip screen</source>
@@ -1168,12 +1190,22 @@
         <translation>Senzitivitatea butonului drept</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1066"/>
+        <source>MOD warning</source>
+        <translation>Avertizment MOD</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1073"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2513"/>
         <source>Graphical speed indicator</source>
         <translation>Indicatorul de viteză grafic</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1080"/>
+        <source>Dynamic ascent rate</source>
+        <translation>Rată de ascensiune dinamică</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1087"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2552"/>
         <source>Bottom gas consumption</source>
@@ -1186,6 +1218,14 @@
         <translation>Consumul de gaz de decompresie</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1133"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1149"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2520"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2536"/>
+        <source> ℓ/min</source>
+        <translation> ℓ/min</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1165"/>
         <source>Temperature sensor offset</source>
         <translation type="unfinished"/>
@@ -1204,6 +1244,18 @@
         <translation>Setări gaz</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1235"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1320"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2610"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2695"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1645"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1668"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1812"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1835"/>
+        <source>%O₂</source>
+        <translation>%O₂</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1240"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1325"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2615"/>
@@ -1322,16 +1374,10 @@
         <translation>Dil 5</translation>
     </message>
     <message>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1691"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1858"/>
-        <source>Set point [cbar]</source>
-        <translation>Setează punct [cbar]</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1693"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1860"/>
-        <source>Change depth [m]</source>
-        <translation>Schimbă adâncimea [m]</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1405"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2770"/>
+        <source>Setpoint</source>
+        <translation>Punct setat</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1415"/>
@@ -1370,6 +1416,12 @@
         <translation>SP 5</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1443"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1709"/>
+        <source>O₂ in calibration gas</source>
+        <translation>O₂ în calibrarea gazului</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1467"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1713"/>
         <source>Fixed setpoint</source>
@@ -1400,101 +1452,6 @@
         <translation> cbar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1748"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1733"/>
-        <source>P1 (medium)</source>
-        <extracomment>Suunto safety level</extracomment>
-        <translation>P1 (mediu)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1753"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1734"/>
-        <source>P2 (high)</source>
-        <extracomment>Suunto safety level</extracomment>
-        <translation>P2 (mare)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1792"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1744"/>
-        <source>Total dive time</source>
-        <translation>Timp total de scufundare</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2109"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1769"/>
-        <source>kg/ℓ</source>
-        <translation>kg/ℓ</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2346"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1795"/>
-        <source>Apnoea</source>
-        <translation>Apnee</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1583"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1722"/>
-        <source>Safety level</source>
-        <translation>Nivel de siguranță</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="54"/>
-        <source>Connect</source>
-        <translation>Conectare</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="64"/>
-        <source>Disconnect</source>
-        <translation>Deconectare</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="214"/>
-        <source>OSTC 3,Sport,Cr,2</source>
-        <translation>OSTC 3,Sport,Cr,2</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1066"/>
-        <source>MOD warning</source>
-        <translation>Avertizment MOD</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1080"/>
-        <source>Dynamic ascent rate</source>
-        <translation>Rată de ascensiune dinamică</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1133"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1149"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2520"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2536"/>
-        <source> ℓ/min</source>
-        <translation> ℓ/min</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1235"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1320"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2610"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2695"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1645"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1668"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1812"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1835"/>
-        <source>%O₂</source>
-        <translation>%O₂</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1405"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2770"/>
-        <source>Setpoint</source>
-        <translation>Punct setat</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1443"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1709"/>
-        <source>O₂ in calibration gas</source>
-        <translation>O₂ în calibrarea gazului</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1535"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2843"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1719"/>
@@ -1511,6 +1468,12 @@
         <translation>pO₂ minim</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1583"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1722"/>
+        <source>Safety level</source>
+        <translation>Nivel de siguranță</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1609"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1723"/>
         <source>Altitude range</source>
@@ -1544,6 +1507,20 @@
         <translation>P0 (niciunul)</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1748"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1733"/>
+        <source>P1 (medium)</source>
+        <extracomment>Suunto safety level</extracomment>
+        <translation>P1 (mediu)</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1753"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1734"/>
+        <source>P2 (high)</source>
+        <extracomment>Suunto safety level</extracomment>
+        <translation>P2 (mare)</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1761"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1736"/>
         <source>Sample rate</source>
@@ -1568,11 +1545,10 @@
         <translation>60s</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="531"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1799"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1745"/>
-        <source>Computer model</source>
-        <translation>Modelul calculatorului</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1792"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1744"/>
+        <source>Total dive time</source>
+        <translation>Timp total de scufundare</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1816"/>
@@ -1637,12 +1613,6 @@
         <translation>Alarmă timp</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2099"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1765"/>
-        <source>Salinity</source>
-        <translation>Salinitate</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2074"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1774"/>
         <source>MM/DD/YY</source>
@@ -1661,12 +1631,30 @@
         <translation>AA/LL/ZZ</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2099"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1765"/>
+        <source>Salinity</source>
+        <translation>Salinitate</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2109"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1769"/>
+        <source>kg/ℓ</source>
+        <translation>kg/ℓ</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2341"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1794"/>
         <source>ZH-L16 CC</source>
         <translation>ZH-L16 CC</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2346"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1795"/>
+        <source>Apnoea</source>
+        <translation>Apnee</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2351"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1796"/>
         <source>L16-GF OC</source>
@@ -1685,87 +1673,112 @@
         <translation>PSCR-GF</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1108"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1129"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1539"/>
+        <source>OSTC 3</source>
+        <translation>OSTC 3</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1691"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1858"/>
+        <source>Set point [cbar]</source>
+        <translation>Setează punct [cbar]</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1693"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1860"/>
+        <source>Change depth [m]</source>
+        <translation>Schimbă adâncimea [m]</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1110"/>
+        <source>Backup dive computer settings</source>
+        <translation>Crează copie de rezervă pentru setărilor dispozitivului de scufundări</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1111"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1132"/>
         <source>Backup files (*.xml)</source>
         <translation>Fișiere de rezervă (*.xml)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1113"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1115"/>
+        <source>XML backup error</source>
+        <translation>Eroare restaurare copie de rezervă XML</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1116"/>
         <source>An error occurred while saving the backup file.
 %1</source>
         <translation>A apărut o eroare în timp ce se salva fișierul de rezervă.
 %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1116"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1119"/>
         <source>Backup succeeded</source>
         <translation>Restaurarea copiei de rezervă s-a terminat cu succes</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1117"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1120"/>
         <source>Your settings have been saved to: %1</source>
         <translation>Setările au fost salvate în fișierul: %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1107"/>
-        <source>Backup dive computer settings</source>
-        <translation>Crează copie de rezervă pentru setărilor dispozitivului de scufundări</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1112"/>
-        <source>XML backup error</source>
-        <translation>Eroare restaurare copie de rezervă XML</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1128"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1131"/>
         <source>Restore dive computer settings</source>
         <translation>Restaurează setările dispozitivului de scufundare</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1134"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1137"/>
         <source>XML restore error</source>
         <translation>Eroare restaurare XML</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1135"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1138"/>
         <source>An error occurred while restoring the backup file.
 %1</source>
         <translation>A apărut o eroare în timp ce se restaura fișierul de rezervă.
 %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1139"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1142"/>
         <source>Restore succeeded</source>
         <translation>Restaurare finalizată cu succes</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1140"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1143"/>
         <source>Your settings have been restored successfully.</source>
         <translation>Setările au fost restaurate cu succes</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1150"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1153"/>
         <source>Select firmware file</source>
         <translation>Selectează fișierul de firmware</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1151"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1154"/>
         <source>All files (*.*)</source>
         <translation>Toate fișierele (*.*)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1207"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1210"/>
         <source>Choose file for divecomputer download logfile</source>
         <translation>Selectează fisier pentru descărcarea jurnalului calculatorului de scufundări</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1208"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1211"/>
         <source>Log files (*.log)</source>
         <translation>Fișiere de log (*.log)</translation>
     </message>
 </context>
 <context>
+    <name>ContextDrawer</name>
+    <message>
+        <location filename="../mobile-widgets/qml/kirigami/src/controls/ContextDrawer.qml" line="76"/>
+        <source>Actions</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>CylindersModel</name>
     <message>
         <location filename="../qt-models/cylindermodel.cpp" line="16"/>
@@ -1779,11 +1792,6 @@
     </message>
     <message>
         <location filename="../qt-models/cylindermodel.cpp" line="16"/>
-        <source>He%</source>
-        <translation>He%</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="16"/>
         <source>Work press.</source>
         <translation>Presiune de lucru</translation>
     </message>
@@ -1803,9 +1811,24 @@
         <translation>O₂%</translation>
     </message>
     <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="16"/>
+        <source>He%</source>
+        <translation>He%</translation>
+    </message>
+    <message>
         <location filename="../qt-models/cylindermodel.cpp" line="17"/>
-        <source>Switch at</source>
-        <translation>Schimbă la</translation>
+        <source>Deco switch at</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
+        <source>Bot. MOD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
+        <source>MND</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-models/cylindermodel.cpp" line="17"/>
@@ -1823,17 +1846,32 @@
         <translation>ℓ</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="161"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="177"/>
         <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-models/cylindermodel.cpp" line="383"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="180"/>
+        <source>Switch depth for deco gas. Calculated using Deco pO₂ preference, unless set manually.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="183"/>
+        <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to &apos;*&apos; for best O₂% for max depth.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="186"/>
+        <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to &apos;*&apos; for best He% for max depth.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="444"/>
         <source>Cylinder cannot be removed</source>
         <translation>Tubul nu poate fi înlăturat</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="384"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="445"/>
         <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source>
         <translation>Acest tub de gaz incă se folosește. Doar tuburile ce nu sunt folosite în scufundare pot fi șterse.</translation>
     </message>
@@ -1853,42 +1891,24 @@
         <translation>Ce componente doriți să fie copiate</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="73"/>
+        <location filename="../build/ui_divecomponentselection.h" line="141"/>
+        <source>Dive site</source>
+        <translation>Locația scufundării</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="80"/>
         <location filename="../build/ui_divecomponentselection.h" line="142"/>
         <source>Suit</source>
         <translation>Costum</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="122"/>
-        <location filename="../build/ui_divecomponentselection.h" line="148"/>
-        <source>Divemaster</source>
-        <translation>Maestru scufundare</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="129"/>
-        <location filename="../build/ui_divecomponentselection.h" line="149"/>
-        <source>Buddy</source>
-        <translation>Însoțitor</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="136"/>
-        <location filename="../build/ui_divecomponentselection.h" line="150"/>
-        <source>Rating</source>
-        <translation>Rating</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="87"/>
         <location filename="../build/ui_divecomponentselection.h" line="143"/>
         <source>Visibility</source>
         <translation>Vizibilitate</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="73"/>
-        <location filename="../build/ui_divecomponentselection.h" line="141"/>
-        <source>Dive site</source>
-        <translation>Locația scufundării</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="94"/>
         <location filename="../build/ui_divecomponentselection.h" line="144"/>
         <source>Notes</source>
@@ -1912,10 +1932,34 @@
         <source>Cylinders</source>
         <translation>Tuburi</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="122"/>
+        <location filename="../build/ui_divecomponentselection.h" line="148"/>
+        <source>Divemaster</source>
+        <translation>Maestru scufundare</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="129"/>
+        <location filename="../build/ui_divecomponentselection.h" line="149"/>
+        <source>Buddy</source>
+        <translation>Însoțitor</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="136"/>
+        <location filename="../build/ui_divecomponentselection.h" line="150"/>
+        <source>Rating</source>
+        <translation>Rating</translation>
+    </message>
 </context>
 <context>
     <name>DiveComputerManagementDialog</name>
     <message>
+        <location filename="../desktop-widgets/divecomputermanagementdialog.ui" line="17"/>
+        <location filename="../build/ui_divecomputermanagementdialog.h" line="65"/>
+        <source>Edit dive computer nicknames</source>
+        <translation>Editați numele computerului de scufundări</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divecomputermanagementdialog.cpp" line="49"/>
         <source>Remove the selected dive computer?</source>
         <translation>Stergeți calculatorul de scufundări selectat?</translation>
@@ -1927,12 +1971,6 @@
         <translation>Sunteți sigur că vreți să înlăturați 
 computerul de scufundări selectat?</translation>
     </message>
-    <message>
-        <location filename="../desktop-widgets/divecomputermanagementdialog.ui" line="17"/>
-        <location filename="../build/ui_divecomputermanagementdialog.h" line="65"/>
-        <source>Edit dive computer nicknames</source>
-        <translation>Editați numele computerului de scufundări</translation>
-    </message>
 </context>
 <context>
     <name>DiveComputerModel</name>
@@ -1960,17 +1998,17 @@ computerul de scufundări selectat?</translation>
 <context>
     <name>DiveDetails</name>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="33"/>
+        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="38"/>
         <source>Dive details</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="67"/>
+        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="72"/>
         <source>Delete dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="84"/>
+        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="89"/>
         <source>Show on map</source>
         <translation type="unfinished"/>
     </message>
@@ -1978,88 +2016,93 @@ computerul de scufundări selectat?</translation>
 <context>
     <name>DiveDetailsEdit</name>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="74"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="80"/>
         <source>Dive %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="78"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="84"/>
         <source>Date:</source>
         <translation>Dată:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="86"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="92"/>
         <source>Location:</source>
         <translation>Locație:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="95"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="101"/>
         <source>Coordinates:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="104"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="110"/>
         <source>Use current
 GPS location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="118"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="124"/>
         <source>Depth:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="127"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="133"/>
         <source>Duration:</source>
         <translation>Durată:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="137"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="143"/>
         <source>Air Temp:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="146"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="152"/>
         <source>Water Temp:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="155"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="161"/>
         <source>Suit:</source>
         <translation>Costum:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="164"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="176"/>
         <source>Buddy:</source>
         <translation>Însoțitor:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="173"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="191"/>
         <source>Dive Master:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="182"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="206"/>
         <source>Weight:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="192"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="216"/>
+        <source>Cylinder:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="231"/>
         <source>Gas mix:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="203"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="241"/>
         <source>Start Pressure:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="213"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="250"/>
         <source>End Pressure:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="224"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="260"/>
         <source>Notes:</source>
         <translation>Notițe:</translation>
     </message>
@@ -2097,42 +2140,42 @@ GPS location:</source>
         <translation>Costum:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="159"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="158"/>
         <source>Air Temp:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="175"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="172"/>
         <source>Cylinder:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="189"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="185"/>
         <source>Water Temp:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="205"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="198"/>
         <source>Dive Master:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="220"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="211"/>
         <source>Weight:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="249"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="224"/>
         <source>Buddy:</source>
         <translation>Însoțitor:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="263"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="237"/>
         <source>SAC:</source>
         <translation>SAC:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="280"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="252"/>
         <source>Notes</source>
         <translation>Notițe</translation>
     </message>
@@ -2140,18 +2183,18 @@ GPS location:</source>
 <context>
     <name>DiveEventItem</name>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="134"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="165"/>
         <source>Manual switch to OC</source>
         <translation>Schimbare manuală la OC</translation>
     </message>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="136"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="167"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation> început</translation>
     </message>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="137"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="168"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation> sfârșit</translation>
@@ -2160,27 +2203,27 @@ GPS location:</source>
 <context>
     <name>DiveImportedModel</name>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="646"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="656"/>
         <source>Date/time</source>
         <translation>Dată/timp</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="648"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="658"/>
         <source>Duration</source>
         <translation>Durată</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="650"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="660"/>
         <source>Depth</source>
         <translation>Adâncime</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="672"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="682"/>
         <source>h:</source>
         <translation>h:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="672"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="682"/>
         <source>min</source>
         <translation>min</translation>
     </message>
@@ -2189,8 +2232,8 @@ GPS location:</source>
     <name>DiveList</name>
     <message>
         <location filename="../mobile-widgets/qml/DiveList.qml" line="12"/>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="226"/>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="232"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="227"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="233"/>
         <source>Dive list</source>
         <translation type="unfinished"/>
     </message>
@@ -2205,110 +2248,115 @@ GPS location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="222"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="223"/>
         <source>Cloud credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="228"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="229"/>
         <source>Please tap the &apos;+&apos; button to add a dive</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="248"/>
+        <source>No dives in dive list</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DiveListView</name>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="846"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="849"/>
         <source>Expand all</source>
         <translation>Expandare totală</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="848"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="851"/>
         <source>Collapse all</source>
         <translation>Colapsare separată</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="852"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="855"/>
         <source>Collapse others</source>
         <translation>Colapsare separată</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="856"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="859"/>
         <source>Remove dive(s) from trip</source>
         <translation>Elimină scufundare/scufundări din excursie</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="857"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="860"/>
         <source>Create new trip above</source>
         <translation>Adaugă o nouă excursie deasupra</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="871"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="874"/>
         <source>Add dive(s) to trip immediately above</source>
         <translation>Adaugă scufundare/scufundări excursiei aflate deasupra</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="873"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="876"/>
         <source>Add dive(s) to trip immediately below</source>
         <translation>Adaugă scufundare/scufundări excursiei aflate sub</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="877"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="880"/>
         <source>Merge trip with trip above</source>
         <translation>Unește excursia cu cea aflată deasupra</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="878"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="881"/>
         <source>Merge trip with trip below</source>
         <translation>Unește excursia cu cea aflată sub</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="882"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="885"/>
         <source>Delete dive(s)</source>
         <translation>Șterge scufundare/scufundări</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="884"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="887"/>
         <source>Mark dive(s) invalid</source>
         <translation>Marchează scufundarea/scufundările ca fiind invalidă/invalide</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="888"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="891"/>
         <source>Merge selected dives</source>
         <translation>Unește scufundările selectate</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="890"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="893"/>
         <source>Renumber dive(s)</source>
         <translation>Renumerotează scufundarea/scufundările</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="891"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="894"/>
         <source>Shift dive times</source>
         <translation>Schimbarea timpilor de scufundare</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="892"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="895"/>
         <source>Split selected dives</source>
         <translation>Împărțirea scufundărilor selectate</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="893"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="896"/>
         <source>Load image(s) from file(s)</source>
         <translation>Încărcarea imaginilor din fișier</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="894"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="897"/>
         <source>Load image(s) from web</source>
         <translation>Încărcarea imaginilor de pe web</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="917"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="919"/>
         <source>Open image files</source>
         <translation>Deschide fișierele imaginilor</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="917"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="919"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>Fișierele imaginilor (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -2329,56 +2377,6 @@ GPS location:</source>
 <context>
     <name>DiveLogExportDialog</name>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="103"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="351"/>
-        <source>Export format</source>
-        <translation>Format de export</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="134"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="353"/>
-        <source>UDDF</source>
-        <translation>UDDF</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="187"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="358"/>
-        <source>Worldmap</source>
-        <translation>Harta lumii</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="197"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="359"/>
-        <source>I&amp;mage depths</source>
-        <translation>Adâncimile din imagine</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="243"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="360"/>
-        <source>Selection</source>
-        <translation>Selecție</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="252"/>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="346"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="361"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="372"/>
-        <source>Selected dives</source>
-        <translation>Scufundările selectate</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="262"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="362"/>
-        <source>All dives</source>
-        <translation>Toate scufundările</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="306"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="396"/>
-        <source>HTML</source>
-        <translation>HTML</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="14"/>
         <location filename="../build/ui_divelogexportdialog.h" line="349"/>
         <source>Export dive log files</source>
@@ -2391,12 +2389,24 @@ GPS location:</source>
         <translation>Export general</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="103"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="351"/>
+        <source>Export format</source>
+        <translation>Format de export</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="115"/>
         <location filename="../build/ui_divelogexportdialog.h" line="352"/>
         <source>Subsurface &amp;XML</source>
         <translation>XML Subsurface</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="134"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="353"/>
+        <source>UDDF</source>
+        <translation>UDDF</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="147"/>
         <location filename="../build/ui_divelogexportdialog.h" line="354"/>
         <source>di&amp;velogs.de</source>
@@ -2421,238 +2431,297 @@ GPS location:</source>
         <translation>Detalii scufundare CSV</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="275"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="187"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="358"/>
+        <source>Worldmap</source>
+        <translation>Harta lumii</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="197"/>
+        <source>TeX</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="207"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="359"/>
+        <source>I&amp;mage depths</source>
+        <translation>Adâncimile din imagine</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="253"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="360"/>
+        <source>Selection</source>
+        <translation>Selecție</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="262"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="356"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="361"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="372"/>
+        <source>Selected dives</source>
+        <translation>Scufundările selectate</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="272"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="362"/>
+        <source>All dives</source>
+        <translation>Toate scufundările</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="285"/>
         <location filename="../build/ui_divelogexportdialog.h" line="363"/>
         <source>CSV units</source>
         <translation>Unități CSV</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="288"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="298"/>
         <location filename="../build/ui_divelogexportdialog.h" line="366"/>
         <source>Metric</source>
         <translation>Metrică</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="293"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="303"/>
         <location filename="../build/ui_divelogexportdialog.h" line="367"/>
         <source>Imperial</source>
         <translation>Imperial</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="324"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="316"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="396"/>
+        <source>HTML</source>
+        <translation>HTML</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="334"/>
         <location filename="../build/ui_divelogexportdialog.h" line="370"/>
         <source>General settings</source>
         <translation>Setări generale</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="330"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="340"/>
         <location filename="../build/ui_divelogexportdialog.h" line="371"/>
         <source>Subsurface numbers</source>
         <translation>Numerele Subsurface</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="359"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="369"/>
         <location filename="../build/ui_divelogexportdialog.h" line="373"/>
         <source>Export yearly statistics</source>
         <translation>Exportă statisticile anuale</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="375"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="385"/>
         <location filename="../build/ui_divelogexportdialog.h" line="374"/>
         <source>All di&amp;ves</source>
         <translation>Toate scufundările</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="385"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="395"/>
         <location filename="../build/ui_divelogexportdialog.h" line="375"/>
         <source>Export list only</source>
         <translation>Exportă doar listele</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="392"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="402"/>
         <location filename="../build/ui_divelogexportdialog.h" line="376"/>
         <source>Export photos</source>
         <translation>Exportarea pozelor</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="408"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="418"/>
         <location filename="../build/ui_divelogexportdialog.h" line="377"/>
         <source>Style options</source>
         <translation>Opțiuni de stil</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="423"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="433"/>
         <location filename="../build/ui_divelogexportdialog.h" line="378"/>
         <source>Font</source>
         <translation>Font</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="433"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="443"/>
         <location filename="../build/ui_divelogexportdialog.h" line="379"/>
         <source>Font size</source>
         <translation>Mărimea fontului</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="444"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="454"/>
         <location filename="../build/ui_divelogexportdialog.h" line="382"/>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="449"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="459"/>
         <location filename="../build/ui_divelogexportdialog.h" line="383"/>
         <source>10</source>
         <translation>10</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="454"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="464"/>
         <location filename="../build/ui_divelogexportdialog.h" line="384"/>
         <source>12</source>
         <translation>12</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="459"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="469"/>
         <location filename="../build/ui_divelogexportdialog.h" line="385"/>
         <source>14</source>
         <translation>14</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="464"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="474"/>
         <location filename="../build/ui_divelogexportdialog.h" line="386"/>
         <source>16</source>
         <translation>16</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="469"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="479"/>
         <location filename="../build/ui_divelogexportdialog.h" line="387"/>
         <source>18</source>
         <translation>18</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="474"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="484"/>
         <location filename="../build/ui_divelogexportdialog.h" line="388"/>
         <source>20</source>
         <translation>20</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="482"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="492"/>
         <location filename="../build/ui_divelogexportdialog.h" line="390"/>
         <source>Theme</source>
         <translation>Temă</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="493"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="503"/>
         <location filename="../build/ui_divelogexportdialog.h" line="393"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="95"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="99"/>
         <source>Light</source>
         <translation>Luminozitate</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="498"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="508"/>
         <location filename="../build/ui_divelogexportdialog.h" line="394"/>
         <source>Sand</source>
         <translation>Nisip</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="134"/>
-        <source>UDDF files (*.uddf *.UDDF)</source>
-        <translation>Fișiere UDDF (*.uddf *.UDDF)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="142"/>
-        <source>CSV files (*.csv *.CSV)</source>
-        <translation>Fișiere CSV (*csv *.CSV)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="74"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="76"/>
         <source>Generic format that is used for data exchange between a variety of diving related programs.</source>
         <translation>Format generic ce este folosit pentru schimbul de date între diverse programe de scufundări</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="76"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="78"/>
         <source>Comma separated values describing the dive profile.</source>
         <translation>Valori separate prin virgulă ce descriu profilul scufundării</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="78"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="80"/>
         <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source>
         <translation>Valori separate prin virgulă ce reprezintă informațiile scufundării. Acestea includ majoritatea detaliilor, fără informații legate de profil.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="80"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="82"/>
         <source>Send the dive data to divelogs.de website.</source>
         <translation>Trimite datele scufundării pe site-ul divelogs.de .</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="82"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="84"/>
         <source>Send the dive data to dive-share.appspot.com website</source>
         <translation>Trimite datele scufundării pe site-ul dive-share.appspot.com .</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="84"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="86"/>
         <source>HTML export of the dive locations, visualized on a world map.</source>
         <translation>Export HTML al locațiilor scufundărilor vizualizate pe harta lumii.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="86"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="88"/>
         <source>Subsurface native XML format.</source>
         <translation>Format XML nativ Subsurface.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="88"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="90"/>
         <source>Write depths of images to file.</source>
         <translation>Scrie adâncimea imaginilor in fișier.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="133"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="92"/>
+        <source>Write dive as TeX macros to file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="137"/>
         <source>Export UDDF file as</source>
         <translation>Exportă ca fișier UDDF</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="137"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/>
+        <source>UDDF files (*.uddf *.UDDF)</source>
+        <translation>Fișiere UDDF (*.uddf *.UDDF)</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divelogexportdialog.cpp" line="141"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="145"/>
         <source>Export CSV file as</source>
         <translation>Exporă ca fișier CSV</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="148"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="142"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="146"/>
+        <source>CSV files (*.csv *.CSV)</source>
+        <translation>Fișiere CSV (*csv *.CSV)</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="152"/>
         <source>Export world map</source>
         <translation>Exportă harta lumii</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="149"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="169"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="153"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="177"/>
         <source>HTML files (*.html)</source>
         <translation>Fișiere HTML (*.html)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="153"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="157"/>
         <source>Export Subsurface XML</source>
         <translation>Exportă XML Subsurface</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="158"/>
         <source>XML files (*.xml *.ssrf)</source>
         <translation>Fișiere XML (*.xml *.ssrf)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="162"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="166"/>
         <source>Save image depths</source>
         <translation>Salvează adâncimile imaginii</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="168"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="170"/>
+        <source>Export to TeX file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="170"/>
+        <source>TeX files (*.tex)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="176"/>
         <source>Export HTML files as</source>
         <translation>Exportă ca fișier HTML</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="184"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="192"/>
         <source>Please wait, exporting...</source>
         <translation>Vă rugăm aștepați, se exportă...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="219"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="227"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="311"/>
         <source>Can&apos;t open file %s</source>
         <translation>Nu se poate deschide fișierul %s</translation>
     </message>
@@ -2666,25 +2735,6 @@ GPS location:</source>
         <translation>Importă jurnalul de scufundări</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="643"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="727"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="856"/>
-        <source>Time</source>
-        <translation>Timp</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.ui" line="127"/>
-        <location filename="../build/ui_divelogimportdialog.h" line="164"/>
-        <source>Metric</source>
-        <translation>Metrică</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.ui" line="132"/>
-        <location filename="../build/ui_divelogimportdialog.h" line="165"/>
-        <source>Imperial</source>
-        <translation>Imperial</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divelogimportdialog.ui" line="89"/>
         <location filename="../build/ui_divelogimportdialog.h" line="152"/>
         <source>dd.mm.yyyy</source>
@@ -2703,74 +2753,6 @@ GPS location:</source>
         <translation>aaaa-ll-zz</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.ui" line="155"/>
-        <location filename="../build/ui_divelogimportdialog.h" line="167"/>
-        <source>Drag the tags above to each corresponding column below</source>
-        <translation>Trageți etichetele de mai sus pentru fiecare coloană de mai jos</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="641"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="729"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="852"/>
-        <source>Dive #</source>
-        <translation>Scufundare #</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="642"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="723"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="854"/>
-        <source>Date</source>
-        <translation>Dată</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="644"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="858"/>
-        <source>Duration</source>
-        <translation>Durată</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="655"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="862"/>
-        <source>GPS</source>
-        <translation>GPS</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="645"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="864"/>
-        <source>Max. depth</source>
-        <translation>Adâncime maximă</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="646"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="866"/>
-        <source>Avg. depth</source>
-        <translation>Adâncime medie</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="658"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="872"/>
-        <source>Suit</source>
-        <translation>Costum</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="663"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="878"/>
-        <source>Tags</source>
-        <translation>Etichete</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="652"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="894"/>
-        <source>O₂</source>
-        <translation>O₂</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="653"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="896"/>
-        <source>He</source>
-        <translation>He</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divelogimportdialog.ui" line="108"/>
         <location filename="../build/ui_divelogimportdialog.h" line="158"/>
         <source>Seconds</source>
@@ -2789,183 +2771,269 @@ GPS location:</source>
         <translation>Minute:secunde</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="654"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="860"/>
-        <source>Location</source>
-        <translation>Locație</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.ui" line="127"/>
+        <location filename="../build/ui_divelogimportdialog.h" line="164"/>
+        <source>Metric</source>
+        <translation>Metrică</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.ui" line="132"/>
+        <location filename="../build/ui_divelogimportdialog.h" line="165"/>
+        <source>Imperial</source>
+        <translation>Imperial</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.ui" line="155"/>
+        <location filename="../build/ui_divelogimportdialog.h" line="167"/>
+        <source>Drag the tags above to each corresponding column below</source>
+        <translation>Trageți etichetele de mai sus pentru fiecare coloană de mai jos</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="354"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="499"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="505"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="355"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="528"/>
         <source>Tab</source>
         <translation>Filă</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="575"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="598"/>
         <source>Some column headers were pre-populated; please drag and drop the headers so they match the column they are in.</source>
         <translation>Unele antete de coloane au fost pre-populate; vă rugăm să fixați antetele astfel încât acestea să se potrivească cu coloana în care se află.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="613"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="731"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="782"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="848"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="636"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="761"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="857"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="925"/>
         <source>Sample time</source>
         <translation>Timp de probă</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="615"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="733"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="784"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="638"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="763"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="859"/>
         <source>Sample depth</source>
         <translation>Adâncime de probă</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="617"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="735"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="786"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="640"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="765"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="861"/>
         <source>Sample temperature</source>
         <translation>Temperatură de probă</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="621"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="739"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="790"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="642"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="767"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="863"/>
+        <source>Sample pO₂</source>
+        <translation>pO₂ de probă</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="644"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="769"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="865"/>
         <source>Sample sensor1 pO₂</source>
         <translation>Exemplu sensor1 pO₂</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="623"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="741"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="792"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="646"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="771"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="867"/>
         <source>Sample sensor2 pO₂</source>
         <translation>Exemplu sensor2 pO₂</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="625"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="743"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="794"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="648"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="773"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="869"/>
         <source>Sample sensor3 pO₂</source>
         <translation>Exemplu sensor3 pO₂</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="633"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="751"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="802"/>
-        <source>Sample stopdepth</source>
-        <translation>Limită de adâncime de probă</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="637"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="755"/>
-        <source>Sample setpoint</source>
-        <translation>Exemplu valoare de refetință</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="619"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="737"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="788"/>
-        <source>Sample pO₂</source>
-        <translation>pO₂ de probă</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="627"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="745"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="796"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="650"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="775"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="871"/>
         <source>Sample CNS</source>
         <translation>CNS de probă</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="629"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="747"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="798"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="652"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="777"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="873"/>
         <source>Sample NDL</source>
         <translation>NDL de probă</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="631"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="749"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="800"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="654"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="779"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="875"/>
         <source>Sample TTS</source>
         <translation>TTS de probă</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="635"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="753"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="804"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="656"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="781"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="877"/>
+        <source>Sample stopdepth</source>
+        <translation>Limită de adâncime de probă</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="658"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="783"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="879"/>
         <source>Sample pressure</source>
         <translation>Presiune de probă</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="656"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="868"/>
-        <source>Divemaster</source>
-        <translation>Maestru scufundare</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="660"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="785"/>
+        <source>Sample setpoint</source>
+        <translation>Exemplu valoare de refetință</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="657"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="870"/>
-        <source>Buddy</source>
-        <translation>Însoțitor</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="664"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="759"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="929"/>
+        <source>Dive #</source>
+        <translation>Scufundare #</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="659"/>
-        <source>Rating</source>
-        <translation>Rating</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="665"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="753"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="931"/>
+        <source>Date</source>
+        <translation>Dată</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="660"/>
-        <source>Visibility</source>
-        <translation>Vizibilitate</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="666"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="757"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="933"/>
+        <source>Time</source>
+        <translation>Timp</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="661"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="874"/>
-        <source>Notes</source>
-        <translation>Notițe</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="667"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="935"/>
+        <source>Duration</source>
+        <translation>Durată</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="662"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="876"/>
-        <source>Weight</source>
-        <translation>Greutate</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="668"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="941"/>
+        <source>Max. depth</source>
+        <translation>Adâncime maximă</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="669"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="943"/>
+        <source>Avg. depth</source>
+        <translation>Adâncime medie</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="670"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="975"/>
+        <source>Air temp.</source>
+        <translation>Temperatura aerului</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="671"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="977"/>
+        <source>Water temp.</source>
+        <translation>Temperatura apei</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="649"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="888"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="672"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="965"/>
         <source>Cyl. size</source>
         <translation>Dimensiune tub</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="650"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="890"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="673"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="967"/>
         <source>Start pressure</source>
         <translation>Începutul presiunii</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="651"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="892"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="674"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="969"/>
         <source>End pressure</source>
         <translation>Sfârșitul presiunii</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="647"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="898"/>
-        <source>Air temp.</source>
-        <translation>Temperatura aerului</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="675"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="971"/>
+        <source>O₂</source>
+        <translation>O₂</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="648"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="900"/>
-        <source>Water temp.</source>
-        <translation>Temperatura apei</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="676"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="973"/>
+        <source>He</source>
+        <translation>He</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="677"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="937"/>
+        <source>Location</source>
+        <translation>Locație</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="678"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="939"/>
+        <source>GPS</source>
+        <translation>GPS</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="679"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="945"/>
+        <source>Divemaster</source>
+        <translation>Maestru scufundare</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="680"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="947"/>
+        <source>Buddy</source>
+        <translation>Însoțitor</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="681"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="949"/>
+        <source>Suit</source>
+        <translation>Costum</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="682"/>
+        <source>Rating</source>
+        <translation>Rating</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="683"/>
+        <source>Visibility</source>
+        <translation>Vizibilitate</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="684"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="951"/>
+        <source>Notes</source>
+        <translation>Notițe</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="685"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="953"/>
+        <source>Weight</source>
+        <translation>Greutate</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="686"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="955"/>
+        <source>Tags</source>
+        <translation>Etichete</translation>
     </message>
 </context>
 <context>
     <name>DiveObjectHelper</name>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="287"/>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="323"/>
         <source>%1 dive(s)</source>
         <translation type="unfinished"/>
     </message>
@@ -2973,18 +3041,18 @@ GPS location:</source>
 <context>
     <name>DivePlanner</name>
     <message>
-        <location filename="../desktop-widgets/diveplanner.ui" line="152"/>
-        <location filename="../build/ui_diveplanner.h" line="190"/>
-        <source>Altitude</source>
-        <translation>Altitudine</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/diveplanner.ui" line="109"/>
         <location filename="../build/ui_diveplanner.h" line="189"/>
         <source>Planned dive time</source>
         <translation>Timpul de scufundare planificat</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/diveplanner.ui" line="152"/>
+        <location filename="../build/ui_diveplanner.h" line="190"/>
+        <source>Altitude</source>
+        <translation>Altitudine</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/diveplanner.ui" line="159"/>
         <location filename="../build/ui_diveplanner.h" line="191"/>
         <source>ATM pressure</source>
@@ -3018,32 +3086,32 @@ GPS location:</source>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="134"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="136"/>
         <source>unknown</source>
         <translation>necunoscut</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="312"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="326"/>
         <source>Final depth</source>
         <translation>Adâncime finală</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="314"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="328"/>
         <source>Run time</source>
         <translation>Timp de rulare</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="316"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="330"/>
         <source>Duration</source>
         <translation>Durată</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="318"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="332"/>
         <source>Used gas</source>
         <translation>Gaz folosit</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="320"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="334"/>
         <source>CC setpoint</source>
         <translation>Valorare CC de refetință</translation>
     </message>
@@ -3051,22 +3119,22 @@ GPS location:</source>
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="108"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="112"/>
         <source>Dive planner points</source>
         <translation>Punctele planului de scufundare</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="112"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="116"/>
         <source>Available gases</source>
         <translation>Gaz disponibil</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="137"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="143"/>
         <source>Add dive data point</source>
         <translation>Adaugă punct de scufundare</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="146"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="152"/>
         <source>Save new</source>
         <translation>Salvează unul nou</translation>
     </message>
@@ -3099,11 +3167,36 @@ GPS location:</source>
         <translation>Culoare</translation>
     </message>
     <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="124"/>
+        <source>User entered</source>
+        <translation>Utilizatorul a intrat</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="126"/>
+        <source>Cylinder index</source>
+        <translation>Indexul tuburilor</translation>
+    </message>
+    <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="128"/>
         <source>Pressure S</source>
         <translation>Presiune S</translation>
     </message>
     <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="130"/>
+        <source>Pressure I</source>
+        <translation>Presiunea I</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="132"/>
+        <source>Ceiling</source>
+        <translation>Plafon</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="134"/>
+        <source>SAC</source>
+        <translation>SAC</translation>
+    </message>
+    <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="136"/>
         <source>pN₂</source>
         <translation>pN₂</translation>
@@ -3139,49 +3232,24 @@ GPS location:</source>
         <translation>Senzor 3</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="152"/>
-        <source>Heart rate</source>
-        <translation>Puls</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="156"/>
-        <source>Mean depth @ s</source>
-        <translation>Adâncime medie @ s</translation>
-    </message>
-    <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="150"/>
         <source>Ambient pressure</source>
         <translation>Presiunea ambientală</translation>
     </message>
     <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="152"/>
+        <source>Heart rate</source>
+        <translation>Puls</translation>
+    </message>
+    <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="154"/>
         <source>Gradient factor</source>
         <translation>Factorul gradient</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="130"/>
-        <source>Pressure I</source>
-        <translation>Presiunea I</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="124"/>
-        <source>User entered</source>
-        <translation>Utilizatorul a intrat</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="126"/>
-        <source>Cylinder index</source>
-        <translation>Indexul tuburilor</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="132"/>
-        <source>Ceiling</source>
-        <translation>Plafon</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="134"/>
-        <source>SAC</source>
-        <translation>SAC</translation>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="156"/>
+        <source>Mean depth @ s</source>
+        <translation>Adâncime medie @ s</translation>
     </message>
 </context>
 <context>
@@ -3252,311 +3320,315 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="395"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="441"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="434"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="483"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="398"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="444"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="437"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="486"/>
         <source>Date</source>
         <translation>Dată</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="401"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="447"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="440"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="489"/>
         <source>Rating</source>
         <translation>Rating</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="404"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="443"/>
         <source>Depth</source>
         <translation>Adâncime</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="410"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="446"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="495"/>
+        <source>Duration</source>
+        <translation>Durată</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="449"/>
         <source>Temp</source>
         <translation>Temperatură</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="413"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="452"/>
         <source>Weight</source>
         <translation>Greutate</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="425"/>
-        <source>SAC</source>
-        <translation>SAC</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
-        <source>m</source>
-        <translation>m</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
-        <source>ft</source>
-        <translation>picioare</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
-        <source>Weight(%1)</source>
-        <translation>Greutate(%1)</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="416"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="462"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="455"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="504"/>
         <source>Suit</source>
         <translation>Costum</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="419"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="465"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="458"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="507"/>
         <source>Cyl</source>
         <translation>Tub</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="422"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="468"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="461"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="510"/>
         <source>Gas</source>
         <translation>Gaz</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
-        <source>SAC(%1)</source>
-        <translation>SAC(%1)</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="464"/>
+        <source>SAC</source>
+        <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
-        <source>/min</source>
-        <translation>/min</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="467"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="518"/>
+        <source>OTU</source>
+        <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="431"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="479"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="470"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="521"/>
         <source>Max CNS</source>
         <translation>CNS maxim</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="434"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="482"/>
-        <source>Location</source>
-        <translation>Locație</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
+        <source>Photos</source>
+        <translation>Fotografii</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
-        <source>kg</source>
-        <translation>kg</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="476"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="527"/>
+        <source>Location</source>
+        <translation>Locație</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="492"/>
         <source>Depth(%1)</source>
         <translation>Adâncime(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="407"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="453"/>
-        <source>Duration</source>
-        <translation>Durată</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="492"/>
+        <source>m</source>
+        <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="456"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="492"/>
+        <source>ft</source>
+        <translation>picioare</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="498"/>
         <source>Temp(%1%2)</source>
         <translation>Temperatură(%1%2)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="501"/>
+        <source>Weight(%1)</source>
+        <translation>Greutate(%1)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="501"/>
+        <source>kg</source>
+        <translation>kg</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="501"/>
         <source>lbs</source>
         <translation>livre</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="428"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="476"/>
-        <source>OTU</source>
-        <translation>OTU</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="515"/>
+        <source>SAC(%1)</source>
+        <translation>SAC(%1)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="515"/>
+        <source>/min</source>
+        <translation>/min</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="524"/>
+        <source>Photos before/during/after dive</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="164"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="165"/>
         <source>no dives were selected</source>
         <translation>nu a fost selectată nicio scufundare</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="174"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="175"/>
         <source>stylesheet to export to divelogs.de is not found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="184"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="185"/>
         <source>failed to create zip file for upload: %s</source>
         <translation>nu a reușit să se creeze fișierul zip pentru upload: %s</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="236"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="237"/>
         <source>internal error</source>
         <translation>eroare internă</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="244"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="245"/>
         <source>Conversion of dive %1 to divelogs.de format failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="272"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="273"/>
         <source>error writing zip file: %s zip error %d system error %d - %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="745"/>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="935"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="936"/>
         <source>Done</source>
         <translation>Finalizat</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="778"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="779"/>
         <source>Uploading dive list...</source>
         <translation>Se uploadează lista de scufundări...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="810"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="811"/>
         <source>Downloading dive list...</source>
         <translation>Se descarcă lista de scufundări...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="851"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="852"/>
         <source>Downloading %1 dives...</source>
         <translation>Se descarcă scufundările %s...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="885"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="886"/>
         <source>Download finished - %1</source>
         <translation>Descărcarea s-a terminat - %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="899"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="900"/>
         <source>Problem with download</source>
         <translation>Problema legată de descărcare</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="900"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="901"/>
         <source>The archive could not be opened:
 </source>
         <translation>Arhiva nu a putut fi deschisă:
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="909"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="910"/>
         <source>Corrupted download</source>
         <translation>Descărcarea a fost coruptă.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="910"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="911"/>
         <source>The archive could not be opened:
 %1</source>
         <translation>Arhiva nu a putut fi deschisă:
 %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="937"/>
+        <source>Upload finished</source>
+        <translation>Upload-ul a fost finalizat</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="950"/>
         <source>Upload failed</source>
         <translation>Upload-ul a eșuat</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="952"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="953"/>
         <source>Upload successful</source>
         <translation>Upload-ul a avut succes</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="955"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="956"/>
         <source>Login failed</source>
         <translation>Logarea a eșuat</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="958"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="959"/>
         <source>Cannot parse response</source>
         <translation>Nu s-a putut parsa răspunsul</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="970"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="971"/>
         <source>Error: %1</source>
         <translation>Eroare: %1</translation>
     </message>
-    <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="936"/>
-        <source>Upload finished</source>
-        <translation>Upload-ul a fost finalizat</translation>
-    </message>
 </context>
 <context>
     <name>DownloadFromDCWidget</name>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="185"/>
-        <source>Error</source>
-        <translation>Eroare</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="436"/>
-        <source>Retry</source>
-        <translation>Reîncearcă</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="280"/>
-        <source>Find Uemis dive computer</source>
-        <translation>Găsește calculatorul de scufundări Uemis</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="101"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="107"/>
         <source>Download</source>
         <translation>Descarcă</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="104"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="110"/>
         <source>Choose Bluetooth download mode</source>
         <translation>Descărcarea datelor folosind Bluetooth</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="382"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="191"/>
+        <source>Error</source>
+        <translation>Eroare</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="286"/>
+        <source>Find Uemis dive computer</source>
+        <translation>Găsește calculatorul de scufundări Uemis</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="392"/>
         <source>Choose file for divecomputer download logfile</source>
         <translation>Selectează fisier pentru descărcarea jurnalului calculatorului de scufundări</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="383"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="393"/>
         <source>Log files (*.log)</source>
         <translation>Fișiere de log (*.log)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="398"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="408"/>
         <source>Warning</source>
         <translation>Avertizare</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="399"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="409"/>
         <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source>
         <translation>Salvând dump-ul libdivecomputer nu se vor mai descărca scufundările din listă.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="410"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="420"/>
         <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="../desktop-widgets/downloadfromdivecomputer.cpp" line="411"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="421"/>
         <source>Dump files (*.bin)</source>
         <translation>Fișiere dump (*.bin)</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="446"/>
+        <source>Retry</source>
+        <translation>Reîncearcă</translation>
+    </message>
 </context>
 <context>
     <name>DownloadFromDiveComputer</name>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="139"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="275"/>
-        <source>Vendor</source>
-        <translation>Furnizor</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="14"/>
         <location filename="../build/ui_downloadfromdivecomputer.h" line="265"/>
         <source>Download from dive computer</source>
@@ -3569,17 +3641,6 @@ p, li { white-space: pre-wrap; }
         <translation>Dispozitiv sau punct de montare</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="122"/>
-        <source>Choose Bluetooth download mode</source>
-        <translation>Descărcarea datelor folosind Bluetooth</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="149"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="276"/>
-        <source>Dive computer</source>
-        <translation>Calculator de scufundări</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="66"/>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="101"/>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="115"/>
@@ -3603,11 +3664,46 @@ p, li { white-space: pre-wrap; }
         <translation>Preferă întotdeauna scufundările descărcate</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="87"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="270"/>
+        <source>Download into new trip</source>
+        <translation>Descarcă în excursii noi</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="94"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="271"/>
+        <source>Save libdivecomputer logfile</source>
+        <translation>Salvați fișierul jurnal al libdivecomputer</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="108"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="273"/>
+        <source>Save libdivecomputer dumpfile</source>
+        <translation>Salvați fișierul de dump al libdivecomputer</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="122"/>
+        <source>Choose Bluetooth download mode</source>
+        <translation>Descărcarea datelor folosind Bluetooth</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="129"/>
         <source>Select a remote Bluetooth device.</source>
         <translation>Selectarea unui dispozitiv Bluetooth de la distanță.</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="139"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="275"/>
+        <source>Vendor</source>
+        <translation>Furnizor</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="149"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="276"/>
+        <source>Dive computer</source>
+        <translation>Calculator de scufundări</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/>
         <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="52"/>
         <location filename="../build/ui_downloadfromdivecomputer.h" line="277"/>
@@ -3615,18 +3711,6 @@ p, li { white-space: pre-wrap; }
         <translation>Descarcă</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="284"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="281"/>
-        <source>OK</source>
-        <translation>OK</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="291"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="282"/>
-        <source>Cancel</source>
-        <translation>Anulează</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="226"/>
         <location filename="../build/ui_downloadfromdivecomputer.h" line="278"/>
         <source>Downloaded dives</source>
@@ -3645,22 +3729,16 @@ p, li { white-space: pre-wrap; }
         <translation>Deselectează totul</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="94"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="271"/>
-        <source>Save libdivecomputer logfile</source>
-        <translation>Salvați fișierul jurnal al libdivecomputer</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="108"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="273"/>
-        <source>Save libdivecomputer dumpfile</source>
-        <translation>Salvați fișierul de dump al libdivecomputer</translation>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="284"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="281"/>
+        <source>OK</source>
+        <translation>OK</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="87"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="270"/>
-        <source>Download into new trip</source>
-        <translation>Descarcă în excursii noi</translation>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="291"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="282"/>
+        <source>Cancel</source>
+        <translation>Anulează</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="16"/>
@@ -3750,12 +3828,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="297"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="242"/>
         <source>To disconnect Subsurface from your Facebook account, use the button below</source>
         <translation>Pentru a deconecta Subsurface de pe contul de Facebook, folosiți butonul aflat deasupra</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="306"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="251"/>
         <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source>
         <translation>Pentru a vă conecta la Facebook, va rugăm să vă autentificați. Acesta va permite aplicației Subsurface să publice scufundările pe timeline-ul dumneavoastă</translation>
     </message>
@@ -3763,22 +3841,22 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>FacebookManager</name>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="266"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="211"/>
         <source>Photo upload sucessfull</source>
         <translation>Poza a fost încărcată cu succes</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="267"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="212"/>
         <source>Your dive profile was updated to Facebook.</source>
         <translation>Profilul de scufundări a fost actualizat cu Facebook-ul.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="271"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="216"/>
         <source>Photo upload failed</source>
         <translation>Încercarea de a încărca poza a eșuat</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="272"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="217"/>
         <source>Your dive profile was not updated to Facebook, 
  please send the following to the developer. 
 </source>
@@ -3839,17 +3917,25 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>FirmwareUpdateThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1750"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1739"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Această funcționalitate nu este încă disponibilă pentru calculatorul de scufundări selectat.</translation>
     </message>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1755"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1744"/>
         <source>Firmware update failed!</source>
         <translation>Actualizarea firmware-ului a eșuat!</translation>
     </message>
 </context>
 <context>
+    <name>GlobalDrawer</name>
+    <message>
+        <location filename="../mobile-widgets/qml/kirigami/src/controls/GlobalDrawer.qml" line="364"/>
+        <source>Back</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>GlobeGPS</name>
     <message>
         <location filename="../desktop-widgets/globe.cpp" line="124"/>
@@ -3865,27 +3951,27 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="40"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="32"/>
         <source>Date: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="50"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="42"/>
         <source>Name: </source>
         <translation>Nume: </translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="60"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="52"/>
         <source>Latitude: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="69"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="61"/>
         <source>Longitude: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="113"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="105"/>
         <source>List of stored GPS fixes</source>
         <translation type="unfinished"/>
     </message>
@@ -3914,7 +4000,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>LocationFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="648"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="646"/>
         <source>Location: </source>
         <translation>Locație: </translation>
     </message>
@@ -3955,7 +4041,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>LocationFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="299"/>
+        <location filename="../qt-models/filtermodels.cpp" line="304"/>
         <source>No location set</source>
         <translation>Nu a fost setată nicio locație</translation>
     </message>
@@ -4077,20 +4163,55 @@ p, li { white-space: pre-wrap; }
     </message>
 </context>
 <context>
-    <name>MainForm.ui</name>
+    <name>MainTab</name>
     <message>
-        <location filename="../packaging/ios/Subsurface-mobile/MainForm.ui.qml" line="17"/>
-        <source>Press Me 1</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/maintab.ui" line="18"/>
+        <location filename="../desktop-widgets/maintab.ui" line="439"/>
+        <location filename="../build/ui_maintab.h" line="961"/>
+        <location filename="../build/ui_maintab.h" line="963"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="539"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="571"/>
+        <source>Notes</source>
+        <translation>Notițe</translation>
     </message>
     <message>
-        <location filename="../packaging/ios/Subsurface-mobile/MainForm.ui.qml" line="22"/>
-        <source>Press Me 2</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/maintab.ui" line="21"/>
+        <location filename="../build/ui_maintab.h" line="964"/>
+        <source>General notes about the current selection</source>
+        <translation>Informații generale legate de selecția curentă</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="92"/>
+        <location filename="../desktop-widgets/maintab.ui" line="646"/>
+        <location filename="../build/ui_maintab.h" line="947"/>
+        <location filename="../build/ui_maintab.h" line="967"/>
+        <source>Date</source>
+        <translation>Dată</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="102"/>
+        <location filename="../build/ui_maintab.h" line="948"/>
+        <source>Time</source>
+        <translation>Timp</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="112"/>
+        <location filename="../desktop-widgets/maintab.ui" line="836"/>
+        <location filename="../build/ui_maintab.h" line="949"/>
+        <location filename="../build/ui_maintab.h" line="987"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="306"/>
+        <source>Air temp.</source>
+        <translation>Temperatura aerului</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="122"/>
+        <location filename="../desktop-widgets/maintab.ui" line="855"/>
+        <location filename="../build/ui_maintab.h" line="950"/>
+        <location filename="../build/ui_maintab.h" line="989"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="307"/>
+        <source>Water temp.</source>
+        <translation>Temperatura apei</translation>
     </message>
-</context>
-<context>
-    <name>MainTab</name>
     <message>
         <location filename="../desktop-widgets/maintab.ui" line="184"/>
         <location filename="../build/ui_maintab.h" line="951"/>
@@ -4099,6 +4220,17 @@ p, li { white-space: pre-wrap; }
         <translation>Locație</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="214"/>
+        <source>Edit dive site</source>
+        <translation>Editarea locației de scufundare</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="217"/>
+        <location filename="../build/ui_maintab.h" line="953"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="252"/>
         <location filename="../build/ui_maintab.h" line="954"/>
         <source>Divemaster</source>
@@ -4111,12 +4243,6 @@ p, li { white-space: pre-wrap; }
         <translation>Însoțitor</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.ui" line="387"/>
-        <location filename="../build/ui_maintab.h" line="959"/>
-        <source>Tags</source>
-        <translation>Etichete</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/maintab.ui" line="308"/>
         <location filename="../build/ui_maintab.h" line="956"/>
         <source>Rating</source>
@@ -4135,57 +4261,18 @@ p, li { white-space: pre-wrap; }
         <translation>Costum</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="387"/>
+        <location filename="../build/ui_maintab.h" line="959"/>
+        <source>Tags</source>
+        <translation>Etichete</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="397"/>
         <location filename="../build/ui_maintab.h" line="960"/>
         <source>Dive mode</source>
         <translation>Mod de scufundare</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.ui" line="112"/>
-        <location filename="../desktop-widgets/maintab.ui" line="836"/>
-        <location filename="../build/ui_maintab.h" line="949"/>
-        <location filename="../build/ui_maintab.h" line="987"/>
-        <location filename="../desktop-widgets/maintab.cpp" line="306"/>
-        <source>Air temp.</source>
-        <translation>Temperatura aerului</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="122"/>
-        <location filename="../desktop-widgets/maintab.ui" line="855"/>
-        <location filename="../build/ui_maintab.h" line="950"/>
-        <location filename="../build/ui_maintab.h" line="989"/>
-        <location filename="../desktop-widgets/maintab.cpp" line="307"/>
-        <source>Water temp.</source>
-        <translation>Temperatura apei</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="18"/>
-        <location filename="../desktop-widgets/maintab.ui" line="439"/>
-        <location filename="../build/ui_maintab.h" line="961"/>
-        <location filename="../build/ui_maintab.h" line="963"/>
-        <location filename="../desktop-widgets/maintab.cpp" line="539"/>
-        <location filename="../desktop-widgets/maintab.cpp" line="571"/>
-        <source>Notes</source>
-        <translation>Notițe</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="21"/>
-        <location filename="../build/ui_maintab.h" line="964"/>
-        <source>General notes about the current selection</source>
-        <translation>Informații generale legate de selecția curentă</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="214"/>
-        <source>Edit dive site</source>
-        <translation>Editarea locației de scufundare</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="217"/>
-        <location filename="../build/ui_maintab.h" line="953"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/maintab.ui" line="491"/>
         <location filename="../build/ui_maintab.h" line="965"/>
         <source>Equipment</source>
@@ -4210,6 +4297,12 @@ p, li { white-space: pre-wrap; }
         <translation>Infomații scufundare</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="665"/>
+        <location filename="../build/ui_maintab.h" line="969"/>
+        <source>Interval</source>
+        <translation>Interval</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="684"/>
         <location filename="../build/ui_maintab.h" line="971"/>
         <source>Gases used</source>
@@ -4222,18 +4315,38 @@ p, li { white-space: pre-wrap; }
         <translation>Gaz consumat</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="722"/>
+        <location filename="../desktop-widgets/maintab.ui" line="1094"/>
+        <location filename="../build/ui_maintab.h" line="975"/>
+        <location filename="../build/ui_maintab.h" line="1003"/>
+        <source>SAC</source>
+        <translation>SAC</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="741"/>
         <location filename="../build/ui_maintab.h" line="977"/>
         <source>CNS</source>
         <translation>CNS</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="760"/>
+        <location filename="../build/ui_maintab.h" line="979"/>
+        <source>OTU</source>
+        <translation>OTU</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="779"/>
         <location filename="../build/ui_maintab.h" line="981"/>
         <source>Max. depth</source>
         <translation>Adâncime maximă</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="798"/>
+        <location filename="../build/ui_maintab.h" line="983"/>
+        <source>Avg. depth</source>
+        <translation>Adâncime medie</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="817"/>
         <location filename="../build/ui_maintab.h" line="985"/>
         <source>Air pressure</source>
@@ -4246,82 +4359,6 @@ p, li { white-space: pre-wrap; }
         <translation>Timpul scufundării</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.ui" line="933"/>
-        <location filename="../build/ui_maintab.h" line="1007"/>
-        <source>Simple statistics about the selection</source>
-        <translation>Statistici legate de selecția curentă</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1039"/>
-        <location filename="../build/ui_maintab.h" line="999"/>
-        <source>Total time</source>
-        <translation>Timp total</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1106"/>
-        <location filename="../build/ui_maintab.h" line="1004"/>
-        <source>Gas consumption</source>
-        <translation>Gaz consumat</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1151"/>
-        <location filename="../build/ui_maintab.h" line="1009"/>
-        <source>All photos from the current selection</source>
-        <translation>Toate pozele din selecția curentă</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1177"/>
-        <location filename="../build/ui_maintab.h" line="1010"/>
-        <source>Extra data</source>
-        <translation>Date adiționale</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1180"/>
-        <location filename="../build/ui_maintab.h" line="1011"/>
-        <source>Adittional data from the dive computer</source>
-        <translation>Date adiționale din dispozitivul de scufundări</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="92"/>
-        <location filename="../desktop-widgets/maintab.ui" line="646"/>
-        <location filename="../build/ui_maintab.h" line="947"/>
-        <location filename="../build/ui_maintab.h" line="967"/>
-        <source>Date</source>
-        <translation>Dată</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="102"/>
-        <location filename="../build/ui_maintab.h" line="948"/>
-        <source>Time</source>
-        <translation>Timp</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="665"/>
-        <location filename="../build/ui_maintab.h" line="969"/>
-        <source>Interval</source>
-        <translation>Interval</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="722"/>
-        <location filename="../desktop-widgets/maintab.ui" line="1094"/>
-        <location filename="../build/ui_maintab.h" line="975"/>
-        <location filename="../build/ui_maintab.h" line="1003"/>
-        <source>SAC</source>
-        <translation>SAC</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="798"/>
-        <location filename="../build/ui_maintab.h" line="983"/>
-        <source>Avg. depth</source>
-        <translation>Adâncime medie</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="760"/>
-        <location filename="../build/ui_maintab.h" line="979"/>
-        <source>OTU</source>
-        <translation>OTU</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/maintab.ui" line="893"/>
         <location filename="../build/ui_maintab.h" line="993"/>
         <source>Salinity</source>
@@ -4334,22 +4371,34 @@ p, li { white-space: pre-wrap; }
         <translation>Statistici</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="933"/>
+        <location filename="../build/ui_maintab.h" line="1007"/>
+        <source>Simple statistics about the selection</source>
+        <translation>Statistici legate de selecția curentă</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="986"/>
         <location filename="../build/ui_maintab.h" line="996"/>
         <source>Depth</source>
         <translation>Adâncime</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="998"/>
+        <location filename="../build/ui_maintab.h" line="997"/>
+        <source>Duration</source>
+        <translation>Durată</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="1027"/>
         <location filename="../build/ui_maintab.h" line="998"/>
         <source>Temperature</source>
         <translation>Temperatură</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.ui" line="998"/>
-        <location filename="../build/ui_maintab.h" line="997"/>
-        <source>Duration</source>
-        <translation>Durată</translation>
+        <location filename="../desktop-widgets/maintab.ui" line="1039"/>
+        <location filename="../build/ui_maintab.h" line="999"/>
+        <source>Total time</source>
+        <translation>Timp total</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/maintab.ui" line="1058"/>
@@ -4358,20 +4407,34 @@ p, li { white-space: pre-wrap; }
         <translation>Scufundări</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="1106"/>
+        <location filename="../build/ui_maintab.h" line="1004"/>
+        <source>Gas consumption</source>
+        <translation>Gaz consumat</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="1148"/>
         <location filename="../build/ui_maintab.h" line="1008"/>
         <source>Photos</source>
         <translation>Fotografii</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.cpp" line="88"/>
-        <source>Cylinders</source>
-        <translation>Tub</translation>
+        <location filename="../desktop-widgets/maintab.ui" line="1151"/>
+        <location filename="../build/ui_maintab.h" line="1009"/>
+        <source>All photos from the current selection</source>
+        <translation>Toate pozele din selecția curentă</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.cpp" line="92"/>
-        <source>Weights</source>
-        <translation>Greutăți</translation>
+        <location filename="../desktop-widgets/maintab.ui" line="1177"/>
+        <location filename="../build/ui_maintab.h" line="1010"/>
+        <source>Extra data</source>
+        <translation>Date adiționale</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="1180"/>
+        <location filename="../build/ui_maintab.h" line="1011"/>
+        <source>Adittional data from the dive computer</source>
+        <translation>Date adiționale din dispozitivul de scufundări</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/maintab.cpp" line="63"/>
@@ -4384,11 +4447,21 @@ p, li { white-space: pre-wrap; }
         <translation>Renunță la modificări</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.cpp" line="88"/>
+        <source>Cylinders</source>
+        <translation>Tub</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.cpp" line="89"/>
         <source>Add cylinder</source>
         <translation>Adaugă tub</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.cpp" line="92"/>
+        <source>Weights</source>
+        <translation>Greutăți</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.cpp" line="93"/>
         <source>Add weight system</source>
         <translation>Adaugă sistem de greutate</translation>
@@ -4580,659 +4653,685 @@ mixate cu aer și folosite:</translation>
         <translation>&amp;Fișier</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="455"/>
-        <location filename="../build/ui_mainwindow.h" line="534"/>
-        <source>Export dive logs</source>
-        <translation>Exportați înregistrările scufundărilor</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="510"/>
-        <location filename="../build/ui_mainwindow.h" line="542"/>
-        <source>Toggle pHe graph</source>
-        <translation>Comutați graficul pHe</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="546"/>
-        <location filename="../build/ui_mainwindow.h" line="545"/>
-        <source>Toggle calculating all tissues</source>
-        <translation>Comutați calculul țesăturilor</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="522"/>
-        <location filename="../build/ui_mainwindow.h" line="543"/>
-        <source>Toggle DC reported ceiling</source>
-        <translation>Comutați rapoartele plafonului DC</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="534"/>
-        <location filename="../build/ui_mainwindow.h" line="544"/>
-        <source>Toggle calculated ceiling</source>
-        <translation>Comutați plafoanele calculate</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="606"/>
-        <location filename="../build/ui_mainwindow.h" line="550"/>
-        <source>Toggle NDL, TTS</source>
-        <translation>Comutați NDL, TTS</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="558"/>
-        <location filename="../build/ui_mainwindow.h" line="546"/>
-        <source>Toggle calculated ceiling with 3m increments</source>
-        <translation>Comutați plafoanele calculate incremental cu 3m</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="463"/>
-        <location filename="../build/ui_mainwindow.h" line="537"/>
-        <source>Configure &amp;dive computer</source>
-        <translation>Configurați &amp;calculatorul de scufundări</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="570"/>
-        <location filename="../build/ui_mainwindow.h" line="547"/>
-        <source>Toggle heart rate</source>
-        <translation>Comutați pulsul</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="582"/>
-        <location filename="../build/ui_mainwindow.h" line="548"/>
-        <source>Toggle MOD</source>
-        <translation>Comutați MOD</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="594"/>
-        <location filename="../build/ui_mainwindow.h" line="549"/>
-        <source>Toggle EAD, END, EADD</source>
-        <translation>Comutați EAD, END, EADD</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="618"/>
-        <location filename="../build/ui_mainwindow.h" line="551"/>
-        <source>Toggle SAC rate</source>
-        <translation>Comutați rata SAC</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="630"/>
-        <location filename="../build/ui_mainwindow.h" line="552"/>
-        <source>Toggle ruler</source>
-        <translation>Comutați conducătorul</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="86"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="87"/>
         <location filename="../build/ui_mainwindow.h" line="569"/>
         <source>&amp;Log</source>
         <translation>&amp;Log</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="105"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="104"/>
         <location filename="../build/ui_mainwindow.h" line="570"/>
         <source>&amp;View</source>
         <translation>&amp;Afișare</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="121"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="120"/>
         <location filename="../build/ui_mainwindow.h" line="571"/>
         <source>&amp;Help</source>
         <translation>&amp;Ajutor</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="130"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="129"/>
         <location filename="../build/ui_mainwindow.h" line="572"/>
         <source>&amp;Import</source>
         <translation>&amp;Importați</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="139"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="138"/>
         <location filename="../build/ui_mainwindow.h" line="573"/>
         <source>&amp;Edit</source>
         <translation>&amp;Editează</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="144"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="143"/>
         <source>Share on</source>
         <translation>&amp;Partajează</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="158"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="157"/>
         <location filename="../build/ui_mainwindow.h" line="453"/>
         <source>&amp;New logbook</source>
         <translation>&amp;Jurnal nou</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="161"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="160"/>
         <location filename="../build/ui_mainwindow.h" line="455"/>
         <source>New</source>
         <translation>Nou</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="164"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="163"/>
         <location filename="../build/ui_mainwindow.h" line="457"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="169"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="168"/>
         <location filename="../build/ui_mainwindow.h" line="458"/>
         <source>&amp;Open logbook</source>
         <translation>&amp;Deschide jurnal</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="172"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="171"/>
         <location filename="../build/ui_mainwindow.h" line="460"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="508"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="502"/>
         <source>Open</source>
         <translation>Deschide</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="175"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="174"/>
         <location filename="../build/ui_mainwindow.h" line="462"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="180"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="179"/>
         <location filename="../build/ui_mainwindow.h" line="463"/>
         <source>&amp;Save</source>
         <translation>&amp;Salvează</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="183"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="182"/>
         <location filename="../build/ui_mainwindow.h" line="465"/>
         <source>Save</source>
         <translation>Salvează</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="186"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="185"/>
         <location filename="../build/ui_mainwindow.h" line="467"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="191"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="190"/>
         <location filename="../build/ui_mainwindow.h" line="468"/>
         <source>Sa&amp;ve as</source>
         <translation>Sa&amp;lvează ca</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="194"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="193"/>
         <location filename="../build/ui_mainwindow.h" line="470"/>
         <source>Save as</source>
         <translation>Salvează ca</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="197"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="196"/>
         <location filename="../build/ui_mainwindow.h" line="472"/>
         <source>Ctrl+Shift+S</source>
         <translation>Ctrl+Shift+S</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="202"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="201"/>
         <location filename="../build/ui_mainwindow.h" line="473"/>
         <source>&amp;Close</source>
         <translation>&amp;Închide</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="205"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="204"/>
         <location filename="../build/ui_mainwindow.h" line="475"/>
         <source>Close</source>
         <translation>Închide</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="208"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="207"/>
         <location filename="../build/ui_mainwindow.h" line="477"/>
         <source>Ctrl+W</source>
         <translation>Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="221"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="212"/>
+        <location filename="../build/ui_mainwindow.h" line="478"/>
+        <source>&amp;Print</source>
+        <translation>&amp;Printează</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="215"/>
+        <location filename="../build/ui_mainwindow.h" line="479"/>
+        <source>Ctrl+P</source>
+        <translation>Ctrl+P</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="220"/>
         <location filename="../build/ui_mainwindow.h" line="480"/>
         <source>P&amp;references</source>
         <translation>P&amp;referințe</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="251"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="223"/>
+        <location filename="../build/ui_mainwindow.h" line="481"/>
+        <source>Ctrl+,</source>
+        <translation>Ctrl+,</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="231"/>
+        <location filename="../build/ui_mainwindow.h" line="482"/>
+        <source>&amp;Quit</source>
+        <translation>&amp;Închide</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="234"/>
+        <location filename="../build/ui_mainwindow.h" line="483"/>
+        <source>Ctrl+Q</source>
+        <translation>Ctrl+Q</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="242"/>
+        <location filename="../build/ui_mainwindow.h" line="484"/>
+        <source>Import from &amp;dive computer</source>
+        <translation>Importă din computerul de &amp;scufundări</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="245"/>
+        <location filename="../build/ui_mainwindow.h" line="485"/>
+        <source>Ctrl+D</source>
+        <translation>Ctrl+D</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="250"/>
         <location filename="../build/ui_mainwindow.h" line="486"/>
         <source>Import &amp;GPS data from Subsurface web service</source>
         <translation>Importă &amp;datele GPS din serviciul web Subsurface</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="259"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="253"/>
+        <location filename="../build/ui_mainwindow.h" line="487"/>
+        <source>Ctrl+G</source>
+        <translation>Ctrl+G</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="258"/>
         <location filename="../build/ui_mainwindow.h" line="488"/>
         <source>Edit device &amp;names</source>
         <translation>Editează numele &amp;dispozitivelor</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="272"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="263"/>
+        <location filename="../build/ui_mainwindow.h" line="489"/>
+        <source>&amp;Add dive</source>
+        <translation>&amp;Adăugați scufundări</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="266"/>
+        <location filename="../build/ui_mainwindow.h" line="490"/>
+        <source>Ctrl++</source>
+        <translation>Ctr++</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="271"/>
         <location filename="../build/ui_mainwindow.h" line="491"/>
         <source>&amp;Edit dive</source>
         <translation>&amp;Editează scufundarea</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="277"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="276"/>
         <location filename="../build/ui_mainwindow.h" line="492"/>
         <source>&amp;Copy dive components</source>
         <translation>&amp;Copiază componetele scufundării</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="280"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="279"/>
         <location filename="../build/ui_mainwindow.h" line="493"/>
         <source>Ctrl+C</source>
         <translation>Ctrl+C</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="285"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="284"/>
         <location filename="../build/ui_mainwindow.h" line="494"/>
         <source>&amp;Paste dive components</source>
         <translation>&amp;Lipește componentele scufundării</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="288"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="287"/>
         <location filename="../build/ui_mainwindow.h" line="495"/>
         <source>Ctrl+V</source>
         <translation>Ctrl+V</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="325"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="292"/>
+        <location filename="../build/ui_mainwindow.h" line="496"/>
+        <source>&amp;Renumber</source>
+        <translation>&amp;Renumerotează</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="295"/>
+        <location filename="../build/ui_mainwindow.h" line="497"/>
+        <source>Ctrl+R</source>
+        <translation>Ctrl+R</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="303"/>
+        <location filename="../build/ui_mainwindow.h" line="498"/>
+        <source>Auto &amp;group</source>
+        <translation>Grupare &amp;automată</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="308"/>
+        <location filename="../build/ui_mainwindow.h" line="499"/>
+        <source>&amp;Yearly statistics</source>
+        <translation>&amp;Statistici anuale</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="311"/>
+        <location filename="../build/ui_mainwindow.h" line="500"/>
+        <source>Ctrl+Y</source>
+        <translation>Ctrl+Y</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="316"/>
+        <location filename="../build/ui_mainwindow.h" line="501"/>
+        <source>&amp;Dive list</source>
+        <translation>&amp;Lista scufundărilor</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="319"/>
+        <location filename="../build/ui_mainwindow.h" line="502"/>
+        <source>Ctrl+2</source>
+        <translation>Ctrl+2</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="324"/>
         <location filename="../build/ui_mainwindow.h" line="503"/>
         <source>&amp;Profile</source>
         <translation>&amp;Profil</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="333"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="327"/>
+        <location filename="../build/ui_mainwindow.h" line="504"/>
+        <source>Ctrl+3</source>
+        <translation>Ctrl+3</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="332"/>
         <location filename="../build/ui_mainwindow.h" line="505"/>
         <source>&amp;Info</source>
         <translation>&amp;Informații</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="341"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="335"/>
+        <location filename="../build/ui_mainwindow.h" line="506"/>
+        <source>Ctrl+4</source>
+        <translation>Ctrl+4</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="340"/>
         <location filename="../build/ui_mainwindow.h" line="507"/>
         <source>&amp;All</source>
         <translation>&amp;Toate</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="357"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="343"/>
+        <location filename="../build/ui_mainwindow.h" line="508"/>
+        <source>Ctrl+1</source>
+        <translation>Ctrl+1</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="348"/>
+        <location filename="../build/ui_mainwindow.h" line="509"/>
+        <source>P&amp;revious DC</source>
+        <translation>DC&amp; anterior</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="351"/>
+        <location filename="../build/ui_mainwindow.h" line="510"/>
+        <source>Left</source>
+        <translation>Stânga</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="356"/>
         <location filename="../build/ui_mainwindow.h" line="511"/>
         <source>&amp;Next DC</source>
         <translation>&amp;Următorul DC</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="365"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="359"/>
+        <location filename="../build/ui_mainwindow.h" line="512"/>
+        <source>Right</source>
+        <translation>Dreapta</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="364"/>
         <location filename="../build/ui_mainwindow.h" line="513"/>
         <source>&amp;About Subsurface</source>
         <translation>&amp;Despre Subsurface</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="381"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="372"/>
+        <location filename="../build/ui_mainwindow.h" line="514"/>
+        <source>User &amp;manual</source>
+        <translation>Manual &amp;utilizator</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="375"/>
+        <location filename="../build/ui_mainwindow.h" line="515"/>
+        <source>F1</source>
+        <translation>F1</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="380"/>
         <location filename="../build/ui_mainwindow.h" line="516"/>
         <source>&amp;Globe</source>
         <translation>&amp;Glob</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="403"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="383"/>
+        <location filename="../build/ui_mainwindow.h" line="517"/>
+        <source>Ctrl+5</source>
+        <translation>Ctrl+5</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="388"/>
+        <location filename="../build/ui_mainwindow.h" line="518"/>
+        <source>P&amp;lan dive</source>
+        <translation>P&amp;lanul scufundării</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="391"/>
+        <location filename="../build/ui_mainwindow.h" line="519"/>
+        <source>Ctrl+L</source>
+        <translation>Ctrl+L</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="396"/>
+        <location filename="../build/ui_mainwindow.h" line="520"/>
+        <source>&amp;Import log files</source>
+        <translation>&amp;Importați fișierele cu înregistrări</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="399"/>
+        <location filename="../build/ui_mainwindow.h" line="522"/>
+        <source>Import divelog files from other applications</source>
+        <translation>&amp;Importați înregistrările scufundărilor din alte aplicații</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="402"/>
         <location filename="../build/ui_mainwindow.h" line="524"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="408"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="407"/>
         <location filename="../build/ui_mainwindow.h" line="525"/>
         <source>Import &amp;from divelogs.de</source>
         <translation>Importă &amp;de pe divelogs.de</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="416"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="415"/>
         <location filename="../build/ui_mainwindow.h" line="526"/>
         <source>&amp;Full screen</source>
         <translation>&amp;Expandare ecran</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="419"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="418"/>
         <location filename="../build/ui_mainwindow.h" line="528"/>
         <source>Toggle full screen</source>
         <translation>Comutați ecranul expandat</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="447"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="421"/>
+        <location filename="../build/ui_mainwindow.h" line="530"/>
+        <source>F11</source>
+        <translation>F11</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="446"/>
         <location filename="../build/ui_mainwindow.h" line="531"/>
         <source>&amp;Check for updates</source>
         <translation>Verifică ultimele actualizări</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="452"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="451"/>
         <location filename="../build/ui_mainwindow.h" line="532"/>
         <source>&amp;Export</source>
         <translation>&amp;Exportă</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="458"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="454"/>
+        <location filename="../build/ui_mainwindow.h" line="534"/>
+        <source>Export dive logs</source>
+        <translation>Exportați înregistrările scufundărilor</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="457"/>
         <location filename="../build/ui_mainwindow.h" line="536"/>
         <source>Ctrl+E</source>
         <translation>Ctrl+E</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="466"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="462"/>
+        <location filename="../build/ui_mainwindow.h" line="537"/>
+        <source>Configure &amp;dive computer</source>
+        <translation>Configurați &amp;calculatorul de scufundări</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="465"/>
         <location filename="../build/ui_mainwindow.h" line="538"/>
         <source>Ctrl+Shift+C</source>
         <translation>Ctrl+Shift+C</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="474"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="473"/>
         <location filename="../build/ui_mainwindow.h" line="539"/>
         <source>Edit &amp;dive in planner</source>
         <translation>Editează &amp;scufundarea din planificator</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="486"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="485"/>
         <location filename="../build/ui_mainwindow.h" line="540"/>
         <source>Toggle pO₂ graph</source>
         <translation>Comutați graficul pO₂</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="498"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="497"/>
         <location filename="../build/ui_mainwindow.h" line="541"/>
         <source>Toggle pN₂ graph</source>
         <translation>Comutați graficul pN₂</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="642"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="509"/>
+        <location filename="../build/ui_mainwindow.h" line="542"/>
+        <source>Toggle pHe graph</source>
+        <translation>Comutați graficul pHe</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="521"/>
+        <location filename="../build/ui_mainwindow.h" line="543"/>
+        <source>Toggle DC reported ceiling</source>
+        <translation>Comutați rapoartele plafonului DC</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="533"/>
+        <location filename="../build/ui_mainwindow.h" line="544"/>
+        <source>Toggle calculated ceiling</source>
+        <translation>Comutați plafoanele calculate</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="545"/>
+        <location filename="../build/ui_mainwindow.h" line="545"/>
+        <source>Toggle calculating all tissues</source>
+        <translation>Comutați calculul țesăturilor</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="557"/>
+        <location filename="../build/ui_mainwindow.h" line="546"/>
+        <source>Toggle calculated ceiling with 3m increments</source>
+        <translation>Comutați plafoanele calculate incremental cu 3m</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="569"/>
+        <location filename="../build/ui_mainwindow.h" line="547"/>
+        <source>Toggle heart rate</source>
+        <translation>Comutați pulsul</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="581"/>
+        <location filename="../build/ui_mainwindow.h" line="548"/>
+        <source>Toggle MOD</source>
+        <translation>Comutați MOD</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="593"/>
+        <location filename="../build/ui_mainwindow.h" line="549"/>
+        <source>Toggle EAD, END, EADD</source>
+        <translation>Comutați EAD, END, EADD</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="605"/>
+        <location filename="../build/ui_mainwindow.h" line="550"/>
+        <source>Toggle NDL, TTS</source>
+        <translation>Comutați NDL, TTS</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="617"/>
+        <location filename="../build/ui_mainwindow.h" line="551"/>
+        <source>Toggle SAC rate</source>
+        <translation>Comutați rata SAC</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="629"/>
+        <location filename="../build/ui_mainwindow.h" line="552"/>
+        <source>Toggle ruler</source>
+        <translation>Comutați conducătorul</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="641"/>
         <location filename="../build/ui_mainwindow.h" line="553"/>
         <source>Scale graph</source>
         <translation>Scalați graficul</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="654"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="653"/>
         <location filename="../build/ui_mainwindow.h" line="554"/>
         <source>Toggle pictures</source>
         <translation>Comutați imaginile</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="666"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="665"/>
         <location filename="../build/ui_mainwindow.h" line="555"/>
         <source>Toggle tank bar</source>
         <translation>Comutați bara rezervorului</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="674"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="673"/>
         <location filename="../build/ui_mainwindow.h" line="556"/>
         <source>&amp;Filter divelist</source>
         <translation>&amp;Filtrați lista scufundărilor</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="689"/>
-        <location filename="../build/ui_mainwindow.h" line="558"/>
-        <source>Toggle tissue graph</source>
-        <translation>Comutați graficul țesuturilor</translation>
+        <location filename="../desktop-widgets/mainwindow.ui" line="676"/>
+        <location filename="../build/ui_mainwindow.h" line="557"/>
+        <source>Ctrl+F</source>
+        <translation>Ctrl+F</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="694"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="688"/>
+        <source>Toggle tissue heat-map</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="693"/>
         <location filename="../build/ui_mainwindow.h" line="559"/>
         <source>User &amp;survey</source>
         <translation>Chestionar &amp;utilizator</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="699"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="698"/>
         <location filename="../build/ui_mainwindow.h" line="560"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="238"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="231"/>
         <source>&amp;Undo</source>
         <translation>&amp;Anulează</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="702"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="701"/>
         <location filename="../build/ui_mainwindow.h" line="561"/>
         <source>Ctrl+Z</source>
         <translation>Ctrl+Z</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="707"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="706"/>
         <location filename="../build/ui_mainwindow.h" line="562"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="239"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="232"/>
         <source>&amp;Redo</source>
         <translation>&amp;Refă</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="710"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="709"/>
         <location filename="../build/ui_mainwindow.h" line="563"/>
         <source>Ctrl+Shift+Z</source>
         <translation>Ctrl+Shift+Z</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="715"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="714"/>
         <location filename="../build/ui_mainwindow.h" line="564"/>
         <source>&amp;Find moved images</source>
         <translation>&amp;Caută imaginile mutate</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="720"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="719"/>
         <source>Open c&amp;loud storage</source>
         <translation>Deschide stocarea în cloud</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="725"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="724"/>
         <source>Save to clo&amp;ud storage</source>
         <translation>Salvează în cloud</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="730"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="729"/>
         <location filename="../build/ui_mainwindow.h" line="567"/>
         <source>&amp;Manage dive sites</source>
         <translation>&amp;Administrează locațiile scufundărilor</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="735"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="734"/>
         <source>Dive Site &amp;Edit</source>
         <translation>Editarea locației scufundării</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="740"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="739"/>
         <source>Facebook</source>
         <translation>Facebook</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="745"/>
-        <source>Add GPS location here</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="744"/>
+        <source>Take cloud storage online</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="677"/>
-        <location filename="../build/ui_mainwindow.h" line="557"/>
-        <source>Ctrl+F</source>
-        <translation>Ctrl+F</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="213"/>
-        <location filename="../build/ui_mainwindow.h" line="478"/>
-        <source>&amp;Print</source>
-        <translation>&amp;Printează</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="224"/>
-        <location filename="../build/ui_mainwindow.h" line="481"/>
-        <source>Ctrl+,</source>
-        <translation>Ctrl+,</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="232"/>
-        <location filename="../build/ui_mainwindow.h" line="482"/>
-        <source>&amp;Quit</source>
-        <translation>&amp;Închide</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="243"/>
-        <location filename="../build/ui_mainwindow.h" line="484"/>
-        <source>Import from &amp;dive computer</source>
-        <translation>Importă din computerul de &amp;scufundări</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="254"/>
-        <location filename="../build/ui_mainwindow.h" line="487"/>
-        <source>Ctrl+G</source>
-        <translation>Ctrl+G</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="267"/>
-        <location filename="../build/ui_mainwindow.h" line="490"/>
-        <source>Ctrl++</source>
-        <translation>Ctr++</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="293"/>
-        <location filename="../build/ui_mainwindow.h" line="496"/>
-        <source>&amp;Renumber</source>
-        <translation>&amp;Renumerotează</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="296"/>
-        <location filename="../build/ui_mainwindow.h" line="497"/>
-        <source>Ctrl+R</source>
-        <translation>Ctrl+R</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="312"/>
-        <location filename="../build/ui_mainwindow.h" line="500"/>
-        <source>Ctrl+Y</source>
-        <translation>Ctrl+Y</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="392"/>
-        <location filename="../build/ui_mainwindow.h" line="519"/>
-        <source>Ctrl+L</source>
-        <translation>Ctrl+L</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="216"/>
-        <location filename="../build/ui_mainwindow.h" line="479"/>
-        <source>Ctrl+P</source>
-        <translation>Ctrl+P</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="235"/>
-        <location filename="../build/ui_mainwindow.h" line="483"/>
-        <source>Ctrl+Q</source>
-        <translation>Ctrl+Q</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="246"/>
-        <location filename="../build/ui_mainwindow.h" line="485"/>
-        <source>Ctrl+D</source>
-        <translation>Ctrl+D</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="264"/>
-        <location filename="../build/ui_mainwindow.h" line="489"/>
-        <source>&amp;Add dive</source>
-        <translation>&amp;Adăugați scufundări</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="304"/>
-        <location filename="../build/ui_mainwindow.h" line="498"/>
-        <source>Auto &amp;group</source>
-        <translation>Grupare &amp;automată</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="309"/>
-        <location filename="../build/ui_mainwindow.h" line="499"/>
-        <source>&amp;Yearly statistics</source>
-        <translation>&amp;Statistici anuale</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="317"/>
-        <location filename="../build/ui_mainwindow.h" line="501"/>
-        <source>&amp;Dive list</source>
-        <translation>&amp;Lista scufundărilor</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="320"/>
-        <location filename="../build/ui_mainwindow.h" line="502"/>
-        <source>Ctrl+2</source>
-        <translation>Ctrl+2</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="328"/>
-        <location filename="../build/ui_mainwindow.h" line="504"/>
-        <source>Ctrl+3</source>
-        <translation>Ctrl+3</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="336"/>
-        <location filename="../build/ui_mainwindow.h" line="506"/>
-        <source>Ctrl+4</source>
-        <translation>Ctrl+4</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="344"/>
-        <location filename="../build/ui_mainwindow.h" line="508"/>
-        <source>Ctrl+1</source>
-        <translation>Ctrl+1</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="349"/>
-        <location filename="../build/ui_mainwindow.h" line="509"/>
-        <source>P&amp;revious DC</source>
-        <translation>DC&amp; anterior</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="352"/>
-        <location filename="../build/ui_mainwindow.h" line="510"/>
-        <source>Left</source>
-        <translation>Stânga</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="360"/>
-        <location filename="../build/ui_mainwindow.h" line="512"/>
-        <source>Right</source>
-        <translation>Dreapta</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="373"/>
-        <location filename="../build/ui_mainwindow.h" line="514"/>
-        <source>User &amp;manual</source>
-        <translation>Manual &amp;utilizator</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="376"/>
-        <location filename="../build/ui_mainwindow.h" line="515"/>
-        <source>F1</source>
-        <translation>F1</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="384"/>
-        <location filename="../build/ui_mainwindow.h" line="517"/>
-        <source>Ctrl+5</source>
-        <translation>Ctrl+5</translation>
+        <location filename="../build/ui_mainwindow.h" line="558"/>
+        <source>Toggle tissue graph</source>
+        <translation>Comutați graficul țesuturilor</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="389"/>
-        <location filename="../build/ui_mainwindow.h" line="518"/>
-        <source>P&amp;lan dive</source>
-        <translation>P&amp;lanul scufundării</translation>
+        <location filename="../build/ui_mainwindow.h" line="565"/>
+        <source>Open cloud storage</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="397"/>
-        <location filename="../build/ui_mainwindow.h" line="520"/>
-        <source>&amp;Import log files</source>
-        <translation>&amp;Importați fișierele cu înregistrări</translation>
+        <location filename="../build/ui_mainwindow.h" line="566"/>
+        <source>Save to cloud storage</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="400"/>
-        <location filename="../build/ui_mainwindow.h" line="522"/>
-        <source>Import divelog files from other applications</source>
-        <translation>&amp;Importați înregistrările scufundărilor din alte aplicații</translation>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="331"/>
+        <source>Connect to</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="422"/>
-        <location filename="../build/ui_mainwindow.h" line="530"/>
-        <source>F11</source>
-        <translation>F11</translation>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="493"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="538"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1545"/>
+        <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="../desktop-widgets/mainwindow.cpp" line="505"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="499"/>
         <source>Open file</source>
         <translation>Deschideți fișier</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="509"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="503"/>
         <location filename="../desktop-widgets/mainwindow.cpp" line="614"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1972"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1978"/>
         <source>Cancel</source>
         <translation>Anulează</translation>
     </message>
@@ -5252,6 +5351,16 @@ mixate cu aer și folosite:</translation>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="649"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="796"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="977"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="983"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1849"/>
+        <source>Warning</source>
+        <translation>Avertizare</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="674"/>
         <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>
@@ -5267,124 +5376,97 @@ mixate cu aer și folosite:</translation>
         <translation>Printați tabelul de execuție</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="982"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
+        <source>Trying to replan a dive that&apos;s not a planned dive.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="977"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1849"/>
+        <source>Please, first finish the current edition before trying to do another.</source>
+        <translation>Vă rugăm să terminați editarea curentă înainte de a începe una nouă.</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="983"/>
         <source>Trying to edit a dive that&apos;s not a manually added dive.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1243"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1030"/>
+        <source>Yearly statistics</source>
+        <translation>Statistici anuale</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1244"/>
         <source>Do you want to save the changes that you made in the file %1?</source>
         <translation>Doriți să salvați modificările efectuare în fișierul %1?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1246"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1247"/>
         <source>Do you want to save the changes that you made in the data file?</source>
         <translation>Doriți să salvați modificările efectuare în fișierul de date?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1251"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1252"/>
         <source>Save changes?</source>
         <translation>Doriți să salvați modificările?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1587"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1253"/>
+        <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="../desktop-widgets/mainwindow.cpp" line="1572"/>
         <source>Save file as</source>
         <translation>Salvează ca</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1682"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1573"/>
+        <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
+        <translation>Fișiere XML Subsurface (*.ssrf *.xml *.XML)</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1670"/>
+        <source>[local cache for] %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1672"/>
         <source>[cloud storage for] %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1782"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1788"/>
         <source>Opening datafile from older version</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1783"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1789"/>
         <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly.
 Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1794"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1800"/>
         <source>Open dive log file</source>
         <translation>Deschideți înregistrările scufundărilor</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1795"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1801"/>
         <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1972"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1978"/>
         <source>Contacting cloud service...</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1252"/>
-        <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="../desktop-widgets/mainwindow.cpp" line="649"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="796"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="976"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="982"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/>
-        <source>Warning</source>
-        <translation>Avertizare</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="499"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="544"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1560"/>
-        <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="../desktop-widgets/mainwindow.cpp" line="338"/>
-        <source>Connect to</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
-        <source>Trying to replan a dive that&apos;s not a planned dive.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1029"/>
-        <source>Yearly statistics</source>
-        <translation>Statistici anuale</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1588"/>
-        <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
-        <translation>Fișiere XML Subsurface (*.ssrf *.xml *.XML)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="976"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/>
-        <source>Please, first finish the current edition before trying to do another.</source>
-        <translation>Vă rugăm să terminați editarea curentă înainte de a începe una nouă.</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_mainwindow.h" line="565"/>
-        <source>Open cloud storage</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../build/ui_mainwindow.h" line="566"/>
-        <source>Save to cloud storage</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>MultiFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="733"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="731"/>
         <source>Filter shows %1 (of %2) dives</source>
         <translation>Filtrele afișează %1 (din %2) scufundări</translation>
     </message>
@@ -5392,12 +5474,12 @@ Subsurface has already tried to pre-populate the data but it might be worth whil
 <context>
     <name>OstcFirmwareCheck</name>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="269"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="271"/>
         <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source>
         <translation>Ar trebui să actualizați versiunea de firmware de pe calculatorul de scufundări: versiunea curentă este %1 în timp ce ultima versiune stabilă este %2</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="273"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="275"/>
         <source>
 
 Please start Bluetooth on your OSTC Sport and do the same preparations as for a logbook download before continuing with the update</source>
@@ -5406,27 +5488,27 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 Vă rugăm să porniți Bluetooth-ul pe dispozitivul OSTC Sport și urmați aceiași pași ca atunci când descărcați jurnalul înainte de a continua cu actualizarea</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="274"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="276"/>
         <source>Not now</source>
         <translation>Nu acum</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="275"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="277"/>
         <source>Update firmware</source>
         <translation>Actualizare firmware</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="277"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="279"/>
         <source>Firmware upgrade notice</source>
         <translation>Notificare de actualizare firmware</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="295"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="297"/>
         <source>Save the downloaded firmware as</source>
         <translation>Salvați firmware-ul descărcat ca</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="296"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="298"/>
         <source>HEX files (*.hex)</source>
         <translation>Fișiere HEX (*.hex)</translation>
     </message>
@@ -5434,79 +5516,89 @@ Vă rugăm să porniți Bluetooth-ul pe dispozitivul OSTC Sport și urmați acei
 <context>
     <name>PlannerSettingsWidget</name>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="322"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="302"/>
         <source>Open circuit</source>
         <translation>Circuit deschis</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="322"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="302"/>
         <source>CCR</source>
         <translation>CCR</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="322"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="302"/>
         <source>pSCR</source>
         <translation>pSCR</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="421"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="388"/>
         <source>ft/min</source>
         <translation>ft/min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="422"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="389"/>
         <source>Last stop at 20ft</source>
         <translation>Ultima oprire la 20 de pași</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="423"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="390"/>
         <source>50% avg. depth to 20ft</source>
         <translation>50% adâncime medie până la 20 de pași</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="424"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="391"/>
         <source>20ft to surface</source>
         <translation>20 de pași pană la suprafață</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="426"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="392"/>
+        <source>ft</source>
+        <translation>picioare</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="394"/>
         <source>m/min</source>
         <translation>m/min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="427"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="395"/>
         <source>Last stop at 6m</source>
         <translation>Ultima oprire la 6m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="428"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="396"/>
         <source>50% avg. depth to 6m</source>
         <translation>50% adâncime medie pană la 6m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="429"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="397"/>
         <source>6m to surface</source>
         <translation>6m pană la suprafață</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="432"/>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="433"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="398"/>
+        <source>m</source>
+        <translation>m</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="401"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="402"/>
         <source>cuft/min</source>
         <translation>metri cubi/min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="441"/>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="442"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="410"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="411"/>
         <source>ℓ/min</source>
         <translation>ℓ/min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="451"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="420"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="456"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="425"/>
         <source>psi</source>
         <translation>livre pe inch pătrat</translation>
     </message>
@@ -5656,6 +5748,11 @@ Vă rugăm să porniți Bluetooth-ul pe dispozitivul OSTC Sport și urmați acei
 <context>
     <name>PreferencesDialog</name>
     <message>
+        <location filename="../build/ui_preferences.h" line="1283"/>
+        <source>Preferences</source>
+        <translation>Preferințe</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1288"/>
         <source>Defaults</source>
         <translation>Implicite</translation>
@@ -5691,6 +5788,11 @@ Vă rugăm să porniți Bluetooth-ul pe dispozitivul OSTC Sport și urmați acei
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1303"/>
+        <source>Lists and tables</source>
+        <translation>Liste și tabele</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1304"/>
         <source>Font</source>
         <translation>Font</translation>
@@ -5706,6 +5808,11 @@ Vă rugăm să porniți Bluetooth-ul pe dispozitivul OSTC Sport și urmați acei
         <translation>Scufundări</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1307"/>
+        <source>Default dive log file</source>
+        <translation>Fișier de înregistrări implicit</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1308"/>
         <source>No default file</source>
         <translation type="unfinished"/>
@@ -5736,6 +5843,21 @@ Vă rugăm să porniți Bluetooth-ul pe dispozitivul OSTC Sport și urmați acei
         <translation>...</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1314"/>
+        <source>Display invalid</source>
+        <translation>Afișaj invalid</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1316"/>
+        <source>Default cylinder</source>
+        <translation>Tub implicit</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1317"/>
+        <source>Use default cylinder</source>
+        <translation>Folosește tubul implicit</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1318"/>
         <source>Animations</source>
         <translation>Animații</translation>
@@ -5766,42 +5888,26 @@ Vă rugăm să porniți Bluetooth-ul pe dispozitivul OSTC Sport și urmați acei
         <translation>Sistem</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1401"/>
-        <source>Dive site geo lookup</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1402"/>
-        <source>Enable geocoding for dive site management</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1403"/>
-        <source>Parse site without GPS data</source>
+        <location filename="../build/ui_preferences.h" line="1324"/>
+        <source>&amp;Metric</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1404"/>
-        <source>Same format for existing dives</source>
-        <translation type="unfinished"/>
+        <location filename="../build/ui_preferences.h" line="1325"/>
+        <source>Imperial</source>
+        <translation>Imperial</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1405"/>
-        <source>Dive Site Layout</source>
+        <location filename="../build/ui_preferences.h" line="1326"/>
+        <source>Personali&amp;ze</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1406"/>
-        <location filename="../build/ui_preferences.h" line="1407"/>
-        <source>/</source>
+        <location filename="../build/ui_preferences.h" line="1327"/>
+        <source>Individual settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1325"/>
-        <source>Imperial</source>
-        <translation>Imperial</translation>
-    </message>
-    <message>
         <location filename="../build/ui_preferences.h" line="1328"/>
         <source>Depth</source>
         <translation>Adâncime</translation>
@@ -5817,6 +5923,11 @@ Vă rugăm să porniți Bluetooth-ul pe dispozitivul OSTC Sport și urmați acei
         <translation>picioare</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1331"/>
+        <source>Pressure</source>
+        <translation>Presiune</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1332"/>
         <location filename="../build/ui_preferences.h" line="1366"/>
         <source>bar</source>
@@ -5828,11 +5939,26 @@ Vă rugăm să porniți Bluetooth-ul pe dispozitivul OSTC Sport și urmați acei
         <translation>livre pe inch pătrat</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1334"/>
+        <source>Volume</source>
+        <translation>Volum</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1335"/>
+        <source>&amp;liter</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1336"/>
         <source>cu ft</source>
         <translation>picioare cubice</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1337"/>
+        <source>Temperature</source>
+        <translation>Temperatură</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1338"/>
         <source>celsius</source>
         <translation>Celsius</translation>
@@ -5843,11 +5969,121 @@ Vă rugăm să porniți Bluetooth-ul pe dispozitivul OSTC Sport și urmați acei
         <translation>Fahrenheit</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1340"/>
+        <source>Weight</source>
+        <translation>Greutate</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1341"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1342"/>
+        <source>lbs</source>
+        <translation>livre</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1343"/>
+        <source>Time units</source>
+        <translation>Unități de timp</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1344"/>
+        <source>Ascent/descent speed denominator</source>
+        <translation>Crește/descrește viteza numitorului</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1345"/>
+        <source>Minutes</source>
+        <translation>Minute</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1346"/>
+        <source>Seconds</source>
+        <translation>Secunde</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1347"/>
+        <source>GPS coordinates</source>
+        <translation>Coordonate GPS</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1348"/>
+        <source>Location Display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1349"/>
+        <source>traditional (dms)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1350"/>
+        <source>decimal</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1351"/>
+        <source>Show</source>
+        <translation>Arată</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1352"/>
+        <source>Threshold when showing pO₂</source>
+        <translation>Pragul este atins atunci când se afișează pO₂</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1353"/>
+        <source>Threshold when showing pN₂</source>
+        <translation>Pragul este atins atunci când se afișează pN₂</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1354"/>
+        <source>Threshold when showing pHe</source>
+        <translation>Pragul este atins atunci când se afișează pHe</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1355"/>
+        <source>Max pO₂ when showing MOD</source>
+        <translation>Maximul pO₂ atunci când se afișează MOD</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1356"/>
+        <source>Draw dive computer reported ceiling red</source>
+        <translation>Desenază pragul raportat de calculatorul de scufundări cu roșu</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1357"/>
+        <source>Show unused cylinders in Equipment tab</source>
+        <translation>Afișează tuburile nefolosite în fereastra Echipament</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1358"/>
+        <source>Show average depth</source>
+        <translation>Afișează adâncimea medie</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1359"/>
+        <source>Misc</source>
+        <translation>Diverse</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1360"/>
+        <source>GFLow</source>
+        <translation>GFLow</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1361"/>
+        <source>GFHigh</source>
+        <translation>GFHigh</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1362"/>
+        <source>GFLow at max depth</source>
+        <translation>GFLow la adâncimea maximă</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1363"/>
         <source>CCR: show setpoints when viewing pO₂</source>
         <translation>CCH: afișați punctele setate atunci când se vede pO₂</translation>
@@ -5893,14 +6129,19 @@ Vă rugăm să porniți Bluetooth-ul pe dispozitivul OSTC Sport și urmați acei
         <translation>Sistem implicit</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1374"/>
+        <source>Filter</source>
+        <translation>Filtrează</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1375"/>
         <source>Proxy</source>
         <translation>ℓ/min</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1379"/>
-        <source>Proxy type</source>
-        <translation>Tipul proxy-ului</translation>
+        <location filename="../build/ui_preferences.h" line="1376"/>
+        <source>Port</source>
+        <translation>Port</translation>
     </message>
     <message>
         <location filename="../build/ui_preferences.h" line="1377"/>
@@ -5908,16 +6149,16 @@ Vă rugăm să porniți Bluetooth-ul pe dispozitivul OSTC Sport și urmați acei
         <translation>Gazdă</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1376"/>
-        <source>Port</source>
-        <translation>Port</translation>
-    </message>
-    <message>
         <location filename="../build/ui_preferences.h" line="1378"/>
         <source>Requires authentication</source>
         <translation>Este necesară autentificarea</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1379"/>
+        <source>Proxy type</source>
+        <translation>Tipul proxy-ului</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1380"/>
         <source>Username</source>
         <translation>Nume utilizator</translation>
@@ -5929,46 +6170,6 @@ Vă rugăm să porniți Bluetooth-ul pe dispozitivul OSTC Sport și urmați acei
         <translation>Parola</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1400"/>
-        <source>Disconnect from Facebook</source>
-        <translation>Deconectare de pe Facebook</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1374"/>
-        <source>Filter</source>
-        <translation>Filtrează</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1331"/>
-        <source>Pressure</source>
-        <translation>Presiune</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1303"/>
-        <source>Lists and tables</source>
-        <translation>Liste și tabele</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1307"/>
-        <source>Default dive log file</source>
-        <translation>Fișier de înregistrări implicit</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1314"/>
-        <source>Display invalid</source>
-        <translation>Afișaj invalid</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1316"/>
-        <source>Default cylinder</source>
-        <translation>Tub implicit</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1317"/>
-        <source>Use default cylinder</source>
-        <translation>Folosește tubul implicit</translation>
-    </message>
-    <message>
         <location filename="../build/ui_preferences.h" line="1382"/>
         <source>Subsurface cloud storage</source>
         <translation type="unfinished"/>
@@ -6009,150 +6210,41 @@ Vă rugăm să porniți Bluetooth-ul pe dispozitivul OSTC Sport și urmați acei
         <translation>Salvați ID-ul utilizatorului local?</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1334"/>
-        <source>Volume</source>
-        <translation>Volum</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1337"/>
-        <source>Temperature</source>
-        <translation>Temperatură</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1340"/>
-        <source>Weight</source>
-        <translation>Greutate</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1342"/>
-        <source>lbs</source>
-        <translation>livre</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1343"/>
-        <source>Time units</source>
-        <translation>Unități de timp</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1345"/>
-        <source>Minutes</source>
-        <translation>Minute</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1346"/>
-        <source>Seconds</source>
-        <translation>Secunde</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1351"/>
-        <source>Show</source>
-        <translation>Arată</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1362"/>
-        <source>GFLow at max depth</source>
-        <translation>GFLow la adâncimea maximă</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1359"/>
-        <source>Misc</source>
-        <translation>Diverse</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1283"/>
-        <source>Preferences</source>
-        <translation>Preferințe</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1324"/>
-        <source>&amp;Metric</source>
-        <translation type="unfinished"/>
+        <location filename="../build/ui_preferences.h" line="1400"/>
+        <source>Disconnect from Facebook</source>
+        <translation>Deconectare de pe Facebook</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1326"/>
-        <source>Personali&amp;ze</source>
+        <location filename="../build/ui_preferences.h" line="1401"/>
+        <source>Dive site geo lookup</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1327"/>
-        <source>Individual settings</source>
+        <location filename="../build/ui_preferences.h" line="1402"/>
+        <source>Enable geocoding for dive site management</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1335"/>
-        <source>&amp;liter</source>
+        <location filename="../build/ui_preferences.h" line="1403"/>
+        <source>Parse site without GPS data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1344"/>
-        <source>Ascent/descent speed denominator</source>
-        <translation>Crește/descrește viteza numitorului</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1347"/>
-        <source>GPS coordinates</source>
-        <translation>Coordonate GPS</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1348"/>
-        <source>Location Display</source>
+        <location filename="../build/ui_preferences.h" line="1404"/>
+        <source>Same format for existing dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1349"/>
-        <source>traditional (dms)</source>
+        <location filename="../build/ui_preferences.h" line="1405"/>
+        <source>Dive Site Layout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1350"/>
-        <source>decimal</source>
+        <location filename="../build/ui_preferences.h" line="1406"/>
+        <location filename="../build/ui_preferences.h" line="1407"/>
+        <source>/</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1352"/>
-        <source>Threshold when showing pO₂</source>
-        <translation>Pragul este atins atunci când se afișează pO₂</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1353"/>
-        <source>Threshold when showing pN₂</source>
-        <translation>Pragul este atins atunci când se afișează pN₂</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1354"/>
-        <source>Threshold when showing pHe</source>
-        <translation>Pragul este atins atunci când se afișează pHe</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1355"/>
-        <source>Max pO₂ when showing MOD</source>
-        <translation>Maximul pO₂ atunci când se afișează MOD</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1356"/>
-        <source>Draw dive computer reported ceiling red</source>
-        <translation>Desenază pragul raportat de calculatorul de scufundări cu roșu</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1357"/>
-        <source>Show unused cylinders in Equipment tab</source>
-        <translation>Afișează tuburile nefolosite în fereastra Echipament</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1358"/>
-        <source>Show average depth</source>
-        <translation>Afișează adâncimea medie</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1360"/>
-        <source>GFLow</source>
-        <translation>GFLow</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1361"/>
-        <source>GFHigh</source>
-        <translation>GFHigh</translation>
-    </message>
 </context>
 <context>
     <name>PreferencesGeoreference</name>
@@ -6207,106 +6299,136 @@ Vă rugăm să porniți Bluetooth-ul pe dispozitivul OSTC Sport și urmați acei
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="20"/>
-        <source>Show</source>
-        <translation>Arată</translation>
+        <source>Gas pressure display setup</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="29"/>
-        <source>Threshold when showing pO₂</source>
-        <translation>Pragul este atins atunci când se afișează pO₂</translation>
+        <source>Threshold for pO₂ (bar)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="49"/>
-        <source>Threshold when showing pN₂</source>
-        <translation>Pragul este atins atunci când se afișează pN₂</translation>
+        <source>Threshold for pN₂ (bar)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="69"/>
-        <source>Threshold when showing pHe</source>
-        <translation>Pragul este atins atunci când se afișează pHe</translation>
+        <source>Threshold for pHe (bar)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="89"/>
-        <source>Max pO₂ when showing MOD</source>
-        <translation>Maximul pO₂ atunci când se afișează MOD</translation>
+        <source>pO₂ in calculating MOD (bar)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="106"/>
+        <source>CCR options:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="113"/>
+        <source>Dive planner default setpoint (bar)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="133"/>
+        <source>Show setpoints when viewing pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="140"/>
+        <source>Show individual O₂ sensor values when viewing pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="150"/>
+        <source>Ceiling display setup</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="109"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="159"/>
         <source>Draw dive computer reported ceiling red</source>
         <translation>Desenază pragul raportat de calculatorul de scufundări cu roșu</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="116"/>
-        <source>Show unused cylinders in Equipment tab</source>
-        <translation>Afișează tuburile nefolosite în fereastra Echipament</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="169"/>
+        <source>Algorithm for calculated ceiling:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="123"/>
-        <source>Show mean depth</source>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="176"/>
+        <source>VPM-B</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="133"/>
-        <source>Misc</source>
-        <translation>Diverse</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="183"/>
+        <source>VPM-B Conservatism</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="149"/>
-        <source>bar</source>
-        <translation>bar</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="193"/>
+        <source>+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="165"/>
-        <source>Default CCR set-point for dive planning</source>
-        <translation>Valoarea de bază pentru scufundări a punctului setat CCR</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="206"/>
+        <source>Bühlmann</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="172"/>
-        <source>pSCR O₂ metabolism rate</source>
-        <translation>rata de metabolism pSCR O₂</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="216"/>
+        <source>GFHigh</source>
+        <translation>GF ridicat</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="179"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="236"/>
         <source>GFLow</source>
         <translation>GF scăzut</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="186"/>
-        <source>GFHigh</source>
-        <translation>GF ridicat</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="256"/>
+        <source>GFLow at max depth</source>
+        <translation>GFLow la adâncimea maximă</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="203"/>
-        <source>ℓ/min</source>
-        <translation>ℓ/min</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="263"/>
+        <source>pSCR options:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="213"/>
-        <source>pSCR ratio</source>
-        <translation>Rata pSCR</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="270"/>
+        <source>Metabolic rate (ℓ O₂/min)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="223"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="287"/>
+        <source>Dilution ratio</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="300"/>
         <source>1:</source>
         <translation>1:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="230"/>
-        <source>CCR: show individual O₂ sensor values when viewing pO₂</source>
-        <translation>CCH: afișați senzorul individual O₂ atunci când se vede pO₂</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="310"/>
+        <source>Misc</source>
+        <translation>Diverse</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="237"/>
-        <source>CCR: show setpoints when viewing pO₂</source>
-        <translation>CCH: afișați punctele setate atunci când se vede pO₂</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="316"/>
+        <source>Show unused cylinders in Equipment tab</source>
+        <translation>Afișează tuburile nefolosite în fereastra Echipament</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="244"/>
-        <source>GFLow at max depth</source>
-        <translation>GFLow la adâncimea maximă</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="323"/>
+        <source>Show mean depth in Profile</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="10"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="9"/>
         <source>Graph</source>
         <translation>Grafic</translation>
     </message>
@@ -6375,15 +6497,29 @@ Vă rugăm să porniți Bluetooth-ul pe dispozitivul OSTC Sport și urmați acei
         <translation>Limbă</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="57"/>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="53"/>
         <source>Restart required</source>
         <translation>Este necesară o repornire</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="58"/>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="54"/>
         <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="../desktop-widgets/preferences/preferences_language.cpp" line="76"/>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="82"/>
+        <source>Literal characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="77"/>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="83"/>
+        <source>Non-special character(s) in time format.
+These will be used as is. This might not be what you intended.
+See http://doc.qt.io/qt-5/qdatetime.html#toString</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PreferencesNetwork</name>
@@ -6430,7 +6566,7 @@ Vă rugăm să porniți Bluetooth-ul pe dispozitivul OSTC Sport și urmați acei
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_network.ui" line="156"/>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="148"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="134"/>
         <source>Subsurface cloud storage</source>
         <translation type="unfinished"/>
     </message>
@@ -6475,39 +6611,39 @@ Vă rugăm să porniți Bluetooth-ul pe dispozitivul OSTC Sport și urmați acei
         <translation>Salvați ID-ul utilizatorului local?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="11"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="10"/>
         <source>Network</source>
         <translation>Rețea</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="15"/>
         <source>No proxy</source>
         <translation>Fără proxy</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/>
         <source>System proxy</source>
         <translation>Sistemul proxy</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/>
         <source>HTTP proxy</source>
         <translation>Proxy HTTP</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="19"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/>
         <source>SOCKS proxy</source>
         <translation>Proxy SOCKS</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="75"/>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="97"/>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="110"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="72"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="93"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="106"/>
         <source>Cloud storage email and password can only consist of letters, numbers, and &apos;.&apos;, &apos;-&apos;, &apos;_&apos;, and &apos;+&apos;.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="146"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="132"/>
         <source>Subsurface cloud storage (credentials verified)</source>
         <translation type="unfinished"/>
     </message>
@@ -6665,7 +6801,7 @@ Vă rugăm să porniți Bluetooth-ul pe dispozitivul OSTC Sport și urmați acei
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="8"/>
+        <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="7"/>
         <source>Units</source>
         <translation>Unități</translation>
     </message>
@@ -6673,17 +6809,17 @@ Vă rugăm să porniți Bluetooth-ul pe dispozitivul OSTC Sport și urmați acei
 <context>
     <name>PrintDialog</name>
     <message>
-        <location filename="../desktop-widgets/printdialog.cpp" line="118"/>
-        <source>&amp;Preview</source>
-        <translation>&amp;Previzualizare</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/printdialog.cpp" line="115"/>
+        <location filename="../desktop-widgets/printdialog.cpp" line="102"/>
         <source>P&amp;rint</source>
         <translation>P&amp;rintează</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/printdialog.cpp" line="130"/>
+        <location filename="../desktop-widgets/printdialog.cpp" line="105"/>
+        <source>&amp;Preview</source>
+        <translation>&amp;Previzualizare</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/printdialog.cpp" line="117"/>
         <source>Print</source>
         <translation>Printează</translation>
     </message>
@@ -6691,19 +6827,10 @@ Vă rugăm să porniți Bluetooth-ul pe dispozitivul OSTC Sport și urmați acei
 <context>
     <name>PrintOptions</name>
     <message>
-        <location filename="../build/ui_printoptions.h" line="150"/>
-        <source>&amp;Table print</source>
-        <translation>&amp;Tabel de printat</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_printoptions.h" line="158"/>
-        <source>One dive per page</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../build/ui_printoptions.h" line="159"/>
-        <source>Two dives per page</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/printoptions.ui" line="29"/>
+        <location filename="../build/ui_printoptions.h" line="148"/>
+        <source>Print type</source>
+        <translation>Tipul printării</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/printoptions.ui" line="41"/>
@@ -6763,10 +6890,19 @@ Vă rugăm să porniți Bluetooth-ul pe dispozitivul OSTC Sport și urmați acei
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/printoptions.ui" line="29"/>
-        <location filename="../build/ui_printoptions.h" line="148"/>
-        <source>Print type</source>
-        <translation>Tipul printării</translation>
+        <location filename="../build/ui_printoptions.h" line="150"/>
+        <source>&amp;Table print</source>
+        <translation>&amp;Tabel de printat</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_printoptions.h" line="158"/>
+        <source>One dive per page</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../build/ui_printoptions.h" line="159"/>
+        <source>Two dives per page</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/printoptions.cpp" line="128"/>
@@ -6808,103 +6944,103 @@ Vă rugăm să porniți Bluetooth-ul pe dispozitivul OSTC Sport și urmați acei
         <translation>Calculator de scufundări necunoscut</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="755"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="752"/>
         <source>Show NDL / TTS was disabled because of excessive processing time</source>
         <translation>Arată NDL / TTS a fost dezactivat din cauza timpului excesiv de procesare</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1344"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1338"/>
         <source>Make first divecomputer</source>
         <translation>Creează primul calculator de scufundări</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1346"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1340"/>
         <source>Delete this divecomputer</source>
         <translation>Șterge acest calculator de scufundări</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1360"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1354"/>
         <source>Add gas change</source>
         <translation>Adaugă gazul modificat</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1363"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1357"/>
         <source> (Tank %1)</source>
         <translation> (Rezervor %1)</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1371"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1365"/>
         <source>Add set-point change</source>
         <translation>Adaugă modificarea punctului setat</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1373"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1367"/>
         <source>Add bookmark</source>
         <translation>Adaugă marcaj</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1377"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1371"/>
         <source>Edit the profile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1381"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1375"/>
         <source>Remove event</source>
         <translation>Șterge evenimentul</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1386"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1380"/>
         <source>Hide similar events</source>
         <translation>Ascunde evenimente similare</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1393"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1387"/>
         <source>Edit name</source>
         <translation>Modifică numele</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1422"/>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1429"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1416"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1423"/>
         <source>Adjust pressure of tank %1 (currently interpolated as %2)</source>
         <translation>Ajustează presiunea rezervorului %1 (în momentul de față aceasta este interpolată ca %2)</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1444"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1438"/>
         <source>Unhide all events</source>
         <translation>Arată toate evenimentele</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1479"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1473"/>
         <source>Hide events</source>
         <translation>Ascunde evenimente</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1479"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1473"/>
         <source>Hide all %1 events?</source>
         <translation>Ascunde toate %1 evenimentele?</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1514"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1508"/>
         <source>Remove the selected event?</source>
         <translation>Înlătură evenimentul selectat?</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1515"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1509"/>
         <source>%1 @ %2:%3</source>
         <translation>%1 @ %2:%3</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1638"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1632"/>
         <source>Edit name of bookmark</source>
         <translation>Modifică numele marcajului</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1639"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1633"/>
         <source>Custom name:</source>
         <translation>Nume presonalizat:</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1644"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1638"/>
         <source>Name is too long!</source>
         <translation>Numele este prea lung</translation>
     </message>
@@ -6912,91 +7048,101 @@ Vă rugăm să porniți Bluetooth-ul pe dispozitivul OSTC Sport și urmați acei
 <context>
     <name>QMLManager</name>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="95"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="97"/>
         <source>Starting...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="202"/>
         <source>working in no-cloud mode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="213"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="216"/>
         <source>no cloud credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="214"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="270"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="217"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="269"/>
         <source>Please enter valid cloud credentials.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="285"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="284"/>
         <source>Attempting to open cloud storage with new credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="304"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="306"/>
         <source>Testing cloud credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="331"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="320"/>
+        <source>No response from cloud server to validate the credentials</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="329"/>
+        <source>Cannot connect to cloud storage - cloud account not verified</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="361"/>
         <source>Cloud credentials are invalid</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="344"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="374"/>
         <source>Cannot open cloud storage: Error creating https connection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="357"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="387"/>
         <source>Cannot open cloud storage: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="369"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="399"/>
         <source>Cannot connect to cloud storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="411"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="441"/>
         <source>Cloud storage error: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="501"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="531"/>
         <source>Failed to connect to cloud server, reverting to no cloud status</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="520"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="550"/>
         <source>Cloud storage open successfully. No dives in dive list.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="689"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="690"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="721"/>
         <source>h</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="689"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="690"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="691"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="721"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="722"/>
         <source>min</source>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="689"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/>
         <source>sec</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="1041"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="1102"/>
         <source>Unknown GPS location</source>
         <translation type="unfinished"/>
     </message>
@@ -7004,126 +7150,126 @@ Vă rugăm să porniți Bluetooth-ul pe dispozitivul OSTC Sport și urmați acei
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../core/qthelper.cpp" line="866"/>
-        <location filename="../core/qthelper.cpp" line="1214"/>
-        <source>AIR</source>
-        <translation>AER</translation>
+        <location filename="../core/gpslocation.h" line="13"/>
+        <source>Waiting to aquire GPS location</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="1214"/>
-        <source>OXYGEN</source>
-        <translation>OXIGEN</translation>
+        <location filename="../core/qthelper.cpp" line="766"/>
+        <location filename="../core/qthelper.cpp" line="1275"/>
+        <source>m</source>
+        <translation>m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="59"/>
-        <source>Remove this point</source>
-        <translation>Elimină acest punct</translation>
+        <location filename="../core/qthelper.cpp" line="768"/>
+        <location filename="../core/qthelper.cpp" line="1274"/>
+        <source>ft</source>
+        <translation>picioare</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="32"/>
-        <source>Average</source>
-        <translation>Medie</translation>
+        <location filename="../core/qthelper.cpp" line="794"/>
+        <source>C</source>
+        <translation>C</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="35"/>
-        <source>Minimum</source>
-        <translation>Minim</translation>
+        <location filename="../core/qthelper.cpp" line="796"/>
+        <source>F</source>
+        <translation>F</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="38"/>
-        <source>Maximum</source>
-        <translation>Maxim</translation>
+        <location filename="../core/qthelper.cpp" line="821"/>
+        <location filename="../core/qthelper.cpp" line="1250"/>
+        <source>kg</source>
+        <translation>kg</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/globe.cpp" line="327"/>
-        <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>
+        <location filename="../core/qthelper.cpp" line="823"/>
+        <location filename="../core/qthelper.cpp" line="1251"/>
+        <source>lbs</source>
+        <translation>livre</translation>
     </message>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="28"/>
-        <source>unknown</source>
-        <translation>necunoscut</translation>
+        <location filename="../core/qthelper.cpp" line="848"/>
+        <location filename="../core/qthelper.cpp" line="1300"/>
+        <source>bar</source>
+        <translation>bar</translation>
     </message>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="105"/>
-        <source>h:</source>
-        <translation>h:</translation>
+        <location filename="../core/qthelper.cpp" line="850"/>
+        <location filename="../core/qthelper.cpp" line="1299"/>
+        <source>psi</source>
+        <translation>livre pe inch pătrat</translation>
     </message>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="105"/>
-        <source>min</source>
-        <translation>min</translation>
+        <location filename="../core/qthelper.cpp" line="871"/>
+        <location filename="../core/qthelper.cpp" line="1235"/>
+        <source>AIR</source>
+        <translation>AER</translation>
     </message>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="337"/>
-        <source>Multiple</source>
+        <location filename="../core/qthelper.cpp" line="873"/>
+        <source>EAN</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="../core/qthelper.cpp" line="957"/>
+        <location filename="../core/qthelper.cpp" line="962"/>
         <source>(%n dive(s))</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="816"/>
-        <location filename="../core/qthelper.cpp" line="1228"/>
-        <source>kg</source>
-        <translation>kg</translation>
+        <location filename="../core/qthelper.cpp" line="1235"/>
+        <source>OXYGEN</source>
+        <translation>OXIGEN</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="818"/>
-        <location filename="../core/qthelper.cpp" line="1229"/>
-        <source>lbs</source>
-        <translation>livre</translation>
+        <location filename="../core/qthelper.cpp" line="1322"/>
+        <source>l</source>
+        <translation>l</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="763"/>
-        <location filename="../core/qthelper.cpp" line="1252"/>
-        <source>ft</source>
-        <translation>picioare</translation>
+        <location filename="../core/qthelper.cpp" line="1323"/>
+        <source>cuft</source>
+        <translation>picioare cubice</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="761"/>
-        <location filename="../core/qthelper.cpp" line="1253"/>
-        <source>m</source>
-        <translation>m</translation>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="29"/>
+        <source>unknown</source>
+        <translation>necunoscut</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="789"/>
-        <source>C</source>
-        <translation>C</translation>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="114"/>
+        <source>h:</source>
+        <translation>h:</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="791"/>
-        <source>F</source>
-        <translation>F</translation>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="114"/>
+        <source>min</source>
+        <translation>min</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="845"/>
-        <location filename="../core/qthelper.cpp" line="1275"/>
-        <source>psi</source>
-        <translation>livre pe inch pătrat</translation>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="63"/>
+        <source>Remove this point</source>
+        <translation>Elimină acest punct</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="843"/>
-        <location filename="../core/qthelper.cpp" line="1276"/>
-        <source>bar</source>
-        <translation>bar</translation>
+        <location filename="../desktop-widgets/globe.cpp" line="327"/>
+        <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>
     <message>
-        <location filename="../core/qthelper.cpp" line="868"/>
-        <source>EAN</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="32"/>
+        <source>Average</source>
+        <translation>Medie</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="1298"/>
-        <source>l</source>
-        <translation>l</translation>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="35"/>
+        <source>Minimum</source>
+        <translation>Minim</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="1299"/>
-        <source>cuft</source>
-        <translation>picioare cubice</translation>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="38"/>
+        <source>Maximum</source>
+        <translation>Maxim</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="625"/>
@@ -7145,17 +7291,12 @@ Vă rugăm să porniți Bluetooth-ul pe dispozitivul OSTC Sport și urmați acei
         <source>Malformed XML response. Line %1: %2</source>
         <translation>Răspuns XML incorect. Linia %1: %2</translation>
     </message>
-    <message>
-        <location filename="../core/gpslocation.h" line="13"/>
-        <source>Waiting to aquire GPS location</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>ReadSettingsThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1651"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1676"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1640"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1665"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Această funcționalitate nu este încă disponibilă pentru calculatorul de scufundări selectat.</translation>
     </message>
@@ -7184,7 +7325,7 @@ Vă rugăm să porniți Bluetooth-ul pe dispozitivul OSTC Sport și urmați acei
 <context>
     <name>ResetSettingsThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1775"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1764"/>
         <source>Reset settings failed!</source>
         <translation type="unfinished"/>
     </message>
@@ -7222,6 +7363,12 @@ Vă rugăm să porniți Bluetooth-ul pe dispozitivul OSTC Sport și urmați acei
 <context>
     <name>ShiftImageTimesDialog</name>
     <message>
+        <location filename="../desktop-widgets/shiftimagetimes.ui" line="23"/>
+        <location filename="../build/ui_shiftimagetimes.h" line="184"/>
+        <source>Shift selected image times</source>
+        <translation>Modifică timpul imaginilor selectate</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/shiftimagetimes.ui" line="34"/>
         <location filename="../build/ui_shiftimagetimes.h" line="185"/>
         <source>Shift times of image(s) by</source>
@@ -7234,12 +7381,6 @@ Vă rugăm să porniți Bluetooth-ul pe dispozitivul OSTC Sport și urmați acei
         <translation>o:mm</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/shiftimagetimes.ui" line="23"/>
-        <location filename="../build/ui_shiftimagetimes.h" line="184"/>
-        <source>Shift selected image times</source>
-        <translation>Modifică timpul imaginilor selectate</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/shiftimagetimes.ui" line="105"/>
         <location filename="../build/ui_shiftimagetimes.h" line="187"/>
         <source>Earlier</source>
@@ -7289,12 +7430,12 @@ Not all images have timestamps in the range between
         <translation>Ce dată și ce oră sunt afișate pe imagine?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="297"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="296"/>
         <source>Open image file</source>
         <translation>Deschide fișierul cu imaginea</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="299"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="298"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>Fișierele imaginilor (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -7452,54 +7593,54 @@ Not all images have timestamps in the range between
 <context>
     <name>SocialNetworkDialog</name>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="339"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="284"/>
         <source>Dive date: %1 
 </source>
         <translation>Timpul scufundării: %1
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="342"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="287"/>
         <source>Duration: %1 
 </source>
         <translation>Durata: %1
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="343"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="288"/>
         <source>h:</source>
         <comment>abbreviation for hours plus separator</comment>
         <translation>h:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="344"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="289"/>
         <source>min</source>
         <comment>abbreviation for minutes</comment>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="347"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="292"/>
         <source>Dive location: %1 
 </source>
         <translation>Locația scufundării: %1
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="350"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="295"/>
         <source>Buddy: %1 
 </source>
         <translation>Însoțitor: %1
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="353"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="298"/>
         <source>Divemaster: %1 
 </source>
         <translation>Maestru scufundări: %1
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="356"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="301"/>
         <source>
 %1</source>
         <translation>
@@ -7585,9 +7726,20 @@ Not all images have timestamps in the range between
     <name>StartPage</name>
     <message>
         <location filename="../mobile-widgets/qml/StartPage.qml" line="19"/>
-        <source>To use Subsurface-mobile with Subsurface cloud storage, please enteryour cloud credentials.
+        <source>To use Subsurface-mobile with Subsurface cloud storage, please enter your cloud credentials.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/StartPage.qml" line="20"/>
+        <source>If this is the first time you use Subsurface cloud storage, enter a valid email (all lower case) and a password of your choice (letters and numbers). The server will send a PIN to the email address provided that you will have to enter here.
 
-To use Subsurface-mobile only with local data on this device, tap on the no cloud icon below.</source>
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/StartPage.qml" line="23"/>
+        <source>To use Subsurface-mobile only with local data on this device, tap on the no cloud icon below.</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -7626,7 +7778,12 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>SubsurfaceWebServices</name>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="419"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="395"/>
+        <source>Enter User ID and click Download</source>
+        <translation>Introduceți ID-ul utilizatorului si apăsați pe butonul de Descărcare</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="417"/>
         <source>Webservice</source>
         <translation>Serviciu Web</translation>
     </message>
@@ -7651,30 +7808,25 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
         <translation>Eroare la conectare:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="557"/>
-        <source>Download successful</source>
-        <translation>Descărcare cu succes</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="551"/>
         <source>Invalid user identifier!</source>
         <translation>Identificator de utilizator invalid!</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="397"/>
-        <source>Enter User ID and click Download</source>
-        <translation>Introduceți ID-ul utilizatorului si apăsați pe butonul de Descărcare</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="554"/>
         <source>Cannot parse response!</source>
         <translation>Nu se poate parsa răspunsul!</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="557"/>
+        <source>Download successful</source>
+        <translation>Descărcare cu succes</translation>
+    </message>
 </context>
 <context>
     <name>SuitFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="674"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="672"/>
         <source>Suits: </source>
         <translation>Costume:</translation>
     </message>
@@ -7682,7 +7834,7 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>SuitsFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="123"/>
+        <location filename="../qt-models/filtermodels.cpp" line="128"/>
         <source>No suit set</source>
         <translation>Niciun costum setat</translation>
     </message>
@@ -7701,7 +7853,7 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>TagFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="595"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="593"/>
         <source>Tags: </source>
         <translation>Etichete: </translation>
     </message>
@@ -7709,7 +7861,7 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>TagFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="148"/>
+        <location filename="../qt-models/filtermodels.cpp" line="153"/>
         <source>Empty tags</source>
         <translation>Etichete goale</translation>
     </message>
@@ -7735,6 +7887,11 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>TemplateEdit</name>
     <message>
+        <location filename="../desktop-widgets/templateedit.ui" line="14"/>
+        <source>Edit template</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/templateedit.ui" line="37"/>
         <source>Preview</source>
         <translation type="unfinished"/>
@@ -7780,11 +7937,6 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
         <translation>Mărimea fontului</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/templateedit.ui" line="14"/>
-        <source>Edit template</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/templateedit.ui" line="165"/>
         <source>Color palette</source>
         <translation type="unfinished"/>
@@ -7966,85 +8118,12 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>TextHyperlinkEventFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="817"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="815"/>
         <source>%1click to visit %2</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>ThemeTest</name>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="29"/>
-        <source>Theme Information</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="33"/>
-        <source>Screen</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="42"/>
-        <source>Geometry (pixels):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="49"/>
-        <source>Geometry (gridUnits):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="56"/>
-        <source>Units.gridUnit:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="63"/>
-        <source>Units.devicePixelRatio:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="70"/>
-        <source>Font Metrics</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="76"/>
-        <source>FontMetrics pointSize:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="83"/>
-        <source>FontMetrics pixelSize:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="90"/>
-        <source>FontMetrics devicePixelRatio:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="97"/>
-        <source>Text item pixelSize:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="104"/>
-        <source>Text item pointSize:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="111"/>
-        <source>Pixel density:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="118"/>
-        <source>Height of default font:</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
     <name>ToolTipItem</name>
     <message>
         <location filename="../profile-widget/divetooltipitem.cpp" line="136"/>
@@ -8055,102 +8134,107 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>TripItem</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="67"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="68"/>
         <source>(%1 shown)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="194"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="197"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="215"/>
         <source>Date</source>
         <translation>Dată</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="200"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="218"/>
         <source>Rating</source>
         <translation>Rating</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
         <source>Depth(%1)</source>
         <translation>Adâncime(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
         <source>ft</source>
         <translation>picioare</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="206"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="224"/>
         <source>Duration</source>
         <translation>Durată</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="209"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="227"/>
         <source>Temp(%1%2)</source>
         <translation>Temperatură(%1%2)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
         <source>Weight(%1)</source>
         <translation>Greutate(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
         <source>lbs</source>
         <translation>livre</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="215"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="233"/>
         <source>Suit</source>
         <translation>Costum</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="218"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="236"/>
         <source>Cyl</source>
         <translation>Tub</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="239"/>
         <source>Gas</source>
         <translation>Gaz</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="244"/>
         <source>SAC(%1)</source>
         <translation>SAC(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="244"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="229"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="247"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="232"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="250"/>
         <source>Max CNS</source>
         <translation>CNS maxim</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="235"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="253"/>
+        <source>Photos before/during/after dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="256"/>
         <source>Location</source>
         <translation>Locație</translation>
     </message>
@@ -8173,72 +8257,73 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>UpdateManager</name>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="69"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="61"/>
         <source>Check for updates.</source>
         <translation>Verifică dacă există actualizări.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="70"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="62"/>
         <source>Subsurface was unable to check for updates.</source>
         <translation>Subsurface nu a reușit să verifice dacă există actualizări.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="75"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="67"/>
         <source>The following error occurred:</source>
         <translation>A apărut următoarea eroare:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="76"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="68"/>
         <source>Please check your internet connection.</source>
         <translation>Vă rugăm verificați conexiunea la internet.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="86"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="78"/>
         <source>You are using the latest version of Subsurface.</source>
         <translation>Folosiți ultima versiune Subsurface.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="89"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="81"/>
         <source>A new version of Subsurface is available.&lt;br/&gt;Click on:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; to download it.</source>
         <translation>O nouă versiune Subsurface este disponibilă.&lt;br/&gt;Apăsați pe:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; pentru a o descărca.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="95"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="87"/>
         <source>A new version of Subsurface is available.</source>
         <translation>O nouă versiune Subsurface este disponibilă.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="96"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="88"/>
         <source>Latest version is %1, please check %2 our download page %3 for information in how to update.</source>
         <translation>Ultima versiune este %1, vă rugam verificați %2 pentru descărcare și %3 pentru informații despre cum se poate actualiza softul.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="106"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="98"/>
         <source>Newest release version is </source>
         <translation>Ultima versiune lansată este </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="107"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="99"/>
         <source>The server returned the following information:</source>
         <translation>Server-ul a returnat următoarea informație:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="125"/>
-        <source>Subsurface is checking every two weeks if a new version is available. If you don&apos;t want Subsurface to continue checking, please click Decline.</source>
-        <translation>Subsurface verifică din 2 in 2 săptămâni dacă există actualizari de software disponibile. Dacă nu doriți ca SUbsurface să continue verificările, vă rugăm să apăsați pe Refuză.</translation>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="117"/>
+        <source>Subsurface is checking every two weeks if a new version is available. 
+ If you don&apos;t want Subsurface to continue checking, please click Decline.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="126"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="119"/>
         <source>Decline</source>
         <translation>Refuză</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="127"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="120"/>
         <source>Accept</source>
         <translation>Acceptă</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="129"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="122"/>
         <source>Automatic check for updates</source>
         <translation>Verificare automată a actualizărilor</translation>
     </message>
@@ -8260,24 +8345,6 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>UserSurvey</name>
     <message>
-        <location filename="../desktop-widgets/usersurvey.ui" line="44"/>
-        <location filename="../build/ui_usersurvey.h" line="151"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;We would love to learn more about our users, their preferences and their usage habits. Please spare a minute to fill out this form and submit it to the Subsurface team.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Ne-ar face plăcere să învățăm mai multe despre obiceiurile si preferințele utilizatorilor noștrii. Vă rugăm să vă alocați un minut să completați următorul formular și să îl trimiteți echipei Subsurface.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/usersurvey.ui" line="115"/>
-        <location filename="../build/ui_usersurvey.h" line="156"/>
-        <source>Other software/sources</source>
-        <translation>Alt software/surse</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/usersurvey.ui" line="128"/>
-        <location filename="../build/ui_usersurvey.h" line="157"/>
-        <source>Manually entering dives</source>
-        <translation>Introducere manuală a scufundărilor</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="14"/>
         <location filename="../build/ui_usersurvey.h" line="149"/>
         <source>User survey</source>
@@ -8290,6 +8357,12 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
         <translation>Chestionar utilizator Subsurface</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/usersurvey.ui" line="44"/>
+        <location filename="../build/ui_usersurvey.h" line="151"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;We would love to learn more about our users, their preferences and their usage habits. Please spare a minute to fill out this form and submit it to the Subsurface team.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Ne-ar face plăcere să învățăm mai multe despre obiceiurile si preferințele utilizatorilor noștrii. Vă rugăm să vă alocați un minut să completați următorul formular și să îl trimiteți echipei Subsurface.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="63"/>
         <location filename="../build/ui_usersurvey.h" line="152"/>
         <source>Technical diver</source>
@@ -8314,6 +8387,18 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
         <translation>Calculatoare de scufundare suportate</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/usersurvey.ui" line="115"/>
+        <location filename="../build/ui_usersurvey.h" line="156"/>
+        <source>Other software/sources</source>
+        <translation>Alt software/surse</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/usersurvey.ui" line="128"/>
+        <location filename="../build/ui_usersurvey.h" line="157"/>
+        <source>Manually entering dives</source>
+        <translation>Introducere manuală a scufundărilor</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="141"/>
         <location filename="../build/ui_usersurvey.h" line="158"/>
         <source>Android/iPhone companion app</source>
@@ -8344,6 +8429,11 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
         <translation>De unde importați datele?</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/usersurvey.cpp" line="18"/>
+        <source>Send</source>
+        <translation>Trimitere</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/usersurvey.cpp" line="43"/>
         <source>
 Operating system: %1</source>
@@ -8387,19 +8477,14 @@ Limba: %1</translation>
         <translation>Întreabă-mă mai târziu</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/usersurvey.cpp" line="101"/>
-        <source>Submit user survey.</source>
-        <translation>Încarcă chestionarul utilizatorului.</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/usersurvey.cpp" line="82"/>
         <source>Ask again?</source>
         <translation>Întreabă iar?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/usersurvey.cpp" line="18"/>
-        <source>Send</source>
-        <translation>Trimitere</translation>
+        <location filename="../desktop-widgets/usersurvey.cpp" line="101"/>
+        <source>Submit user survey.</source>
+        <translation>Încarcă chestionarul utilizatorului.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/usersurvey.cpp" line="102"/>
@@ -8491,12 +8576,12 @@ Limba: %1</translation>
         <translation>Uploadează</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="324"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="325"/>
         <source>Operation timed out</source>
         <translation>Operațiunea a expirat</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="345"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="346"/>
         <source>Transferring data...</source>
         <translation>Se transferă datele...</translation>
     </message>
@@ -8531,18 +8616,18 @@ Limba: %1</translation>
 <context>
     <name>WriteSettingsThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1702"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1709"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1718"/>
-        <source>Failed!</source>
-        <translation>Fără succes!</translation>
-    </message>
-    <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1700"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1721"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1689"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1710"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Această funcționalitate nu este încă disponibilă pe acest tip de calculator de scufundări.</translation>
     </message>
+    <message>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1691"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1698"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1707"/>
+        <source>Failed!</source>
+        <translation>Fără succes!</translation>
+    </message>
 </context>
 <context>
     <name>YearlyStatisticsModel</name>
@@ -8667,7 +8752,7 @@ Medie</translation>
 <context>
     <name>getextFromC</name>
     <message>
-        <location filename="../core/libdivecomputer.c" line="674"/>
+        <location filename="../core/libdivecomputer.c" line="737"/>
         <source>Error parsing the header</source>
         <translation type="unfinished"/>
     </message>
@@ -8675,38 +8760,377 @@ Medie</translation>
 <context>
     <name>gettextFromC</name>
     <message>
+        <location filename="../core/cochran.c" line="309"/>
+        <location filename="../core/cochran.c" line="315"/>
+        <location filename="../core/cochran.c" line="385"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>deco stop</source>
+        <translation>oprire de decompresie</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="336"/>
+        <location filename="../core/cochran.c" line="390"/>
+        <location filename="../core/file.c" line="777"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>ascent</source>
+        <translation>ascensiune</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="342"/>
+        <location filename="../core/file.c" line="755"/>
+        <source>battery</source>
+        <translation>baterie</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="348"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
+        <source>OLF</source>
+        <translation>OLF</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="353"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
+        <source>maxdepth</source>
+        <translation>adâncime maximă</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="358"/>
+        <location filename="../core/cochran.c" line="404"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
+        <source>pO₂</source>
+        <translation>pO₂</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="365"/>
+        <location filename="../core/cochran.c" line="414"/>
+        <location filename="../core/cochran.c" line="421"/>
+        <location filename="../core/file.c" line="868"/>
+        <location filename="../core/libdivecomputer.c" line="225"/>
+        <location filename="../core/libdivecomputer.c" line="228"/>
+        <source>gaschange</source>
+        <translation>schimbarea gazului</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="370"/>
+        <location filename="../core/cochran.c" line="409"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>rbt</source>
+        <translation>rbt</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="379"/>
+        <location filename="../core/cochran.c" line="426"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>ceiling</source>
+        <translation>plafon</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="395"/>
+        <location filename="../core/libdivecomputer.c" line="224"/>
+        <source>transmitter</source>
+        <translation>transmițător</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="153"/>
+        <source>Error: the file does not appear to be a DATATRAK divelog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="286"/>
+        <source>clear</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="289"/>
+        <source>misty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="292"/>
+        <source>fog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="295"/>
+        <source>rain</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="298"/>
+        <source>storm</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="301"/>
+        <source>snow</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="321"/>
+        <source>No suit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="324"/>
+        <source>Shorty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="327"/>
+        <source>Combi</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="330"/>
+        <source>Wet suit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="333"/>
+        <source>Semidry suit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="336"/>
+        <source>Dry suit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="396"/>
+        <source>no stop</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="398"/>
+        <location filename="../core/dive.c" line="29"/>
+        <source>deco</source>
+        <translation>decompresie</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="400"/>
+        <source>single ascent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="402"/>
+        <source>multiple ascent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="404"/>
+        <location filename="../core/dive.c" line="27"/>
+        <source>fresh</source>
+        <translation>proaspăt</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="406"/>
+        <source>salt water</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="431"/>
+        <source>sight seeing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="433"/>
+        <source>club dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="435"/>
+        <location filename="../core/dive.c" line="28"/>
+        <source>instructor</source>
+        <translation>instructor</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="437"/>
+        <source>instruction</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="439"/>
+        <location filename="../core/dive.c" line="27"/>
+        <source>night</source>
+        <translation>noapte</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="441"/>
+        <location filename="../core/dive.c" line="25"/>
+        <source>cave</source>
+        <translation>peșteră</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="443"/>
+        <location filename="../core/dive.c" line="24"/>
+        <source>ice</source>
+        <translation>gheață</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="445"/>
+        <source>search</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="455"/>
+        <location filename="../core/dive.c" line="25"/>
+        <source>wreck</source>
+        <translation>epavă</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="457"/>
+        <location filename="../core/dive.c" line="26"/>
+        <source>river</source>
+        <translation>râu</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="459"/>
+        <location filename="../core/dive.c" line="23"/>
+        <source>drift</source>
+        <translation>derivă</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="461"/>
+        <location filename="../core/dive.c" line="28"/>
+        <source>photo</source>
+        <translation>fotografie</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="463"/>
+        <source>other</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="474"/>
+        <source>Other activities</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="498"/>
+        <source>Datatrak/Wlog notes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="537"/>
+        <source>Manually entered dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="588"/>
+        <source>Unknown</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="674"/>
+        <source>Error: couldn&apos;t open the file %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="687"/>
+        <source>Error: no dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="23"/>
+        <source>boat</source>
+        <translation>ambarcațiune</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="23"/>
+        <source>shore</source>
+        <translation>țărm</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="24"/>
+        <source>deep</source>
+        <translation>adânc</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="24"/>
+        <source>cavern</source>
+        <translation>cavernă</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="25"/>
+        <source>altitude</source>
+        <translation>altitudine</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="26"/>
+        <source>pool</source>
+        <translation>piscină</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="26"/>
+        <source>lake</source>
+        <translation>lac</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="27"/>
+        <source>student</source>
+        <translation>student</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="28"/>
+        <source>video</source>
+        <translation>videoclip</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="33"/>
+        <source>OC-gas</source>
+        <translation>Gaz-OC</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="33"/>
+        <source>diluent</source>
+        <translation>solvent</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="33"/>
+        <location filename="../core/equipment.c" line="88"/>
+        <location filename="../core/planner.c" line="1436"/>
+        <location filename="../core/planner.c" line="1439"/>
+        <source>oxygen</source>
+        <translation>oxigen</translation>
+    </message>
+    <message>
         <location filename="../core/dive.c" line="181"/>
         <source>pascal</source>
         <translation>Pascal</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="186"/>
-        <location filename="../core/qthelper.cpp" line="669"/>
+        <location filename="../core/qthelper.cpp" line="674"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="190"/>
-        <location filename="../core/qthelper.cpp" line="672"/>
+        <location filename="../core/qthelper.cpp" line="677"/>
         <source>psi</source>
         <translation>livre pe inch pătrat</translation>
     </message>
     <message>
+        <location filename="../core/dive.c" line="227"/>
+        <source>ℓ</source>
+        <translation>ℓ</translation>
+    </message>
+    <message>
         <location filename="../core/dive.c" line="232"/>
         <source>cuft</source>
         <translation>picioare cubice</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="269"/>
-        <location filename="../core/qthelper.cpp" line="590"/>
-        <location filename="../core/qthelper.cpp" line="605"/>
+        <location filename="../core/qthelper.cpp" line="595"/>
+        <location filename="../core/qthelper.cpp" line="610"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="274"/>
-        <location filename="../core/qthelper.cpp" line="593"/>
-        <location filename="../core/qthelper.cpp" line="607"/>
+        <location filename="../core/qthelper.cpp" line="598"/>
+        <location filename="../core/qthelper.cpp" line="612"/>
         <source>ft</source>
         <translation>picioare</translation>
     </message>
@@ -8732,53 +9156,58 @@ Medie</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="325"/>
-        <location filename="../core/qthelper.cpp" line="616"/>
-        <location filename="../core/qthelper.cpp" line="626"/>
+        <location filename="../core/qthelper.cpp" line="621"/>
+        <location filename="../core/qthelper.cpp" line="631"/>
         <source>lbs</source>
         <translation>livre</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="329"/>
-        <location filename="../core/qthelper.cpp" line="614"/>
-        <location filename="../core/qthelper.cpp" line="624"/>
+        <location filename="../core/qthelper.cpp" line="619"/>
+        <location filename="../core/qthelper.cpp" line="629"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="1772"/>
+        <location filename="../core/dive.c" line="1751"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) sau (%s)</translation>
     </message>
     <message>
-        <location filename="../core/divelist.c" line="484"/>
+        <location filename="../core/divelist.c" line="487"/>
         <location filename="../core/equipment.c" line="84"/>
-        <location filename="../core/planner.c" line="1411"/>
-        <location filename="../core/planner.c" line="1414"/>
+        <location filename="../core/planner.c" line="1432"/>
+        <location filename="../core/planner.c" line="1435"/>
         <source>air</source>
         <translation>aer</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="197"/>
+        <location filename="../core/equipment.c" line="86"/>
+        <source>EAN%d</source>
+        <translation>EAN%d</translation>
+    </message>
+    <message>
+        <location filename="../core/equipment.c" line="198"/>
         <source>integrated</source>
         <translation>integrat</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="198"/>
+        <location filename="../core/equipment.c" line="199"/>
         <source>belt</source>
         <translation>curea</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="199"/>
+        <location filename="../core/equipment.c" line="200"/>
         <source>ankle</source>
         <translation>gleznă</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="200"/>
+        <location filename="../core/equipment.c" line="201"/>
         <source>backplate weight</source>
         <translation>greutate placă spate</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="201"/>
+        <location filename="../core/equipment.c" line="202"/>
         <source>clip-on</source>
         <translation>clip-on</translation>
     </message>
@@ -8791,8 +9220,8 @@ Medie</translation>
         <location filename="../core/file.c" line="121"/>
         <location filename="../core/file.c" line="512"/>
         <location filename="../core/file.c" line="597"/>
-        <location filename="../core/file.c" line="924"/>
-        <location filename="../core/file.c" line="1056"/>
+        <location filename="../core/file.c" line="909"/>
+        <location filename="../core/file.c" line="1092"/>
         <location filename="../core/ostctools.c" line="80"/>
         <source>Failed to read &apos;%s&apos;</source>
         <translation>Nu s-a putut citi &apos;%s&apos;</translation>
@@ -8850,485 +9279,494 @@ Medie</translation>
         <translation>Calibrare O₂</translation>
     </message>
     <message>
-        <location filename="../core/file.c" line="887"/>
-        <source>No matching DC found for file &apos;%s&apos;</source>
-        <translation>Nu s-a putut găsi niciun calculator de scufundări pentru fișierul &apos;%s&apos;</translation>
+        <location filename="../core/git-access.c" line="134"/>
+        <source>Local cache directory %s corrupted - can&apos;t sync with Subsurface cloud storage</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>none</source>
-        <translation>niciunul</translation>
+        <location filename="../core/git-access.c" line="157"/>
+        <location filename="../core/git-access.c" line="177"/>
+        <source>Could not update local cache to newer remote data</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="309"/>
-        <location filename="../core/cochran.c" line="315"/>
-        <location filename="../core/cochran.c" line="385"/>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>deco stop</source>
-        <translation>oprire de decompresie</translation>
+        <location filename="../core/git-access.c" line="170"/>
+        <source>Subsurface cloud storage corrupted</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="342"/>
-        <location filename="../core/file.c" line="755"/>
-        <source>battery</source>
-        <translation>baterie</translation>
+        <location filename="../core/git-access.c" line="284"/>
+        <source>Could not update Subsurface cloud storage, try again later</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="370"/>
-        <location filename="../core/cochran.c" line="409"/>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>rbt</source>
-        <translation>rbt</translation>
+        <location filename="../core/git-access.c" line="344"/>
+        <source>Remote storage and local data diverged. Error: merge failed (%s)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="336"/>
-        <location filename="../core/cochran.c" line="390"/>
-        <location filename="../core/file.c" line="777"/>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>ascent</source>
-        <translation>ascensiune</translation>
+        <location filename="../core/git-access.c" line="374"/>
+        <source>Remote storage and local data diverged. Cannot combine local and remote changes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="379"/>
-        <location filename="../core/cochran.c" line="426"/>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>ceiling</source>
-        <translation>plafon</translation>
+        <location filename="../core/git-access.c" line="408"/>
+        <source>Remote storage and local data diverged</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>workload</source>
-        <translation>volum de muncă</translation>
+        <location filename="../core/git-access.c" line="411"/>
+        <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="395"/>
-        <location filename="../core/libdivecomputer.c" line="203"/>
-        <source>transmitter</source>
-        <translation>transmițător</translation>
+        <location filename="../core/git-access.c" line="420"/>
+        <source>Problems with local cache of Subsurface cloud data</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/git-access.c" line="421"/>
+        <source>Moved cache data to %s. Please try the operation again.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="203"/>
+        <location filename="../core/git-access.c" line="743"/>
+        <source>Error connecting to Subsurface cloud storage</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/git-access.c" line="746"/>
+        <source>git clone of %s failed (%s)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="210"/>
+        <location filename="../core/parse-xml.c" line="3317"/>
+        <location filename="../core/uemis-downloader.c" line="134"/>
+        <source>unknown</source>
+        <translation>necunoscut</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>none</source>
+        <translation>niciunul</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>workload</source>
+        <translation>volum de muncă</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="224"/>
         <source>violation</source>
         <translation>încălcare</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="203"/>
+        <location filename="../core/libdivecomputer.c" line="224"/>
         <source>bookmark</source>
         <translation>semn de carte</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="203"/>
+        <location filename="../core/libdivecomputer.c" line="224"/>
         <source>surface</source>
         <translation>suprafață</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="203"/>
+        <location filename="../core/libdivecomputer.c" line="224"/>
         <source>safety stop</source>
         <translation>oprire pentru siguranță</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="365"/>
-        <location filename="../core/cochran.c" line="414"/>
-        <location filename="../core/cochran.c" line="421"/>
-        <location filename="../core/file.c" line="868"/>
-        <location filename="../core/libdivecomputer.c" line="204"/>
-        <location filename="../core/libdivecomputer.c" line="207"/>
-        <source>gaschange</source>
-        <translation>schimbarea gazului</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="204"/>
+        <location filename="../core/libdivecomputer.c" line="225"/>
         <source>safety stop (voluntary)</source>
         <translation>oprire pentru siguranță (voluntară)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="204"/>
+        <location filename="../core/libdivecomputer.c" line="225"/>
         <source>safety stop (mandatory)</source>
         <translation>oprire pentru siguranță (obligatorie)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="205"/>
+        <location filename="../core/libdivecomputer.c" line="226"/>
         <source>deepstop</source>
         <translation>deepstop</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="205"/>
+        <location filename="../core/libdivecomputer.c" line="226"/>
         <source>ceiling (safety stop)</source>
         <translation>plafon (oprire pentru siguranță)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="205"/>
-        <source>divetime</source>
-        <translation>timp scufundare</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="205"/>
+        <location filename="../core/libdivecomputer.c" line="226"/>
         <source>below floor</source>
         <comment>event showing dive is below deco floor and adding deco time</comment>
         <translation>sub limită</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="353"/>
-        <location filename="../core/libdivecomputer.c" line="206"/>
-        <source>maxdepth</source>
-        <translation>adâncime maximă</translation>
-    </message>
-    <message>
-        <location filename="../core/cochran.c" line="348"/>
-        <location filename="../core/libdivecomputer.c" line="206"/>
-        <source>OLF</source>
-        <translation>OLF</translation>
+        <location filename="../core/libdivecomputer.c" line="226"/>
+        <source>divetime</source>
+        <translation>timp scufundare</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="206"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
         <source>airtime</source>
         <translation>timp aer rămas</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="206"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
         <source>rgbm</source>
         <translation>rgbm</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="206"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
         <source>heading</source>
         <translation>direcție</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="358"/>
-        <location filename="../core/cochran.c" line="404"/>
-        <location filename="../core/libdivecomputer.c" line="206"/>
-        <source>pO₂</source>
-        <translation>pO₂</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="207"/>
+        <location filename="../core/libdivecomputer.c" line="228"/>
         <source>tissue level warning</source>
         <translation>avertizare nivel țesut</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="207"/>
+        <location filename="../core/libdivecomputer.c" line="228"/>
         <source>non stop time</source>
         <translation>timp fără oprire</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="224"/>
+        <location filename="../core/libdivecomputer.c" line="237"/>
         <source>invalid event number</source>
         <translation>numărul evenimentul este invalid</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="658"/>
-        <source>Unable to create parser for %s %s</source>
-        <translation>Nu s-a putut crea parser pentru %s %s</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="664"/>
-        <source>Error registering the data</source>
-        <translation>Eroare înregistrând datele</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="495"/>
+        <location filename="../core/libdivecomputer.c" line="553"/>
         <source>Error parsing the datetime</source>
         <translation>Eroare parsând data</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="513"/>
+        <location filename="../core/libdivecomputer.c" line="571"/>
         <source>Dive %d: %s</source>
         <translation>Scufundarea %d: %s</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="519"/>
+        <location filename="../core/libdivecomputer.c" line="577"/>
         <source>Error parsing the divetime</source>
         <translation>Eroare parsând data</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="529"/>
+        <location filename="../core/libdivecomputer.c" line="587"/>
         <source>Error parsing the maxdepth</source>
         <translation>Eroare parsând adâncimea maximă</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="548"/>
+        <location filename="../core/libdivecomputer.c" line="606"/>
         <source>Error parsing temperature</source>
         <translation>Eroare parsând temperatura</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="568"/>
+        <location filename="../core/libdivecomputer.c" line="626"/>
         <source>Error parsing the gas mix count</source>
         <translation>Eroare parsând valoarea amestecului de gaz</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="580"/>
+        <location filename="../core/libdivecomputer.c" line="638"/>
         <source>Error obtaining water salinity</source>
         <translation>Eroare obținând salinitatea apei</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="589"/>
+        <location filename="../core/libdivecomputer.c" line="647"/>
         <source>Error obtaining surface pressure</source>
         <translation>Eroare obținând presiunea la suprafață</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="614"/>
+        <location filename="../core/libdivecomputer.c" line="672"/>
         <source>Error obtaining divemode</source>
         <translation>Eroare la obținerea modului de scufundare</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="634"/>
+        <location filename="../core/libdivecomputer.c" line="692"/>
         <source>Error parsing the gas mix</source>
         <translation>Eroare parsând amestecul de gaz</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="684"/>
+        <location filename="../core/libdivecomputer.c" line="717"/>
+        <source>Unable to create parser for %s %s</source>
+        <translation>Nu s-a putut crea parser pentru %s %s</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="723"/>
+        <source>Error registering the data</source>
+        <translation>Eroare înregistrând datele</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="744"/>
         <source>Error parsing the samples</source>
         <translation>Eroare parsând eșantioanele</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="822"/>
+        <location filename="../core/libdivecomputer.c" line="882"/>
         <source>Event: waiting for user action</source>
         <translation>Eveniment: aștept acțiunea utilizatorului</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="830"/>
+        <location filename="../core/libdivecomputer.c" line="890"/>
         <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="../core/libdivecomputer.c" line="894"/>
+        <location filename="../core/libdivecomputer.c" line="954"/>
         <source>Error registering the event handler.</source>
         <translation>Eroare la înregistrarea handlerului de evenimente.</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="899"/>
+        <location filename="../core/libdivecomputer.c" line="959"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Eroare la înregistrarea handlerului de anulare.</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="920"/>
+        <location filename="../core/libdivecomputer.c" line="980"/>
         <source>Dive data import error</source>
         <translation>Eroare la importarea datelor despre scufundare</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="959"/>
+        <location filename="../core/libdivecomputer.c" line="1019"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Nu s-a putut crea contextul libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="966"/>
+        <location filename="../core/libdivecomputer.c" line="1026"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Nu s-a putut deschide %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="992"/>
+        <location filename="../core/libdivecomputer.c" line="1048"/>
         <source>Insufficient privileges to open the device %s %s (%s)</source>
         <translation>Nu aveți drepturi suficiente pentru a deschide dispozitivul %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../core/parse-xml.c" line="517"/>
-        <source>Strange percentage reading %s
+        <location filename="../core/load-git.c" line="194"/>
+        <location filename="../core/parse-xml.c" line="1242"/>
+        <source>multiple GPS locations for this dive site; also %s
 </source>
-        <translation>Valoare procentuală neobișnuită %s
-</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/load-git.c" line="194"/>
-        <location filename="../core/parse-xml.c" line="1238"/>
-        <source>multiple GPS locations for this dive site; also %s
+        <location filename="../core/load-git.c" line="222"/>
+        <location filename="../core/parse-xml.c" line="1304"/>
+        <source>additional name for site: %s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/parse-xml.c" line="2044"/>
+        <location filename="../core/ostctools.c" line="120"/>
+        <location filename="../core/ostctools.c" line="152"/>
+        <source>Unknown DC in dive %d</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/ostctools.c" line="165"/>
+        <source>Error - %s - parsing dive %d</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/parse-xml.c" line="517"/>
+        <source>Strange percentage reading %s
+</source>
+        <translation>Valoare procentuală neobișnuită %s
+</translation>
+    </message>
+    <message>
+        <location filename="../core/parse-xml.c" line="2051"/>
         <source>Failed to parse &apos;%s&apos;</source>
         <translation>Nu s-a putut parsa &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../core/parse-xml.c" line="3741"/>
+        <location filename="../core/parse-xml.c" line="3774"/>
         <source>Can&apos;t open stylesheet %s</source>
         <translation>Nu s-a putut deschide stylesheet-ul %s</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="86"/>
-        <source>EAN%d</source>
-        <translation>EAN%d</translation>
+        <location filename="../core/planner.c" line="555"/>
+        <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE %s ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="1032"/>
-        <location filename="../core/planner.c" line="1184"/>
-        <source>Can&apos;t find gas %s</source>
-        <translation>Gazul %s nu a fost găsit</translation>
+        <location filename="../core/planner.c" line="569"/>
+        <source>Decompression calculation aborted due to excessive time</source>
+        <translation>Calculut decompresiei a fost abandonat deoarece dura prea mult</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="368"/>
-        <source>Too many gas mixes</source>
-        <translation>Prea multe amestecuri de gaz</translation>
+        <location filename="../core/planner.c" line="571"/>
+        <location filename="../core/planner.c" line="829"/>
+        <location filename="../core/planner.c" line="834"/>
+        <location filename="../core/planner.c" line="860"/>
+        <location filename="../core/planner.c" line="870"/>
+        <source>Warning:</source>
+        <translation>Avertizare:</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="568"/>
-        <source>Decompression calculation aborted due to excessive time</source>
-        <translation>Calculut decompresiei a fost abandonat deoarece dura prea mult</translation>
+        <location filename="../core/planner.c" line="581"/>
+        <source>based on Bühlmann ZHL-16C with GFlow = %d and GFhigh = %d</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="592"/>
+        <location filename="../core/planner.c" line="586"/>
+        <source>based on VPM-B at nominal conservatism</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="588"/>
+        <source>based on VPM-B at +%d conservatism</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="590"/>
+        <source>, effective GF=%d/%d</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="594"/>
+        <source>recreational mode based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="598"/>
         <source>Subsurface dive plan</source>
         <translation>Planul de scufundare Subsurface</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="596"/>
-        <source>depth</source>
-        <translation>adâncime</translation>
+        <location filename="../core/planner.c" line="599"/>
+        <source>&lt;div&gt;Runtime: %dmin&lt;/div&gt;&lt;br&gt;</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="602"/>
-        <source>runtime</source>
-        <translation>timp de rulare</translation>
+        <location filename="../core/planner.c" line="604"/>
+        <source>depth</source>
+        <translation>adâncime</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="599"/>
+        <location filename="../core/planner.c" line="607"/>
         <source>duration</source>
         <translation>durată</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="554"/>
-        <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE %s ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source>
-        <translation type="unfinished"/>
+        <location filename="../core/planner.c" line="610"/>
+        <source>runtime</source>
+        <translation>timp de rulare</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="605"/>
+        <location filename="../core/planner.c" line="613"/>
         <source>gas</source>
         <translation>gaz</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="648"/>
+        <location filename="../core/planner.c" line="656"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation>Tranziția la %.*f %s în %d:%02d min - timp de rulare %d:%02u în %s (SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="656"/>
+        <location filename="../core/planner.c" line="664"/>
         <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 de rulare %d:%02u în %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="669"/>
+        <location filename="../core/planner.c" line="677"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation>Stai la %.*f %s pentru %d:%02d min - timp de rulare %d:%02u în %s (SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="676"/>
+        <location filename="../core/planner.c" line="684"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source>
         <translation>Stai la %.*f %s pentru %d:%02d min - timp de rulare %d:%02u în %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="721"/>
+        <location filename="../core/planner.c" line="729"/>
         <source>%3.0f%s</source>
         <translation>%3.0f%s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="724"/>
-        <location filename="../core/planner.c" line="728"/>
+        <location filename="../core/planner.c" line="732"/>
+        <location filename="../core/planner.c" line="736"/>
         <source>%3dmin</source>
         <translation>%3dmin</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="737"/>
-        <location filename="../core/planner.c" line="749"/>
+        <location filename="../core/planner.c" line="745"/>
+        <location filename="../core/planner.c" line="757"/>
         <source>(SP = %.1fbar)</source>
         <translation>(SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="772"/>
+        <location filename="../core/planner.c" line="780"/>
         <source>Switch gas to %s (SP = %.1fbar)</source>
         <translation>Schimbă gazul la %s (SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="774"/>
+        <location filename="../core/planner.c" line="782"/>
         <source>Switch gas to %s</source>
         <translation>Schimbă gazul la %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="793"/>
+        <location filename="../core/planner.c" line="801"/>
         <source>CNS</source>
         <translation>CNS</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="795"/>
+        <location filename="../core/planner.c" line="803"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="799"/>
+        <location filename="../core/planner.c" line="807"/>
         <source>Gas consumption (CCR legs excluded):</source>
         <translation>Gaz consumat (picioarele CCR au fost excluse):</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="801"/>
+        <location filename="../core/planner.c" line="809"/>
         <source>Gas consumption:</source>
         <translation>Gaz consumat</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="570"/>
-        <location filename="../core/planner.c" line="821"/>
-        <location filename="../core/planner.c" line="826"/>
-        <location filename="../core/planner.c" line="851"/>
-        <location filename="../core/planner.c" line="861"/>
-        <source>Warning:</source>
-        <translation>Avertizare:</translation>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="580"/>
-        <source>based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="584"/>
-        <source>based on VPM-B at nominal conservatism</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="586"/>
-        <source>based on VPM-B at +%d conservatism</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="588"/>
-        <source>recreational mode based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="822"/>
+        <location filename="../core/planner.c" line="830"/>
         <source>this is more gas than available in the specified cylinder!</source>
         <translation>este necesar de mai mult gaz decât de cel disponibil in tub!</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="827"/>
+        <location filename="../core/planner.c" line="835"/>
         <source>not enough reserve for gas sharing on ascent!</source>
         <translation>nu există rezerve de gaz ce pot fi împărțite la urcare!</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="829"/>
+        <location filename="../core/planner.c" line="837"/>
         <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source>
         <translation>%.0f%s/%.0f%s din %s (%.0f%s/%.0f%s plănuite pentru urcare)</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="831"/>
+        <location filename="../core/planner.c" line="839"/>
         <source>%.0f%s (%.0f%s during planned ascent) of %s</source>
         <translation>%.0f%s (%.0f%s în timpul urcării planificate) din %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="848"/>
+        <location filename="../core/planner.c" line="857"/>
         <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
         <translation>valoare pO₂ mare %.2f la %d:%02u cu gazul %s la adâncimea %.*f %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="858"/>
+        <location filename="../core/planner.c" line="867"/>
         <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
         <translation>valoare pO₂ mică %.2f la %d:%02u cu gazul %s la adâncimea %.*f %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="1419"/>
+        <location filename="../core/planner.c" line="1194"/>
+        <source>Can&apos;t find gas %s</source>
+        <translation>Gazul %s nu a fost găsit</translation>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="1440"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1280"/>
+        <location filename="../core/profile.c" line="1298"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
@@ -9337,70 +9775,70 @@ D: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1283"/>
+        <location filename="../core/profile.c" line="1301"/>
         <source>P: %d%s
 </source>
         <translation>P: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1287"/>
+        <location filename="../core/profile.c" line="1305"/>
         <source>T: %.1f%s
 </source>
         <translation>T: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1293"/>
+        <location filename="../core/profile.c" line="1311"/>
         <source>V: %.1f%s
 </source>
         <translation>V: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1296"/>
+        <location filename="../core/profile.c" line="1314"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation>SAC: %.*f%s/min
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1298"/>
+        <location filename="../core/profile.c" line="1316"/>
         <source>CNS: %u%%
 </source>
         <translation>CNS: %u%%
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1300"/>
+        <location filename="../core/profile.c" line="1318"/>
         <source>pO%s: %.2fbar
 </source>
         <translation>pO%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1302"/>
+        <location filename="../core/profile.c" line="1320"/>
         <source>pN%s: %.2fbar
 </source>
         <translation>pN%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1304"/>
+        <location filename="../core/profile.c" line="1322"/>
         <source>pHe: %.2fbar
 </source>
         <translation>pHe: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1307"/>
+        <location filename="../core/profile.c" line="1325"/>
         <source>MOD: %d%s
 </source>
         <translation>MOD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1314"/>
+        <location filename="../core/profile.c" line="1332"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
@@ -9409,7 +9847,7 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1318"/>
+        <location filename="../core/profile.c" line="1336"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
@@ -9418,171 +9856,176 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1331"/>
+        <location filename="../core/profile.c" line="1349"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation>Oprire de siguranță: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1334"/>
+        <location filename="../core/profile.c" line="1352"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation>Oprire de siguranță: timp necunoscut @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1339"/>
+        <location filename="../core/profile.c" line="1357"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation>Decompresie: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1342"/>
+        <location filename="../core/profile.c" line="1360"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation>Decompresie: timp necunoscut @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1346"/>
+        <location filename="../core/profile.c" line="1364"/>
         <source>In deco
 </source>
         <translation>În decompresie
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1348"/>
+        <location filename="../core/profile.c" line="1366"/>
         <source>NDL: %umin
 </source>
         <translation>NDL: %umin
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1351"/>
+        <location filename="../core/profile.c" line="1369"/>
         <source>TTS: %umin
 </source>
         <translation>TTS: %umin
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1354"/>
+        <location filename="../core/profile.c" line="1372"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation>Decompresie: %umin @ %.0f%s (calc)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1362"/>
+        <location filename="../core/profile.c" line="1380"/>
         <source>In deco (calc)
 </source>
         <translation>În decompresie (calc)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1365"/>
+        <location filename="../core/profile.c" line="1383"/>
         <source>NDL: %umin (calc)
 </source>
         <translation>NDL: %umin (calc)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1367"/>
+        <location filename="../core/profile.c" line="1385"/>
         <source>NDL: &gt;2h (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1371"/>
+        <location filename="../core/profile.c" line="1389"/>
         <source>TTS: %umin (calc)
 </source>
         <translation>TTS: %umin (calc)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1373"/>
+        <location filename="../core/profile.c" line="1391"/>
         <source>TTS: &gt;2h (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1376"/>
+        <location filename="../core/profile.c" line="1394"/>
         <source>RBT: %umin
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1379"/>
+        <location filename="../core/profile.c" line="1397"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation>Limita calculată %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1385"/>
+        <location filename="../core/profile.c" line="1403"/>
         <source>Tissue %.0fmin: %.1f%s
 </source>
         <translation>Țesut %.0fmin: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1391"/>
+        <location filename="../core/profile.c" line="1409"/>
         <source>heartbeat: %d
 </source>
         <translation>puls: %d
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1393"/>
+        <location filename="../core/profile.c" line="1411"/>
         <source>bearing: %d
 </source>
         <translation>producere: %d
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1396"/>
+        <location filename="../core/profile.c" line="1414"/>
         <source>mean depth to here %.1f%s
 </source>
         <translation>adâncimea medie pana aici %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1491"/>
+        <location filename="../core/profile.c" line="1515"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1495"/>
-        <location filename="../core/profile.c" line="1499"/>
-        <location filename="../core/profile.c" line="1503"/>
+        <location filename="../core/profile.c" line="1519"/>
+        <location filename="../core/profile.c" line="1523"/>
+        <location filename="../core/profile.c" line="1527"/>
         <source>%s %sD:%.1f%s</source>
         <translation>%s %sD:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1507"/>
+        <location filename="../core/profile.c" line="1531"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sD:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1511"/>
+        <location filename="../core/profile.c" line="1535"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1515"/>
-        <location filename="../core/profile.c" line="1519"/>
+        <location filename="../core/profile.c" line="1539"/>
+        <location filename="../core/profile.c" line="1543"/>
         <source>%s %sV:%.2f%s</source>
         <translation>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1526"/>
+        <location filename="../core/profile.c" line="1550"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s</translation>
     </message>
     <message>
+        <location filename="../core/profile.c" line="1575"/>
+        <source>%s SAC:%.*f %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../core/qthelper.cpp" line="67"/>
         <source>%1km</source>
         <translation type="unfinished"/>
@@ -9603,446 +10046,460 @@ EADD: %d%s
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="635"/>
+        <location filename="../core/qthelper.cpp" line="91"/>
+        <location filename="../core/qthelper.cpp" line="226"/>
+        <source>N</source>
+        <translation>N</translation>
+    </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="91"/>
+        <location filename="../core/qthelper.cpp" line="227"/>
+        <source>S</source>
+        <translation>S</translation>
+    </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="92"/>
+        <location filename="../core/qthelper.cpp" line="228"/>
+        <source>E</source>
+        <translation>E</translation>
+    </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="92"/>
+        <location filename="../core/qthelper.cpp" line="229"/>
+        <source>W</source>
+        <translation>V</translation>
+    </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="640"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="638"/>
+        <location filename="../core/qthelper.cpp" line="643"/>
         <source>F</source>
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="23"/>
-        <source>boat</source>
-        <translation>ambarcațiune</translation>
+        <location filename="../core/save-html.c" line="469"/>
+        <location filename="../core/save-html.c" line="553"/>
+        <location filename="../core/worldmap-save.c" line="111"/>
+        <source>Can&apos;t open file %s</source>
+        <translation>Nu se poate deschide fișierul %s</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="23"/>
-        <source>shore</source>
-        <translation>țărm</translation>
+        <location filename="../core/save-html.c" line="488"/>
+        <source>Number</source>
+        <translation>Număr</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="459"/>
-        <location filename="../core/dive.c" line="23"/>
-        <source>drift</source>
-        <translation>derivă</translation>
+        <location filename="../core/save-html.c" line="489"/>
+        <source>Date</source>
+        <translation>Dată</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="24"/>
-        <source>deep</source>
-        <translation>adânc</translation>
+        <location filename="../core/save-html.c" line="490"/>
+        <source>Time</source>
+        <translation>Timp</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="24"/>
-        <source>cavern</source>
-        <translation>cavernă</translation>
+        <location filename="../core/save-html.c" line="491"/>
+        <source>Location</source>
+        <translation>Locație</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="443"/>
-        <location filename="../core/dive.c" line="24"/>
-        <source>ice</source>
-        <translation>gheață</translation>
+        <location filename="../core/save-html.c" line="492"/>
+        <source>Air temp.</source>
+        <translation>Temperatura aerului</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="445"/>
-        <source>search</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="493"/>
+        <source>Water temp.</source>
+        <translation>Temperatura apei</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="455"/>
-        <location filename="../core/dive.c" line="25"/>
-        <source>wreck</source>
-        <translation>epavă</translation>
+        <location filename="../core/save-html.c" line="494"/>
+        <source>Dives</source>
+        <translation>Scufundări</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="441"/>
-        <location filename="../core/dive.c" line="25"/>
-        <source>cave</source>
-        <translation>peșteră</translation>
+        <location filename="../core/save-html.c" line="495"/>
+        <source>Expand all</source>
+        <translation>Expandare totală</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="25"/>
-        <source>altitude</source>
-        <translation>altitudine</translation>
+        <location filename="../core/save-html.c" line="496"/>
+        <source>Collapse all</source>
+        <translation>Colapsare separată</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="26"/>
-        <source>pool</source>
-        <translation>piscină</translation>
+        <location filename="../core/save-html.c" line="497"/>
+        <source>Trips</source>
+        <translation>Excursii</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="26"/>
-        <source>lake</source>
-        <translation>lac</translation>
+        <location filename="../core/save-html.c" line="498"/>
+        <source>Statistics</source>
+        <translation>Statistici</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="457"/>
-        <location filename="../core/dive.c" line="26"/>
-        <source>river</source>
-        <translation>râu</translation>
+        <location filename="../core/save-html.c" line="499"/>
+        <source>Advanced search</source>
+        <translation>Căutare avansată</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="439"/>
-        <location filename="../core/dive.c" line="27"/>
-        <source>night</source>
-        <translation>noapte</translation>
+        <location filename="../core/save-html.c" line="502"/>
+        <source>Rating</source>
+        <translation>Rating</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="153"/>
-        <source>Error: the file does not appear to be a DATATRAK divelog</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="503"/>
+        <source>Visibility</source>
+        <translation>Vizibilitate</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="286"/>
-        <source>clear</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="504"/>
+        <source>Duration</source>
+        <translation>Durată</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="289"/>
-        <source>misty</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="505"/>
+        <source>Divemaster</source>
+        <translation>Maestru scufundare</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="292"/>
-        <source>fog</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="506"/>
+        <source>Buddy</source>
+        <translation>Însoțitor</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="295"/>
-        <source>rain</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="507"/>
+        <source>Suit</source>
+        <translation>Costum</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="298"/>
-        <source>storm</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="508"/>
+        <source>Tags</source>
+        <translation>Etichete</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="301"/>
-        <source>snow</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="509"/>
+        <location filename="../smtk-import/smartrak.c" line="251"/>
+        <location filename="../smtk-import/smartrak.c" line="321"/>
+        <source>Notes</source>
+        <translation>Notițe</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="321"/>
-        <source>No suit</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="510"/>
+        <source>Show more details</source>
+        <translation>Afișează mai multe detalii</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="324"/>
-        <source>Shorty</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="513"/>
+        <source>Yearly statistics</source>
+        <translation>Statistici anuale</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="327"/>
-        <source>Combi</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="514"/>
+        <source>Year</source>
+        <translation>An</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="330"/>
-        <source>Wet suit</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="515"/>
+        <source>Total time</source>
+        <translation>Timp total</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="333"/>
-        <source>Semidry suit</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="516"/>
+        <source>Average time</source>
+        <translation>Timp mediu</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="336"/>
-        <source>Dry suit</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="517"/>
+        <source>Shortest time</source>
+        <translation>Cel mai scurt timp</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="396"/>
-        <source>no stop</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="518"/>
+        <source>Longest time</source>
+        <translation>Cel mai lung timp</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="400"/>
-        <source>single ascent</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="519"/>
+        <source>Average depth</source>
+        <translation>Adâncime medie</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="402"/>
-        <source>multiple ascent</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="520"/>
+        <source>Min. depth</source>
+        <translation>Adâncime minimă</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="404"/>
-        <location filename="../core/dive.c" line="27"/>
-        <source>fresh</source>
-        <translation>proaspăt</translation>
+        <location filename="../core/save-html.c" line="521"/>
+        <source>Max. depth</source>
+        <translation>Adâncime maximă</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="406"/>
-        <source>salt water</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="522"/>
+        <source>Average SAC</source>
+        <translation>SAC mediu</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="431"/>
-        <source>sight seeing</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="523"/>
+        <source>Min. SAC</source>
+        <translation>SAC minim</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="433"/>
-        <source>club dive</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="524"/>
+        <source>Max. SAC</source>
+        <translation>SAC maxim</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="437"/>
-        <source>instruction</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="525"/>
+        <source>Average temp.</source>
+        <translation>Temperatura medie</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="463"/>
-        <source>other</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="526"/>
+        <source>Min. temp.</source>
+        <translation>Temperatura minimă</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="474"/>
-        <source>Other activities</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="527"/>
+        <source>Max. temp.</source>
+        <translation>Temperatura maximă</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="498"/>
-        <source>Datatrak/Wlog notes</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="528"/>
+        <source>Back to list</source>
+        <translation>Întoarcere la liste</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="537"/>
-        <source>Manually entered dive</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="531"/>
+        <source>Dive No.</source>
+        <translation>Numărul scufundării</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="588"/>
-        <source>Unknown</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="532"/>
+        <source>Dive profile</source>
+        <translation>Profil scufundare</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="674"/>
-        <source>Error: couldn&apos;t open the file %s</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="533"/>
+        <source>Dive information</source>
+        <translation>Infomații scufundare</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="687"/>
-        <source>Error: no dive</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="534"/>
+        <source>Dive equipment</source>
+        <translation>Echipament scufundare</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="27"/>
-        <source>student</source>
-        <translation>student</translation>
+        <location filename="../core/save-html.c" line="535"/>
+        <location filename="../core/save-html.c" line="542"/>
+        <source>Type</source>
+        <translation>Tip</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="461"/>
-        <location filename="../core/dive.c" line="28"/>
-        <source>photo</source>
-        <translation>fotografie</translation>
+        <location filename="../core/save-html.c" line="536"/>
+        <source>Size</source>
+        <translation>Mărime</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="28"/>
-        <source>video</source>
-        <translation>videoclip</translation>
+        <location filename="../core/save-html.c" line="537"/>
+        <source>Work pressure</source>
+        <translation>Presiune de lucru</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="435"/>
-        <location filename="../core/dive.c" line="28"/>
-        <source>instructor</source>
-        <translation>instructor</translation>
+        <location filename="../core/save-html.c" line="538"/>
+        <source>Start pressure</source>
+        <translation>Începutul presiunii</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="398"/>
-        <location filename="../core/dive.c" line="29"/>
-        <source>deco</source>
-        <translation>decompresie</translation>
+        <location filename="../core/save-html.c" line="539"/>
+        <source>End pressure</source>
+        <translation>Sfârșitul presiunii</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="33"/>
-        <source>OC-gas</source>
-        <translation>Gaz-OC</translation>
+        <location filename="../core/save-html.c" line="540"/>
+        <source>Gas</source>
+        <translation>Gaz</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="33"/>
-        <source>diluent</source>
-        <translation>solvent</translation>
+        <location filename="../core/save-html.c" line="541"/>
+        <source>Weight</source>
+        <translation>Greutate</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="33"/>
-        <location filename="../core/equipment.c" line="88"/>
-        <location filename="../core/planner.c" line="1415"/>
-        <location filename="../core/planner.c" line="1418"/>
-        <source>oxygen</source>
-        <translation>oxigen</translation>
+        <location filename="../core/save-html.c" line="543"/>
+        <source>Events</source>
+        <translation>Evenimente</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="227"/>
-        <source>ℓ</source>
-        <translation>ℓ</translation>
+        <location filename="../core/save-html.c" line="544"/>
+        <source>Name</source>
+        <translation>Nume</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="239"/>
+        <location filename="../core/save-html.c" line="545"/>
+        <source>Value</source>
+        <translation>Valoare</translation>
+    </message>
+    <message>
+        <location filename="../core/save-html.c" line="546"/>
+        <source>Coordinates</source>
+        <translation>Coordonate</translation>
+    </message>
+    <message>
+        <location filename="../core/save-html.c" line="547"/>
+        <source>Dive status</source>
+        <translation>Starea scufundării</translation>
+    </message>
+    <message>
+        <location filename="../core/statistics.c" line="242"/>
         <source>more than %d days</source>
         <translation>mai mult de %d zile</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="246"/>
+        <location filename="../core/statistics.c" line="249"/>
         <source>%dd %dh %dmin</source>
         <translation>%dz %do %dmin</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="249"/>
+        <location filename="../core/statistics.c" line="252"/>
         <source>%dmin %dsecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="251"/>
+        <location filename="../core/statistics.c" line="254"/>
         <source>%dh %dmin</source>
         <translation>%do %dmin</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="263"/>
+        <location filename="../core/statistics.c" line="266"/>
         <source>for dives #</source>
         <translation>pentru scufundările nr.</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="269"/>
+        <location filename="../core/statistics.c" line="272"/>
         <source>for selected dives</source>
         <translation>pentru scufundările selectate</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="304"/>
+        <location filename="../core/statistics.c" line="307"/>
         <source>for dive #%d</source>
         <translation>pentru scufundarea nr. %d</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="306"/>
+        <location filename="../core/statistics.c" line="309"/>
         <source>for selected dive</source>
         <translation>pentru scufundarea selectată</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="308"/>
+        <location filename="../core/statistics.c" line="311"/>
         <source>for all dives</source>
         <translation>pentru toate scufundările</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="310"/>
+        <location filename="../core/statistics.c" line="313"/>
         <source>(no dives)</source>
         <translation>(nicio scufundare)</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Sun</source>
         <translation>Duminică</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Mon</source>
         <translation>Luni</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Tue</source>
         <translation>Marți</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Wed</source>
         <translation>Miercuri</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Thu</source>
         <translation>Joi</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Fri</source>
         <translation>Vineri</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Sat</source>
         <translation>Sâmbătă</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Jan</source>
         <translation>Jan</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Feb</source>
         <translation>Feb</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Mar</source>
         <translation>Mar</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Apr</source>
         <translation>Apr</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>May</source>
         <translation>Mai</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Jun</source>
         <translation>Iun</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Jul</source>
         <translation>Iul</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Aug</source>
         <translation>Aug</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Sep</source>
         <translation>Sep</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Oct</source>
         <translation>Oct</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Nov</source>
         <translation>Noi</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Dec</source>
         <translation>Dec</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="191"/>
-        <location filename="../core/parse-xml.c" line="3284"/>
-        <location filename="../core/uemis-downloader.c" line="134"/>
-        <source>unknown</source>
-        <translation>necunoscut</translation>
-    </message>
-    <message>
-        <location filename="../core/uemis-downloader.c" line="467"/>
-        <source>data</source>
-        <translation>data</translation>
-    </message>
-    <message>
-        <location filename="../core/uemis-downloader.c" line="447"/>
-        <source>%s %s</source>
-        <translation>%s %s</translation>
-    </message>
-    <message>
         <location filename="../core/uemis-downloader.c" line="27"/>
         <source>Uemis Zurich: the file system is almost full.
 Disconnect/reconnect the dive computer
@@ -10071,6 +10528,16 @@ Este conectat corect dispozitivul Uemis Zurich?</translation>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../core/uemis-downloader.c" line="447"/>
+        <source>%s %s</source>
+        <translation>%s %s</translation>
+    </message>
+    <message>
+        <location filename="../core/uemis-downloader.c" line="467"/>
+        <source>data</source>
+        <translation>data</translation>
+    </message>
+    <message>
         <location filename="../core/uemis-downloader.c" line="495"/>
         <source>divelog #</source>
         <translation>scufundare #</translation>
@@ -10241,281 +10708,6 @@ Este conectat corect dispozitivul Uemis Zurich?</translation>
         <translation>Alertă baterie scăzută</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="469"/>
-        <location filename="../core/save-html.c" line="553"/>
-        <location filename="../core/worldmap-save.c" line="111"/>
-        <source>Can&apos;t open file %s</source>
-        <translation>Nu se poate deschide fișierul %s</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="488"/>
-        <source>Number</source>
-        <translation>Număr</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="489"/>
-        <source>Date</source>
-        <translation>Dată</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="490"/>
-        <source>Time</source>
-        <translation>Timp</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="491"/>
-        <source>Location</source>
-        <translation>Locație</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="492"/>
-        <source>Air temp.</source>
-        <translation>Temperatura aerului</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="493"/>
-        <source>Water temp.</source>
-        <translation>Temperatura apei</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="498"/>
-        <source>Statistics</source>
-        <translation>Statistici</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="502"/>
-        <source>Rating</source>
-        <translation>Rating</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="503"/>
-        <source>Visibility</source>
-        <translation>Vizibilitate</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="504"/>
-        <source>Duration</source>
-        <translation>Durată</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="494"/>
-        <source>Dives</source>
-        <translation>Scufundări</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="495"/>
-        <source>Expand all</source>
-        <translation>Expandare totală</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="496"/>
-        <source>Collapse all</source>
-        <translation>Colapsare separată</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="497"/>
-        <source>Trips</source>
-        <translation>Excursii</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="499"/>
-        <source>Advanced search</source>
-        <translation>Căutare avansată</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="505"/>
-        <source>Divemaster</source>
-        <translation>Maestru scufundare</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="506"/>
-        <source>Buddy</source>
-        <translation>Însoțitor</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="507"/>
-        <source>Suit</source>
-        <translation>Costum</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="508"/>
-        <source>Tags</source>
-        <translation>Etichete</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="509"/>
-        <location filename="../smtk-import/smartrak.c" line="251"/>
-        <location filename="../smtk-import/smartrak.c" line="321"/>
-        <source>Notes</source>
-        <translation>Notițe</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="510"/>
-        <source>Show more details</source>
-        <translation>Afișează mai multe detalii</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="513"/>
-        <source>Yearly statistics</source>
-        <translation>Statistici anuale</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="514"/>
-        <source>Year</source>
-        <translation>An</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="515"/>
-        <source>Total time</source>
-        <translation>Timp total</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="516"/>
-        <source>Average time</source>
-        <translation>Timp mediu</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="517"/>
-        <source>Shortest time</source>
-        <translation>Cel mai scurt timp</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="518"/>
-        <source>Longest time</source>
-        <translation>Cel mai lung timp</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="519"/>
-        <source>Average depth</source>
-        <translation>Adâncime medie</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="520"/>
-        <source>Min. depth</source>
-        <translation>Adâncime minimă</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="521"/>
-        <source>Max. depth</source>
-        <translation>Adâncime maximă</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="523"/>
-        <source>Min. SAC</source>
-        <translation>SAC minim</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="524"/>
-        <source>Max. SAC</source>
-        <translation>SAC maxim</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="525"/>
-        <source>Average temp.</source>
-        <translation>Temperatura medie</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="526"/>
-        <source>Min. temp.</source>
-        <translation>Temperatura minimă</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="527"/>
-        <source>Max. temp.</source>
-        <translation>Temperatura maximă</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="528"/>
-        <source>Back to list</source>
-        <translation>Întoarcere la liste</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="534"/>
-        <source>Dive equipment</source>
-        <translation>Echipament scufundare</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="537"/>
-        <source>Work pressure</source>
-        <translation>Presiune de lucru</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="538"/>
-        <source>Start pressure</source>
-        <translation>Începutul presiunii</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="539"/>
-        <source>End pressure</source>
-        <translation>Sfârșitul presiunii</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="547"/>
-        <source>Dive status</source>
-        <translation>Starea scufundării</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="522"/>
-        <source>Average SAC</source>
-        <translation>SAC mediu</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="531"/>
-        <source>Dive No.</source>
-        <translation>Numărul scufundării</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="532"/>
-        <source>Dive profile</source>
-        <translation>Profil scufundare</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="533"/>
-        <source>Dive information</source>
-        <translation>Infomații scufundare</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="535"/>
-        <location filename="../core/save-html.c" line="542"/>
-        <source>Type</source>
-        <translation>Tip</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="536"/>
-        <source>Size</source>
-        <translation>Mărime</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="540"/>
-        <source>Gas</source>
-        <translation>Gaz</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="541"/>
-        <source>Weight</source>
-        <translation>Greutate</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="543"/>
-        <source>Events</source>
-        <translation>Evenimente</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="544"/>
-        <source>Name</source>
-        <translation>Nume</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="545"/>
-        <source>Value</source>
-        <translation>Valoare</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="546"/>
-        <source>Coordinates</source>
-        <translation>Coordonate</translation>
-    </message>
-    <message>
         <location filename="../core/worldmap-save.c" line="39"/>
         <source>Date:</source>
         <translation>Dată:</translation>
@@ -10561,109 +10753,6 @@ Este conectat corect dispozitivul Uemis Zurich?</translation>
         <translation>Notițe</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="91"/>
-        <location filename="../core/qthelper.cpp" line="226"/>
-        <source>N</source>
-        <translation>N</translation>
-    </message>
-    <message>
-        <location filename="../core/qthelper.cpp" line="91"/>
-        <location filename="../core/qthelper.cpp" line="227"/>
-        <source>S</source>
-        <translation>S</translation>
-    </message>
-    <message>
-        <location filename="../core/qthelper.cpp" line="92"/>
-        <location filename="../core/qthelper.cpp" line="228"/>
-        <source>E</source>
-        <translation>E</translation>
-    </message>
-    <message>
-        <location filename="../core/qthelper.cpp" line="92"/>
-        <location filename="../core/qthelper.cpp" line="229"/>
-        <source>W</source>
-        <translation>V</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="341"/>
-        <source>Remote storage and local data diverged. Error: merge failed (%s)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="134"/>
-        <source>Local cache directory %s corrupted - can&apos;t sync with Subsurface cloud storage</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="157"/>
-        <location filename="../core/git-access.c" line="177"/>
-        <source>Could not update local cache to newer remote data</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="170"/>
-        <source>Subsurface cloud storage corrupted</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="285"/>
-        <source>Could not update Subsurface cloud storage, try again later</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="371"/>
-        <source>Remote storage and local data diverged. Cannot combine local and remote changes</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="405"/>
-        <source>Remote storage and local data diverged</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="408"/>
-        <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="417"/>
-        <source>Problems with local cache of Subsurface cloud data</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="418"/>
-        <source>Moved cache data to %s. Please try the operation again.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="737"/>
-        <source>Error connecting to Subsurface cloud storage</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="740"/>
-        <source>git clone of %s failed (%s)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/load-git.c" line="222"/>
-        <location filename="../core/parse-xml.c" line="1300"/>
-        <source>additional name for site: %s
-</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/ostctools.c" line="120"/>
-        <location filename="../core/ostctools.c" line="152"/>
-        <source>Unknown DC in dive %d</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/ostctools.c" line="165"/>
-        <source>Error - %s - parsing dive %d</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../smtk-import/smartrak.c" line="247"/>
         <source>Built</source>
         <translation type="unfinished"/>
@@ -10747,155 +10836,120 @@ Este conectat corect dispozitivul Uemis Zurich?</translation>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="91"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="103"/>
         <source>Subsurface</source>
         <translation>Subsurface</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="97"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="110"/>
         <source>Dive list</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="112"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="125"/>
         <source>Cloud credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="126"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="139"/>
         <source>Manage dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="138"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="141"/>
         <source>Add dive manually</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="146"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="149"/>
         <source>Manual sync with cloud</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="164"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="167"/>
         <source>Offline mode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="164"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="167"/>
         <source>Enable auto cloud sync</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="182"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="187"/>
         <source>GPS</source>
         <translation>GPS</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="185"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="190"/>
         <source>GPS-tag dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="192"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="197"/>
         <source>Upload GPS data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="199"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="204"/>
         <source>Download GPS data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="206"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="211"/>
         <source>Show GPS fixes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="215"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="220"/>
         <source>Clear GPS cache</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="221"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="226"/>
         <source>Preferences</source>
         <translation>Preferințe</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="230"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="237"/>
         <source>Developer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="232"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="239"/>
         <source>App log</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="239"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="246"/>
         <source>Theme information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="246"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="253"/>
         <source>User manual</source>
         <translation>Manual de utilizare</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="252"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="259"/>
         <source>About</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="283"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="304"/>
         <source>Run location service</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="283"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="304"/>
         <source>No GPS source available</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="295"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="316"/>
         <source>Actions</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="9"/>
-        <source>Hello World</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="13"/>
-        <source>File</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="15"/>
-        <source>&amp;Open</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="19"/>
-        <source>Exit</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="27"/>
-        <source>Button 1 pressed</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="28"/>
-        <source>Button 2 pressed</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="33"/>
-        <source>May I have your attention, please?</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>plannerDetails</name>
@@ -10973,6 +11027,24 @@ p, li { white-space: pre-wrap; }
         <translation>m/min</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="121"/>
+        <location filename="../build/ui_plannerSettings.h" line="425"/>
+        <source>75% to 50% avg. depth</source>
+        <translation>75% până la 50% adâncime medie</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="138"/>
+        <location filename="../build/ui_plannerSettings.h" line="427"/>
+        <source>50% avg. depth to 6m</source>
+        <translation>50% adâncime medie până la 6m</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="155"/>
+        <location filename="../build/ui_plannerSettings.h" line="429"/>
+        <source>6m to surface</source>
+        <translation>6m până la suprafață</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="175"/>
         <location filename="../build/ui_plannerSettings.h" line="431"/>
         <source>Descent</source>
@@ -10996,12 +11068,35 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="268"/>
+        <source>Bühlmann deco</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="278"/>
         <location filename="../build/ui_plannerSettings.h" line="445"/>
         <source>Reserve gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="288"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="549"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="578"/>
+        <location filename="../build/ui_plannerSettings.h" line="446"/>
+        <location filename="../build/ui_plannerSettings.h" line="459"/>
+        <location filename="../build/ui_plannerSettings.h" line="461"/>
+        <source>bar</source>
+        <translation>bar</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="307"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="416"/>
+        <location filename="../build/ui_plannerSettings.h" line="437"/>
+        <location filename="../build/ui_plannerSettings.h" line="440"/>
+        <source>%</source>
+        <translation>%</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="320"/>
         <location filename="../build/ui_plannerSettings.h" line="449"/>
         <source>Postpone gas change if a stop is not required</source>
@@ -11020,12 +11115,10 @@ p, li { white-space: pre-wrap; }
         <translation>GF low</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="307"/>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="416"/>
-        <location filename="../build/ui_plannerSettings.h" line="437"/>
-        <location filename="../build/ui_plannerSettings.h" line="440"/>
-        <source>%</source>
-        <translation>%</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="353"/>
+        <location filename="../build/ui_plannerSettings.h" line="436"/>
+        <source>Plan backgas breaks</source>
+        <translation>Pauze backgas planificate</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="360"/>
@@ -11034,10 +11127,10 @@ p, li { white-space: pre-wrap; }
         <translation>GF high</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="429"/>
-        <location filename="../build/ui_plannerSettings.h" line="441"/>
-        <source>Drop to first depth</source>
-        <translation>Elimimă prima adâncime</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="370"/>
+        <location filename="../build/ui_plannerSettings.h" line="453"/>
+        <source>min</source>
+        <translation>min</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="389"/>
@@ -11046,163 +11139,139 @@ p, li { white-space: pre-wrap; }
         <translation>Ultima oprire la 6m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="353"/>
-        <location filename="../build/ui_plannerSettings.h" line="436"/>
-        <source>Plan backgas breaks</source>
-        <translation>Pauze backgas planificate</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="396"/>
+        <source>Maximize bottom time allowed by gas and no decompression limits</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="515"/>
-        <location filename="../build/ui_plannerSettings.h" line="455"/>
-        <source>Gas options</source>
-        <translation>Opțiuni gaz</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="399"/>
+        <location filename="../build/ui_plannerSettings.h" line="443"/>
+        <source>Recreational mode</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="594"/>
-        <location filename="../build/ui_plannerSettings.h" line="456"/>
-        <source>Bottom SAC</source>
-        <translation>SAC</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="429"/>
+        <location filename="../build/ui_plannerSettings.h" line="441"/>
+        <source>Drop to first depth</source>
+        <translation>Elimimă prima adâncime</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="692"/>
-        <location filename="../build/ui_plannerSettings.h" line="457"/>
-        <source>Deco SAC</source>
-        <translation>Decompresie SAC</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="436"/>
+        <location filename="../build/ui_plannerSettings.h" line="452"/>
+        <source>Min. switch duration</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="601"/>
-        <location filename="../build/ui_plannerSettings.h" line="458"/>
-        <source>Bottom pO₂</source>
-        <translation>Limită pO₂</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="459"/>
+        <location filename="../build/ui_plannerSettings.h" line="444"/>
+        <source>Safety stop</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="685"/>
-        <location filename="../build/ui_plannerSettings.h" line="460"/>
-        <source>Deco pO₂</source>
-        <translation>Decompresie pO₂</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="495"/>
+        <source>Conservatism level</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="515"/>
+        <location filename="../build/ui_plannerSettings.h" line="455"/>
+        <source>Gas options</source>
+        <translation>Opțiuni gaz</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="565"/>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="672"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="698"/>
         <location filename="../build/ui_plannerSettings.h" line="462"/>
         <location filename="../build/ui_plannerSettings.h" line="463"/>
         <source>ℓ/min</source>
         <translation>ℓ/min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="632"/>
-        <location filename="../build/ui_plannerSettings.h" line="468"/>
-        <source>Display runtime</source>
-        <translation>Afișează timpul rulării</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="645"/>
-        <location filename="../build/ui_plannerSettings.h" line="472"/>
-        <source>Display segment duration</source>
-        <translation>Afișează durata segmentului</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="655"/>
-        <location filename="../build/ui_plannerSettings.h" line="476"/>
-        <source>Display transitions in deco</source>
-        <translation>Afișează tranzițiile de decompresie</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="662"/>
-        <location filename="../build/ui_plannerSettings.h" line="477"/>
-        <source>Verbatim dive plan</source>
-        <translation>Plan de scufundare textual</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="288"/>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="549"/>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="578"/>
-        <location filename="../build/ui_plannerSettings.h" line="446"/>
-        <location filename="../build/ui_plannerSettings.h" line="459"/>
-        <location filename="../build/ui_plannerSettings.h" line="461"/>
-        <source>bar</source>
-        <translation>bar</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="121"/>
-        <location filename="../build/ui_plannerSettings.h" line="425"/>
-        <source>75% to 50% avg. depth</source>
-        <translation>75% până la 50% adâncime medie</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="138"/>
-        <location filename="../build/ui_plannerSettings.h" line="427"/>
-        <source>50% avg. depth to 6m</source>
-        <translation>50% adâncime medie până la 6m</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="155"/>
-        <location filename="../build/ui_plannerSettings.h" line="429"/>
-        <source>6m to surface</source>
-        <translation>6m până la suprafață</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="268"/>
-        <source>Bühlmann deco</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="370"/>
-        <location filename="../build/ui_plannerSettings.h" line="453"/>
-        <source>min</source>
-        <translation>min</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="396"/>
-        <source>Maximize bottom time allowed by gas and no decompression limits</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="594"/>
+        <source>m</source>
+        <translation>m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="399"/>
-        <location filename="../build/ui_plannerSettings.h" line="443"/>
-        <source>Recreational mode</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="606"/>
+        <source>Used to calculate best mix. Select best mix depth in &apos;Available gases&apos; table by entering gas depth, followed by &quot;B&quot; (best trimix mix) or &quot;BN&quot; (best nitrox mix)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="436"/>
-        <location filename="../build/ui_plannerSettings.h" line="452"/>
-        <source>Min. switch duration</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="613"/>
+        <location filename="../build/ui_plannerSettings.h" line="456"/>
+        <source>Bottom SAC</source>
+        <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="459"/>
-        <location filename="../build/ui_plannerSettings.h" line="444"/>
-        <source>Safety stop</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="620"/>
+        <location filename="../build/ui_plannerSettings.h" line="458"/>
+        <source>Bottom pO₂</source>
+        <translation>Limită pO₂</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="495"/>
-        <source>Conservatism level</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="627"/>
+        <source>Best mix END</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="608"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="634"/>
         <location filename="../build/ui_plannerSettings.h" line="464"/>
         <source>Notes</source>
         <translation>Notițe</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="629"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="655"/>
         <location filename="../build/ui_plannerSettings.h" line="466"/>
         <source>In dive plan, show runtime (absolute time) of stops</source>
         <translation>Afișează în planul de scufundare timpul de execuție (timpul absolut) al opririlor</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="642"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="658"/>
+        <location filename="../build/ui_plannerSettings.h" line="468"/>
+        <source>Display runtime</source>
+        <translation>Afișează timpul rulării</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="668"/>
         <location filename="../build/ui_plannerSettings.h" line="470"/>
         <source>In dive plan, show duration (relative time) of stops</source>
         <translation>Afișează în planul de scufundare timpul de execuție (timpul relativ) al opririlor</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="652"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="671"/>
+        <location filename="../build/ui_plannerSettings.h" line="472"/>
+        <source>Display segment duration</source>
+        <translation>Afișează durata segmentului</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="678"/>
         <location filename="../build/ui_plannerSettings.h" line="474"/>
         <source>In diveplan, list transitions or treat them as implicit</source>
         <translation>Afișează în planul de scufundare lista de tranziții sau tratează-le ca fiind implicite</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="681"/>
+        <location filename="../build/ui_plannerSettings.h" line="476"/>
+        <source>Display transitions in deco</source>
+        <translation>Afișează tranzițiile de decompresie</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="688"/>
+        <location filename="../build/ui_plannerSettings.h" line="477"/>
+        <source>Verbatim dive plan</source>
+        <translation>Plan de scufundare textual</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="711"/>
+        <location filename="../build/ui_plannerSettings.h" line="460"/>
+        <source>Deco pO₂</source>
+        <translation>Decompresie pO₂</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="718"/>
+        <location filename="../build/ui_plannerSettings.h" line="457"/>
+        <source>Deco SAC</source>
+        <translation>Decompresie SAC</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 a95df73d2..3594f3164 100644
--- a/translations/subsurface_ru_RU.ts
+++ b/translations/subsurface_ru_RU.ts
@@ -105,6 +105,11 @@
         <translation>Название:</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="56"/>
+        <source>Could not initialize Winsock version 2.2</source>
+        <translation>Ошибка инициализации Winsock 2.2</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="134"/>
         <source>Trying to turn on the local Bluetooth device...</source>
         <translation>Включение локального устройства Bluetooth...</translation>
@@ -115,6 +120,11 @@
         <translation>Выключение локального устройства Bluetooth...</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="167"/>
+        <source>Remote devices list was cleared.</source>
+        <translation>Список удаленных устройств очищен.</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="183"/>
         <source>Scanning for remote devices...</source>
         <translation>Сканирование устройств...</translation>
@@ -125,6 +135,22 @@
         <translation>Сканирование завершено.</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="208"/>
+        <source>The local Bluetooth device was %1.</source>
+        <extracomment>%1 will be replaced with &quot;turned on&quot; or &quot;turned off&quot;</extracomment>
+        <translation>Локальное устройство Bluetooth было %1.</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
+        <source>turned on</source>
+        <translation>включено</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
+        <source>turned off</source>
+        <translation>выключено</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="225"/>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="339"/>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="359"/>
@@ -172,37 +198,6 @@
         <translation>Сопряжение</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="352"/>
-        <source>Device %1 was paired and is authorized.</source>
-        <translation>Устройство %1 авторизовано и сопряжено.</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="56"/>
-        <source>Could not initialize Winsock version 2.2</source>
-        <translation>Ошибка инициализации Winsock 2.2</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="167"/>
-        <source>Remote devices list was cleared.</source>
-        <translation>Список удаленных устройств очищен.</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="208"/>
-        <source>The local Bluetooth device was %1.</source>
-        <extracomment>%1 will be replaced with &quot;turned on&quot; or &quot;turned off&quot;</extracomment>
-        <translation>Локальное устройство Bluetooth было %1.</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
-        <source>turned on</source>
-        <translation>включено</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
-        <source>turned off</source>
-        <translation>выключено</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="307"/>
         <source>Remove pairing</source>
         <translation>Удалить сопряжение</translation>
@@ -228,6 +223,11 @@
         <translation>Устройство %1 сопряжено.</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="352"/>
+        <source>Device %1 was paired and is authorized.</source>
+        <translation>Устройство %1 авторизовано и сопряжено.</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="378"/>
         <source>The device %1 can now be used for connection. You can press the Save button.</source>
         <translation>Устройство %1 может быть использовано для соединения. Нажмите кнопку Сохранить.</translation>
@@ -286,12 +286,12 @@
 <context>
     <name>BuddyFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="621"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="619"/>
         <source>Person: </source>
         <translation>Люди:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="622"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="620"/>
         <source>Searches for buddies and divemasters</source>
         <translation>Поиск партнеров и инструкторов</translation>
     </message>
@@ -299,7 +299,7 @@
 <context>
     <name>BuddyFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="243"/>
+        <location filename="../qt-models/filtermodels.cpp" line="248"/>
         <source>No buddies</source>
         <translation>Без напарника</translation>
     </message>
@@ -307,25 +307,30 @@
 <context>
     <name>CloudCredentials</name>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="49"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="50"/>
         <source>Cloud credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="55"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="56"/>
         <source>Email</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="67"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="68"/>
         <source>Password</source>
         <translation>Пароль</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="90"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="92"/>
         <source>Show password</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="97"/>
+        <source>PIN</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>ColumnNameProvider</name>
@@ -381,6 +386,16 @@
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
+        <source>Max. depth</source>
+        <translation>Макс. глубина</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
+        <source>Avg. depth</source>
+        <translation>Сред. глубина</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
         <source>Divemaster</source>
         <translation>Инструктор</translation>
     </message>
@@ -391,6 +406,11 @@
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
+        <source>Suit</source>
+        <translation>Костюм</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
         <source>Notes</source>
         <translation>Примечания</translation>
     </message>
@@ -410,21 +430,6 @@
         <translation>Темп. воды</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
-        <source>Max. depth</source>
-        <translation>Макс. глубина</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
-        <source>Avg. depth</source>
-        <translation>Сред. глубина</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
-        <source>Suit</source>
-        <translation>Костюм</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="44"/>
         <source>O₂</source>
         <translation>O₂</translation>
@@ -538,7 +543,7 @@
         <translation>Невозможно создать контекст libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../core/configuredivecomputer.cpp" line="660"/>
+        <location filename="../core/configuredivecomputer.cpp" line="656"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation>Невозможно установить соединение с дайвкомпьютером.</translation>
     </message>
@@ -558,11 +563,19 @@
         <translation>Устройство или точка монтирования</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="170"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1520"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1533"/>
-        <source>...</source>
-        <translation>...</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="47"/>
+        <source>Connect via Bluetooth</source>
+        <translation>Bluetooth</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="54"/>
+        <source>Connect</source>
+        <translation>Подключить</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="64"/>
+        <source>Disconnect</source>
+        <translation>Отключить</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="80"/>
@@ -571,12 +584,24 @@
         <translation>Загрузить настройки</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="90"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1523"/>
+        <source>Read settings from backup file or from device before writing to the device</source>
+        <translation>Загрузить настройки из резервной копии или устройства перед сохранением в устройство</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="93"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1525"/>
         <source>Save changes to device</source>
         <translation>Сохранить в устройстве</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="116"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1527"/>
+        <source>Read settings from backup file or from device before writing to a backup file</source>
+        <translation>Загрузить настройки из резервной копии или устройства перед сохранением в резервный файл</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="119"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1529"/>
         <source>Backup</source>
@@ -595,15 +620,40 @@
         <translation>Обновить прошивку</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="163"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1532"/>
+        <source>Save libdivecomputer logfile</source>
+        <translation>Сохранить журнал libdivecomputer</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="170"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1520"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1533"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="177"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1534"/>
         <source>Cancel</source>
         <translation>Отмена</translation>
     </message>
     <message>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1539"/>
-        <source>OSTC 3</source>
-        <translation>OSTC 3</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="214"/>
+        <source>OSTC 3,Sport,Cr,2</source>
+        <translation>OSTC 3,Sport,Cr,2</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="223"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1541"/>
+        <source>Suunto Vyper family</source>
+        <translation>Семейство Suunto Vyper</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="232"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1543"/>
+        <source>OSTC, Mk.2/2N/2C</source>
+        <translation>OSTC, Mk.2/2N/2C</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="253"/>
@@ -616,40 +666,56 @@
         <translation>Основное</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="326"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1656"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1943"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1546"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1726"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1766"/>
-        <source>Serial No.</source>
-        <translation>Серийный #</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="260"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1575"/>
+        <source>Eco</source>
+        <translation>Эко</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="349"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1679"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1980"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1547"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1727"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1767"/>
-        <source>Firmware version</source>
-        <translation>Прошивка</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="265"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1576"/>
+        <source>Medium</source>
+        <translation>Средняя</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="538"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1713"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1990"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1548"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1729"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1768"/>
-        <source>Custom text</source>
-        <translation>Свой текст</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="270"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1577"/>
+        <source>High</source>
+        <translation>Высокая</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="385"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1549"/>
-        <source>Language</source>
-        <translation>Язык</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="278"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="826"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="849"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="875"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="927"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="993"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1019"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1101"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1117"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1450"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2278"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2382"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2408"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2434"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2474"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2497"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1586"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1621"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1623"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1625"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1628"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1637"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1638"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1710"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1785"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1789"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1801"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1803"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1806"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1807"/>
+        <source>%</source>
+        <translation>%</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="289"/>
@@ -676,44 +742,36 @@
         <translation>Итальянский</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="579"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1557"/>
-        <source>Dive mode</source>
-        <translation>Режим</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="556"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1560"/>
-        <source>OC</source>
-        <translation>Откр. цикл</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="561"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1561"/>
-        <source>CC</source>
-        <translation>Закр. цикл</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="313"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1582"/>
+        <source>m/°C</source>
+        <translation>м/°C</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="566"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2336"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1562"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1793"/>
-        <source>Gauge</source>
-        <translation>Измеритель</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="318"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1583"/>
+        <source>ft/°F</source>
+        <translation>фут/°F</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="571"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1563"/>
-        <source>Apnea</source>
-        <translation>Апноэ</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="326"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1656"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1943"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1546"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1726"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1766"/>
+        <source>Serial No.</source>
+        <translation>Серийный #</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="395"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2063"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1565"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1780"/>
-        <source>Date format</source>
-        <translation>Формат даты</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="349"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1679"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1980"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1547"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1727"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1767"/>
+        <source>Firmware version</source>
+        <translation>Прошивка</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="360"/>
@@ -734,108 +792,147 @@
         <translation>ГГММДД</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1042"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2457"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1639"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1805"/>
-        <source>Saturation</source>
-        <translation>Насыщение</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="385"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1549"/>
+        <source>Language</source>
+        <translation>Язык</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="278"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="826"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="849"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="875"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="927"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="993"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1019"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1101"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1117"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1450"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2278"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2382"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2408"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2434"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2474"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2497"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1586"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1621"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1623"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1625"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1628"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1637"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1638"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1710"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1785"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1789"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1801"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1803"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1806"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1807"/>
-        <source>%</source>
-        <translation>%</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="395"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2063"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1565"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1780"/>
+        <source>Date format</source>
+        <translation>Формат даты</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="865"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2261"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1624"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1784"/>
-        <source>Desaturation</source>
-        <translation>Рассыщение</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="405"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1572"/>
+        <source>Brightness</source>
+        <translation>Яркость</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="983"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2398"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1636"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1800"/>
-        <source>Last deco</source>
-        <translation>Последнее деко</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="415"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1850"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1579"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1753"/>
+        <source>Units</source>
+        <translation>Единицы</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="711"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="736"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="758"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="904"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2181"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2206"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2228"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2307"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1626"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1786"/>
-        <source> m</source>
-        <translation>м</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="425"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1585"/>
+        <source>Salinity (0-5%)</source>
+        <translation>Соленость (0-5%)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="405"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1572"/>
-        <source>Brightness</source>
-        <translation>Яркость</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="438"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1615"/>
+        <source>Reset device to default settings</source>
+        <translation>Сбросить в заводские установки</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="260"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1575"/>
-        <source>Eco</source>
-        <translation>Эко</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="452"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1590"/>
+        <source>230LSB/Gauss</source>
+        <translation>230LSB/Gauss</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="265"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1576"/>
-        <source>Medium</source>
-        <translation>Средняя</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="457"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1591"/>
+        <source>330LSB/Gauss</source>
+        <translation>330LSB/Gauss</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="270"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1577"/>
-        <source>High</source>
-        <translation>Высокая</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="462"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1592"/>
+        <source>390LSB/Gauss</source>
+        <translation>390LSB/Gauss</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="603"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2034"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1599"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1779"/>
-        <source>Sampling rate</source>
-        <translation>Дискретизация</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="467"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1593"/>
+        <source>440LSB/Gauss</source>
+        <translation>440LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="472"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1594"/>
+        <source>660LSB/Gauss</source>
+        <translation>660LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="477"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1595"/>
+        <source>820LSB/Gauss</source>
+        <translation>820LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="482"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1596"/>
+        <source>1090LSB/Gauss</source>
+        <translation>1090LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="487"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1597"/>
+        <source>1370LSB/Gauss</source>
+        <translation>1370LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="521"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1587"/>
+        <source>Compass gain</source>
+        <translation>Поправка компаса</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="531"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1799"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1745"/>
+        <source>Computer model</source>
+        <translation>Модель</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="538"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1713"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1990"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1548"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1729"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1768"/>
+        <source>Custom text</source>
+        <translation>Свой текст</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="556"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1560"/>
+        <source>OC</source>
+        <translation>Откр. цикл</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="561"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1561"/>
+        <source>CC</source>
+        <translation>Закр. цикл</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="566"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2336"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1562"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1793"/>
+        <source>Gauge</source>
+        <translation>Измеритель</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="571"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1563"/>
+        <source>Apnea</source>
+        <translation>Апноэ</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="579"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1557"/>
+        <source>Dive mode</source>
+        <translation>Режим</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="590"/>
@@ -852,30 +949,12 @@
         <translation>10с</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="415"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1850"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1579"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1753"/>
-        <source>Units</source>
-        <translation>Единицы</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="313"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1582"/>
-        <source>m/°C</source>
-        <translation>м/°C</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="318"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1583"/>
-        <source>ft/°F</source>
-        <translation>фут/°F</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="644"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1605"/>
-        <source>Dive mode color</source>
-        <translation>Цвет режима</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="603"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2034"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1599"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1779"/>
+        <source>Sampling rate</source>
+        <translation>Дискретизация</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="614"/>
@@ -902,12 +981,6 @@
         <translation>Синий</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="425"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1585"/>
-        <source>Salinity (0-5%)</source>
-        <translation>Соленость (0-5%)</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="637"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2092"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1613"/>
@@ -916,90 +989,80 @@
         <translation>Синхронизировать время с ПК</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="521"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1587"/>
-        <source>Compass gain</source>
-        <translation>Поправка компаса</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="90"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1523"/>
-        <source>Read settings from backup file or from device before writing to the device</source>
-        <translation>Загрузить настройки из резервной копии или устройства перед сохранением в устройство</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="116"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1527"/>
-        <source>Read settings from backup file or from device before writing to a backup file</source>
-        <translation>Загрузить настройки из резервной копии или устройства перед сохранением в резервный файл</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="232"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1543"/>
-        <source>OSTC, Mk.2/2N/2C</source>
-        <translation>OSTC, Mk.2/2N/2C</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="644"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1605"/>
+        <source>Dive mode color</source>
+        <translation>Цвет режима</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="452"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1590"/>
-        <source>230LSB/Gauss</source>
-        <translation>230LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="654"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2020"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1614"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1771"/>
+        <source>Show safety stop</source>
+        <translation>Остановка безопасности</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="457"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1591"/>
-        <source>330LSB/Gauss</source>
-        <translation>330LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="661"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2145"/>
+        <source>End Depth</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="462"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1592"/>
-        <source>390LSB/Gauss</source>
-        <translation>390LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="671"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2162"/>
+        <source> s</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="467"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1593"/>
-        <source>440LSB/Gauss</source>
-        <translation>440LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="687"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1953"/>
+        <source>Length</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="472"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1594"/>
-        <source>660LSB/Gauss</source>
-        <translation>660LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="694"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2138"/>
+        <source>Start Depth</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="477"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1595"/>
-        <source>820LSB/Gauss</source>
-        <translation>820LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="701"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2152"/>
+        <source>Reset Depth</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="482"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1596"/>
-        <source>1090LSB/Gauss</source>
-        <translation>1090LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="711"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="736"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="758"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="904"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2181"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2206"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2228"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2307"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1626"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1786"/>
+        <source> m</source>
+        <translation>м</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="487"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1597"/>
-        <source>1370LSB/Gauss</source>
-        <translation>1370LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="778"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2248"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1643"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1810"/>
+        <source>Advanced settings</source>
+        <translation>Дополнительно</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="654"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2020"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1614"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1771"/>
-        <source>Show safety stop</source>
-        <translation>Остановка безопасности</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="784"/>
+        <source>Left button sensitivity</source>
+        <translation>Чувствительность левой кнопки</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="438"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1615"/>
-        <source>Reset device to default settings</source>
-        <translation>Сбросить в заводские установки</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="791"/>
+        <source>Always show ppO2</source>
+        <translation>Всегда показывать ppO2</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="798"/>
@@ -1010,20 +1073,6 @@
         <translation>Альтернативный GF под водой</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="223"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1541"/>
-        <source>Suunto Vyper family</source>
-        <translation>Семейство Suunto Vyper</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="778"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2248"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1643"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1810"/>
-        <source>Advanced settings</source>
-        <translation>Дополнительно</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="805"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2271"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1618"/>
@@ -1054,6 +1103,14 @@
         <translation>GFHigh</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="865"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2261"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1624"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1784"/>
+        <source>Desaturation</source>
+        <translation>Рассыщение</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="917"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2320"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1627"/>
@@ -1068,14 +1125,6 @@
         <translation>мбар</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="973"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2369"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1630"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1788"/>
-        <source> min</source>
-        <translation>мин</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="960"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2331"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1633"/>
@@ -1084,63 +1133,28 @@
         <translation>ZH-L16</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="47"/>
-        <source>Connect via Bluetooth</source>
-        <translation>Bluetooth</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="163"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1532"/>
-        <source>Save libdivecomputer logfile</source>
-        <translation>Сохранить журнал libdivecomputer</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="661"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2145"/>
-        <source>End Depth</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="671"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2162"/>
-        <source> s</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="687"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1953"/>
-        <source>Length</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="694"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2138"/>
-        <source>Start Depth</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="701"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2152"/>
-        <source>Reset Depth</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="784"/>
-        <source>Left button sensitivity</source>
-        <translation>Чувствительность левой кнопки</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="791"/>
-        <source>Always show ppO2</source>
-        <translation>Всегда показывать ppO2</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="965"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1634"/>
         <source>ZH-L16+GF</source>
         <translation>ZH-L16+GF</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="973"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2369"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1630"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1788"/>
+        <source> min</source>
+        <translation>мин</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="983"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2398"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1636"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1800"/>
+        <source>Last deco</source>
+        <translation>Последнее деко</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1009"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2424"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1640"/>
@@ -1157,6 +1171,14 @@
         <translation>Альт. GFHigh</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1042"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2457"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1639"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1805"/>
+        <source>Saturation</source>
+        <translation>Насыщение</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1052"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1642"/>
         <source>Flip screen</source>
@@ -1168,12 +1190,22 @@
         <translation>Чувствительность правой кнопки</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1066"/>
+        <source>MOD warning</source>
+        <translation>Предупреждение MOD</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1073"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2513"/>
         <source>Graphical speed indicator</source>
         <translation>Графический индикатор скорости</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1080"/>
+        <source>Dynamic ascent rate</source>
+        <translation>Динамическая скорость подъема</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1087"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2552"/>
         <source>Bottom gas consumption</source>
@@ -1186,6 +1218,14 @@
         <translation>Расход деко-газа</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1133"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1149"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2520"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2536"/>
+        <source> ℓ/min</source>
+        <translation>л/мин</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1165"/>
         <source>Temperature sensor offset</source>
         <translation type="unfinished"/>
@@ -1204,6 +1244,18 @@
         <translation>Газы</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1235"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1320"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2610"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2695"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1645"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1668"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1812"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1835"/>
+        <source>%O₂</source>
+        <translation>%O₂</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1240"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1325"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2615"/>
@@ -1322,16 +1374,10 @@
         <translation>Дил 5</translation>
     </message>
     <message>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1691"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1858"/>
-        <source>Set point [cbar]</source>
-        <translation>Установка [сбар]</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1693"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1860"/>
-        <source>Change depth [m]</source>
-        <translation>Замена на [м]</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1405"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2770"/>
+        <source>Setpoint</source>
+        <translation>Установка</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1415"/>
@@ -1370,6 +1416,12 @@
         <translation>SP 5</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1443"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1709"/>
+        <source>O₂ in calibration gas</source>
+        <translation>O₂ в калибровочном газе</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1467"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1713"/>
         <source>Fixed setpoint</source>
@@ -1400,101 +1452,6 @@
         <translation>сбар</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1748"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1733"/>
-        <source>P1 (medium)</source>
-        <extracomment>Suunto safety level</extracomment>
-        <translation>P1 (средний)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1753"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1734"/>
-        <source>P2 (high)</source>
-        <extracomment>Suunto safety level</extracomment>
-        <translation>P2 (высокий)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1792"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1744"/>
-        <source>Total dive time</source>
-        <translation>Общее время</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2109"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1769"/>
-        <source>kg/ℓ</source>
-        <translation>кг/л</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2346"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1795"/>
-        <source>Apnoea</source>
-        <translation>Апноэ</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1583"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1722"/>
-        <source>Safety level</source>
-        <translation>Уровень безопасности</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="54"/>
-        <source>Connect</source>
-        <translation>Подключить</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="64"/>
-        <source>Disconnect</source>
-        <translation>Отключить</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="214"/>
-        <source>OSTC 3,Sport,Cr,2</source>
-        <translation>OSTC 3,Sport,Cr,2</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1066"/>
-        <source>MOD warning</source>
-        <translation>Предупреждение MOD</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1080"/>
-        <source>Dynamic ascent rate</source>
-        <translation>Динамическая скорость подъема</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1133"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1149"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2520"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2536"/>
-        <source> ℓ/min</source>
-        <translation>л/мин</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1235"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1320"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2610"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2695"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1645"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1668"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1812"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1835"/>
-        <source>%O₂</source>
-        <translation>%O₂</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1405"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2770"/>
-        <source>Setpoint</source>
-        <translation>Установка</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1443"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1709"/>
-        <source>O₂ in calibration gas</source>
-        <translation>O₂ в калибровочном газе</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1535"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2843"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1719"/>
@@ -1511,6 +1468,12 @@
         <translation>pO₂ мин</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1583"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1722"/>
+        <source>Safety level</source>
+        <translation>Уровень безопасности</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1609"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1723"/>
         <source>Altitude range</source>
@@ -1544,6 +1507,20 @@
         <translation>P0 (отсутствует)</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1748"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1733"/>
+        <source>P1 (medium)</source>
+        <extracomment>Suunto safety level</extracomment>
+        <translation>P1 (средний)</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1753"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1734"/>
+        <source>P2 (high)</source>
+        <extracomment>Suunto safety level</extracomment>
+        <translation>P2 (высокий)</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1761"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1736"/>
         <source>Sample rate</source>
@@ -1568,11 +1545,10 @@
         <translation>60с</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="531"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1799"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1745"/>
-        <source>Computer model</source>
-        <translation>Модель</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1792"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1744"/>
+        <source>Total dive time</source>
+        <translation>Общее время</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1816"/>
@@ -1637,12 +1613,6 @@
         <translation>Тревога: время</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2099"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1765"/>
-        <source>Salinity</source>
-        <translation>Соленость</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2074"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1774"/>
         <source>MM/DD/YY</source>
@@ -1661,12 +1631,30 @@
         <translation>ГГ/ММ/ДД</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2099"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1765"/>
+        <source>Salinity</source>
+        <translation>Соленость</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2109"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1769"/>
+        <source>kg/ℓ</source>
+        <translation>кг/л</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2341"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1794"/>
         <source>ZH-L16 CC</source>
         <translation>ZH-L16 ЗЦ</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2346"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1795"/>
+        <source>Apnoea</source>
+        <translation>Апноэ</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2351"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1796"/>
         <source>L16-GF OC</source>
@@ -1685,87 +1673,112 @@
         <translation>PSCR-GF</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1108"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1129"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1539"/>
+        <source>OSTC 3</source>
+        <translation>OSTC 3</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1691"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1858"/>
+        <source>Set point [cbar]</source>
+        <translation>Установка [сбар]</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1693"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1860"/>
+        <source>Change depth [m]</source>
+        <translation>Замена на [м]</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1110"/>
+        <source>Backup dive computer settings</source>
+        <translation>Создать рез. копию настроек</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1111"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1132"/>
         <source>Backup files (*.xml)</source>
         <translation>Резервные копии (*.xml)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1113"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1115"/>
+        <source>XML backup error</source>
+        <translation>XML-ошибка при создании рез. копии</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1116"/>
         <source>An error occurred while saving the backup file.
 %1</source>
         <translation>Ошибка при сохранении резервной копии.
 %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1116"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1119"/>
         <source>Backup succeeded</source>
         <translation>Резервная копия создана</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1117"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1120"/>
         <source>Your settings have been saved to: %1</source>
         <translation>Ваши настройки сохранены в %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1107"/>
-        <source>Backup dive computer settings</source>
-        <translation>Создать рез. копию настроек</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1112"/>
-        <source>XML backup error</source>
-        <translation>XML-ошибка при создании рез. копии</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1128"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1131"/>
         <source>Restore dive computer settings</source>
         <translation>Восстановить настройки дайвкомпьютера</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1134"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1137"/>
         <source>XML restore error</source>
         <translation>XML-ошибка при восстановлении</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1135"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1138"/>
         <source>An error occurred while restoring the backup file.
 %1</source>
         <translation>Ошибка при восстановлении из рез. копии.
 %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1139"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1142"/>
         <source>Restore succeeded</source>
         <translation>Восстановление успешно</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1140"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1143"/>
         <source>Your settings have been restored successfully.</source>
         <translation>Настройки были успешно восстановлены.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1150"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1153"/>
         <source>Select firmware file</source>
         <translation>Выберите файл прошивки</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1151"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1154"/>
         <source>All files (*.*)</source>
         <translation>Все файлы (*.*)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1207"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1210"/>
         <source>Choose file for divecomputer download logfile</source>
         <translation>Выберите файл для журнала загрузки из дайв-компьютера</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1208"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1211"/>
         <source>Log files (*.log)</source>
         <translation>Файлы журналов (*.log)</translation>
     </message>
 </context>
 <context>
+    <name>ContextDrawer</name>
+    <message>
+        <location filename="../mobile-widgets/qml/kirigami/src/controls/ContextDrawer.qml" line="76"/>
+        <source>Actions</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>CylindersModel</name>
     <message>
         <location filename="../qt-models/cylindermodel.cpp" line="16"/>
@@ -1779,11 +1792,6 @@
     </message>
     <message>
         <location filename="../qt-models/cylindermodel.cpp" line="16"/>
-        <source>He%</source>
-        <translation>He%</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="16"/>
         <source>Work press.</source>
         <translation>Раб. давл.</translation>
     </message>
@@ -1803,9 +1811,24 @@
         <translation>O₂%</translation>
     </message>
     <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="16"/>
+        <source>He%</source>
+        <translation>He%</translation>
+    </message>
+    <message>
         <location filename="../qt-models/cylindermodel.cpp" line="17"/>
-        <source>Switch at</source>
-        <translation>Замена на</translation>
+        <source>Deco switch at</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
+        <source>Bot. MOD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
+        <source>MND</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-models/cylindermodel.cpp" line="17"/>
@@ -1823,17 +1846,32 @@
         <translation>л</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="161"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="177"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation>Нажмите здесь чтобы удалить этот баллон.</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="383"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="180"/>
+        <source>Switch depth for deco gas. Calculated using Deco pO₂ preference, unless set manually.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="183"/>
+        <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to &apos;*&apos; for best O₂% for max depth.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="186"/>
+        <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to &apos;*&apos; for best He% for max depth.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="444"/>
         <source>Cylinder cannot be removed</source>
         <translation>Баллон не может быть удален</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="384"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="445"/>
         <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source>
         <translation>Этот газ используется. Можно удалять только те баллоны, которые не используются.</translation>
     </message>
@@ -1853,42 +1891,24 @@
         <translation>Какие компоненты вы хотите скопировать</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="73"/>
+        <location filename="../build/ui_divecomponentselection.h" line="141"/>
+        <source>Dive site</source>
+        <translation>Дайв-сайт</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="80"/>
         <location filename="../build/ui_divecomponentselection.h" line="142"/>
         <source>Suit</source>
         <translation>Костюм</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="122"/>
-        <location filename="../build/ui_divecomponentselection.h" line="148"/>
-        <source>Divemaster</source>
-        <translation>Инструктор</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="129"/>
-        <location filename="../build/ui_divecomponentselection.h" line="149"/>
-        <source>Buddy</source>
-        <translation>Партнер</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="136"/>
-        <location filename="../build/ui_divecomponentselection.h" line="150"/>
-        <source>Rating</source>
-        <translation>Оценка</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="87"/>
         <location filename="../build/ui_divecomponentselection.h" line="143"/>
         <source>Visibility</source>
         <translation>Видимость</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="73"/>
-        <location filename="../build/ui_divecomponentselection.h" line="141"/>
-        <source>Dive site</source>
-        <translation>Дайв-сайт</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="94"/>
         <location filename="../build/ui_divecomponentselection.h" line="144"/>
         <source>Notes</source>
@@ -1912,10 +1932,34 @@
         <source>Cylinders</source>
         <translation>Баллоны</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="122"/>
+        <location filename="../build/ui_divecomponentselection.h" line="148"/>
+        <source>Divemaster</source>
+        <translation>Инструктор</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="129"/>
+        <location filename="../build/ui_divecomponentselection.h" line="149"/>
+        <source>Buddy</source>
+        <translation>Партнер</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="136"/>
+        <location filename="../build/ui_divecomponentselection.h" line="150"/>
+        <source>Rating</source>
+        <translation>Оценка</translation>
+    </message>
 </context>
 <context>
     <name>DiveComputerManagementDialog</name>
     <message>
+        <location filename="../desktop-widgets/divecomputermanagementdialog.ui" line="17"/>
+        <location filename="../build/ui_divecomputermanagementdialog.h" line="65"/>
+        <source>Edit dive computer nicknames</source>
+        <translation>Редактировать дайвкомпьютеры</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divecomputermanagementdialog.cpp" line="49"/>
         <source>Remove the selected dive computer?</source>
         <translation>Удалить компьютер?</translation>
@@ -1927,12 +1971,6 @@
         <translation>Вы действительно хотите удалить
 выбранный дайв-компьютер?</translation>
     </message>
-    <message>
-        <location filename="../desktop-widgets/divecomputermanagementdialog.ui" line="17"/>
-        <location filename="../build/ui_divecomputermanagementdialog.h" line="65"/>
-        <source>Edit dive computer nicknames</source>
-        <translation>Редактировать дайвкомпьютеры</translation>
-    </message>
 </context>
 <context>
     <name>DiveComputerModel</name>
@@ -1960,17 +1998,17 @@
 <context>
     <name>DiveDetails</name>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="33"/>
+        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="38"/>
         <source>Dive details</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="67"/>
+        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="72"/>
         <source>Delete dive</source>
         <translation>Удалить погружение</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="84"/>
+        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="89"/>
         <source>Show on map</source>
         <translation type="unfinished"/>
     </message>
@@ -1978,88 +2016,93 @@
 <context>
     <name>DiveDetailsEdit</name>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="74"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="80"/>
         <source>Dive %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="78"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="84"/>
         <source>Date:</source>
         <translation>Дата:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="86"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="92"/>
         <source>Location:</source>
         <translation>Место:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="95"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="101"/>
         <source>Coordinates:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="104"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="110"/>
         <source>Use current
 GPS location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="118"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="124"/>
         <source>Depth:</source>
         <translation>Глубина:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="127"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="133"/>
         <source>Duration:</source>
         <translation>Длительность:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="137"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="143"/>
         <source>Air Temp:</source>
         <translation>Темп. воздуха:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="146"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="152"/>
         <source>Water Temp:</source>
         <translation>Темп. воды:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="155"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="161"/>
         <source>Suit:</source>
         <translation>Костюм:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="164"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="176"/>
         <source>Buddy:</source>
         <translation>Напарник:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="173"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="191"/>
         <source>Dive Master:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="182"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="206"/>
         <source>Weight:</source>
         <translation>Вес:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="192"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="216"/>
+        <source>Cylinder:</source>
+        <translation>Баллон:</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="231"/>
         <source>Gas mix:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="203"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="241"/>
         <source>Start Pressure:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="213"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="250"/>
         <source>End Pressure:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="224"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="260"/>
         <source>Notes:</source>
         <translation>Заметки:</translation>
     </message>
@@ -2074,7 +2117,7 @@ GPS location:</source>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="80"/>
         <source>Depth: </source>
-        <translation type="unfinished"/>
+        <translation>Глубина:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="89"/>
@@ -2097,42 +2140,42 @@ GPS location:</source>
         <translation>Костюм:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="159"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="158"/>
         <source>Air Temp:</source>
         <translation>Темп. воздуха:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="175"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="172"/>
         <source>Cylinder:</source>
-        <translation type="unfinished"/>
+        <translation>Баллон:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="189"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="185"/>
         <source>Water Temp:</source>
         <translation>Темп. воды:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="205"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="198"/>
         <source>Dive Master:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="220"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="211"/>
         <source>Weight:</source>
         <translation>Вес:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="249"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="224"/>
         <source>Buddy:</source>
         <translation>Напарник:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="263"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="237"/>
         <source>SAC:</source>
         <translation>SAC:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="280"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="252"/>
         <source>Notes</source>
         <translation>Примечания</translation>
     </message>
@@ -2140,18 +2183,18 @@ GPS location:</source>
 <context>
     <name>DiveEventItem</name>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="134"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="165"/>
         <source>Manual switch to OC</source>
         <translation>Ручной переход на ОЦ</translation>
     </message>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="136"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="167"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation> начало</translation>
     </message>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="137"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="168"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation> конец</translation>
@@ -2160,27 +2203,27 @@ GPS location:</source>
 <context>
     <name>DiveImportedModel</name>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="646"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="656"/>
         <source>Date/time</source>
         <translation>Дата/время</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="648"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="658"/>
         <source>Duration</source>
         <translation>Длительность</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="650"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="660"/>
         <source>Depth</source>
         <translation>Глубина</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="672"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="682"/>
         <source>h:</source>
         <translation>ч:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="672"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="682"/>
         <source>min</source>
         <translation>мин</translation>
     </message>
@@ -2189,15 +2232,15 @@ GPS location:</source>
     <name>DiveList</name>
     <message>
         <location filename="../mobile-widgets/qml/DiveList.qml" line="12"/>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="226"/>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="232"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="227"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="233"/>
         <source>Dive list</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveList.qml" line="95"/>
         <source>Depth: </source>
-        <translation type="unfinished"/>
+        <translation>Глубина:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveList.qml" line="106"/>
@@ -2205,110 +2248,115 @@ GPS location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="222"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="223"/>
         <source>Cloud credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="228"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="229"/>
         <source>Please tap the &apos;+&apos; button to add a dive</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="248"/>
+        <source>No dives in dive list</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DiveListView</name>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="846"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="849"/>
         <source>Expand all</source>
         <translation>Развернуть все</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="848"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="851"/>
         <source>Collapse all</source>
         <translation>Свернуть все</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="852"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="855"/>
         <source>Collapse others</source>
         <translation>Свернуть остальные</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="856"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="859"/>
         <source>Remove dive(s) from trip</source>
         <translation>Удалить из поездки</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="857"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="860"/>
         <source>Create new trip above</source>
         <translation>Создать поездку выше</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="871"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="874"/>
         <source>Add dive(s) to trip immediately above</source>
         <translation>Добавить к поездке сверху</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="873"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="876"/>
         <source>Add dive(s) to trip immediately below</source>
         <translation>Добавить к поездке снизу</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="877"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="880"/>
         <source>Merge trip with trip above</source>
         <translation>Объединить с поездкой выше</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="878"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="881"/>
         <source>Merge trip with trip below</source>
         <translation>Объединить с поездкой ниже</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="882"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="885"/>
         <source>Delete dive(s)</source>
         <translation>Удалить</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="884"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="887"/>
         <source>Mark dive(s) invalid</source>
         <translation>Пометить как ошибочное(-ые)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="888"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="891"/>
         <source>Merge selected dives</source>
         <translation>Объединить выбранные</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="890"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="893"/>
         <source>Renumber dive(s)</source>
         <translation>Перенумеровать</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="891"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="894"/>
         <source>Shift dive times</source>
         <translation>Сдвиг времени</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="892"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="895"/>
         <source>Split selected dives</source>
         <translation>Разбить выделенные погружения</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="893"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="896"/>
         <source>Load image(s) from file(s)</source>
         <translation>Загрузить фото из файлов</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="894"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="897"/>
         <source>Load image(s) from web</source>
         <translation>Загрузить фото из Web</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="917"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="919"/>
         <source>Open image files</source>
         <translation>Открыть файлы изображений</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="917"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="919"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>Файлы изображений (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -2329,56 +2377,6 @@ GPS location:</source>
 <context>
     <name>DiveLogExportDialog</name>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="103"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="351"/>
-        <source>Export format</source>
-        <translation>Формат экспорта</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="134"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="353"/>
-        <source>UDDF</source>
-        <translation>UDDF</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="187"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="358"/>
-        <source>Worldmap</source>
-        <translation>Карта мира</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="197"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="359"/>
-        <source>I&amp;mage depths</source>
-        <translation>Глубины из фото</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="243"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="360"/>
-        <source>Selection</source>
-        <translation>Выбор</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="252"/>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="346"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="361"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="372"/>
-        <source>Selected dives</source>
-        <translation>Выделенные погружения</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="262"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="362"/>
-        <source>All dives</source>
-        <translation>Все погружения</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="306"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="396"/>
-        <source>HTML</source>
-        <translation>HTML</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="14"/>
         <location filename="../build/ui_divelogexportdialog.h" line="349"/>
         <source>Export dive log files</source>
@@ -2391,12 +2389,24 @@ GPS location:</source>
         <translation>Обычный</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="103"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="351"/>
+        <source>Export format</source>
+        <translation>Формат экспорта</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="115"/>
         <location filename="../build/ui_divelogexportdialog.h" line="352"/>
         <source>Subsurface &amp;XML</source>
         <translation>Subsurface &amp;XML</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="134"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="353"/>
+        <source>UDDF</source>
+        <translation>UDDF</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="147"/>
         <location filename="../build/ui_divelogexportdialog.h" line="354"/>
         <source>di&amp;velogs.de</source>
@@ -2421,238 +2431,297 @@ GPS location:</source>
         <translation>Погружение в CSV</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="275"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="187"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="358"/>
+        <source>Worldmap</source>
+        <translation>Карта мира</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="197"/>
+        <source>TeX</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="207"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="359"/>
+        <source>I&amp;mage depths</source>
+        <translation>Глубины из фото</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="253"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="360"/>
+        <source>Selection</source>
+        <translation>Выбор</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="262"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="356"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="361"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="372"/>
+        <source>Selected dives</source>
+        <translation>Выделенные погружения</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="272"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="362"/>
+        <source>All dives</source>
+        <translation>Все погружения</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="285"/>
         <location filename="../build/ui_divelogexportdialog.h" line="363"/>
         <source>CSV units</source>
         <translation>Система мер</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="288"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="298"/>
         <location filename="../build/ui_divelogexportdialog.h" line="366"/>
         <source>Metric</source>
         <translation>Метрическая</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="293"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="303"/>
         <location filename="../build/ui_divelogexportdialog.h" line="367"/>
         <source>Imperial</source>
         <translation>Имперская</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="324"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="316"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="396"/>
+        <source>HTML</source>
+        <translation>HTML</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="334"/>
         <location filename="../build/ui_divelogexportdialog.h" line="370"/>
         <source>General settings</source>
         <translation>Общие настройки</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="330"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="340"/>
         <location filename="../build/ui_divelogexportdialog.h" line="371"/>
         <source>Subsurface numbers</source>
         <translation>Нумерация Subsurface</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="359"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="369"/>
         <location filename="../build/ui_divelogexportdialog.h" line="373"/>
         <source>Export yearly statistics</source>
         <translation>Выгружать статистику за год</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="375"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="385"/>
         <location filename="../build/ui_divelogexportdialog.h" line="374"/>
         <source>All di&amp;ves</source>
         <translation>Все погружения</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="385"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="395"/>
         <location filename="../build/ui_divelogexportdialog.h" line="375"/>
         <source>Export list only</source>
         <translation>Только список</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="392"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="402"/>
         <location filename="../build/ui_divelogexportdialog.h" line="376"/>
         <source>Export photos</source>
         <translation>Экспорт фото</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="408"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="418"/>
         <location filename="../build/ui_divelogexportdialog.h" line="377"/>
         <source>Style options</source>
         <translation>Настройки стиля</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="423"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="433"/>
         <location filename="../build/ui_divelogexportdialog.h" line="378"/>
         <source>Font</source>
         <translation>Шрифт</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="433"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="443"/>
         <location filename="../build/ui_divelogexportdialog.h" line="379"/>
         <source>Font size</source>
         <translation>Размер шрифта</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="444"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="454"/>
         <location filename="../build/ui_divelogexportdialog.h" line="382"/>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="449"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="459"/>
         <location filename="../build/ui_divelogexportdialog.h" line="383"/>
         <source>10</source>
         <translation>10</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="454"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="464"/>
         <location filename="../build/ui_divelogexportdialog.h" line="384"/>
         <source>12</source>
         <translation>12</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="459"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="469"/>
         <location filename="../build/ui_divelogexportdialog.h" line="385"/>
         <source>14</source>
         <translation>14</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="464"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="474"/>
         <location filename="../build/ui_divelogexportdialog.h" line="386"/>
         <source>16</source>
         <translation>16</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="469"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="479"/>
         <location filename="../build/ui_divelogexportdialog.h" line="387"/>
         <source>18</source>
         <translation>18</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="474"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="484"/>
         <location filename="../build/ui_divelogexportdialog.h" line="388"/>
         <source>20</source>
         <translation>20</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="482"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="492"/>
         <location filename="../build/ui_divelogexportdialog.h" line="390"/>
         <source>Theme</source>
         <translation>Тема</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="493"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="503"/>
         <location filename="../build/ui_divelogexportdialog.h" line="393"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="95"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="99"/>
         <source>Light</source>
         <translation>Светлая</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="498"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="508"/>
         <location filename="../build/ui_divelogexportdialog.h" line="394"/>
         <source>Sand</source>
         <translation>Песочная</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="134"/>
-        <source>UDDF files (*.uddf *.UDDF)</source>
-        <translation>UDDF файлы (*.uddf *.UDDF)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="142"/>
-        <source>CSV files (*.csv *.CSV)</source>
-        <translation>CSV файлы (*.csv *.CSV)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="74"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="76"/>
         <source>Generic format that is used for data exchange between a variety of diving related programs.</source>
         <translation>Распространенный формат, используемый для обмена данными между различными дайверскими программами.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="76"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="78"/>
         <source>Comma separated values describing the dive profile.</source>
         <translation>Профиль погружения в виде значений, разделенных запятой.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="78"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="80"/>
         <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source>
         <translation>Информация о погружении в виде значений, разделенных запятой. Включает почти все детали кроме профиля.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="80"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="82"/>
         <source>Send the dive data to divelogs.de website.</source>
         <translation>Отправить данные погружения на сайт divelogs.de.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="82"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="84"/>
         <source>Send the dive data to dive-share.appspot.com website</source>
         <translation>Отправить данные погружения на сайт dive-share.appspot.com</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="84"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="86"/>
         <source>HTML export of the dive locations, visualized on a world map.</source>
         <translation>HTML экспорт мест погружений на карте мира.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="86"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="88"/>
         <source>Subsurface native XML format.</source>
         <translation>Собственный XML-формат Subsurface.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="88"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="90"/>
         <source>Write depths of images to file.</source>
         <translation>Выгружает имена фотографий и глубины, на которых они были сделаны.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="133"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="92"/>
+        <source>Write dive as TeX macros to file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="137"/>
         <source>Export UDDF file as</source>
         <translation>Файл для UDDF экспорта</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="137"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/>
+        <source>UDDF files (*.uddf *.UDDF)</source>
+        <translation>UDDF файлы (*.uddf *.UDDF)</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divelogexportdialog.cpp" line="141"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="145"/>
         <source>Export CSV file as</source>
         <translation>Файл для CSV экспорта</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="148"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="142"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="146"/>
+        <source>CSV files (*.csv *.CSV)</source>
+        <translation>CSV файлы (*.csv *.CSV)</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="152"/>
         <source>Export world map</source>
         <translation>Файл для экспорта карты</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="149"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="169"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="153"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="177"/>
         <source>HTML files (*.html)</source>
         <translation>HTML файлы (*.html)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="153"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="157"/>
         <source>Export Subsurface XML</source>
         <translation>Экспорт Subsurface XML</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="158"/>
         <source>XML files (*.xml *.ssrf)</source>
         <translation>XML файлы (*.xml *.ssrf)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="162"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="166"/>
         <source>Save image depths</source>
         <translation>Экспорт глубин фотографий</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="168"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="170"/>
+        <source>Export to TeX file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="170"/>
+        <source>TeX files (*.tex)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="176"/>
         <source>Export HTML files as</source>
         <translation>Экспортировать HTML файл как</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="184"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="192"/>
         <source>Please wait, exporting...</source>
         <translation>Ожидайте, идет экспорт...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="219"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="227"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="311"/>
         <source>Can&apos;t open file %s</source>
         <translation>Невозможно открыть файл %s</translation>
     </message>
@@ -2666,25 +2735,6 @@ GPS location:</source>
         <translation>Импорт журнала погружений</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="643"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="727"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="856"/>
-        <source>Time</source>
-        <translation>Время</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.ui" line="127"/>
-        <location filename="../build/ui_divelogimportdialog.h" line="164"/>
-        <source>Metric</source>
-        <translation>Метрическая</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.ui" line="132"/>
-        <location filename="../build/ui_divelogimportdialog.h" line="165"/>
-        <source>Imperial</source>
-        <translation>Имперская</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divelogimportdialog.ui" line="89"/>
         <location filename="../build/ui_divelogimportdialog.h" line="152"/>
         <source>dd.mm.yyyy</source>
@@ -2703,74 +2753,6 @@ GPS location:</source>
         <translation>гггг-мм-дд</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.ui" line="155"/>
-        <location filename="../build/ui_divelogimportdialog.h" line="167"/>
-        <source>Drag the tags above to each corresponding column below</source>
-        <translation>Перетащите метки на соответствующие колонки ниже</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="641"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="729"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="852"/>
-        <source>Dive #</source>
-        <translation>№</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="642"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="723"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="854"/>
-        <source>Date</source>
-        <translation>Дата</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="644"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="858"/>
-        <source>Duration</source>
-        <translation>Длительность</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="655"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="862"/>
-        <source>GPS</source>
-        <translation>GPS</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="645"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="864"/>
-        <source>Max. depth</source>
-        <translation>Макс. глубина</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="646"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="866"/>
-        <source>Avg. depth</source>
-        <translation>Сред. глубина</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="658"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="872"/>
-        <source>Suit</source>
-        <translation>Костюм</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="663"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="878"/>
-        <source>Tags</source>
-        <translation>Метки</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="652"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="894"/>
-        <source>O₂</source>
-        <translation>O₂</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="653"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="896"/>
-        <source>He</source>
-        <translation>He</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divelogimportdialog.ui" line="108"/>
         <location filename="../build/ui_divelogimportdialog.h" line="158"/>
         <source>Seconds</source>
@@ -2789,183 +2771,269 @@ GPS location:</source>
         <translation>Минуты:секунды</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="654"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="860"/>
-        <source>Location</source>
-        <translation>Местонахождение</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.ui" line="127"/>
+        <location filename="../build/ui_divelogimportdialog.h" line="164"/>
+        <source>Metric</source>
+        <translation>Метрическая</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.ui" line="132"/>
+        <location filename="../build/ui_divelogimportdialog.h" line="165"/>
+        <source>Imperial</source>
+        <translation>Имперская</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.ui" line="155"/>
+        <location filename="../build/ui_divelogimportdialog.h" line="167"/>
+        <source>Drag the tags above to each corresponding column below</source>
+        <translation>Перетащите метки на соответствующие колонки ниже</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="354"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="499"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="505"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="355"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="528"/>
         <source>Tab</source>
         <translation>Tab</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="575"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="598"/>
         <source>Some column headers were pre-populated; please drag and drop the headers so they match the column they are in.</source>
         <translation>Перетаскивайте заголовки так, чтобы они соответствовали колонам с данными.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="613"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="731"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="782"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="848"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="636"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="761"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="857"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="925"/>
         <source>Sample time</source>
         <translation>Выборка времени</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="615"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="733"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="784"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="638"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="763"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="859"/>
         <source>Sample depth</source>
         <translation>Выборка глубины</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="617"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="735"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="786"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="640"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="765"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="861"/>
         <source>Sample temperature</source>
         <translation>Выборка температуры</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="621"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="739"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="790"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="642"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="767"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="863"/>
+        <source>Sample pO₂</source>
+        <translation>Выборка pO₂</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="644"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="769"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="865"/>
         <source>Sample sensor1 pO₂</source>
         <translation>Выборка 1-го сеносора pO₂</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="623"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="741"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="792"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="646"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="771"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="867"/>
         <source>Sample sensor2 pO₂</source>
         <translation>Выборка 2-го сеносора pO₂</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="625"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="743"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="794"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="648"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="773"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="869"/>
         <source>Sample sensor3 pO₂</source>
         <translation>Выборка 3-го сеносора pO₂</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="633"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="751"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="802"/>
-        <source>Sample stopdepth</source>
-        <translation>Выборка остановки</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="637"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="755"/>
-        <source>Sample setpoint</source>
-        <translation>Выборка установки</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="619"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="737"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="788"/>
-        <source>Sample pO₂</source>
-        <translation>Выборка pO₂</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="627"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="745"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="796"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="650"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="775"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="871"/>
         <source>Sample CNS</source>
         <translation>Выборка CNS</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="629"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="747"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="798"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="652"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="777"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="873"/>
         <source>Sample NDL</source>
         <translation>Выборка NDL</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="631"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="749"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="800"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="654"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="779"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="875"/>
         <source>Sample TTS</source>
         <translation>Выборка TTS</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="635"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="753"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="804"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="656"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="781"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="877"/>
+        <source>Sample stopdepth</source>
+        <translation>Выборка остановки</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="658"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="783"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="879"/>
         <source>Sample pressure</source>
         <translation>Выборка давления</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="656"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="868"/>
-        <source>Divemaster</source>
-        <translation>Инструктор</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="660"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="785"/>
+        <source>Sample setpoint</source>
+        <translation>Выборка установки</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="657"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="870"/>
-        <source>Buddy</source>
-        <translation>Партнер</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="664"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="759"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="929"/>
+        <source>Dive #</source>
+        <translation>№</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="659"/>
-        <source>Rating</source>
-        <translation>Оценка</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="665"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="753"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="931"/>
+        <source>Date</source>
+        <translation>Дата</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="660"/>
-        <source>Visibility</source>
-        <translation>Видимость</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="666"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="757"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="933"/>
+        <source>Time</source>
+        <translation>Время</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="661"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="874"/>
-        <source>Notes</source>
-        <translation>Примечания</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="667"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="935"/>
+        <source>Duration</source>
+        <translation>Длительность</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="662"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="876"/>
-        <source>Weight</source>
-        <translation>Вес</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="668"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="941"/>
+        <source>Max. depth</source>
+        <translation>Макс. глубина</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="669"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="943"/>
+        <source>Avg. depth</source>
+        <translation>Сред. глубина</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="670"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="975"/>
+        <source>Air temp.</source>
+        <translation>Темп. воздуха</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="671"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="977"/>
+        <source>Water temp.</source>
+        <translation>Темп. воды</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="649"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="888"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="672"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="965"/>
         <source>Cyl. size</source>
         <translation>Объем баллона</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="650"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="890"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="673"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="967"/>
         <source>Start pressure</source>
         <translation>Нач. давл.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="651"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="892"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="674"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="969"/>
         <source>End pressure</source>
         <translation>Кон. давл.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="647"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="898"/>
-        <source>Air temp.</source>
-        <translation>Темп. воздуха</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="675"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="971"/>
+        <source>O₂</source>
+        <translation>O₂</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="648"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="900"/>
-        <source>Water temp.</source>
-        <translation>Темп. воды</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="676"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="973"/>
+        <source>He</source>
+        <translation>He</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="677"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="937"/>
+        <source>Location</source>
+        <translation>Местонахождение</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="678"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="939"/>
+        <source>GPS</source>
+        <translation>GPS</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="679"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="945"/>
+        <source>Divemaster</source>
+        <translation>Инструктор</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="680"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="947"/>
+        <source>Buddy</source>
+        <translation>Партнер</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="681"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="949"/>
+        <source>Suit</source>
+        <translation>Костюм</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="682"/>
+        <source>Rating</source>
+        <translation>Оценка</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="683"/>
+        <source>Visibility</source>
+        <translation>Видимость</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="684"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="951"/>
+        <source>Notes</source>
+        <translation>Примечания</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="685"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="953"/>
+        <source>Weight</source>
+        <translation>Вес</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="686"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="955"/>
+        <source>Tags</source>
+        <translation>Метки</translation>
     </message>
 </context>
 <context>
     <name>DiveObjectHelper</name>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="287"/>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="323"/>
         <source>%1 dive(s)</source>
         <translation type="unfinished"/>
     </message>
@@ -2973,18 +3041,18 @@ GPS location:</source>
 <context>
     <name>DivePlanner</name>
     <message>
-        <location filename="../desktop-widgets/diveplanner.ui" line="152"/>
-        <location filename="../build/ui_diveplanner.h" line="190"/>
-        <source>Altitude</source>
-        <translation>Высота</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/diveplanner.ui" line="109"/>
         <location filename="../build/ui_diveplanner.h" line="189"/>
         <source>Planned dive time</source>
         <translation>Планируемое время погружения</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/diveplanner.ui" line="152"/>
+        <location filename="../build/ui_diveplanner.h" line="190"/>
+        <source>Altitude</source>
+        <translation>Высота</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/diveplanner.ui" line="159"/>
         <location filename="../build/ui_diveplanner.h" line="191"/>
         <source>ATM pressure</source>
@@ -3018,32 +3086,32 @@ GPS location:</source>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="134"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="136"/>
         <source>unknown</source>
         <translation>неизвестно</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="312"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="326"/>
         <source>Final depth</source>
         <translation>Глубина</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="314"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="328"/>
         <source>Run time</source>
         <translation>Отсчет</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="316"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="330"/>
         <source>Duration</source>
         <translation>Длительность</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="318"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="332"/>
         <source>Used gas</source>
         <translation>Исп. газ</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="320"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="334"/>
         <source>CC setpoint</source>
         <translation>Установка ребризера</translation>
     </message>
@@ -3051,22 +3119,22 @@ GPS location:</source>
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="108"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="112"/>
         <source>Dive planner points</source>
         <translation>Путевые точки плана</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="112"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="116"/>
         <source>Available gases</source>
         <translation>Доступные смеси</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="137"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="143"/>
         <source>Add dive data point</source>
         <translation>Добавить путевую точку</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="146"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="152"/>
         <source>Save new</source>
         <translation>Сохранить новый</translation>
     </message>
@@ -3099,11 +3167,36 @@ GPS location:</source>
         <translation>Цвет</translation>
     </message>
     <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="124"/>
+        <source>User entered</source>
+        <translation>Пользователь</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="126"/>
+        <source>Cylinder index</source>
+        <translation>Индекс баллона</translation>
+    </message>
+    <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="128"/>
         <source>Pressure S</source>
         <translation>Давление S</translation>
     </message>
     <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="130"/>
+        <source>Pressure I</source>
+        <translation>Давление I</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="132"/>
+        <source>Ceiling</source>
+        <translation>Потолок</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="134"/>
+        <source>SAC</source>
+        <translation>SAC</translation>
+    </message>
+    <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="136"/>
         <source>pN₂</source>
         <translation>pN₂</translation>
@@ -3139,49 +3232,24 @@ GPS location:</source>
         <translation>Сенсор 3</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="152"/>
-        <source>Heart rate</source>
-        <translation>Пульс</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="156"/>
-        <source>Mean depth @ s</source>
-        <translation>Средняя глубина @ s</translation>
-    </message>
-    <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="150"/>
         <source>Ambient pressure</source>
         <translation>Внешнее давление</translation>
     </message>
     <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="152"/>
+        <source>Heart rate</source>
+        <translation>Пульс</translation>
+    </message>
+    <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="154"/>
         <source>Gradient factor</source>
         <translation>Градиент-фактор</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="130"/>
-        <source>Pressure I</source>
-        <translation>Давление I</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="124"/>
-        <source>User entered</source>
-        <translation>Пользователь</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="126"/>
-        <source>Cylinder index</source>
-        <translation>Индекс баллона</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="132"/>
-        <source>Ceiling</source>
-        <translation>Потолок</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="134"/>
-        <source>SAC</source>
-        <translation>SAC</translation>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="156"/>
+        <source>Mean depth @ s</source>
+        <translation>Средняя глубина @ s</translation>
     </message>
 </context>
 <context>
@@ -3252,311 +3320,315 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="395"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="441"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="434"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="483"/>
         <source>#</source>
         <translation>№</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="398"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="444"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="437"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="486"/>
         <source>Date</source>
         <translation>Дата</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="401"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="447"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="440"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="489"/>
         <source>Rating</source>
         <translation>Оценка</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="404"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="443"/>
         <source>Depth</source>
         <translation>Глубина</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="410"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="446"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="495"/>
+        <source>Duration</source>
+        <translation>Длительность</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="449"/>
         <source>Temp</source>
         <translation>Темп.</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="413"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="452"/>
         <source>Weight</source>
         <translation>Вес</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="425"/>
-        <source>SAC</source>
-        <translation>SAC</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
-        <source>m</source>
-        <translation>м</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
-        <source>ft</source>
-        <translation>фут</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
-        <source>Weight(%1)</source>
-        <translation>Вес(%1)</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="416"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="462"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="455"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="504"/>
         <source>Suit</source>
         <translation>Костюм</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="419"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="465"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="458"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="507"/>
         <source>Cyl</source>
         <translation>Баллон</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="422"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="468"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="461"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="510"/>
         <source>Gas</source>
         <translation>Смесь</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
-        <source>SAC(%1)</source>
-        <translation>SAC(%1)</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="464"/>
+        <source>SAC</source>
+        <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
-        <source>/min</source>
-        <translation>/мин</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="467"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="518"/>
+        <source>OTU</source>
+        <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="431"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="479"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="470"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="521"/>
         <source>Max CNS</source>
         <translation>Макс. CNS</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="434"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="482"/>
-        <source>Location</source>
-        <translation>Местонахождение</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
+        <source>Photos</source>
+        <translation>Фотографии</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
-        <source>kg</source>
-        <translation>кг</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="476"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="527"/>
+        <source>Location</source>
+        <translation>Местонахождение</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="492"/>
         <source>Depth(%1)</source>
         <translation>Глубина(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="407"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="453"/>
-        <source>Duration</source>
-        <translation>Длительность</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="492"/>
+        <source>m</source>
+        <translation>м</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="492"/>
+        <source>ft</source>
+        <translation>фут</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="456"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="498"/>
         <source>Temp(%1%2)</source>
         <translation>Температура(%1%2)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="501"/>
+        <source>Weight(%1)</source>
+        <translation>Вес(%1)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="501"/>
+        <source>kg</source>
+        <translation>кг</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="501"/>
         <source>lbs</source>
         <translation>фунт</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="428"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="476"/>
-        <source>OTU</source>
-        <translation>OTU</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="515"/>
+        <source>SAC(%1)</source>
+        <translation>SAC(%1)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="515"/>
+        <source>/min</source>
+        <translation>/мин</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="524"/>
+        <source>Photos before/during/after dive</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="164"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="165"/>
         <source>no dives were selected</source>
         <translation>не выбраны погружения</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="174"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="175"/>
         <source>stylesheet to export to divelogs.de is not found</source>
         <translation>Не найден стиль для экспорта в divelogs.de</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="184"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="185"/>
         <source>failed to create zip file for upload: %s</source>
         <translation>не удалось создать ZIP файл для загрузки: %s</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="236"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="237"/>
         <source>internal error</source>
         <translation>внутренняя ошибка</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="244"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="245"/>
         <source>Conversion of dive %1 to divelogs.de format failed</source>
         <translation>Ошибка преобразования погружения %1 в формат divelogs.de</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="272"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="273"/>
         <source>error writing zip file: %s zip error %d system error %d - %s</source>
         <translation>ошибка сохранения zip-файла: %s ошибка %d системная ошибка %d - %s</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="745"/>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="935"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="936"/>
         <source>Done</source>
         <translation>Готово</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="778"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="779"/>
         <source>Uploading dive list...</source>
         <translation>Выгрузка списка погружений...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="810"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="811"/>
         <source>Downloading dive list...</source>
         <translation>Загрузка списка погружений...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="851"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="852"/>
         <source>Downloading %1 dives...</source>
         <translation>Загрузка %1 погружений...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="885"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="886"/>
         <source>Download finished - %1</source>
         <translation>Загрузка завершена - %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="899"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="900"/>
         <source>Problem with download</source>
         <translation>Ошибка загрузки</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="900"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="901"/>
         <source>The archive could not be opened:
 </source>
         <translation>Невозможно открыть архив:
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="909"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="910"/>
         <source>Corrupted download</source>
         <translation>Поврежденная загрузка</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="910"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="911"/>
         <source>The archive could not be opened:
 %1</source>
         <translation>Невозможно открыть архив:
 %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="937"/>
+        <source>Upload finished</source>
+        <translation>Выгрузка завершена</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="950"/>
         <source>Upload failed</source>
         <translation>Выгрузка не удалась</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="952"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="953"/>
         <source>Upload successful</source>
         <translation>Выгрузка завершена</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="955"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="956"/>
         <source>Login failed</source>
         <translation>Ошибка входа</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="958"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="959"/>
         <source>Cannot parse response</source>
         <translation>Ошибка разбора ответа</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="970"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="971"/>
         <source>Error: %1</source>
         <translation>Ошибка: %1</translation>
     </message>
-    <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="936"/>
-        <source>Upload finished</source>
-        <translation>Выгрузка завершена</translation>
-    </message>
 </context>
 <context>
     <name>DownloadFromDCWidget</name>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="185"/>
-        <source>Error</source>
-        <translation>Ошибка</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="436"/>
-        <source>Retry</source>
-        <translation>Повторить</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="280"/>
-        <source>Find Uemis dive computer</source>
-        <translation>Найти дайвкомпьютер Uemis</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="101"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="107"/>
         <source>Download</source>
         <translation>Загрузить</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="104"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="110"/>
         <source>Choose Bluetooth download mode</source>
         <translation>Выберите режим загрузки по Bluetooth</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="382"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="191"/>
+        <source>Error</source>
+        <translation>Ошибка</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="286"/>
+        <source>Find Uemis dive computer</source>
+        <translation>Найти дайвкомпьютер Uemis</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="392"/>
         <source>Choose file for divecomputer download logfile</source>
         <translation>Выберите файл для журнала загрузки из дайв-компьютера</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="383"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="393"/>
         <source>Log files (*.log)</source>
         <translation>Файлы журналов (*.log)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="398"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="408"/>
         <source>Warning</source>
         <translation>Предупреждение</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="399"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="409"/>
         <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source>
         <translation>При сохранении дампа, погружения в журнал НЕ загружаются.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="410"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="420"/>
         <source>Choose file for divecomputer binary dump file</source>
         <translation>Выберите файл для двоичного дампа из дайв-компьютера</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="411"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="421"/>
         <source>Dump files (*.bin)</source>
         <translation>Дамп-файлы (*.bin)</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="446"/>
+        <source>Retry</source>
+        <translation>Повторить</translation>
+    </message>
 </context>
 <context>
     <name>DownloadFromDiveComputer</name>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="139"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="275"/>
-        <source>Vendor</source>
-        <translation>Производитель</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="14"/>
         <location filename="../build/ui_downloadfromdivecomputer.h" line="265"/>
         <source>Download from dive computer</source>
@@ -3569,17 +3641,6 @@ p, li { white-space: pre-wrap; }
         <translation>Устройство или точка монтирования</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="122"/>
-        <source>Choose Bluetooth download mode</source>
-        <translation>Загрузка через Bluetooth</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="149"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="276"/>
-        <source>Dive computer</source>
-        <translation>Модель</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="66"/>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="101"/>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="115"/>
@@ -3603,11 +3664,46 @@ p, li { white-space: pre-wrap; }
         <translation>Предпочтение загруженным</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="87"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="270"/>
+        <source>Download into new trip</source>
+        <translation>Загружать в новую поездку</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="94"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="271"/>
+        <source>Save libdivecomputer logfile</source>
+        <translation>Сохранить журнал libdivecomputer</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="108"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="273"/>
+        <source>Save libdivecomputer dumpfile</source>
+        <translation>Сохранить дамп-файл libdivecomputer</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="122"/>
+        <source>Choose Bluetooth download mode</source>
+        <translation>Загрузка через Bluetooth</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="129"/>
         <source>Select a remote Bluetooth device.</source>
         <translation>Выберите устройство Bluetooth.</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="139"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="275"/>
+        <source>Vendor</source>
+        <translation>Производитель</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="149"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="276"/>
+        <source>Dive computer</source>
+        <translation>Модель</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/>
         <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="52"/>
         <location filename="../build/ui_downloadfromdivecomputer.h" line="277"/>
@@ -3615,18 +3711,6 @@ p, li { white-space: pre-wrap; }
         <translation>Загрузить</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="284"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="281"/>
-        <source>OK</source>
-        <translation>OK</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="291"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="282"/>
-        <source>Cancel</source>
-        <translation>Отмена</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="226"/>
         <location filename="../build/ui_downloadfromdivecomputer.h" line="278"/>
         <source>Downloaded dives</source>
@@ -3645,22 +3729,16 @@ p, li { white-space: pre-wrap; }
         <translation>Снять выделение</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="94"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="271"/>
-        <source>Save libdivecomputer logfile</source>
-        <translation>Сохранить журнал libdivecomputer</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="108"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="273"/>
-        <source>Save libdivecomputer dumpfile</source>
-        <translation>Сохранить дамп-файл libdivecomputer</translation>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="284"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="281"/>
+        <source>OK</source>
+        <translation>OK</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="87"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="270"/>
-        <source>Download into new trip</source>
-        <translation>Загружать в новую поездку</translation>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="291"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="282"/>
+        <source>Cancel</source>
+        <translation>Отмена</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="16"/>
@@ -3750,12 +3828,12 @@ p, li { white-space: pre-wrap; }
         <translation>Соединение с Facebook</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="297"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="242"/>
         <source>To disconnect Subsurface from your Facebook account, use the button below</source>
         <translation>Чтобы отключить Subsurface от Facebook, нажмите на кнопку ниже</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="306"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="251"/>
         <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source>
         <translation>Авторизуйтесь чтобы подключиться к Facebook. После этого Subsurface сможет публиковать погружения в хронике.</translation>
     </message>
@@ -3763,22 +3841,22 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>FacebookManager</name>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="266"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="211"/>
         <source>Photo upload sucessfull</source>
         <translation>Выгрузка фото успешна!</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="267"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="212"/>
         <source>Your dive profile was updated to Facebook.</source>
         <translation>Профиль погружения обновлен на Facebook.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="271"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="216"/>
         <source>Photo upload failed</source>
         <translation>Выгрузка фото не удалась!</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="272"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="217"/>
         <source>Your dive profile was not updated to Facebook, 
  please send the following to the developer. 
 </source>
@@ -3840,17 +3918,25 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>FirmwareUpdateThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1750"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1739"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Эта функция пока недоступна для выбранного дайвкомпьютера.</translation>
     </message>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1755"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1744"/>
         <source>Firmware update failed!</source>
         <translation>Обонвление прошивки не удалось!</translation>
     </message>
 </context>
 <context>
+    <name>GlobalDrawer</name>
+    <message>
+        <location filename="../mobile-widgets/qml/kirigami/src/controls/GlobalDrawer.qml" line="364"/>
+        <source>Back</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>GlobeGPS</name>
     <message>
         <location filename="../desktop-widgets/globe.cpp" line="124"/>
@@ -3866,27 +3952,27 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="40"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="32"/>
         <source>Date: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="50"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="42"/>
         <source>Name: </source>
         <translation>Название:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="60"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="52"/>
         <source>Latitude: </source>
-        <translation type="unfinished"/>
+        <translation>Широта:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="69"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="61"/>
         <source>Longitude: </source>
-        <translation type="unfinished"/>
+        <translation>Долгота:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="113"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="105"/>
         <source>List of stored GPS fixes</source>
         <translation type="unfinished"/>
     </message>
@@ -3915,7 +4001,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>LocationFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="648"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="646"/>
         <source>Location: </source>
         <translation>Места:</translation>
     </message>
@@ -3956,7 +4042,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>LocationFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="299"/>
+        <location filename="../qt-models/filtermodels.cpp" line="304"/>
         <source>No location set</source>
         <translation>Место не указано</translation>
     </message>
@@ -4078,20 +4164,55 @@ p, li { white-space: pre-wrap; }
     </message>
 </context>
 <context>
-    <name>MainForm.ui</name>
+    <name>MainTab</name>
     <message>
-        <location filename="../packaging/ios/Subsurface-mobile/MainForm.ui.qml" line="17"/>
-        <source>Press Me 1</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/maintab.ui" line="18"/>
+        <location filename="../desktop-widgets/maintab.ui" line="439"/>
+        <location filename="../build/ui_maintab.h" line="961"/>
+        <location filename="../build/ui_maintab.h" line="963"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="539"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="571"/>
+        <source>Notes</source>
+        <translation>Примечания</translation>
     </message>
     <message>
-        <location filename="../packaging/ios/Subsurface-mobile/MainForm.ui.qml" line="22"/>
-        <source>Press Me 2</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/maintab.ui" line="21"/>
+        <location filename="../build/ui_maintab.h" line="964"/>
+        <source>General notes about the current selection</source>
+        <translation>Основная информация о выделенных погружениях</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="92"/>
+        <location filename="../desktop-widgets/maintab.ui" line="646"/>
+        <location filename="../build/ui_maintab.h" line="947"/>
+        <location filename="../build/ui_maintab.h" line="967"/>
+        <source>Date</source>
+        <translation>Дата</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="102"/>
+        <location filename="../build/ui_maintab.h" line="948"/>
+        <source>Time</source>
+        <translation>Время</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="112"/>
+        <location filename="../desktop-widgets/maintab.ui" line="836"/>
+        <location filename="../build/ui_maintab.h" line="949"/>
+        <location filename="../build/ui_maintab.h" line="987"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="306"/>
+        <source>Air temp.</source>
+        <translation>Темп. воздуха</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="122"/>
+        <location filename="../desktop-widgets/maintab.ui" line="855"/>
+        <location filename="../build/ui_maintab.h" line="950"/>
+        <location filename="../build/ui_maintab.h" line="989"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="307"/>
+        <source>Water temp.</source>
+        <translation>Темп. воды</translation>
     </message>
-</context>
-<context>
-    <name>MainTab</name>
     <message>
         <location filename="../desktop-widgets/maintab.ui" line="184"/>
         <location filename="../build/ui_maintab.h" line="951"/>
@@ -4100,6 +4221,17 @@ p, li { white-space: pre-wrap; }
         <translation>Местонахождение</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="214"/>
+        <source>Edit dive site</source>
+        <translation>Редактирование сайта</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="217"/>
+        <location filename="../build/ui_maintab.h" line="953"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="252"/>
         <location filename="../build/ui_maintab.h" line="954"/>
         <source>Divemaster</source>
@@ -4112,12 +4244,6 @@ p, li { white-space: pre-wrap; }
         <translation>Партнер</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.ui" line="387"/>
-        <location filename="../build/ui_maintab.h" line="959"/>
-        <source>Tags</source>
-        <translation>Метки</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/maintab.ui" line="308"/>
         <location filename="../build/ui_maintab.h" line="956"/>
         <source>Rating</source>
@@ -4136,57 +4262,18 @@ p, li { white-space: pre-wrap; }
         <translation>Костюм</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="387"/>
+        <location filename="../build/ui_maintab.h" line="959"/>
+        <source>Tags</source>
+        <translation>Метки</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="397"/>
         <location filename="../build/ui_maintab.h" line="960"/>
         <source>Dive mode</source>
         <translation>Режим</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.ui" line="112"/>
-        <location filename="../desktop-widgets/maintab.ui" line="836"/>
-        <location filename="../build/ui_maintab.h" line="949"/>
-        <location filename="../build/ui_maintab.h" line="987"/>
-        <location filename="../desktop-widgets/maintab.cpp" line="306"/>
-        <source>Air temp.</source>
-        <translation>Темп. воздуха</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="122"/>
-        <location filename="../desktop-widgets/maintab.ui" line="855"/>
-        <location filename="../build/ui_maintab.h" line="950"/>
-        <location filename="../build/ui_maintab.h" line="989"/>
-        <location filename="../desktop-widgets/maintab.cpp" line="307"/>
-        <source>Water temp.</source>
-        <translation>Темп. воды</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="18"/>
-        <location filename="../desktop-widgets/maintab.ui" line="439"/>
-        <location filename="../build/ui_maintab.h" line="961"/>
-        <location filename="../build/ui_maintab.h" line="963"/>
-        <location filename="../desktop-widgets/maintab.cpp" line="539"/>
-        <location filename="../desktop-widgets/maintab.cpp" line="571"/>
-        <source>Notes</source>
-        <translation>Примечания</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="21"/>
-        <location filename="../build/ui_maintab.h" line="964"/>
-        <source>General notes about the current selection</source>
-        <translation>Основная информация о выделенных погружениях</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="214"/>
-        <source>Edit dive site</source>
-        <translation>Редактирование сайта</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="217"/>
-        <location filename="../build/ui_maintab.h" line="953"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/maintab.ui" line="491"/>
         <location filename="../build/ui_maintab.h" line="965"/>
         <source>Equipment</source>
@@ -4211,6 +4298,12 @@ p, li { white-space: pre-wrap; }
         <translation>Информация о погружении</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="665"/>
+        <location filename="../build/ui_maintab.h" line="969"/>
+        <source>Interval</source>
+        <translation>Интервал</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="684"/>
         <location filename="../build/ui_maintab.h" line="971"/>
         <source>Gases used</source>
@@ -4223,18 +4316,38 @@ p, li { white-space: pre-wrap; }
         <translation>Расход газа</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="722"/>
+        <location filename="../desktop-widgets/maintab.ui" line="1094"/>
+        <location filename="../build/ui_maintab.h" line="975"/>
+        <location filename="../build/ui_maintab.h" line="1003"/>
+        <source>SAC</source>
+        <translation>SAC</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="741"/>
         <location filename="../build/ui_maintab.h" line="977"/>
         <source>CNS</source>
         <translation>CNS</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="760"/>
+        <location filename="../build/ui_maintab.h" line="979"/>
+        <source>OTU</source>
+        <translation>OTU</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="779"/>
         <location filename="../build/ui_maintab.h" line="981"/>
         <source>Max. depth</source>
         <translation>Макс. глубина</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="798"/>
+        <location filename="../build/ui_maintab.h" line="983"/>
+        <source>Avg. depth</source>
+        <translation>Сред. глубина</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="817"/>
         <location filename="../build/ui_maintab.h" line="985"/>
         <source>Air pressure</source>
@@ -4247,82 +4360,6 @@ p, li { white-space: pre-wrap; }
         <translation>Время погружения</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.ui" line="933"/>
-        <location filename="../build/ui_maintab.h" line="1007"/>
-        <source>Simple statistics about the selection</source>
-        <translation>Статистика выделенных погружений</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1039"/>
-        <location filename="../build/ui_maintab.h" line="999"/>
-        <source>Total time</source>
-        <translation>Общее время</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1106"/>
-        <location filename="../build/ui_maintab.h" line="1004"/>
-        <source>Gas consumption</source>
-        <translation>Расход газа</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1151"/>
-        <location filename="../build/ui_maintab.h" line="1009"/>
-        <source>All photos from the current selection</source>
-        <translation>Все фото выделенных погружений</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1177"/>
-        <location filename="../build/ui_maintab.h" line="1010"/>
-        <source>Extra data</source>
-        <translation>Дополнительно</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1180"/>
-        <location filename="../build/ui_maintab.h" line="1011"/>
-        <source>Adittional data from the dive computer</source>
-        <translation>Дополнительная информация из дайв-компьютера</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="92"/>
-        <location filename="../desktop-widgets/maintab.ui" line="646"/>
-        <location filename="../build/ui_maintab.h" line="947"/>
-        <location filename="../build/ui_maintab.h" line="967"/>
-        <source>Date</source>
-        <translation>Дата</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="102"/>
-        <location filename="../build/ui_maintab.h" line="948"/>
-        <source>Time</source>
-        <translation>Время</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="665"/>
-        <location filename="../build/ui_maintab.h" line="969"/>
-        <source>Interval</source>
-        <translation>Интервал</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="722"/>
-        <location filename="../desktop-widgets/maintab.ui" line="1094"/>
-        <location filename="../build/ui_maintab.h" line="975"/>
-        <location filename="../build/ui_maintab.h" line="1003"/>
-        <source>SAC</source>
-        <translation>SAC</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="798"/>
-        <location filename="../build/ui_maintab.h" line="983"/>
-        <source>Avg. depth</source>
-        <translation>Сред. глубина</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="760"/>
-        <location filename="../build/ui_maintab.h" line="979"/>
-        <source>OTU</source>
-        <translation>OTU</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/maintab.ui" line="893"/>
         <location filename="../build/ui_maintab.h" line="993"/>
         <source>Salinity</source>
@@ -4335,22 +4372,34 @@ p, li { white-space: pre-wrap; }
         <translation>Статистика</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="933"/>
+        <location filename="../build/ui_maintab.h" line="1007"/>
+        <source>Simple statistics about the selection</source>
+        <translation>Статистика выделенных погружений</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="986"/>
         <location filename="../build/ui_maintab.h" line="996"/>
         <source>Depth</source>
         <translation>Глуб.</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="998"/>
+        <location filename="../build/ui_maintab.h" line="997"/>
+        <source>Duration</source>
+        <translation>Длительность</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="1027"/>
         <location filename="../build/ui_maintab.h" line="998"/>
         <source>Temperature</source>
         <translation>Температура</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.ui" line="998"/>
-        <location filename="../build/ui_maintab.h" line="997"/>
-        <source>Duration</source>
-        <translation>Длительность</translation>
+        <location filename="../desktop-widgets/maintab.ui" line="1039"/>
+        <location filename="../build/ui_maintab.h" line="999"/>
+        <source>Total time</source>
+        <translation>Общее время</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/maintab.ui" line="1058"/>
@@ -4359,20 +4408,34 @@ p, li { white-space: pre-wrap; }
         <translation>Погружения</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="1106"/>
+        <location filename="../build/ui_maintab.h" line="1004"/>
+        <source>Gas consumption</source>
+        <translation>Расход газа</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="1148"/>
         <location filename="../build/ui_maintab.h" line="1008"/>
         <source>Photos</source>
         <translation>Фотографии</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.cpp" line="88"/>
-        <source>Cylinders</source>
-        <translation>Баллоны</translation>
+        <location filename="../desktop-widgets/maintab.ui" line="1151"/>
+        <location filename="../build/ui_maintab.h" line="1009"/>
+        <source>All photos from the current selection</source>
+        <translation>Все фото выделенных погружений</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.cpp" line="92"/>
-        <source>Weights</source>
-        <translation>Грузы</translation>
+        <location filename="../desktop-widgets/maintab.ui" line="1177"/>
+        <location filename="../build/ui_maintab.h" line="1010"/>
+        <source>Extra data</source>
+        <translation>Дополнительно</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="1180"/>
+        <location filename="../build/ui_maintab.h" line="1011"/>
+        <source>Adittional data from the dive computer</source>
+        <translation>Дополнительная информация из дайв-компьютера</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/maintab.cpp" line="63"/>
@@ -4385,11 +4448,21 @@ p, li { white-space: pre-wrap; }
         <translation>Отменить изменения</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.cpp" line="88"/>
+        <source>Cylinders</source>
+        <translation>Баллоны</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.cpp" line="89"/>
         <source>Add cylinder</source>
         <translation>Добавить баллон</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.cpp" line="92"/>
+        <source>Weights</source>
+        <translation>Грузы</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.cpp" line="93"/>
         <source>Add weight system</source>
         <translation>Добавить грузовую систему</translation>
@@ -4582,659 +4655,685 @@ mixed from Air and using:
         <translation>Файл</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="455"/>
-        <location filename="../build/ui_mainwindow.h" line="534"/>
-        <source>Export dive logs</source>
-        <translation>Экспорт </translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="510"/>
-        <location filename="../build/ui_mainwindow.h" line="542"/>
-        <source>Toggle pHe graph</source>
-        <translation>График pHe</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="546"/>
-        <location filename="../build/ui_mainwindow.h" line="545"/>
-        <source>Toggle calculating all tissues</source>
-        <translation>Расчет всех тканей</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="522"/>
-        <location filename="../build/ui_mainwindow.h" line="543"/>
-        <source>Toggle DC reported ceiling</source>
-        <translation>Потолок компьютера</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="534"/>
-        <location filename="../build/ui_mainwindow.h" line="544"/>
-        <source>Toggle calculated ceiling</source>
-        <translation>Расчетный потолок</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="606"/>
-        <location filename="../build/ui_mainwindow.h" line="550"/>
-        <source>Toggle NDL, TTS</source>
-        <translation>NDL, TTS</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="558"/>
-        <location filename="../build/ui_mainwindow.h" line="546"/>
-        <source>Toggle calculated ceiling with 3m increments</source>
-        <translation>3м шаг для расчетного потолка</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="463"/>
-        <location filename="../build/ui_mainwindow.h" line="537"/>
-        <source>Configure &amp;dive computer</source>
-        <translation>Настройки дайв-компьютера</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="570"/>
-        <location filename="../build/ui_mainwindow.h" line="547"/>
-        <source>Toggle heart rate</source>
-        <translation>Пульс</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="582"/>
-        <location filename="../build/ui_mainwindow.h" line="548"/>
-        <source>Toggle MOD</source>
-        <translation>MOD</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="594"/>
-        <location filename="../build/ui_mainwindow.h" line="549"/>
-        <source>Toggle EAD, END, EADD</source>
-        <translation>EAD, END, EADD</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="618"/>
-        <location filename="../build/ui_mainwindow.h" line="551"/>
-        <source>Toggle SAC rate</source>
-        <translation>SAC</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="630"/>
-        <location filename="../build/ui_mainwindow.h" line="552"/>
-        <source>Toggle ruler</source>
-        <translation>Рулетка</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="86"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="87"/>
         <location filename="../build/ui_mainwindow.h" line="569"/>
         <source>&amp;Log</source>
         <translation>Журнал</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="105"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="104"/>
         <location filename="../build/ui_mainwindow.h" line="570"/>
         <source>&amp;View</source>
         <translation>Вид</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="121"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="120"/>
         <location filename="../build/ui_mainwindow.h" line="571"/>
         <source>&amp;Help</source>
         <translation>Помощь</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="130"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="129"/>
         <location filename="../build/ui_mainwindow.h" line="572"/>
         <source>&amp;Import</source>
         <translation>Импорт</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="139"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="138"/>
         <location filename="../build/ui_mainwindow.h" line="573"/>
         <source>&amp;Edit</source>
         <translation>Редактирование</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="144"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="143"/>
         <source>Share on</source>
         <translation>Поделиться</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="158"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="157"/>
         <location filename="../build/ui_mainwindow.h" line="453"/>
         <source>&amp;New logbook</source>
         <translation>Новый журнал</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="161"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="160"/>
         <location filename="../build/ui_mainwindow.h" line="455"/>
         <source>New</source>
         <translation>Новый</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="164"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="163"/>
         <location filename="../build/ui_mainwindow.h" line="457"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="169"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="168"/>
         <location filename="../build/ui_mainwindow.h" line="458"/>
         <source>&amp;Open logbook</source>
         <translation>Открыть журнал</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="172"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="171"/>
         <location filename="../build/ui_mainwindow.h" line="460"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="508"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="502"/>
         <source>Open</source>
         <translation>Открыть</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="175"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="174"/>
         <location filename="../build/ui_mainwindow.h" line="462"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="180"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="179"/>
         <location filename="../build/ui_mainwindow.h" line="463"/>
         <source>&amp;Save</source>
         <translation>Сохранить</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="183"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="182"/>
         <location filename="../build/ui_mainwindow.h" line="465"/>
         <source>Save</source>
         <translation>Сохранить</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="186"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="185"/>
         <location filename="../build/ui_mainwindow.h" line="467"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="191"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="190"/>
         <location filename="../build/ui_mainwindow.h" line="468"/>
         <source>Sa&amp;ve as</source>
         <translation>Сохранить как</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="194"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="193"/>
         <location filename="../build/ui_mainwindow.h" line="470"/>
         <source>Save as</source>
         <translation>Сохранить как</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="197"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="196"/>
         <location filename="../build/ui_mainwindow.h" line="472"/>
         <source>Ctrl+Shift+S</source>
         <translation>Ctrl+Shift+S</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="202"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="201"/>
         <location filename="../build/ui_mainwindow.h" line="473"/>
         <source>&amp;Close</source>
         <translation>Закрыть</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="205"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="204"/>
         <location filename="../build/ui_mainwindow.h" line="475"/>
         <source>Close</source>
         <translation>Закрыть</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="208"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="207"/>
         <location filename="../build/ui_mainwindow.h" line="477"/>
         <source>Ctrl+W</source>
         <translation>Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="221"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="212"/>
+        <location filename="../build/ui_mainwindow.h" line="478"/>
+        <source>&amp;Print</source>
+        <translation>Печать</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="215"/>
+        <location filename="../build/ui_mainwindow.h" line="479"/>
+        <source>Ctrl+P</source>
+        <translation>Ctrl+P</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="220"/>
         <location filename="../build/ui_mainwindow.h" line="480"/>
         <source>P&amp;references</source>
         <translation>Настройки</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="251"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="223"/>
+        <location filename="../build/ui_mainwindow.h" line="481"/>
+        <source>Ctrl+,</source>
+        <translation>Ctrl+,</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="231"/>
+        <location filename="../build/ui_mainwindow.h" line="482"/>
+        <source>&amp;Quit</source>
+        <translation>Выход</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="234"/>
+        <location filename="../build/ui_mainwindow.h" line="483"/>
+        <source>Ctrl+Q</source>
+        <translation>Ctrl+Q</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="242"/>
+        <location filename="../build/ui_mainwindow.h" line="484"/>
+        <source>Import from &amp;dive computer</source>
+        <translation>Импорт из дайвкомпьютера</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="245"/>
+        <location filename="../build/ui_mainwindow.h" line="485"/>
+        <source>Ctrl+D</source>
+        <translation>Ctrl+D</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="250"/>
         <location filename="../build/ui_mainwindow.h" line="486"/>
         <source>Import &amp;GPS data from Subsurface web service</source>
         <translation>Импорт координат из веб-сервиса Subsurface</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="259"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="253"/>
+        <location filename="../build/ui_mainwindow.h" line="487"/>
+        <source>Ctrl+G</source>
+        <translation>Ctrl+G</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="258"/>
         <location filename="../build/ui_mainwindow.h" line="488"/>
         <source>Edit device &amp;names</source>
         <translation>Названия дайвкомпьютеров</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="272"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="263"/>
+        <location filename="../build/ui_mainwindow.h" line="489"/>
+        <source>&amp;Add dive</source>
+        <translation>Добавить погружение</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="266"/>
+        <location filename="../build/ui_mainwindow.h" line="490"/>
+        <source>Ctrl++</source>
+        <translation>Ctrl++</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="271"/>
         <location filename="../build/ui_mainwindow.h" line="491"/>
         <source>&amp;Edit dive</source>
         <translation>Редактировать погружение</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="277"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="276"/>
         <location filename="../build/ui_mainwindow.h" line="492"/>
         <source>&amp;Copy dive components</source>
         <translation>Копировать параметры погружения</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="280"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="279"/>
         <location filename="../build/ui_mainwindow.h" line="493"/>
         <source>Ctrl+C</source>
         <translation>Ctrl+C</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="285"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="284"/>
         <location filename="../build/ui_mainwindow.h" line="494"/>
         <source>&amp;Paste dive components</source>
         <translation>Вставить параметры погружения</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="288"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="287"/>
         <location filename="../build/ui_mainwindow.h" line="495"/>
         <source>Ctrl+V</source>
         <translation>Ctrl+V</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="325"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="292"/>
+        <location filename="../build/ui_mainwindow.h" line="496"/>
+        <source>&amp;Renumber</source>
+        <translation>Перенумеровать</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="295"/>
+        <location filename="../build/ui_mainwindow.h" line="497"/>
+        <source>Ctrl+R</source>
+        <translation>Ctrl+R</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="303"/>
+        <location filename="../build/ui_mainwindow.h" line="498"/>
+        <source>Auto &amp;group</source>
+        <translation>Авто-группировка</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="308"/>
+        <location filename="../build/ui_mainwindow.h" line="499"/>
+        <source>&amp;Yearly statistics</source>
+        <translation>Статистика по годам</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="311"/>
+        <location filename="../build/ui_mainwindow.h" line="500"/>
+        <source>Ctrl+Y</source>
+        <translation>Ctrl+Y</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="316"/>
+        <location filename="../build/ui_mainwindow.h" line="501"/>
+        <source>&amp;Dive list</source>
+        <translation>Список погружений</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="319"/>
+        <location filename="../build/ui_mainwindow.h" line="502"/>
+        <source>Ctrl+2</source>
+        <translation>Ctrl+2</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="324"/>
         <location filename="../build/ui_mainwindow.h" line="503"/>
         <source>&amp;Profile</source>
         <translation>Профиль</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="333"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="327"/>
+        <location filename="../build/ui_mainwindow.h" line="504"/>
+        <source>Ctrl+3</source>
+        <translation>Ctrl+3</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="332"/>
         <location filename="../build/ui_mainwindow.h" line="505"/>
         <source>&amp;Info</source>
         <translation>Информация</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="341"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="335"/>
+        <location filename="../build/ui_mainwindow.h" line="506"/>
+        <source>Ctrl+4</source>
+        <translation>Ctrl+4</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="340"/>
         <location filename="../build/ui_mainwindow.h" line="507"/>
         <source>&amp;All</source>
         <translation>Все</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="357"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="343"/>
+        <location filename="../build/ui_mainwindow.h" line="508"/>
+        <source>Ctrl+1</source>
+        <translation>Ctrl+1</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="348"/>
+        <location filename="../build/ui_mainwindow.h" line="509"/>
+        <source>P&amp;revious DC</source>
+        <translation>Пред. компьютер</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="351"/>
+        <location filename="../build/ui_mainwindow.h" line="510"/>
+        <source>Left</source>
+        <translation>Влево</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="356"/>
         <location filename="../build/ui_mainwindow.h" line="511"/>
         <source>&amp;Next DC</source>
         <translation>След. компьютер</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="365"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="359"/>
+        <location filename="../build/ui_mainwindow.h" line="512"/>
+        <source>Right</source>
+        <translation>Вправо</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="364"/>
         <location filename="../build/ui_mainwindow.h" line="513"/>
         <source>&amp;About Subsurface</source>
         <translation>О Subsurface</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="381"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="372"/>
+        <location filename="../build/ui_mainwindow.h" line="514"/>
+        <source>User &amp;manual</source>
+        <translation>Руководство пользователя</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="375"/>
+        <location filename="../build/ui_mainwindow.h" line="515"/>
+        <source>F1</source>
+        <translation>F1</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="380"/>
         <location filename="../build/ui_mainwindow.h" line="516"/>
         <source>&amp;Globe</source>
         <translation>Карта</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="403"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="383"/>
+        <location filename="../build/ui_mainwindow.h" line="517"/>
+        <source>Ctrl+5</source>
+        <translation>Ctrl+5</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="388"/>
+        <location filename="../build/ui_mainwindow.h" line="518"/>
+        <source>P&amp;lan dive</source>
+        <translation>Планировщик</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="391"/>
+        <location filename="../build/ui_mainwindow.h" line="519"/>
+        <source>Ctrl+L</source>
+        <translation>Ctrl+L</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="396"/>
+        <location filename="../build/ui_mainwindow.h" line="520"/>
+        <source>&amp;Import log files</source>
+        <translation>Импорт журналов</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="399"/>
+        <location filename="../build/ui_mainwindow.h" line="522"/>
+        <source>Import divelog files from other applications</source>
+        <translation>Импортировать журнал погружений из другой программы</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="402"/>
         <location filename="../build/ui_mainwindow.h" line="524"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="408"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="407"/>
         <location filename="../build/ui_mainwindow.h" line="525"/>
         <source>Import &amp;from divelogs.de</source>
         <translation>Импорт с сайта divelogs.de</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="416"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="415"/>
         <location filename="../build/ui_mainwindow.h" line="526"/>
         <source>&amp;Full screen</source>
         <translation>Полный экран</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="419"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="418"/>
         <location filename="../build/ui_mainwindow.h" line="528"/>
         <source>Toggle full screen</source>
         <translation>Переключить полноэкранный режим</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="447"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="421"/>
+        <location filename="../build/ui_mainwindow.h" line="530"/>
+        <source>F11</source>
+        <translation>F11</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="446"/>
         <location filename="../build/ui_mainwindow.h" line="531"/>
         <source>&amp;Check for updates</source>
         <translation>Проверить обновления</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="452"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="451"/>
         <location filename="../build/ui_mainwindow.h" line="532"/>
         <source>&amp;Export</source>
         <translation>Экспорт</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="458"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="454"/>
+        <location filename="../build/ui_mainwindow.h" line="534"/>
+        <source>Export dive logs</source>
+        <translation>Экспорт </translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="457"/>
         <location filename="../build/ui_mainwindow.h" line="536"/>
         <source>Ctrl+E</source>
         <translation>Ctrl+E</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="466"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="462"/>
+        <location filename="../build/ui_mainwindow.h" line="537"/>
+        <source>Configure &amp;dive computer</source>
+        <translation>Настройки дайв-компьютера</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="465"/>
         <location filename="../build/ui_mainwindow.h" line="538"/>
         <source>Ctrl+Shift+C</source>
         <translation>Ctrl+Shift+C</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="474"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="473"/>
         <location filename="../build/ui_mainwindow.h" line="539"/>
         <source>Edit &amp;dive in planner</source>
         <translation>Редактировать в планировщике</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="486"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="485"/>
         <location filename="../build/ui_mainwindow.h" line="540"/>
         <source>Toggle pO₂ graph</source>
         <translation>График pO₂</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="498"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="497"/>
         <location filename="../build/ui_mainwindow.h" line="541"/>
         <source>Toggle pN₂ graph</source>
         <translation>График pN₂</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="642"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="509"/>
+        <location filename="../build/ui_mainwindow.h" line="542"/>
+        <source>Toggle pHe graph</source>
+        <translation>График pHe</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="521"/>
+        <location filename="../build/ui_mainwindow.h" line="543"/>
+        <source>Toggle DC reported ceiling</source>
+        <translation>Потолок компьютера</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="533"/>
+        <location filename="../build/ui_mainwindow.h" line="544"/>
+        <source>Toggle calculated ceiling</source>
+        <translation>Расчетный потолок</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="545"/>
+        <location filename="../build/ui_mainwindow.h" line="545"/>
+        <source>Toggle calculating all tissues</source>
+        <translation>Расчет всех тканей</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="557"/>
+        <location filename="../build/ui_mainwindow.h" line="546"/>
+        <source>Toggle calculated ceiling with 3m increments</source>
+        <translation>3м шаг для расчетного потолка</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="569"/>
+        <location filename="../build/ui_mainwindow.h" line="547"/>
+        <source>Toggle heart rate</source>
+        <translation>Пульс</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="581"/>
+        <location filename="../build/ui_mainwindow.h" line="548"/>
+        <source>Toggle MOD</source>
+        <translation>MOD</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="593"/>
+        <location filename="../build/ui_mainwindow.h" line="549"/>
+        <source>Toggle EAD, END, EADD</source>
+        <translation>EAD, END, EADD</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="605"/>
+        <location filename="../build/ui_mainwindow.h" line="550"/>
+        <source>Toggle NDL, TTS</source>
+        <translation>NDL, TTS</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="617"/>
+        <location filename="../build/ui_mainwindow.h" line="551"/>
+        <source>Toggle SAC rate</source>
+        <translation>SAC</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="629"/>
+        <location filename="../build/ui_mainwindow.h" line="552"/>
+        <source>Toggle ruler</source>
+        <translation>Рулетка</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="641"/>
         <location filename="../build/ui_mainwindow.h" line="553"/>
         <source>Scale graph</source>
         <translation>Альтернативный масштаб</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="654"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="653"/>
         <location filename="../build/ui_mainwindow.h" line="554"/>
         <source>Toggle pictures</source>
         <translation>Фотографии</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="666"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="665"/>
         <location filename="../build/ui_mainwindow.h" line="555"/>
         <source>Toggle tank bar</source>
         <translation>Замена смесей</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="674"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="673"/>
         <location filename="../build/ui_mainwindow.h" line="556"/>
         <source>&amp;Filter divelist</source>
         <translation>Фильтр погружений</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="689"/>
-        <location filename="../build/ui_mainwindow.h" line="558"/>
-        <source>Toggle tissue graph</source>
-        <translation>Насыщение тканей</translation>
+        <location filename="../desktop-widgets/mainwindow.ui" line="676"/>
+        <location filename="../build/ui_mainwindow.h" line="557"/>
+        <source>Ctrl+F</source>
+        <translation>Ctrl+F</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="688"/>
+        <source>Toggle tissue heat-map</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="694"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="693"/>
         <location filename="../build/ui_mainwindow.h" line="559"/>
         <source>User &amp;survey</source>
         <translation>Опрос пользователей</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="699"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="698"/>
         <location filename="../build/ui_mainwindow.h" line="560"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="238"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="231"/>
         <source>&amp;Undo</source>
         <translation>Отменить</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="702"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="701"/>
         <location filename="../build/ui_mainwindow.h" line="561"/>
         <source>Ctrl+Z</source>
         <translation>Ctrl+Z</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="707"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="706"/>
         <location filename="../build/ui_mainwindow.h" line="562"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="239"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="232"/>
         <source>&amp;Redo</source>
         <translation>Повторить</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="710"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="709"/>
         <location filename="../build/ui_mainwindow.h" line="563"/>
         <source>Ctrl+Shift+Z</source>
         <translation>Ctrl+Shift+Z</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="715"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="714"/>
         <location filename="../build/ui_mainwindow.h" line="564"/>
         <source>&amp;Find moved images</source>
         <translation>Найти перемещенные фото</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="720"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="719"/>
         <source>Open c&amp;loud storage</source>
         <translation>Открыть облачное хранилище</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="725"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="724"/>
         <source>Save to clo&amp;ud storage</source>
         <translation>Сохранить в облаке</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="730"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="729"/>
         <location filename="../build/ui_mainwindow.h" line="567"/>
         <source>&amp;Manage dive sites</source>
         <translation>Управление дайв-сайтами</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="735"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="734"/>
         <source>Dive Site &amp;Edit</source>
         <translation>Редактирование дайв-сайта</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="740"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="739"/>
         <source>Facebook</source>
         <translation>Facebook</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="745"/>
-        <source>Add GPS location here</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="744"/>
+        <source>Take cloud storage online</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="677"/>
-        <location filename="../build/ui_mainwindow.h" line="557"/>
-        <source>Ctrl+F</source>
-        <translation>Ctrl+F</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="213"/>
-        <location filename="../build/ui_mainwindow.h" line="478"/>
-        <source>&amp;Print</source>
-        <translation>Печать</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="224"/>
-        <location filename="../build/ui_mainwindow.h" line="481"/>
-        <source>Ctrl+,</source>
-        <translation>Ctrl+,</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="232"/>
-        <location filename="../build/ui_mainwindow.h" line="482"/>
-        <source>&amp;Quit</source>
-        <translation>Выход</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="243"/>
-        <location filename="../build/ui_mainwindow.h" line="484"/>
-        <source>Import from &amp;dive computer</source>
-        <translation>Импорт из дайвкомпьютера</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="254"/>
-        <location filename="../build/ui_mainwindow.h" line="487"/>
-        <source>Ctrl+G</source>
-        <translation>Ctrl+G</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="267"/>
-        <location filename="../build/ui_mainwindow.h" line="490"/>
-        <source>Ctrl++</source>
-        <translation>Ctrl++</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="293"/>
-        <location filename="../build/ui_mainwindow.h" line="496"/>
-        <source>&amp;Renumber</source>
-        <translation>Перенумеровать</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="296"/>
-        <location filename="../build/ui_mainwindow.h" line="497"/>
-        <source>Ctrl+R</source>
-        <translation>Ctrl+R</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="312"/>
-        <location filename="../build/ui_mainwindow.h" line="500"/>
-        <source>Ctrl+Y</source>
-        <translation>Ctrl+Y</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="392"/>
-        <location filename="../build/ui_mainwindow.h" line="519"/>
-        <source>Ctrl+L</source>
-        <translation>Ctrl+L</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="216"/>
-        <location filename="../build/ui_mainwindow.h" line="479"/>
-        <source>Ctrl+P</source>
-        <translation>Ctrl+P</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="235"/>
-        <location filename="../build/ui_mainwindow.h" line="483"/>
-        <source>Ctrl+Q</source>
-        <translation>Ctrl+Q</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="246"/>
-        <location filename="../build/ui_mainwindow.h" line="485"/>
-        <source>Ctrl+D</source>
-        <translation>Ctrl+D</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="264"/>
-        <location filename="../build/ui_mainwindow.h" line="489"/>
-        <source>&amp;Add dive</source>
-        <translation>Добавить погружение</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="304"/>
-        <location filename="../build/ui_mainwindow.h" line="498"/>
-        <source>Auto &amp;group</source>
-        <translation>Авто-группировка</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="309"/>
-        <location filename="../build/ui_mainwindow.h" line="499"/>
-        <source>&amp;Yearly statistics</source>
-        <translation>Статистика по годам</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="317"/>
-        <location filename="../build/ui_mainwindow.h" line="501"/>
-        <source>&amp;Dive list</source>
-        <translation>Список погружений</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="320"/>
-        <location filename="../build/ui_mainwindow.h" line="502"/>
-        <source>Ctrl+2</source>
-        <translation>Ctrl+2</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="328"/>
-        <location filename="../build/ui_mainwindow.h" line="504"/>
-        <source>Ctrl+3</source>
-        <translation>Ctrl+3</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="336"/>
-        <location filename="../build/ui_mainwindow.h" line="506"/>
-        <source>Ctrl+4</source>
-        <translation>Ctrl+4</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="344"/>
-        <location filename="../build/ui_mainwindow.h" line="508"/>
-        <source>Ctrl+1</source>
-        <translation>Ctrl+1</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="349"/>
-        <location filename="../build/ui_mainwindow.h" line="509"/>
-        <source>P&amp;revious DC</source>
-        <translation>Пред. компьютер</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="352"/>
-        <location filename="../build/ui_mainwindow.h" line="510"/>
-        <source>Left</source>
-        <translation>Влево</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="360"/>
-        <location filename="../build/ui_mainwindow.h" line="512"/>
-        <source>Right</source>
-        <translation>Вправо</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="373"/>
-        <location filename="../build/ui_mainwindow.h" line="514"/>
-        <source>User &amp;manual</source>
-        <translation>Руководство пользователя</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="376"/>
-        <location filename="../build/ui_mainwindow.h" line="515"/>
-        <source>F1</source>
-        <translation>F1</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="384"/>
-        <location filename="../build/ui_mainwindow.h" line="517"/>
-        <source>Ctrl+5</source>
-        <translation>Ctrl+5</translation>
+        <location filename="../build/ui_mainwindow.h" line="558"/>
+        <source>Toggle tissue graph</source>
+        <translation>Насыщение тканей</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="389"/>
-        <location filename="../build/ui_mainwindow.h" line="518"/>
-        <source>P&amp;lan dive</source>
-        <translation>Планировщик</translation>
+        <location filename="../build/ui_mainwindow.h" line="565"/>
+        <source>Open cloud storage</source>
+        <translation>Открыть облачное хранилище</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="397"/>
-        <location filename="../build/ui_mainwindow.h" line="520"/>
-        <source>&amp;Import log files</source>
-        <translation>Импорт журналов</translation>
+        <location filename="../build/ui_mainwindow.h" line="566"/>
+        <source>Save to cloud storage</source>
+        <translation>Сохранить в облако</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="400"/>
-        <location filename="../build/ui_mainwindow.h" line="522"/>
-        <source>Import divelog files from other applications</source>
-        <translation>Импортировать журнал погружений из другой программы</translation>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="331"/>
+        <source>Connect to</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="422"/>
-        <location filename="../build/ui_mainwindow.h" line="530"/>
-        <source>F11</source>
-        <translation>F11</translation>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="493"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="538"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1545"/>
+        <source>Please save or cancel the current dive edit before opening a new file.</source>
+        <translation>Сохраните или отмените изменения перед открытием нового файла.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="505"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="499"/>
         <source>Open file</source>
         <translation>Открыть журнал</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="509"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="503"/>
         <location filename="../desktop-widgets/mainwindow.cpp" line="614"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1972"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1978"/>
         <source>Cancel</source>
         <translation>Отмена</translation>
     </message>
@@ -5254,6 +5353,16 @@ mixed from Air and using:
         <translation>Поиск изображений, подождите...</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="649"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="796"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="977"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="983"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1849"/>
+        <source>Warning</source>
+        <translation>Предупреждение</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="674"/>
         <source>Please save or cancel the current dive edit before closing the file.</source>
         <translation>Сохраните или отмените изменения перед закрытием файла.</translation>
@@ -5269,125 +5378,98 @@ mixed from Air and using:
         <translation>Печать плана погружения</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="982"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
+        <source>Trying to replan a dive that&apos;s not a planned dive.</source>
+        <translation>Попытка перепланирования погружения, созданного не в планировщике.</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="977"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1849"/>
+        <source>Please, first finish the current edition before trying to do another.</source>
+        <translation>Пожалуйста, для начала закончите текущее редактирование, а потом пробуйте редактировать другой.</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="983"/>
         <source>Trying to edit a dive that&apos;s not a manually added dive.</source>
         <translation>Попытка редактирования погружения, созданного не вручную.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1243"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1030"/>
+        <source>Yearly statistics</source>
+        <translation>Статистика по годам</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1244"/>
         <source>Do you want to save the changes that you made in the file %1?</source>
         <translation>Хотите ли вы сохранить изменения, внесенные в файл %1?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1246"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1247"/>
         <source>Do you want to save the changes that you made in the data file?</source>
         <translation>Хотите ли вы сохранить изменения, внесенные в файл журнала?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1251"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1252"/>
         <source>Save changes?</source>
         <translation>Сохранить изменения?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1587"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1253"/>
+        <source>Changes will be lost if you don&apos;t save them.</source>
+        <translation>Изменения будут утеряны, если вы не сохраните их.</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1572"/>
         <source>Save file as</source>
         <translation>Сохранить как</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1682"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1573"/>
+        <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
+        <translation>Subsurface XML файлы (*.ssrf *.xml *.XML)</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1670"/>
+        <source>[local cache for] %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1672"/>
         <source>[cloud storage for] %1</source>
         <translation>[облачное хранилище для] %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1782"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1788"/>
         <source>Opening datafile from older version</source>
         <translation>Журнал создан в старой версии</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1783"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1789"/>
         <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly.
 Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source>
         <translation>Вы открыли журнал, созданный в старой версии Subsurface. Мы рекомендуем прочитать руководство, чтобы узнать о последних изменения, особенно что касается управления сайтами погружений.
 Subsurface попытался перенести уже существующие данные, но тем не менее стоит проверить, что все информация выглядит корректно.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1794"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1800"/>
         <source>Open dive log file</source>
         <translation>Открыть журнал погружений</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1795"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1801"/>
         <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1972"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1978"/>
         <source>Contacting cloud service...</source>
         <translation>Соединение с облачным сервисом...</translation>
     </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1252"/>
-        <source>Changes will be lost if you don&apos;t save them.</source>
-        <translation>Изменения будут утеряны, если вы не сохраните их.</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="649"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="796"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="976"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="982"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/>
-        <source>Warning</source>
-        <translation>Предупреждение</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="499"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="544"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1560"/>
-        <source>Please save or cancel the current dive edit before opening a new file.</source>
-        <translation>Сохраните или отмените изменения перед открытием нового файла.</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="338"/>
-        <source>Connect to</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
-        <source>Trying to replan a dive that&apos;s not a planned dive.</source>
-        <translation>Попытка перепланирования погружения, созданного не в планировщике.</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1029"/>
-        <source>Yearly statistics</source>
-        <translation>Статистика по годам</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1588"/>
-        <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
-        <translation>Subsurface XML файлы (*.ssrf *.xml *.XML)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="976"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/>
-        <source>Please, first finish the current edition before trying to do another.</source>
-        <translation>Пожалуйста, для начала закончите текущее редактирование, а потом пробуйте редактировать другой.</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_mainwindow.h" line="565"/>
-        <source>Open cloud storage</source>
-        <translation>Открыть облачное хранилище</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_mainwindow.h" line="566"/>
-        <source>Save to cloud storage</source>
-        <translation>Сохранить в облако</translation>
-    </message>
 </context>
 <context>
     <name>MultiFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="733"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="731"/>
         <source>Filter shows %1 (of %2) dives</source>
         <translation>Показано %1 (из %2) погружений</translation>
     </message>
@@ -5395,12 +5477,12 @@ Subsurface попытался перенести уже существующие
 <context>
     <name>OstcFirmwareCheck</name>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="269"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="271"/>
         <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source>
         <translation>Вам следует обновить прошивку дайвкомпьютера: текущая версия %1, а последняя стабильная версия %2</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="273"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="275"/>
         <source>
 
 Please start Bluetooth on your OSTC Sport and do the same preparations as for a logbook download before continuing with the update</source>
@@ -5409,27 +5491,27 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 Включите Bluetooth на OSTC Sport и выполните такие же приготовления, что и для загрузки журнала, прежде чем продолжать обновление.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="274"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="276"/>
         <source>Not now</source>
         <translation>Не сейчас</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="275"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="277"/>
         <source>Update firmware</source>
         <translation>Обновить прошивку</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="277"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="279"/>
         <source>Firmware upgrade notice</source>
         <translation>Примечание по обновлению прошивки</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="295"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="297"/>
         <source>Save the downloaded firmware as</source>
         <translation>Сохранить загруженную прошивку как</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="296"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="298"/>
         <source>HEX files (*.hex)</source>
         <translation>Файлы HEX (*.hex)</translation>
     </message>
@@ -5437,79 +5519,89 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PlannerSettingsWidget</name>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="322"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="302"/>
         <source>Open circuit</source>
         <translation>Открытый цикл</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="322"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="302"/>
         <source>CCR</source>
         <translation>CCR</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="322"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="302"/>
         <source>pSCR</source>
         <translation>pSCR</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="421"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="388"/>
         <source>ft/min</source>
         <translation>фут/мин</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="422"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="389"/>
         <source>Last stop at 20ft</source>
         <translation>Последняя остановка на 20фт</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="423"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="390"/>
         <source>50% avg. depth to 20ft</source>
         <translation>50% ср. глубины - 20фут</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="424"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="391"/>
         <source>20ft to surface</source>
         <translation>20фут - поверхность</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="426"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="392"/>
+        <source>ft</source>
+        <translation>фут</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="394"/>
         <source>m/min</source>
         <translation>м/мин</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="427"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="395"/>
         <source>Last stop at 6m</source>
         <translation>Последняя остановка на 6м</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="428"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="396"/>
         <source>50% avg. depth to 6m</source>
         <translation>50% ср. глубины - 6м</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="429"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="397"/>
         <source>6m to surface</source>
         <translation>6м - поверхность</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="432"/>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="433"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="398"/>
+        <source>m</source>
+        <translation>м</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="401"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="402"/>
         <source>cuft/min</source>
         <translation>куб.фут/мин</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="441"/>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="442"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="410"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="411"/>
         <source>ℓ/min</source>
         <translation>л/мин</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="451"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="420"/>
         <source>bar</source>
         <translation>бар</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="456"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="425"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
@@ -5659,6 +5751,11 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PreferencesDialog</name>
     <message>
+        <location filename="../build/ui_preferences.h" line="1283"/>
+        <source>Preferences</source>
+        <translation>Настройки</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1288"/>
         <source>Defaults</source>
         <translation>Общие</translation>
@@ -5694,6 +5791,11 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>Геопоиск</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1303"/>
+        <source>Lists and tables</source>
+        <translation>Списки и таблицы</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1304"/>
         <source>Font</source>
         <translation>Шрифт</translation>
@@ -5709,6 +5811,11 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>Погружения</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1307"/>
+        <source>Default dive log file</source>
+        <translation>Журнал по умолчанию</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1308"/>
         <source>No default file</source>
         <translation>Отсутствует</translation>
@@ -5739,6 +5846,21 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>...</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1314"/>
+        <source>Display invalid</source>
+        <translation>Показывать ошибочные</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1316"/>
+        <source>Default cylinder</source>
+        <translation>Баллон по умолчанию</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1317"/>
+        <source>Use default cylinder</source>
+        <translation>Использовать по умолчанию</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1318"/>
         <source>Animations</source>
         <translation>Анимация</translation>
@@ -5769,40 +5891,24 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>Система мер</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1401"/>
-        <source>Dive site geo lookup</source>
-        <translation>Геопоиск дайв-сайтов</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1402"/>
-        <source>Enable geocoding for dive site management</source>
-        <translation>Включить геокодирование для дайв-сайтов</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1403"/>
-        <source>Parse site without GPS data</source>
-        <translation>Искать сайты без координат GPS</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1404"/>
-        <source>Same format for existing dives</source>
-        <translation>Один формат для существующих погружений</translation>
+        <location filename="../build/ui_preferences.h" line="1324"/>
+        <source>&amp;Metric</source>
+        <translation>Метрическая</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1405"/>
-        <source>Dive Site Layout</source>
-        <translation>Формат названия дайв-сайта</translation>
+        <location filename="../build/ui_preferences.h" line="1325"/>
+        <source>Imperial</source>
+        <translation>Имперская</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1406"/>
-        <location filename="../build/ui_preferences.h" line="1407"/>
-        <source>/</source>
-        <translation>/</translation>
+        <location filename="../build/ui_preferences.h" line="1326"/>
+        <source>Personali&amp;ze</source>
+        <translation>Персональная</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1325"/>
-        <source>Imperial</source>
-        <translation>Имперская</translation>
+        <location filename="../build/ui_preferences.h" line="1327"/>
+        <source>Individual settings</source>
+        <translation>Индивидуальные настройки</translation>
     </message>
     <message>
         <location filename="../build/ui_preferences.h" line="1328"/>
@@ -5820,6 +5926,11 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>фут</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1331"/>
+        <source>Pressure</source>
+        <translation>Давление</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1332"/>
         <location filename="../build/ui_preferences.h" line="1366"/>
         <source>bar</source>
@@ -5831,11 +5942,26 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>psi</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1334"/>
+        <source>Volume</source>
+        <translation>Объем</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1335"/>
+        <source>&amp;liter</source>
+        <translation>литр</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1336"/>
         <source>cu ft</source>
         <translation>куб. фут</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1337"/>
+        <source>Temperature</source>
+        <translation>Температура</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1338"/>
         <source>celsius</source>
         <translation>цельсий</translation>
@@ -5846,11 +5972,121 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>фаренгейт</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1340"/>
+        <source>Weight</source>
+        <translation>Вес</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1341"/>
         <source>kg</source>
         <translation>кг</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1342"/>
+        <source>lbs</source>
+        <translation>фунт</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1343"/>
+        <source>Time units</source>
+        <translation>Единицы времени</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1344"/>
+        <source>Ascent/descent speed denominator</source>
+        <translation>Делитель скорости спуска/подъема</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1345"/>
+        <source>Minutes</source>
+        <translation>Минуты</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1346"/>
+        <source>Seconds</source>
+        <translation>Секунды</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1347"/>
+        <source>GPS coordinates</source>
+        <translation>Координаты GPS</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1348"/>
+        <source>Location Display</source>
+        <translation>Отображение координат</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1349"/>
+        <source>traditional (dms)</source>
+        <translation>обычное (гмс)</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1350"/>
+        <source>decimal</source>
+        <translation>десятичное</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1351"/>
+        <source>Show</source>
+        <translation>Показывать</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1352"/>
+        <source>Threshold when showing pO₂</source>
+        <translation>Предельное значение pO₂</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1353"/>
+        <source>Threshold when showing pN₂</source>
+        <translation>Предельное значение pN₂</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1354"/>
+        <source>Threshold when showing pHe</source>
+        <translation>Предельное значение pHe</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1355"/>
+        <source>Max pO₂ when showing MOD</source>
+        <translation>Макс. pO₂ при отображении MOD</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1356"/>
+        <source>Draw dive computer reported ceiling red</source>
+        <translation>Показывать потолок дайвкомпьютера красным</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1357"/>
+        <source>Show unused cylinders in Equipment tab</source>
+        <translation>Показывать неиспользуемые баллоны</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1358"/>
+        <source>Show average depth</source>
+        <translation>Показывать среднюю глубину</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1359"/>
+        <source>Misc</source>
+        <translation>Разное</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1360"/>
+        <source>GFLow</source>
+        <translation>GFLow</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1361"/>
+        <source>GFHigh</source>
+        <translation>GFHigh</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1362"/>
+        <source>GFLow at max depth</source>
+        <translation>GFLow на макс. грубине</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1363"/>
         <source>CCR: show setpoints when viewing pO₂</source>
         <translation>CCR: показывать установки</translation>
@@ -5896,14 +6132,19 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>Системные настройки</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1374"/>
+        <source>Filter</source>
+        <translation>Фильтр</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1375"/>
         <source>Proxy</source>
         <translation>Прокси</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1379"/>
-        <source>Proxy type</source>
-        <translation>Тип прокси</translation>
+        <location filename="../build/ui_preferences.h" line="1376"/>
+        <source>Port</source>
+        <translation>Порт</translation>
     </message>
     <message>
         <location filename="../build/ui_preferences.h" line="1377"/>
@@ -5911,16 +6152,16 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>Хост</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1376"/>
-        <source>Port</source>
-        <translation>Порт</translation>
-    </message>
-    <message>
         <location filename="../build/ui_preferences.h" line="1378"/>
         <source>Requires authentication</source>
         <translation>Требуется авторизация</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1379"/>
+        <source>Proxy type</source>
+        <translation>Тип прокси</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1380"/>
         <source>Username</source>
         <translation>Пользователь</translation>
@@ -5932,46 +6173,6 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>Пароль</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1400"/>
-        <source>Disconnect from Facebook</source>
-        <translation>Отключиться от Facebook</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1374"/>
-        <source>Filter</source>
-        <translation>Фильтр</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1331"/>
-        <source>Pressure</source>
-        <translation>Давление</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1303"/>
-        <source>Lists and tables</source>
-        <translation>Списки и таблицы</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1307"/>
-        <source>Default dive log file</source>
-        <translation>Журнал по умолчанию</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1314"/>
-        <source>Display invalid</source>
-        <translation>Показывать ошибочные</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1316"/>
-        <source>Default cylinder</source>
-        <translation>Баллон по умолчанию</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1317"/>
-        <source>Use default cylinder</source>
-        <translation>Использовать по умолчанию</translation>
-    </message>
-    <message>
         <location filename="../build/ui_preferences.h" line="1382"/>
         <source>Subsurface cloud storage</source>
         <translation>Облачное хранилище Subsurface</translation>
@@ -6012,149 +6213,40 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>Сохранять ID пользователя</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1334"/>
-        <source>Volume</source>
-        <translation>Объем</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1337"/>
-        <source>Temperature</source>
-        <translation>Температура</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1340"/>
-        <source>Weight</source>
-        <translation>Вес</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1342"/>
-        <source>lbs</source>
-        <translation>фунт</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1343"/>
-        <source>Time units</source>
-        <translation>Единицы времени</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1345"/>
-        <source>Minutes</source>
-        <translation>Минуты</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1346"/>
-        <source>Seconds</source>
-        <translation>Секунды</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1351"/>
-        <source>Show</source>
-        <translation>Показывать</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1362"/>
-        <source>GFLow at max depth</source>
-        <translation>GFLow на макс. грубине</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1359"/>
-        <source>Misc</source>
-        <translation>Разное</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1283"/>
-        <source>Preferences</source>
-        <translation>Настройки</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1324"/>
-        <source>&amp;Metric</source>
-        <translation>Метрическая</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1326"/>
-        <source>Personali&amp;ze</source>
-        <translation>Персональная</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1327"/>
-        <source>Individual settings</source>
-        <translation>Индивидуальные настройки</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1335"/>
-        <source>&amp;liter</source>
-        <translation>литр</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1344"/>
-        <source>Ascent/descent speed denominator</source>
-        <translation>Делитель скорости спуска/подъема</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1347"/>
-        <source>GPS coordinates</source>
-        <translation>Координаты GPS</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1348"/>
-        <source>Location Display</source>
-        <translation>Отображение координат</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1349"/>
-        <source>traditional (dms)</source>
-        <translation>обычное (гмс)</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1350"/>
-        <source>decimal</source>
-        <translation>десятичное</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1352"/>
-        <source>Threshold when showing pO₂</source>
-        <translation>Предельное значение pO₂</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1353"/>
-        <source>Threshold when showing pN₂</source>
-        <translation>Предельное значение pN₂</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1354"/>
-        <source>Threshold when showing pHe</source>
-        <translation>Предельное значение pHe</translation>
+        <location filename="../build/ui_preferences.h" line="1400"/>
+        <source>Disconnect from Facebook</source>
+        <translation>Отключиться от Facebook</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1355"/>
-        <source>Max pO₂ when showing MOD</source>
-        <translation>Макс. pO₂ при отображении MOD</translation>
+        <location filename="../build/ui_preferences.h" line="1401"/>
+        <source>Dive site geo lookup</source>
+        <translation>Геопоиск дайв-сайтов</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1356"/>
-        <source>Draw dive computer reported ceiling red</source>
-        <translation>Показывать потолок дайвкомпьютера красным</translation>
+        <location filename="../build/ui_preferences.h" line="1402"/>
+        <source>Enable geocoding for dive site management</source>
+        <translation>Включить геокодирование для дайв-сайтов</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1357"/>
-        <source>Show unused cylinders in Equipment tab</source>
-        <translation>Показывать неиспользуемые баллоны</translation>
+        <location filename="../build/ui_preferences.h" line="1403"/>
+        <source>Parse site without GPS data</source>
+        <translation>Искать сайты без координат GPS</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1358"/>
-        <source>Show average depth</source>
-        <translation>Показывать среднюю глубину</translation>
+        <location filename="../build/ui_preferences.h" line="1404"/>
+        <source>Same format for existing dives</source>
+        <translation>Один формат для существующих погружений</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1360"/>
-        <source>GFLow</source>
-        <translation>GFLow</translation>
+        <location filename="../build/ui_preferences.h" line="1405"/>
+        <source>Dive Site Layout</source>
+        <translation>Формат названия дайв-сайта</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1361"/>
-        <source>GFHigh</source>
-        <translation>GFHigh</translation>
+        <location filename="../build/ui_preferences.h" line="1406"/>
+        <location filename="../build/ui_preferences.h" line="1407"/>
+        <source>/</source>
+        <translation>/</translation>
     </message>
 </context>
 <context>
@@ -6210,106 +6302,136 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="20"/>
-        <source>Show</source>
-        <translation>Показывать</translation>
+        <source>Gas pressure display setup</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="29"/>
-        <source>Threshold when showing pO₂</source>
-        <translation>Предельное значение pO₂</translation>
+        <source>Threshold for pO₂ (bar)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="49"/>
-        <source>Threshold when showing pN₂</source>
-        <translation>Предельное значение pN₂</translation>
+        <source>Threshold for pN₂ (bar)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="69"/>
-        <source>Threshold when showing pHe</source>
-        <translation>Предельное значение pHe</translation>
+        <source>Threshold for pHe (bar)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="89"/>
-        <source>Max pO₂ when showing MOD</source>
-        <translation>Макс. pO₂ при отображении MOD</translation>
+        <source>pO₂ in calculating MOD (bar)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="106"/>
+        <source>CCR options:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="113"/>
+        <source>Dive planner default setpoint (bar)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="133"/>
+        <source>Show setpoints when viewing pO₂</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="109"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="140"/>
+        <source>Show individual O₂ sensor values when viewing pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="150"/>
+        <source>Ceiling display setup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="159"/>
         <source>Draw dive computer reported ceiling red</source>
         <translation>Показывать потолок дайвкомпьютера красным</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="116"/>
-        <source>Show unused cylinders in Equipment tab</source>
-        <translation>Показывать неиспользуемые баллоны</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="169"/>
+        <source>Algorithm for calculated ceiling:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="123"/>
-        <source>Show mean depth</source>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="176"/>
+        <source>VPM-B</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="133"/>
-        <source>Misc</source>
-        <translation>Разное</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="183"/>
+        <source>VPM-B Conservatism</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="149"/>
-        <source>bar</source>
-        <translation>бар</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="193"/>
+        <source>+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="165"/>
-        <source>Default CCR set-point for dive planning</source>
-        <translation>Установка CCR по умолчанию для планировщика</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="206"/>
+        <source>Bühlmann</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="172"/>
-        <source>pSCR O₂ metabolism rate</source>
-        <translation>pSCR метаболизм O₂</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="216"/>
+        <source>GFHigh</source>
+        <translation>GFHigh</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="179"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="236"/>
         <source>GFLow</source>
         <translation>GFLow</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="186"/>
-        <source>GFHigh</source>
-        <translation>GFHigh</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="256"/>
+        <source>GFLow at max depth</source>
+        <translation>GFLow на макс. грубине</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="203"/>
-        <source>ℓ/min</source>
-        <translation>л/мин</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="263"/>
+        <source>pSCR options:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="213"/>
-        <source>pSCR ratio</source>
-        <translation>pSCR отношение сброса</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="270"/>
+        <source>Metabolic rate (ℓ O₂/min)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="223"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="287"/>
+        <source>Dilution ratio</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="300"/>
         <source>1:</source>
         <translation>1:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="230"/>
-        <source>CCR: show individual O₂ sensor values when viewing pO₂</source>
-        <translation>CCR: индивидуальные значения сенсоров O₂</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="310"/>
+        <source>Misc</source>
+        <translation>Разное</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="237"/>
-        <source>CCR: show setpoints when viewing pO₂</source>
-        <translation>CCR: показывать установки</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="316"/>
+        <source>Show unused cylinders in Equipment tab</source>
+        <translation>Показывать неиспользуемые баллоны</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="244"/>
-        <source>GFLow at max depth</source>
-        <translation>GFLow на макс. грубине</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="323"/>
+        <source>Show mean depth in Profile</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="10"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="9"/>
         <source>Graph</source>
         <translation>Профиль</translation>
     </message>
@@ -6378,15 +6500,29 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>Язык</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="57"/>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="53"/>
         <source>Restart required</source>
         <translation>Необходим перезапуск</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="58"/>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="54"/>
         <source>To correctly load a new language you must restart Subsurface.</source>
         <translation>Для смены языка необходимо перезапустить Subsurface.</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="76"/>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="82"/>
+        <source>Literal characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="77"/>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="83"/>
+        <source>Non-special character(s) in time format.
+These will be used as is. This might not be what you intended.
+See http://doc.qt.io/qt-5/qdatetime.html#toString</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PreferencesNetwork</name>
@@ -6433,7 +6569,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_network.ui" line="156"/>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="148"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="134"/>
         <source>Subsurface cloud storage</source>
         <translation>Облачное хранилище Subsurface</translation>
     </message>
@@ -6478,39 +6614,39 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>Сохранять ID пользователя</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="11"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="10"/>
         <source>Network</source>
         <translation>Сеть</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="15"/>
         <source>No proxy</source>
         <translation>Без прокси</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/>
         <source>System proxy</source>
         <translation>Системный прокси</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/>
         <source>HTTP proxy</source>
         <translation>HTTP прокси</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="19"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/>
         <source>SOCKS proxy</source>
         <translation>SOCKS прокси</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="75"/>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="97"/>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="110"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="72"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="93"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="106"/>
         <source>Cloud storage email and password can only consist of letters, numbers, and &apos;.&apos;, &apos;-&apos;, &apos;_&apos;, and &apos;+&apos;.</source>
         <translation>Адрес почты и пароль для могут содержать только буквы, цифры и  &apos;.&apos;, &apos;-&apos;, &apos;_&apos;, и &apos;+&apos;.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="146"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="132"/>
         <source>Subsurface cloud storage (credentials verified)</source>
         <translation>Облачное хранилище Subsurface (данные подтверждены)</translation>
     </message>
@@ -6668,7 +6804,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>десятичное</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="8"/>
+        <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="7"/>
         <source>Units</source>
         <translation>Единицы</translation>
     </message>
@@ -6676,17 +6812,17 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PrintDialog</name>
     <message>
-        <location filename="../desktop-widgets/printdialog.cpp" line="118"/>
-        <source>&amp;Preview</source>
-        <translation>Просмотр</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/printdialog.cpp" line="115"/>
+        <location filename="../desktop-widgets/printdialog.cpp" line="102"/>
         <source>P&amp;rint</source>
         <translation>Печать</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/printdialog.cpp" line="130"/>
+        <location filename="../desktop-widgets/printdialog.cpp" line="105"/>
+        <source>&amp;Preview</source>
+        <translation>Просмотр</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/printdialog.cpp" line="117"/>
         <source>Print</source>
         <translation>Печать</translation>
     </message>
@@ -6694,19 +6830,10 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PrintOptions</name>
     <message>
-        <location filename="../build/ui_printoptions.h" line="150"/>
-        <source>&amp;Table print</source>
-        <translation>Таблица</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_printoptions.h" line="158"/>
-        <source>One dive per page</source>
-        <translation>Одно погружение на странице</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_printoptions.h" line="159"/>
-        <source>Two dives per page</source>
-        <translation>Одно погружения на странице</translation>
+        <location filename="../desktop-widgets/printoptions.ui" line="29"/>
+        <location filename="../build/ui_printoptions.h" line="148"/>
+        <source>Print type</source>
+        <translation>Варианты печати</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/printoptions.ui" line="41"/>
@@ -6766,10 +6893,19 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>Импорт</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/printoptions.ui" line="29"/>
-        <location filename="../build/ui_printoptions.h" line="148"/>
-        <source>Print type</source>
-        <translation>Варианты печати</translation>
+        <location filename="../build/ui_printoptions.h" line="150"/>
+        <source>&amp;Table print</source>
+        <translation>Таблица</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_printoptions.h" line="158"/>
+        <source>One dive per page</source>
+        <translation>Одно погружение на странице</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_printoptions.h" line="159"/>
+        <source>Two dives per page</source>
+        <translation>Одно погружения на странице</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/printoptions.cpp" line="128"/>
@@ -6811,103 +6947,103 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>Неизвестный дайвкомпьютер</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="755"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="752"/>
         <source>Show NDL / TTS was disabled because of excessive processing time</source>
         <translation>Отображение NDL/TTS отключено из-за большого времени расчета</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1344"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1338"/>
         <source>Make first divecomputer</source>
         <translation>Сделать первым компьютером</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1346"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1340"/>
         <source>Delete this divecomputer</source>
         <translation>Удалить этот дайвкомпьютер</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1360"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1354"/>
         <source>Add gas change</source>
         <translation>Добавить замену газа</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1363"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1357"/>
         <source> (Tank %1)</source>
         <translation> (Баллон %1)</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1371"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1365"/>
         <source>Add set-point change</source>
         <translation>Добавить замену установки</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1373"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1367"/>
         <source>Add bookmark</source>
         <translation>Добавить закладку</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1377"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1371"/>
         <source>Edit the profile</source>
         <translation>Редактировать профиль</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1381"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1375"/>
         <source>Remove event</source>
         <translation>Удалить событие</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1386"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1380"/>
         <source>Hide similar events</source>
         <translation>Скрыть похожие события</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1393"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1387"/>
         <source>Edit name</source>
         <translation>Изменить закладку</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1422"/>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1429"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1416"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1423"/>
         <source>Adjust pressure of tank %1 (currently interpolated as %2)</source>
         <translation>Скорректировать давление баллона %1 (текущее интерполированное %2)</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1444"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1438"/>
         <source>Unhide all events</source>
         <translation>Показать все события</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1479"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1473"/>
         <source>Hide events</source>
         <translation>Скрыть событие</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1479"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1473"/>
         <source>Hide all %1 events?</source>
         <translation>Спрятать все %1 события?</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1514"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1508"/>
         <source>Remove the selected event?</source>
         <translation>Удалить выбранное событие?</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1515"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1509"/>
         <source>%1 @ %2:%3</source>
         <translation>%1 @ %2:%3</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1638"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1632"/>
         <source>Edit name of bookmark</source>
         <translation>Изменить закладку</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1639"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1633"/>
         <source>Custom name:</source>
         <translation>Название:</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1644"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1638"/>
         <source>Name is too long!</source>
         <translation>Слишком длинное название!</translation>
     </message>
@@ -6915,91 +7051,101 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>QMLManager</name>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="95"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="97"/>
         <source>Starting...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="202"/>
         <source>working in no-cloud mode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="213"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="216"/>
         <source>no cloud credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="214"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="270"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="217"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="269"/>
         <source>Please enter valid cloud credentials.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="285"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="284"/>
         <source>Attempting to open cloud storage with new credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="304"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="306"/>
         <source>Testing cloud credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="331"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="320"/>
+        <source>No response from cloud server to validate the credentials</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="329"/>
+        <source>Cannot connect to cloud storage - cloud account not verified</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="361"/>
         <source>Cloud credentials are invalid</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="344"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="374"/>
         <source>Cannot open cloud storage: Error creating https connection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="357"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="387"/>
         <source>Cannot open cloud storage: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="369"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="399"/>
         <source>Cannot connect to cloud storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="411"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="441"/>
         <source>Cloud storage error: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="501"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="531"/>
         <source>Failed to connect to cloud server, reverting to no cloud status</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="520"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="550"/>
         <source>Cloud storage open successfully. No dives in dive list.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="689"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="690"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="721"/>
         <source>h</source>
-        <translation type="unfinished"/>
+        <translation>ч</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="689"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="690"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="691"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="721"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="722"/>
         <source>min</source>
         <translation>мин</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="689"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/>
         <source>sec</source>
-        <translation type="unfinished"/>
+        <translation>с</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="1041"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="1102"/>
         <source>Unknown GPS location</source>
         <translation type="unfinished"/>
     </message>
@@ -7007,126 +7153,126 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../core/qthelper.cpp" line="866"/>
-        <location filename="../core/qthelper.cpp" line="1214"/>
-        <source>AIR</source>
-        <translation>воздух</translation>
+        <location filename="../core/gpslocation.h" line="13"/>
+        <source>Waiting to aquire GPS location</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="1214"/>
-        <source>OXYGEN</source>
-        <translation>КИСЛОРОД</translation>
+        <location filename="../core/qthelper.cpp" line="766"/>
+        <location filename="../core/qthelper.cpp" line="1275"/>
+        <source>m</source>
+        <translation>м</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="59"/>
-        <source>Remove this point</source>
-        <translation>Удалить эту точку</translation>
+        <location filename="../core/qthelper.cpp" line="768"/>
+        <location filename="../core/qthelper.cpp" line="1274"/>
+        <source>ft</source>
+        <translation>фут</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="32"/>
-        <source>Average</source>
-        <translation>Среднее</translation>
+        <location filename="../core/qthelper.cpp" line="794"/>
+        <source>C</source>
+        <translation>C</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="35"/>
-        <source>Minimum</source>
-        <translation>Минимум</translation>
+        <location filename="../core/qthelper.cpp" line="796"/>
+        <source>F</source>
+        <translation>F</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="38"/>
-        <source>Maximum</source>
-        <translation>Максимум</translation>
+        <location filename="../core/qthelper.cpp" line="821"/>
+        <location filename="../core/qthelper.cpp" line="1250"/>
+        <source>kg</source>
+        <translation>кг</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/globe.cpp" line="327"/>
-        <source>Move the map and double-click to set the dive location</source>
-        <translation>Выберите место на карте двойным щелчком мыши.</translation>
+        <location filename="../core/qthelper.cpp" line="823"/>
+        <location filename="../core/qthelper.cpp" line="1251"/>
+        <source>lbs</source>
+        <translation>фунт</translation>
     </message>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="28"/>
-        <source>unknown</source>
-        <translation>неизвестно</translation>
+        <location filename="../core/qthelper.cpp" line="848"/>
+        <location filename="../core/qthelper.cpp" line="1300"/>
+        <source>bar</source>
+        <translation>бар</translation>
     </message>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="105"/>
-        <source>h:</source>
-        <translation>ч:</translation>
+        <location filename="../core/qthelper.cpp" line="850"/>
+        <location filename="../core/qthelper.cpp" line="1299"/>
+        <source>psi</source>
+        <translation>psi</translation>
     </message>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="105"/>
-        <source>min</source>
-        <translation>мин</translation>
+        <location filename="../core/qthelper.cpp" line="871"/>
+        <location filename="../core/qthelper.cpp" line="1235"/>
+        <source>AIR</source>
+        <translation>воздух</translation>
     </message>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="337"/>
-        <source>Multiple</source>
-        <translation type="unfinished"/>
+        <location filename="../core/qthelper.cpp" line="873"/>
+        <source>EAN</source>
+        <translation>EAN</translation>
     </message>
     <message numerus="yes">
-        <location filename="../core/qthelper.cpp" line="957"/>
+        <location filename="../core/qthelper.cpp" line="962"/>
         <source>(%n dive(s))</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="816"/>
-        <location filename="../core/qthelper.cpp" line="1228"/>
-        <source>kg</source>
-        <translation>кг</translation>
+        <location filename="../core/qthelper.cpp" line="1235"/>
+        <source>OXYGEN</source>
+        <translation>КИСЛОРОД</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="818"/>
-        <location filename="../core/qthelper.cpp" line="1229"/>
-        <source>lbs</source>
-        <translation>фунт</translation>
+        <location filename="../core/qthelper.cpp" line="1322"/>
+        <source>l</source>
+        <translation>л</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="763"/>
-        <location filename="../core/qthelper.cpp" line="1252"/>
-        <source>ft</source>
-        <translation>фут</translation>
+        <location filename="../core/qthelper.cpp" line="1323"/>
+        <source>cuft</source>
+        <translation>куб. фут</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="761"/>
-        <location filename="../core/qthelper.cpp" line="1253"/>
-        <source>m</source>
-        <translation>м</translation>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="29"/>
+        <source>unknown</source>
+        <translation>неизвестно</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="789"/>
-        <source>C</source>
-        <translation>C</translation>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="114"/>
+        <source>h:</source>
+        <translation>ч:</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="791"/>
-        <source>F</source>
-        <translation>F</translation>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="114"/>
+        <source>min</source>
+        <translation>мин</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="845"/>
-        <location filename="../core/qthelper.cpp" line="1275"/>
-        <source>psi</source>
-        <translation>psi</translation>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="63"/>
+        <source>Remove this point</source>
+        <translation>Удалить эту точку</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="843"/>
-        <location filename="../core/qthelper.cpp" line="1276"/>
-        <source>bar</source>
-        <translation>бар</translation>
+        <location filename="../desktop-widgets/globe.cpp" line="327"/>
+        <source>Move the map and double-click to set the dive location</source>
+        <translation>Выберите место на карте двойным щелчком мыши.</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="868"/>
-        <source>EAN</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="32"/>
+        <source>Average</source>
+        <translation>Среднее</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="1298"/>
-        <source>l</source>
-        <translation>л</translation>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="35"/>
+        <source>Minimum</source>
+        <translation>Минимум</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="1299"/>
-        <source>cuft</source>
-        <translation>куб. фут</translation>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="38"/>
+        <source>Maximum</source>
+        <translation>Максимум</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="625"/>
@@ -7148,17 +7294,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <source>Malformed XML response. Line %1: %2</source>
         <translation>Неверный XML ответ. Строка %1: %2</translation>
     </message>
-    <message>
-        <location filename="../core/gpslocation.h" line="13"/>
-        <source>Waiting to aquire GPS location</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>ReadSettingsThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1651"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1676"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1640"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1665"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Эта функция пока недоступна для выбранного дайвкомпьютера.</translation>
     </message>
@@ -7187,7 +7328,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ResetSettingsThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1775"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1764"/>
         <source>Reset settings failed!</source>
         <translation>Сброс настроек не удался!</translation>
     </message>
@@ -7225,6 +7366,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ShiftImageTimesDialog</name>
     <message>
+        <location filename="../desktop-widgets/shiftimagetimes.ui" line="23"/>
+        <location filename="../build/ui_shiftimagetimes.h" line="184"/>
+        <source>Shift selected image times</source>
+        <translation>Сдвинуть время изображений</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/shiftimagetimes.ui" line="34"/>
         <location filename="../build/ui_shiftimagetimes.h" line="185"/>
         <source>Shift times of image(s) by</source>
@@ -7237,12 +7384,6 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>h:mm</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/shiftimagetimes.ui" line="23"/>
-        <location filename="../build/ui_shiftimagetimes.h" line="184"/>
-        <source>Shift selected image times</source>
-        <translation>Сдвинуть время изображений</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/shiftimagetimes.ui" line="105"/>
         <location filename="../build/ui_shiftimagetimes.h" line="187"/>
         <source>Earlier</source>
@@ -7294,12 +7435,12 @@ Not all images have timestamps in the range between
         <translation>Какое время и дата отображены на изображении?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="297"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="296"/>
         <source>Open image file</source>
         <translation>Открыть файл с изображением</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="299"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="298"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>Файлы изображений (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -7457,54 +7598,54 @@ Not all images have timestamps in the range between
 <context>
     <name>SocialNetworkDialog</name>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="339"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="284"/>
         <source>Dive date: %1 
 </source>
         <translation>Дата погружения: %1 
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="342"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="287"/>
         <source>Duration: %1 
 </source>
         <translation>Длительность: %1 
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="343"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="288"/>
         <source>h:</source>
         <comment>abbreviation for hours plus separator</comment>
         <translation>ч:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="344"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="289"/>
         <source>min</source>
         <comment>abbreviation for minutes</comment>
         <translation>мин</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="347"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="292"/>
         <source>Dive location: %1 
 </source>
         <translation>Местоположение: %1 
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="350"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="295"/>
         <source>Buddy: %1 
 </source>
         <translation>Партнер: %1 
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="353"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="298"/>
         <source>Divemaster: %1 
 </source>
         <translation>Дайвмастер: %1 
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="356"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="301"/>
         <source>
 %1</source>
         <translation>
@@ -7590,9 +7731,20 @@ Not all images have timestamps in the range between
     <name>StartPage</name>
     <message>
         <location filename="../mobile-widgets/qml/StartPage.qml" line="19"/>
-        <source>To use Subsurface-mobile with Subsurface cloud storage, please enteryour cloud credentials.
+        <source>To use Subsurface-mobile with Subsurface cloud storage, please enter your cloud credentials.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/StartPage.qml" line="20"/>
+        <source>If this is the first time you use Subsurface cloud storage, enter a valid email (all lower case) and a password of your choice (letters and numbers). The server will send a PIN to the email address provided that you will have to enter here.
 
-To use Subsurface-mobile only with local data on this device, tap on the no cloud icon below.</source>
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/StartPage.qml" line="23"/>
+        <source>To use Subsurface-mobile only with local data on this device, tap on the no cloud icon below.</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -7631,7 +7783,12 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>SubsurfaceWebServices</name>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="419"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="395"/>
+        <source>Enter User ID and click Download</source>
+        <translation>Укажите КЛЮЧ и нажмите Загрузить</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="417"/>
         <source>Webservice</source>
         <translation>Вебсервис</translation>
     </message>
@@ -7656,30 +7813,25 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
         <translation>Ошибка соединения:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="557"/>
-        <source>Download successful</source>
-        <translation>Загрузка завершена</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="551"/>
         <source>Invalid user identifier!</source>
         <translation>Неверный идентификатор пользователя!</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="397"/>
-        <source>Enter User ID and click Download</source>
-        <translation>Укажите КЛЮЧ и нажмите Загрузить</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="554"/>
         <source>Cannot parse response!</source>
         <translation>Невозможно разобрать ответ!</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="557"/>
+        <source>Download successful</source>
+        <translation>Загрузка завершена</translation>
+    </message>
 </context>
 <context>
     <name>SuitFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="674"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="672"/>
         <source>Suits: </source>
         <translation>Костюмы:</translation>
     </message>
@@ -7687,7 +7839,7 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>SuitsFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="123"/>
+        <location filename="../qt-models/filtermodels.cpp" line="128"/>
         <source>No suit set</source>
         <translation>Костюм не указан</translation>
     </message>
@@ -7706,7 +7858,7 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>TagFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="595"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="593"/>
         <source>Tags: </source>
         <translation>Метки:</translation>
     </message>
@@ -7714,7 +7866,7 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>TagFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="148"/>
+        <location filename="../qt-models/filtermodels.cpp" line="153"/>
         <source>Empty tags</source>
         <translation>Без меток</translation>
     </message>
@@ -7740,6 +7892,11 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>TemplateEdit</name>
     <message>
+        <location filename="../desktop-widgets/templateedit.ui" line="14"/>
+        <source>Edit template</source>
+        <translation>Редактирование шаблона</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/templateedit.ui" line="37"/>
         <source>Preview</source>
         <translation>Просмотр</translation>
@@ -7785,11 +7942,6 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
         <translation>Размер шрифта</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/templateedit.ui" line="14"/>
-        <source>Edit template</source>
-        <translation>Редактирование шаблона</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/templateedit.ui" line="165"/>
         <source>Color palette</source>
         <translation>Палитра цветов</translation>
@@ -7971,85 +8123,12 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>TextHyperlinkEventFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="817"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="815"/>
         <source>%1click to visit %2</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>ThemeTest</name>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="29"/>
-        <source>Theme Information</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="33"/>
-        <source>Screen</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="42"/>
-        <source>Geometry (pixels):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="49"/>
-        <source>Geometry (gridUnits):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="56"/>
-        <source>Units.gridUnit:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="63"/>
-        <source>Units.devicePixelRatio:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="70"/>
-        <source>Font Metrics</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="76"/>
-        <source>FontMetrics pointSize:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="83"/>
-        <source>FontMetrics pixelSize:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="90"/>
-        <source>FontMetrics devicePixelRatio:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="97"/>
-        <source>Text item pixelSize:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="104"/>
-        <source>Text item pointSize:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="111"/>
-        <source>Pixel density:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="118"/>
-        <source>Height of default font:</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
     <name>ToolTipItem</name>
     <message>
         <location filename="../profile-widget/divetooltipitem.cpp" line="136"/>
@@ -8060,102 +8139,107 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>TripItem</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="67"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="68"/>
         <source>(%1 shown)</source>
         <translation> (показано %1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="194"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
         <source>#</source>
         <translation>№</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="197"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="215"/>
         <source>Date</source>
         <translation>Дата</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="200"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="218"/>
         <source>Rating</source>
         <translation>Оценка</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
         <source>Depth(%1)</source>
         <translation>Глубина(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
         <source>m</source>
         <translation>м</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
         <source>ft</source>
         <translation>фут</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="206"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="224"/>
         <source>Duration</source>
         <translation>Длительность</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="209"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="227"/>
         <source>Temp(%1%2)</source>
         <translation>Температура(%1%2)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
         <source>Weight(%1)</source>
         <translation>Вес(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
         <source>kg</source>
         <translation>кг</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
         <source>lbs</source>
         <translation>фунт</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="215"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="233"/>
         <source>Suit</source>
         <translation>Костюм</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="218"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="236"/>
         <source>Cyl</source>
         <translation>Баллон</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="239"/>
         <source>Gas</source>
         <translation>Смесь</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="244"/>
         <source>SAC(%1)</source>
         <translation>SAC(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="244"/>
         <source>/min</source>
         <translation>/мин</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="229"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="247"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="232"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="250"/>
         <source>Max CNS</source>
         <translation>Макс. CNS</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="235"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="253"/>
+        <source>Photos before/during/after dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="256"/>
         <source>Location</source>
         <translation>Местонахождение</translation>
     </message>
@@ -8178,72 +8262,73 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>UpdateManager</name>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="69"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="61"/>
         <source>Check for updates.</source>
         <translation>Проверить обновления.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="70"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="62"/>
         <source>Subsurface was unable to check for updates.</source>
         <translation>Не получилось проверить наличие обновлений.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="75"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="67"/>
         <source>The following error occurred:</source>
         <translation>Возникла ошибка:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="76"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="68"/>
         <source>Please check your internet connection.</source>
         <translation>Проверьте Интернет-соединение.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="86"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="78"/>
         <source>You are using the latest version of Subsurface.</source>
         <translation>Вы используете актуальную версию Subsurface.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="89"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="81"/>
         <source>A new version of Subsurface is available.&lt;br/&gt;Click on:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; to download it.</source>
         <translation>Доступна новая верся Subsurface.&lt;br/&gt;Кликинте по:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt;, чтобы скачать.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="95"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="87"/>
         <source>A new version of Subsurface is available.</source>
         <translation>Доступна новая версия Subsurface.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="96"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="88"/>
         <source>Latest version is %1, please check %2 our download page %3 for information in how to update.</source>
         <translation>Последняя версия %1, передите на %2 нашу страницу загрузки %3 чтобы узнать как обновиться.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="106"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="98"/>
         <source>Newest release version is </source>
         <translation>Последняя версия</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="107"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="99"/>
         <source>The server returned the following information:</source>
         <translation>Сервер вернул следующую информацию:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="125"/>
-        <source>Subsurface is checking every two weeks if a new version is available. If you don&apos;t want Subsurface to continue checking, please click Decline.</source>
-        <translation>Subsurface проверяет наличие новых версий каждые две недели. Если вы не желаете выполнять эти проверки, нажмите Отказаться.</translation>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="117"/>
+        <source>Subsurface is checking every two weeks if a new version is available. 
+ If you don&apos;t want Subsurface to continue checking, please click Decline.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="126"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="119"/>
         <source>Decline</source>
         <translation>Отказаться</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="127"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="120"/>
         <source>Accept</source>
         <translation>Принять</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="129"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="122"/>
         <source>Automatic check for updates</source>
         <translation>Автоматическая проверка обновлений</translation>
     </message>
@@ -8265,24 +8350,6 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>UserSurvey</name>
     <message>
-        <location filename="../desktop-widgets/usersurvey.ui" line="44"/>
-        <location filename="../build/ui_usersurvey.h" line="151"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;We would love to learn more about our users, their preferences and their usage habits. Please spare a minute to fill out this form and submit it to the Subsurface team.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Мы хотели бы узнать наших пользователей и их предпочтения. Пожалуйста, потратьте минуту, чтобы заполнить эту форму и отправить ее команде Subsurface.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/usersurvey.ui" line="115"/>
-        <location filename="../build/ui_usersurvey.h" line="156"/>
-        <source>Other software/sources</source>
-        <translation>Другие программы/источники</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/usersurvey.ui" line="128"/>
-        <location filename="../build/ui_usersurvey.h" line="157"/>
-        <source>Manually entering dives</source>
-        <translation>Ручной ввод погружений</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="14"/>
         <location filename="../build/ui_usersurvey.h" line="149"/>
         <source>User survey</source>
@@ -8295,6 +8362,12 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
         <translation>Анкета Subsurface</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/usersurvey.ui" line="44"/>
+        <location filename="../build/ui_usersurvey.h" line="151"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;We would love to learn more about our users, their preferences and their usage habits. Please spare a minute to fill out this form and submit it to the Subsurface team.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Мы хотели бы узнать наших пользователей и их предпочтения. Пожалуйста, потратьте минуту, чтобы заполнить эту форму и отправить ее команде Subsurface.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="63"/>
         <location filename="../build/ui_usersurvey.h" line="152"/>
         <source>Technical diver</source>
@@ -8319,6 +8392,18 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
         <translation>Из дайвкомпьютера</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/usersurvey.ui" line="115"/>
+        <location filename="../build/ui_usersurvey.h" line="156"/>
+        <source>Other software/sources</source>
+        <translation>Другие программы/источники</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/usersurvey.ui" line="128"/>
+        <location filename="../build/ui_usersurvey.h" line="157"/>
+        <source>Manually entering dives</source>
+        <translation>Ручной ввод погружений</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="141"/>
         <location filename="../build/ui_usersurvey.h" line="158"/>
         <source>Android/iPhone companion app</source>
@@ -8349,6 +8434,11 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
         <translation>Откуда вы загружаете данные?</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/usersurvey.cpp" line="18"/>
+        <source>Send</source>
+        <translation>Отправить</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/usersurvey.cpp" line="43"/>
         <source>
 Operating system: %1</source>
@@ -8392,19 +8482,14 @@ Language: %1</source>
         <translation>Спросить позже</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/usersurvey.cpp" line="101"/>
-        <source>Submit user survey.</source>
-        <translation>Отправить опросник.</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/usersurvey.cpp" line="82"/>
         <source>Ask again?</source>
         <translation>Спрашивать снова?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/usersurvey.cpp" line="18"/>
-        <source>Send</source>
-        <translation>Отправить</translation>
+        <location filename="../desktop-widgets/usersurvey.cpp" line="101"/>
+        <source>Submit user survey.</source>
+        <translation>Отправить опросник.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/usersurvey.cpp" line="102"/>
@@ -8496,12 +8581,12 @@ Language: %1</source>
         <translation>Выгрузить</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="324"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="325"/>
         <source>Operation timed out</source>
         <translation>Таймаут выполнения</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="345"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="346"/>
         <source>Transferring data...</source>
         <translation>Передача данных...</translation>
     </message>
@@ -8536,18 +8621,18 @@ Language: %1</source>
 <context>
     <name>WriteSettingsThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1702"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1709"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1718"/>
-        <source>Failed!</source>
-        <translation>Ошибка!</translation>
-    </message>
-    <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1700"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1721"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1689"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1710"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Эта функция пока недоступна для выбранного дайвкомпьютера.</translation>
     </message>
+    <message>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1691"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1698"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1707"/>
+        <source>Failed!</source>
+        <translation>Ошибка!</translation>
+    </message>
 </context>
 <context>
     <name>YearlyStatisticsModel</name>
@@ -8672,7 +8757,7 @@ Maximum</source>
 <context>
     <name>getextFromC</name>
     <message>
-        <location filename="../core/libdivecomputer.c" line="674"/>
+        <location filename="../core/libdivecomputer.c" line="737"/>
         <source>Error parsing the header</source>
         <translation>Ошибка разбора заголовка</translation>
     </message>
@@ -8680,38 +8765,377 @@ Maximum</source>
 <context>
     <name>gettextFromC</name>
     <message>
+        <location filename="../core/cochran.c" line="309"/>
+        <location filename="../core/cochran.c" line="315"/>
+        <location filename="../core/cochran.c" line="385"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>deco stop</source>
+        <translation>деко стоп</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="336"/>
+        <location filename="../core/cochran.c" line="390"/>
+        <location filename="../core/file.c" line="777"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>ascent</source>
+        <translation>подъем</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="342"/>
+        <location filename="../core/file.c" line="755"/>
+        <source>battery</source>
+        <translation>батарея</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="348"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
+        <source>OLF</source>
+        <translation>OLF</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="353"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
+        <source>maxdepth</source>
+        <translation>макс. глуб.</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="358"/>
+        <location filename="../core/cochran.c" line="404"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
+        <source>pO₂</source>
+        <translation>pO₂</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="365"/>
+        <location filename="../core/cochran.c" line="414"/>
+        <location filename="../core/cochran.c" line="421"/>
+        <location filename="../core/file.c" line="868"/>
+        <location filename="../core/libdivecomputer.c" line="225"/>
+        <location filename="../core/libdivecomputer.c" line="228"/>
+        <source>gaschange</source>
+        <translation>замена смеси</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="370"/>
+        <location filename="../core/cochran.c" line="409"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>rbt</source>
+        <translation>оставшееся время на дне</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="379"/>
+        <location filename="../core/cochran.c" line="426"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>ceiling</source>
+        <translation>потолок</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="395"/>
+        <location filename="../core/libdivecomputer.c" line="224"/>
+        <source>transmitter</source>
+        <translation>передатчик</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="153"/>
+        <source>Error: the file does not appear to be a DATATRAK divelog</source>
+        <translation>Ошибка: файл не является журналом DATATRAK.</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="286"/>
+        <source>clear</source>
+        <translation>ясно</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="289"/>
+        <source>misty</source>
+        <translation>туман</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="292"/>
+        <source>fog</source>
+        <translation>туман</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="295"/>
+        <source>rain</source>
+        <translation>дождь</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="298"/>
+        <source>storm</source>
+        <translation>шторм</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="301"/>
+        <source>snow</source>
+        <translation>снег</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="321"/>
+        <source>No suit</source>
+        <translation>Без костюма</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="324"/>
+        <source>Shorty</source>
+        <translation>Шорты</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="327"/>
+        <source>Combi</source>
+        <translation>Комбинезон</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="330"/>
+        <source>Wet suit</source>
+        <translation>Мокрый костюм</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="333"/>
+        <source>Semidry suit</source>
+        <translation>Полусухой костюм</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="336"/>
+        <source>Dry suit</source>
+        <translation>Сухой костюм</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="396"/>
+        <source>no stop</source>
+        <translation>без остановки</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="398"/>
+        <location filename="../core/dive.c" line="29"/>
+        <source>deco</source>
+        <translation>деко стоп</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="400"/>
+        <source>single ascent</source>
+        <translation>единичный подъем</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="402"/>
+        <source>multiple ascent</source>
+        <translation>множественный подъем</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="404"/>
+        <location filename="../core/dive.c" line="27"/>
+        <source>fresh</source>
+        <translation>пресная</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="406"/>
+        <source>salt water</source>
+        <translation>соленая вода</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="431"/>
+        <source>sight seeing</source>
+        <translation>обзорная прогулка</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="433"/>
+        <source>club dive</source>
+        <translation>погружение с клубом</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="435"/>
+        <location filename="../core/dive.c" line="28"/>
+        <source>instructor</source>
+        <translation>инструктор</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="437"/>
+        <source>instruction</source>
+        <translation>обучение</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="439"/>
+        <location filename="../core/dive.c" line="27"/>
+        <source>night</source>
+        <translation>ночное</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="441"/>
+        <location filename="../core/dive.c" line="25"/>
+        <source>cave</source>
+        <translation>пещера</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="443"/>
+        <location filename="../core/dive.c" line="24"/>
+        <source>ice</source>
+        <translation>подледное</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="445"/>
+        <source>search</source>
+        <translation>поиск</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="455"/>
+        <location filename="../core/dive.c" line="25"/>
+        <source>wreck</source>
+        <translation>рэк</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="457"/>
+        <location filename="../core/dive.c" line="26"/>
+        <source>river</source>
+        <translation>в реке</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="459"/>
+        <location filename="../core/dive.c" line="23"/>
+        <source>drift</source>
+        <translation>течение</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="461"/>
+        <location filename="../core/dive.c" line="28"/>
+        <source>photo</source>
+        <translation>фото</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="463"/>
+        <source>other</source>
+        <translation>прочее</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="474"/>
+        <source>Other activities</source>
+        <translation>Прочие активности</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="498"/>
+        <source>Datatrak/Wlog notes</source>
+        <translation>Datatrak/Wlog notes</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="537"/>
+        <source>Manually entered dive</source>
+        <translation>Вручную введенное погружение</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="588"/>
+        <source>Unknown</source>
+        <translation>Неизвестно</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="674"/>
+        <source>Error: couldn&apos;t open the file %s</source>
+        <translation>Ошибка: невозможно открыть файл %s</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="687"/>
+        <source>Error: no dive</source>
+        <translation>Ошибка: погружение отсутствует</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="23"/>
+        <source>boat</source>
+        <translation>с лодки</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="23"/>
+        <source>shore</source>
+        <translation>с берега</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="24"/>
+        <source>deep</source>
+        <translation>глубокое</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="24"/>
+        <source>cavern</source>
+        <translation>каверна</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="25"/>
+        <source>altitude</source>
+        <translation>высокогорье</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="26"/>
+        <source>pool</source>
+        <translation>бассейн</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="26"/>
+        <source>lake</source>
+        <translation>в озере</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="27"/>
+        <source>student</source>
+        <translation>ученик</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="28"/>
+        <source>video</source>
+        <translation>видео</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="33"/>
+        <source>OC-gas</source>
+        <translation>Смесь ОЦ</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="33"/>
+        <source>diluent</source>
+        <translation>дилуент</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="33"/>
+        <location filename="../core/equipment.c" line="88"/>
+        <location filename="../core/planner.c" line="1436"/>
+        <location filename="../core/planner.c" line="1439"/>
+        <source>oxygen</source>
+        <translation>кислород</translation>
+    </message>
+    <message>
         <location filename="../core/dive.c" line="181"/>
         <source>pascal</source>
         <translation>Па</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="186"/>
-        <location filename="../core/qthelper.cpp" line="669"/>
+        <location filename="../core/qthelper.cpp" line="674"/>
         <source>bar</source>
         <translation>бар</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="190"/>
-        <location filename="../core/qthelper.cpp" line="672"/>
+        <location filename="../core/qthelper.cpp" line="677"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
+        <location filename="../core/dive.c" line="227"/>
+        <source>ℓ</source>
+        <translation>л</translation>
+    </message>
+    <message>
         <location filename="../core/dive.c" line="232"/>
         <source>cuft</source>
         <translation>куб. фут</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="269"/>
-        <location filename="../core/qthelper.cpp" line="590"/>
-        <location filename="../core/qthelper.cpp" line="605"/>
+        <location filename="../core/qthelper.cpp" line="595"/>
+        <location filename="../core/qthelper.cpp" line="610"/>
         <source>m</source>
         <translation>м</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="274"/>
-        <location filename="../core/qthelper.cpp" line="593"/>
-        <location filename="../core/qthelper.cpp" line="607"/>
+        <location filename="../core/qthelper.cpp" line="598"/>
+        <location filename="../core/qthelper.cpp" line="612"/>
         <source>ft</source>
         <translation>фут</translation>
     </message>
@@ -8737,53 +9161,58 @@ Maximum</source>
     </message>
     <message>
         <location filename="../core/dive.c" line="325"/>
-        <location filename="../core/qthelper.cpp" line="616"/>
-        <location filename="../core/qthelper.cpp" line="626"/>
+        <location filename="../core/qthelper.cpp" line="621"/>
+        <location filename="../core/qthelper.cpp" line="631"/>
         <source>lbs</source>
         <translation>фунт</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="329"/>
-        <location filename="../core/qthelper.cpp" line="614"/>
-        <location filename="../core/qthelper.cpp" line="624"/>
+        <location filename="../core/qthelper.cpp" line="619"/>
+        <location filename="../core/qthelper.cpp" line="629"/>
         <source>kg</source>
         <translation>кг</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="1772"/>
+        <location filename="../core/dive.c" line="1751"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) или (%s)</translation>
     </message>
     <message>
-        <location filename="../core/divelist.c" line="484"/>
+        <location filename="../core/divelist.c" line="487"/>
         <location filename="../core/equipment.c" line="84"/>
-        <location filename="../core/planner.c" line="1411"/>
-        <location filename="../core/planner.c" line="1414"/>
+        <location filename="../core/planner.c" line="1432"/>
+        <location filename="../core/planner.c" line="1435"/>
         <source>air</source>
         <translation>воздух</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="197"/>
+        <location filename="../core/equipment.c" line="86"/>
+        <source>EAN%d</source>
+        <translation>EAN%d</translation>
+    </message>
+    <message>
+        <location filename="../core/equipment.c" line="198"/>
         <source>integrated</source>
         <translation>интегрированный</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="198"/>
+        <location filename="../core/equipment.c" line="199"/>
         <source>belt</source>
         <translation>пояс</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="199"/>
+        <location filename="../core/equipment.c" line="200"/>
         <source>ankle</source>
         <translation>груз на ноги</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="200"/>
+        <location filename="../core/equipment.c" line="201"/>
         <source>backplate weight</source>
         <translation>груз на пластину</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="201"/>
+        <location filename="../core/equipment.c" line="202"/>
         <source>clip-on</source>
         <translation>карабины</translation>
     </message>
@@ -8796,8 +9225,8 @@ Maximum</source>
         <location filename="../core/file.c" line="121"/>
         <location filename="../core/file.c" line="512"/>
         <location filename="../core/file.c" line="597"/>
-        <location filename="../core/file.c" line="924"/>
-        <location filename="../core/file.c" line="1056"/>
+        <location filename="../core/file.c" line="909"/>
+        <location filename="../core/file.c" line="1092"/>
         <location filename="../core/ostctools.c" line="80"/>
         <source>Failed to read &apos;%s&apos;</source>
         <translation>Ошибка чтения &apos;%s&apos;</translation>
@@ -8855,486 +9284,496 @@ Maximum</source>
         <translation>Калибровка O₂</translation>
     </message>
     <message>
-        <location filename="../core/file.c" line="887"/>
-        <source>No matching DC found for file &apos;%s&apos;</source>
-        <translation>Не найден соответствующий компьютер для файла &apos;%s&apos;</translation>
+        <location filename="../core/git-access.c" line="134"/>
+        <source>Local cache directory %s corrupted - can&apos;t sync with Subsurface cloud storage</source>
+        <translation>Директория локального кэша %s повреждена, синхронизация с облачным хранилищем невозможна</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>none</source>
-        <translation>отсутствует</translation>
+        <location filename="../core/git-access.c" line="157"/>
+        <location filename="../core/git-access.c" line="177"/>
+        <source>Could not update local cache to newer remote data</source>
+        <translation>Невозможно синхронизировать локальный кэш с облачным хранилищем</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="309"/>
-        <location filename="../core/cochran.c" line="315"/>
-        <location filename="../core/cochran.c" line="385"/>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>deco stop</source>
-        <translation>деко стоп</translation>
+        <location filename="../core/git-access.c" line="170"/>
+        <source>Subsurface cloud storage corrupted</source>
+        <translation>Облачное хранилице поверждено</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="342"/>
-        <location filename="../core/file.c" line="755"/>
-        <source>battery</source>
-        <translation>батарея</translation>
+        <location filename="../core/git-access.c" line="284"/>
+        <source>Could not update Subsurface cloud storage, try again later</source>
+        <translation>Невозможно обновить облачное хранилище, попробуйте позже</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="370"/>
-        <location filename="../core/cochran.c" line="409"/>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>rbt</source>
-        <translation>оставшееся время на дне</translation>
+        <location filename="../core/git-access.c" line="344"/>
+        <source>Remote storage and local data diverged. Error: merge failed (%s)</source>
+        <translation>Данные в локальном и облачном хранилице отличаются. Ошибка слияния (%s)</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="336"/>
-        <location filename="../core/cochran.c" line="390"/>
-        <location filename="../core/file.c" line="777"/>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>ascent</source>
-        <translation>подъем</translation>
+        <location filename="../core/git-access.c" line="374"/>
+        <source>Remote storage and local data diverged. Cannot combine local and remote changes</source>
+        <translation>Данные в локальном и облачном хранилице отличаются. Невозможно объединить изменения.</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="379"/>
-        <location filename="../core/cochran.c" line="426"/>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>ceiling</source>
-        <translation>потолок</translation>
+        <location filename="../core/git-access.c" line="408"/>
+        <source>Remote storage and local data diverged</source>
+        <translation>Данные в локальном и облачном хранилице отличаются</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>workload</source>
-        <translation>нагрузка</translation>
+        <location filename="../core/git-access.c" line="411"/>
+        <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source>
+        <translation>Данные в локальном и облачном хранилице отличаются. Ошибка записи (%s)</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="395"/>
-        <location filename="../core/libdivecomputer.c" line="203"/>
-        <source>transmitter</source>
-        <translation>передатчик</translation>
+        <location filename="../core/git-access.c" line="420"/>
+        <source>Problems with local cache of Subsurface cloud data</source>
+        <translation>Проблема с локальным кэшем облачного хранилища</translation>
+    </message>
+    <message>
+        <location filename="../core/git-access.c" line="421"/>
+        <source>Moved cache data to %s. Please try the operation again.</source>
+        <translation>Директория кэша перенесена в %s. Попробуйте снова.</translation>
+    </message>
+    <message>
+        <location filename="../core/git-access.c" line="743"/>
+        <source>Error connecting to Subsurface cloud storage</source>
+        <translation>Ошибка подключения к облачному хранилищу Subsurface</translation>
+    </message>
+    <message>
+        <location filename="../core/git-access.c" line="746"/>
+        <source>git clone of %s failed (%s)</source>
+        <translation>Клонирование git-репозитория %s не удалось (%s)</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="210"/>
+        <location filename="../core/parse-xml.c" line="3317"/>
+        <location filename="../core/uemis-downloader.c" line="134"/>
+        <source>unknown</source>
+        <translation>неизвестно</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>none</source>
+        <translation>отсутствует</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="203"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>workload</source>
+        <translation>нагрузка</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="224"/>
         <source>violation</source>
         <translation>нарушение</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="203"/>
+        <location filename="../core/libdivecomputer.c" line="224"/>
         <source>bookmark</source>
         <translation>закладка</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="203"/>
+        <location filename="../core/libdivecomputer.c" line="224"/>
         <source>surface</source>
         <translation>поверхность</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="203"/>
+        <location filename="../core/libdivecomputer.c" line="224"/>
         <source>safety stop</source>
         <translation>остановка безопасности</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="365"/>
-        <location filename="../core/cochran.c" line="414"/>
-        <location filename="../core/cochran.c" line="421"/>
-        <location filename="../core/file.c" line="868"/>
-        <location filename="../core/libdivecomputer.c" line="204"/>
-        <location filename="../core/libdivecomputer.c" line="207"/>
-        <source>gaschange</source>
-        <translation>замена смеси</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="204"/>
+        <location filename="../core/libdivecomputer.c" line="225"/>
         <source>safety stop (voluntary)</source>
         <translation>остановка безопасности (добровольно)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="204"/>
+        <location filename="../core/libdivecomputer.c" line="225"/>
         <source>safety stop (mandatory)</source>
         <translation>остановка безопасности (обязательно)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="205"/>
+        <location filename="../core/libdivecomputer.c" line="226"/>
         <source>deepstop</source>
         <translation>глубокая остановка</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="205"/>
+        <location filename="../core/libdivecomputer.c" line="226"/>
         <source>ceiling (safety stop)</source>
         <translation>потолок (остановка безопасности)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="205"/>
-        <source>divetime</source>
-        <translation>время погружения</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="205"/>
+        <location filename="../core/libdivecomputer.c" line="226"/>
         <source>below floor</source>
         <comment>event showing dive is below deco floor and adding deco time</comment>
         <translation>ниже пола</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="353"/>
-        <location filename="../core/libdivecomputer.c" line="206"/>
-        <source>maxdepth</source>
-        <translation>макс. глуб.</translation>
-    </message>
-    <message>
-        <location filename="../core/cochran.c" line="348"/>
-        <location filename="../core/libdivecomputer.c" line="206"/>
-        <source>OLF</source>
-        <translation>OLF</translation>
+        <location filename="../core/libdivecomputer.c" line="226"/>
+        <source>divetime</source>
+        <translation>время погружения</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="206"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
         <source>airtime</source>
         <translation>оставшееся время по воздуху</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="206"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
         <source>rgbm</source>
         <translation>rgbm</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="206"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
         <source>heading</source>
         <translation>направление</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="358"/>
-        <location filename="../core/cochran.c" line="404"/>
-        <location filename="../core/libdivecomputer.c" line="206"/>
-        <source>pO₂</source>
-        <translation>pO₂</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="207"/>
+        <location filename="../core/libdivecomputer.c" line="228"/>
         <source>tissue level warning</source>
         <translation>насыщение тканей</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="207"/>
+        <location filename="../core/libdivecomputer.c" line="228"/>
         <source>non stop time</source>
         <translation>время без остановки</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="224"/>
+        <location filename="../core/libdivecomputer.c" line="237"/>
         <source>invalid event number</source>
         <translation>неверный номер события</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="658"/>
-        <source>Unable to create parser for %s %s</source>
-        <translation>Невозможно создать анализатор для %s %s</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="664"/>
-        <source>Error registering the data</source>
-        <translation>Ошибка регистрации данных</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="495"/>
+        <location filename="../core/libdivecomputer.c" line="553"/>
         <source>Error parsing the datetime</source>
         <translation>Ошибка разбора даты/времени</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="513"/>
+        <location filename="../core/libdivecomputer.c" line="571"/>
         <source>Dive %d: %s</source>
         <translation>Погр. №%d - %s</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="519"/>
+        <location filename="../core/libdivecomputer.c" line="577"/>
         <source>Error parsing the divetime</source>
         <translation>Ошибка разбора времени погружения</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="529"/>
+        <location filename="../core/libdivecomputer.c" line="587"/>
         <source>Error parsing the maxdepth</source>
         <translation>Ошибка разбора макс. глубины</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="548"/>
+        <location filename="../core/libdivecomputer.c" line="606"/>
         <source>Error parsing temperature</source>
         <translation>Ошибка разбора температуры</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="568"/>
+        <location filename="../core/libdivecomputer.c" line="626"/>
         <source>Error parsing the gas mix count</source>
         <translation>Ошибка разбора счетчика смесей</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="580"/>
+        <location filename="../core/libdivecomputer.c" line="638"/>
         <source>Error obtaining water salinity</source>
         <translation>Ошибка получения солености воды</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="589"/>
+        <location filename="../core/libdivecomputer.c" line="647"/>
         <source>Error obtaining surface pressure</source>
         <translation>Ошибка получения давления на поверхности</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="614"/>
+        <location filename="../core/libdivecomputer.c" line="672"/>
         <source>Error obtaining divemode</source>
         <translation>Ошибка при получении режима погружения</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="634"/>
+        <location filename="../core/libdivecomputer.c" line="692"/>
         <source>Error parsing the gas mix</source>
         <translation>Ошибка разбора смеси</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="684"/>
+        <location filename="../core/libdivecomputer.c" line="717"/>
+        <source>Unable to create parser for %s %s</source>
+        <translation>Невозможно создать анализатор для %s %s</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="723"/>
+        <source>Error registering the data</source>
+        <translation>Ошибка регистрации данных</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="744"/>
         <source>Error parsing the samples</source>
         <translation>Ошибка разбора выборки</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="822"/>
+        <location filename="../core/libdivecomputer.c" line="882"/>
         <source>Event: waiting for user action</source>
         <translation>Событие: ожидание действия пользователя</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="830"/>
+        <location filename="../core/libdivecomputer.c" line="890"/>
         <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="../core/libdivecomputer.c" line="894"/>
+        <location filename="../core/libdivecomputer.c" line="954"/>
         <source>Error registering the event handler.</source>
         <translation>Ошибка регистрации обработчика событий.</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="899"/>
+        <location filename="../core/libdivecomputer.c" line="959"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Ошибка регистрации обработчика завершения.</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="920"/>
+        <location filename="../core/libdivecomputer.c" line="980"/>
         <source>Dive data import error</source>
         <translation>Ошибка импорта данных погружения</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="959"/>
+        <location filename="../core/libdivecomputer.c" line="1019"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Невозможно создать контекст libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="966"/>
+        <location filename="../core/libdivecomputer.c" line="1026"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Невозможно открыть %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="992"/>
+        <location filename="../core/libdivecomputer.c" line="1048"/>
         <source>Insufficient privileges to open the device %s %s (%s)</source>
         <translation>Нет прав, чтобы открыть устройство %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../core/parse-xml.c" line="517"/>
-        <source>Strange percentage reading %s
+        <location filename="../core/load-git.c" line="194"/>
+        <location filename="../core/parse-xml.c" line="1242"/>
+        <source>multiple GPS locations for this dive site; also %s
 </source>
-        <translation>Странное значение процентов %s
+        <translation>множественные GPS координаты для дайв-сайта, также %s
 </translation>
     </message>
     <message>
-        <location filename="../core/load-git.c" line="194"/>
-        <location filename="../core/parse-xml.c" line="1238"/>
-        <source>multiple GPS locations for this dive site; also %s
+        <location filename="../core/load-git.c" line="222"/>
+        <location filename="../core/parse-xml.c" line="1304"/>
+        <source>additional name for site: %s
 </source>
-        <translation>множественные GPS координаты для дайв-сайта, также %s
+        <translation>другое название дайв-сайта: %s
 </translation>
     </message>
     <message>
-        <location filename="../core/parse-xml.c" line="2044"/>
+        <location filename="../core/ostctools.c" line="120"/>
+        <location filename="../core/ostctools.c" line="152"/>
+        <source>Unknown DC in dive %d</source>
+        <translation>Неизвестный дайв-компьютер в погружении %d</translation>
+    </message>
+    <message>
+        <location filename="../core/ostctools.c" line="165"/>
+        <source>Error - %s - parsing dive %d</source>
+        <translation>Ошибка %s в погружении %d</translation>
+    </message>
+    <message>
+        <location filename="../core/parse-xml.c" line="517"/>
+        <source>Strange percentage reading %s
+</source>
+        <translation>Странное значение процентов %s
+</translation>
+    </message>
+    <message>
+        <location filename="../core/parse-xml.c" line="2051"/>
         <source>Failed to parse &apos;%s&apos;</source>
         <translation>Ошибка разбора &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../core/parse-xml.c" line="3741"/>
+        <location filename="../core/parse-xml.c" line="3774"/>
         <source>Can&apos;t open stylesheet %s</source>
         <translation>Невозможно открыть файл преобразования %s</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="86"/>
-        <source>EAN%d</source>
-        <translation>EAN%d</translation>
+        <location filename="../core/planner.c" line="555"/>
+        <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE %s ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source>
+        <translation>ОТКАЗ ОТ ОТВЕТСТВЕННОСТИ / ВНИМАНИЕ: В ПЛАНИРОВЩИКЕ ИСПОЛЬЗУЕТСЯ НОВАЯ РЕАЛИЗАЦИЯ АЛГОРИТМА %s, КОТОРАЯ БЫЛА НЕДОСТАТОЧНО ПРОТЕСТИРОВАНА. МЫ НАСТОЯТЕЛЬНО РЕКОМЕНДУЕМ НЕ ПЛАНИРОВАТЬ ПОГРУЖЕНИЯ ТОЛЬКО НА ОСНОВЕ ЭТИХ РЕЗУЛЬТАТОВ.</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="1032"/>
-        <location filename="../core/planner.c" line="1184"/>
-        <source>Can&apos;t find gas %s</source>
-        <translation>Невозможно найти газ %s</translation>
+        <location filename="../core/planner.c" line="569"/>
+        <source>Decompression calculation aborted due to excessive time</source>
+        <translation>Расчет деко прекращен из-за большой длительности</translation>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="571"/>
+        <location filename="../core/planner.c" line="829"/>
+        <location filename="../core/planner.c" line="834"/>
+        <location filename="../core/planner.c" line="860"/>
+        <location filename="../core/planner.c" line="870"/>
+        <source>Warning:</source>
+        <translation>Внимание:</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="368"/>
-        <source>Too many gas mixes</source>
-        <translation>Слишком много смесей</translation>
+        <location filename="../core/planner.c" line="581"/>
+        <source>based on Bühlmann ZHL-16C with GFlow = %d and GFhigh = %d</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="568"/>
-        <source>Decompression calculation aborted due to excessive time</source>
-        <translation>Расчет деко прекращен из-за большой длительности</translation>
+        <location filename="../core/planner.c" line="586"/>
+        <source>based on VPM-B at nominal conservatism</source>
+        <translation>на основе VPM-B с номинальным консерватизмом</translation>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="588"/>
+        <source>based on VPM-B at +%d conservatism</source>
+        <translation>на основе VPM-B с консерватизмом +%d</translation>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="590"/>
+        <source>, effective GF=%d/%d</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="594"/>
+        <source>recreational mode based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source>
+        <translation>рекреационный режим на основе алгорита Бюльмана ZHL-16B с GFlow = %d и GFhigh = %d</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="592"/>
+        <location filename="../core/planner.c" line="598"/>
         <source>Subsurface dive plan</source>
         <translation>План погружения Subsurface</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="596"/>
-        <source>depth</source>
-        <translation>глубина</translation>
+        <location filename="../core/planner.c" line="599"/>
+        <source>&lt;div&gt;Runtime: %dmin&lt;/div&gt;&lt;br&gt;</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="602"/>
-        <source>runtime</source>
-        <translation>отсчет</translation>
+        <location filename="../core/planner.c" line="604"/>
+        <source>depth</source>
+        <translation>глубина</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="599"/>
+        <location filename="../core/planner.c" line="607"/>
         <source>duration</source>
         <translation>длительность</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="554"/>
-        <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE %s ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source>
-        <translation>ОТКАЗ ОТ ОТВЕТСТВЕННОСТИ / ВНИМАНИЕ: В ПЛАНИРОВЩИКЕ ИСПОЛЬЗУЕТСЯ НОВАЯ РЕАЛИЗАЦИЯ АЛГОРИТМА %s, КОТОРАЯ БЫЛА НЕДОСТАТОЧНО ПРОТЕСТИРОВАНА. МЫ НАСТОЯТЕЛЬНО РЕКОМЕНДУЕМ НЕ ПЛАНИРОВАТЬ ПОГРУЖЕНИЯ ТОЛЬКО НА ОСНОВЕ ЭТИХ РЕЗУЛЬТАТОВ.</translation>
+        <location filename="../core/planner.c" line="610"/>
+        <source>runtime</source>
+        <translation>отсчет</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="605"/>
+        <location filename="../core/planner.c" line="613"/>
         <source>gas</source>
         <translation>смесь</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="648"/>
+        <location filename="../core/planner.c" line="656"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation>Переход на %.*f %s за %d:%02d мин - отсчет %d:%02u на %s (SP = %.1fбар)</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="656"/>
+        <location filename="../core/planner.c" line="664"/>
         <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="../core/planner.c" line="669"/>
+        <location filename="../core/planner.c" line="677"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation>Остановка на %.*f %s в течение %d:%02d мин - отсчет %d:%02u на %s (SP = %.1fбар)</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="676"/>
+        <location filename="../core/planner.c" line="684"/>
         <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="../core/planner.c" line="721"/>
+        <location filename="../core/planner.c" line="729"/>
         <source>%3.0f%s</source>
         <translation>%3.0f%s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="724"/>
-        <location filename="../core/planner.c" line="728"/>
+        <location filename="../core/planner.c" line="732"/>
+        <location filename="../core/planner.c" line="736"/>
         <source>%3dmin</source>
         <translation>%3dмин</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="737"/>
-        <location filename="../core/planner.c" line="749"/>
+        <location filename="../core/planner.c" line="745"/>
+        <location filename="../core/planner.c" line="757"/>
         <source>(SP = %.1fbar)</source>
         <translation>(SP = %.1fбар)</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="772"/>
+        <location filename="../core/planner.c" line="780"/>
         <source>Switch gas to %s (SP = %.1fbar)</source>
         <translation>Переключение на %s (SP = %.1fбар)</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="774"/>
+        <location filename="../core/planner.c" line="782"/>
         <source>Switch gas to %s</source>
         <translation>Переключение на %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="793"/>
+        <location filename="../core/planner.c" line="801"/>
         <source>CNS</source>
         <translation>CNS</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="795"/>
+        <location filename="../core/planner.c" line="803"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="799"/>
+        <location filename="../core/planner.c" line="807"/>
         <source>Gas consumption (CCR legs excluded):</source>
         <translation>Потребление газа (без CCR сегментов)</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="801"/>
+        <location filename="../core/planner.c" line="809"/>
         <source>Gas consumption:</source>
         <translation>Расход газов:</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="570"/>
-        <location filename="../core/planner.c" line="821"/>
-        <location filename="../core/planner.c" line="826"/>
-        <location filename="../core/planner.c" line="851"/>
-        <location filename="../core/planner.c" line="861"/>
-        <source>Warning:</source>
-        <translation>Внимание:</translation>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="580"/>
-        <source>based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source>
-        <translation>на основе алгорита Бюльмана ZHL-16B с GFlow = %d и GFhigh = %d</translation>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="584"/>
-        <source>based on VPM-B at nominal conservatism</source>
-        <translation>на основе VPM-B с номинальным консерватизмом</translation>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="586"/>
-        <source>based on VPM-B at +%d conservatism</source>
-        <translation>на основе VPM-B с консерватизмом +%d</translation>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="588"/>
-        <source>recreational mode based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source>
-        <translation>рекреационный режим на основе алгорита Бюльмана ZHL-16B с GFlow = %d и GFhigh = %d</translation>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="822"/>
+        <location filename="../core/planner.c" line="830"/>
         <source>this is more gas than available in the specified cylinder!</source>
         <translation>расход выше чем запас газа в указанном баллоне!</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="827"/>
+        <location filename="../core/planner.c" line="835"/>
         <source>not enough reserve for gas sharing on ascent!</source>
         <translation>недостаточно газа для резерва при подъеме</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="829"/>
+        <location filename="../core/planner.c" line="837"/>
         <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source>
         <translation>%.0f%s/%.0f%s %s (%.0f%s/%.0f%s в запланированном подъеме)</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="831"/>
+        <location filename="../core/planner.c" line="839"/>
         <source>%.0f%s (%.0f%s during planned ascent) of %s</source>
         <translation>%.0f%s (%.0f%s в запланированном подъеме) на %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="848"/>
+        <location filename="../core/planner.c" line="857"/>
         <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
         <translation>высокий pO₂  %.2f в %d:%02u на %s на глубине %.*f %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="858"/>
+        <location filename="../core/planner.c" line="867"/>
         <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
         <translation>Низкое значение pO₂ %.2f в %d:%02u на смеси %s на глубине %.*f %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="1419"/>
+        <location filename="../core/planner.c" line="1194"/>
+        <source>Can&apos;t find gas %s</source>
+        <translation>Невозможно найти газ %s</translation>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="1440"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1280"/>
+        <location filename="../core/profile.c" line="1298"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
@@ -9343,70 +9782,70 @@ D: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1283"/>
+        <location filename="../core/profile.c" line="1301"/>
         <source>P: %d%s
 </source>
         <translation>Д: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1287"/>
+        <location filename="../core/profile.c" line="1305"/>
         <source>T: %.1f%s
 </source>
         <translation>Т: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1293"/>
+        <location filename="../core/profile.c" line="1311"/>
         <source>V: %.1f%s
 </source>
         <translation>С: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1296"/>
+        <location filename="../core/profile.c" line="1314"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation>SAC: %.*f%s/мин
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1298"/>
+        <location filename="../core/profile.c" line="1316"/>
         <source>CNS: %u%%
 </source>
         <translation>CNS: %u%%
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1300"/>
+        <location filename="../core/profile.c" line="1318"/>
         <source>pO%s: %.2fbar
 </source>
         <translation>pO%s: %.2fбар
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1302"/>
+        <location filename="../core/profile.c" line="1320"/>
         <source>pN%s: %.2fbar
 </source>
         <translation>pN%s: %.2fбар
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1304"/>
+        <location filename="../core/profile.c" line="1322"/>
         <source>pHe: %.2fbar
 </source>
         <translation>pHe: %.2fбар
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1307"/>
+        <location filename="../core/profile.c" line="1325"/>
         <source>MOD: %d%s
 </source>
         <translation>MOD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1314"/>
+        <location filename="../core/profile.c" line="1332"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
@@ -9415,7 +9854,7 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1318"/>
+        <location filename="../core/profile.c" line="1336"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
@@ -9424,174 +9863,179 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1331"/>
+        <location filename="../core/profile.c" line="1349"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation>Ост. безопасности: %uмин @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1334"/>
+        <location filename="../core/profile.c" line="1352"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation>Ост. безопасности: неизв. время @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1339"/>
+        <location filename="../core/profile.c" line="1357"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation>Деко: %uмин @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1342"/>
+        <location filename="../core/profile.c" line="1360"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation>Деко: неиз. время @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1346"/>
+        <location filename="../core/profile.c" line="1364"/>
         <source>In deco
 </source>
         <translation>В деко
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1348"/>
+        <location filename="../core/profile.c" line="1366"/>
         <source>NDL: %umin
 </source>
         <translation>NDL: %uмин
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1351"/>
+        <location filename="../core/profile.c" line="1369"/>
         <source>TTS: %umin
 </source>
         <translation>TTS: %uмин
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1354"/>
+        <location filename="../core/profile.c" line="1372"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation>Деко: %uмин @ %.0f%s (вычисл.)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1362"/>
+        <location filename="../core/profile.c" line="1380"/>
         <source>In deco (calc)
 </source>
         <translation>В деко (вычисл.)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1365"/>
+        <location filename="../core/profile.c" line="1383"/>
         <source>NDL: %umin (calc)
 </source>
         <translation>NDL: %uмин (вычисл.)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1367"/>
+        <location filename="../core/profile.c" line="1385"/>
         <source>NDL: &gt;2h (calc)
 </source>
         <translation>NDL: &gt;2ч (вычисл.)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1371"/>
+        <location filename="../core/profile.c" line="1389"/>
         <source>TTS: %umin (calc)
 </source>
         <translation>TTS: %uмин (вычисл.)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1373"/>
+        <location filename="../core/profile.c" line="1391"/>
         <source>TTS: &gt;2h (calc)
 </source>
         <translation>TTS: &gt;2ч (вычисл.)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1376"/>
+        <location filename="../core/profile.c" line="1394"/>
         <source>RBT: %umin
 </source>
         <translation>RBT: %uмин
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1379"/>
+        <location filename="../core/profile.c" line="1397"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation>Расчетный потолок %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1385"/>
+        <location filename="../core/profile.c" line="1403"/>
         <source>Tissue %.0fmin: %.1f%s
 </source>
         <translation>Ткань %.0fмин: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1391"/>
+        <location filename="../core/profile.c" line="1409"/>
         <source>heartbeat: %d
 </source>
         <translation>пульс: %d
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1393"/>
+        <location filename="../core/profile.c" line="1411"/>
         <source>bearing: %d
 </source>
         <translation>азимут: %d
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1396"/>
+        <location filename="../core/profile.c" line="1414"/>
         <source>mean depth to here %.1f%s
 </source>
         <translation>средная глубина здесь %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1491"/>
+        <location filename="../core/profile.c" line="1515"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1495"/>
-        <location filename="../core/profile.c" line="1499"/>
-        <location filename="../core/profile.c" line="1503"/>
+        <location filename="../core/profile.c" line="1519"/>
+        <location filename="../core/profile.c" line="1523"/>
+        <location filename="../core/profile.c" line="1527"/>
         <source>%s %sD:%.1f%s</source>
         <translation>%s %sГ:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1507"/>
+        <location filename="../core/profile.c" line="1531"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sГ:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1511"/>
+        <location filename="../core/profile.c" line="1535"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sС:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1515"/>
-        <location filename="../core/profile.c" line="1519"/>
+        <location filename="../core/profile.c" line="1539"/>
+        <location filename="../core/profile.c" line="1543"/>
         <source>%s %sV:%.2f%s</source>
         <translation>%s %sС:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1526"/>
+        <location filename="../core/profile.c" line="1550"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sД:%d %s</translation>
     </message>
     <message>
+        <location filename="../core/profile.c" line="1575"/>
+        <source>%s SAC:%.*f %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../core/qthelper.cpp" line="67"/>
         <source>%1km</source>
         <translation>%1км</translation>
@@ -9612,446 +10056,460 @@ EADD: %d%s
         <translation>%1ярд</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="635"/>
+        <location filename="../core/qthelper.cpp" line="91"/>
+        <location filename="../core/qthelper.cpp" line="226"/>
+        <source>N</source>
+        <translation>С</translation>
+    </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="91"/>
+        <location filename="../core/qthelper.cpp" line="227"/>
+        <source>S</source>
+        <translation>Ю</translation>
+    </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="92"/>
+        <location filename="../core/qthelper.cpp" line="228"/>
+        <source>E</source>
+        <translation>В</translation>
+    </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="92"/>
+        <location filename="../core/qthelper.cpp" line="229"/>
+        <source>W</source>
+        <translation>З</translation>
+    </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="640"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="638"/>
+        <location filename="../core/qthelper.cpp" line="643"/>
         <source>F</source>
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="23"/>
-        <source>boat</source>
-        <translation>с лодки</translation>
+        <location filename="../core/save-html.c" line="469"/>
+        <location filename="../core/save-html.c" line="553"/>
+        <location filename="../core/worldmap-save.c" line="111"/>
+        <source>Can&apos;t open file %s</source>
+        <translation>Невозможно открыть файл %s</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="23"/>
-        <source>shore</source>
-        <translation>с берега</translation>
+        <location filename="../core/save-html.c" line="488"/>
+        <source>Number</source>
+        <translation>Номер</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="459"/>
-        <location filename="../core/dive.c" line="23"/>
-        <source>drift</source>
-        <translation>течение</translation>
+        <location filename="../core/save-html.c" line="489"/>
+        <source>Date</source>
+        <translation>Дата</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="24"/>
-        <source>deep</source>
-        <translation>глубокое</translation>
+        <location filename="../core/save-html.c" line="490"/>
+        <source>Time</source>
+        <translation>Время</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="24"/>
-        <source>cavern</source>
-        <translation>каверна</translation>
+        <location filename="../core/save-html.c" line="491"/>
+        <source>Location</source>
+        <translation>Местонахождение</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="443"/>
-        <location filename="../core/dive.c" line="24"/>
-        <source>ice</source>
-        <translation>подледное</translation>
+        <location filename="../core/save-html.c" line="492"/>
+        <source>Air temp.</source>
+        <translation>Темп. воздуха</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="445"/>
-        <source>search</source>
-        <translation>поиск</translation>
+        <location filename="../core/save-html.c" line="493"/>
+        <source>Water temp.</source>
+        <translation>Темп. воды</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="455"/>
-        <location filename="../core/dive.c" line="25"/>
-        <source>wreck</source>
-        <translation>рэк</translation>
+        <location filename="../core/save-html.c" line="494"/>
+        <source>Dives</source>
+        <translation>Погружения</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="441"/>
-        <location filename="../core/dive.c" line="25"/>
-        <source>cave</source>
-        <translation>пещера</translation>
+        <location filename="../core/save-html.c" line="495"/>
+        <source>Expand all</source>
+        <translation>Развернуть все</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="25"/>
-        <source>altitude</source>
-        <translation>высокогорье</translation>
+        <location filename="../core/save-html.c" line="496"/>
+        <source>Collapse all</source>
+        <translation>Свернуть все</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="26"/>
-        <source>pool</source>
-        <translation>бассейн</translation>
+        <location filename="../core/save-html.c" line="497"/>
+        <source>Trips</source>
+        <translation>Поездки</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="26"/>
-        <source>lake</source>
-        <translation>в озере</translation>
+        <location filename="../core/save-html.c" line="498"/>
+        <source>Statistics</source>
+        <translation>Статистика</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="457"/>
-        <location filename="../core/dive.c" line="26"/>
-        <source>river</source>
-        <translation>в реке</translation>
+        <location filename="../core/save-html.c" line="499"/>
+        <source>Advanced search</source>
+        <translation>Расширенный поиск</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="439"/>
-        <location filename="../core/dive.c" line="27"/>
-        <source>night</source>
-        <translation>ночное</translation>
+        <location filename="../core/save-html.c" line="502"/>
+        <source>Rating</source>
+        <translation>Оценка</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="153"/>
-        <source>Error: the file does not appear to be a DATATRAK divelog</source>
-        <translation>Ошибка: файл не является журналом DATATRAK.</translation>
+        <location filename="../core/save-html.c" line="503"/>
+        <source>Visibility</source>
+        <translation>Видимость</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="286"/>
-        <source>clear</source>
-        <translation>ясно</translation>
+        <location filename="../core/save-html.c" line="504"/>
+        <source>Duration</source>
+        <translation>Длительность</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="289"/>
-        <source>misty</source>
-        <translation>туман</translation>
+        <location filename="../core/save-html.c" line="505"/>
+        <source>Divemaster</source>
+        <translation>Инструктор</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="292"/>
-        <source>fog</source>
-        <translation>туман</translation>
+        <location filename="../core/save-html.c" line="506"/>
+        <source>Buddy</source>
+        <translation>Партнер</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="295"/>
-        <source>rain</source>
-        <translation>дождь</translation>
+        <location filename="../core/save-html.c" line="507"/>
+        <source>Suit</source>
+        <translation>Костюм</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="298"/>
-        <source>storm</source>
-        <translation>шторм</translation>
+        <location filename="../core/save-html.c" line="508"/>
+        <source>Tags</source>
+        <translation>Метки</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="301"/>
-        <source>snow</source>
-        <translation>снег</translation>
+        <location filename="../core/save-html.c" line="509"/>
+        <location filename="../smtk-import/smartrak.c" line="251"/>
+        <location filename="../smtk-import/smartrak.c" line="321"/>
+        <source>Notes</source>
+        <translation>Примечания</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="321"/>
-        <source>No suit</source>
-        <translation>Без костюма</translation>
+        <location filename="../core/save-html.c" line="510"/>
+        <source>Show more details</source>
+        <translation>Подробнее</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="324"/>
-        <source>Shorty</source>
-        <translation>Шорты</translation>
+        <location filename="../core/save-html.c" line="513"/>
+        <source>Yearly statistics</source>
+        <translation>Статистика по годам</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="327"/>
-        <source>Combi</source>
-        <translation>Комбинезон</translation>
+        <location filename="../core/save-html.c" line="514"/>
+        <source>Year</source>
+        <translation>Год</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="330"/>
-        <source>Wet suit</source>
-        <translation>Мокрый костюм</translation>
+        <location filename="../core/save-html.c" line="515"/>
+        <source>Total time</source>
+        <translation>Общее время</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="333"/>
-        <source>Semidry suit</source>
-        <translation>Полусухой костюм</translation>
+        <location filename="../core/save-html.c" line="516"/>
+        <source>Average time</source>
+        <translation>Среднее время</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="336"/>
-        <source>Dry suit</source>
-        <translation>Сухой костюм</translation>
+        <location filename="../core/save-html.c" line="517"/>
+        <source>Shortest time</source>
+        <translation>Мин. время</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="396"/>
-        <source>no stop</source>
-        <translation>без остановки</translation>
+        <location filename="../core/save-html.c" line="518"/>
+        <source>Longest time</source>
+        <translation>Макс. время</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="400"/>
-        <source>single ascent</source>
-        <translation>единичный подъем</translation>
+        <location filename="../core/save-html.c" line="519"/>
+        <source>Average depth</source>
+        <translation>Сред. глуб.</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="402"/>
-        <source>multiple ascent</source>
-        <translation>множественный подъем</translation>
+        <location filename="../core/save-html.c" line="520"/>
+        <source>Min. depth</source>
+        <translation>Мин. глуб.</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="404"/>
-        <location filename="../core/dive.c" line="27"/>
-        <source>fresh</source>
-        <translation>пресная</translation>
+        <location filename="../core/save-html.c" line="521"/>
+        <source>Max. depth</source>
+        <translation>Макс. глубина</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="406"/>
-        <source>salt water</source>
-        <translation>соленая вода</translation>
+        <location filename="../core/save-html.c" line="522"/>
+        <source>Average SAC</source>
+        <translation>Средний SAC</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="431"/>
-        <source>sight seeing</source>
-        <translation>обзорная прогулка</translation>
+        <location filename="../core/save-html.c" line="523"/>
+        <source>Min. SAC</source>
+        <translation>Мин. SAC</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="433"/>
-        <source>club dive</source>
-        <translation>погружение с клубом</translation>
+        <location filename="../core/save-html.c" line="524"/>
+        <source>Max. SAC</source>
+        <translation>Макс. SAC</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="437"/>
-        <source>instruction</source>
-        <translation>обучение</translation>
+        <location filename="../core/save-html.c" line="525"/>
+        <source>Average temp.</source>
+        <translation>Сред. темп.</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="463"/>
-        <source>other</source>
-        <translation>прочее</translation>
+        <location filename="../core/save-html.c" line="526"/>
+        <source>Min. temp.</source>
+        <translation>Мин. темп.</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="474"/>
-        <source>Other activities</source>
-        <translation>Прочие активности</translation>
+        <location filename="../core/save-html.c" line="527"/>
+        <source>Max. temp.</source>
+        <translation>Макс. темп.</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="498"/>
-        <source>Datatrak/Wlog notes</source>
-        <translation>Datatrak/Wlog notes</translation>
+        <location filename="../core/save-html.c" line="528"/>
+        <source>Back to list</source>
+        <translation>Вернуться к списку</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="537"/>
-        <source>Manually entered dive</source>
-        <translation>Вручную введенное погружение</translation>
+        <location filename="../core/save-html.c" line="531"/>
+        <source>Dive No.</source>
+        <translation>Погружение № </translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="588"/>
-        <source>Unknown</source>
-        <translation>Неизвестно</translation>
+        <location filename="../core/save-html.c" line="532"/>
+        <source>Dive profile</source>
+        <translation>Профиль погружения</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="674"/>
-        <source>Error: couldn&apos;t open the file %s</source>
-        <translation>Ошибка: невозможно открыть файл %s</translation>
+        <location filename="../core/save-html.c" line="533"/>
+        <source>Dive information</source>
+        <translation>Информация о погружении</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="687"/>
-        <source>Error: no dive</source>
-        <translation>Ошибка: погружение отсутствует</translation>
+        <location filename="../core/save-html.c" line="534"/>
+        <source>Dive equipment</source>
+        <translation>Снаряжение</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="27"/>
-        <source>student</source>
-        <translation>ученик</translation>
+        <location filename="../core/save-html.c" line="535"/>
+        <location filename="../core/save-html.c" line="542"/>
+        <source>Type</source>
+        <translation>Тип</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="461"/>
-        <location filename="../core/dive.c" line="28"/>
-        <source>photo</source>
-        <translation>фото</translation>
+        <location filename="../core/save-html.c" line="536"/>
+        <source>Size</source>
+        <translation>Объем</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="28"/>
-        <source>video</source>
-        <translation>видео</translation>
+        <location filename="../core/save-html.c" line="537"/>
+        <source>Work pressure</source>
+        <translation>Раб. давл.</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="435"/>
-        <location filename="../core/dive.c" line="28"/>
-        <source>instructor</source>
-        <translation>инструктор</translation>
+        <location filename="../core/save-html.c" line="538"/>
+        <source>Start pressure</source>
+        <translation>Нач. давл.</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="398"/>
-        <location filename="../core/dive.c" line="29"/>
-        <source>deco</source>
-        <translation>деко стоп</translation>
+        <location filename="../core/save-html.c" line="539"/>
+        <source>End pressure</source>
+        <translation>Кон. давл.</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="33"/>
-        <source>OC-gas</source>
-        <translation>Смесь ОЦ</translation>
+        <location filename="../core/save-html.c" line="540"/>
+        <source>Gas</source>
+        <translation>Смесь</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="33"/>
-        <source>diluent</source>
-        <translation>дилуент</translation>
+        <location filename="../core/save-html.c" line="541"/>
+        <source>Weight</source>
+        <translation>Вес</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="33"/>
-        <location filename="../core/equipment.c" line="88"/>
-        <location filename="../core/planner.c" line="1415"/>
-        <location filename="../core/planner.c" line="1418"/>
-        <source>oxygen</source>
-        <translation>кислород</translation>
+        <location filename="../core/save-html.c" line="543"/>
+        <source>Events</source>
+        <translation>События</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="227"/>
-        <source>ℓ</source>
-        <translation>л</translation>
+        <location filename="../core/save-html.c" line="544"/>
+        <source>Name</source>
+        <translation>Название</translation>
+    </message>
+    <message>
+        <location filename="../core/save-html.c" line="545"/>
+        <source>Value</source>
+        <translation>Значение</translation>
+    </message>
+    <message>
+        <location filename="../core/save-html.c" line="546"/>
+        <source>Coordinates</source>
+        <translation>Координаты</translation>
+    </message>
+    <message>
+        <location filename="../core/save-html.c" line="547"/>
+        <source>Dive status</source>
+        <translation>Статистика погружения</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="239"/>
+        <location filename="../core/statistics.c" line="242"/>
         <source>more than %d days</source>
         <translation>более %d дней</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="246"/>
+        <location filename="../core/statistics.c" line="249"/>
         <source>%dd %dh %dmin</source>
         <translation>%dд %dч %dмин</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="249"/>
+        <location filename="../core/statistics.c" line="252"/>
         <source>%dmin %dsecs</source>
         <translation>%dмин %dсек</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="251"/>
+        <location filename="../core/statistics.c" line="254"/>
         <source>%dh %dmin</source>
         <translation>%dч %dмин</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="263"/>
+        <location filename="../core/statistics.c" line="266"/>
         <source>for dives #</source>
         <translation>для погружений №</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="269"/>
+        <location filename="../core/statistics.c" line="272"/>
         <source>for selected dives</source>
         <translation>для выбранных погружений</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="304"/>
+        <location filename="../core/statistics.c" line="307"/>
         <source>for dive #%d</source>
         <translation>для погружения №%d</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="306"/>
+        <location filename="../core/statistics.c" line="309"/>
         <source>for selected dive</source>
         <translation>для выбранного погружения</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="308"/>
+        <location filename="../core/statistics.c" line="311"/>
         <source>for all dives</source>
         <translation>для всех погружений</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="310"/>
+        <location filename="../core/statistics.c" line="313"/>
         <source>(no dives)</source>
         <translation>(нет погружений)</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Sun</source>
         <translation>Вск</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Mon</source>
         <translation>Пнд</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Tue</source>
         <translation>Втр</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Wed</source>
         <translation>Срд</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Thu</source>
         <translation>Чтв</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Fri</source>
         <translation>Птн</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Sat</source>
         <translation>Суб</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Jan</source>
         <translation>Янв</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Feb</source>
         <translation>Фев</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Mar</source>
         <translation>Мар</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Apr</source>
         <translation>Апр</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>May</source>
         <translation>Май</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Jun</source>
         <translation>Июн</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Jul</source>
         <translation>Июл</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Aug</source>
         <translation>Авг</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Sep</source>
         <translation>Снт</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Oct</source>
         <translation>Окт</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Nov</source>
         <translation>Ноя</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Dec</source>
         <translation>Дек</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="191"/>
-        <location filename="../core/parse-xml.c" line="3284"/>
-        <location filename="../core/uemis-downloader.c" line="134"/>
-        <source>unknown</source>
-        <translation>неизвестно</translation>
-    </message>
-    <message>
-        <location filename="../core/uemis-downloader.c" line="467"/>
-        <source>data</source>
-        <translation>данные</translation>
-    </message>
-    <message>
-        <location filename="../core/uemis-downloader.c" line="447"/>
-        <source>%s %s</source>
-        <translation>%s %s</translation>
-    </message>
-    <message>
         <location filename="../core/uemis-downloader.c" line="27"/>
         <source>Uemis Zurich: the file system is almost full.
 Disconnect/reconnect the dive computer
@@ -10082,6 +10540,16 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation>Не погружений для загрузки.</translation>
     </message>
     <message>
+        <location filename="../core/uemis-downloader.c" line="447"/>
+        <source>%s %s</source>
+        <translation>%s %s</translation>
+    </message>
+    <message>
+        <location filename="../core/uemis-downloader.c" line="467"/>
+        <source>data</source>
+        <translation>данные</translation>
+    </message>
+    <message>
         <location filename="../core/uemis-downloader.c" line="495"/>
         <source>divelog #</source>
         <translation>журнала №</translation>
@@ -10252,281 +10720,6 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation>Тревога: заряд батареи</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="469"/>
-        <location filename="../core/save-html.c" line="553"/>
-        <location filename="../core/worldmap-save.c" line="111"/>
-        <source>Can&apos;t open file %s</source>
-        <translation>Невозможно открыть файл %s</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="488"/>
-        <source>Number</source>
-        <translation>Номер</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="489"/>
-        <source>Date</source>
-        <translation>Дата</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="490"/>
-        <source>Time</source>
-        <translation>Время</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="491"/>
-        <source>Location</source>
-        <translation>Местонахождение</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="492"/>
-        <source>Air temp.</source>
-        <translation>Темп. воздуха</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="493"/>
-        <source>Water temp.</source>
-        <translation>Темп. воды</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="498"/>
-        <source>Statistics</source>
-        <translation>Статистика</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="502"/>
-        <source>Rating</source>
-        <translation>Оценка</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="503"/>
-        <source>Visibility</source>
-        <translation>Видимость</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="504"/>
-        <source>Duration</source>
-        <translation>Длительность</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="494"/>
-        <source>Dives</source>
-        <translation>Погружения</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="495"/>
-        <source>Expand all</source>
-        <translation>Развернуть все</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="496"/>
-        <source>Collapse all</source>
-        <translation>Свернуть все</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="497"/>
-        <source>Trips</source>
-        <translation>Поездки</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="499"/>
-        <source>Advanced search</source>
-        <translation>Расширенный поиск</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="505"/>
-        <source>Divemaster</source>
-        <translation>Инструктор</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="506"/>
-        <source>Buddy</source>
-        <translation>Партнер</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="507"/>
-        <source>Suit</source>
-        <translation>Костюм</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="508"/>
-        <source>Tags</source>
-        <translation>Метки</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="509"/>
-        <location filename="../smtk-import/smartrak.c" line="251"/>
-        <location filename="../smtk-import/smartrak.c" line="321"/>
-        <source>Notes</source>
-        <translation>Примечания</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="510"/>
-        <source>Show more details</source>
-        <translation>Подробнее</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="513"/>
-        <source>Yearly statistics</source>
-        <translation>Статистика по годам</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="514"/>
-        <source>Year</source>
-        <translation>Год</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="515"/>
-        <source>Total time</source>
-        <translation>Общее время</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="516"/>
-        <source>Average time</source>
-        <translation>Среднее время</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="517"/>
-        <source>Shortest time</source>
-        <translation>Мин. время</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="518"/>
-        <source>Longest time</source>
-        <translation>Макс. время</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="519"/>
-        <source>Average depth</source>
-        <translation>Сред. глуб.</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="520"/>
-        <source>Min. depth</source>
-        <translation>Мин. глуб.</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="521"/>
-        <source>Max. depth</source>
-        <translation>Макс. глубина</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="523"/>
-        <source>Min. SAC</source>
-        <translation>Мин. SAC</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="524"/>
-        <source>Max. SAC</source>
-        <translation>Макс. SAC</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="525"/>
-        <source>Average temp.</source>
-        <translation>Сред. темп.</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="526"/>
-        <source>Min. temp.</source>
-        <translation>Мин. темп.</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="527"/>
-        <source>Max. temp.</source>
-        <translation>Макс. темп.</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="528"/>
-        <source>Back to list</source>
-        <translation>Вернуться к списку</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="534"/>
-        <source>Dive equipment</source>
-        <translation>Снаряжение</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="537"/>
-        <source>Work pressure</source>
-        <translation>Раб. давл.</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="538"/>
-        <source>Start pressure</source>
-        <translation>Нач. давл.</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="539"/>
-        <source>End pressure</source>
-        <translation>Кон. давл.</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="547"/>
-        <source>Dive status</source>
-        <translation>Статистика погружения</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="522"/>
-        <source>Average SAC</source>
-        <translation>Средний SAC</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="531"/>
-        <source>Dive No.</source>
-        <translation>Погружение № </translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="532"/>
-        <source>Dive profile</source>
-        <translation>Профиль погружения</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="533"/>
-        <source>Dive information</source>
-        <translation>Информация о погружении</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="535"/>
-        <location filename="../core/save-html.c" line="542"/>
-        <source>Type</source>
-        <translation>Тип</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="536"/>
-        <source>Size</source>
-        <translation>Объем</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="540"/>
-        <source>Gas</source>
-        <translation>Смесь</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="541"/>
-        <source>Weight</source>
-        <translation>Вес</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="543"/>
-        <source>Events</source>
-        <translation>События</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="544"/>
-        <source>Name</source>
-        <translation>Название</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="545"/>
-        <source>Value</source>
-        <translation>Значение</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="546"/>
-        <source>Coordinates</source>
-        <translation>Координаты</translation>
-    </message>
-    <message>
         <location filename="../core/worldmap-save.c" line="39"/>
         <source>Date:</source>
         <translation>Дата:</translation>
@@ -10572,110 +10765,6 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation>Заметки:</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="91"/>
-        <location filename="../core/qthelper.cpp" line="226"/>
-        <source>N</source>
-        <translation>С</translation>
-    </message>
-    <message>
-        <location filename="../core/qthelper.cpp" line="91"/>
-        <location filename="../core/qthelper.cpp" line="227"/>
-        <source>S</source>
-        <translation>Ю</translation>
-    </message>
-    <message>
-        <location filename="../core/qthelper.cpp" line="92"/>
-        <location filename="../core/qthelper.cpp" line="228"/>
-        <source>E</source>
-        <translation>В</translation>
-    </message>
-    <message>
-        <location filename="../core/qthelper.cpp" line="92"/>
-        <location filename="../core/qthelper.cpp" line="229"/>
-        <source>W</source>
-        <translation>З</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="341"/>
-        <source>Remote storage and local data diverged. Error: merge failed (%s)</source>
-        <translation>Данные в локальном и облачном хранилице отличаются. Ошибка слияния (%s)</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="134"/>
-        <source>Local cache directory %s corrupted - can&apos;t sync with Subsurface cloud storage</source>
-        <translation>Директория локального кэша %s повреждена, синхронизация с облачным хранилищем невозможна</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="157"/>
-        <location filename="../core/git-access.c" line="177"/>
-        <source>Could not update local cache to newer remote data</source>
-        <translation>Невозможно синхронизировать локальный кэш с облачным хранилищем</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="170"/>
-        <source>Subsurface cloud storage corrupted</source>
-        <translation>Облачное хранилице поверждено</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="285"/>
-        <source>Could not update Subsurface cloud storage, try again later</source>
-        <translation>Невозможно обновить облачное хранилище, попробуйте позже</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="371"/>
-        <source>Remote storage and local data diverged. Cannot combine local and remote changes</source>
-        <translation>Данные в локальном и облачном хранилице отличаются. Невозможно объединить изменения.</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="405"/>
-        <source>Remote storage and local data diverged</source>
-        <translation>Данные в локальном и облачном хранилице отличаются</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="408"/>
-        <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source>
-        <translation>Данные в локальном и облачном хранилице отличаются. Ошибка записи (%s)</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="417"/>
-        <source>Problems with local cache of Subsurface cloud data</source>
-        <translation>Проблема с локальным кэшем облачного хранилища</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="418"/>
-        <source>Moved cache data to %s. Please try the operation again.</source>
-        <translation>Директория кэша перенесена в %s. Попробуйте снова.</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="737"/>
-        <source>Error connecting to Subsurface cloud storage</source>
-        <translation>Ошибка подключения к облачному хранилищу Subsurface</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="740"/>
-        <source>git clone of %s failed (%s)</source>
-        <translation>Клонирование git-репозитория %s не удалось (%s)</translation>
-    </message>
-    <message>
-        <location filename="../core/load-git.c" line="222"/>
-        <location filename="../core/parse-xml.c" line="1300"/>
-        <source>additional name for site: %s
-</source>
-        <translation>другое название дайв-сайта: %s
-</translation>
-    </message>
-    <message>
-        <location filename="../core/ostctools.c" line="120"/>
-        <location filename="../core/ostctools.c" line="152"/>
-        <source>Unknown DC in dive %d</source>
-        <translation>Неизвестный дайв-компьютер в погружении %d</translation>
-    </message>
-    <message>
-        <location filename="../core/ostctools.c" line="165"/>
-        <source>Error - %s - parsing dive %d</source>
-        <translation>Ошибка %s в погружении %d</translation>
-    </message>
-    <message>
         <location filename="../smtk-import/smartrak.c" line="247"/>
         <source>Built</source>
         <translation type="unfinished"/>
@@ -10759,155 +10848,120 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="91"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="103"/>
         <source>Subsurface</source>
         <translation>Subsurface</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="97"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="110"/>
         <source>Dive list</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="112"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="125"/>
         <source>Cloud credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="126"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="139"/>
         <source>Manage dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="138"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="141"/>
         <source>Add dive manually</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="146"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="149"/>
         <source>Manual sync with cloud</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="164"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="167"/>
         <source>Offline mode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="164"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="167"/>
         <source>Enable auto cloud sync</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="182"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="187"/>
         <source>GPS</source>
         <translation>GPS</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="185"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="190"/>
         <source>GPS-tag dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="192"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="197"/>
         <source>Upload GPS data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="199"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="204"/>
         <source>Download GPS data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="206"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="211"/>
         <source>Show GPS fixes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="215"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="220"/>
         <source>Clear GPS cache</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="221"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="226"/>
         <source>Preferences</source>
         <translation>Настройки</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="230"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="237"/>
         <source>Developer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="232"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="239"/>
         <source>App log</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="239"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="246"/>
         <source>Theme information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="246"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="253"/>
         <source>User manual</source>
         <translation>Руководство пользователя</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="252"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="259"/>
         <source>About</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="283"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="304"/>
         <source>Run location service</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="283"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="304"/>
         <source>No GPS source available</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="295"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="316"/>
         <source>Actions</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="9"/>
-        <source>Hello World</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="13"/>
-        <source>File</source>
-        <translation>Файл</translation>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="15"/>
-        <source>&amp;Open</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="19"/>
-        <source>Exit</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="27"/>
-        <source>Button 1 pressed</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="28"/>
-        <source>Button 2 pressed</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="33"/>
-        <source>May I have your attention, please?</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>plannerDetails</name>
@@ -10985,6 +11039,24 @@ p, li { white-space: pre-wrap; }
         <translation>м/мин</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="121"/>
+        <location filename="../build/ui_plannerSettings.h" line="425"/>
+        <source>75% to 50% avg. depth</source>
+        <translation>75% - 50% ср. глубины</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="138"/>
+        <location filename="../build/ui_plannerSettings.h" line="427"/>
+        <source>50% avg. depth to 6m</source>
+        <translation>50% ср. глубины - 6м</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="155"/>
+        <location filename="../build/ui_plannerSettings.h" line="429"/>
+        <source>6m to surface</source>
+        <translation>6м - поверхность</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="175"/>
         <location filename="../build/ui_plannerSettings.h" line="431"/>
         <source>Descent</source>
@@ -11008,12 +11080,35 @@ p, li { white-space: pre-wrap; }
         <translation>Алгоритм VPM-B</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="268"/>
+        <source>Bühlmann deco</source>
+        <translation>Алгоритм Бюльмана</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="278"/>
         <location filename="../build/ui_plannerSettings.h" line="445"/>
         <source>Reserve gas</source>
         <translation>Газовый резерв</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="288"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="549"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="578"/>
+        <location filename="../build/ui_plannerSettings.h" line="446"/>
+        <location filename="../build/ui_plannerSettings.h" line="459"/>
+        <location filename="../build/ui_plannerSettings.h" line="461"/>
+        <source>bar</source>
+        <translation>бар</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="307"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="416"/>
+        <location filename="../build/ui_plannerSettings.h" line="437"/>
+        <location filename="../build/ui_plannerSettings.h" line="440"/>
+        <source>%</source>
+        <translation>%</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="320"/>
         <location filename="../build/ui_plannerSettings.h" line="449"/>
         <source>Postpone gas change if a stop is not required</source>
@@ -11032,12 +11127,10 @@ p, li { white-space: pre-wrap; }
         <translation>GF low</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="307"/>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="416"/>
-        <location filename="../build/ui_plannerSettings.h" line="437"/>
-        <location filename="../build/ui_plannerSettings.h" line="440"/>
-        <source>%</source>
-        <translation>%</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="353"/>
+        <location filename="../build/ui_plannerSettings.h" line="436"/>
+        <source>Plan backgas breaks</source>
+        <translation>Перерывы на основной газ</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="360"/>
@@ -11046,10 +11139,10 @@ p, li { white-space: pre-wrap; }
         <translation>GF high</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="429"/>
-        <location filename="../build/ui_plannerSettings.h" line="441"/>
-        <source>Drop to first depth</source>
-        <translation>Падение к первой глубине</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="370"/>
+        <location filename="../build/ui_plannerSettings.h" line="453"/>
+        <source>min</source>
+        <translation>мин</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="389"/>
@@ -11058,163 +11151,139 @@ p, li { white-space: pre-wrap; }
         <translation>Последняя остановка на 6м</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="353"/>
-        <location filename="../build/ui_plannerSettings.h" line="436"/>
-        <source>Plan backgas breaks</source>
-        <translation>Перерывы на основной газ</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="396"/>
+        <source>Maximize bottom time allowed by gas and no decompression limits</source>
+        <translation>Увеличить донное время исходя из газов и NDL</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="515"/>
-        <location filename="../build/ui_plannerSettings.h" line="455"/>
-        <source>Gas options</source>
-        <translation>Газы</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="399"/>
+        <location filename="../build/ui_plannerSettings.h" line="443"/>
+        <source>Recreational mode</source>
+        <translation>Рекреационный режим</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="594"/>
-        <location filename="../build/ui_plannerSettings.h" line="456"/>
-        <source>Bottom SAC</source>
-        <translation>SAC на дне</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="429"/>
+        <location filename="../build/ui_plannerSettings.h" line="441"/>
+        <source>Drop to first depth</source>
+        <translation>Падение к первой глубине</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="692"/>
-        <location filename="../build/ui_plannerSettings.h" line="457"/>
-        <source>Deco SAC</source>
-        <translation>SAC на деко</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="436"/>
+        <location filename="../build/ui_plannerSettings.h" line="452"/>
+        <source>Min. switch duration</source>
+        <translation>Мин. время переключения</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="601"/>
-        <location filename="../build/ui_plannerSettings.h" line="458"/>
-        <source>Bottom pO₂</source>
-        <translation>pO₂ на дне</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="459"/>
+        <location filename="../build/ui_plannerSettings.h" line="444"/>
+        <source>Safety stop</source>
+        <translation>Остановка безопасности</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="685"/>
-        <location filename="../build/ui_plannerSettings.h" line="460"/>
-        <source>Deco pO₂</source>
-        <translation>pO₂ на деко</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="495"/>
+        <source>Conservatism level</source>
+        <translation>Уровень консерватизма</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="515"/>
+        <location filename="../build/ui_plannerSettings.h" line="455"/>
+        <source>Gas options</source>
+        <translation>Газы</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="565"/>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="672"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="698"/>
         <location filename="../build/ui_plannerSettings.h" line="462"/>
         <location filename="../build/ui_plannerSettings.h" line="463"/>
         <source>ℓ/min</source>
         <translation>л/мин</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="632"/>
-        <location filename="../build/ui_plannerSettings.h" line="468"/>
-        <source>Display runtime</source>
-        <translation>Показать отсчет</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="645"/>
-        <location filename="../build/ui_plannerSettings.h" line="472"/>
-        <source>Display segment duration</source>
-        <translation>Показать время сегмента</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="655"/>
-        <location filename="../build/ui_plannerSettings.h" line="476"/>
-        <source>Display transitions in deco</source>
-        <translation>Показать переходы в деко</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="662"/>
-        <location filename="../build/ui_plannerSettings.h" line="477"/>
-        <source>Verbatim dive plan</source>
-        <translation>Подробный план:</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="288"/>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="549"/>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="578"/>
-        <location filename="../build/ui_plannerSettings.h" line="446"/>
-        <location filename="../build/ui_plannerSettings.h" line="459"/>
-        <location filename="../build/ui_plannerSettings.h" line="461"/>
-        <source>bar</source>
-        <translation>бар</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="121"/>
-        <location filename="../build/ui_plannerSettings.h" line="425"/>
-        <source>75% to 50% avg. depth</source>
-        <translation>75% - 50% ср. глубины</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="138"/>
-        <location filename="../build/ui_plannerSettings.h" line="427"/>
-        <source>50% avg. depth to 6m</source>
-        <translation>50% ср. глубины - 6м</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="155"/>
-        <location filename="../build/ui_plannerSettings.h" line="429"/>
-        <source>6m to surface</source>
-        <translation>6м - поверхность</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="268"/>
-        <source>Bühlmann deco</source>
-        <translation>Алгоритм Бюльмана</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="370"/>
-        <location filename="../build/ui_plannerSettings.h" line="453"/>
-        <source>min</source>
-        <translation>мин</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="396"/>
-        <source>Maximize bottom time allowed by gas and no decompression limits</source>
-        <translation>Увеличить донное время исходя из газов и NDL</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="594"/>
+        <source>m</source>
+        <translation>м</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="399"/>
-        <location filename="../build/ui_plannerSettings.h" line="443"/>
-        <source>Recreational mode</source>
-        <translation>Рекреационный режим</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="606"/>
+        <source>Used to calculate best mix. Select best mix depth in &apos;Available gases&apos; table by entering gas depth, followed by &quot;B&quot; (best trimix mix) or &quot;BN&quot; (best nitrox mix)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="436"/>
-        <location filename="../build/ui_plannerSettings.h" line="452"/>
-        <source>Min. switch duration</source>
-        <translation>Мин. время переключения</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="613"/>
+        <location filename="../build/ui_plannerSettings.h" line="456"/>
+        <source>Bottom SAC</source>
+        <translation>SAC на дне</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="459"/>
-        <location filename="../build/ui_plannerSettings.h" line="444"/>
-        <source>Safety stop</source>
-        <translation>Остановка безопасности</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="620"/>
+        <location filename="../build/ui_plannerSettings.h" line="458"/>
+        <source>Bottom pO₂</source>
+        <translation>pO₂ на дне</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="495"/>
-        <source>Conservatism level</source>
-        <translation>Уровень консерватизма</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="627"/>
+        <source>Best mix END</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="608"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="634"/>
         <location filename="../build/ui_plannerSettings.h" line="464"/>
         <source>Notes</source>
         <translation>Примечания</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="629"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="655"/>
         <location filename="../build/ui_plannerSettings.h" line="466"/>
         <source>In dive plan, show runtime (absolute time) of stops</source>
         <translation>Показывать время отсчета для остановок (абсолютное время)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="642"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="658"/>
+        <location filename="../build/ui_plannerSettings.h" line="468"/>
+        <source>Display runtime</source>
+        <translation>Показать отсчет</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="668"/>
         <location filename="../build/ui_plannerSettings.h" line="470"/>
         <source>In dive plan, show duration (relative time) of stops</source>
         <translation>Показывать длительность остановок (относительное время)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="652"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="671"/>
+        <location filename="../build/ui_plannerSettings.h" line="472"/>
+        <source>Display segment duration</source>
+        <translation>Показать время сегмента</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="678"/>
         <location filename="../build/ui_plannerSettings.h" line="474"/>
         <source>In diveplan, list transitions or treat them as implicit</source>
         <translation>Показывать переходы в списке или неявно учитывать их</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="681"/>
+        <location filename="../build/ui_plannerSettings.h" line="476"/>
+        <source>Display transitions in deco</source>
+        <translation>Показать переходы в деко</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="688"/>
+        <location filename="../build/ui_plannerSettings.h" line="477"/>
+        <source>Verbatim dive plan</source>
+        <translation>Подробный план:</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="711"/>
+        <location filename="../build/ui_plannerSettings.h" line="460"/>
+        <source>Deco pO₂</source>
+        <translation>pO₂ на деко</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="718"/>
+        <location filename="../build/ui_plannerSettings.h" line="457"/>
+        <source>Deco SAC</source>
+        <translation>SAC на деко</translation>
+    </message>
 </context>
 </TS>
\ No newline at end of file
diff --git a/translations/subsurface_sk_SK.ts b/translations/subsurface_sk_SK.ts
index 415a0f9cc..31e61a185 100644
--- a/translations/subsurface_sk_SK.ts
+++ b/translations/subsurface_sk_SK.ts
@@ -105,6 +105,11 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="56"/>
+        <source>Could not initialize Winsock version 2.2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="134"/>
         <source>Trying to turn on the local Bluetooth device...</source>
         <translation type="unfinished"/>
@@ -115,6 +120,11 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="167"/>
+        <source>Remote devices list was cleared.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="183"/>
         <source>Scanning for remote devices...</source>
         <translation type="unfinished"/>
@@ -125,6 +135,22 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="208"/>
+        <source>The local Bluetooth device was %1.</source>
+        <extracomment>%1 will be replaced with &quot;turned on&quot; or &quot;turned off&quot;</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
+        <source>turned on</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
+        <source>turned off</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="225"/>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="339"/>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="359"/>
@@ -172,37 +198,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="352"/>
-        <source>Device %1 was paired and is authorized.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="56"/>
-        <source>Could not initialize Winsock version 2.2</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="167"/>
-        <source>Remote devices list was cleared.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="208"/>
-        <source>The local Bluetooth device was %1.</source>
-        <extracomment>%1 will be replaced with &quot;turned on&quot; or &quot;turned off&quot;</extracomment>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
-        <source>turned on</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
-        <source>turned off</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="307"/>
         <source>Remove pairing</source>
         <translation type="unfinished"/>
@@ -228,6 +223,11 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="352"/>
+        <source>Device %1 was paired and is authorized.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="378"/>
         <source>The device %1 can now be used for connection. You can press the Save button.</source>
         <translation type="unfinished"/>
@@ -286,12 +286,12 @@
 <context>
     <name>BuddyFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="621"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="619"/>
         <source>Person: </source>
         <translation>Osoba:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="622"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="620"/>
         <source>Searches for buddies and divemasters</source>
         <translation>Vyhľadávanie partnerov a divemastrov</translation>
     </message>
@@ -299,7 +299,7 @@
 <context>
     <name>BuddyFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="243"/>
+        <location filename="../qt-models/filtermodels.cpp" line="248"/>
         <source>No buddies</source>
         <translation>Žiaden partner</translation>
     </message>
@@ -307,25 +307,30 @@
 <context>
     <name>CloudCredentials</name>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="49"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="50"/>
         <source>Cloud credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="55"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="56"/>
         <source>Email</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="67"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="68"/>
         <source>Password</source>
         <translation>Heslo</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="90"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="92"/>
         <source>Show password</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="97"/>
+        <source>PIN</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>ColumnNameProvider</name>
@@ -381,6 +386,16 @@
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
+        <source>Max. depth</source>
+        <translation>Max. hĺbka</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
+        <source>Avg. depth</source>
+        <translation>Priemerná hĺbka</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
         <source>Divemaster</source>
         <translation>Divemaster</translation>
     </message>
@@ -391,6 +406,11 @@
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
+        <source>Suit</source>
+        <translation>Oblek</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
         <source>Notes</source>
         <translation>Poznámky</translation>
     </message>
@@ -410,21 +430,6 @@
         <translation>Teplota vody</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
-        <source>Max. depth</source>
-        <translation>Max. hĺbka</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
-        <source>Avg. depth</source>
-        <translation>Priemerná hĺbka</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
-        <source>Suit</source>
-        <translation>Oblek</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="44"/>
         <source>O₂</source>
         <translation type="unfinished"/>
@@ -538,7 +543,7 @@
         <translation>Problém inicializácie libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../core/configuredivecomputer.cpp" line="660"/>
+        <location filename="../core/configuredivecomputer.cpp" line="656"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation>Nie je možné vytvoriť spojenie s počítačom.</translation>
     </message>
@@ -558,11 +563,19 @@
         <translation>Zariadenie alebo bod pripojenia</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="170"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1520"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1533"/>
-        <source>...</source>
-        <translation>...</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="47"/>
+        <source>Connect via Bluetooth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="54"/>
+        <source>Connect</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="64"/>
+        <source>Disconnect</source>
+        <translation>Odpoj</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="80"/>
@@ -571,12 +584,24 @@
         <translation>Načítať detaily</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="90"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1523"/>
+        <source>Read settings from backup file or from device before writing to the device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="93"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1525"/>
         <source>Save changes to device</source>
         <translation>Uložiť zmeny do zariadenia</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="116"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1527"/>
+        <source>Read settings from backup file or from device before writing to a backup file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="119"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1529"/>
         <source>Backup</source>
@@ -595,15 +620,40 @@
         <translation>Firmware update</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="163"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1532"/>
+        <source>Save libdivecomputer logfile</source>
+        <translation>Uložiť libdivecomputer logfile</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="170"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1520"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1533"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="177"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1534"/>
         <source>Cancel</source>
         <translation>Zrušiť</translation>
     </message>
     <message>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1539"/>
-        <source>OSTC 3</source>
-        <translation>OSTC 3</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="214"/>
+        <source>OSTC 3,Sport,Cr,2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="223"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1541"/>
+        <source>Suunto Vyper family</source>
+        <translation>Suunto Vyper family</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="232"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1543"/>
+        <source>OSTC, Mk.2/2N/2C</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="253"/>
@@ -616,40 +666,56 @@
         <translation>Základné nastavenia</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="326"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1656"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1943"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1546"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1726"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1766"/>
-        <source>Serial No.</source>
-        <translation>Serial No.</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="260"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1575"/>
+        <source>Eco</source>
+        <translation>Eco</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="349"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1679"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1980"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1547"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1727"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1767"/>
-        <source>Firmware version</source>
-        <translation>Verzia firmware</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="265"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1576"/>
+        <source>Medium</source>
+        <translation>Stredný</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="538"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1713"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1990"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1548"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1729"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1768"/>
-        <source>Custom text</source>
-        <translation>Voliteľný text</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="270"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1577"/>
+        <source>High</source>
+        <translation>Vysoký</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="385"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1549"/>
-        <source>Language</source>
-        <translation>Jazyk</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="278"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="826"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="849"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="875"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="927"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="993"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1019"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1101"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1117"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1450"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2278"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2382"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2408"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2434"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2474"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2497"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1586"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1621"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1623"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1625"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1628"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1637"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1638"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1710"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1785"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1789"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1801"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1803"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1806"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1807"/>
+        <source>%</source>
+        <translation>%</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="289"/>
@@ -676,44 +742,36 @@
         <translation>Taliančina</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="579"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1557"/>
-        <source>Dive mode</source>
-        <translation>Mód ponoru</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="556"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1560"/>
-        <source>OC</source>
-        <translation>OC</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="561"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1561"/>
-        <source>CC</source>
-        <translation>CC</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="313"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1582"/>
+        <source>m/°C</source>
+        <translation>m/°C</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="566"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2336"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1562"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1793"/>
-        <source>Gauge</source>
-        <translation>Gauge</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="318"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1583"/>
+        <source>ft/°F</source>
+        <translation>ft/°F</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="571"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1563"/>
-        <source>Apnea</source>
-        <translation>Apnea</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="326"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1656"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1943"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1546"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1726"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1766"/>
+        <source>Serial No.</source>
+        <translation>Serial No.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="395"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2063"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1565"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1780"/>
-        <source>Date format</source>
-        <translation>Formát dátumu</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="349"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1679"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1980"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1547"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1727"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1767"/>
+        <source>Firmware version</source>
+        <translation>Verzia firmware</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="360"/>
@@ -734,108 +792,147 @@
         <translation>YYMMDD</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1042"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2457"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1639"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1805"/>
-        <source>Saturation</source>
-        <translation>Saturácia</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="385"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1549"/>
+        <source>Language</source>
+        <translation>Jazyk</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="278"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="826"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="849"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="875"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="927"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="993"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1019"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1101"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1117"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1450"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2278"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2382"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2408"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2434"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2474"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2497"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1586"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1621"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1623"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1625"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1628"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1637"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1638"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1710"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1785"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1789"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1801"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1803"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1806"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1807"/>
-        <source>%</source>
-        <translation>%</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="395"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2063"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1565"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1780"/>
+        <source>Date format</source>
+        <translation>Formát dátumu</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="865"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2261"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1624"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1784"/>
-        <source>Desaturation</source>
-        <translation>Desaturácia</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="405"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1572"/>
+        <source>Brightness</source>
+        <translation>Jas</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="983"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2398"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1636"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1800"/>
-        <source>Last deco</source>
-        <translation>Posledná deco zastávka</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="415"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1850"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1579"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1753"/>
+        <source>Units</source>
+        <translation>Jednotky</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="711"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="736"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="758"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="904"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2181"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2206"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2228"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2307"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1626"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1786"/>
-        <source> m</source>
-        <translation>m</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="425"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1585"/>
+        <source>Salinity (0-5%)</source>
+        <translation>Slanosť </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="405"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1572"/>
-        <source>Brightness</source>
-        <translation>Jas</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="438"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1615"/>
+        <source>Reset device to default settings</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="260"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1575"/>
-        <source>Eco</source>
-        <translation>Eco</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="452"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1590"/>
+        <source>230LSB/Gauss</source>
+        <translation>230LSB/Gauss</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="265"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1576"/>
-        <source>Medium</source>
-        <translation>Stredný</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="457"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1591"/>
+        <source>330LSB/Gauss</source>
+        <translation>330LSB/Gauss</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="270"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1577"/>
-        <source>High</source>
-        <translation>Vysoký</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="462"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1592"/>
+        <source>390LSB/Gauss</source>
+        <translation>390LSB/Gauss</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="603"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2034"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1599"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1779"/>
-        <source>Sampling rate</source>
-        <translation>Vzorkovacia frekvencia</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="467"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1593"/>
+        <source>440LSB/Gauss</source>
+        <translation>440LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="472"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1594"/>
+        <source>660LSB/Gauss</source>
+        <translation>660LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="477"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1595"/>
+        <source>820LSB/Gauss</source>
+        <translation>820LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="482"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1596"/>
+        <source>1090LSB/Gauss</source>
+        <translation>1090LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="487"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1597"/>
+        <source>1370LSB/Gauss</source>
+        <translation>1370LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="521"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1587"/>
+        <source>Compass gain</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="531"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1799"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1745"/>
+        <source>Computer model</source>
+        <translation>Model počítača</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="538"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1713"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1990"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1548"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1729"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1768"/>
+        <source>Custom text</source>
+        <translation>Voliteľný text</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="556"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1560"/>
+        <source>OC</source>
+        <translation>OC</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="561"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1561"/>
+        <source>CC</source>
+        <translation>CC</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="566"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2336"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1562"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1793"/>
+        <source>Gauge</source>
+        <translation>Gauge</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="571"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1563"/>
+        <source>Apnea</source>
+        <translation>Apnea</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="579"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1557"/>
+        <source>Dive mode</source>
+        <translation>Mód ponoru</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="590"/>
@@ -852,30 +949,12 @@
         <translation>10s</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="415"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1850"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1579"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1753"/>
-        <source>Units</source>
-        <translation>Jednotky</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="313"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1582"/>
-        <source>m/°C</source>
-        <translation>m/°C</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="318"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1583"/>
-        <source>ft/°F</source>
-        <translation>ft/°F</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="644"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1605"/>
-        <source>Dive mode color</source>
-        <translation>Farba modu ponoru</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="603"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2034"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1599"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1779"/>
+        <source>Sampling rate</source>
+        <translation>Vzorkovacia frekvencia</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="614"/>
@@ -902,12 +981,6 @@
         <translation>Modrá</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="425"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1585"/>
-        <source>Salinity (0-5%)</source>
-        <translation>Slanosť </translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="637"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2092"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1613"/>
@@ -916,89 +989,79 @@
         <translation>Synchronizácia času počítača s PC</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="521"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1587"/>
-        <source>Compass gain</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="644"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1605"/>
+        <source>Dive mode color</source>
+        <translation>Farba modu ponoru</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="90"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1523"/>
-        <source>Read settings from backup file or from device before writing to the device</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="654"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2020"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1614"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1771"/>
+        <source>Show safety stop</source>
+        <translation>Zobraziť bezpečnostnú zastávku</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="116"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1527"/>
-        <source>Read settings from backup file or from device before writing to a backup file</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="661"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2145"/>
+        <source>End Depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="232"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1543"/>
-        <source>OSTC, Mk.2/2N/2C</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="671"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2162"/>
+        <source> s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="452"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1590"/>
-        <source>230LSB/Gauss</source>
-        <translation>230LSB/Gauss</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="457"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1591"/>
-        <source>330LSB/Gauss</source>
-        <translation>330LSB/Gauss</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="462"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1592"/>
-        <source>390LSB/Gauss</source>
-        <translation>390LSB/Gauss</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="467"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1593"/>
-        <source>440LSB/Gauss</source>
-        <translation>440LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="687"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1953"/>
+        <source>Length</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="472"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1594"/>
-        <source>660LSB/Gauss</source>
-        <translation>660LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="694"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2138"/>
+        <source>Start Depth</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="477"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1595"/>
-        <source>820LSB/Gauss</source>
-        <translation>820LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="701"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2152"/>
+        <source>Reset Depth</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="482"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1596"/>
-        <source>1090LSB/Gauss</source>
-        <translation>1090LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="711"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="736"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="758"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="904"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2181"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2206"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2228"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2307"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1626"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1786"/>
+        <source> m</source>
+        <translation>m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="487"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1597"/>
-        <source>1370LSB/Gauss</source>
-        <translation>1370LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="778"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2248"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1643"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1810"/>
+        <source>Advanced settings</source>
+        <translation>Pokročilé nastavenia</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="654"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2020"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1614"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1771"/>
-        <source>Show safety stop</source>
-        <translation>Zobraziť bezpečnostnú zastávku</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="784"/>
+        <source>Left button sensitivity</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="438"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1615"/>
-        <source>Reset device to default settings</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="791"/>
+        <source>Always show ppO2</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1010,20 +1073,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="223"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1541"/>
-        <source>Suunto Vyper family</source>
-        <translation>Suunto Vyper family</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="778"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2248"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1643"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1810"/>
-        <source>Advanced settings</source>
-        <translation>Pokročilé nastavenia</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="805"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2271"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1618"/>
@@ -1054,6 +1103,14 @@
         <translation>GFHigh</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="865"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2261"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1624"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1784"/>
+        <source>Desaturation</source>
+        <translation>Desaturácia</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="917"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2320"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1627"/>
@@ -1068,14 +1125,6 @@
         <translation> mbar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="973"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2369"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1630"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1788"/>
-        <source> min</source>
-        <translation> min</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="960"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2331"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1633"/>
@@ -1084,63 +1133,28 @@
         <translation>ZH-L16</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="47"/>
-        <source>Connect via Bluetooth</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="163"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1532"/>
-        <source>Save libdivecomputer logfile</source>
-        <translation>Uložiť libdivecomputer logfile</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="661"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2145"/>
-        <source>End Depth</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="671"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2162"/>
-        <source> s</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="687"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1953"/>
-        <source>Length</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="694"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2138"/>
-        <source>Start Depth</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="701"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2152"/>
-        <source>Reset Depth</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="784"/>
-        <source>Left button sensitivity</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="791"/>
-        <source>Always show ppO2</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="965"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1634"/>
         <source>ZH-L16+GF</source>
         <translation>ZH-L16+GF</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="973"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2369"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1630"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1788"/>
+        <source> min</source>
+        <translation> min</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="983"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2398"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1636"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1800"/>
+        <source>Last deco</source>
+        <translation>Posledná deco zastávka</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1009"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2424"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1640"/>
@@ -1157,6 +1171,14 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1042"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2457"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1639"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1805"/>
+        <source>Saturation</source>
+        <translation>Saturácia</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1052"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1642"/>
         <source>Flip screen</source>
@@ -1168,12 +1190,22 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1066"/>
+        <source>MOD warning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1073"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2513"/>
         <source>Graphical speed indicator</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1080"/>
+        <source>Dynamic ascent rate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1087"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2552"/>
         <source>Bottom gas consumption</source>
@@ -1186,6 +1218,14 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1133"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1149"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2520"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2536"/>
+        <source> ℓ/min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1165"/>
         <source>Temperature sensor offset</source>
         <translation type="unfinished"/>
@@ -1204,6 +1244,18 @@
         <translation>Nastavenie zmesi</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1235"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1320"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2610"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2695"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1645"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1668"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1812"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1835"/>
+        <source>%O₂</source>
+        <translation>%O₂</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1240"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1325"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2615"/>
@@ -1322,18 +1374,12 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1691"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1858"/>
-        <source>Set point [cbar]</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1405"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2770"/>
+        <source>Setpoint</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1693"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1860"/>
-        <source>Change depth [m]</source>
-        <translation>Zmena v hĺbke [m]</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1415"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2780"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1698"/>
@@ -1370,6 +1416,12 @@
         <translation>SP 5</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1443"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1709"/>
+        <source>O₂ in calibration gas</source>
+        <translation>O₂ v kalibračnej zmesi</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1467"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1713"/>
         <source>Fixed setpoint</source>
@@ -1400,101 +1452,6 @@
         <translation> cbar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1748"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1733"/>
-        <source>P1 (medium)</source>
-        <extracomment>Suunto safety level</extracomment>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1753"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1734"/>
-        <source>P2 (high)</source>
-        <extracomment>Suunto safety level</extracomment>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1792"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1744"/>
-        <source>Total dive time</source>
-        <translation>Celkový čas ponoru</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2109"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1769"/>
-        <source>kg/ℓ</source>
-        <translation>kg/ℓ</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2346"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1795"/>
-        <source>Apnoea</source>
-        <translation>Apnoea</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1583"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1722"/>
-        <source>Safety level</source>
-        <translation>Úroveň bezpečnosti</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="54"/>
-        <source>Connect</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="64"/>
-        <source>Disconnect</source>
-        <translation>Odpoj</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="214"/>
-        <source>OSTC 3,Sport,Cr,2</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1066"/>
-        <source>MOD warning</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1080"/>
-        <source>Dynamic ascent rate</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1133"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1149"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2520"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2536"/>
-        <source> ℓ/min</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1235"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1320"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2610"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2695"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1645"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1668"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1812"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1835"/>
-        <source>%O₂</source>
-        <translation>%O₂</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1405"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2770"/>
-        <source>Setpoint</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1443"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1709"/>
-        <source>O₂ in calibration gas</source>
-        <translation>O₂ v kalibračnej zmesi</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1535"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2843"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1719"/>
@@ -1511,6 +1468,12 @@
         <translation>pO₂ min</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1583"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1722"/>
+        <source>Safety level</source>
+        <translation>Úroveň bezpečnosti</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1609"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1723"/>
         <source>Altitude range</source>
@@ -1544,6 +1507,20 @@
         <translation>P0 (žiadne)</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1748"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1733"/>
+        <source>P1 (medium)</source>
+        <extracomment>Suunto safety level</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1753"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1734"/>
+        <source>P2 (high)</source>
+        <extracomment>Suunto safety level</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1761"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1736"/>
         <source>Sample rate</source>
@@ -1568,11 +1545,10 @@
         <translation>60s</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="531"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1799"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1745"/>
-        <source>Computer model</source>
-        <translation>Model počítača</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1792"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1744"/>
+        <source>Total dive time</source>
+        <translation>Celkový čas ponoru</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1816"/>
@@ -1637,12 +1613,6 @@
         <translation>Časový alarm</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2099"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1765"/>
-        <source>Salinity</source>
-        <translation>Slanosť</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2074"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1774"/>
         <source>MM/DD/YY</source>
@@ -1661,12 +1631,30 @@
         <translation>YY/MM/DD</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2099"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1765"/>
+        <source>Salinity</source>
+        <translation>Slanosť</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2109"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1769"/>
+        <source>kg/ℓ</source>
+        <translation>kg/ℓ</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2341"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1794"/>
         <source>ZH-L16 CC</source>
         <translation>ZH-L16 CC</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2346"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1795"/>
+        <source>Apnoea</source>
+        <translation>Apnoea</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2351"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1796"/>
         <source>L16-GF OC</source>
@@ -1685,87 +1673,112 @@
         <translation>PSCR-GF</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1108"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1129"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1539"/>
+        <source>OSTC 3</source>
+        <translation>OSTC 3</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1691"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1858"/>
+        <source>Set point [cbar]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1693"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1860"/>
+        <source>Change depth [m]</source>
+        <translation>Zmena v hĺbke [m]</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1110"/>
+        <source>Backup dive computer settings</source>
+        <translation>Nastavenie záložného počítača</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1111"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1132"/>
         <source>Backup files (*.xml)</source>
         <translation>Záložné súbory (*.xml)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1113"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1115"/>
+        <source>XML backup error</source>
+        <translation>Chyba XML zálohy</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1116"/>
         <source>An error occurred while saving the backup file.
 %1</source>
         <translation>Chyba počas ukladania zálohy.
 %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1116"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1119"/>
         <source>Backup succeeded</source>
         <translation>Vytvorenie zálohy úspešné</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1117"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1120"/>
         <source>Your settings have been saved to: %1</source>
         <translation>Nastavenie bolo uložené do: %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1107"/>
-        <source>Backup dive computer settings</source>
-        <translation>Nastavenie záložného počítača</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1112"/>
-        <source>XML backup error</source>
-        <translation>Chyba XML zálohy</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1128"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1131"/>
         <source>Restore dive computer settings</source>
         <translation>Obnova nastavenia počítača</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1134"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1137"/>
         <source>XML restore error</source>
         <translation>Chyba XML obnovy</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1135"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1138"/>
         <source>An error occurred while restoring the backup file.
 %1</source>
         <translation>Pri obnove zálohy nastala chyba.
 %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1139"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1142"/>
         <source>Restore succeeded</source>
         <translation>Úspešná obnova</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1140"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1143"/>
         <source>Your settings have been restored successfully.</source>
         <translation>Nastavenia boli obnovené úspešne.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1150"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1153"/>
         <source>Select firmware file</source>
         <translation>Vyber súbor s firmware</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1151"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1154"/>
         <source>All files (*.*)</source>
         <translation>Všetky súbory (*.*)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1207"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1210"/>
         <source>Choose file for divecomputer download logfile</source>
         <translation>Zvoľ meno log súboru pre divecomputer sťahovanie</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1208"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1211"/>
         <source>Log files (*.log)</source>
         <translation>Log súbory</translation>
     </message>
 </context>
 <context>
+    <name>ContextDrawer</name>
+    <message>
+        <location filename="../mobile-widgets/qml/kirigami/src/controls/ContextDrawer.qml" line="76"/>
+        <source>Actions</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>CylindersModel</name>
     <message>
         <location filename="../qt-models/cylindermodel.cpp" line="16"/>
@@ -1779,11 +1792,6 @@
     </message>
     <message>
         <location filename="../qt-models/cylindermodel.cpp" line="16"/>
-        <source>He%</source>
-        <translation>He%</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="16"/>
         <source>Work press.</source>
         <translation>Pracovný tlak.</translation>
     </message>
@@ -1803,9 +1811,24 @@
         <translation>O₂%</translation>
     </message>
     <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="16"/>
+        <source>He%</source>
+        <translation>He%</translation>
+    </message>
+    <message>
         <location filename="../qt-models/cylindermodel.cpp" line="17"/>
-        <source>Switch at</source>
-        <translation>Zmeň v</translation>
+        <source>Deco switch at</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
+        <source>Bot. MOD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
+        <source>MND</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-models/cylindermodel.cpp" line="17"/>
@@ -1823,17 +1846,32 @@
         <translation>ℓ</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="161"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="177"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation>Kliknutím sem vymažeš fľašu</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="383"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="180"/>
+        <source>Switch depth for deco gas. Calculated using Deco pO₂ preference, unless set manually.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="183"/>
+        <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to &apos;*&apos; for best O₂% for max depth.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="186"/>
+        <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to &apos;*&apos; for best He% for max depth.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="444"/>
         <source>Cylinder cannot be removed</source>
         <translation>Flaša nemôže byť vymazaná</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="384"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="445"/>
         <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source>
         <translation>Táto zmes sa používa. Len fľaše, ktoré nie sú použité pri ponore, môžu byť vymazané.</translation>
     </message>
@@ -1853,42 +1891,24 @@
         <translation>Ktoré komponenty chceš kopírovať</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="73"/>
+        <location filename="../build/ui_divecomponentselection.h" line="141"/>
+        <source>Dive site</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="80"/>
         <location filename="../build/ui_divecomponentselection.h" line="142"/>
         <source>Suit</source>
         <translation>Oblek</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="122"/>
-        <location filename="../build/ui_divecomponentselection.h" line="148"/>
-        <source>Divemaster</source>
-        <translation>Divemaster</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="129"/>
-        <location filename="../build/ui_divecomponentselection.h" line="149"/>
-        <source>Buddy</source>
-        <translation>Buddy</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="136"/>
-        <location filename="../build/ui_divecomponentselection.h" line="150"/>
-        <source>Rating</source>
-        <translation>Hodnotenie</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="87"/>
         <location filename="../build/ui_divecomponentselection.h" line="143"/>
         <source>Visibility</source>
         <translation>Viditeľnosť</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="73"/>
-        <location filename="../build/ui_divecomponentselection.h" line="141"/>
-        <source>Dive site</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="94"/>
         <location filename="../build/ui_divecomponentselection.h" line="144"/>
         <source>Notes</source>
@@ -1912,10 +1932,34 @@
         <source>Cylinders</source>
         <translation>Fľaše</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="122"/>
+        <location filename="../build/ui_divecomponentselection.h" line="148"/>
+        <source>Divemaster</source>
+        <translation>Divemaster</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="129"/>
+        <location filename="../build/ui_divecomponentselection.h" line="149"/>
+        <source>Buddy</source>
+        <translation>Buddy</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="136"/>
+        <location filename="../build/ui_divecomponentselection.h" line="150"/>
+        <source>Rating</source>
+        <translation>Hodnotenie</translation>
+    </message>
 </context>
 <context>
     <name>DiveComputerManagementDialog</name>
     <message>
+        <location filename="../desktop-widgets/divecomputermanagementdialog.ui" line="17"/>
+        <location filename="../build/ui_divecomputermanagementdialog.h" line="65"/>
+        <source>Edit dive computer nicknames</source>
+        <translation>Zmena voliteľného mena počítača</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divecomputermanagementdialog.cpp" line="49"/>
         <source>Remove the selected dive computer?</source>
         <translation>Zmazať vybraný počítač?</translation>
@@ -1927,12 +1971,6 @@
         <translation>Si si istý, že chceš zmazať
 vybraný počítač?</translation>
     </message>
-    <message>
-        <location filename="../desktop-widgets/divecomputermanagementdialog.ui" line="17"/>
-        <location filename="../build/ui_divecomputermanagementdialog.h" line="65"/>
-        <source>Edit dive computer nicknames</source>
-        <translation>Zmena voliteľného mena počítača</translation>
-    </message>
 </context>
 <context>
     <name>DiveComputerModel</name>
@@ -1960,17 +1998,17 @@ vybraný počítač?</translation>
 <context>
     <name>DiveDetails</name>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="33"/>
+        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="38"/>
         <source>Dive details</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="67"/>
+        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="72"/>
         <source>Delete dive</source>
         <translation>Zmazať ponor</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="84"/>
+        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="89"/>
         <source>Show on map</source>
         <translation type="unfinished"/>
     </message>
@@ -1978,88 +2016,93 @@ vybraný počítač?</translation>
 <context>
     <name>DiveDetailsEdit</name>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="74"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="80"/>
         <source>Dive %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="78"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="84"/>
         <source>Date:</source>
         <translation>Dátum:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="86"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="92"/>
         <source>Location:</source>
         <translation>Miesto:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="95"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="101"/>
         <source>Coordinates:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="104"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="110"/>
         <source>Use current
 GPS location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="118"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="124"/>
         <source>Depth:</source>
         <translation>Hĺbka:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="127"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="133"/>
         <source>Duration:</source>
         <translation>Trvanie:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="137"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="143"/>
         <source>Air Temp:</source>
         <translation>Teplota vzduchu:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="146"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="152"/>
         <source>Water Temp:</source>
         <translation>Teplota vody:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="155"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="161"/>
         <source>Suit:</source>
         <translation>Oblek:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="164"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="176"/>
         <source>Buddy:</source>
         <translation>Buddy:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="173"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="191"/>
         <source>Dive Master:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="182"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="206"/>
         <source>Weight:</source>
         <translation>Závažie:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="192"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="216"/>
+        <source>Cylinder:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="231"/>
         <source>Gas mix:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="203"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="241"/>
         <source>Start Pressure:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="213"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="250"/>
         <source>End Pressure:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="224"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="260"/>
         <source>Notes:</source>
         <translation>Poznámky:</translation>
     </message>
@@ -2097,42 +2140,42 @@ GPS location:</source>
         <translation>Oblek:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="159"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="158"/>
         <source>Air Temp:</source>
         <translation>Teplota vzduchu:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="175"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="172"/>
         <source>Cylinder:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="189"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="185"/>
         <source>Water Temp:</source>
         <translation>Teplota vody:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="205"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="198"/>
         <source>Dive Master:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="220"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="211"/>
         <source>Weight:</source>
         <translation>Závažie:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="249"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="224"/>
         <source>Buddy:</source>
         <translation>Buddy:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="263"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="237"/>
         <source>SAC:</source>
         <translation>SAC:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="280"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="252"/>
         <source>Notes</source>
         <translation>Poznámky</translation>
     </message>
@@ -2140,18 +2183,18 @@ GPS location:</source>
 <context>
     <name>DiveEventItem</name>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="134"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="165"/>
         <source>Manual switch to OC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="136"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="167"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation>začiatok</translation>
     </message>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="137"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="168"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation>koniec</translation>
@@ -2160,27 +2203,27 @@ GPS location:</source>
 <context>
     <name>DiveImportedModel</name>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="646"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="656"/>
         <source>Date/time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="648"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="658"/>
         <source>Duration</source>
         <translation>Dĺžka (min)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="650"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="660"/>
         <source>Depth</source>
         <translation>Hĺbka</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="672"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="682"/>
         <source>h:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="672"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="682"/>
         <source>min</source>
         <translation>min</translation>
     </message>
@@ -2189,8 +2232,8 @@ GPS location:</source>
     <name>DiveList</name>
     <message>
         <location filename="../mobile-widgets/qml/DiveList.qml" line="12"/>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="226"/>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="232"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="227"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="233"/>
         <source>Dive list</source>
         <translation type="unfinished"/>
     </message>
@@ -2205,110 +2248,115 @@ GPS location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="222"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="223"/>
         <source>Cloud credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="228"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="229"/>
         <source>Please tap the &apos;+&apos; button to add a dive</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="248"/>
+        <source>No dives in dive list</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DiveListView</name>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="846"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="849"/>
         <source>Expand all</source>
         <translation>Expandovať všetky</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="848"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="851"/>
         <source>Collapse all</source>
         <translation>Zredukovať všetky</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="852"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="855"/>
         <source>Collapse others</source>
         <translation>Zbaliť ostatné</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="856"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="859"/>
         <source>Remove dive(s) from trip</source>
         <translation>Vymazať ponor(y) z akcie</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="857"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="860"/>
         <source>Create new trip above</source>
         <translation>Vytvoriť novú akciu nad</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="871"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="874"/>
         <source>Add dive(s) to trip immediately above</source>
         <translation>Pridať ponor(y) do akcie hneď nad</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="873"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="876"/>
         <source>Add dive(s) to trip immediately below</source>
         <translation>Pridať ponor(y) do akcie hneď pod</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="877"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="880"/>
         <source>Merge trip with trip above</source>
         <translation>Spoj akciu s akciou nad</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="878"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="881"/>
         <source>Merge trip with trip below</source>
         <translation>Spoj akciu s akciou pod</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="882"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="885"/>
         <source>Delete dive(s)</source>
         <translation>Zmazať ponor(y)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="884"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="887"/>
         <source>Mark dive(s) invalid</source>
         <translation>Neplatný ponor(y)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="888"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="891"/>
         <source>Merge selected dives</source>
         <translation>Spojiť vybraté ponory</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="890"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="893"/>
         <source>Renumber dive(s)</source>
         <translation>Prečíslovanie ponorov</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="891"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="894"/>
         <source>Shift dive times</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="892"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="895"/>
         <source>Split selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="893"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="896"/>
         <source>Load image(s) from file(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="894"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="897"/>
         <source>Load image(s) from web</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="917"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="919"/>
         <source>Open image files</source>
         <translation>Otvoriť súbory s obrázkami</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="917"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="919"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>Grafické súbory (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -2329,56 +2377,6 @@ GPS location:</source>
 <context>
     <name>DiveLogExportDialog</name>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="103"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="351"/>
-        <source>Export format</source>
-        <translation>Export formát</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="134"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="353"/>
-        <source>UDDF</source>
-        <translation>UDDF</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="187"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="358"/>
-        <source>Worldmap</source>
-        <translation>Mapa sveta</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="197"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="359"/>
-        <source>I&amp;mage depths</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="243"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="360"/>
-        <source>Selection</source>
-        <translation>Výber</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="252"/>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="346"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="361"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="372"/>
-        <source>Selected dives</source>
-        <translation>Vybrané ponory</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="262"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="362"/>
-        <source>All dives</source>
-        <translation>Všetky ponory</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="306"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="396"/>
-        <source>HTML</source>
-        <translation>HTML</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="14"/>
         <location filename="../build/ui_divelogexportdialog.h" line="349"/>
         <source>Export dive log files</source>
@@ -2391,12 +2389,24 @@ GPS location:</source>
         <translation>Všeobecný export</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="103"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="351"/>
+        <source>Export format</source>
+        <translation>Export formát</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="115"/>
         <location filename="../build/ui_divelogexportdialog.h" line="352"/>
         <source>Subsurface &amp;XML</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="134"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="353"/>
+        <source>UDDF</source>
+        <translation>UDDF</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="147"/>
         <location filename="../build/ui_divelogexportdialog.h" line="354"/>
         <source>di&amp;velogs.de</source>
@@ -2421,238 +2431,297 @@ GPS location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="275"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="187"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="358"/>
+        <source>Worldmap</source>
+        <translation>Mapa sveta</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="197"/>
+        <source>TeX</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="207"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="359"/>
+        <source>I&amp;mage depths</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="253"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="360"/>
+        <source>Selection</source>
+        <translation>Výber</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="262"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="356"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="361"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="372"/>
+        <source>Selected dives</source>
+        <translation>Vybrané ponory</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="272"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="362"/>
+        <source>All dives</source>
+        <translation>Všetky ponory</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="285"/>
         <location filename="../build/ui_divelogexportdialog.h" line="363"/>
         <source>CSV units</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="288"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="298"/>
         <location filename="../build/ui_divelogexportdialog.h" line="366"/>
         <source>Metric</source>
         <translation>Metrický</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="293"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="303"/>
         <location filename="../build/ui_divelogexportdialog.h" line="367"/>
         <source>Imperial</source>
         <translation>Imperiálny</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="324"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="316"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="396"/>
+        <source>HTML</source>
+        <translation>HTML</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="334"/>
         <location filename="../build/ui_divelogexportdialog.h" line="370"/>
         <source>General settings</source>
         <translation>Obecné nastavenia</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="330"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="340"/>
         <location filename="../build/ui_divelogexportdialog.h" line="371"/>
         <source>Subsurface numbers</source>
         <translation>Subsurface čísla</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="359"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="369"/>
         <location filename="../build/ui_divelogexportdialog.h" line="373"/>
         <source>Export yearly statistics</source>
         <translation>Export ročných štatistík</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="375"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="385"/>
         <location filename="../build/ui_divelogexportdialog.h" line="374"/>
         <source>All di&amp;ves</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="385"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="395"/>
         <location filename="../build/ui_divelogexportdialog.h" line="375"/>
         <source>Export list only</source>
         <translation>Export zoznamu</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="392"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="402"/>
         <location filename="../build/ui_divelogexportdialog.h" line="376"/>
         <source>Export photos</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="408"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="418"/>
         <location filename="../build/ui_divelogexportdialog.h" line="377"/>
         <source>Style options</source>
         <translation>Nastavenia štýlov</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="423"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="433"/>
         <location filename="../build/ui_divelogexportdialog.h" line="378"/>
         <source>Font</source>
         <translation>Font</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="433"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="443"/>
         <location filename="../build/ui_divelogexportdialog.h" line="379"/>
         <source>Font size</source>
         <translation>Veľkosť fontu</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="444"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="454"/>
         <location filename="../build/ui_divelogexportdialog.h" line="382"/>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="449"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="459"/>
         <location filename="../build/ui_divelogexportdialog.h" line="383"/>
         <source>10</source>
         <translation>10</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="454"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="464"/>
         <location filename="../build/ui_divelogexportdialog.h" line="384"/>
         <source>12</source>
         <translation>12</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="459"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="469"/>
         <location filename="../build/ui_divelogexportdialog.h" line="385"/>
         <source>14</source>
         <translation>14</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="464"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="474"/>
         <location filename="../build/ui_divelogexportdialog.h" line="386"/>
         <source>16</source>
         <translation>16</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="469"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="479"/>
         <location filename="../build/ui_divelogexportdialog.h" line="387"/>
         <source>18</source>
         <translation>18</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="474"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="484"/>
         <location filename="../build/ui_divelogexportdialog.h" line="388"/>
         <source>20</source>
         <translation>20</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="482"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="492"/>
         <location filename="../build/ui_divelogexportdialog.h" line="390"/>
         <source>Theme</source>
         <translation>Téma</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="493"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="503"/>
         <location filename="../build/ui_divelogexportdialog.h" line="393"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="95"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="99"/>
         <source>Light</source>
         <translation>Svetlo</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="498"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="508"/>
         <location filename="../build/ui_divelogexportdialog.h" line="394"/>
         <source>Sand</source>
         <translation>Piesok</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="134"/>
-        <source>UDDF files (*.uddf *.UDDF)</source>
-        <translation>UDDF súbory (*.uddf *.UDDF)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="142"/>
-        <source>CSV files (*.csv *.CSV)</source>
-        <translation>CSV súbory (*.csv *.CSV)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="74"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="76"/>
         <source>Generic format that is used for data exchange between a variety of diving related programs.</source>
         <translation>Všeobecný formát používaný pre výmenu dát medzi rôznymi potápačskými programami.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="76"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="78"/>
         <source>Comma separated values describing the dive profile.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="78"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="80"/>
         <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="80"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="82"/>
         <source>Send the dive data to divelogs.de website.</source>
         <translation>Odoslať dáta o ponore na stránku divelogs.de</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="82"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="84"/>
         <source>Send the dive data to dive-share.appspot.com website</source>
         <translation>Odoslať dáta o ponore na stránku dive-share.appspot.com</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="84"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="86"/>
         <source>HTML export of the dive locations, visualized on a world map.</source>
         <translation>HTML export potápačskej lokality zobrazenej na mape sveta.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="86"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="88"/>
         <source>Subsurface native XML format.</source>
         <translation>Subsurface XML formát.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="88"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="90"/>
         <source>Write depths of images to file.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="133"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="92"/>
+        <source>Write dive as TeX macros to file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="137"/>
         <source>Export UDDF file as</source>
         <translation>Exportovať UDDF súbor ako</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="137"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/>
+        <source>UDDF files (*.uddf *.UDDF)</source>
+        <translation>UDDF súbory (*.uddf *.UDDF)</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divelogexportdialog.cpp" line="141"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="145"/>
         <source>Export CSV file as</source>
         <translation>Exportovať CSV súbor ako</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="148"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="142"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="146"/>
+        <source>CSV files (*.csv *.CSV)</source>
+        <translation>CSV súbory (*.csv *.CSV)</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="152"/>
         <source>Export world map</source>
         <translation>Exportovať mapu sveta</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="149"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="169"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="153"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="177"/>
         <source>HTML files (*.html)</source>
         <translation>HTML súbory (*.html)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="153"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="157"/>
         <source>Export Subsurface XML</source>
         <translation>Exportovať </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="158"/>
         <source>XML files (*.xml *.ssrf)</source>
         <translation>XML súbory (*.xml *.ssrf)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="162"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="166"/>
         <source>Save image depths</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="168"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="170"/>
+        <source>Export to TeX file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="170"/>
+        <source>TeX files (*.tex)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="176"/>
         <source>Export HTML files as</source>
         <translation>Exportovať HTML súbor ako</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="184"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="192"/>
         <source>Please wait, exporting...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="219"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="227"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="311"/>
         <source>Can&apos;t open file %s</source>
         <translation>Neviem otvoriť súbor %s</translation>
     </message>
@@ -2666,25 +2735,6 @@ GPS location:</source>
         <translation>Import log súboru</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="643"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="727"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="856"/>
-        <source>Time</source>
-        <translation>Čas</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.ui" line="127"/>
-        <location filename="../build/ui_divelogimportdialog.h" line="164"/>
-        <source>Metric</source>
-        <translation>Metrický</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.ui" line="132"/>
-        <location filename="../build/ui_divelogimportdialog.h" line="165"/>
-        <source>Imperial</source>
-        <translation>Imperiálny</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divelogimportdialog.ui" line="89"/>
         <location filename="../build/ui_divelogimportdialog.h" line="152"/>
         <source>dd.mm.yyyy</source>
@@ -2703,74 +2753,6 @@ GPS location:</source>
         <translation>rrrr-mm-dd</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.ui" line="155"/>
-        <location filename="../build/ui_divelogimportdialog.h" line="167"/>
-        <source>Drag the tags above to each corresponding column below</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="641"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="729"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="852"/>
-        <source>Dive #</source>
-        <translation>Ponor #</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="642"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="723"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="854"/>
-        <source>Date</source>
-        <translation>Dátum</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="644"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="858"/>
-        <source>Duration</source>
-        <translation>Dĺžka (min)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="655"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="862"/>
-        <source>GPS</source>
-        <translation>GPS</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="645"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="864"/>
-        <source>Max. depth</source>
-        <translation>Max. hĺbka</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="646"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="866"/>
-        <source>Avg. depth</source>
-        <translation>Priemerná hĺbka</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="658"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="872"/>
-        <source>Suit</source>
-        <translation>Oblek</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="663"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="878"/>
-        <source>Tags</source>
-        <translation>Značky</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="652"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="894"/>
-        <source>O₂</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="653"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="896"/>
-        <source>He</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divelogimportdialog.ui" line="108"/>
         <location filename="../build/ui_divelogimportdialog.h" line="158"/>
         <source>Seconds</source>
@@ -2789,183 +2771,269 @@ GPS location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="654"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="860"/>
-        <source>Location</source>
-        <translation>Miesto</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.ui" line="127"/>
+        <location filename="../build/ui_divelogimportdialog.h" line="164"/>
+        <source>Metric</source>
+        <translation>Metrický</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.ui" line="132"/>
+        <location filename="../build/ui_divelogimportdialog.h" line="165"/>
+        <source>Imperial</source>
+        <translation>Imperiálny</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.ui" line="155"/>
+        <location filename="../build/ui_divelogimportdialog.h" line="167"/>
+        <source>Drag the tags above to each corresponding column below</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="354"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="499"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="505"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="355"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="528"/>
         <source>Tab</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="575"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="598"/>
         <source>Some column headers were pre-populated; please drag and drop the headers so they match the column they are in.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="613"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="731"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="782"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="848"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="636"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="761"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="857"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="925"/>
         <source>Sample time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="615"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="733"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="784"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="638"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="763"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="859"/>
         <source>Sample depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="617"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="735"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="786"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="640"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="765"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="861"/>
         <source>Sample temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="621"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="739"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="790"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="642"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="767"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="863"/>
+        <source>Sample pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="644"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="769"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="865"/>
         <source>Sample sensor1 pO₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="623"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="741"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="792"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="646"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="771"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="867"/>
         <source>Sample sensor2 pO₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="625"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="743"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="794"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="648"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="773"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="869"/>
         <source>Sample sensor3 pO₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="633"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="751"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="802"/>
-        <source>Sample stopdepth</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="650"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="775"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="871"/>
+        <source>Sample CNS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="637"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="755"/>
-        <source>Sample setpoint</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="652"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="777"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="873"/>
+        <source>Sample NDL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="619"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="737"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="788"/>
-        <source>Sample pO₂</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="654"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="779"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="875"/>
+        <source>Sample TTS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="627"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="745"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="796"/>
-        <source>Sample CNS</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="656"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="781"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="877"/>
+        <source>Sample stopdepth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="629"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="747"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="798"/>
-        <source>Sample NDL</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="658"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="783"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="879"/>
+        <source>Sample pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="631"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="749"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="800"/>
-        <source>Sample TTS</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="660"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="785"/>
+        <source>Sample setpoint</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="635"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="664"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="759"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="929"/>
+        <source>Dive #</source>
+        <translation>Ponor #</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="665"/>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="753"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="804"/>
-        <source>Sample pressure</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="931"/>
+        <source>Date</source>
+        <translation>Dátum</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="656"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="868"/>
-        <source>Divemaster</source>
-        <translation>Divemaster</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="666"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="757"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="933"/>
+        <source>Time</source>
+        <translation>Čas</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="657"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="870"/>
-        <source>Buddy</source>
-        <translation>Buddy</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="667"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="935"/>
+        <source>Duration</source>
+        <translation>Dĺžka (min)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="659"/>
-        <source>Rating</source>
-        <translation>Hodnotenie</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="668"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="941"/>
+        <source>Max. depth</source>
+        <translation>Max. hĺbka</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="660"/>
-        <source>Visibility</source>
-        <translation>Viditeľnosť</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="669"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="943"/>
+        <source>Avg. depth</source>
+        <translation>Priemerná hĺbka</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="661"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="874"/>
-        <source>Notes</source>
-        <translation>Poznámky</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="670"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="975"/>
+        <source>Air temp.</source>
+        <translation>Teplota vzduchu</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="662"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="876"/>
-        <source>Weight</source>
-        <translation>Hmotnosť</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="671"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="977"/>
+        <source>Water temp.</source>
+        <translation>Teplota vody</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="649"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="888"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="672"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="965"/>
         <source>Cyl. size</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="650"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="890"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="673"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="967"/>
         <source>Start pressure</source>
         <translation>Počiatočný tlak</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="651"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="892"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="674"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="969"/>
         <source>End pressure</source>
         <translation>Koncový tlak</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="647"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="898"/>
-        <source>Air temp.</source>
-        <translation>Teplota vzduchu</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="675"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="971"/>
+        <source>O₂</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="648"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="900"/>
-        <source>Water temp.</source>
-        <translation>Teplota vody</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="676"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="973"/>
+        <source>He</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="677"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="937"/>
+        <source>Location</source>
+        <translation>Miesto</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="678"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="939"/>
+        <source>GPS</source>
+        <translation>GPS</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="679"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="945"/>
+        <source>Divemaster</source>
+        <translation>Divemaster</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="680"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="947"/>
+        <source>Buddy</source>
+        <translation>Buddy</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="681"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="949"/>
+        <source>Suit</source>
+        <translation>Oblek</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="682"/>
+        <source>Rating</source>
+        <translation>Hodnotenie</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="683"/>
+        <source>Visibility</source>
+        <translation>Viditeľnosť</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="684"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="951"/>
+        <source>Notes</source>
+        <translation>Poznámky</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="685"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="953"/>
+        <source>Weight</source>
+        <translation>Hmotnosť</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="686"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="955"/>
+        <source>Tags</source>
+        <translation>Značky</translation>
     </message>
 </context>
 <context>
     <name>DiveObjectHelper</name>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="287"/>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="323"/>
         <source>%1 dive(s)</source>
         <translation type="unfinished"/>
     </message>
@@ -2973,18 +3041,18 @@ GPS location:</source>
 <context>
     <name>DivePlanner</name>
     <message>
-        <location filename="../desktop-widgets/diveplanner.ui" line="152"/>
-        <location filename="../build/ui_diveplanner.h" line="190"/>
-        <source>Altitude</source>
-        <translation>Výška</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/diveplanner.ui" line="109"/>
         <location filename="../build/ui_diveplanner.h" line="189"/>
         <source>Planned dive time</source>
         <translation>Plánovaný čas ponoru</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/diveplanner.ui" line="152"/>
+        <location filename="../build/ui_diveplanner.h" line="190"/>
+        <source>Altitude</source>
+        <translation>Výška</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/diveplanner.ui" line="159"/>
         <location filename="../build/ui_diveplanner.h" line="191"/>
         <source>ATM pressure</source>
@@ -3018,32 +3086,32 @@ GPS location:</source>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="134"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="136"/>
         <source>unknown</source>
         <translation>neznámy</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="312"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="326"/>
         <source>Final depth</source>
         <translation>Cieľová hĺbka</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="314"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="328"/>
         <source>Run time</source>
         <translation>Aktuálny čas</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="316"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="330"/>
         <source>Duration</source>
         <translation>Dĺžka (min)</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="318"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="332"/>
         <source>Used gas</source>
         <translation>Použitá zmes</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="320"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="334"/>
         <source>CC setpoint</source>
         <translation type="unfinished"/>
     </message>
@@ -3051,22 +3119,22 @@ GPS location:</source>
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="108"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="112"/>
         <source>Dive planner points</source>
         <translation>Body plánu ponoru</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="112"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="116"/>
         <source>Available gases</source>
         <translation>Zmesi k dispozícii</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="137"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="143"/>
         <source>Add dive data point</source>
         <translation>Pridať data point ponoru</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="146"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="152"/>
         <source>Save new</source>
         <translation>Uložiť nový</translation>
     </message>
@@ -3099,11 +3167,36 @@ GPS location:</source>
         <translation>Farba</translation>
     </message>
     <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="124"/>
+        <source>User entered</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="126"/>
+        <source>Cylinder index</source>
+        <translation>Index fliaš</translation>
+    </message>
+    <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="128"/>
         <source>Pressure S</source>
         <translation>Tlak S</translation>
     </message>
     <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="130"/>
+        <source>Pressure I</source>
+        <translation>Tlak I</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="132"/>
+        <source>Ceiling</source>
+        <translation>Strop</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="134"/>
+        <source>SAC</source>
+        <translation>Spotreba plynu</translation>
+    </message>
+    <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="136"/>
         <source>pN₂</source>
         <translation>pN₂</translation>
@@ -3139,49 +3232,24 @@ GPS location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="152"/>
-        <source>Heart rate</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="156"/>
-        <source>Mean depth @ s</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="150"/>
         <source>Ambient pressure</source>
         <translation>Okolitý tlak</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="154"/>
-        <source>Gradient factor</source>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="152"/>
+        <source>Heart rate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="130"/>
-        <source>Pressure I</source>
-        <translation>Tlak I</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="124"/>
-        <source>User entered</source>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="154"/>
+        <source>Gradient factor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="126"/>
-        <source>Cylinder index</source>
-        <translation>Index fliaš</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="132"/>
-        <source>Ceiling</source>
-        <translation>Strop</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="134"/>
-        <source>SAC</source>
-        <translation>Spotreba plynu</translation>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="156"/>
+        <source>Mean depth @ s</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3248,311 +3316,315 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="395"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="441"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="434"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="483"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="398"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="444"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="437"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="486"/>
         <source>Date</source>
         <translation>Dátum</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="401"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="447"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="440"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="489"/>
         <source>Rating</source>
         <translation>Hodnotenie</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="404"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="443"/>
         <source>Depth</source>
         <translation>Hĺbka</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="410"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="446"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="495"/>
+        <source>Duration</source>
+        <translation>Dĺžka (min)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="449"/>
         <source>Temp</source>
         <translation>Teplota</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="413"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="452"/>
         <source>Weight</source>
         <translation>Hmotnosť</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="425"/>
-        <source>SAC</source>
-        <translation>Spotreba plynu</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
-        <source>m</source>
-        <translation>m</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
-        <source>ft</source>
-        <translation>ft</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
-        <source>Weight(%1)</source>
-        <translation>Záťaž(%1)</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="416"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="462"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="455"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="504"/>
         <source>Suit</source>
         <translation>Oblek</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="419"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="465"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="458"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="507"/>
         <source>Cyl</source>
         <translation>Fľaša</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="422"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="468"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="461"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="510"/>
         <source>Gas</source>
         <translation>Zmes</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
-        <source>SAC(%1)</source>
-        <translation>SAC(%1)</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="464"/>
+        <source>SAC</source>
+        <translation>Spotreba plynu</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
-        <source>/min</source>
-        <translation>/min</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="467"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="518"/>
+        <source>OTU</source>
+        <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="431"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="479"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="470"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="521"/>
         <source>Max CNS</source>
         <translation>Max. CNS</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="434"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="482"/>
-        <source>Location</source>
-        <translation>Miesto</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
+        <source>Photos</source>
+        <translation>Fotografie</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
-        <source>kg</source>
-        <translation>kg</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="476"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="527"/>
+        <source>Location</source>
+        <translation>Miesto</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="492"/>
         <source>Depth(%1)</source>
         <translation>Hĺbka(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="407"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="453"/>
-        <source>Duration</source>
-        <translation>Dĺžka (min)</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="492"/>
+        <source>m</source>
+        <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="456"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="492"/>
+        <source>ft</source>
+        <translation>ft</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="498"/>
         <source>Temp(%1%2)</source>
         <translation>Tepl(%1%2)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="501"/>
+        <source>Weight(%1)</source>
+        <translation>Záťaž(%1)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="501"/>
+        <source>kg</source>
+        <translation>kg</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="501"/>
         <source>lbs</source>
         <translation>US libra</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="428"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="476"/>
-        <source>OTU</source>
-        <translation>OTU</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="515"/>
+        <source>SAC(%1)</source>
+        <translation>SAC(%1)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="515"/>
+        <source>/min</source>
+        <translation>/min</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="524"/>
+        <source>Photos before/during/after dive</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="164"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="165"/>
         <source>no dives were selected</source>
         <translation>neboli vybrané žiadne ponory</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="174"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="175"/>
         <source>stylesheet to export to divelogs.de is not found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="184"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="185"/>
         <source>failed to create zip file for upload: %s</source>
         <translation>vytvorenie zip súboru pre upload zlyhalo: %s</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="236"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="237"/>
         <source>internal error</source>
         <translation>interná chyba</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="244"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="245"/>
         <source>Conversion of dive %1 to divelogs.de format failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="272"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="273"/>
         <source>error writing zip file: %s zip error %d system error %d - %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="745"/>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="935"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="936"/>
         <source>Done</source>
         <translation>Hotovo</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="778"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="779"/>
         <source>Uploading dive list...</source>
         <translation>Nahrávanie zoznamu ponorov...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="810"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="811"/>
         <source>Downloading dive list...</source>
         <translation>Sťahovanie zoznamu ponorov...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="851"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="852"/>
         <source>Downloading %1 dives...</source>
         <translation>Sťahovanie %1 ponorov...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="885"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="886"/>
         <source>Download finished - %1</source>
         <translation>Sťahovanie ukončené %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="899"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="900"/>
         <source>Problem with download</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="900"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="901"/>
         <source>The archive could not be opened:
 </source>
         <translation>Nemôžem otvoriť archív:
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="909"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="910"/>
         <source>Corrupted download</source>
         <translation>Poškodené sťahovanie</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="910"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="911"/>
         <source>The archive could not be opened:
 %1</source>
         <translation>Nemôžem otvoriť archív:
 %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="937"/>
+        <source>Upload finished</source>
+        <translation>Nahrávanie ukončené</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="950"/>
         <source>Upload failed</source>
         <translation>Nahrávanie zlýhalo</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="952"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="953"/>
         <source>Upload successful</source>
         <translation>Úspešne nahrávanie</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="955"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="956"/>
         <source>Login failed</source>
         <translation>Prihlásenie zlýhalo</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="958"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="959"/>
         <source>Cannot parse response</source>
         <translation>Neviem spracovať odpoveď</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="970"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="971"/>
         <source>Error: %1</source>
         <translation>Chyba: %1</translation>
     </message>
-    <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="936"/>
-        <source>Upload finished</source>
-        <translation>Nahrávanie ukončené</translation>
-    </message>
 </context>
 <context>
     <name>DownloadFromDCWidget</name>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="185"/>
-        <source>Error</source>
-        <translation>Chyba</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="436"/>
-        <source>Retry</source>
-        <translation>Skús znovu</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="280"/>
-        <source>Find Uemis dive computer</source>
-        <translation>Hladať Uemis DC</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="101"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="107"/>
         <source>Download</source>
         <translation>Stiahnutie</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="104"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="110"/>
         <source>Choose Bluetooth download mode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="382"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="191"/>
+        <source>Error</source>
+        <translation>Chyba</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="286"/>
+        <source>Find Uemis dive computer</source>
+        <translation>Hladať Uemis DC</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="392"/>
         <source>Choose file for divecomputer download logfile</source>
         <translation>Zvoľ meno log súboru pre divecomputer sťahovanie</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="383"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="393"/>
         <source>Log files (*.log)</source>
         <translation>Log súbory</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="398"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="408"/>
         <source>Warning</source>
         <translation>Upozornenie</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="399"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="409"/>
         <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source>
         <translation>Uloženie dump súboru pre libdivecomputer spôsobí nenahratie ponorov do zoznamu ponorov.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="410"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="420"/>
         <source>Choose file for divecomputer binary dump file</source>
         <translation>Zvoľ meno súboru pre divecomputer dump</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="411"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="421"/>
         <source>Dump files (*.bin)</source>
         <translation>Dump súbory</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="446"/>
+        <source>Retry</source>
+        <translation>Skús znovu</translation>
+    </message>
 </context>
 <context>
     <name>DownloadFromDiveComputer</name>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="139"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="275"/>
-        <source>Vendor</source>
-        <translation>Výrobca</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="14"/>
         <location filename="../build/ui_downloadfromdivecomputer.h" line="265"/>
         <source>Download from dive computer</source>
@@ -3565,17 +3637,6 @@ p, li { white-space: pre-wrap; }
         <translation>Zariadenie alebo bod pripojenia</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="122"/>
-        <source>Choose Bluetooth download mode</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="149"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="276"/>
-        <source>Dive computer</source>
-        <translation>Počítač</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="66"/>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="101"/>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="115"/>
@@ -3599,11 +3660,46 @@ p, li { white-space: pre-wrap; }
         <translation>Vždy preferuj nahraté ponory</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="87"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="270"/>
+        <source>Download into new trip</source>
+        <translation>Nahratie do novej akcie</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="94"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="271"/>
+        <source>Save libdivecomputer logfile</source>
+        <translation>Uložiť libdivecomputer logfile</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="108"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="273"/>
+        <source>Save libdivecomputer dumpfile</source>
+        <translation>Uložiť </translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="122"/>
+        <source>Choose Bluetooth download mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="129"/>
         <source>Select a remote Bluetooth device.</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="139"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="275"/>
+        <source>Vendor</source>
+        <translation>Výrobca</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="149"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="276"/>
+        <source>Dive computer</source>
+        <translation>Počítač</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/>
         <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="52"/>
         <location filename="../build/ui_downloadfromdivecomputer.h" line="277"/>
@@ -3611,18 +3707,6 @@ p, li { white-space: pre-wrap; }
         <translation>Stiahnutie</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="284"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="281"/>
-        <source>OK</source>
-        <translation>OK</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="291"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="282"/>
-        <source>Cancel</source>
-        <translation>Zrušiť</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="226"/>
         <location filename="../build/ui_downloadfromdivecomputer.h" line="278"/>
         <source>Downloaded dives</source>
@@ -3641,22 +3725,16 @@ p, li { white-space: pre-wrap; }
         <translation>Zrušiť výber</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="94"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="271"/>
-        <source>Save libdivecomputer logfile</source>
-        <translation>Uložiť libdivecomputer logfile</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="108"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="273"/>
-        <source>Save libdivecomputer dumpfile</source>
-        <translation>Uložiť </translation>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="284"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="281"/>
+        <source>OK</source>
+        <translation>OK</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="87"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="270"/>
-        <source>Download into new trip</source>
-        <translation>Nahratie do novej akcie</translation>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="291"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="282"/>
+        <source>Cancel</source>
+        <translation>Zrušiť</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="16"/>
@@ -3746,12 +3824,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="297"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="242"/>
         <source>To disconnect Subsurface from your Facebook account, use the button below</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="306"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="251"/>
         <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source>
         <translation type="unfinished"/>
     </message>
@@ -3759,22 +3837,22 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>FacebookManager</name>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="266"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="211"/>
         <source>Photo upload sucessfull</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="267"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="212"/>
         <source>Your dive profile was updated to Facebook.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="271"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="216"/>
         <source>Photo upload failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="272"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="217"/>
         <source>Your dive profile was not updated to Facebook, 
  please send the following to the developer. 
 </source>
@@ -3834,17 +3912,25 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>FirmwareUpdateThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1750"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1739"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Daná funkcia pre zvolený počítač zatiaľ nie je k dispozícii.</translation>
     </message>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1755"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1744"/>
         <source>Firmware update failed!</source>
         <translation>Obnova firmware zlyhala!</translation>
     </message>
 </context>
 <context>
+    <name>GlobalDrawer</name>
+    <message>
+        <location filename="../mobile-widgets/qml/kirigami/src/controls/GlobalDrawer.qml" line="364"/>
+        <source>Back</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>GlobeGPS</name>
     <message>
         <location filename="../desktop-widgets/globe.cpp" line="124"/>
@@ -3860,27 +3946,27 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="40"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="32"/>
         <source>Date: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="50"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="42"/>
         <source>Name: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="60"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="52"/>
         <source>Latitude: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="69"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="61"/>
         <source>Longitude: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="113"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="105"/>
         <source>List of stored GPS fixes</source>
         <translation type="unfinished"/>
     </message>
@@ -3909,7 +3995,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>LocationFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="648"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="646"/>
         <source>Location: </source>
         <translation>Miesto:</translation>
     </message>
@@ -3950,7 +4036,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>LocationFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="299"/>
+        <location filename="../qt-models/filtermodels.cpp" line="304"/>
         <source>No location set</source>
         <translation type="unfinished"/>
     </message>
@@ -4071,20 +4157,55 @@ p, li { white-space: pre-wrap; }
     </message>
 </context>
 <context>
-    <name>MainForm.ui</name>
+    <name>MainTab</name>
     <message>
-        <location filename="../packaging/ios/Subsurface-mobile/MainForm.ui.qml" line="17"/>
-        <source>Press Me 1</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/maintab.ui" line="18"/>
+        <location filename="../desktop-widgets/maintab.ui" line="439"/>
+        <location filename="../build/ui_maintab.h" line="961"/>
+        <location filename="../build/ui_maintab.h" line="963"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="539"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="571"/>
+        <source>Notes</source>
+        <translation>Poznámky</translation>
     </message>
     <message>
-        <location filename="../packaging/ios/Subsurface-mobile/MainForm.ui.qml" line="22"/>
-        <source>Press Me 2</source>
+        <location filename="../desktop-widgets/maintab.ui" line="21"/>
+        <location filename="../build/ui_maintab.h" line="964"/>
+        <source>General notes about the current selection</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>MainTab</name>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="92"/>
+        <location filename="../desktop-widgets/maintab.ui" line="646"/>
+        <location filename="../build/ui_maintab.h" line="947"/>
+        <location filename="../build/ui_maintab.h" line="967"/>
+        <source>Date</source>
+        <translation>Dátum</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="102"/>
+        <location filename="../build/ui_maintab.h" line="948"/>
+        <source>Time</source>
+        <translation>Čas</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="112"/>
+        <location filename="../desktop-widgets/maintab.ui" line="836"/>
+        <location filename="../build/ui_maintab.h" line="949"/>
+        <location filename="../build/ui_maintab.h" line="987"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="306"/>
+        <source>Air temp.</source>
+        <translation>Teplota vzduchu</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="122"/>
+        <location filename="../desktop-widgets/maintab.ui" line="855"/>
+        <location filename="../build/ui_maintab.h" line="950"/>
+        <location filename="../build/ui_maintab.h" line="989"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="307"/>
+        <source>Water temp.</source>
+        <translation>Teplota vody</translation>
+    </message>
     <message>
         <location filename="../desktop-widgets/maintab.ui" line="184"/>
         <location filename="../build/ui_maintab.h" line="951"/>
@@ -4093,6 +4214,17 @@ p, li { white-space: pre-wrap; }
         <translation>Miesto</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="214"/>
+        <source>Edit dive site</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="217"/>
+        <location filename="../build/ui_maintab.h" line="953"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="252"/>
         <location filename="../build/ui_maintab.h" line="954"/>
         <source>Divemaster</source>
@@ -4105,12 +4237,6 @@ p, li { white-space: pre-wrap; }
         <translation>Buddy</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.ui" line="387"/>
-        <location filename="../build/ui_maintab.h" line="959"/>
-        <source>Tags</source>
-        <translation>Značky</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/maintab.ui" line="308"/>
         <location filename="../build/ui_maintab.h" line="956"/>
         <source>Rating</source>
@@ -4129,57 +4255,18 @@ p, li { white-space: pre-wrap; }
         <translation>Oblek</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="387"/>
+        <location filename="../build/ui_maintab.h" line="959"/>
+        <source>Tags</source>
+        <translation>Značky</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="397"/>
         <location filename="../build/ui_maintab.h" line="960"/>
         <source>Dive mode</source>
         <translation>Mód ponoru</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.ui" line="112"/>
-        <location filename="../desktop-widgets/maintab.ui" line="836"/>
-        <location filename="../build/ui_maintab.h" line="949"/>
-        <location filename="../build/ui_maintab.h" line="987"/>
-        <location filename="../desktop-widgets/maintab.cpp" line="306"/>
-        <source>Air temp.</source>
-        <translation>Teplota vzduchu</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="122"/>
-        <location filename="../desktop-widgets/maintab.ui" line="855"/>
-        <location filename="../build/ui_maintab.h" line="950"/>
-        <location filename="../build/ui_maintab.h" line="989"/>
-        <location filename="../desktop-widgets/maintab.cpp" line="307"/>
-        <source>Water temp.</source>
-        <translation>Teplota vody</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="18"/>
-        <location filename="../desktop-widgets/maintab.ui" line="439"/>
-        <location filename="../build/ui_maintab.h" line="961"/>
-        <location filename="../build/ui_maintab.h" line="963"/>
-        <location filename="../desktop-widgets/maintab.cpp" line="539"/>
-        <location filename="../desktop-widgets/maintab.cpp" line="571"/>
-        <source>Notes</source>
-        <translation>Poznámky</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="21"/>
-        <location filename="../build/ui_maintab.h" line="964"/>
-        <source>General notes about the current selection</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="214"/>
-        <source>Edit dive site</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="217"/>
-        <location filename="../build/ui_maintab.h" line="953"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/maintab.ui" line="491"/>
         <location filename="../build/ui_maintab.h" line="965"/>
         <source>Equipment</source>
@@ -4204,6 +4291,12 @@ p, li { white-space: pre-wrap; }
         <translation>Informácia o ponore</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="665"/>
+        <location filename="../build/ui_maintab.h" line="969"/>
+        <source>Interval</source>
+        <translation>Povrch. interval</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="684"/>
         <location filename="../build/ui_maintab.h" line="971"/>
         <source>Gases used</source>
@@ -4216,18 +4309,38 @@ p, li { white-space: pre-wrap; }
         <translation>Spotrebovaná zmes</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="722"/>
+        <location filename="../desktop-widgets/maintab.ui" line="1094"/>
+        <location filename="../build/ui_maintab.h" line="975"/>
+        <location filename="../build/ui_maintab.h" line="1003"/>
+        <source>SAC</source>
+        <translation>Spotreba plynu</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="741"/>
         <location filename="../build/ui_maintab.h" line="977"/>
         <source>CNS</source>
         <translation>CNS</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="760"/>
+        <location filename="../build/ui_maintab.h" line="979"/>
+        <source>OTU</source>
+        <translation>OTU</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="779"/>
         <location filename="../build/ui_maintab.h" line="981"/>
         <source>Max. depth</source>
         <translation>Max. hĺbka</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="798"/>
+        <location filename="../build/ui_maintab.h" line="983"/>
+        <source>Avg. depth</source>
+        <translation>Priemerná hĺbka</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="817"/>
         <location filename="../build/ui_maintab.h" line="985"/>
         <source>Air pressure</source>
@@ -4240,82 +4353,6 @@ p, li { white-space: pre-wrap; }
         <translation>Čas ponoru</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.ui" line="933"/>
-        <location filename="../build/ui_maintab.h" line="1007"/>
-        <source>Simple statistics about the selection</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1039"/>
-        <location filename="../build/ui_maintab.h" line="999"/>
-        <source>Total time</source>
-        <translation>Celkový čas</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1106"/>
-        <location filename="../build/ui_maintab.h" line="1004"/>
-        <source>Gas consumption</source>
-        <translation>Spotreba plynu</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1151"/>
-        <location filename="../build/ui_maintab.h" line="1009"/>
-        <source>All photos from the current selection</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1177"/>
-        <location filename="../build/ui_maintab.h" line="1010"/>
-        <source>Extra data</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1180"/>
-        <location filename="../build/ui_maintab.h" line="1011"/>
-        <source>Adittional data from the dive computer</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="92"/>
-        <location filename="../desktop-widgets/maintab.ui" line="646"/>
-        <location filename="../build/ui_maintab.h" line="947"/>
-        <location filename="../build/ui_maintab.h" line="967"/>
-        <source>Date</source>
-        <translation>Dátum</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="102"/>
-        <location filename="../build/ui_maintab.h" line="948"/>
-        <source>Time</source>
-        <translation>Čas</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="665"/>
-        <location filename="../build/ui_maintab.h" line="969"/>
-        <source>Interval</source>
-        <translation>Povrch. interval</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="722"/>
-        <location filename="../desktop-widgets/maintab.ui" line="1094"/>
-        <location filename="../build/ui_maintab.h" line="975"/>
-        <location filename="../build/ui_maintab.h" line="1003"/>
-        <source>SAC</source>
-        <translation>Spotreba plynu</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="798"/>
-        <location filename="../build/ui_maintab.h" line="983"/>
-        <source>Avg. depth</source>
-        <translation>Priemerná hĺbka</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="760"/>
-        <location filename="../build/ui_maintab.h" line="979"/>
-        <source>OTU</source>
-        <translation>OTU</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/maintab.ui" line="893"/>
         <location filename="../build/ui_maintab.h" line="993"/>
         <source>Salinity</source>
@@ -4328,22 +4365,34 @@ p, li { white-space: pre-wrap; }
         <translation>Štatistiky</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="933"/>
+        <location filename="../build/ui_maintab.h" line="1007"/>
+        <source>Simple statistics about the selection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="986"/>
         <location filename="../build/ui_maintab.h" line="996"/>
         <source>Depth</source>
         <translation>Hĺbka</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="998"/>
+        <location filename="../build/ui_maintab.h" line="997"/>
+        <source>Duration</source>
+        <translation>Dĺžka (min)</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="1027"/>
         <location filename="../build/ui_maintab.h" line="998"/>
         <source>Temperature</source>
         <translation>Teplota</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.ui" line="998"/>
-        <location filename="../build/ui_maintab.h" line="997"/>
-        <source>Duration</source>
-        <translation>Dĺžka (min)</translation>
+        <location filename="../desktop-widgets/maintab.ui" line="1039"/>
+        <location filename="../build/ui_maintab.h" line="999"/>
+        <source>Total time</source>
+        <translation>Celkový čas</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/maintab.ui" line="1058"/>
@@ -4352,20 +4401,34 @@ p, li { white-space: pre-wrap; }
         <translation>Ponory</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="1106"/>
+        <location filename="../build/ui_maintab.h" line="1004"/>
+        <source>Gas consumption</source>
+        <translation>Spotreba plynu</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="1148"/>
         <location filename="../build/ui_maintab.h" line="1008"/>
         <source>Photos</source>
         <translation>Fotografie</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.cpp" line="88"/>
-        <source>Cylinders</source>
-        <translation>Fľaše</translation>
+        <location filename="../desktop-widgets/maintab.ui" line="1151"/>
+        <location filename="../build/ui_maintab.h" line="1009"/>
+        <source>All photos from the current selection</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.cpp" line="92"/>
-        <source>Weights</source>
-        <translation>Závažia</translation>
+        <location filename="../desktop-widgets/maintab.ui" line="1177"/>
+        <location filename="../build/ui_maintab.h" line="1010"/>
+        <source>Extra data</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="1180"/>
+        <location filename="../build/ui_maintab.h" line="1011"/>
+        <source>Adittional data from the dive computer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/maintab.cpp" line="63"/>
@@ -4378,11 +4441,21 @@ p, li { white-space: pre-wrap; }
         <translation>Vymazať zmeny</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.cpp" line="88"/>
+        <source>Cylinders</source>
+        <translation>Fľaše</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.cpp" line="89"/>
         <source>Add cylinder</source>
         <translation>Pridaj fľašu</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.cpp" line="92"/>
+        <source>Weights</source>
+        <translation>Závažia</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.cpp" line="93"/>
         <source>Add weight system</source>
         <translation>Pridať závažia</translation>
@@ -4575,659 +4648,685 @@ vytvorene zo vzduchu a:
         <translation>&amp;Súbor</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="455"/>
-        <location filename="../build/ui_mainwindow.h" line="534"/>
-        <source>Export dive logs</source>
-        <translation>Exportovať všetko</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="510"/>
-        <location filename="../build/ui_mainwindow.h" line="542"/>
-        <source>Toggle pHe graph</source>
-        <translation>Prepnúť pHe graf</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="546"/>
-        <location filename="../build/ui_mainwindow.h" line="545"/>
-        <source>Toggle calculating all tissues</source>
-        <translation>Prepnúť výpočet všetkých tkanív</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="522"/>
-        <location filename="../build/ui_mainwindow.h" line="543"/>
-        <source>Toggle DC reported ceiling</source>
-        <translation>Prepnúť zobrazenie stropu podľa počítača</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="534"/>
-        <location filename="../build/ui_mainwindow.h" line="544"/>
-        <source>Toggle calculated ceiling</source>
-        <translation>Prepnúť na vypočítaný strop</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="606"/>
-        <location filename="../build/ui_mainwindow.h" line="550"/>
-        <source>Toggle NDL, TTS</source>
-        <translation>Prepnúť NDL, TTS</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="558"/>
-        <location filename="../build/ui_mainwindow.h" line="546"/>
-        <source>Toggle calculated ceiling with 3m increments</source>
-        <translation>Prepnúť na </translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="463"/>
-        <location filename="../build/ui_mainwindow.h" line="537"/>
-        <source>Configure &amp;dive computer</source>
-        <translation>Konfigurácia počítača</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="570"/>
-        <location filename="../build/ui_mainwindow.h" line="547"/>
-        <source>Toggle heart rate</source>
-        <translation>Prepnúť tepovú frekvenciu</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="582"/>
-        <location filename="../build/ui_mainwindow.h" line="548"/>
-        <source>Toggle MOD</source>
-        <translation>Prepnúť MOD</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="594"/>
-        <location filename="../build/ui_mainwindow.h" line="549"/>
-        <source>Toggle EAD, END, EADD</source>
-        <translation>Prepnúť </translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="618"/>
-        <location filename="../build/ui_mainwindow.h" line="551"/>
-        <source>Toggle SAC rate</source>
-        <translation>Prepnúť SAC spotrebu</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="630"/>
-        <location filename="../build/ui_mainwindow.h" line="552"/>
-        <source>Toggle ruler</source>
-        <translation>Prepnúť pravítko</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="86"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="87"/>
         <location filename="../build/ui_mainwindow.h" line="569"/>
         <source>&amp;Log</source>
         <translation>&amp;Log</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="105"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="104"/>
         <location filename="../build/ui_mainwindow.h" line="570"/>
         <source>&amp;View</source>
         <translation>&amp;Náhľad</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="121"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="120"/>
         <location filename="../build/ui_mainwindow.h" line="571"/>
         <source>&amp;Help</source>
         <translation>&amp;Help</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="130"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="129"/>
         <location filename="../build/ui_mainwindow.h" line="572"/>
         <source>&amp;Import</source>
         <translation>&amp;Import</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="139"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="138"/>
         <location filename="../build/ui_mainwindow.h" line="573"/>
         <source>&amp;Edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="144"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="143"/>
         <source>Share on</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="158"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="157"/>
         <location filename="../build/ui_mainwindow.h" line="453"/>
         <source>&amp;New logbook</source>
         <translation>&amp;Nový logbook</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="161"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="160"/>
         <location filename="../build/ui_mainwindow.h" line="455"/>
         <source>New</source>
         <translation>Nový</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="164"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="163"/>
         <location filename="../build/ui_mainwindow.h" line="457"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="169"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="168"/>
         <location filename="../build/ui_mainwindow.h" line="458"/>
         <source>&amp;Open logbook</source>
         <translation>&amp;Otvoriť logbook</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="172"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="171"/>
         <location filename="../build/ui_mainwindow.h" line="460"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="508"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="502"/>
         <source>Open</source>
         <translation>Otvor</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="175"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="174"/>
         <location filename="../build/ui_mainwindow.h" line="462"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="180"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="179"/>
         <location filename="../build/ui_mainwindow.h" line="463"/>
         <source>&amp;Save</source>
         <translation>&amp;Uložiť</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="183"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="182"/>
         <location filename="../build/ui_mainwindow.h" line="465"/>
         <source>Save</source>
         <translation>Uložiť</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="186"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="185"/>
         <location filename="../build/ui_mainwindow.h" line="467"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="191"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="190"/>
         <location filename="../build/ui_mainwindow.h" line="468"/>
         <source>Sa&amp;ve as</source>
         <translation>Uložiť a&amp;ko</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="194"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="193"/>
         <location filename="../build/ui_mainwindow.h" line="470"/>
         <source>Save as</source>
         <translation>Uložiť ako</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="197"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="196"/>
         <location filename="../build/ui_mainwindow.h" line="472"/>
         <source>Ctrl+Shift+S</source>
         <translation>Ctrl+Shift+S</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="202"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="201"/>
         <location filename="../build/ui_mainwindow.h" line="473"/>
         <source>&amp;Close</source>
         <translation>&amp;Zatvoriť</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="205"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="204"/>
         <location filename="../build/ui_mainwindow.h" line="475"/>
         <source>Close</source>
         <translation>Zatvoriť</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="208"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="207"/>
         <location filename="../build/ui_mainwindow.h" line="477"/>
         <source>Ctrl+W</source>
         <translation>Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="221"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="212"/>
+        <location filename="../build/ui_mainwindow.h" line="478"/>
+        <source>&amp;Print</source>
+        <translation>&amp;Tlačiť</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="215"/>
+        <location filename="../build/ui_mainwindow.h" line="479"/>
+        <source>Ctrl+P</source>
+        <translation>Ctrl+P</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="220"/>
         <location filename="../build/ui_mainwindow.h" line="480"/>
         <source>P&amp;references</source>
         <translation>Na&amp;stavenia</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="251"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="223"/>
+        <location filename="../build/ui_mainwindow.h" line="481"/>
+        <source>Ctrl+,</source>
+        <translation>Ctrl+,</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="231"/>
+        <location filename="../build/ui_mainwindow.h" line="482"/>
+        <source>&amp;Quit</source>
+        <translation>&amp;Ukončiť</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="234"/>
+        <location filename="../build/ui_mainwindow.h" line="483"/>
+        <source>Ctrl+Q</source>
+        <translation>Ctrl+Q</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="242"/>
+        <location filename="../build/ui_mainwindow.h" line="484"/>
+        <source>Import from &amp;dive computer</source>
+        <translation>Import z &amp;počítača</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="245"/>
+        <location filename="../build/ui_mainwindow.h" line="485"/>
+        <source>Ctrl+D</source>
+        <translation>Ctrl+D</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="250"/>
         <location filename="../build/ui_mainwindow.h" line="486"/>
         <source>Import &amp;GPS data from Subsurface web service</source>
         <translation>Import &amp;GPS data zo Subsurface webu</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="259"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="253"/>
+        <location filename="../build/ui_mainwindow.h" line="487"/>
+        <source>Ctrl+G</source>
+        <translation>Ctrl+G</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="258"/>
         <location filename="../build/ui_mainwindow.h" line="488"/>
         <source>Edit device &amp;names</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="272"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="263"/>
+        <location filename="../build/ui_mainwindow.h" line="489"/>
+        <source>&amp;Add dive</source>
+        <translation>&amp;Pridanie ponoru</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="266"/>
+        <location filename="../build/ui_mainwindow.h" line="490"/>
+        <source>Ctrl++</source>
+        <translation>Ctrl++</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="271"/>
         <location filename="../build/ui_mainwindow.h" line="491"/>
         <source>&amp;Edit dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="277"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="276"/>
         <location filename="../build/ui_mainwindow.h" line="492"/>
         <source>&amp;Copy dive components</source>
         <translation>&amp;Kopírovať údaje z ponoru</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="280"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="279"/>
         <location filename="../build/ui_mainwindow.h" line="493"/>
         <source>Ctrl+C</source>
         <translation>Ctrl+C</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="285"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="284"/>
         <location filename="../build/ui_mainwindow.h" line="494"/>
         <source>&amp;Paste dive components</source>
         <translation>&amp;Vložiť údaje z ponoru</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="288"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="287"/>
         <location filename="../build/ui_mainwindow.h" line="495"/>
         <source>Ctrl+V</source>
         <translation>Ctrl+V</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="325"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="292"/>
+        <location filename="../build/ui_mainwindow.h" line="496"/>
+        <source>&amp;Renumber</source>
+        <translation>&amp;Prečisluj</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="295"/>
+        <location filename="../build/ui_mainwindow.h" line="497"/>
+        <source>Ctrl+R</source>
+        <translation>Ctrl+R</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="303"/>
+        <location filename="../build/ui_mainwindow.h" line="498"/>
+        <source>Auto &amp;group</source>
+        <translation>&amp;Automatické zoskupovanie</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="308"/>
+        <location filename="../build/ui_mainwindow.h" line="499"/>
+        <source>&amp;Yearly statistics</source>
+        <translation>&amp;Ročné štatistiky</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="311"/>
+        <location filename="../build/ui_mainwindow.h" line="500"/>
+        <source>Ctrl+Y</source>
+        <translation>Ctrl+Y</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="316"/>
+        <location filename="../build/ui_mainwindow.h" line="501"/>
+        <source>&amp;Dive list</source>
+        <translation>Zoznam &amp;ponorov</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="319"/>
+        <location filename="../build/ui_mainwindow.h" line="502"/>
+        <source>Ctrl+2</source>
+        <translation>Ctrl+2</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="324"/>
         <location filename="../build/ui_mainwindow.h" line="503"/>
         <source>&amp;Profile</source>
         <translation>&amp;Profil</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="333"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="327"/>
+        <location filename="../build/ui_mainwindow.h" line="504"/>
+        <source>Ctrl+3</source>
+        <translation>Ctrl+3</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="332"/>
         <location filename="../build/ui_mainwindow.h" line="505"/>
         <source>&amp;Info</source>
         <translation>&amp;Info</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="341"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="335"/>
+        <location filename="../build/ui_mainwindow.h" line="506"/>
+        <source>Ctrl+4</source>
+        <translation>Ctrl+4</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="340"/>
         <location filename="../build/ui_mainwindow.h" line="507"/>
         <source>&amp;All</source>
         <translation>&amp;Všetko</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="357"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="343"/>
+        <location filename="../build/ui_mainwindow.h" line="508"/>
+        <source>Ctrl+1</source>
+        <translation>Ctrl+1</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="348"/>
+        <location filename="../build/ui_mainwindow.h" line="509"/>
+        <source>P&amp;revious DC</source>
+        <translation>P&amp;redchádzajúci DC</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="351"/>
+        <location filename="../build/ui_mainwindow.h" line="510"/>
+        <source>Left</source>
+        <translation>Šipka v ľavo</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="356"/>
         <location filename="../build/ui_mainwindow.h" line="511"/>
         <source>&amp;Next DC</source>
         <translation>&amp;Nasledujúci DC</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="365"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="359"/>
+        <location filename="../build/ui_mainwindow.h" line="512"/>
+        <source>Right</source>
+        <translation>Šipka v pravo</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="364"/>
         <location filename="../build/ui_mainwindow.h" line="513"/>
         <source>&amp;About Subsurface</source>
         <translation>&amp;O Subsurface</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="381"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="372"/>
+        <location filename="../build/ui_mainwindow.h" line="514"/>
+        <source>User &amp;manual</source>
+        <translation>Uživateľský &amp;manuál</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="375"/>
+        <location filename="../build/ui_mainwindow.h" line="515"/>
+        <source>F1</source>
+        <translation>F1</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="380"/>
         <location filename="../build/ui_mainwindow.h" line="516"/>
         <source>&amp;Globe</source>
         <translation>&amp;Zemeguľa</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="403"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="383"/>
+        <location filename="../build/ui_mainwindow.h" line="517"/>
+        <source>Ctrl+5</source>
+        <translation>Ctrl+5</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="388"/>
+        <location filename="../build/ui_mainwindow.h" line="518"/>
+        <source>P&amp;lan dive</source>
+        <translation>P&amp;lánovanie ponoru</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="391"/>
+        <location filename="../build/ui_mainwindow.h" line="519"/>
+        <source>Ctrl+L</source>
+        <translation>Ctrl+L</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="396"/>
+        <location filename="../build/ui_mainwindow.h" line="520"/>
+        <source>&amp;Import log files</source>
+        <translation>Import z &amp;log súborov</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="399"/>
+        <location filename="../build/ui_mainwindow.h" line="522"/>
+        <source>Import divelog files from other applications</source>
+        <translation>Import log súborov z iných aplikácii</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="402"/>
         <location filename="../build/ui_mainwindow.h" line="524"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="408"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="407"/>
         <location filename="../build/ui_mainwindow.h" line="525"/>
         <source>Import &amp;from divelogs.de</source>
         <translation>Import z &amp;</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="416"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="415"/>
         <location filename="../build/ui_mainwindow.h" line="526"/>
         <source>&amp;Full screen</source>
         <translation>&amp;Celá obrazovka</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="419"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="418"/>
         <location filename="../build/ui_mainwindow.h" line="528"/>
         <source>Toggle full screen</source>
         <translation>Prepnúť celú obrazovku</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="447"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="421"/>
+        <location filename="../build/ui_mainwindow.h" line="530"/>
+        <source>F11</source>
+        <translation>F11</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="446"/>
         <location filename="../build/ui_mainwindow.h" line="531"/>
         <source>&amp;Check for updates</source>
         <translation>&amp;Kontrola novšej verzie</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="452"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="451"/>
         <location filename="../build/ui_mainwindow.h" line="532"/>
         <source>&amp;Export</source>
         <translation>&amp;Export</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="458"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="454"/>
+        <location filename="../build/ui_mainwindow.h" line="534"/>
+        <source>Export dive logs</source>
+        <translation>Exportovať všetko</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="457"/>
         <location filename="../build/ui_mainwindow.h" line="536"/>
         <source>Ctrl+E</source>
         <translation>Ctrl+E</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="466"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="462"/>
+        <location filename="../build/ui_mainwindow.h" line="537"/>
+        <source>Configure &amp;dive computer</source>
+        <translation>Konfigurácia počítača</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="465"/>
         <location filename="../build/ui_mainwindow.h" line="538"/>
         <source>Ctrl+Shift+C</source>
         <translation>Ctrl+Shift+C</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="474"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="473"/>
         <location filename="../build/ui_mainwindow.h" line="539"/>
         <source>Edit &amp;dive in planner</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="486"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="485"/>
         <location filename="../build/ui_mainwindow.h" line="540"/>
         <source>Toggle pO₂ graph</source>
         <translation>Prepnúť pO₂ graf</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="498"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="497"/>
         <location filename="../build/ui_mainwindow.h" line="541"/>
         <source>Toggle pN₂ graph</source>
         <translation>Prepnúť pN₂ graf</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="642"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="509"/>
+        <location filename="../build/ui_mainwindow.h" line="542"/>
+        <source>Toggle pHe graph</source>
+        <translation>Prepnúť pHe graf</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="521"/>
+        <location filename="../build/ui_mainwindow.h" line="543"/>
+        <source>Toggle DC reported ceiling</source>
+        <translation>Prepnúť zobrazenie stropu podľa počítača</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="533"/>
+        <location filename="../build/ui_mainwindow.h" line="544"/>
+        <source>Toggle calculated ceiling</source>
+        <translation>Prepnúť na vypočítaný strop</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="545"/>
+        <location filename="../build/ui_mainwindow.h" line="545"/>
+        <source>Toggle calculating all tissues</source>
+        <translation>Prepnúť výpočet všetkých tkanív</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="557"/>
+        <location filename="../build/ui_mainwindow.h" line="546"/>
+        <source>Toggle calculated ceiling with 3m increments</source>
+        <translation>Prepnúť na </translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="569"/>
+        <location filename="../build/ui_mainwindow.h" line="547"/>
+        <source>Toggle heart rate</source>
+        <translation>Prepnúť tepovú frekvenciu</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="581"/>
+        <location filename="../build/ui_mainwindow.h" line="548"/>
+        <source>Toggle MOD</source>
+        <translation>Prepnúť MOD</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="593"/>
+        <location filename="../build/ui_mainwindow.h" line="549"/>
+        <source>Toggle EAD, END, EADD</source>
+        <translation>Prepnúť </translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="605"/>
+        <location filename="../build/ui_mainwindow.h" line="550"/>
+        <source>Toggle NDL, TTS</source>
+        <translation>Prepnúť NDL, TTS</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="617"/>
+        <location filename="../build/ui_mainwindow.h" line="551"/>
+        <source>Toggle SAC rate</source>
+        <translation>Prepnúť SAC spotrebu</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="629"/>
+        <location filename="../build/ui_mainwindow.h" line="552"/>
+        <source>Toggle ruler</source>
+        <translation>Prepnúť pravítko</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="641"/>
         <location filename="../build/ui_mainwindow.h" line="553"/>
         <source>Scale graph</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="654"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="653"/>
         <location filename="../build/ui_mainwindow.h" line="554"/>
         <source>Toggle pictures</source>
         <translation>Prepnúť fotografie</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="666"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="665"/>
         <location filename="../build/ui_mainwindow.h" line="555"/>
         <source>Toggle tank bar</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="674"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="673"/>
         <location filename="../build/ui_mainwindow.h" line="556"/>
         <source>&amp;Filter divelist</source>
         <translation>&amp;Filtruj zoznam ponorov</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="689"/>
-        <location filename="../build/ui_mainwindow.h" line="558"/>
-        <source>Toggle tissue graph</source>
-        <translation>Prepnúť graf tkanív</translation>
+        <location filename="../desktop-widgets/mainwindow.ui" line="676"/>
+        <location filename="../build/ui_mainwindow.h" line="557"/>
+        <source>Ctrl+F</source>
+        <translation>Ctrl+F</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="688"/>
+        <source>Toggle tissue heat-map</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="694"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="693"/>
         <location filename="../build/ui_mainwindow.h" line="559"/>
         <source>User &amp;survey</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="699"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="698"/>
         <location filename="../build/ui_mainwindow.h" line="560"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="238"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="231"/>
         <source>&amp;Undo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="702"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="701"/>
         <location filename="../build/ui_mainwindow.h" line="561"/>
         <source>Ctrl+Z</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="707"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="706"/>
         <location filename="../build/ui_mainwindow.h" line="562"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="239"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="232"/>
         <source>&amp;Redo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="710"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="709"/>
         <location filename="../build/ui_mainwindow.h" line="563"/>
         <source>Ctrl+Shift+Z</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="715"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="714"/>
         <location filename="../build/ui_mainwindow.h" line="564"/>
         <source>&amp;Find moved images</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="720"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="719"/>
         <source>Open c&amp;loud storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="725"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="724"/>
         <source>Save to clo&amp;ud storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="730"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="729"/>
         <location filename="../build/ui_mainwindow.h" line="567"/>
         <source>&amp;Manage dive sites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="735"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="734"/>
         <source>Dive Site &amp;Edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="740"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="739"/>
         <source>Facebook</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="745"/>
-        <source>Add GPS location here</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="744"/>
+        <source>Take cloud storage online</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="677"/>
-        <location filename="../build/ui_mainwindow.h" line="557"/>
-        <source>Ctrl+F</source>
-        <translation>Ctrl+F</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="213"/>
-        <location filename="../build/ui_mainwindow.h" line="478"/>
-        <source>&amp;Print</source>
-        <translation>&amp;Tlačiť</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="224"/>
-        <location filename="../build/ui_mainwindow.h" line="481"/>
-        <source>Ctrl+,</source>
-        <translation>Ctrl+,</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="232"/>
-        <location filename="../build/ui_mainwindow.h" line="482"/>
-        <source>&amp;Quit</source>
-        <translation>&amp;Ukončiť</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="243"/>
-        <location filename="../build/ui_mainwindow.h" line="484"/>
-        <source>Import from &amp;dive computer</source>
-        <translation>Import z &amp;počítača</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="254"/>
-        <location filename="../build/ui_mainwindow.h" line="487"/>
-        <source>Ctrl+G</source>
-        <translation>Ctrl+G</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="267"/>
-        <location filename="../build/ui_mainwindow.h" line="490"/>
-        <source>Ctrl++</source>
-        <translation>Ctrl++</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="293"/>
-        <location filename="../build/ui_mainwindow.h" line="496"/>
-        <source>&amp;Renumber</source>
-        <translation>&amp;Prečisluj</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="296"/>
-        <location filename="../build/ui_mainwindow.h" line="497"/>
-        <source>Ctrl+R</source>
-        <translation>Ctrl+R</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="312"/>
-        <location filename="../build/ui_mainwindow.h" line="500"/>
-        <source>Ctrl+Y</source>
-        <translation>Ctrl+Y</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="392"/>
-        <location filename="../build/ui_mainwindow.h" line="519"/>
-        <source>Ctrl+L</source>
-        <translation>Ctrl+L</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="216"/>
-        <location filename="../build/ui_mainwindow.h" line="479"/>
-        <source>Ctrl+P</source>
-        <translation>Ctrl+P</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="235"/>
-        <location filename="../build/ui_mainwindow.h" line="483"/>
-        <source>Ctrl+Q</source>
-        <translation>Ctrl+Q</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="246"/>
-        <location filename="../build/ui_mainwindow.h" line="485"/>
-        <source>Ctrl+D</source>
-        <translation>Ctrl+D</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="264"/>
-        <location filename="../build/ui_mainwindow.h" line="489"/>
-        <source>&amp;Add dive</source>
-        <translation>&amp;Pridanie ponoru</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="304"/>
-        <location filename="../build/ui_mainwindow.h" line="498"/>
-        <source>Auto &amp;group</source>
-        <translation>&amp;Automatické zoskupovanie</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="309"/>
-        <location filename="../build/ui_mainwindow.h" line="499"/>
-        <source>&amp;Yearly statistics</source>
-        <translation>&amp;Ročné štatistiky</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="317"/>
-        <location filename="../build/ui_mainwindow.h" line="501"/>
-        <source>&amp;Dive list</source>
-        <translation>Zoznam &amp;ponorov</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="320"/>
-        <location filename="../build/ui_mainwindow.h" line="502"/>
-        <source>Ctrl+2</source>
-        <translation>Ctrl+2</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="328"/>
-        <location filename="../build/ui_mainwindow.h" line="504"/>
-        <source>Ctrl+3</source>
-        <translation>Ctrl+3</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="336"/>
-        <location filename="../build/ui_mainwindow.h" line="506"/>
-        <source>Ctrl+4</source>
-        <translation>Ctrl+4</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="344"/>
-        <location filename="../build/ui_mainwindow.h" line="508"/>
-        <source>Ctrl+1</source>
-        <translation>Ctrl+1</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="349"/>
-        <location filename="../build/ui_mainwindow.h" line="509"/>
-        <source>P&amp;revious DC</source>
-        <translation>P&amp;redchádzajúci DC</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="352"/>
-        <location filename="../build/ui_mainwindow.h" line="510"/>
-        <source>Left</source>
-        <translation>Šipka v ľavo</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="360"/>
-        <location filename="../build/ui_mainwindow.h" line="512"/>
-        <source>Right</source>
-        <translation>Šipka v pravo</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="373"/>
-        <location filename="../build/ui_mainwindow.h" line="514"/>
-        <source>User &amp;manual</source>
-        <translation>Uživateľský &amp;manuál</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="376"/>
-        <location filename="../build/ui_mainwindow.h" line="515"/>
-        <source>F1</source>
-        <translation>F1</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="384"/>
-        <location filename="../build/ui_mainwindow.h" line="517"/>
-        <source>Ctrl+5</source>
-        <translation>Ctrl+5</translation>
+        <location filename="../build/ui_mainwindow.h" line="558"/>
+        <source>Toggle tissue graph</source>
+        <translation>Prepnúť graf tkanív</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="389"/>
-        <location filename="../build/ui_mainwindow.h" line="518"/>
-        <source>P&amp;lan dive</source>
-        <translation>P&amp;lánovanie ponoru</translation>
+        <location filename="../build/ui_mainwindow.h" line="565"/>
+        <source>Open cloud storage</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="397"/>
-        <location filename="../build/ui_mainwindow.h" line="520"/>
-        <source>&amp;Import log files</source>
-        <translation>Import z &amp;log súborov</translation>
+        <location filename="../build/ui_mainwindow.h" line="566"/>
+        <source>Save to cloud storage</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="400"/>
-        <location filename="../build/ui_mainwindow.h" line="522"/>
-        <source>Import divelog files from other applications</source>
-        <translation>Import log súborov z iných aplikácii</translation>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="331"/>
+        <source>Connect to</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="422"/>
-        <location filename="../build/ui_mainwindow.h" line="530"/>
-        <source>F11</source>
-        <translation>F11</translation>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="493"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="538"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1545"/>
+        <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="../desktop-widgets/mainwindow.cpp" line="505"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="499"/>
         <source>Open file</source>
         <translation>Otvoriť súbor</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="509"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="503"/>
         <location filename="../desktop-widgets/mainwindow.cpp" line="614"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1972"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1978"/>
         <source>Cancel</source>
         <translation>Zrušiť</translation>
     </message>
@@ -5247,6 +5346,16 @@ vytvorene zo vzduchu a:
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="649"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="796"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="977"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="983"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1849"/>
+        <source>Warning</source>
+        <translation>Upozornenie</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="674"/>
         <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>
@@ -5262,124 +5371,97 @@ vytvorene zo vzduchu a:
         <translation>Vytlačiť runtime tabuľku</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="982"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
+        <source>Trying to replan a dive that&apos;s not a planned dive.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="977"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1849"/>
+        <source>Please, first finish the current edition before trying to do another.</source>
+        <translation>Ukonči aktuálne editovanie pred tým než začneš ďalšie.</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="983"/>
         <source>Trying to edit a dive that&apos;s not a manually added dive.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1243"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1030"/>
+        <source>Yearly statistics</source>
+        <translation>Ročná štatistika</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1244"/>
         <source>Do you want to save the changes that you made in the file %1?</source>
         <translation>Chceš uložiť zmeny prevedené v súbore %1?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1246"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1247"/>
         <source>Do you want to save the changes that you made in the data file?</source>
         <translation>Chces uložiť zmeny prevedené v dátovom súbore?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1251"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1252"/>
         <source>Save changes?</source>
         <translation>Uložiť zmeny?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1587"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1253"/>
+        <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="../desktop-widgets/mainwindow.cpp" line="1572"/>
         <source>Save file as</source>
         <translation>Uložiť súbor ako</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1682"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1573"/>
+        <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
+        <translation>Subsurface XML súbory (*.ssrf *.xml *.XML)</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1670"/>
+        <source>[local cache for] %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1672"/>
         <source>[cloud storage for] %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1782"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1788"/>
         <source>Opening datafile from older version</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1783"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1789"/>
         <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly.
 Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1794"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1800"/>
         <source>Open dive log file</source>
         <translation>Otvoriť log súbor</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1795"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1801"/>
         <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1972"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1978"/>
         <source>Contacting cloud service...</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1252"/>
-        <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="../desktop-widgets/mainwindow.cpp" line="649"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="796"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="976"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="982"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/>
-        <source>Warning</source>
-        <translation>Upozornenie</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="499"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="544"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1560"/>
-        <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="../desktop-widgets/mainwindow.cpp" line="338"/>
-        <source>Connect to</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
-        <source>Trying to replan a dive that&apos;s not a planned dive.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1029"/>
-        <source>Yearly statistics</source>
-        <translation>Ročná štatistika</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1588"/>
-        <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
-        <translation>Subsurface XML súbory (*.ssrf *.xml *.XML)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="976"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/>
-        <source>Please, first finish the current edition before trying to do another.</source>
-        <translation>Ukonči aktuálne editovanie pred tým než začneš ďalšie.</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_mainwindow.h" line="565"/>
-        <source>Open cloud storage</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../build/ui_mainwindow.h" line="566"/>
-        <source>Save to cloud storage</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>MultiFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="733"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="731"/>
         <source>Filter shows %1 (of %2) dives</source>
         <translation>Filter zobrazuje %1 (z %2) ponorov</translation>
     </message>
@@ -5387,39 +5469,39 @@ Subsurface has already tried to pre-populate the data but it might be worth whil
 <context>
     <name>OstcFirmwareCheck</name>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="269"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="271"/>
         <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="273"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="275"/>
         <source>
 
 Please start Bluetooth on your OSTC Sport and do the same preparations as for a logbook download before continuing with the update</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="274"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="276"/>
         <source>Not now</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="275"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="277"/>
         <source>Update firmware</source>
         <translation>Firmware update</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="277"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="279"/>
         <source>Firmware upgrade notice</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="295"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="297"/>
         <source>Save the downloaded firmware as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="296"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="298"/>
         <source>HEX files (*.hex)</source>
         <translation type="unfinished"/>
     </message>
@@ -5427,79 +5509,89 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PlannerSettingsWidget</name>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="322"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="302"/>
         <source>Open circuit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="322"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="302"/>
         <source>CCR</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="322"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="302"/>
         <source>pSCR</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="421"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="388"/>
         <source>ft/min</source>
         <translation>ft/min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="422"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="389"/>
         <source>Last stop at 20ft</source>
         <translation>Posledná zastávka v 20 stopách</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="423"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="390"/>
         <source>50% avg. depth to 20ft</source>
         <translation>50% priemernej hĺbky do 20ft</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="424"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="391"/>
         <source>20ft to surface</source>
         <translation>20ft na hladinu</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="426"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="392"/>
+        <source>ft</source>
+        <translation>ft</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="394"/>
         <source>m/min</source>
         <translation>m/min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="427"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="395"/>
         <source>Last stop at 6m</source>
         <translation>Posledná zastávka v 6m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="428"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="396"/>
         <source>50% avg. depth to 6m</source>
         <translation>50% priemernej hĺbky do 6m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="429"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="397"/>
         <source>6m to surface</source>
         <translation>6m na povrch</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="432"/>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="433"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="398"/>
+        <source>m</source>
+        <translation>m</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="401"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="402"/>
         <source>cuft/min</source>
         <translation>cuft/min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="441"/>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="442"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="410"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="411"/>
         <source>ℓ/min</source>
         <translation>ℓ/min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="451"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="420"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="456"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="425"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
@@ -5649,6 +5741,11 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PreferencesDialog</name>
     <message>
+        <location filename="../build/ui_preferences.h" line="1283"/>
+        <source>Preferences</source>
+        <translation>Nastavenia</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1288"/>
         <source>Defaults</source>
         <translation>Predvolené</translation>
@@ -5684,6 +5781,11 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1303"/>
+        <source>Lists and tables</source>
+        <translation>Zoznamy a tabuľky</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1304"/>
         <source>Font</source>
         <translation>Font</translation>
@@ -5699,6 +5801,11 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>Ponory</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1307"/>
+        <source>Default dive log file</source>
+        <translation>Predvolený súbor s ponormi</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1308"/>
         <source>No default file</source>
         <translation type="unfinished"/>
@@ -5729,6 +5836,21 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>...</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1314"/>
+        <source>Display invalid</source>
+        <translation>Zobraziť neplatné</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1316"/>
+        <source>Default cylinder</source>
+        <translation>Predvolená fľaša</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1317"/>
+        <source>Use default cylinder</source>
+        <translation>Použi prednastavenú fľašu</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1318"/>
         <source>Animations</source>
         <translation>Animácie</translation>
@@ -5759,42 +5881,26 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>Systém</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1401"/>
-        <source>Dive site geo lookup</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1402"/>
-        <source>Enable geocoding for dive site management</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1403"/>
-        <source>Parse site without GPS data</source>
+        <location filename="../build/ui_preferences.h" line="1324"/>
+        <source>&amp;Metric</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1404"/>
-        <source>Same format for existing dives</source>
-        <translation type="unfinished"/>
+        <location filename="../build/ui_preferences.h" line="1325"/>
+        <source>Imperial</source>
+        <translation>Imperiálny</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1405"/>
-        <source>Dive Site Layout</source>
+        <location filename="../build/ui_preferences.h" line="1326"/>
+        <source>Personali&amp;ze</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1406"/>
-        <location filename="../build/ui_preferences.h" line="1407"/>
-        <source>/</source>
+        <location filename="../build/ui_preferences.h" line="1327"/>
+        <source>Individual settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1325"/>
-        <source>Imperial</source>
-        <translation>Imperiálny</translation>
-    </message>
-    <message>
         <location filename="../build/ui_preferences.h" line="1328"/>
         <source>Depth</source>
         <translation>Hĺbka</translation>
@@ -5810,6 +5916,11 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>stopa</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1331"/>
+        <source>Pressure</source>
+        <translation>Tlak</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1332"/>
         <location filename="../build/ui_preferences.h" line="1366"/>
         <source>bar</source>
@@ -5821,11 +5932,26 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>psi</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1334"/>
+        <source>Volume</source>
+        <translation>Objem</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1335"/>
+        <source>&amp;liter</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1336"/>
         <source>cu ft</source>
         <translation>cu ft</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1337"/>
+        <source>Temperature</source>
+        <translation>Teplota</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1338"/>
         <source>celsius</source>
         <translation>celsius</translation>
@@ -5836,11 +5962,121 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>fahrenheit</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1340"/>
+        <source>Weight</source>
+        <translation>Hmotnosť</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1341"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1342"/>
+        <source>lbs</source>
+        <translation>US libra</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1343"/>
+        <source>Time units</source>
+        <translation>Časové jednotky</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1344"/>
+        <source>Ascent/descent speed denominator</source>
+        <translation>Menovateľ rýchlosti pre výstup/zostup</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1345"/>
+        <source>Minutes</source>
+        <translation>Minuty</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1346"/>
+        <source>Seconds</source>
+        <translation>Sekundy</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1347"/>
+        <source>GPS coordinates</source>
+        <translation>GPS súradnice</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1348"/>
+        <source>Location Display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1349"/>
+        <source>traditional (dms)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1350"/>
+        <source>decimal</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1351"/>
+        <source>Show</source>
+        <translation>Zobraziť</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1352"/>
+        <source>Threshold when showing pO₂</source>
+        <translation>Hranica pre zobrazenie pO₂</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1353"/>
+        <source>Threshold when showing pN₂</source>
+        <translation>Hranica pre zobrazenie pN₂</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1354"/>
+        <source>Threshold when showing pHe</source>
+        <translation>Hranica pre zobrazenie pHe</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1355"/>
+        <source>Max pO₂ when showing MOD</source>
+        <translation>Max ppO₂ pri zobrazení MOD</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1356"/>
+        <source>Draw dive computer reported ceiling red</source>
+        <translation>Strop určený počítačom zobraziť červenou</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1357"/>
+        <source>Show unused cylinders in Equipment tab</source>
+        <translation>Zobraziť nepoužité fľaše v záložke výstroja</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1358"/>
+        <source>Show average depth</source>
+        <translation>Zobraziť priemernú hĺbku</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1359"/>
+        <source>Misc</source>
+        <translation>Rôzne</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1360"/>
+        <source>GFLow</source>
+        <translation>GFLow</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1361"/>
+        <source>GFHigh</source>
+        <translation>GFHigh</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1362"/>
+        <source>GFLow at max depth</source>
+        <translation>GFLow na max. hĺbke</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1363"/>
         <source>CCR: show setpoints when viewing pO₂</source>
         <translation type="unfinished"/>
@@ -5886,14 +6122,19 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>Systémove prednastavenia</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1374"/>
+        <source>Filter</source>
+        <translation>Filter</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1375"/>
         <source>Proxy</source>
         <translation>Proxy</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1379"/>
-        <source>Proxy type</source>
-        <translation>Typ proxy</translation>
+        <location filename="../build/ui_preferences.h" line="1376"/>
+        <source>Port</source>
+        <translation>Port</translation>
     </message>
     <message>
         <location filename="../build/ui_preferences.h" line="1377"/>
@@ -5901,16 +6142,16 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>Host</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1376"/>
-        <source>Port</source>
-        <translation>Port</translation>
-    </message>
-    <message>
         <location filename="../build/ui_preferences.h" line="1378"/>
         <source>Requires authentication</source>
         <translation>Vyžaduje autentifikáciu</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1379"/>
+        <source>Proxy type</source>
+        <translation>Typ proxy</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1380"/>
         <source>Username</source>
         <translation>Meno</translation>
@@ -5922,46 +6163,6 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>Heslo</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1400"/>
-        <source>Disconnect from Facebook</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1374"/>
-        <source>Filter</source>
-        <translation>Filter</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1331"/>
-        <source>Pressure</source>
-        <translation>Tlak</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1303"/>
-        <source>Lists and tables</source>
-        <translation>Zoznamy a tabuľky</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1307"/>
-        <source>Default dive log file</source>
-        <translation>Predvolený súbor s ponormi</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1314"/>
-        <source>Display invalid</source>
-        <translation>Zobraziť neplatné</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1316"/>
-        <source>Default cylinder</source>
-        <translation>Predvolená fľaša</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1317"/>
-        <source>Use default cylinder</source>
-        <translation>Použi prednastavenú fľašu</translation>
-    </message>
-    <message>
         <location filename="../build/ui_preferences.h" line="1382"/>
         <source>Subsurface cloud storage</source>
         <translation type="unfinished"/>
@@ -6002,150 +6203,41 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>Uložiť uživateľské ID lokálne?</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1334"/>
-        <source>Volume</source>
-        <translation>Objem</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1337"/>
-        <source>Temperature</source>
-        <translation>Teplota</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1340"/>
-        <source>Weight</source>
-        <translation>Hmotnosť</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1342"/>
-        <source>lbs</source>
-        <translation>US libra</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1343"/>
-        <source>Time units</source>
-        <translation>Časové jednotky</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1345"/>
-        <source>Minutes</source>
-        <translation>Minuty</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1346"/>
-        <source>Seconds</source>
-        <translation>Sekundy</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1351"/>
-        <source>Show</source>
-        <translation>Zobraziť</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1362"/>
-        <source>GFLow at max depth</source>
-        <translation>GFLow na max. hĺbke</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1359"/>
-        <source>Misc</source>
-        <translation>Rôzne</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1283"/>
-        <source>Preferences</source>
-        <translation>Nastavenia</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1324"/>
-        <source>&amp;Metric</source>
+        <location filename="../build/ui_preferences.h" line="1400"/>
+        <source>Disconnect from Facebook</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1326"/>
-        <source>Personali&amp;ze</source>
+        <location filename="../build/ui_preferences.h" line="1401"/>
+        <source>Dive site geo lookup</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1327"/>
-        <source>Individual settings</source>
+        <location filename="../build/ui_preferences.h" line="1402"/>
+        <source>Enable geocoding for dive site management</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1335"/>
-        <source>&amp;liter</source>
+        <location filename="../build/ui_preferences.h" line="1403"/>
+        <source>Parse site without GPS data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1344"/>
-        <source>Ascent/descent speed denominator</source>
-        <translation>Menovateľ rýchlosti pre výstup/zostup</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1347"/>
-        <source>GPS coordinates</source>
-        <translation>GPS súradnice</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1348"/>
-        <source>Location Display</source>
+        <location filename="../build/ui_preferences.h" line="1404"/>
+        <source>Same format for existing dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1349"/>
-        <source>traditional (dms)</source>
+        <location filename="../build/ui_preferences.h" line="1405"/>
+        <source>Dive Site Layout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1350"/>
-        <source>decimal</source>
+        <location filename="../build/ui_preferences.h" line="1406"/>
+        <location filename="../build/ui_preferences.h" line="1407"/>
+        <source>/</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1352"/>
-        <source>Threshold when showing pO₂</source>
-        <translation>Hranica pre zobrazenie pO₂</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1353"/>
-        <source>Threshold when showing pN₂</source>
-        <translation>Hranica pre zobrazenie pN₂</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1354"/>
-        <source>Threshold when showing pHe</source>
-        <translation>Hranica pre zobrazenie pHe</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1355"/>
-        <source>Max pO₂ when showing MOD</source>
-        <translation>Max ppO₂ pri zobrazení MOD</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1356"/>
-        <source>Draw dive computer reported ceiling red</source>
-        <translation>Strop určený počítačom zobraziť červenou</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1357"/>
-        <source>Show unused cylinders in Equipment tab</source>
-        <translation>Zobraziť nepoužité fľaše v záložke výstroja</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1358"/>
-        <source>Show average depth</source>
-        <translation>Zobraziť priemernú hĺbku</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1360"/>
-        <source>GFLow</source>
-        <translation>GFLow</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1361"/>
-        <source>GFHigh</source>
-        <translation>GFHigh</translation>
-    </message>
 </context>
 <context>
     <name>PreferencesGeoreference</name>
@@ -6200,106 +6292,136 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="20"/>
-        <source>Show</source>
-        <translation>Zobraziť</translation>
+        <source>Gas pressure display setup</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="29"/>
-        <source>Threshold when showing pO₂</source>
-        <translation>Hranica pre zobrazenie pO₂</translation>
+        <source>Threshold for pO₂ (bar)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="49"/>
-        <source>Threshold when showing pN₂</source>
-        <translation>Hranica pre zobrazenie pN₂</translation>
+        <source>Threshold for pN₂ (bar)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="69"/>
-        <source>Threshold when showing pHe</source>
-        <translation>Hranica pre zobrazenie pHe</translation>
+        <source>Threshold for pHe (bar)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="89"/>
-        <source>Max pO₂ when showing MOD</source>
-        <translation>Max ppO₂ pri zobrazení MOD</translation>
+        <source>pO₂ in calculating MOD (bar)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="109"/>
-        <source>Draw dive computer reported ceiling red</source>
-        <translation>Strop určený počítačom zobraziť červenou</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="106"/>
+        <source>CCR options:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="116"/>
-        <source>Show unused cylinders in Equipment tab</source>
-        <translation>Zobraziť nepoužité fľaše v záložke výstroja</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="113"/>
+        <source>Dive planner default setpoint (bar)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="123"/>
-        <source>Show mean depth</source>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="133"/>
+        <source>Show setpoints when viewing pO₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="133"/>
-        <source>Misc</source>
-        <translation>Rôzne</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="140"/>
+        <source>Show individual O₂ sensor values when viewing pO₂</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="149"/>
-        <source>bar</source>
-        <translation>bar</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="150"/>
+        <source>Ceiling display setup</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="165"/>
-        <source>Default CCR set-point for dive planning</source>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="159"/>
+        <source>Draw dive computer reported ceiling red</source>
+        <translation>Strop určený počítačom zobraziť červenou</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="169"/>
+        <source>Algorithm for calculated ceiling:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="172"/>
-        <source>pSCR O₂ metabolism rate</source>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="176"/>
+        <source>VPM-B</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="179"/>
-        <source>GFLow</source>
-        <translation>GFLow</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="183"/>
+        <source>VPM-B Conservatism</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="193"/>
+        <source>+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="186"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="206"/>
+        <source>Bühlmann</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="216"/>
         <source>GFHigh</source>
         <translation>GFHigh</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="203"/>
-        <source>ℓ/min</source>
-        <translation>ℓ/min</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="236"/>
+        <source>GFLow</source>
+        <translation>GFLow</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="213"/>
-        <source>pSCR ratio</source>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="256"/>
+        <source>GFLow at max depth</source>
+        <translation>GFLow na max. hĺbke</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="263"/>
+        <source>pSCR options:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="223"/>
-        <source>1:</source>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="270"/>
+        <source>Metabolic rate (ℓ O₂/min)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="230"/>
-        <source>CCR: show individual O₂ sensor values when viewing pO₂</source>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="287"/>
+        <source>Dilution ratio</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="237"/>
-        <source>CCR: show setpoints when viewing pO₂</source>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="300"/>
+        <source>1:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="244"/>
-        <source>GFLow at max depth</source>
-        <translation>GFLow na max. hĺbke</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="310"/>
+        <source>Misc</source>
+        <translation>Rôzne</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="316"/>
+        <source>Show unused cylinders in Equipment tab</source>
+        <translation>Zobraziť nepoužité fľaše v záložke výstroja</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="10"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="323"/>
+        <source>Show mean depth in Profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="9"/>
         <source>Graph</source>
         <translation>Graf</translation>
     </message>
@@ -6368,15 +6490,29 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>Jazyk</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="57"/>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="53"/>
         <source>Restart required</source>
         <translation>Potrebný reštart</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="58"/>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="54"/>
         <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="../desktop-widgets/preferences/preferences_language.cpp" line="76"/>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="82"/>
+        <source>Literal characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="77"/>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="83"/>
+        <source>Non-special character(s) in time format.
+These will be used as is. This might not be what you intended.
+See http://doc.qt.io/qt-5/qdatetime.html#toString</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PreferencesNetwork</name>
@@ -6423,7 +6559,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_network.ui" line="156"/>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="148"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="134"/>
         <source>Subsurface cloud storage</source>
         <translation type="unfinished"/>
     </message>
@@ -6468,39 +6604,39 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>Uložiť uživateľské ID lokálne?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="11"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="10"/>
         <source>Network</source>
         <translation>Sieť</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="15"/>
         <source>No proxy</source>
         <translation>Žiadne proxy</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/>
         <source>System proxy</source>
         <translation>Systémové proxy</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/>
         <source>HTTP proxy</source>
         <translation>HTTP proxy</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="19"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/>
         <source>SOCKS proxy</source>
         <translation>SOCKS proxy</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="75"/>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="97"/>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="110"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="72"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="93"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="106"/>
         <source>Cloud storage email and password can only consist of letters, numbers, and &apos;.&apos;, &apos;-&apos;, &apos;_&apos;, and &apos;+&apos;.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="146"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="132"/>
         <source>Subsurface cloud storage (credentials verified)</source>
         <translation type="unfinished"/>
     </message>
@@ -6658,7 +6794,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="8"/>
+        <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="7"/>
         <source>Units</source>
         <translation>Jednotky</translation>
     </message>
@@ -6666,17 +6802,17 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PrintDialog</name>
     <message>
-        <location filename="../desktop-widgets/printdialog.cpp" line="118"/>
-        <source>&amp;Preview</source>
-        <translation>&amp;Náhľad</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/printdialog.cpp" line="115"/>
+        <location filename="../desktop-widgets/printdialog.cpp" line="102"/>
         <source>P&amp;rint</source>
         <translation>T&amp;lač</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/printdialog.cpp" line="130"/>
+        <location filename="../desktop-widgets/printdialog.cpp" line="105"/>
+        <source>&amp;Preview</source>
+        <translation>&amp;Náhľad</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/printdialog.cpp" line="117"/>
         <source>Print</source>
         <translation>Tlačiť</translation>
     </message>
@@ -6684,19 +6820,10 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PrintOptions</name>
     <message>
-        <location filename="../build/ui_printoptions.h" line="150"/>
-        <source>&amp;Table print</source>
-        <translation>&amp;Tlač tabuľky</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_printoptions.h" line="158"/>
-        <source>One dive per page</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../build/ui_printoptions.h" line="159"/>
-        <source>Two dives per page</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/printoptions.ui" line="29"/>
+        <location filename="../build/ui_printoptions.h" line="148"/>
+        <source>Print type</source>
+        <translation>Druh tlače</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/printoptions.ui" line="41"/>
@@ -6756,10 +6883,19 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/printoptions.ui" line="29"/>
-        <location filename="../build/ui_printoptions.h" line="148"/>
-        <source>Print type</source>
-        <translation>Druh tlače</translation>
+        <location filename="../build/ui_printoptions.h" line="150"/>
+        <source>&amp;Table print</source>
+        <translation>&amp;Tlač tabuľky</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_printoptions.h" line="158"/>
+        <source>One dive per page</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../build/ui_printoptions.h" line="159"/>
+        <source>Two dives per page</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/printoptions.cpp" line="128"/>
@@ -6801,103 +6937,103 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="755"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="752"/>
         <source>Show NDL / TTS was disabled because of excessive processing time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1344"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1338"/>
         <source>Make first divecomputer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1346"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1340"/>
         <source>Delete this divecomputer</source>
         <translation>Zmazať tento počítač</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1360"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1354"/>
         <source>Add gas change</source>
         <translation>Pridaj zmenu zmesi</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1363"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1357"/>
         <source> (Tank %1)</source>
         <translation> (Fľaša %1)</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1371"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1365"/>
         <source>Add set-point change</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1373"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1367"/>
         <source>Add bookmark</source>
         <translation>Pridať Bookmark</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1377"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1371"/>
         <source>Edit the profile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1381"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1375"/>
         <source>Remove event</source>
         <translation>Vymazať udalosť</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1386"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1380"/>
         <source>Hide similar events</source>
         <translation>Schovaj podobné udalosti</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1393"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1387"/>
         <source>Edit name</source>
         <translation>Editovať meno</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1422"/>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1429"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1416"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1423"/>
         <source>Adjust pressure of tank %1 (currently interpolated as %2)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1444"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1438"/>
         <source>Unhide all events</source>
         <translation>Zobraziť všetky udalosti</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1479"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1473"/>
         <source>Hide events</source>
         <translation>Schovaj udalosti</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1479"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1473"/>
         <source>Hide all %1 events?</source>
         <translation>Schovať všetky %1 udalosti?</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1514"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1508"/>
         <source>Remove the selected event?</source>
         <translation>Zmazať vybrané udalosti?</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1515"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1509"/>
         <source>%1 @ %2:%3</source>
         <translation>%1 @ %2:%3</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1638"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1632"/>
         <source>Edit name of bookmark</source>
         <translation>Editovať meno záložky</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1639"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1633"/>
         <source>Custom name:</source>
         <translation>Voliteľné meno:</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1644"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1638"/>
         <source>Name is too long!</source>
         <translation>Príliš dlhý názov!</translation>
     </message>
@@ -6905,91 +7041,101 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>QMLManager</name>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="95"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="97"/>
         <source>Starting...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="202"/>
         <source>working in no-cloud mode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="213"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="216"/>
         <source>no cloud credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="214"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="270"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="217"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="269"/>
         <source>Please enter valid cloud credentials.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="285"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="284"/>
         <source>Attempting to open cloud storage with new credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="304"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="306"/>
         <source>Testing cloud credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="331"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="320"/>
+        <source>No response from cloud server to validate the credentials</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="329"/>
+        <source>Cannot connect to cloud storage - cloud account not verified</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="361"/>
         <source>Cloud credentials are invalid</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="344"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="374"/>
         <source>Cannot open cloud storage: Error creating https connection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="357"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="387"/>
         <source>Cannot open cloud storage: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="369"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="399"/>
         <source>Cannot connect to cloud storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="411"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="441"/>
         <source>Cloud storage error: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="501"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="531"/>
         <source>Failed to connect to cloud server, reverting to no cloud status</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="520"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="550"/>
         <source>Cloud storage open successfully. No dives in dive list.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="689"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="690"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="721"/>
         <source>h</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="689"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="690"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="691"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="721"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="722"/>
         <source>min</source>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="689"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/>
         <source>sec</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="1041"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="1102"/>
         <source>Unknown GPS location</source>
         <translation type="unfinished"/>
     </message>
@@ -6997,126 +7143,126 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../core/qthelper.cpp" line="866"/>
-        <location filename="../core/qthelper.cpp" line="1214"/>
-        <source>AIR</source>
-        <translation>Vzduch</translation>
+        <location filename="../core/gpslocation.h" line="13"/>
+        <source>Waiting to aquire GPS location</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="1214"/>
-        <source>OXYGEN</source>
-        <translation>KYSLÍK</translation>
+        <location filename="../core/qthelper.cpp" line="766"/>
+        <location filename="../core/qthelper.cpp" line="1275"/>
+        <source>m</source>
+        <translation>m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="59"/>
-        <source>Remove this point</source>
-        <translation>Odstrániť tento bod</translation>
+        <location filename="../core/qthelper.cpp" line="768"/>
+        <location filename="../core/qthelper.cpp" line="1274"/>
+        <source>ft</source>
+        <translation>ft</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="32"/>
-        <source>Average</source>
-        <translation>Priemer</translation>
+        <location filename="../core/qthelper.cpp" line="794"/>
+        <source>C</source>
+        <translation>C</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="35"/>
-        <source>Minimum</source>
-        <translation>Minimum</translation>
+        <location filename="../core/qthelper.cpp" line="796"/>
+        <source>F</source>
+        <translation>F</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="38"/>
-        <source>Maximum</source>
-        <translation>Maximum</translation>
+        <location filename="../core/qthelper.cpp" line="821"/>
+        <location filename="../core/qthelper.cpp" line="1250"/>
+        <source>kg</source>
+        <translation>kg</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/globe.cpp" line="327"/>
-        <source>Move the map and double-click to set the dive location</source>
-        <translation>Posuň mapu a dvojklikom označ miesto ponoru</translation>
+        <location filename="../core/qthelper.cpp" line="823"/>
+        <location filename="../core/qthelper.cpp" line="1251"/>
+        <source>lbs</source>
+        <translation>US libra</translation>
     </message>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="28"/>
-        <source>unknown</source>
-        <translation>neznámy</translation>
+        <location filename="../core/qthelper.cpp" line="848"/>
+        <location filename="../core/qthelper.cpp" line="1300"/>
+        <source>bar</source>
+        <translation>bar</translation>
     </message>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="105"/>
-        <source>h:</source>
-        <translation type="unfinished"/>
+        <location filename="../core/qthelper.cpp" line="850"/>
+        <location filename="../core/qthelper.cpp" line="1299"/>
+        <source>psi</source>
+        <translation>psi</translation>
     </message>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="105"/>
-        <source>min</source>
-        <translation>min</translation>
+        <location filename="../core/qthelper.cpp" line="871"/>
+        <location filename="../core/qthelper.cpp" line="1235"/>
+        <source>AIR</source>
+        <translation>Vzduch</translation>
     </message>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="337"/>
-        <source>Multiple</source>
+        <location filename="../core/qthelper.cpp" line="873"/>
+        <source>EAN</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="../core/qthelper.cpp" line="957"/>
+        <location filename="../core/qthelper.cpp" line="962"/>
         <source>(%n dive(s))</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="816"/>
-        <location filename="../core/qthelper.cpp" line="1228"/>
-        <source>kg</source>
-        <translation>kg</translation>
+        <location filename="../core/qthelper.cpp" line="1235"/>
+        <source>OXYGEN</source>
+        <translation>KYSLÍK</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="818"/>
-        <location filename="../core/qthelper.cpp" line="1229"/>
-        <source>lbs</source>
-        <translation>US libra</translation>
+        <location filename="../core/qthelper.cpp" line="1322"/>
+        <source>l</source>
+        <translation>l</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="763"/>
-        <location filename="../core/qthelper.cpp" line="1252"/>
-        <source>ft</source>
-        <translation>ft</translation>
+        <location filename="../core/qthelper.cpp" line="1323"/>
+        <source>cuft</source>
+        <translation>cuft</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="761"/>
-        <location filename="../core/qthelper.cpp" line="1253"/>
-        <source>m</source>
-        <translation>m</translation>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="29"/>
+        <source>unknown</source>
+        <translation>neznámy</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="789"/>
-        <source>C</source>
-        <translation>C</translation>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="114"/>
+        <source>h:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="791"/>
-        <source>F</source>
-        <translation>F</translation>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="114"/>
+        <source>min</source>
+        <translation>min</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="845"/>
-        <location filename="../core/qthelper.cpp" line="1275"/>
-        <source>psi</source>
-        <translation>psi</translation>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="63"/>
+        <source>Remove this point</source>
+        <translation>Odstrániť tento bod</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="843"/>
-        <location filename="../core/qthelper.cpp" line="1276"/>
-        <source>bar</source>
-        <translation>bar</translation>
+        <location filename="../desktop-widgets/globe.cpp" line="327"/>
+        <source>Move the map and double-click to set the dive location</source>
+        <translation>Posuň mapu a dvojklikom označ miesto ponoru</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="868"/>
-        <source>EAN</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="32"/>
+        <source>Average</source>
+        <translation>Priemer</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="1298"/>
-        <source>l</source>
-        <translation>l</translation>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="35"/>
+        <source>Minimum</source>
+        <translation>Minimum</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="1299"/>
-        <source>cuft</source>
-        <translation>cuft</translation>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="38"/>
+        <source>Maximum</source>
+        <translation>Maximum</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="625"/>
@@ -7138,17 +7284,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <source>Malformed XML response. Line %1: %2</source>
         <translation>Nekorektná XML odpoveď. Riadok %1: %2</translation>
     </message>
-    <message>
-        <location filename="../core/gpslocation.h" line="13"/>
-        <source>Waiting to aquire GPS location</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>ReadSettingsThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1651"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1676"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1640"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1665"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Táto funkcia pre daný počítač zatiaľ nie je k dispozícii.</translation>
     </message>
@@ -7177,7 +7318,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ResetSettingsThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1775"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1764"/>
         <source>Reset settings failed!</source>
         <translation type="unfinished"/>
     </message>
@@ -7215,6 +7356,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ShiftImageTimesDialog</name>
     <message>
+        <location filename="../desktop-widgets/shiftimagetimes.ui" line="23"/>
+        <location filename="../build/ui_shiftimagetimes.h" line="184"/>
+        <source>Shift selected image times</source>
+        <translation>Posun časov vybraných obrázkov</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/shiftimagetimes.ui" line="34"/>
         <location filename="../build/ui_shiftimagetimes.h" line="185"/>
         <source>Shift times of image(s) by</source>
@@ -7227,12 +7374,6 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>h:mm</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/shiftimagetimes.ui" line="23"/>
-        <location filename="../build/ui_shiftimagetimes.h" line="184"/>
-        <source>Shift selected image times</source>
-        <translation>Posun časov vybraných obrázkov</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/shiftimagetimes.ui" line="105"/>
         <location filename="../build/ui_shiftimagetimes.h" line="187"/>
         <source>Earlier</source>
@@ -7282,12 +7423,12 @@ Not all images have timestamps in the range between
         <translation>Aký dátum a čas je zobrazený na fotke?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="297"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="296"/>
         <source>Open image file</source>
         <translation>Otvoriť súbory s obrázkami</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="299"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="298"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>Grafické súbory (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -7445,49 +7586,49 @@ Not all images have timestamps in the range between
 <context>
     <name>SocialNetworkDialog</name>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="339"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="284"/>
         <source>Dive date: %1 
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="342"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="287"/>
         <source>Duration: %1 
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="343"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="288"/>
         <source>h:</source>
         <comment>abbreviation for hours plus separator</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="344"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="289"/>
         <source>min</source>
         <comment>abbreviation for minutes</comment>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="347"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="292"/>
         <source>Dive location: %1 
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="350"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="295"/>
         <source>Buddy: %1 
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="353"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="298"/>
         <source>Divemaster: %1 
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="356"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="301"/>
         <source>
 %1</source>
         <translation type="unfinished"/>
@@ -7572,9 +7713,20 @@ Not all images have timestamps in the range between
     <name>StartPage</name>
     <message>
         <location filename="../mobile-widgets/qml/StartPage.qml" line="19"/>
-        <source>To use Subsurface-mobile with Subsurface cloud storage, please enteryour cloud credentials.
+        <source>To use Subsurface-mobile with Subsurface cloud storage, please enter your cloud credentials.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/StartPage.qml" line="20"/>
+        <source>If this is the first time you use Subsurface cloud storage, enter a valid email (all lower case) and a password of your choice (letters and numbers). The server will send a PIN to the email address provided that you will have to enter here.
 
-To use Subsurface-mobile only with local data on this device, tap on the no cloud icon below.</source>
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/StartPage.qml" line="23"/>
+        <source>To use Subsurface-mobile only with local data on this device, tap on the no cloud icon below.</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -7613,7 +7765,12 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>SubsurfaceWebServices</name>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="419"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="395"/>
+        <source>Enter User ID and click Download</source>
+        <translation>Zadaj ID užívateľa a klikni na Stiahnutie</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="417"/>
         <source>Webservice</source>
         <translation>Webservis</translation>
     </message>
@@ -7638,30 +7795,25 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
         <translation>Chyba spojenia:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="557"/>
-        <source>Download successful</source>
-        <translation>Sťahovanie úspešné</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="551"/>
         <source>Invalid user identifier!</source>
         <translation>Neplatný identifikátor užívateľa!</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="397"/>
-        <source>Enter User ID and click Download</source>
-        <translation>Zadaj ID užívateľa a klikni na Stiahnutie</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="554"/>
         <source>Cannot parse response!</source>
         <translation>Nemôžem spracovať odpoveď!</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="557"/>
+        <source>Download successful</source>
+        <translation>Sťahovanie úspešné</translation>
+    </message>
 </context>
 <context>
     <name>SuitFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="674"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="672"/>
         <source>Suits: </source>
         <translation>Obleky:</translation>
     </message>
@@ -7669,7 +7821,7 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>SuitsFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="123"/>
+        <location filename="../qt-models/filtermodels.cpp" line="128"/>
         <source>No suit set</source>
         <translation type="unfinished"/>
     </message>
@@ -7688,7 +7840,7 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>TagFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="595"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="593"/>
         <source>Tags: </source>
         <translation>Značky:</translation>
     </message>
@@ -7696,7 +7848,7 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>TagFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="148"/>
+        <location filename="../qt-models/filtermodels.cpp" line="153"/>
         <source>Empty tags</source>
         <translation>Žiadne značky</translation>
     </message>
@@ -7722,6 +7874,11 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>TemplateEdit</name>
     <message>
+        <location filename="../desktop-widgets/templateedit.ui" line="14"/>
+        <source>Edit template</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/templateedit.ui" line="37"/>
         <source>Preview</source>
         <translation type="unfinished"/>
@@ -7767,11 +7924,6 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
         <translation>Veľkosť fontu</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/templateedit.ui" line="14"/>
-        <source>Edit template</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/templateedit.ui" line="165"/>
         <source>Color palette</source>
         <translation type="unfinished"/>
@@ -7953,85 +8105,12 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>TextHyperlinkEventFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="817"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="815"/>
         <source>%1click to visit %2</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>ThemeTest</name>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="29"/>
-        <source>Theme Information</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="33"/>
-        <source>Screen</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="42"/>
-        <source>Geometry (pixels):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="49"/>
-        <source>Geometry (gridUnits):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="56"/>
-        <source>Units.gridUnit:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="63"/>
-        <source>Units.devicePixelRatio:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="70"/>
-        <source>Font Metrics</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="76"/>
-        <source>FontMetrics pointSize:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="83"/>
-        <source>FontMetrics pixelSize:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="90"/>
-        <source>FontMetrics devicePixelRatio:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="97"/>
-        <source>Text item pixelSize:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="104"/>
-        <source>Text item pointSize:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="111"/>
-        <source>Pixel density:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="118"/>
-        <source>Height of default font:</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
     <name>ToolTipItem</name>
     <message>
         <location filename="../profile-widget/divetooltipitem.cpp" line="136"/>
@@ -8042,102 +8121,107 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>TripItem</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="67"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="68"/>
         <source>(%1 shown)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="194"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="197"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="215"/>
         <source>Date</source>
         <translation>Dátum</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="200"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="218"/>
         <source>Rating</source>
         <translation>Hodnotenie</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
         <source>Depth(%1)</source>
         <translation>Hĺbka(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="206"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="224"/>
         <source>Duration</source>
         <translation>Dĺžka (min)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="209"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="227"/>
         <source>Temp(%1%2)</source>
         <translation>Tepl(%1%2)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
         <source>Weight(%1)</source>
         <translation>Záťaž(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
         <source>lbs</source>
         <translation>US libra</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="215"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="233"/>
         <source>Suit</source>
         <translation>Oblek</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="218"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="236"/>
         <source>Cyl</source>
         <translation>Fľaša</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="239"/>
         <source>Gas</source>
         <translation>Zmes</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="244"/>
         <source>SAC(%1)</source>
         <translation>SAC(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="244"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="229"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="247"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="232"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="250"/>
         <source>Max CNS</source>
         <translation>Max. CNS</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="235"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="253"/>
+        <source>Photos before/during/after dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="256"/>
         <source>Location</source>
         <translation>Miesto</translation>
     </message>
@@ -8160,72 +8244,73 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>UpdateManager</name>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="69"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="61"/>
         <source>Check for updates.</source>
         <translation>Kontrola novšej verzie.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="70"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="62"/>
         <source>Subsurface was unable to check for updates.</source>
         <translation>Subsurface nedokázal skontrolovať existenciu novšej verzie.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="75"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="67"/>
         <source>The following error occurred:</source>
         <translation>Vyskytla sa nasledujúca chyba:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="76"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="68"/>
         <source>Please check your internet connection.</source>
         <translation>Prosím, skontroluj pripojenie na internet.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="86"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="78"/>
         <source>You are using the latest version of Subsurface.</source>
         <translation>Používaš poslednu verziu Subsurface.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="89"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="81"/>
         <source>A new version of Subsurface is available.&lt;br/&gt;Click on:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; to download it.</source>
         <translation>Nová verzia Subsurface je k dispozícii.&lt;br/&gt;Klikni na:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt;.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="95"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="87"/>
         <source>A new version of Subsurface is available.</source>
         <translation>K dispozícii je nová verzia Subsurface.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="96"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="88"/>
         <source>Latest version is %1, please check %2 our download page %3 for information in how to update.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="106"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="98"/>
         <source>Newest release version is </source>
         <translation>Najnovšia verzia je</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="107"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="99"/>
         <source>The server returned the following information:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="125"/>
-        <source>Subsurface is checking every two weeks if a new version is available. If you don&apos;t want Subsurface to continue checking, please click Decline.</source>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="117"/>
+        <source>Subsurface is checking every two weeks if a new version is available. 
+ If you don&apos;t want Subsurface to continue checking, please click Decline.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="126"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="119"/>
         <source>Decline</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="127"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="120"/>
         <source>Accept</source>
         <translation>Akceptovať</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="129"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="122"/>
         <source>Automatic check for updates</source>
         <translation type="unfinished"/>
     </message>
@@ -8247,24 +8332,6 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>UserSurvey</name>
     <message>
-        <location filename="../desktop-widgets/usersurvey.ui" line="44"/>
-        <location filename="../build/ui_usersurvey.h" line="151"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;We would love to learn more about our users, their preferences and their usage habits. Please spare a minute to fill out this form and submit it to the Subsurface team.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/usersurvey.ui" line="115"/>
-        <location filename="../build/ui_usersurvey.h" line="156"/>
-        <source>Other software/sources</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/usersurvey.ui" line="128"/>
-        <location filename="../build/ui_usersurvey.h" line="157"/>
-        <source>Manually entering dives</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="14"/>
         <location filename="../build/ui_usersurvey.h" line="149"/>
         <source>User survey</source>
@@ -8277,6 +8344,12 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
         <translation>Subsurface dotazník</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/usersurvey.ui" line="44"/>
+        <location filename="../build/ui_usersurvey.h" line="151"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;We would love to learn more about our users, their preferences and their usage habits. Please spare a minute to fill out this form and submit it to the Subsurface team.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="63"/>
         <location filename="../build/ui_usersurvey.h" line="152"/>
         <source>Technical diver</source>
@@ -8301,6 +8374,18 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/usersurvey.ui" line="115"/>
+        <location filename="../build/ui_usersurvey.h" line="156"/>
+        <source>Other software/sources</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/usersurvey.ui" line="128"/>
+        <location filename="../build/ui_usersurvey.h" line="157"/>
+        <source>Manually entering dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="141"/>
         <location filename="../build/ui_usersurvey.h" line="158"/>
         <source>Android/iPhone companion app</source>
@@ -8331,6 +8416,11 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/usersurvey.cpp" line="18"/>
+        <source>Send</source>
+        <translation>Poslať</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/usersurvey.cpp" line="43"/>
         <source>
 Operating system: %1</source>
@@ -8371,19 +8461,14 @@ Jazyk: %1</translation>
         <translation>Spýtajte sa neskôr</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/usersurvey.cpp" line="101"/>
-        <source>Submit user survey.</source>
-        <translation>Odoslať dotazník.</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/usersurvey.cpp" line="82"/>
         <source>Ask again?</source>
         <translation>Spýtať sa znova?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/usersurvey.cpp" line="18"/>
-        <source>Send</source>
-        <translation>Poslať</translation>
+        <location filename="../desktop-widgets/usersurvey.cpp" line="101"/>
+        <source>Submit user survey.</source>
+        <translation>Odoslať dotazník.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/usersurvey.cpp" line="102"/>
@@ -8475,12 +8560,12 @@ Jazyk: %1</translation>
         <translation>Nahratie</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="324"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="325"/>
         <source>Operation timed out</source>
         <translation>Čas operácie vypršal</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="345"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="346"/>
         <source>Transferring data...</source>
         <translation>Prenášanie dát...</translation>
     </message>
@@ -8515,18 +8600,18 @@ Jazyk: %1</translation>
 <context>
     <name>WriteSettingsThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1702"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1709"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1718"/>
-        <source>Failed!</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1700"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1721"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1689"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1710"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Daná funkcia pre zvolený počítač zatiaľ nie je k dispozícii.</translation>
     </message>
+    <message>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1691"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1698"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1707"/>
+        <source>Failed!</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>YearlyStatisticsModel</name>
@@ -8648,7 +8733,7 @@ Maximum</translation>
 <context>
     <name>getextFromC</name>
     <message>
-        <location filename="../core/libdivecomputer.c" line="674"/>
+        <location filename="../core/libdivecomputer.c" line="737"/>
         <source>Error parsing the header</source>
         <translation type="unfinished"/>
     </message>
@@ -8656,38 +8741,377 @@ Maximum</translation>
 <context>
     <name>gettextFromC</name>
     <message>
+        <location filename="../core/cochran.c" line="309"/>
+        <location filename="../core/cochran.c" line="315"/>
+        <location filename="../core/cochran.c" line="385"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>deco stop</source>
+        <translation>dekompresná zastávka</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="336"/>
+        <location filename="../core/cochran.c" line="390"/>
+        <location filename="../core/file.c" line="777"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>ascent</source>
+        <translation>výstup</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="342"/>
+        <location filename="../core/file.c" line="755"/>
+        <source>battery</source>
+        <translation>batéria</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="348"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
+        <source>OLF</source>
+        <translation>OLF</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="353"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
+        <source>maxdepth</source>
+        <translation>max. hĺbka</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="358"/>
+        <location filename="../core/cochran.c" line="404"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
+        <source>pO₂</source>
+        <translation>pO₂</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="365"/>
+        <location filename="../core/cochran.c" line="414"/>
+        <location filename="../core/cochran.c" line="421"/>
+        <location filename="../core/file.c" line="868"/>
+        <location filename="../core/libdivecomputer.c" line="225"/>
+        <location filename="../core/libdivecomputer.c" line="228"/>
+        <source>gaschange</source>
+        <translation>zmena plynu</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="370"/>
+        <location filename="../core/cochran.c" line="409"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>rbt</source>
+        <translation>rbt</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="379"/>
+        <location filename="../core/cochran.c" line="426"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>ceiling</source>
+        <translation>strop</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="395"/>
+        <location filename="../core/libdivecomputer.c" line="224"/>
+        <source>transmitter</source>
+        <translation>vysielač</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="153"/>
+        <source>Error: the file does not appear to be a DATATRAK divelog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="286"/>
+        <source>clear</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="289"/>
+        <source>misty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="292"/>
+        <source>fog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="295"/>
+        <source>rain</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="298"/>
+        <source>storm</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="301"/>
+        <source>snow</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="321"/>
+        <source>No suit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="324"/>
+        <source>Shorty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="327"/>
+        <source>Combi</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="330"/>
+        <source>Wet suit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="333"/>
+        <source>Semidry suit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="336"/>
+        <source>Dry suit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="396"/>
+        <source>no stop</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="398"/>
+        <location filename="../core/dive.c" line="29"/>
+        <source>deco</source>
+        <translation>deco</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="400"/>
+        <source>single ascent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="402"/>
+        <source>multiple ascent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="404"/>
+        <location filename="../core/dive.c" line="27"/>
+        <source>fresh</source>
+        <translation>čerstvý</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="406"/>
+        <source>salt water</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="431"/>
+        <source>sight seeing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="433"/>
+        <source>club dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="435"/>
+        <location filename="../core/dive.c" line="28"/>
+        <source>instructor</source>
+        <translation>inštruktor</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="437"/>
+        <source>instruction</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="439"/>
+        <location filename="../core/dive.c" line="27"/>
+        <source>night</source>
+        <translation>nočný</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="441"/>
+        <location filename="../core/dive.c" line="25"/>
+        <source>cave</source>
+        <translation>jaskyňa</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="443"/>
+        <location filename="../core/dive.c" line="24"/>
+        <source>ice</source>
+        <translation>ľad</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="445"/>
+        <source>search</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="455"/>
+        <location filename="../core/dive.c" line="25"/>
+        <source>wreck</source>
+        <translation>vrak</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="457"/>
+        <location filename="../core/dive.c" line="26"/>
+        <source>river</source>
+        <translation>rieka</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="459"/>
+        <location filename="../core/dive.c" line="23"/>
+        <source>drift</source>
+        <translation>prúdový</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="461"/>
+        <location filename="../core/dive.c" line="28"/>
+        <source>photo</source>
+        <translation>fotenie</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="463"/>
+        <source>other</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="474"/>
+        <source>Other activities</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="498"/>
+        <source>Datatrak/Wlog notes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="537"/>
+        <source>Manually entered dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="588"/>
+        <source>Unknown</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="674"/>
+        <source>Error: couldn&apos;t open the file %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="687"/>
+        <source>Error: no dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="23"/>
+        <source>boat</source>
+        <translation>z lode</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="23"/>
+        <source>shore</source>
+        <translation>z brehu</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="24"/>
+        <source>deep</source>
+        <translation>hlboký</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="24"/>
+        <source>cavern</source>
+        <translation>dutina</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="25"/>
+        <source>altitude</source>
+        <translation>výškovy</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="26"/>
+        <source>pool</source>
+        <translation>bazén</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="26"/>
+        <source>lake</source>
+        <translation>jazero</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="27"/>
+        <source>student</source>
+        <translation>študent</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="28"/>
+        <source>video</source>
+        <translation>kamera</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="33"/>
+        <source>OC-gas</source>
+        <translation>OC-zmes</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="33"/>
+        <source>diluent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="33"/>
+        <location filename="../core/equipment.c" line="88"/>
+        <location filename="../core/planner.c" line="1436"/>
+        <location filename="../core/planner.c" line="1439"/>
+        <source>oxygen</source>
+        <translation>kyslík</translation>
+    </message>
+    <message>
         <location filename="../core/dive.c" line="181"/>
         <source>pascal</source>
         <translation>pascal</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="186"/>
-        <location filename="../core/qthelper.cpp" line="669"/>
+        <location filename="../core/qthelper.cpp" line="674"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="190"/>
-        <location filename="../core/qthelper.cpp" line="672"/>
+        <location filename="../core/qthelper.cpp" line="677"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
+        <location filename="../core/dive.c" line="227"/>
+        <source>ℓ</source>
+        <translation>ℓ</translation>
+    </message>
+    <message>
         <location filename="../core/dive.c" line="232"/>
         <source>cuft</source>
         <translation>cuft</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="269"/>
-        <location filename="../core/qthelper.cpp" line="590"/>
-        <location filename="../core/qthelper.cpp" line="605"/>
+        <location filename="../core/qthelper.cpp" line="595"/>
+        <location filename="../core/qthelper.cpp" line="610"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="274"/>
-        <location filename="../core/qthelper.cpp" line="593"/>
-        <location filename="../core/qthelper.cpp" line="607"/>
+        <location filename="../core/qthelper.cpp" line="598"/>
+        <location filename="../core/qthelper.cpp" line="612"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
@@ -8713,53 +9137,58 @@ Maximum</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="325"/>
-        <location filename="../core/qthelper.cpp" line="616"/>
-        <location filename="../core/qthelper.cpp" line="626"/>
+        <location filename="../core/qthelper.cpp" line="621"/>
+        <location filename="../core/qthelper.cpp" line="631"/>
         <source>lbs</source>
         <translation>US libra</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="329"/>
-        <location filename="../core/qthelper.cpp" line="614"/>
-        <location filename="../core/qthelper.cpp" line="624"/>
+        <location filename="../core/qthelper.cpp" line="619"/>
+        <location filename="../core/qthelper.cpp" line="629"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="1772"/>
+        <location filename="../core/dive.c" line="1751"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) alebo (%s)</translation>
     </message>
     <message>
-        <location filename="../core/divelist.c" line="484"/>
+        <location filename="../core/divelist.c" line="487"/>
         <location filename="../core/equipment.c" line="84"/>
-        <location filename="../core/planner.c" line="1411"/>
-        <location filename="../core/planner.c" line="1414"/>
+        <location filename="../core/planner.c" line="1432"/>
+        <location filename="../core/planner.c" line="1435"/>
         <source>air</source>
         <translation>vzduch</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="197"/>
+        <location filename="../core/equipment.c" line="86"/>
+        <source>EAN%d</source>
+        <translation>EAN%d</translation>
+    </message>
+    <message>
+        <location filename="../core/equipment.c" line="198"/>
         <source>integrated</source>
         <translation>integrované</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="198"/>
+        <location filename="../core/equipment.c" line="199"/>
         <source>belt</source>
         <translation>opasok</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="199"/>
+        <location filename="../core/equipment.c" line="200"/>
         <source>ankle</source>
         <translation>členok</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="200"/>
+        <location filename="../core/equipment.c" line="201"/>
         <source>backplate weight</source>
         <translation>backplate závažie</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="201"/>
+        <location filename="../core/equipment.c" line="202"/>
         <source>clip-on</source>
         <translation>clip-on</translation>
     </message>
@@ -8772,8 +9201,8 @@ Maximum</translation>
         <location filename="../core/file.c" line="121"/>
         <location filename="../core/file.c" line="512"/>
         <location filename="../core/file.c" line="597"/>
-        <location filename="../core/file.c" line="924"/>
-        <location filename="../core/file.c" line="1056"/>
+        <location filename="../core/file.c" line="909"/>
+        <location filename="../core/file.c" line="1092"/>
         <location filename="../core/ostctools.c" line="80"/>
         <source>Failed to read &apos;%s&apos;</source>
         <translation>Chyba pri načítaní &apos;%s&apos;</translation>
@@ -8831,492 +9260,501 @@ Maximum</translation>
         <translation>O₂ kalibrácia</translation>
     </message>
     <message>
-        <location filename="../core/file.c" line="887"/>
-        <source>No matching DC found for file &apos;%s&apos;</source>
-        <translation>Pre súbor &apos;%s&apos; nebol nájdený zodpovedajúci počítač</translation>
+        <location filename="../core/git-access.c" line="134"/>
+        <source>Local cache directory %s corrupted - can&apos;t sync with Subsurface cloud storage</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>none</source>
-        <translation>žiaden</translation>
+        <location filename="../core/git-access.c" line="157"/>
+        <location filename="../core/git-access.c" line="177"/>
+        <source>Could not update local cache to newer remote data</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="309"/>
-        <location filename="../core/cochran.c" line="315"/>
-        <location filename="../core/cochran.c" line="385"/>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>deco stop</source>
-        <translation>dekompresná zastávka</translation>
+        <location filename="../core/git-access.c" line="170"/>
+        <source>Subsurface cloud storage corrupted</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="342"/>
-        <location filename="../core/file.c" line="755"/>
-        <source>battery</source>
-        <translation>batéria</translation>
+        <location filename="../core/git-access.c" line="284"/>
+        <source>Could not update Subsurface cloud storage, try again later</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="370"/>
-        <location filename="../core/cochran.c" line="409"/>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>rbt</source>
-        <translation>rbt</translation>
+        <location filename="../core/git-access.c" line="344"/>
+        <source>Remote storage and local data diverged. Error: merge failed (%s)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="336"/>
-        <location filename="../core/cochran.c" line="390"/>
-        <location filename="../core/file.c" line="777"/>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>ascent</source>
-        <translation>výstup</translation>
+        <location filename="../core/git-access.c" line="374"/>
+        <source>Remote storage and local data diverged. Cannot combine local and remote changes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="379"/>
-        <location filename="../core/cochran.c" line="426"/>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>ceiling</source>
-        <translation>strop</translation>
+        <location filename="../core/git-access.c" line="408"/>
+        <source>Remote storage and local data diverged</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>workload</source>
-        <translation>záťaž</translation>
+        <location filename="../core/git-access.c" line="411"/>
+        <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="395"/>
-        <location filename="../core/libdivecomputer.c" line="203"/>
-        <source>transmitter</source>
-        <translation>vysielač</translation>
+        <location filename="../core/git-access.c" line="420"/>
+        <source>Problems with local cache of Subsurface cloud data</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="203"/>
+        <location filename="../core/git-access.c" line="421"/>
+        <source>Moved cache data to %s. Please try the operation again.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/git-access.c" line="743"/>
+        <source>Error connecting to Subsurface cloud storage</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/git-access.c" line="746"/>
+        <source>git clone of %s failed (%s)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="210"/>
+        <location filename="../core/parse-xml.c" line="3317"/>
+        <location filename="../core/uemis-downloader.c" line="134"/>
+        <source>unknown</source>
+        <translation>neznámy</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>none</source>
+        <translation>žiaden</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>workload</source>
+        <translation>záťaž</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="224"/>
         <source>violation</source>
         <translation>prekročenie</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="203"/>
+        <location filename="../core/libdivecomputer.c" line="224"/>
         <source>bookmark</source>
         <translation>poznámka</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="203"/>
+        <location filename="../core/libdivecomputer.c" line="224"/>
         <source>surface</source>
         <translation>povrch</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="203"/>
+        <location filename="../core/libdivecomputer.c" line="224"/>
         <source>safety stop</source>
         <translation>bezpečnostná zastávka</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="365"/>
-        <location filename="../core/cochran.c" line="414"/>
-        <location filename="../core/cochran.c" line="421"/>
-        <location filename="../core/file.c" line="868"/>
-        <location filename="../core/libdivecomputer.c" line="204"/>
-        <location filename="../core/libdivecomputer.c" line="207"/>
-        <source>gaschange</source>
-        <translation>zmena plynu</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="204"/>
+        <location filename="../core/libdivecomputer.c" line="225"/>
         <source>safety stop (voluntary)</source>
         <translation>bezpečnostná zastávka (dobrovoľná)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="204"/>
+        <location filename="../core/libdivecomputer.c" line="225"/>
         <source>safety stop (mandatory)</source>
         <translation>bezpečnostná zastávka (povinná)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="205"/>
+        <location filename="../core/libdivecomputer.c" line="226"/>
         <source>deepstop</source>
         <translation>hĺbková zastávka</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="205"/>
+        <location filename="../core/libdivecomputer.c" line="226"/>
         <source>ceiling (safety stop)</source>
         <translation>strop (bezpečnostná zastávka)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="205"/>
-        <source>divetime</source>
-        <translation>čas ponoru</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="205"/>
+        <location filename="../core/libdivecomputer.c" line="226"/>
         <source>below floor</source>
         <comment>event showing dive is below deco floor and adding deco time</comment>
         <translation>pod stropom</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="353"/>
-        <location filename="../core/libdivecomputer.c" line="206"/>
-        <source>maxdepth</source>
-        <translation>max. hĺbka</translation>
-    </message>
-    <message>
-        <location filename="../core/cochran.c" line="348"/>
-        <location filename="../core/libdivecomputer.c" line="206"/>
-        <source>OLF</source>
-        <translation>OLF</translation>
+        <location filename="../core/libdivecomputer.c" line="226"/>
+        <source>divetime</source>
+        <translation>čas ponoru</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="206"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
         <source>airtime</source>
         <translation>čas na vzduchu</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="206"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
         <source>rgbm</source>
         <translation>rgbm</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="206"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
         <source>heading</source>
         <translation>smer</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="358"/>
-        <location filename="../core/cochran.c" line="404"/>
-        <location filename="../core/libdivecomputer.c" line="206"/>
-        <source>pO₂</source>
-        <translation>pO₂</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="207"/>
+        <location filename="../core/libdivecomputer.c" line="228"/>
         <source>tissue level warning</source>
         <translation>upozornenie nasýtenia tkanív</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="207"/>
+        <location filename="../core/libdivecomputer.c" line="228"/>
         <source>non stop time</source>
         <translation>non stop čas</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="224"/>
+        <location filename="../core/libdivecomputer.c" line="237"/>
         <source>invalid event number</source>
         <translation>neplatné číslo udalosti</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="658"/>
-        <source>Unable to create parser for %s %s</source>
-        <translation>Nie je možné spracovať %s %s</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="664"/>
-        <source>Error registering the data</source>
-        <translation>Chyba registrácie dát</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="495"/>
+        <location filename="../core/libdivecomputer.c" line="553"/>
         <source>Error parsing the datetime</source>
         <translation>Chyba spracovania času</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="513"/>
+        <location filename="../core/libdivecomputer.c" line="571"/>
         <source>Dive %d: %s</source>
         <translation>Ponor #%d: %s</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="519"/>
+        <location filename="../core/libdivecomputer.c" line="577"/>
         <source>Error parsing the divetime</source>
         <translation>Chyba spracovania času ponoru</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="529"/>
+        <location filename="../core/libdivecomputer.c" line="587"/>
         <source>Error parsing the maxdepth</source>
         <translation>Chyba spracovania maximálnej hĺbky</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="548"/>
+        <location filename="../core/libdivecomputer.c" line="606"/>
         <source>Error parsing temperature</source>
         <translation>Chyba spracovania teploty</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="568"/>
+        <location filename="../core/libdivecomputer.c" line="626"/>
         <source>Error parsing the gas mix count</source>
         <translation>Chyba spracovania dýchacích zmesí</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="580"/>
+        <location filename="../core/libdivecomputer.c" line="638"/>
         <source>Error obtaining water salinity</source>
         <translation>Chyba získania slanosti vody</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="589"/>
+        <location filename="../core/libdivecomputer.c" line="647"/>
         <source>Error obtaining surface pressure</source>
         <translation>Chyba pri zisťovaní tlaku na povrchu</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="614"/>
+        <location filename="../core/libdivecomputer.c" line="672"/>
         <source>Error obtaining divemode</source>
         <translation>Chyba načítania módu ponoru</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="634"/>
+        <location filename="../core/libdivecomputer.c" line="692"/>
         <source>Error parsing the gas mix</source>
         <translation>Chyba spracovania zmesi plynu</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="684"/>
+        <location filename="../core/libdivecomputer.c" line="717"/>
+        <source>Unable to create parser for %s %s</source>
+        <translation>Nie je možné spracovať %s %s</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="723"/>
+        <source>Error registering the data</source>
+        <translation>Chyba registrácie dát</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="744"/>
         <source>Error parsing the samples</source>
         <translation>Chyba spracovania vzoriek</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="822"/>
+        <location filename="../core/libdivecomputer.c" line="882"/>
         <source>Event: waiting for user action</source>
         <translation>Udalosť: Čakanie na vstup uživateľa</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="830"/>
+        <location filename="../core/libdivecomputer.c" line="890"/>
         <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="../core/libdivecomputer.c" line="894"/>
+        <location filename="../core/libdivecomputer.c" line="954"/>
         <source>Error registering the event handler.</source>
         <translation>Chyba registrácia správcu udalosti.</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="899"/>
+        <location filename="../core/libdivecomputer.c" line="959"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Chyba registrácie správcu ukončenia</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="920"/>
+        <location filename="../core/libdivecomputer.c" line="980"/>
         <source>Dive data import error</source>
         <translation>Chyba importu dát</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="959"/>
+        <location filename="../core/libdivecomputer.c" line="1019"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Problém inicializácie libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="966"/>
+        <location filename="../core/libdivecomputer.c" line="1026"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Nie je možné otvoriť %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="992"/>
+        <location filename="../core/libdivecomputer.c" line="1048"/>
         <source>Insufficient privileges to open the device %s %s (%s)</source>
         <translation>Nedostatočné privilégia na otvorenie zariadenia %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../core/parse-xml.c" line="517"/>
-        <source>Strange percentage reading %s
+        <location filename="../core/load-git.c" line="194"/>
+        <location filename="../core/parse-xml.c" line="1242"/>
+        <source>multiple GPS locations for this dive site; also %s
 </source>
-        <translation>Zvláštne percenta v %s
-</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/load-git.c" line="194"/>
-        <location filename="../core/parse-xml.c" line="1238"/>
-        <source>multiple GPS locations for this dive site; also %s
+        <location filename="../core/load-git.c" line="222"/>
+        <location filename="../core/parse-xml.c" line="1304"/>
+        <source>additional name for site: %s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/parse-xml.c" line="2044"/>
+        <location filename="../core/ostctools.c" line="120"/>
+        <location filename="../core/ostctools.c" line="152"/>
+        <source>Unknown DC in dive %d</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/ostctools.c" line="165"/>
+        <source>Error - %s - parsing dive %d</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/parse-xml.c" line="517"/>
+        <source>Strange percentage reading %s
+</source>
+        <translation>Zvláštne percenta v %s
+</translation>
+    </message>
+    <message>
+        <location filename="../core/parse-xml.c" line="2051"/>
         <source>Failed to parse &apos;%s&apos;</source>
         <translation>Chyba pri spracovaní &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../core/parse-xml.c" line="3741"/>
+        <location filename="../core/parse-xml.c" line="3774"/>
         <source>Can&apos;t open stylesheet %s</source>
         <translation>Neviem otvoriť šablónu %s</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="86"/>
-        <source>EAN%d</source>
-        <translation>EAN%d</translation>
+        <location filename="../core/planner.c" line="555"/>
+        <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE %s ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="1032"/>
-        <location filename="../core/planner.c" line="1184"/>
-        <source>Can&apos;t find gas %s</source>
-        <translation>Neviem nájsť zmes %s</translation>
+        <location filename="../core/planner.c" line="569"/>
+        <source>Decompression calculation aborted due to excessive time</source>
+        <translation>Výpočet dekompresie zrušený z dôvodu píliš dlhého času</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="368"/>
-        <source>Too many gas mixes</source>
-        <translation>Príliš veľa zmesí</translation>
+        <location filename="../core/planner.c" line="571"/>
+        <location filename="../core/planner.c" line="829"/>
+        <location filename="../core/planner.c" line="834"/>
+        <location filename="../core/planner.c" line="860"/>
+        <location filename="../core/planner.c" line="870"/>
+        <source>Warning:</source>
+        <translation>Upozornenie:</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="568"/>
-        <source>Decompression calculation aborted due to excessive time</source>
-        <translation>Výpočet dekompresie zrušený z dôvodu píliš dlhého času</translation>
+        <location filename="../core/planner.c" line="581"/>
+        <source>based on Bühlmann ZHL-16C with GFlow = %d and GFhigh = %d</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="586"/>
+        <source>based on VPM-B at nominal conservatism</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="588"/>
+        <source>based on VPM-B at +%d conservatism</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="590"/>
+        <source>, effective GF=%d/%d</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="594"/>
+        <source>recreational mode based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="592"/>
+        <location filename="../core/planner.c" line="598"/>
         <source>Subsurface dive plan</source>
         <translation>Subsurface plán ponoru</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="596"/>
-        <source>depth</source>
-        <translation>hĺbka</translation>
+        <location filename="../core/planner.c" line="599"/>
+        <source>&lt;div&gt;Runtime: %dmin&lt;/div&gt;&lt;br&gt;</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="602"/>
-        <source>runtime</source>
-        <translation>runtime</translation>
+        <location filename="../core/planner.c" line="604"/>
+        <source>depth</source>
+        <translation>hĺbka</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="599"/>
+        <location filename="../core/planner.c" line="607"/>
         <source>duration</source>
         <translation>trvanie</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="554"/>
-        <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE %s ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source>
-        <translation type="unfinished"/>
+        <location filename="../core/planner.c" line="610"/>
+        <source>runtime</source>
+        <translation>runtime</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="605"/>
+        <location filename="../core/planner.c" line="613"/>
         <source>gas</source>
         <translation>plyn</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="648"/>
+        <location filename="../core/planner.c" line="656"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation>Prechod na %.*f %s v %d:%02d min - runtime %d:%02u na %s (SP = %.1fbar)
 </translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="656"/>
+        <location filename="../core/planner.c" line="664"/>
         <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="../core/planner.c" line="669"/>
+        <location filename="../core/planner.c" line="677"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation>Zostaň v %.*f %s na %d:%02d min - runtime %d:%02u na %s (SP = %.1fbar)
 </translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="676"/>
+        <location filename="../core/planner.c" line="684"/>
         <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="../core/planner.c" line="721"/>
+        <location filename="../core/planner.c" line="729"/>
         <source>%3.0f%s</source>
         <translation>%3.0f%s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="724"/>
-        <location filename="../core/planner.c" line="728"/>
+        <location filename="../core/planner.c" line="732"/>
+        <location filename="../core/planner.c" line="736"/>
         <source>%3dmin</source>
         <translation>%3dmin</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="737"/>
-        <location filename="../core/planner.c" line="749"/>
+        <location filename="../core/planner.c" line="745"/>
+        <location filename="../core/planner.c" line="757"/>
         <source>(SP = %.1fbar)</source>
         <translation>(SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="772"/>
+        <location filename="../core/planner.c" line="780"/>
         <source>Switch gas to %s (SP = %.1fbar)</source>
         <translation>Zmena plynu na %s (SP = %.1fbar)
 </translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="774"/>
+        <location filename="../core/planner.c" line="782"/>
         <source>Switch gas to %s</source>
         <translation>Zmena plynu na %s
 </translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="793"/>
+        <location filename="../core/planner.c" line="801"/>
         <source>CNS</source>
         <translation>CNS</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="795"/>
+        <location filename="../core/planner.c" line="803"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="799"/>
+        <location filename="../core/planner.c" line="807"/>
         <source>Gas consumption (CCR legs excluded):</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="801"/>
+        <location filename="../core/planner.c" line="809"/>
         <source>Gas consumption:</source>
         <translation>Spotreba plynu:
 </translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="570"/>
-        <location filename="../core/planner.c" line="821"/>
-        <location filename="../core/planner.c" line="826"/>
-        <location filename="../core/planner.c" line="851"/>
-        <location filename="../core/planner.c" line="861"/>
-        <source>Warning:</source>
-        <translation>Upozornenie:</translation>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="580"/>
-        <source>based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="584"/>
-        <source>based on VPM-B at nominal conservatism</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="586"/>
-        <source>based on VPM-B at +%d conservatism</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="588"/>
-        <source>recreational mode based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="822"/>
+        <location filename="../core/planner.c" line="830"/>
         <source>this is more gas than available in the specified cylinder!</source>
         <translation>toto je väčšie množstvo plynu než je k dispozícií v danej fľaši!</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="827"/>
+        <location filename="../core/planner.c" line="835"/>
         <source>not enough reserve for gas sharing on ascent!</source>
         <translation>žiadna rezerva pre zdieľanie zmesi počas výstupu!</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="829"/>
+        <location filename="../core/planner.c" line="837"/>
         <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source>
         <translation>%.0f%s/%.0f%s z %s (%.0f%s/%.0f%s v plánovanom výstupe)</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="831"/>
+        <location filename="../core/planner.c" line="839"/>
         <source>%.0f%s (%.0f%s during planned ascent) of %s</source>
         <translation>%.0f%s (%.0f%s počas plánovaného výstupu) z %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="848"/>
+        <location filename="../core/planner.c" line="857"/>
         <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
         <translation>vysoká pO₂ hodnota %.2f v %d:%02u so zmesou %s v hĺbke %.*f %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="858"/>
+        <location filename="../core/planner.c" line="867"/>
         <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="1419"/>
+        <location filename="../core/planner.c" line="1194"/>
+        <source>Can&apos;t find gas %s</source>
+        <translation>Neviem nájsť zmes %s</translation>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="1440"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1280"/>
+        <location filename="../core/profile.c" line="1298"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
@@ -9325,70 +9763,70 @@ D: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1283"/>
+        <location filename="../core/profile.c" line="1301"/>
         <source>P: %d%s
 </source>
         <translation>P: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1287"/>
+        <location filename="../core/profile.c" line="1305"/>
         <source>T: %.1f%s
 </source>
         <translation>T: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1293"/>
+        <location filename="../core/profile.c" line="1311"/>
         <source>V: %.1f%s
 </source>
         <translation>V: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1296"/>
+        <location filename="../core/profile.c" line="1314"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation>SAC: %.*f%s/min
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1298"/>
+        <location filename="../core/profile.c" line="1316"/>
         <source>CNS: %u%%
 </source>
         <translation>CNS: %u%%
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1300"/>
+        <location filename="../core/profile.c" line="1318"/>
         <source>pO%s: %.2fbar
 </source>
         <translation>pO%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1302"/>
+        <location filename="../core/profile.c" line="1320"/>
         <source>pN%s: %.2fbar
 </source>
         <translation>pN%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1304"/>
+        <location filename="../core/profile.c" line="1322"/>
         <source>pHe: %.2fbar
 </source>
         <translation>pHe: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1307"/>
+        <location filename="../core/profile.c" line="1325"/>
         <source>MOD: %d%s
 </source>
         <translation>MOD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1314"/>
+        <location filename="../core/profile.c" line="1332"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
@@ -9397,7 +9835,7 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1318"/>
+        <location filename="../core/profile.c" line="1336"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
@@ -9406,170 +9844,175 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1331"/>
+        <location filename="../core/profile.c" line="1349"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation>Bezpečnostná zastávka: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1334"/>
+        <location filename="../core/profile.c" line="1352"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation>Bezpečnostná zastávka: neznáma @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1339"/>
+        <location filename="../core/profile.c" line="1357"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation>Deco: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1342"/>
+        <location filename="../core/profile.c" line="1360"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation>Deco: neznáma @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1346"/>
+        <location filename="../core/profile.c" line="1364"/>
         <source>In deco
 </source>
         <translation>In deco
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1348"/>
+        <location filename="../core/profile.c" line="1366"/>
         <source>NDL: %umin
 </source>
         <translation>NDL: %umin
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1351"/>
+        <location filename="../core/profile.c" line="1369"/>
         <source>TTS: %umin
 </source>
         <translation>TTS: %umin
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1354"/>
+        <location filename="../core/profile.c" line="1372"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation>Deco: %umin @ %.0f%s (calc)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1362"/>
+        <location filename="../core/profile.c" line="1380"/>
         <source>In deco (calc)
 </source>
         <translation>V deco (calc)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1365"/>
+        <location filename="../core/profile.c" line="1383"/>
         <source>NDL: %umin (calc)
 </source>
         <translation>NDL: %umin (calc)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1367"/>
+        <location filename="../core/profile.c" line="1385"/>
         <source>NDL: &gt;2h (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1371"/>
+        <location filename="../core/profile.c" line="1389"/>
         <source>TTS: %umin (calc)
 </source>
         <translation>TTS: %umin (calc)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1373"/>
+        <location filename="../core/profile.c" line="1391"/>
         <source>TTS: &gt;2h (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1376"/>
+        <location filename="../core/profile.c" line="1394"/>
         <source>RBT: %umin
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1379"/>
+        <location filename="../core/profile.c" line="1397"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation>Vypočítaný strop %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1385"/>
+        <location filename="../core/profile.c" line="1403"/>
         <source>Tissue %.0fmin: %.1f%s
 </source>
         <translation>Tkanivo %.0fmin: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1391"/>
+        <location filename="../core/profile.c" line="1409"/>
         <source>heartbeat: %d
 </source>
         <translation>tep srdca: %d
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1393"/>
+        <location filename="../core/profile.c" line="1411"/>
         <source>bearing: %d
 </source>
         <translation>smer: %d
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1396"/>
+        <location filename="../core/profile.c" line="1414"/>
         <source>mean depth to here %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1491"/>
+        <location filename="../core/profile.c" line="1515"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1495"/>
-        <location filename="../core/profile.c" line="1499"/>
-        <location filename="../core/profile.c" line="1503"/>
+        <location filename="../core/profile.c" line="1519"/>
+        <location filename="../core/profile.c" line="1523"/>
+        <location filename="../core/profile.c" line="1527"/>
         <source>%s %sD:%.1f%s</source>
         <translation>%s %sD:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1507"/>
+        <location filename="../core/profile.c" line="1531"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sD:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1511"/>
+        <location filename="../core/profile.c" line="1535"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1515"/>
-        <location filename="../core/profile.c" line="1519"/>
+        <location filename="../core/profile.c" line="1539"/>
+        <location filename="../core/profile.c" line="1543"/>
         <source>%s %sV:%.2f%s</source>
         <translation>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1526"/>
+        <location filename="../core/profile.c" line="1550"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s</translation>
     </message>
     <message>
+        <location filename="../core/profile.c" line="1575"/>
+        <source>%s SAC:%.*f %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../core/qthelper.cpp" line="67"/>
         <source>%1km</source>
         <translation type="unfinished"/>
@@ -9590,446 +10033,460 @@ EADD: %d%s
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="635"/>
+        <location filename="../core/qthelper.cpp" line="91"/>
+        <location filename="../core/qthelper.cpp" line="226"/>
+        <source>N</source>
+        <translation>N</translation>
+    </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="91"/>
+        <location filename="../core/qthelper.cpp" line="227"/>
+        <source>S</source>
+        <translation>S</translation>
+    </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="92"/>
+        <location filename="../core/qthelper.cpp" line="228"/>
+        <source>E</source>
+        <translation>E</translation>
+    </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="92"/>
+        <location filename="../core/qthelper.cpp" line="229"/>
+        <source>W</source>
+        <translation>W</translation>
+    </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="640"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="638"/>
+        <location filename="../core/qthelper.cpp" line="643"/>
         <source>F</source>
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="23"/>
-        <source>boat</source>
-        <translation>z lode</translation>
+        <location filename="../core/save-html.c" line="469"/>
+        <location filename="../core/save-html.c" line="553"/>
+        <location filename="../core/worldmap-save.c" line="111"/>
+        <source>Can&apos;t open file %s</source>
+        <translation>Neviem otvoriť súbor %s</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="23"/>
-        <source>shore</source>
-        <translation>z brehu</translation>
+        <location filename="../core/save-html.c" line="488"/>
+        <source>Number</source>
+        <translation>Číslo</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="459"/>
-        <location filename="../core/dive.c" line="23"/>
-        <source>drift</source>
-        <translation>prúdový</translation>
+        <location filename="../core/save-html.c" line="489"/>
+        <source>Date</source>
+        <translation>Dátum</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="24"/>
-        <source>deep</source>
-        <translation>hlboký</translation>
+        <location filename="../core/save-html.c" line="490"/>
+        <source>Time</source>
+        <translation>Čas</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="24"/>
-        <source>cavern</source>
-        <translation>dutina</translation>
+        <location filename="../core/save-html.c" line="491"/>
+        <source>Location</source>
+        <translation>Miesto</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="443"/>
-        <location filename="../core/dive.c" line="24"/>
-        <source>ice</source>
-        <translation>ľad</translation>
+        <location filename="../core/save-html.c" line="492"/>
+        <source>Air temp.</source>
+        <translation>Teplota vzduchu</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="445"/>
-        <source>search</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="493"/>
+        <source>Water temp.</source>
+        <translation>Teplota vody</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="455"/>
-        <location filename="../core/dive.c" line="25"/>
-        <source>wreck</source>
-        <translation>vrak</translation>
+        <location filename="../core/save-html.c" line="494"/>
+        <source>Dives</source>
+        <translation>Ponory</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="441"/>
-        <location filename="../core/dive.c" line="25"/>
-        <source>cave</source>
-        <translation>jaskyňa</translation>
+        <location filename="../core/save-html.c" line="495"/>
+        <source>Expand all</source>
+        <translation>Expandovať všetky</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="25"/>
-        <source>altitude</source>
-        <translation>výškovy</translation>
+        <location filename="../core/save-html.c" line="496"/>
+        <source>Collapse all</source>
+        <translation>Zredukovať všetky</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="26"/>
-        <source>pool</source>
-        <translation>bazén</translation>
+        <location filename="../core/save-html.c" line="497"/>
+        <source>Trips</source>
+        <translation>Akcie</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="26"/>
-        <source>lake</source>
-        <translation>jazero</translation>
+        <location filename="../core/save-html.c" line="498"/>
+        <source>Statistics</source>
+        <translation>Štatistika</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="457"/>
-        <location filename="../core/dive.c" line="26"/>
-        <source>river</source>
-        <translation>rieka</translation>
+        <location filename="../core/save-html.c" line="499"/>
+        <source>Advanced search</source>
+        <translation>Pokročilé vyhľadávanie</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="439"/>
-        <location filename="../core/dive.c" line="27"/>
-        <source>night</source>
-        <translation>nočný</translation>
+        <location filename="../core/save-html.c" line="502"/>
+        <source>Rating</source>
+        <translation>Hodnotenie</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="153"/>
-        <source>Error: the file does not appear to be a DATATRAK divelog</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="503"/>
+        <source>Visibility</source>
+        <translation>Viditeľnosť</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="286"/>
-        <source>clear</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="504"/>
+        <source>Duration</source>
+        <translation>Dĺžka (min)</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="289"/>
-        <source>misty</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="505"/>
+        <source>Divemaster</source>
+        <translation>Divemaster</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="292"/>
-        <source>fog</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="506"/>
+        <source>Buddy</source>
+        <translation>Buddy</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="295"/>
-        <source>rain</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="507"/>
+        <source>Suit</source>
+        <translation>Oblek</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="298"/>
-        <source>storm</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="508"/>
+        <source>Tags</source>
+        <translation>Značky</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="301"/>
-        <source>snow</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="509"/>
+        <location filename="../smtk-import/smartrak.c" line="251"/>
+        <location filename="../smtk-import/smartrak.c" line="321"/>
+        <source>Notes</source>
+        <translation>Poznámky</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="321"/>
-        <source>No suit</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="510"/>
+        <source>Show more details</source>
+        <translation>Zobraziť viac detailov</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="324"/>
-        <source>Shorty</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="513"/>
+        <source>Yearly statistics</source>
+        <translation>Ročná štatistika</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="327"/>
-        <source>Combi</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="514"/>
+        <source>Year</source>
+        <translation>Rok</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="330"/>
-        <source>Wet suit</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="515"/>
+        <source>Total time</source>
+        <translation>Celkový čas</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="333"/>
-        <source>Semidry suit</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="516"/>
+        <source>Average time</source>
+        <translation>Priemerný čas</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="336"/>
-        <source>Dry suit</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="517"/>
+        <source>Shortest time</source>
+        <translation>Najkratší čas</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="396"/>
-        <source>no stop</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="518"/>
+        <source>Longest time</source>
+        <translation>Najdlhší čas</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="400"/>
-        <source>single ascent</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="519"/>
+        <source>Average depth</source>
+        <translation>Priemerná hĺbka</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="402"/>
-        <source>multiple ascent</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="520"/>
+        <source>Min. depth</source>
+        <translation>Min. hĺbka</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="404"/>
-        <location filename="../core/dive.c" line="27"/>
-        <source>fresh</source>
-        <translation>čerstvý</translation>
+        <location filename="../core/save-html.c" line="521"/>
+        <source>Max. depth</source>
+        <translation>Max. hĺbka</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="406"/>
-        <source>salt water</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="522"/>
+        <source>Average SAC</source>
+        <translation>Priemerná SAC</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="431"/>
-        <source>sight seeing</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="523"/>
+        <source>Min. SAC</source>
+        <translation>Min. spotreba</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="433"/>
-        <source>club dive</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="524"/>
+        <source>Max. SAC</source>
+        <translation>Max. spotreba</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="437"/>
-        <source>instruction</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="525"/>
+        <source>Average temp.</source>
+        <translation>Priemerná teplota</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="463"/>
-        <source>other</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="526"/>
+        <source>Min. temp.</source>
+        <translation>Min. teplota</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="474"/>
-        <source>Other activities</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="527"/>
+        <source>Max. temp.</source>
+        <translation>Max. teplota</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="498"/>
-        <source>Datatrak/Wlog notes</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="528"/>
+        <source>Back to list</source>
+        <translation>Spǎť na zoznam</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="537"/>
-        <source>Manually entered dive</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="531"/>
+        <source>Dive No.</source>
+        <translation>Ponor No.</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="588"/>
-        <source>Unknown</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="532"/>
+        <source>Dive profile</source>
+        <translation>Profil ponoru</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="674"/>
-        <source>Error: couldn&apos;t open the file %s</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="533"/>
+        <source>Dive information</source>
+        <translation>Informácia o ponore</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="687"/>
-        <source>Error: no dive</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="534"/>
+        <source>Dive equipment</source>
+        <translation>Vybavenie ponoru</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="27"/>
-        <source>student</source>
-        <translation>študent</translation>
+        <location filename="../core/save-html.c" line="535"/>
+        <location filename="../core/save-html.c" line="542"/>
+        <source>Type</source>
+        <translation>Typ</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="461"/>
-        <location filename="../core/dive.c" line="28"/>
-        <source>photo</source>
-        <translation>fotenie</translation>
+        <location filename="../core/save-html.c" line="536"/>
+        <source>Size</source>
+        <translation>Veľkosť</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="28"/>
-        <source>video</source>
-        <translation>kamera</translation>
+        <location filename="../core/save-html.c" line="537"/>
+        <source>Work pressure</source>
+        <translation>Pracovný tlak</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="435"/>
-        <location filename="../core/dive.c" line="28"/>
-        <source>instructor</source>
-        <translation>inštruktor</translation>
+        <location filename="../core/save-html.c" line="538"/>
+        <source>Start pressure</source>
+        <translation>Počiatočný tlak</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="398"/>
-        <location filename="../core/dive.c" line="29"/>
-        <source>deco</source>
-        <translation>deco</translation>
+        <location filename="../core/save-html.c" line="539"/>
+        <source>End pressure</source>
+        <translation>Koncový tlak</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="33"/>
-        <source>OC-gas</source>
-        <translation>OC-zmes</translation>
+        <location filename="../core/save-html.c" line="540"/>
+        <source>Gas</source>
+        <translation>Zmes</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="33"/>
-        <source>diluent</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="541"/>
+        <source>Weight</source>
+        <translation>Hmotnosť</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="33"/>
-        <location filename="../core/equipment.c" line="88"/>
-        <location filename="../core/planner.c" line="1415"/>
-        <location filename="../core/planner.c" line="1418"/>
-        <source>oxygen</source>
-        <translation>kyslík</translation>
+        <location filename="../core/save-html.c" line="543"/>
+        <source>Events</source>
+        <translation>Udalosti</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="227"/>
-        <source>ℓ</source>
-        <translation>ℓ</translation>
+        <location filename="../core/save-html.c" line="544"/>
+        <source>Name</source>
+        <translation>Meno</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="239"/>
+        <location filename="../core/save-html.c" line="545"/>
+        <source>Value</source>
+        <translation>Hodnota</translation>
+    </message>
+    <message>
+        <location filename="../core/save-html.c" line="546"/>
+        <source>Coordinates</source>
+        <translation>Súradnice</translation>
+    </message>
+    <message>
+        <location filename="../core/save-html.c" line="547"/>
+        <source>Dive status</source>
+        <translation>Stav ponoru</translation>
+    </message>
+    <message>
+        <location filename="../core/statistics.c" line="242"/>
         <source>more than %d days</source>
         <translation>viac než %d dní</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="246"/>
+        <location filename="../core/statistics.c" line="249"/>
         <source>%dd %dh %dmin</source>
         <translation>%dd %dh %dmin</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="249"/>
+        <location filename="../core/statistics.c" line="252"/>
         <source>%dmin %dsecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="251"/>
+        <location filename="../core/statistics.c" line="254"/>
         <source>%dh %dmin</source>
         <translation>%dh %dmin</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="263"/>
+        <location filename="../core/statistics.c" line="266"/>
         <source>for dives #</source>
         <translation>pre ponory</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="269"/>
+        <location filename="../core/statistics.c" line="272"/>
         <source>for selected dives</source>
         <translation>pre vybrané ponory</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="304"/>
+        <location filename="../core/statistics.c" line="307"/>
         <source>for dive #%d</source>
         <translation>pre ponor #%d</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="306"/>
+        <location filename="../core/statistics.c" line="309"/>
         <source>for selected dive</source>
         <translation>pre vybraný ponor</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="308"/>
+        <location filename="../core/statistics.c" line="311"/>
         <source>for all dives</source>
         <translation>pre všetky ponory</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="310"/>
+        <location filename="../core/statistics.c" line="313"/>
         <source>(no dives)</source>
         <translation>(žiadné ponory)</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Sun</source>
         <translation>Ne</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Mon</source>
         <translation>Po</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Tue</source>
         <translation>Ut</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Wed</source>
         <translation>St</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Thu</source>
         <translation>Št</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Fri</source>
         <translation>Pi</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Sat</source>
         <translation>So</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Jan</source>
         <translation>Jan</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Feb</source>
         <translation>Feb</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Mar</source>
         <translation>Mar</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Apr</source>
         <translation>Apr</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>May</source>
         <translation>Máj</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Jun</source>
         <translation>Jun</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Jul</source>
         <translation>Jul</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Aug</source>
         <translation>Aug</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Sep</source>
         <translation>Sep</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Oct</source>
         <translation>Okt</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Nov</source>
         <translation>Nov</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Dec</source>
         <translation>Dec</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="191"/>
-        <location filename="../core/parse-xml.c" line="3284"/>
-        <location filename="../core/uemis-downloader.c" line="134"/>
-        <source>unknown</source>
-        <translation>neznámy</translation>
-    </message>
-    <message>
-        <location filename="../core/uemis-downloader.c" line="467"/>
-        <source>data</source>
-        <translation>data</translation>
-    </message>
-    <message>
-        <location filename="../core/uemis-downloader.c" line="447"/>
-        <source>%s %s</source>
-        <translation>%s %s</translation>
-    </message>
-    <message>
         <location filename="../core/uemis-downloader.c" line="27"/>
         <source>Uemis Zurich: the file system is almost full.
 Disconnect/reconnect the dive computer
@@ -10055,6 +10512,16 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../core/uemis-downloader.c" line="447"/>
+        <source>%s %s</source>
+        <translation>%s %s</translation>
+    </message>
+    <message>
+        <location filename="../core/uemis-downloader.c" line="467"/>
+        <source>data</source>
+        <translation>data</translation>
+    </message>
+    <message>
         <location filename="../core/uemis-downloader.c" line="495"/>
         <source>divelog #</source>
         <translation>potápačský denník #</translation>
@@ -10225,281 +10692,6 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation>Alarm: Slabá batéria</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="469"/>
-        <location filename="../core/save-html.c" line="553"/>
-        <location filename="../core/worldmap-save.c" line="111"/>
-        <source>Can&apos;t open file %s</source>
-        <translation>Neviem otvoriť súbor %s</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="488"/>
-        <source>Number</source>
-        <translation>Číslo</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="489"/>
-        <source>Date</source>
-        <translation>Dátum</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="490"/>
-        <source>Time</source>
-        <translation>Čas</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="491"/>
-        <source>Location</source>
-        <translation>Miesto</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="492"/>
-        <source>Air temp.</source>
-        <translation>Teplota vzduchu</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="493"/>
-        <source>Water temp.</source>
-        <translation>Teplota vody</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="498"/>
-        <source>Statistics</source>
-        <translation>Štatistika</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="502"/>
-        <source>Rating</source>
-        <translation>Hodnotenie</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="503"/>
-        <source>Visibility</source>
-        <translation>Viditeľnosť</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="504"/>
-        <source>Duration</source>
-        <translation>Dĺžka (min)</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="494"/>
-        <source>Dives</source>
-        <translation>Ponory</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="495"/>
-        <source>Expand all</source>
-        <translation>Expandovať všetky</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="496"/>
-        <source>Collapse all</source>
-        <translation>Zredukovať všetky</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="497"/>
-        <source>Trips</source>
-        <translation>Akcie</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="499"/>
-        <source>Advanced search</source>
-        <translation>Pokročilé vyhľadávanie</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="505"/>
-        <source>Divemaster</source>
-        <translation>Divemaster</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="506"/>
-        <source>Buddy</source>
-        <translation>Buddy</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="507"/>
-        <source>Suit</source>
-        <translation>Oblek</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="508"/>
-        <source>Tags</source>
-        <translation>Značky</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="509"/>
-        <location filename="../smtk-import/smartrak.c" line="251"/>
-        <location filename="../smtk-import/smartrak.c" line="321"/>
-        <source>Notes</source>
-        <translation>Poznámky</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="510"/>
-        <source>Show more details</source>
-        <translation>Zobraziť viac detailov</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="513"/>
-        <source>Yearly statistics</source>
-        <translation>Ročná štatistika</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="514"/>
-        <source>Year</source>
-        <translation>Rok</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="515"/>
-        <source>Total time</source>
-        <translation>Celkový čas</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="516"/>
-        <source>Average time</source>
-        <translation>Priemerný čas</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="517"/>
-        <source>Shortest time</source>
-        <translation>Najkratší čas</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="518"/>
-        <source>Longest time</source>
-        <translation>Najdlhší čas</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="519"/>
-        <source>Average depth</source>
-        <translation>Priemerná hĺbka</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="520"/>
-        <source>Min. depth</source>
-        <translation>Min. hĺbka</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="521"/>
-        <source>Max. depth</source>
-        <translation>Max. hĺbka</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="523"/>
-        <source>Min. SAC</source>
-        <translation>Min. spotreba</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="524"/>
-        <source>Max. SAC</source>
-        <translation>Max. spotreba</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="525"/>
-        <source>Average temp.</source>
-        <translation>Priemerná teplota</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="526"/>
-        <source>Min. temp.</source>
-        <translation>Min. teplota</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="527"/>
-        <source>Max. temp.</source>
-        <translation>Max. teplota</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="528"/>
-        <source>Back to list</source>
-        <translation>Spǎť na zoznam</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="534"/>
-        <source>Dive equipment</source>
-        <translation>Vybavenie ponoru</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="537"/>
-        <source>Work pressure</source>
-        <translation>Pracovný tlak</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="538"/>
-        <source>Start pressure</source>
-        <translation>Počiatočný tlak</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="539"/>
-        <source>End pressure</source>
-        <translation>Koncový tlak</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="547"/>
-        <source>Dive status</source>
-        <translation>Stav ponoru</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="522"/>
-        <source>Average SAC</source>
-        <translation>Priemerná SAC</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="531"/>
-        <source>Dive No.</source>
-        <translation>Ponor No.</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="532"/>
-        <source>Dive profile</source>
-        <translation>Profil ponoru</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="533"/>
-        <source>Dive information</source>
-        <translation>Informácia o ponore</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="535"/>
-        <location filename="../core/save-html.c" line="542"/>
-        <source>Type</source>
-        <translation>Typ</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="536"/>
-        <source>Size</source>
-        <translation>Veľkosť</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="540"/>
-        <source>Gas</source>
-        <translation>Zmes</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="541"/>
-        <source>Weight</source>
-        <translation>Hmotnosť</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="543"/>
-        <source>Events</source>
-        <translation>Udalosti</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="544"/>
-        <source>Name</source>
-        <translation>Meno</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="545"/>
-        <source>Value</source>
-        <translation>Hodnota</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="546"/>
-        <source>Coordinates</source>
-        <translation>Súradnice</translation>
-    </message>
-    <message>
         <location filename="../core/worldmap-save.c" line="39"/>
         <source>Date:</source>
         <translation>Dátum:</translation>
@@ -10545,109 +10737,6 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation>Poznámky:</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="91"/>
-        <location filename="../core/qthelper.cpp" line="226"/>
-        <source>N</source>
-        <translation>N</translation>
-    </message>
-    <message>
-        <location filename="../core/qthelper.cpp" line="91"/>
-        <location filename="../core/qthelper.cpp" line="227"/>
-        <source>S</source>
-        <translation>S</translation>
-    </message>
-    <message>
-        <location filename="../core/qthelper.cpp" line="92"/>
-        <location filename="../core/qthelper.cpp" line="228"/>
-        <source>E</source>
-        <translation>E</translation>
-    </message>
-    <message>
-        <location filename="../core/qthelper.cpp" line="92"/>
-        <location filename="../core/qthelper.cpp" line="229"/>
-        <source>W</source>
-        <translation>W</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="341"/>
-        <source>Remote storage and local data diverged. Error: merge failed (%s)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="134"/>
-        <source>Local cache directory %s corrupted - can&apos;t sync with Subsurface cloud storage</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="157"/>
-        <location filename="../core/git-access.c" line="177"/>
-        <source>Could not update local cache to newer remote data</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="170"/>
-        <source>Subsurface cloud storage corrupted</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="285"/>
-        <source>Could not update Subsurface cloud storage, try again later</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="371"/>
-        <source>Remote storage and local data diverged. Cannot combine local and remote changes</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="405"/>
-        <source>Remote storage and local data diverged</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="408"/>
-        <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="417"/>
-        <source>Problems with local cache of Subsurface cloud data</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="418"/>
-        <source>Moved cache data to %s. Please try the operation again.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="737"/>
-        <source>Error connecting to Subsurface cloud storage</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="740"/>
-        <source>git clone of %s failed (%s)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/load-git.c" line="222"/>
-        <location filename="../core/parse-xml.c" line="1300"/>
-        <source>additional name for site: %s
-</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/ostctools.c" line="120"/>
-        <location filename="../core/ostctools.c" line="152"/>
-        <source>Unknown DC in dive %d</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/ostctools.c" line="165"/>
-        <source>Error - %s - parsing dive %d</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../smtk-import/smartrak.c" line="247"/>
         <source>Built</source>
         <translation type="unfinished"/>
@@ -10731,155 +10820,120 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="91"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="103"/>
         <source>Subsurface</source>
         <translation>Subsurface</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="97"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="110"/>
         <source>Dive list</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="112"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="125"/>
         <source>Cloud credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="126"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="139"/>
         <source>Manage dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="138"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="141"/>
         <source>Add dive manually</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="146"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="149"/>
         <source>Manual sync with cloud</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="164"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="167"/>
         <source>Offline mode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="164"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="167"/>
         <source>Enable auto cloud sync</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="182"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="187"/>
         <source>GPS</source>
         <translation>GPS</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="185"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="190"/>
         <source>GPS-tag dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="192"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="197"/>
         <source>Upload GPS data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="199"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="204"/>
         <source>Download GPS data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="206"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="211"/>
         <source>Show GPS fixes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="215"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="220"/>
         <source>Clear GPS cache</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="221"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="226"/>
         <source>Preferences</source>
         <translation>Nastavenia</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="230"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="237"/>
         <source>Developer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="232"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="239"/>
         <source>App log</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="239"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="246"/>
         <source>Theme information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="246"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="253"/>
         <source>User manual</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="252"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="259"/>
         <source>About</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="283"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="304"/>
         <source>Run location service</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="283"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="304"/>
         <source>No GPS source available</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="295"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="316"/>
         <source>Actions</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="9"/>
-        <source>Hello World</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="13"/>
-        <source>File</source>
-        <translation>Súbor</translation>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="15"/>
-        <source>&amp;Open</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="19"/>
-        <source>Exit</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="27"/>
-        <source>Button 1 pressed</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="28"/>
-        <source>Button 2 pressed</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="33"/>
-        <source>May I have your attention, please?</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>plannerDetails</name>
@@ -10957,6 +11011,24 @@ p, li { white-space: pre-wrap; }
         <translation>m/min</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="121"/>
+        <location filename="../build/ui_plannerSettings.h" line="425"/>
+        <source>75% to 50% avg. depth</source>
+        <translation>75% až 50% priemernej hĺbky</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="138"/>
+        <location filename="../build/ui_plannerSettings.h" line="427"/>
+        <source>50% avg. depth to 6m</source>
+        <translation>50% priemernej hĺbky do 6m</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="155"/>
+        <location filename="../build/ui_plannerSettings.h" line="429"/>
+        <source>6m to surface</source>
+        <translation>6m na hladinu</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="175"/>
         <location filename="../build/ui_plannerSettings.h" line="431"/>
         <source>Descent</source>
@@ -10980,12 +11052,35 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="268"/>
+        <source>Bühlmann deco</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="278"/>
         <location filename="../build/ui_plannerSettings.h" line="445"/>
         <source>Reserve gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="288"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="549"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="578"/>
+        <location filename="../build/ui_plannerSettings.h" line="446"/>
+        <location filename="../build/ui_plannerSettings.h" line="459"/>
+        <location filename="../build/ui_plannerSettings.h" line="461"/>
+        <source>bar</source>
+        <translation>bar</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="307"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="416"/>
+        <location filename="../build/ui_plannerSettings.h" line="437"/>
+        <location filename="../build/ui_plannerSettings.h" line="440"/>
+        <source>%</source>
+        <translation>%</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="320"/>
         <location filename="../build/ui_plannerSettings.h" line="449"/>
         <source>Postpone gas change if a stop is not required</source>
@@ -11004,12 +11099,10 @@ p, li { white-space: pre-wrap; }
         <translation>GF low</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="307"/>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="416"/>
-        <location filename="../build/ui_plannerSettings.h" line="437"/>
-        <location filename="../build/ui_plannerSettings.h" line="440"/>
-        <source>%</source>
-        <translation>%</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="353"/>
+        <location filename="../build/ui_plannerSettings.h" line="436"/>
+        <source>Plan backgas breaks</source>
+        <translation>Plánovanie back gas zastávok</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="360"/>
@@ -11018,10 +11111,10 @@ p, li { white-space: pre-wrap; }
         <translation>GF high</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="429"/>
-        <location filename="../build/ui_plannerSettings.h" line="441"/>
-        <source>Drop to first depth</source>
-        <translation>Priamy zostup do prvej hĺbky</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="370"/>
+        <location filename="../build/ui_plannerSettings.h" line="453"/>
+        <source>min</source>
+        <translation>min</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="389"/>
@@ -11030,163 +11123,139 @@ p, li { white-space: pre-wrap; }
         <translation>Posledná zastávka v 6m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="353"/>
-        <location filename="../build/ui_plannerSettings.h" line="436"/>
-        <source>Plan backgas breaks</source>
-        <translation>Plánovanie back gas zastávok</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="396"/>
+        <source>Maximize bottom time allowed by gas and no decompression limits</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="515"/>
-        <location filename="../build/ui_plannerSettings.h" line="455"/>
-        <source>Gas options</source>
-        <translation>Nastavenia zmesi</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="399"/>
+        <location filename="../build/ui_plannerSettings.h" line="443"/>
+        <source>Recreational mode</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="594"/>
-        <location filename="../build/ui_plannerSettings.h" line="456"/>
-        <source>Bottom SAC</source>
-        <translation>SAC na dne</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="429"/>
+        <location filename="../build/ui_plannerSettings.h" line="441"/>
+        <source>Drop to first depth</source>
+        <translation>Priamy zostup do prvej hĺbky</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="692"/>
-        <location filename="../build/ui_plannerSettings.h" line="457"/>
-        <source>Deco SAC</source>
-        <translation>SAC pri dekompresii</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="436"/>
+        <location filename="../build/ui_plannerSettings.h" line="452"/>
+        <source>Min. switch duration</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="601"/>
-        <location filename="../build/ui_plannerSettings.h" line="458"/>
-        <source>Bottom pO₂</source>
-        <translation>pO₂ na dne</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="459"/>
+        <location filename="../build/ui_plannerSettings.h" line="444"/>
+        <source>Safety stop</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="685"/>
-        <location filename="../build/ui_plannerSettings.h" line="460"/>
-        <source>Deco pO₂</source>
-        <translation>pO₂ pri dekompresii</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="495"/>
+        <source>Conservatism level</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="515"/>
+        <location filename="../build/ui_plannerSettings.h" line="455"/>
+        <source>Gas options</source>
+        <translation>Nastavenia zmesi</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="565"/>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="672"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="698"/>
         <location filename="../build/ui_plannerSettings.h" line="462"/>
         <location filename="../build/ui_plannerSettings.h" line="463"/>
         <source>ℓ/min</source>
         <translation>ℓ/min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="632"/>
-        <location filename="../build/ui_plannerSettings.h" line="468"/>
-        <source>Display runtime</source>
-        <translation>Zobraziť priebeh</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="645"/>
-        <location filename="../build/ui_plannerSettings.h" line="472"/>
-        <source>Display segment duration</source>
-        <translation>Zobraziť trvanie segmentu</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="655"/>
-        <location filename="../build/ui_plannerSettings.h" line="476"/>
-        <source>Display transitions in deco</source>
-        <translation>Zobraziť prechody medzi deco zastávkami</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="662"/>
-        <location filename="../build/ui_plannerSettings.h" line="477"/>
-        <source>Verbatim dive plan</source>
-        <translation>Ukecaný plán ponoru</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="288"/>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="549"/>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="578"/>
-        <location filename="../build/ui_plannerSettings.h" line="446"/>
-        <location filename="../build/ui_plannerSettings.h" line="459"/>
-        <location filename="../build/ui_plannerSettings.h" line="461"/>
-        <source>bar</source>
-        <translation>bar</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="121"/>
-        <location filename="../build/ui_plannerSettings.h" line="425"/>
-        <source>75% to 50% avg. depth</source>
-        <translation>75% až 50% priemernej hĺbky</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="138"/>
-        <location filename="../build/ui_plannerSettings.h" line="427"/>
-        <source>50% avg. depth to 6m</source>
-        <translation>50% priemernej hĺbky do 6m</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="155"/>
-        <location filename="../build/ui_plannerSettings.h" line="429"/>
-        <source>6m to surface</source>
-        <translation>6m na hladinu</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="268"/>
-        <source>Bühlmann deco</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="370"/>
-        <location filename="../build/ui_plannerSettings.h" line="453"/>
-        <source>min</source>
-        <translation>min</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="396"/>
-        <source>Maximize bottom time allowed by gas and no decompression limits</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="594"/>
+        <source>m</source>
+        <translation>m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="399"/>
-        <location filename="../build/ui_plannerSettings.h" line="443"/>
-        <source>Recreational mode</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="606"/>
+        <source>Used to calculate best mix. Select best mix depth in &apos;Available gases&apos; table by entering gas depth, followed by &quot;B&quot; (best trimix mix) or &quot;BN&quot; (best nitrox mix)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="436"/>
-        <location filename="../build/ui_plannerSettings.h" line="452"/>
-        <source>Min. switch duration</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="613"/>
+        <location filename="../build/ui_plannerSettings.h" line="456"/>
+        <source>Bottom SAC</source>
+        <translation>SAC na dne</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="459"/>
-        <location filename="../build/ui_plannerSettings.h" line="444"/>
-        <source>Safety stop</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="620"/>
+        <location filename="../build/ui_plannerSettings.h" line="458"/>
+        <source>Bottom pO₂</source>
+        <translation>pO₂ na dne</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="495"/>
-        <source>Conservatism level</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="627"/>
+        <source>Best mix END</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="608"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="634"/>
         <location filename="../build/ui_plannerSettings.h" line="464"/>
         <source>Notes</source>
         <translation>Poznámky</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="629"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="655"/>
         <location filename="../build/ui_plannerSettings.h" line="466"/>
         <source>In dive plan, show runtime (absolute time) of stops</source>
         <translation>Zobraziť runtime zastávok (absolútny čas) v pláne ponoru</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="642"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="658"/>
+        <location filename="../build/ui_plannerSettings.h" line="468"/>
+        <source>Display runtime</source>
+        <translation>Zobraziť priebeh</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="668"/>
         <location filename="../build/ui_plannerSettings.h" line="470"/>
         <source>In dive plan, show duration (relative time) of stops</source>
         <translation>V pláne ponoru zobraziť trvanie (relatívny čas) zastávok</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="652"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="671"/>
+        <location filename="../build/ui_plannerSettings.h" line="472"/>
+        <source>Display segment duration</source>
+        <translation>Zobraziť trvanie segmentu</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="678"/>
         <location filename="../build/ui_plannerSettings.h" line="474"/>
         <source>In diveplan, list transitions or treat them as implicit</source>
         <translation>Zobraziť prechody v pláne ponoru alebo ich predpokladať implicitne</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="681"/>
+        <location filename="../build/ui_plannerSettings.h" line="476"/>
+        <source>Display transitions in deco</source>
+        <translation>Zobraziť prechody medzi deco zastávkami</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="688"/>
+        <location filename="../build/ui_plannerSettings.h" line="477"/>
+        <source>Verbatim dive plan</source>
+        <translation>Ukecaný plán ponoru</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="711"/>
+        <location filename="../build/ui_plannerSettings.h" line="460"/>
+        <source>Deco pO₂</source>
+        <translation>pO₂ pri dekompresii</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="718"/>
+        <location filename="../build/ui_plannerSettings.h" line="457"/>
+        <source>Deco SAC</source>
+        <translation>SAC pri dekompresii</translation>
+    </message>
 </context>
 </TS>
\ No newline at end of file
diff --git a/translations/subsurface_sv_SE.ts b/translations/subsurface_sv_SE.ts
index 780c270c4..c062a3353 100644
--- a/translations/subsurface_sv_SE.ts
+++ b/translations/subsurface_sv_SE.ts
@@ -109,6 +109,11 @@
         <translation>Namn:</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="56"/>
+        <source>Could not initialize Winsock version 2.2</source>
+        <translation>Kunde inte initialisera Winsock version 2.2</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="134"/>
         <source>Trying to turn on the local Bluetooth device...</source>
         <translation>Försöker slå på den lokala Blåtands enheten...</translation>
@@ -119,6 +124,11 @@
         <translation>Försöker slå av den lokala Blåtands enheten...</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="167"/>
+        <source>Remote devices list was cleared.</source>
+        <translation>Listan av fjärrenheter rensades.</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="183"/>
         <source>Scanning for remote devices...</source>
         <translation>Söker efter externa enheter...</translation>
@@ -129,6 +139,22 @@
         <translation>Sökning avslutad</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="208"/>
+        <source>The local Bluetooth device was %1.</source>
+        <extracomment>%1 will be replaced with &quot;turned on&quot; or &quot;turned off&quot;</extracomment>
+        <translation>%1 var den lokala blåtandsenheten.</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
+        <source>turned on</source>
+        <translation>slå på</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
+        <source>turned off</source>
+        <translation>slå av</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="225"/>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="339"/>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="359"/>
@@ -176,37 +202,6 @@
         <translation>Parkoppla</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="352"/>
-        <source>Device %1 was paired and is authorized.</source>
-        <translation>Enheten %1 parkopplades och är nu auktoriserad.</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="56"/>
-        <source>Could not initialize Winsock version 2.2</source>
-        <translation>Kunde inte initialisera Winsock version 2.2</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="167"/>
-        <source>Remote devices list was cleared.</source>
-        <translation>Listan av fjärrenheter rensades.</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="208"/>
-        <source>The local Bluetooth device was %1.</source>
-        <extracomment>%1 will be replaced with &quot;turned on&quot; or &quot;turned off&quot;</extracomment>
-        <translation>%1 var den lokala blåtandsenheten.</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
-        <source>turned on</source>
-        <translation>slå på</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
-        <source>turned off</source>
-        <translation>slå av</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="307"/>
         <source>Remove pairing</source>
         <translation>Ta bort parkoppling.</translation>
@@ -232,6 +227,11 @@
         <translation>Parkopplade med %1.</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="352"/>
+        <source>Device %1 was paired and is authorized.</source>
+        <translation>Enheten %1 parkopplades och är nu auktoriserad.</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="378"/>
         <source>The device %1 can now be used for connection. You can press the Save button.</source>
         <translation>Enheten %1 kan nu användas för anslutningar. Du kan klicka på spara.</translation>
@@ -290,12 +290,12 @@
 <context>
     <name>BuddyFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="621"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="619"/>
         <source>Person: </source>
         <translation>Person:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="622"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="620"/>
         <source>Searches for buddies and divemasters</source>
         <translation>Sök efter parkamrater och divemasters</translation>
     </message>
@@ -303,7 +303,7 @@
 <context>
     <name>BuddyFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="243"/>
+        <location filename="../qt-models/filtermodels.cpp" line="248"/>
         <source>No buddies</source>
         <translation>Inga parkamrater</translation>
     </message>
@@ -311,25 +311,30 @@
 <context>
     <name>CloudCredentials</name>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="49"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="50"/>
         <source>Cloud credentials</source>
         <translation>Moln referenser</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="55"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="56"/>
         <source>Email</source>
         <translation>Epost</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="67"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="68"/>
         <source>Password</source>
         <translation>Lösenord</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="90"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="92"/>
         <source>Show password</source>
         <translation>Visa lösenord</translation>
     </message>
+    <message>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="97"/>
+        <source>PIN</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>ColumnNameProvider</name>
@@ -385,6 +390,16 @@
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
+        <source>Max. depth</source>
+        <translation>Maxdjup</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
+        <source>Avg. depth</source>
+        <translation>Medeldjup</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
         <source>Divemaster</source>
         <translation>Divemaster</translation>
     </message>
@@ -395,6 +410,11 @@
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
+        <source>Suit</source>
+        <translation>Dräkt</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
         <source>Notes</source>
         <translation>Anteckningar</translation>
     </message>
@@ -414,21 +434,6 @@
         <translation>Vattentemp.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
-        <source>Max. depth</source>
-        <translation>Maxdjup</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
-        <source>Avg. depth</source>
-        <translation>Medeldjup</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
-        <source>Suit</source>
-        <translation>Dräkt</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="44"/>
         <source>O₂</source>
         <translation>O₂</translation>
@@ -542,7 +547,7 @@
         <translation>Kan inte skapa libdivecomputer context</translation>
     </message>
     <message>
-        <location filename="../core/configuredivecomputer.cpp" line="660"/>
+        <location filename="../core/configuredivecomputer.cpp" line="656"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation>Kunde inte upprätta en koppling till dykdatorn.</translation>
     </message>
@@ -562,11 +567,19 @@
         <translation>Enhet eller monteringspunkt</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="170"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1520"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1533"/>
-        <source>...</source>
-        <translation>...</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="47"/>
+        <source>Connect via Bluetooth</source>
+        <translation>Anslut via Blåtand</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="54"/>
+        <source>Connect</source>
+        <translation>Anslut</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="64"/>
+        <source>Disconnect</source>
+        <translation>Koppla ner</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="80"/>
@@ -575,12 +588,24 @@
         <translation>Hämta tillgängliga detaljer</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="90"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1523"/>
+        <source>Read settings from backup file or from device before writing to the device</source>
+        <translation>Läs in inställningarna ifrån en backupfil eller ifrån enheten innan de kan skrivas till enheten</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="93"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1525"/>
         <source>Save changes to device</source>
         <translation>Spara ändringarna till enheten</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="116"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1527"/>
+        <source>Read settings from backup file or from device before writing to a backup file</source>
+        <translation>Läs in inställningarna ifrån en backupfil eller ifrån enheten innan de kan skrivas till en backupfil</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="119"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1529"/>
         <source>Backup</source>
@@ -599,15 +624,40 @@
         <translation>Uppdatera firmware</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="163"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1532"/>
+        <source>Save libdivecomputer logfile</source>
+        <translation>Spara loggfil av nerladdningen ifrån dykdatorn</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="170"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1520"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1533"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="177"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1534"/>
         <source>Cancel</source>
         <translation>Avbryt</translation>
     </message>
     <message>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1539"/>
-        <source>OSTC 3</source>
-        <translation>OSTC 3</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="214"/>
+        <source>OSTC 3,Sport,Cr,2</source>
+        <translation>OSTC 3,Sport,Cr,2</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="223"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1541"/>
+        <source>Suunto Vyper family</source>
+        <translation>Suunto Vyper familjen</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="232"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1543"/>
+        <source>OSTC, Mk.2/2N/2C</source>
+        <translation>OSTC, Mk.2/2N/2C</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="253"/>
@@ -620,40 +670,56 @@
         <translation>Grundläggande inställningar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="326"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1656"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1943"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1546"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1726"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1766"/>
-        <source>Serial No.</source>
-        <translation>Serienummer</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="260"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1575"/>
+        <source>Eco</source>
+        <translation>Eco</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="349"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1679"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1980"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1547"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1727"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1767"/>
-        <source>Firmware version</source>
-        <translation>Firmware version</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="265"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1576"/>
+        <source>Medium</source>
+        <translation>Medium</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="538"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1713"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1990"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1548"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1729"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1768"/>
-        <source>Custom text</source>
-        <translation>Konfigurerbar text</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="270"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1577"/>
+        <source>High</source>
+        <translation>Hög</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="385"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1549"/>
-        <source>Language</source>
-        <translation>Språk</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="278"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="826"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="849"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="875"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="927"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="993"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1019"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1101"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1117"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1450"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2278"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2382"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2408"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2434"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2474"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2497"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1586"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1621"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1623"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1625"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1628"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1637"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1638"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1710"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1785"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1789"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1801"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1803"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1806"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1807"/>
+        <source>%</source>
+        <translation>%</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="289"/>
@@ -680,44 +746,36 @@
         <translation>Italienska</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="579"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1557"/>
-        <source>Dive mode</source>
-        <translation>Dykläge</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="556"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1560"/>
-        <source>OC</source>
-        <translation>OC</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="561"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1561"/>
-        <source>CC</source>
-        <translation>CC</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="313"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1582"/>
+        <source>m/°C</source>
+        <translation>m/°C</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="566"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2336"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1562"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1793"/>
-        <source>Gauge</source>
-        <translation>Mätare</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="318"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1583"/>
+        <source>ft/°F</source>
+        <translation>ft/°F</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="571"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1563"/>
-        <source>Apnea</source>
-        <translation>Fridykning</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="326"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1656"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1943"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1546"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1726"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1766"/>
+        <source>Serial No.</source>
+        <translation>Serienummer</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="395"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2063"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1565"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1780"/>
-        <source>Date format</source>
-        <translation>Datumformat</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="349"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1679"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1980"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1547"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1727"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1767"/>
+        <source>Firmware version</source>
+        <translation>Firmware version</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="360"/>
@@ -738,108 +796,147 @@
         <translation>YYMMDD</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1042"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2457"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1639"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1805"/>
-        <source>Saturation</source>
-        <translation>Saturation</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="385"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1549"/>
+        <source>Language</source>
+        <translation>Språk</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="278"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="826"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="849"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="875"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="927"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="993"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1019"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1101"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1117"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1450"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2278"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2382"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2408"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2434"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2474"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2497"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1586"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1621"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1623"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1625"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1628"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1637"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1638"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1710"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1785"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1789"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1801"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1803"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1806"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1807"/>
-        <source>%</source>
-        <translation>%</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="395"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2063"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1565"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1780"/>
+        <source>Date format</source>
+        <translation>Datumformat</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="865"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2261"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1624"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1784"/>
-        <source>Desaturation</source>
-        <translation>Desaturation</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="405"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1572"/>
+        <source>Brightness</source>
+        <translation>Ljusstyrka</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="983"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2398"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1636"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1800"/>
-        <source>Last deco</source>
-        <translation>Sista stop</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="415"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1850"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1579"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1753"/>
+        <source>Units</source>
+        <translation>Enheter</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="711"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="736"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="758"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="904"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2181"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2206"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2228"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2307"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1626"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1786"/>
-        <source> m</source>
-        <translation>m</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="425"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1585"/>
+        <source>Salinity (0-5%)</source>
+        <translation>Salthalt (0-5%)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="405"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1572"/>
-        <source>Brightness</source>
-        <translation>Ljusstyrka</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="438"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1615"/>
+        <source>Reset device to default settings</source>
+        <translation>Återställ enheten till standardinställningar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="260"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1575"/>
-        <source>Eco</source>
-        <translation>Eco</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="452"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1590"/>
+        <source>230LSB/Gauss</source>
+        <translation>230LSB/Gauss</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="265"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1576"/>
-        <source>Medium</source>
-        <translation>Medium</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="457"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1591"/>
+        <source>330LSB/Gauss</source>
+        <translation>330LSB/Gauss</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="270"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1577"/>
-        <source>High</source>
-        <translation>Hög</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="462"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1592"/>
+        <source>390LSB/Gauss</source>
+        <translation>390LSB/Gauss</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="603"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2034"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1599"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1779"/>
-        <source>Sampling rate</source>
-        <translation>Samplingsfrekvens</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="467"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1593"/>
+        <source>440LSB/Gauss</source>
+        <translation>440LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="472"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1594"/>
+        <source>660LSB/Gauss</source>
+        <translation>660LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="477"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1595"/>
+        <source>820LSB/Gauss</source>
+        <translation>820LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="482"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1596"/>
+        <source>1090LSB/Gauss</source>
+        <translation>1090LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="487"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1597"/>
+        <source>1370LSB/Gauss</source>
+        <translation>1370LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="521"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1587"/>
+        <source>Compass gain</source>
+        <translation>Kompassförstärkning</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="531"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1799"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1745"/>
+        <source>Computer model</source>
+        <translation>Datormodell</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="538"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1713"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1990"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1548"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1729"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1768"/>
+        <source>Custom text</source>
+        <translation>Konfigurerbar text</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="556"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1560"/>
+        <source>OC</source>
+        <translation>OC</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="561"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1561"/>
+        <source>CC</source>
+        <translation>CC</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="566"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2336"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1562"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1793"/>
+        <source>Gauge</source>
+        <translation>Mätare</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="571"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1563"/>
+        <source>Apnea</source>
+        <translation>Fridykning</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="579"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1557"/>
+        <source>Dive mode</source>
+        <translation>Dykläge</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="590"/>
@@ -856,30 +953,12 @@
         <translation>10s</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="415"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1850"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1579"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1753"/>
-        <source>Units</source>
-        <translation>Enheter</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="313"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1582"/>
-        <source>m/°C</source>
-        <translation>m/°C</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="318"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1583"/>
-        <source>ft/°F</source>
-        <translation>ft/°F</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="644"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1605"/>
-        <source>Dive mode color</source>
-        <translation>Färgschema dykläge</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="603"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2034"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1599"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1779"/>
+        <source>Sampling rate</source>
+        <translation>Samplingsfrekvens</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="614"/>
@@ -906,12 +985,6 @@
         <translation>Blå</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="425"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1585"/>
-        <source>Salinity (0-5%)</source>
-        <translation>Salthalt (0-5%)</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="637"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2092"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1613"/>
@@ -920,90 +993,80 @@
         <translation>Synkronisera klockan med datorn</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="521"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1587"/>
-        <source>Compass gain</source>
-        <translation>Kompassförstärkning</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="90"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1523"/>
-        <source>Read settings from backup file or from device before writing to the device</source>
-        <translation>Läs in inställningarna ifrån en backupfil eller ifrån enheten innan de kan skrivas till enheten</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="116"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1527"/>
-        <source>Read settings from backup file or from device before writing to a backup file</source>
-        <translation>Läs in inställningarna ifrån en backupfil eller ifrån enheten innan de kan skrivas till en backupfil</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="232"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1543"/>
-        <source>OSTC, Mk.2/2N/2C</source>
-        <translation>OSTC, Mk.2/2N/2C</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="644"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1605"/>
+        <source>Dive mode color</source>
+        <translation>Färgschema dykläge</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="452"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1590"/>
-        <source>230LSB/Gauss</source>
-        <translation>230LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="654"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2020"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1614"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1771"/>
+        <source>Show safety stop</source>
+        <translation>Visa säkerhetsstopp</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="457"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1591"/>
-        <source>330LSB/Gauss</source>
-        <translation>330LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="661"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2145"/>
+        <source>End Depth</source>
+        <translation>END djup</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="462"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1592"/>
-        <source>390LSB/Gauss</source>
-        <translation>390LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="671"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2162"/>
+        <source> s</source>
+        <translation>s</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="467"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1593"/>
-        <source>440LSB/Gauss</source>
-        <translation>440LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="687"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1953"/>
+        <source>Length</source>
+        <translation>Längd</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="472"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1594"/>
-        <source>660LSB/Gauss</source>
-        <translation>660LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="694"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2138"/>
+        <source>Start Depth</source>
+        <translation>Start djup</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="477"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1595"/>
-        <source>820LSB/Gauss</source>
-        <translation>820LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="701"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2152"/>
+        <source>Reset Depth</source>
+        <translation>Återställ djup</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="482"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1596"/>
-        <source>1090LSB/Gauss</source>
-        <translation>1090LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="711"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="736"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="758"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="904"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2181"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2206"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2228"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2307"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1626"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1786"/>
+        <source> m</source>
+        <translation>m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="487"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1597"/>
-        <source>1370LSB/Gauss</source>
-        <translation>1370LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="778"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2248"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1643"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1810"/>
+        <source>Advanced settings</source>
+        <translation>Avancerade inställningar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="654"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2020"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1614"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1771"/>
-        <source>Show safety stop</source>
-        <translation>Visa säkerhetsstopp</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="784"/>
+        <source>Left button sensitivity</source>
+        <translation>Vänster knapps känslighet</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="438"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1615"/>
-        <source>Reset device to default settings</source>
-        <translation>Återställ enheten till standardinställningar</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="791"/>
+        <source>Always show ppO2</source>
+        <translation>Visa alltid ppO2</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="798"/>
@@ -1014,20 +1077,6 @@
         <translation>Alt. GF kan väljas under vatten</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="223"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1541"/>
-        <source>Suunto Vyper family</source>
-        <translation>Suunto Vyper familjen</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="778"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2248"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1643"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1810"/>
-        <source>Advanced settings</source>
-        <translation>Avancerade inställningar</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="805"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2271"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1618"/>
@@ -1058,6 +1107,14 @@
         <translation>GFHigh</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="865"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2261"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1624"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1784"/>
+        <source>Desaturation</source>
+        <translation>Desaturation</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="917"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2320"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1627"/>
@@ -1072,14 +1129,6 @@
         <translation> mbar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="973"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2369"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1630"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1788"/>
-        <source> min</source>
-        <translation> min</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="960"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2331"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1633"/>
@@ -1088,63 +1137,28 @@
         <translation>ZH-L16</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="47"/>
-        <source>Connect via Bluetooth</source>
-        <translation>Anslut via Blåtand</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="163"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1532"/>
-        <source>Save libdivecomputer logfile</source>
-        <translation>Spara loggfil av nerladdningen ifrån dykdatorn</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="661"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2145"/>
-        <source>End Depth</source>
-        <translation>END djup</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="671"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2162"/>
-        <source> s</source>
-        <translation>s</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="687"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1953"/>
-        <source>Length</source>
-        <translation>Längd</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="694"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2138"/>
-        <source>Start Depth</source>
-        <translation>Start djup</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="701"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2152"/>
-        <source>Reset Depth</source>
-        <translation>Återställ djup</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="784"/>
-        <source>Left button sensitivity</source>
-        <translation>Vänster knapps känslighet</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="791"/>
-        <source>Always show ppO2</source>
-        <translation>Visa alltid ppO2</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="965"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1634"/>
         <source>ZH-L16+GF</source>
         <translation>ZH-L16+GF</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="973"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2369"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1630"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1788"/>
+        <source> min</source>
+        <translation> min</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="983"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2398"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1636"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1800"/>
+        <source>Last deco</source>
+        <translation>Sista stop</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1009"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2424"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1640"/>
@@ -1161,6 +1175,14 @@
         <translation>Alt GFHigh</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1042"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2457"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1639"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1805"/>
+        <source>Saturation</source>
+        <translation>Saturation</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1052"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1642"/>
         <source>Flip screen</source>
@@ -1172,12 +1194,22 @@
         <translation>Höger knapps känslighet</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1066"/>
+        <source>MOD warning</source>
+        <translation>MOD varning</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1073"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2513"/>
         <source>Graphical speed indicator</source>
         <translation>Grafisk hastighetes indikator</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1080"/>
+        <source>Dynamic ascent rate</source>
+        <translation>Dynamisk uppstignings hastighet</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1087"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2552"/>
         <source>Bottom gas consumption</source>
@@ -1190,6 +1222,14 @@
         <translation>Deko gasförbrukning</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1133"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1149"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2520"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2536"/>
+        <source> ℓ/min</source>
+        <translation>ℓ/min</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1165"/>
         <source>Temperature sensor offset</source>
         <translation>Temperatursensorjustering</translation>
@@ -1208,6 +1248,18 @@
         <translation>Gasinställningar</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1235"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1320"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2610"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2695"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1645"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1668"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1812"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1835"/>
+        <source>%O₂</source>
+        <translation>%O₂</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1240"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1325"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2615"/>
@@ -1326,16 +1378,10 @@
         <translation>Dil 5</translation>
     </message>
     <message>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1691"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1858"/>
-        <source>Set point [cbar]</source>
-        <translation>Set point [cbar]</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1693"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1860"/>
-        <source>Change depth [m]</source>
-        <translation>Bytesdjup [m]</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1405"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2770"/>
+        <source>Setpoint</source>
+        <translation>Setpoint</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1415"/>
@@ -1374,6 +1420,12 @@
         <translation>SP 5</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1443"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1709"/>
+        <source>O₂ in calibration gas</source>
+        <translation>O₂ i kalibreringsgas</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1467"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1713"/>
         <source>Fixed setpoint</source>
@@ -1404,101 +1456,6 @@
         <translation> cbar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1748"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1733"/>
-        <source>P1 (medium)</source>
-        <extracomment>Suunto safety level</extracomment>
-        <translation>P1 (medium)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1753"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1734"/>
-        <source>P2 (high)</source>
-        <extracomment>Suunto safety level</extracomment>
-        <translation>P2 (Hög)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1792"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1744"/>
-        <source>Total dive time</source>
-        <translation>Total dyktid</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2109"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1769"/>
-        <source>kg/ℓ</source>
-        <translation>kg/ℓ</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2346"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1795"/>
-        <source>Apnoea</source>
-        <translation>Fridykning</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1583"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1722"/>
-        <source>Safety level</source>
-        <translation>Säkerhetsnivå</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="54"/>
-        <source>Connect</source>
-        <translation>Anslut</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="64"/>
-        <source>Disconnect</source>
-        <translation>Koppla ner</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="214"/>
-        <source>OSTC 3,Sport,Cr,2</source>
-        <translation>OSTC 3,Sport,Cr,2</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1066"/>
-        <source>MOD warning</source>
-        <translation>MOD varning</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1080"/>
-        <source>Dynamic ascent rate</source>
-        <translation>Dynamisk uppstignings hastighet</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1133"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1149"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2520"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2536"/>
-        <source> ℓ/min</source>
-        <translation>ℓ/min</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1235"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1320"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2610"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2695"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1645"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1668"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1812"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1835"/>
-        <source>%O₂</source>
-        <translation>%O₂</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1405"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2770"/>
-        <source>Setpoint</source>
-        <translation>Setpoint</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1443"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1709"/>
-        <source>O₂ in calibration gas</source>
-        <translation>O₂ i kalibreringsgas</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1535"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2843"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1719"/>
@@ -1515,6 +1472,12 @@
         <translation>pO₂ min</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1583"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1722"/>
+        <source>Safety level</source>
+        <translation>Säkerhetsnivå</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1609"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1723"/>
         <source>Altitude range</source>
@@ -1548,6 +1511,20 @@
         <translation>P0 (ingen)</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1748"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1733"/>
+        <source>P1 (medium)</source>
+        <extracomment>Suunto safety level</extracomment>
+        <translation>P1 (medium)</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1753"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1734"/>
+        <source>P2 (high)</source>
+        <extracomment>Suunto safety level</extracomment>
+        <translation>P2 (Hög)</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1761"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1736"/>
         <source>Sample rate</source>
@@ -1572,11 +1549,10 @@
         <translation>60s</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="531"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1799"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1745"/>
-        <source>Computer model</source>
-        <translation>Datormodell</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1792"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1744"/>
+        <source>Total dive time</source>
+        <translation>Total dyktid</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1816"/>
@@ -1641,12 +1617,6 @@
         <translation>Tidsalarm</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2099"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1765"/>
-        <source>Salinity</source>
-        <translation>Salthalt</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2074"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1774"/>
         <source>MM/DD/YY</source>
@@ -1665,12 +1635,30 @@
         <translation>YY/MM/DD</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2099"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1765"/>
+        <source>Salinity</source>
+        <translation>Salthalt</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2109"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1769"/>
+        <source>kg/ℓ</source>
+        <translation>kg/ℓ</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2341"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1794"/>
         <source>ZH-L16 CC</source>
         <translation>ZH-L16 CC</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2346"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1795"/>
+        <source>Apnoea</source>
+        <translation>Fridykning</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2351"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1796"/>
         <source>L16-GF OC</source>
@@ -1689,87 +1677,112 @@
         <translation>PSCR-GF</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1108"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1129"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1539"/>
+        <source>OSTC 3</source>
+        <translation>OSTC 3</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1691"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1858"/>
+        <source>Set point [cbar]</source>
+        <translation>Set point [cbar]</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1693"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1860"/>
+        <source>Change depth [m]</source>
+        <translation>Bytesdjup [m]</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1110"/>
+        <source>Backup dive computer settings</source>
+        <translation>Säkerhetskopiera dykdatorns inställningar</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1111"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1132"/>
         <source>Backup files (*.xml)</source>
         <translation>Backupfiler (*.xml)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1113"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1115"/>
+        <source>XML backup error</source>
+        <translation>XML backup fel</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1116"/>
         <source>An error occurred while saving the backup file.
 %1</source>
         <translation>Ett fel inträffade när backupfilen skulle sparas.
 %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1116"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1119"/>
         <source>Backup succeeded</source>
         <translation>Backup sparad</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1117"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1120"/>
         <source>Your settings have been saved to: %1</source>
         <translation>Dina inställningar har blivit sparade till: %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1107"/>
-        <source>Backup dive computer settings</source>
-        <translation>Säkerhetskopiera dykdatorns inställningar</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1112"/>
-        <source>XML backup error</source>
-        <translation>XML backup fel</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1128"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1131"/>
         <source>Restore dive computer settings</source>
         <translation>Återställ dykdatorns inställningar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1134"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1137"/>
         <source>XML restore error</source>
         <translation>XML återställningsfel</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1135"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1138"/>
         <source>An error occurred while restoring the backup file.
 %1</source>
         <translation>Ett fel inträffade när backupfilen skulle återställas.
 %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1139"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1142"/>
         <source>Restore succeeded</source>
         <translation>Återställda</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1140"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1143"/>
         <source>Your settings have been restored successfully.</source>
         <translation>Dina inställningar har blivit återställda</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1150"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1153"/>
         <source>Select firmware file</source>
         <translation>Välj en firmware-fil</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1151"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1154"/>
         <source>All files (*.*)</source>
         <translation>Alla filer (*.*)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1207"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1210"/>
         <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="../desktop-widgets/configuredivecomputerdialog.cpp" line="1208"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1211"/>
         <source>Log files (*.log)</source>
         <translation>Loggfiler (*.log)</translation>
     </message>
 </context>
 <context>
+    <name>ContextDrawer</name>
+    <message>
+        <location filename="../mobile-widgets/qml/kirigami/src/controls/ContextDrawer.qml" line="76"/>
+        <source>Actions</source>
+        <translation>Händelser</translation>
+    </message>
+</context>
+<context>
     <name>CylindersModel</name>
     <message>
         <location filename="../qt-models/cylindermodel.cpp" line="16"/>
@@ -1783,11 +1796,6 @@
     </message>
     <message>
         <location filename="../qt-models/cylindermodel.cpp" line="16"/>
-        <source>He%</source>
-        <translation>He%</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="16"/>
         <source>Work press.</source>
         <translation>Arbetstryck</translation>
     </message>
@@ -1807,9 +1815,24 @@
         <translation>O₂%</translation>
     </message>
     <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="16"/>
+        <source>He%</source>
+        <translation>He%</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
+        <source>Deco switch at</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
+        <source>Bot. MOD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../qt-models/cylindermodel.cpp" line="17"/>
-        <source>Switch at</source>
-        <translation>Byt vid</translation>
+        <source>MND</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-models/cylindermodel.cpp" line="17"/>
@@ -1827,17 +1850,32 @@
         <translation>ℓ</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="161"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="177"/>
         <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-models/cylindermodel.cpp" line="383"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="180"/>
+        <source>Switch depth for deco gas. Calculated using Deco pO₂ preference, unless set manually.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="183"/>
+        <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to &apos;*&apos; for best O₂% for max depth.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="186"/>
+        <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to &apos;*&apos; for best He% for max depth.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="444"/>
         <source>Cylinder cannot be removed</source>
         <translation>Flaska kan inte tas bort</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="384"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="445"/>
         <source>This gas is 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>
@@ -1857,42 +1895,24 @@
         <translation>Vilka delar skulle du vilja kopiera</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="73"/>
+        <location filename="../build/ui_divecomponentselection.h" line="141"/>
+        <source>Dive site</source>
+        <translation>Dyk plats</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="80"/>
         <location filename="../build/ui_divecomponentselection.h" line="142"/>
         <source>Suit</source>
         <translation>Dräkt</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="122"/>
-        <location filename="../build/ui_divecomponentselection.h" line="148"/>
-        <source>Divemaster</source>
-        <translation>Divemaster</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="129"/>
-        <location filename="../build/ui_divecomponentselection.h" line="149"/>
-        <source>Buddy</source>
-        <translation>Parkamrat</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="136"/>
-        <location filename="../build/ui_divecomponentselection.h" line="150"/>
-        <source>Rating</source>
-        <translation>Rankning</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="87"/>
         <location filename="../build/ui_divecomponentselection.h" line="143"/>
         <source>Visibility</source>
         <translation>Synlighet</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="73"/>
-        <location filename="../build/ui_divecomponentselection.h" line="141"/>
-        <source>Dive site</source>
-        <translation>Dyk plats</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="94"/>
         <location filename="../build/ui_divecomponentselection.h" line="144"/>
         <source>Notes</source>
@@ -1916,10 +1936,34 @@
         <source>Cylinders</source>
         <translation>Flaskor</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="122"/>
+        <location filename="../build/ui_divecomponentselection.h" line="148"/>
+        <source>Divemaster</source>
+        <translation>Divemaster</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="129"/>
+        <location filename="../build/ui_divecomponentselection.h" line="149"/>
+        <source>Buddy</source>
+        <translation>Parkamrat</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="136"/>
+        <location filename="../build/ui_divecomponentselection.h" line="150"/>
+        <source>Rating</source>
+        <translation>Rankning</translation>
+    </message>
 </context>
 <context>
     <name>DiveComputerManagementDialog</name>
     <message>
+        <location filename="../desktop-widgets/divecomputermanagementdialog.ui" line="17"/>
+        <location filename="../build/ui_divecomputermanagementdialog.h" line="65"/>
+        <source>Edit dive computer nicknames</source>
+        <translation>Ändra dykdatorers namn</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divecomputermanagementdialog.cpp" line="49"/>
         <source>Remove the selected dive computer?</source>
         <translation>Radera vald dykdator?</translation>
@@ -1931,12 +1975,6 @@
         <translation>Är du säker på att du vill
 radera den valda dykdatorn?</translation>
     </message>
-    <message>
-        <location filename="../desktop-widgets/divecomputermanagementdialog.ui" line="17"/>
-        <location filename="../build/ui_divecomputermanagementdialog.h" line="65"/>
-        <source>Edit dive computer nicknames</source>
-        <translation>Ändra dykdatorers namn</translation>
-    </message>
 </context>
 <context>
     <name>DiveComputerModel</name>
@@ -1964,17 +2002,17 @@ radera den valda dykdatorn?</translation>
 <context>
     <name>DiveDetails</name>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="33"/>
+        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="38"/>
         <source>Dive details</source>
         <translation>Dykdetaljer</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="67"/>
+        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="72"/>
         <source>Delete dive</source>
         <translation>Radera dyk</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="84"/>
+        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="89"/>
         <source>Show on map</source>
         <translation>Visa på kartan</translation>
     </message>
@@ -1982,89 +2020,94 @@ radera den valda dykdatorn?</translation>
 <context>
     <name>DiveDetailsEdit</name>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="74"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="80"/>
         <source>Dive %1</source>
         <translation>Dyk %1</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="78"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="84"/>
         <source>Date:</source>
         <translation>Datum:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="86"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="92"/>
         <source>Location:</source>
         <translation>Plats:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="95"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="101"/>
         <source>Coordinates:</source>
         <translation>Koordinater:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="104"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="110"/>
         <source>Use current
 GPS location:</source>
         <translation>Använd nuvarande
 GPS position:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="118"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="124"/>
         <source>Depth:</source>
         <translation>Djup:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="127"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="133"/>
         <source>Duration:</source>
         <translation>Varaktighet:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="137"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="143"/>
         <source>Air Temp:</source>
         <translation>Lufttemp:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="146"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="152"/>
         <source>Water Temp:</source>
         <translation>Vattentemperatur:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="155"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="161"/>
         <source>Suit:</source>
         <translation>Dräkt:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="164"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="176"/>
         <source>Buddy:</source>
         <translation>Parkamrat:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="173"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="191"/>
         <source>Dive Master:</source>
         <translation>Divemaster:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="182"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="206"/>
         <source>Weight:</source>
         <translation>Vikt:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="192"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="216"/>
+        <source>Cylinder:</source>
+        <translation>Flaska:</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="231"/>
         <source>Gas mix:</source>
         <translation>Gasblandning:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="203"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="241"/>
         <source>Start Pressure:</source>
         <translation>Starttryck:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="213"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="250"/>
         <source>End Pressure:</source>
         <translation>Sluttryck:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="224"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="260"/>
         <source>Notes:</source>
         <translation>Anteckningar:</translation>
     </message>
@@ -2117,27 +2160,27 @@ GPS position:</translation>
         <translation>Vattentemperatur:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="199"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="198"/>
         <source>Dive Master:</source>
         <translation>Divemaster:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="213"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="211"/>
         <source>Weight:</source>
         <translation>Vikt:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="226"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="224"/>
         <source>Buddy:</source>
         <translation>Parkamrat:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="239"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="237"/>
         <source>SAC:</source>
         <translation>SAC:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="254"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="252"/>
         <source>Notes</source>
         <translation>Anteckningar</translation>
     </message>
@@ -2145,18 +2188,18 @@ GPS position:</translation>
 <context>
     <name>DiveEventItem</name>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="134"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="165"/>
         <source>Manual switch to OC</source>
         <translation>Manuellt byte till OC</translation>
     </message>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="136"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="167"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation>start</translation>
     </message>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="137"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="168"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation>slut</translation>
@@ -2165,27 +2208,27 @@ GPS position:</translation>
 <context>
     <name>DiveImportedModel</name>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="646"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="656"/>
         <source>Date/time</source>
         <translation>Datum/tid</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="648"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="658"/>
         <source>Duration</source>
         <translation>Varaktighet</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="650"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="660"/>
         <source>Depth</source>
         <translation>Djup</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="672"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="682"/>
         <source>h:</source>
         <translation>h:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="672"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="682"/>
         <source>min</source>
         <translation>Min</translation>
     </message>
@@ -2194,8 +2237,8 @@ GPS position:</translation>
     <name>DiveList</name>
     <message>
         <location filename="../mobile-widgets/qml/DiveList.qml" line="12"/>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="226"/>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="232"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="227"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="233"/>
         <source>Dive list</source>
         <translation>Dyklista</translation>
     </message>
@@ -2210,110 +2253,115 @@ GPS position:</translation>
         <translation>Varaktighet:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="222"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="223"/>
         <source>Cloud credentials</source>
         <translation>Moln referenser</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="228"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="229"/>
         <source>Please tap the &apos;+&apos; button to add a dive</source>
         <translation>Vänligen klicka på &apos;+&apos; knappen för att lägga till ett dyk</translation>
     </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="248"/>
+        <source>No dives in dive list</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DiveListView</name>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="846"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="849"/>
         <source>Expand all</source>
         <translation>Expandera alla</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="848"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="851"/>
         <source>Collapse all</source>
         <translation>Sammanslå alla</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="852"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="855"/>
         <source>Collapse others</source>
         <translation>Fäll samman andra</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="856"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="859"/>
         <source>Remove dive(s) from trip</source>
         <translation>Ta bort dyk från resa</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="857"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="860"/>
         <source>Create new trip above</source>
         <translation>Ny resa ovan</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="871"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="874"/>
         <source>Add dive(s) to trip immediately above</source>
         <translation>Lägg till dyk(en) till resan ovan</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="873"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="876"/>
         <source>Add dive(s) to trip immediately below</source>
         <translation>Lägg till dyk(en) till resan nedanför</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="877"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="880"/>
         <source>Merge trip with trip above</source>
         <translation>Sammanfoga resa med resan ovan</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="878"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="881"/>
         <source>Merge trip with trip below</source>
         <translation>Sammanfoga resa med resan under</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="882"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="885"/>
         <source>Delete dive(s)</source>
         <translation>Radera dyk(en)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="884"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="887"/>
         <source>Mark dive(s) invalid</source>
         <translation>Markera dyk som ogiltiga</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="888"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="891"/>
         <source>Merge selected dives</source>
         <translation>Slå samman valda dyk</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="890"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="893"/>
         <source>Renumber dive(s)</source>
         <translation>Uppdatera numrering</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="891"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="894"/>
         <source>Shift dive times</source>
         <translation>Korrigera dyk tider</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="892"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="895"/>
         <source>Split selected dives</source>
         <translation>Dela markerade dyk</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="893"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="896"/>
         <source>Load image(s) from file(s)</source>
         <translation>Laddar bild(er) från fil(er)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="894"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="897"/>
         <source>Load image(s) from web</source>
         <translation>Ladda bild(er) från nätet</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="917"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="919"/>
         <source>Open image files</source>
         <translation>Öppna bildfler</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="917"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="919"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>Bildfiler (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -2334,56 +2382,6 @@ GPS position:</translation>
 <context>
     <name>DiveLogExportDialog</name>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="103"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="351"/>
-        <source>Export format</source>
-        <translation>Exportformat</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="134"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="353"/>
-        <source>UDDF</source>
-        <translation>UDDF</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="187"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="358"/>
-        <source>Worldmap</source>
-        <translation>Värdskarta</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="197"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="359"/>
-        <source>I&amp;mage depths</source>
-        <translation>Bildernas ljup</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="243"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="360"/>
-        <source>Selection</source>
-        <translation>Markering</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="252"/>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="346"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="361"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="372"/>
-        <source>Selected dives</source>
-        <translation>Markerade dyk</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="262"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="362"/>
-        <source>All dives</source>
-        <translation>Alla dyk</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="306"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="396"/>
-        <source>HTML</source>
-        <translation>HTML</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="14"/>
         <location filename="../build/ui_divelogexportdialog.h" line="349"/>
         <source>Export dive log files</source>
@@ -2396,12 +2394,24 @@ GPS position:</translation>
         <translation>Exportera</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="103"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="351"/>
+        <source>Export format</source>
+        <translation>Exportformat</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="115"/>
         <location filename="../build/ui_divelogexportdialog.h" line="352"/>
         <source>Subsurface &amp;XML</source>
         <translation>Subsurface &amp;XML</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="134"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="353"/>
+        <source>UDDF</source>
+        <translation>UDDF</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="147"/>
         <location filename="../build/ui_divelogexportdialog.h" line="354"/>
         <source>di&amp;velogs.de</source>
@@ -2426,238 +2436,297 @@ GPS position:</translation>
         <translation>CSV dykdetaljer</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="275"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="187"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="358"/>
+        <source>Worldmap</source>
+        <translation>Värdskarta</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="197"/>
+        <source>TeX</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="207"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="359"/>
+        <source>I&amp;mage depths</source>
+        <translation>Bildernas ljup</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="253"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="360"/>
+        <source>Selection</source>
+        <translation>Markering</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="262"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="356"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="361"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="372"/>
+        <source>Selected dives</source>
+        <translation>Markerade dyk</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="272"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="362"/>
+        <source>All dives</source>
+        <translation>Alla dyk</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="285"/>
         <location filename="../build/ui_divelogexportdialog.h" line="363"/>
         <source>CSV units</source>
         <translation>CSV enheter</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="288"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="298"/>
         <location filename="../build/ui_divelogexportdialog.h" line="366"/>
         <source>Metric</source>
         <translation>Metrisk</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="293"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="303"/>
         <location filename="../build/ui_divelogexportdialog.h" line="367"/>
         <source>Imperial</source>
         <translation>Imperial</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="324"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="316"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="396"/>
+        <source>HTML</source>
+        <translation>HTML</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="334"/>
         <location filename="../build/ui_divelogexportdialog.h" line="370"/>
         <source>General settings</source>
         <translation>Allmänna inställningar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="330"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="340"/>
         <location filename="../build/ui_divelogexportdialog.h" line="371"/>
         <source>Subsurface numbers</source>
         <translation>Subsurface siffror</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="359"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="369"/>
         <location filename="../build/ui_divelogexportdialog.h" line="373"/>
         <source>Export yearly statistics</source>
         <translation>Exportera årsvis statestik</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="375"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="385"/>
         <location filename="../build/ui_divelogexportdialog.h" line="374"/>
         <source>All di&amp;ves</source>
         <translation>Alla dyk</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="385"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="395"/>
         <location filename="../build/ui_divelogexportdialog.h" line="375"/>
         <source>Export list only</source>
         <translation>Exportera enbart listan</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="392"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="402"/>
         <location filename="../build/ui_divelogexportdialog.h" line="376"/>
         <source>Export photos</source>
         <translation>Exportera foton</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="408"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="418"/>
         <location filename="../build/ui_divelogexportdialog.h" line="377"/>
         <source>Style options</source>
         <translation>Utseende</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="423"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="433"/>
         <location filename="../build/ui_divelogexportdialog.h" line="378"/>
         <source>Font</source>
         <translation>Font</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="433"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="443"/>
         <location filename="../build/ui_divelogexportdialog.h" line="379"/>
         <source>Font size</source>
         <translation>Fontstorlek</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="444"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="454"/>
         <location filename="../build/ui_divelogexportdialog.h" line="382"/>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="449"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="459"/>
         <location filename="../build/ui_divelogexportdialog.h" line="383"/>
         <source>10</source>
         <translation>10</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="454"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="464"/>
         <location filename="../build/ui_divelogexportdialog.h" line="384"/>
         <source>12</source>
         <translation>12</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="459"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="469"/>
         <location filename="../build/ui_divelogexportdialog.h" line="385"/>
         <source>14</source>
         <translation>14</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="464"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="474"/>
         <location filename="../build/ui_divelogexportdialog.h" line="386"/>
         <source>16</source>
         <translation>16</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="469"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="479"/>
         <location filename="../build/ui_divelogexportdialog.h" line="387"/>
         <source>18</source>
         <translation>18</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="474"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="484"/>
         <location filename="../build/ui_divelogexportdialog.h" line="388"/>
         <source>20</source>
         <translation>20</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="482"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="492"/>
         <location filename="../build/ui_divelogexportdialog.h" line="390"/>
         <source>Theme</source>
         <translation>Tema</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="493"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="503"/>
         <location filename="../build/ui_divelogexportdialog.h" line="393"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="95"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="99"/>
         <source>Light</source>
         <translation>Ljus</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="498"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="508"/>
         <location filename="../build/ui_divelogexportdialog.h" line="394"/>
         <source>Sand</source>
         <translation>Sand</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="134"/>
-        <source>UDDF files (*.uddf *.UDDF)</source>
-        <translation>UDDF filer (*.uddf *.UDDF)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="142"/>
-        <source>CSV files (*.csv *.CSV)</source>
-        <translation>CSV filer (*.csv *.CSV)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="74"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="76"/>
         <source>Generic format that is used for data exchange between a variety of diving related programs.</source>
         <translation>Generellt format som används för att utbyta data emellan olika dykrelaterade program. </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="76"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="78"/>
         <source>Comma separated values describing the dive profile.</source>
         <translation>Kommaseparerade värden som beskriver dykprofilen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="78"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="80"/>
         <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source>
         <translation>Dykinformationen i kommaseparerat format . Detta inkluderar de flesta av dykets detaljer men inte dykprofilen.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="80"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="82"/>
         <source>Send the dive data to divelogs.de website.</source>
         <translation>Skicka dykdatan till divelogs.de.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="82"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="84"/>
         <source>Send the dive data to dive-share.appspot.com website</source>
         <translation>Skicka dykdatan till websidan dive-share.appspot.com</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="84"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="86"/>
         <source>HTML export of the dive locations, visualized on a world map.</source>
         <translation>HTML-export av dykplatser visualiserade på en världskarta.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="86"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="88"/>
         <source>Subsurface native XML format.</source>
         <translation>Subsurface eget XML-format.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="88"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="90"/>
         <source>Write depths of images to file.</source>
         <translation>Skriv ljupet av bilderna till fil.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="133"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="92"/>
+        <source>Write dive as TeX macros to file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="137"/>
         <source>Export UDDF file as</source>
         <translation>Exportera som UDDF fil</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="137"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/>
+        <source>UDDF files (*.uddf *.UDDF)</source>
+        <translation>UDDF filer (*.uddf *.UDDF)</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divelogexportdialog.cpp" line="141"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="145"/>
         <source>Export CSV file as</source>
         <translation>Exportera CSV-fil som</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="148"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="142"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="146"/>
+        <source>CSV files (*.csv *.CSV)</source>
+        <translation>CSV filer (*.csv *.CSV)</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="152"/>
         <source>Export world map</source>
         <translation>Exportera världskarta</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="149"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="169"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="153"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="177"/>
         <source>HTML files (*.html)</source>
         <translation>HTMLfiler (*.html)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="153"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="157"/>
         <source>Export Subsurface XML</source>
         <translation>Exportera Subsurface XML</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="158"/>
         <source>XML files (*.xml *.ssrf)</source>
         <translation>XML filer (*.xml *.ssrf)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="162"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="166"/>
         <source>Save image depths</source>
         <translation>Spara bildernas ljup</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="168"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="170"/>
+        <source>Export to TeX file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="170"/>
+        <source>TeX files (*.tex)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="176"/>
         <source>Export HTML files as</source>
         <translation>Exportera HTML filer son</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="184"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="192"/>
         <source>Please wait, exporting...</source>
         <translation>Vänligen vänta, exporterar...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="219"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="227"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="311"/>
         <source>Can&apos;t open file %s</source>
         <translation>Kan inte öppna fil %s</translation>
     </message>
@@ -2671,25 +2740,6 @@ GPS position:</translation>
         <translation>Importera dyklogg</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="643"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="727"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="856"/>
-        <source>Time</source>
-        <translation>Tid</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.ui" line="127"/>
-        <location filename="../build/ui_divelogimportdialog.h" line="164"/>
-        <source>Metric</source>
-        <translation>Metrisk</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.ui" line="132"/>
-        <location filename="../build/ui_divelogimportdialog.h" line="165"/>
-        <source>Imperial</source>
-        <translation>Imperial</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divelogimportdialog.ui" line="89"/>
         <location filename="../build/ui_divelogimportdialog.h" line="152"/>
         <source>dd.mm.yyyy</source>
@@ -2708,74 +2758,6 @@ GPS position:</translation>
         <translation>yyyy-mm-dd</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.ui" line="155"/>
-        <location filename="../build/ui_divelogimportdialog.h" line="167"/>
-        <source>Drag the tags above to each corresponding column below</source>
-        <translation>Dra taggarna ovanför till respektive kolumn nedaför</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="641"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="729"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="852"/>
-        <source>Dive #</source>
-        <translation>Dyk #</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="642"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="723"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="854"/>
-        <source>Date</source>
-        <translation>Datum</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="644"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="858"/>
-        <source>Duration</source>
-        <translation>Varaktighet</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="655"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="862"/>
-        <source>GPS</source>
-        <translation>GPS</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="645"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="864"/>
-        <source>Max. depth</source>
-        <translation>Maxdjup</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="646"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="866"/>
-        <source>Avg. depth</source>
-        <translation>Medeldjup</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="658"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="872"/>
-        <source>Suit</source>
-        <translation>Dräkt</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="663"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="878"/>
-        <source>Tags</source>
-        <translation>Taggar</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="652"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="894"/>
-        <source>O₂</source>
-        <translation>O₂</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="653"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="896"/>
-        <source>He</source>
-        <translation>He</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divelogimportdialog.ui" line="108"/>
         <location filename="../build/ui_divelogimportdialog.h" line="158"/>
         <source>Seconds</source>
@@ -2794,183 +2776,269 @@ GPS position:</translation>
         <translation>Minuter:sekunder</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="654"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="860"/>
-        <source>Location</source>
-        <translation>Plats</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.ui" line="127"/>
+        <location filename="../build/ui_divelogimportdialog.h" line="164"/>
+        <source>Metric</source>
+        <translation>Metrisk</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.ui" line="132"/>
+        <location filename="../build/ui_divelogimportdialog.h" line="165"/>
+        <source>Imperial</source>
+        <translation>Imperial</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="354"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="499"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="505"/>
+        <location filename="../desktop-widgets/divelogimportdialog.ui" line="155"/>
+        <location filename="../build/ui_divelogimportdialog.h" line="167"/>
+        <source>Drag the tags above to each corresponding column below</source>
+        <translation>Dra taggarna ovanför till respektive kolumn nedaför</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="355"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="528"/>
         <source>Tab</source>
         <translation>Tabbstop</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="575"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="598"/>
         <source>Some column headers were pre-populated; please drag and drop the headers so they match the column they are in.</source>
         <translation>Vissa kolumn titlar placerades i förväg; vänligen dra och släpp titlarna till den kolumn de tillhör.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="613"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="731"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="782"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="848"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="636"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="761"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="857"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="925"/>
         <source>Sample time</source>
         <translation>Samplingstid</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="615"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="733"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="784"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="638"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="763"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="859"/>
         <source>Sample depth</source>
         <translation>Samplingsdjup</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="617"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="735"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="786"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="640"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="765"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="861"/>
         <source>Sample temperature</source>
         <translation>Samnplingstemperatur</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="621"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="739"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="790"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="642"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="767"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="863"/>
+        <source>Sample pO₂</source>
+        <translation>Samplings pO₂</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="644"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="769"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="865"/>
         <source>Sample sensor1 pO₂</source>
         <translation>Samplings sensor1 pO₂</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="623"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="741"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="792"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="646"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="771"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="867"/>
         <source>Sample sensor2 pO₂</source>
         <translation>Samplings sensor2 pO₂</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="625"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="743"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="794"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="648"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="773"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="869"/>
         <source>Sample sensor3 pO₂</source>
         <translation>Samplings sensor3 pO₂</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="633"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="751"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="802"/>
-        <source>Sample stopdepth</source>
-        <translation>Samplingsstopdjup</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="637"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="755"/>
-        <source>Sample setpoint</source>
-        <translation>Samplings setpoint</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="619"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="737"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="788"/>
-        <source>Sample pO₂</source>
-        <translation>Samplings pO₂</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="627"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="745"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="796"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="650"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="775"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="871"/>
         <source>Sample CNS</source>
         <translation>Samplings CNS</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="629"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="747"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="798"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="652"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="777"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="873"/>
         <source>Sample NDL</source>
         <translation>Samplings NDL</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="631"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="749"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="800"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="654"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="779"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="875"/>
         <source>Sample TTS</source>
         <translation>Samplings TTS</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="635"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="753"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="804"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="656"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="781"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="877"/>
+        <source>Sample stopdepth</source>
+        <translation>Samplingsstopdjup</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="658"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="783"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="879"/>
         <source>Sample pressure</source>
         <translation>Samplingstryck</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="656"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="868"/>
-        <source>Divemaster</source>
-        <translation>Divemaster</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="660"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="785"/>
+        <source>Sample setpoint</source>
+        <translation>Samplings setpoint</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="657"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="870"/>
-        <source>Buddy</source>
-        <translation>Parkamrat</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="664"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="759"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="929"/>
+        <source>Dive #</source>
+        <translation>Dyk #</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="659"/>
-        <source>Rating</source>
-        <translation>Rankning</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="665"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="753"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="931"/>
+        <source>Date</source>
+        <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="660"/>
-        <source>Visibility</source>
-        <translation>Synlighet</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="666"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="757"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="933"/>
+        <source>Time</source>
+        <translation>Tid</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="661"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="874"/>
-        <source>Notes</source>
-        <translation>Anteckningar</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="667"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="935"/>
+        <source>Duration</source>
+        <translation>Varaktighet</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="662"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="876"/>
-        <source>Weight</source>
-        <translation>Vikt</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="668"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="941"/>
+        <source>Max. depth</source>
+        <translation>Maxdjup</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="669"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="943"/>
+        <source>Avg. depth</source>
+        <translation>Medeldjup</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="649"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="888"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="670"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="975"/>
+        <source>Air temp.</source>
+        <translation>Lufttemp</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="671"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="977"/>
+        <source>Water temp.</source>
+        <translation>Vattentemperatur</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="672"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="965"/>
         <source>Cyl. size</source>
         <translation>Cyl. storlek</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="650"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="890"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="673"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="967"/>
         <source>Start pressure</source>
         <translation>Starttryck</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="651"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="892"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="674"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="969"/>
         <source>End pressure</source>
         <translation>Sluttryck</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="647"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="898"/>
-        <source>Air temp.</source>
-        <translation>Lufttemp</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="675"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="971"/>
+        <source>O₂</source>
+        <translation>O₂</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="648"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="900"/>
-        <source>Water temp.</source>
-        <translation>Vattentemperatur</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="676"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="973"/>
+        <source>He</source>
+        <translation>He</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="677"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="937"/>
+        <source>Location</source>
+        <translation>Plats</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="678"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="939"/>
+        <source>GPS</source>
+        <translation>GPS</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="679"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="945"/>
+        <source>Divemaster</source>
+        <translation>Divemaster</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="680"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="947"/>
+        <source>Buddy</source>
+        <translation>Parkamrat</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="681"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="949"/>
+        <source>Suit</source>
+        <translation>Dräkt</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="682"/>
+        <source>Rating</source>
+        <translation>Rankning</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="683"/>
+        <source>Visibility</source>
+        <translation>Synlighet</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="684"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="951"/>
+        <source>Notes</source>
+        <translation>Anteckningar</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="685"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="953"/>
+        <source>Weight</source>
+        <translation>Vikt</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="686"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="955"/>
+        <source>Tags</source>
+        <translation>Taggar</translation>
     </message>
 </context>
 <context>
     <name>DiveObjectHelper</name>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="287"/>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="323"/>
         <source>%1 dive(s)</source>
         <translation>%1 dyk</translation>
     </message>
@@ -2978,18 +3046,18 @@ GPS position:</translation>
 <context>
     <name>DivePlanner</name>
     <message>
-        <location filename="../desktop-widgets/diveplanner.ui" line="152"/>
-        <location filename="../build/ui_diveplanner.h" line="190"/>
-        <source>Altitude</source>
-        <translation>Höjd</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/diveplanner.ui" line="109"/>
         <location filename="../build/ui_diveplanner.h" line="189"/>
         <source>Planned dive time</source>
         <translation>Planerad dyktid</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/diveplanner.ui" line="152"/>
+        <location filename="../build/ui_diveplanner.h" line="190"/>
+        <source>Altitude</source>
+        <translation>Höjd</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/diveplanner.ui" line="159"/>
         <location filename="../build/ui_diveplanner.h" line="191"/>
         <source>ATM pressure</source>
@@ -3023,32 +3091,32 @@ GPS position:</translation>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="134"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="136"/>
         <source>unknown</source>
         <translation>okänd</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="312"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="326"/>
         <source>Final depth</source>
         <translation>Slutdjup</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="314"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="328"/>
         <source>Run time</source>
         <translation>Löptid</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="316"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="330"/>
         <source>Duration</source>
         <translation>Varaktighet</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="318"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="332"/>
         <source>Used gas</source>
         <translation>Använd gas</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="320"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="334"/>
         <source>CC setpoint</source>
         <translation>CC setpoint</translation>
     </message>
@@ -3056,22 +3124,22 @@ GPS position:</translation>
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="108"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="112"/>
         <source>Dive planner points</source>
         <translation>Dykplaneringspunkter</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="112"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="116"/>
         <source>Available gases</source>
         <translation>Tillgänglig gas</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="137"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="143"/>
         <source>Add dive data point</source>
         <translation>lägg till dykdatapunkt</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="146"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="152"/>
         <source>Save new</source>
         <translation>Spara ny</translation>
     </message>
@@ -3104,11 +3172,36 @@ GPS position:</translation>
         <translation>Färg</translation>
     </message>
     <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="124"/>
+        <source>User entered</source>
+        <translation>Användarinmatad</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="126"/>
+        <source>Cylinder index</source>
+        <translation>Flaskid</translation>
+    </message>
+    <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="128"/>
         <source>Pressure S</source>
         <translation>Tryck S</translation>
     </message>
     <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="130"/>
+        <source>Pressure I</source>
+        <translation>Tryck I</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="132"/>
+        <source>Ceiling</source>
+        <translation>Tak</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="134"/>
+        <source>SAC</source>
+        <translation>SAC</translation>
+    </message>
+    <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="136"/>
         <source>pN₂</source>
         <translation>pN₂</translation>
@@ -3144,49 +3237,24 @@ GPS position:</translation>
         <translation>Sensor 3</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="152"/>
-        <source>Heart rate</source>
-        <translation>Hjärtrytm</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="156"/>
-        <source>Mean depth @ s</source>
-        <translation>Medeldjup @ s</translation>
-    </message>
-    <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="150"/>
         <source>Ambient pressure</source>
         <translation>Omgivande tryck</translation>
     </message>
     <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="152"/>
+        <source>Heart rate</source>
+        <translation>Hjärtrytm</translation>
+    </message>
+    <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="154"/>
         <source>Gradient factor</source>
         <translation>Gradientfaktor</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="130"/>
-        <source>Pressure I</source>
-        <translation>Tryck I</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="124"/>
-        <source>User entered</source>
-        <translation>Användarinmatad</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="126"/>
-        <source>Cylinder index</source>
-        <translation>Flaskid</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="132"/>
-        <source>Ceiling</source>
-        <translation>Tak</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="134"/>
-        <source>SAC</source>
-        <translation>SAC</translation>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="156"/>
+        <source>Mean depth @ s</source>
+        <translation>Medeldjup @ s</translation>
     </message>
 </context>
 <context>
@@ -3257,311 +3325,315 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="395"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="441"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="434"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="483"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="398"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="444"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="437"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="486"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="401"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="447"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="440"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="489"/>
         <source>Rating</source>
         <translation>Rankning</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="404"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="443"/>
         <source>Depth</source>
         <translation>Djup</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="410"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="446"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="495"/>
+        <source>Duration</source>
+        <translation>Varaktighet</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="449"/>
         <source>Temp</source>
         <translation>Temp</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="413"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="452"/>
         <source>Weight</source>
         <translation>Vikt</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="425"/>
-        <source>SAC</source>
-        <translation>SAC</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
-        <source>m</source>
-        <translation>m</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
-        <source>ft</source>
-        <translation>ft</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
-        <source>Weight(%1)</source>
-        <translation>Vikt(%1)</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="416"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="462"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="455"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="504"/>
         <source>Suit</source>
         <translation>Dräkt</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="419"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="465"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="458"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="507"/>
         <source>Cyl</source>
         <translation>Cyl</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="422"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="468"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="461"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="510"/>
         <source>Gas</source>
         <translation>Gas</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
-        <source>SAC(%1)</source>
-        <translation>SAC(%1)</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="464"/>
+        <source>SAC</source>
+        <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
-        <source>/min</source>
-        <translation>/min</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="467"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="518"/>
+        <source>OTU</source>
+        <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="431"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="479"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="470"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="521"/>
         <source>Max CNS</source>
         <translation>Max CNS</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="434"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="482"/>
-        <source>Location</source>
-        <translation>Plats</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
+        <source>Photos</source>
+        <translation>Bilder</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
-        <source>kg</source>
-        <translation>kg</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="476"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="527"/>
+        <source>Location</source>
+        <translation>Plats</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="492"/>
         <source>Depth(%1)</source>
         <translation>Ljup(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="407"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="453"/>
-        <source>Duration</source>
-        <translation>Varaktighet</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="492"/>
+        <source>m</source>
+        <translation>m</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="492"/>
+        <source>ft</source>
+        <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="456"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="498"/>
         <source>Temp(%1%2)</source>
         <translation>Temperatur(%1%2)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="501"/>
+        <source>Weight(%1)</source>
+        <translation>Vikt(%1)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="501"/>
+        <source>kg</source>
+        <translation>kg</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="501"/>
         <source>lbs</source>
         <translation>pund</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="428"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="476"/>
-        <source>OTU</source>
-        <translation>OTU</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="515"/>
+        <source>SAC(%1)</source>
+        <translation>SAC(%1)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="515"/>
+        <source>/min</source>
+        <translation>/min</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="524"/>
+        <source>Photos before/during/after dive</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="164"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="165"/>
         <source>no dives were selected</source>
         <translation>inga dyk var markerade</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="174"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="175"/>
         <source>stylesheet to export to divelogs.de is not found</source>
         <translation>mallen för export till divelogs.de kan inte hittas</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="184"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="185"/>
         <source>failed to create zip file for upload: %s</source>
         <translation>misslyckades med att skapa zipfilen för uppladdning: %s</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="236"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="237"/>
         <source>internal error</source>
         <translation>internt fel</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="244"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="245"/>
         <source>Conversion of dive %1 to divelogs.de format failed</source>
         <translation>Konvertering av dyk %1 till divelogs.de format misslyckades</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="272"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="273"/>
         <source>error writing zip file: %s zip error %d system error %d - %s</source>
         <translation>fel vid skrivning av zip fil: %s zip fel %d system fel %d - %s</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="745"/>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="935"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="936"/>
         <source>Done</source>
         <translation>Klar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="778"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="779"/>
         <source>Uploading dive list...</source>
         <translation>Laddar upp dyklista...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="810"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="811"/>
         <source>Downloading dive list...</source>
         <translation>Laddar ner dyklista...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="851"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="852"/>
         <source>Downloading %1 dives...</source>
         <translation>Laddar ner %1 dyk...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="885"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="886"/>
         <source>Download finished - %1</source>
         <translation>Nedladdning klar - %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="899"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="900"/>
         <source>Problem with download</source>
         <translation>Problem med nerladdningen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="900"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="901"/>
         <source>The archive could not be opened:
 </source>
         <translation>Arkiver kunde inte öppnas:
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="909"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="910"/>
         <source>Corrupted download</source>
         <translation>Misslyckad nedladdning</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="910"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="911"/>
         <source>The archive could not be opened:
 %1</source>
         <translation>Arkivet kunde inte öppnas:
 %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="937"/>
+        <source>Upload finished</source>
+        <translation>Uppladdning klar</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="950"/>
         <source>Upload failed</source>
         <translation>Uppladdning misslyckades</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="952"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="953"/>
         <source>Upload successful</source>
         <translation>Uppladdningen lyckades</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="955"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="956"/>
         <source>Login failed</source>
         <translation>Inloggning misslyckades</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="958"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="959"/>
         <source>Cannot parse response</source>
         <translation>Kan inte tolka respons</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="970"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="971"/>
         <source>Error: %1</source>
         <translation>Fel: %1</translation>
     </message>
-    <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="936"/>
-        <source>Upload finished</source>
-        <translation>Uppladdning klar</translation>
-    </message>
 </context>
 <context>
     <name>DownloadFromDCWidget</name>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="185"/>
-        <source>Error</source>
-        <translation>Error</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="436"/>
-        <source>Retry</source>
-        <translation>Försök igen</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="280"/>
-        <source>Find Uemis dive computer</source>
-        <translation>Hitta Uemis dykdator</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="101"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="107"/>
         <source>Download</source>
         <translation>Ladda ned</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="104"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="110"/>
         <source>Choose Bluetooth download mode</source>
         <translation>Välj Blåtands nerladdnings läge</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="382"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="191"/>
+        <source>Error</source>
+        <translation>Error</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="286"/>
+        <source>Find Uemis dive computer</source>
+        <translation>Hitta Uemis dykdator</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="392"/>
         <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="../desktop-widgets/downloadfromdivecomputer.cpp" line="383"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="393"/>
         <source>Log files (*.log)</source>
         <translation>Loggfiler (*.log)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="398"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="408"/>
         <source>Warning</source>
         <translation>Varning</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="399"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="409"/>
         <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="../desktop-widgets/downloadfromdivecomputer.cpp" line="410"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="420"/>
         <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="../desktop-widgets/downloadfromdivecomputer.cpp" line="411"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="421"/>
         <source>Dump files (*.bin)</source>
         <translation>Dumpfiler (*.bin)</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="446"/>
+        <source>Retry</source>
+        <translation>Försök igen</translation>
+    </message>
 </context>
 <context>
     <name>DownloadFromDiveComputer</name>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="139"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="275"/>
-        <source>Vendor</source>
-        <translation>Leverantör</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="14"/>
         <location filename="../build/ui_downloadfromdivecomputer.h" line="265"/>
         <source>Download from dive computer</source>
@@ -3574,17 +3646,6 @@ p, li { white-space: pre-wrap; }
         <translation>Enhet eller monteringspunkt</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="122"/>
-        <source>Choose Bluetooth download mode</source>
-        <translation>Välj Blåtands nerladdnings läge</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="149"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="276"/>
-        <source>Dive computer</source>
-        <translation>Dykdator</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="66"/>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="101"/>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="115"/>
@@ -3608,11 +3669,46 @@ p, li { white-space: pre-wrap; }
         <translation>Föredra alltid nedladdad dykinformation</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="87"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="270"/>
+        <source>Download into new trip</source>
+        <translation>Ladda ner till ny resa</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="94"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="271"/>
+        <source>Save libdivecomputer logfile</source>
+        <translation>Spara loggfil av nerladdningen ifrån dykdatorn</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="108"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="273"/>
+        <source>Save libdivecomputer dumpfile</source>
+        <translation>Spara dumpfil ifrån dykdatorn</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="122"/>
+        <source>Choose Bluetooth download mode</source>
+        <translation>Välj Blåtands nerladdnings läge</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="129"/>
         <source>Select a remote Bluetooth device.</source>
         <translation>Välj extern blåtandsenhet.</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="139"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="275"/>
+        <source>Vendor</source>
+        <translation>Leverantör</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="149"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="276"/>
+        <source>Dive computer</source>
+        <translation>Dykdator</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/>
         <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="52"/>
         <location filename="../build/ui_downloadfromdivecomputer.h" line="277"/>
@@ -3620,18 +3716,6 @@ p, li { white-space: pre-wrap; }
         <translation>Ladda ned</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="284"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="281"/>
-        <source>OK</source>
-        <translation>OK</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="291"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="282"/>
-        <source>Cancel</source>
-        <translation>Avbryt</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="226"/>
         <location filename="../build/ui_downloadfromdivecomputer.h" line="278"/>
         <source>Downloaded dives</source>
@@ -3650,22 +3734,16 @@ p, li { white-space: pre-wrap; }
         <translation>Avmarkera alla</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="94"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="271"/>
-        <source>Save libdivecomputer logfile</source>
-        <translation>Spara loggfil av nerladdningen ifrån dykdatorn</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="108"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="273"/>
-        <source>Save libdivecomputer dumpfile</source>
-        <translation>Spara dumpfil ifrån dykdatorn</translation>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="284"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="281"/>
+        <source>OK</source>
+        <translation>OK</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="87"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="270"/>
-        <source>Download into new trip</source>
-        <translation>Ladda ner till ny resa</translation>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="291"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="282"/>
+        <source>Cancel</source>
+        <translation>Avbryt</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="16"/>
@@ -3755,12 +3833,12 @@ p, li { white-space: pre-wrap; }
         <translation>Anslut till facebook </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="297"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="242"/>
         <source>To disconnect Subsurface from your Facebook account, use the button below</source>
         <translation>Använd knappen nedan för att koppla Subsurface till ditt Facebook-konto.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="306"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="251"/>
         <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source>
         <translation>Logga in för att koppla Subsurface till Facebook. Det tillgängliggör möjligheten att publicera dyk till din Facebook-timeline.</translation>
     </message>
@@ -3768,22 +3846,22 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>FacebookManager</name>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="266"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="211"/>
         <source>Photo upload sucessfull</source>
         <translation>Fotouppladdningen  lyckades</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="267"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="212"/>
         <source>Your dive profile was updated to Facebook.</source>
         <translation>Din dykprofil laddades up till Facebook.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="271"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="216"/>
         <source>Photo upload failed</source>
         <translation>Fotouppladdningen misslyckades</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="272"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="217"/>
         <source>Your dive profile was not updated to Facebook, 
  please send the following to the developer. 
 </source>
@@ -3845,17 +3923,25 @@ vänligen skicka följande till utvecklarna.
 <context>
     <name>FirmwareUpdateThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1750"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1739"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Den här möjligheten är inte än tillgänglig för denna dykdator dator.</translation>
     </message>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1755"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1744"/>
         <source>Firmware update failed!</source>
         <translation>Mjukvaruuppdateringen misslyckades!</translation>
     </message>
 </context>
 <context>
+    <name>GlobalDrawer</name>
+    <message>
+        <location filename="../mobile-widgets/qml/kirigami/src/controls/GlobalDrawer.qml" line="364"/>
+        <source>Back</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>GlobeGPS</name>
     <message>
         <location filename="../desktop-widgets/globe.cpp" line="124"/>
@@ -3871,27 +3957,27 @@ vänligen skicka följande till utvecklarna.
         <translation>GPS position</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="40"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="32"/>
         <source>Date: </source>
         <translation>Datum:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="50"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="42"/>
         <source>Name: </source>
         <translation>Namn</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="60"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="52"/>
         <source>Latitude: </source>
         <translation>Lattitud:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="69"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="61"/>
         <source>Longitude: </source>
         <translation>Longitud:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="113"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="105"/>
         <source>List of stored GPS fixes</source>
         <translation>Lista på sparade GPS positioner</translation>
     </message>
@@ -3920,7 +4006,7 @@ vänligen skicka följande till utvecklarna.
 <context>
     <name>LocationFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="648"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="646"/>
         <source>Location: </source>
         <translation>Platts:</translation>
     </message>
@@ -3961,7 +4047,7 @@ vänligen skicka följande till utvecklarna.
 <context>
     <name>LocationFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="299"/>
+        <location filename="../qt-models/filtermodels.cpp" line="304"/>
         <source>No location set</source>
         <translation>Ingen plats angiven</translation>
     </message>
@@ -4085,6 +4171,54 @@ vänligen skicka följande till utvecklarna.
 <context>
     <name>MainTab</name>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="18"/>
+        <location filename="../desktop-widgets/maintab.ui" line="439"/>
+        <location filename="../build/ui_maintab.h" line="961"/>
+        <location filename="../build/ui_maintab.h" line="963"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="539"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="571"/>
+        <source>Notes</source>
+        <translation>Anteckningar</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="21"/>
+        <location filename="../build/ui_maintab.h" line="964"/>
+        <source>General notes about the current selection</source>
+        <translation>Generella notiser om den aktuella markeringen</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="92"/>
+        <location filename="../desktop-widgets/maintab.ui" line="646"/>
+        <location filename="../build/ui_maintab.h" line="947"/>
+        <location filename="../build/ui_maintab.h" line="967"/>
+        <source>Date</source>
+        <translation>Datum</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="102"/>
+        <location filename="../build/ui_maintab.h" line="948"/>
+        <source>Time</source>
+        <translation>Tid</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="112"/>
+        <location filename="../desktop-widgets/maintab.ui" line="836"/>
+        <location filename="../build/ui_maintab.h" line="949"/>
+        <location filename="../build/ui_maintab.h" line="987"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="306"/>
+        <source>Air temp.</source>
+        <translation>Lufttemp</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="122"/>
+        <location filename="../desktop-widgets/maintab.ui" line="855"/>
+        <location filename="../build/ui_maintab.h" line="950"/>
+        <location filename="../build/ui_maintab.h" line="989"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="307"/>
+        <source>Water temp.</source>
+        <translation>Vattentemperatur</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="184"/>
         <location filename="../build/ui_maintab.h" line="951"/>
         <location filename="../desktop-widgets/maintab.cpp" line="570"/>
@@ -4092,6 +4226,17 @@ vänligen skicka följande till utvecklarna.
         <translation>Plats</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="214"/>
+        <source>Edit dive site</source>
+        <translation>Redigera dykplats</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="217"/>
+        <location filename="../build/ui_maintab.h" line="953"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="252"/>
         <location filename="../build/ui_maintab.h" line="954"/>
         <source>Divemaster</source>
@@ -4104,12 +4249,6 @@ vänligen skicka följande till utvecklarna.
         <translation>Parkamrat</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.ui" line="387"/>
-        <location filename="../build/ui_maintab.h" line="959"/>
-        <source>Tags</source>
-        <translation>Taggar</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/maintab.ui" line="308"/>
         <location filename="../build/ui_maintab.h" line="956"/>
         <source>Rating</source>
@@ -4128,57 +4267,18 @@ vänligen skicka följande till utvecklarna.
         <translation>Dräkt</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="387"/>
+        <location filename="../build/ui_maintab.h" line="959"/>
+        <source>Tags</source>
+        <translation>Taggar</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="397"/>
         <location filename="../build/ui_maintab.h" line="960"/>
         <source>Dive mode</source>
         <translation>Dykläge</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.ui" line="112"/>
-        <location filename="../desktop-widgets/maintab.ui" line="836"/>
-        <location filename="../build/ui_maintab.h" line="949"/>
-        <location filename="../build/ui_maintab.h" line="987"/>
-        <location filename="../desktop-widgets/maintab.cpp" line="306"/>
-        <source>Air temp.</source>
-        <translation>Lufttemp</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="122"/>
-        <location filename="../desktop-widgets/maintab.ui" line="855"/>
-        <location filename="../build/ui_maintab.h" line="950"/>
-        <location filename="../build/ui_maintab.h" line="989"/>
-        <location filename="../desktop-widgets/maintab.cpp" line="307"/>
-        <source>Water temp.</source>
-        <translation>Vattentemperatur</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="18"/>
-        <location filename="../desktop-widgets/maintab.ui" line="439"/>
-        <location filename="../build/ui_maintab.h" line="961"/>
-        <location filename="../build/ui_maintab.h" line="963"/>
-        <location filename="../desktop-widgets/maintab.cpp" line="539"/>
-        <location filename="../desktop-widgets/maintab.cpp" line="571"/>
-        <source>Notes</source>
-        <translation>Anteckningar</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="21"/>
-        <location filename="../build/ui_maintab.h" line="964"/>
-        <source>General notes about the current selection</source>
-        <translation>Generella notiser om den aktuella markeringen</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="214"/>
-        <source>Edit dive site</source>
-        <translation>Redigera dykplats</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="217"/>
-        <location filename="../build/ui_maintab.h" line="953"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/maintab.ui" line="491"/>
         <location filename="../build/ui_maintab.h" line="965"/>
         <source>Equipment</source>
@@ -4203,6 +4303,12 @@ vänligen skicka följande till utvecklarna.
         <translation>Dykinformation</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="665"/>
+        <location filename="../build/ui_maintab.h" line="969"/>
+        <source>Interval</source>
+        <translation>Intervall</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="684"/>
         <location filename="../build/ui_maintab.h" line="971"/>
         <source>Gases used</source>
@@ -4215,18 +4321,38 @@ vänligen skicka följande till utvecklarna.
         <translation>Gasanvändning</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="722"/>
+        <location filename="../desktop-widgets/maintab.ui" line="1094"/>
+        <location filename="../build/ui_maintab.h" line="975"/>
+        <location filename="../build/ui_maintab.h" line="1003"/>
+        <source>SAC</source>
+        <translation>SAC</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="741"/>
         <location filename="../build/ui_maintab.h" line="977"/>
         <source>CNS</source>
         <translation>CNS</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="760"/>
+        <location filename="../build/ui_maintab.h" line="979"/>
+        <source>OTU</source>
+        <translation>OTU</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="779"/>
         <location filename="../build/ui_maintab.h" line="981"/>
         <source>Max. depth</source>
         <translation>Maxdjup</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="798"/>
+        <location filename="../build/ui_maintab.h" line="983"/>
+        <source>Avg. depth</source>
+        <translation>Medeldjup</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="817"/>
         <location filename="../build/ui_maintab.h" line="985"/>
         <source>Air pressure</source>
@@ -4239,82 +4365,6 @@ vänligen skicka följande till utvecklarna.
         <translation>Dyktid</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.ui" line="933"/>
-        <location filename="../build/ui_maintab.h" line="1007"/>
-        <source>Simple statistics about the selection</source>
-        <translation>Enkel statistik om markeringen</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1039"/>
-        <location filename="../build/ui_maintab.h" line="999"/>
-        <source>Total time</source>
-        <translation>Total tid</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1106"/>
-        <location filename="../build/ui_maintab.h" line="1004"/>
-        <source>Gas consumption</source>
-        <translation>Gasförbrukning</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1151"/>
-        <location filename="../build/ui_maintab.h" line="1009"/>
-        <source>All photos from the current selection</source>
-        <translation>Alla foton från den aktuella markeringen</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1177"/>
-        <location filename="../build/ui_maintab.h" line="1010"/>
-        <source>Extra data</source>
-        <translation>Extra data</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1180"/>
-        <location filename="../build/ui_maintab.h" line="1011"/>
-        <source>Adittional data from the dive computer</source>
-        <translation>Extra data ifrån dykdatorn</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="92"/>
-        <location filename="../desktop-widgets/maintab.ui" line="646"/>
-        <location filename="../build/ui_maintab.h" line="947"/>
-        <location filename="../build/ui_maintab.h" line="967"/>
-        <source>Date</source>
-        <translation>Datum</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="102"/>
-        <location filename="../build/ui_maintab.h" line="948"/>
-        <source>Time</source>
-        <translation>Tid</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="665"/>
-        <location filename="../build/ui_maintab.h" line="969"/>
-        <source>Interval</source>
-        <translation>Intervall</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="722"/>
-        <location filename="../desktop-widgets/maintab.ui" line="1094"/>
-        <location filename="../build/ui_maintab.h" line="975"/>
-        <location filename="../build/ui_maintab.h" line="1003"/>
-        <source>SAC</source>
-        <translation>SAC</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="798"/>
-        <location filename="../build/ui_maintab.h" line="983"/>
-        <source>Avg. depth</source>
-        <translation>Medeldjup</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="760"/>
-        <location filename="../build/ui_maintab.h" line="979"/>
-        <source>OTU</source>
-        <translation>OTU</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/maintab.ui" line="893"/>
         <location filename="../build/ui_maintab.h" line="993"/>
         <source>Salinity</source>
@@ -4327,22 +4377,34 @@ vänligen skicka följande till utvecklarna.
         <translation>Statistik</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="933"/>
+        <location filename="../build/ui_maintab.h" line="1007"/>
+        <source>Simple statistics about the selection</source>
+        <translation>Enkel statistik om markeringen</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="986"/>
         <location filename="../build/ui_maintab.h" line="996"/>
         <source>Depth</source>
         <translation>Djup</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="998"/>
+        <location filename="../build/ui_maintab.h" line="997"/>
+        <source>Duration</source>
+        <translation>Varaktighet</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="1027"/>
         <location filename="../build/ui_maintab.h" line="998"/>
         <source>Temperature</source>
         <translation>Temperatur</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.ui" line="998"/>
-        <location filename="../build/ui_maintab.h" line="997"/>
-        <source>Duration</source>
-        <translation>Varaktighet</translation>
+        <location filename="../desktop-widgets/maintab.ui" line="1039"/>
+        <location filename="../build/ui_maintab.h" line="999"/>
+        <source>Total time</source>
+        <translation>Total tid</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/maintab.ui" line="1058"/>
@@ -4351,20 +4413,34 @@ vänligen skicka följande till utvecklarna.
         <translation>Dyk</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="1106"/>
+        <location filename="../build/ui_maintab.h" line="1004"/>
+        <source>Gas consumption</source>
+        <translation>Gasförbrukning</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="1148"/>
         <location filename="../build/ui_maintab.h" line="1008"/>
         <source>Photos</source>
         <translation>Bilder</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.cpp" line="88"/>
-        <source>Cylinders</source>
-        <translation>Flaskor</translation>
+        <location filename="../desktop-widgets/maintab.ui" line="1151"/>
+        <location filename="../build/ui_maintab.h" line="1009"/>
+        <source>All photos from the current selection</source>
+        <translation>Alla foton från den aktuella markeringen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.cpp" line="92"/>
-        <source>Weights</source>
-        <translation>Vikter</translation>
+        <location filename="../desktop-widgets/maintab.ui" line="1177"/>
+        <location filename="../build/ui_maintab.h" line="1010"/>
+        <source>Extra data</source>
+        <translation>Extra data</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="1180"/>
+        <location filename="../build/ui_maintab.h" line="1011"/>
+        <source>Adittional data from the dive computer</source>
+        <translation>Extra data ifrån dykdatorn</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/maintab.cpp" line="63"/>
@@ -4377,11 +4453,21 @@ vänligen skicka följande till utvecklarna.
         <translation>Kasta förändringar</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.cpp" line="88"/>
+        <source>Cylinders</source>
+        <translation>Flaskor</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.cpp" line="89"/>
         <source>Add cylinder</source>
         <translation>Lägg till flaska</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.cpp" line="92"/>
+        <source>Weights</source>
+        <translation>Vikter</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.cpp" line="93"/>
         <source>Add weight system</source>
         <translation>Lägg till viktsystem</translation>
@@ -4574,659 +4660,685 @@ mixas av luft och:
         <translation>&amp;File</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="455"/>
-        <location filename="../build/ui_mainwindow.h" line="534"/>
-        <source>Export dive logs</source>
-        <translation>Exportera dykloggar</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="510"/>
-        <location filename="../build/ui_mainwindow.h" line="542"/>
-        <source>Toggle pHe graph</source>
-        <translation>Slå av/på pHe grafen</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="546"/>
-        <location filename="../build/ui_mainwindow.h" line="545"/>
-        <source>Toggle calculating all tissues</source>
-        <translation>Slå av/på beräkningen av alla vävnader</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="522"/>
-        <location filename="../build/ui_mainwindow.h" line="543"/>
-        <source>Toggle DC reported ceiling</source>
-        <translation>Slå av/på dykdatorrapporterat takinformation</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="534"/>
-        <location filename="../build/ui_mainwindow.h" line="544"/>
-        <source>Toggle calculated ceiling</source>
-        <translation>Slå av/på  beräknad takinformation</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="606"/>
-        <location filename="../build/ui_mainwindow.h" line="550"/>
-        <source>Toggle NDL, TTS</source>
-        <translation> Slå av/på NDL, TTS</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="558"/>
-        <location filename="../build/ui_mainwindow.h" line="546"/>
-        <source>Toggle calculated ceiling with 3m increments</source>
-        <translation>Slå av/på beräknad takinformation i 3m steg</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="463"/>
-        <location filename="../build/ui_mainwindow.h" line="537"/>
-        <source>Configure &amp;dive computer</source>
-        <translation>Konfigurera &amp;dykdatorer</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="570"/>
-        <location filename="../build/ui_mainwindow.h" line="547"/>
-        <source>Toggle heart rate</source>
-        <translation>Slå av/på hjärtrytm</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="582"/>
-        <location filename="../build/ui_mainwindow.h" line="548"/>
-        <source>Toggle MOD</source>
-        <translation>Slå av/på MOD</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="594"/>
-        <location filename="../build/ui_mainwindow.h" line="549"/>
-        <source>Toggle EAD, END, EADD</source>
-        <translation>Slå av/på EAD, END, EADD</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="618"/>
-        <location filename="../build/ui_mainwindow.h" line="551"/>
-        <source>Toggle SAC rate</source>
-        <translation>Slå av/på SAC</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="630"/>
-        <location filename="../build/ui_mainwindow.h" line="552"/>
-        <source>Toggle ruler</source>
-        <translation>Slå av/på mätverktyget</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="86"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="87"/>
         <location filename="../build/ui_mainwindow.h" line="569"/>
         <source>&amp;Log</source>
         <translation>&amp;Logg</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="105"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="104"/>
         <location filename="../build/ui_mainwindow.h" line="570"/>
         <source>&amp;View</source>
         <translation>&amp;Visa</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="121"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="120"/>
         <location filename="../build/ui_mainwindow.h" line="571"/>
         <source>&amp;Help</source>
         <translation>&amp;Hjälp</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="130"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="129"/>
         <location filename="../build/ui_mainwindow.h" line="572"/>
         <source>&amp;Import</source>
         <translation>&amp;Import</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="139"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="138"/>
         <location filename="../build/ui_mainwindow.h" line="573"/>
         <source>&amp;Edit</source>
         <translation>&amp;Redigera</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="144"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="143"/>
         <source>Share on</source>
         <translation>Dela via</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="158"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="157"/>
         <location filename="../build/ui_mainwindow.h" line="453"/>
         <source>&amp;New logbook</source>
         <translation>&amp;Ny Loggbok</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="161"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="160"/>
         <location filename="../build/ui_mainwindow.h" line="455"/>
         <source>New</source>
         <translation>Ny</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="164"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="163"/>
         <location filename="../build/ui_mainwindow.h" line="457"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="169"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="168"/>
         <location filename="../build/ui_mainwindow.h" line="458"/>
         <source>&amp;Open logbook</source>
         <translation>&amp;Öppna loggbok</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="172"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="171"/>
         <location filename="../build/ui_mainwindow.h" line="460"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="508"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="502"/>
         <source>Open</source>
         <translation>Öppna</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="175"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="174"/>
         <location filename="../build/ui_mainwindow.h" line="462"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="180"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="179"/>
         <location filename="../build/ui_mainwindow.h" line="463"/>
         <source>&amp;Save</source>
         <translation>&amp;Spara</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="183"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="182"/>
         <location filename="../build/ui_mainwindow.h" line="465"/>
         <source>Save</source>
         <translation>Spara</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="186"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="185"/>
         <location filename="../build/ui_mainwindow.h" line="467"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="191"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="190"/>
         <location filename="../build/ui_mainwindow.h" line="468"/>
         <source>Sa&amp;ve as</source>
         <translation>Spara som(&amp;v)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="194"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="193"/>
         <location filename="../build/ui_mainwindow.h" line="470"/>
         <source>Save as</source>
         <translation>Spara som</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="197"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="196"/>
         <location filename="../build/ui_mainwindow.h" line="472"/>
         <source>Ctrl+Shift+S</source>
         <translation>Ctrl+Shift+S</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="202"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="201"/>
         <location filename="../build/ui_mainwindow.h" line="473"/>
         <source>&amp;Close</source>
         <translation>Stäng</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="205"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="204"/>
         <location filename="../build/ui_mainwindow.h" line="475"/>
         <source>Close</source>
         <translation>Stäng</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="208"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="207"/>
         <location filename="../build/ui_mainwindow.h" line="477"/>
         <source>Ctrl+W</source>
         <translation>Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="221"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="212"/>
+        <location filename="../build/ui_mainwindow.h" line="478"/>
+        <source>&amp;Print</source>
+        <translation>&amp;Skriv ut</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="215"/>
+        <location filename="../build/ui_mainwindow.h" line="479"/>
+        <source>Ctrl+P</source>
+        <translation>Ctrl+P</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="220"/>
         <location filename="../build/ui_mainwindow.h" line="480"/>
         <source>P&amp;references</source>
         <translation>Inställninga&amp;r</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="251"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="223"/>
+        <location filename="../build/ui_mainwindow.h" line="481"/>
+        <source>Ctrl+,</source>
+        <translation>Ctrl+,</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="231"/>
+        <location filename="../build/ui_mainwindow.h" line="482"/>
+        <source>&amp;Quit</source>
+        <translation>&amp;Avsluta</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="234"/>
+        <location filename="../build/ui_mainwindow.h" line="483"/>
+        <source>Ctrl+Q</source>
+        <translation>Ctrl+Q</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="242"/>
+        <location filename="../build/ui_mainwindow.h" line="484"/>
+        <source>Import from &amp;dive computer</source>
+        <translation>Ladda ner från dykdator</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="245"/>
+        <location filename="../build/ui_mainwindow.h" line="485"/>
+        <source>Ctrl+D</source>
+        <translation>Ctrl+D</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="250"/>
         <location filename="../build/ui_mainwindow.h" line="486"/>
         <source>Import &amp;GPS data from Subsurface web service</source>
         <translation>Importera &amp;GPSdata från Subsurface webbtjänst</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="259"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="253"/>
+        <location filename="../build/ui_mainwindow.h" line="487"/>
+        <source>Ctrl+G</source>
+        <translation>Ctrl+G</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="258"/>
         <location filename="../build/ui_mainwindow.h" line="488"/>
         <source>Edit device &amp;names</source>
         <translation>Ändra enhetsnamn</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="272"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="263"/>
+        <location filename="../build/ui_mainwindow.h" line="489"/>
+        <source>&amp;Add dive</source>
+        <translation>Lägg till dyk</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="266"/>
+        <location filename="../build/ui_mainwindow.h" line="490"/>
+        <source>Ctrl++</source>
+        <translation>Ctrl++</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="271"/>
         <location filename="../build/ui_mainwindow.h" line="491"/>
         <source>&amp;Edit dive</source>
         <translation>&amp;Redigera dyk</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="277"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="276"/>
         <location filename="../build/ui_mainwindow.h" line="492"/>
         <source>&amp;Copy dive components</source>
         <translation>Kopiera dykkomponenter</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="280"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="279"/>
         <location filename="../build/ui_mainwindow.h" line="493"/>
         <source>Ctrl+C</source>
         <translation>Ctrl+C</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="285"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="284"/>
         <location filename="../build/ui_mainwindow.h" line="494"/>
         <source>&amp;Paste dive components</source>
         <translation>Klistra in dykkomponenter</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="288"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="287"/>
         <location filename="../build/ui_mainwindow.h" line="495"/>
         <source>Ctrl+V</source>
         <translation>Ctrl+V</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="325"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="292"/>
+        <location filename="../build/ui_mainwindow.h" line="496"/>
+        <source>&amp;Renumber</source>
+        <translation>&amp;Renumrering</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="295"/>
+        <location filename="../build/ui_mainwindow.h" line="497"/>
+        <source>Ctrl+R</source>
+        <translation>Ctrl+R</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="303"/>
+        <location filename="../build/ui_mainwindow.h" line="498"/>
+        <source>Auto &amp;group</source>
+        <translation>Autogruppering</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="308"/>
+        <location filename="../build/ui_mainwindow.h" line="499"/>
+        <source>&amp;Yearly statistics</source>
+        <translation>&amp;Årsstatistik</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="311"/>
+        <location filename="../build/ui_mainwindow.h" line="500"/>
+        <source>Ctrl+Y</source>
+        <translation>Ctrl+Y</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="316"/>
+        <location filename="../build/ui_mainwindow.h" line="501"/>
+        <source>&amp;Dive list</source>
+        <translation>Dyklista</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="319"/>
+        <location filename="../build/ui_mainwindow.h" line="502"/>
+        <source>Ctrl+2</source>
+        <translation>Ctrl+2</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="324"/>
         <location filename="../build/ui_mainwindow.h" line="503"/>
         <source>&amp;Profile</source>
         <translation>&amp;Profil</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="333"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="327"/>
+        <location filename="../build/ui_mainwindow.h" line="504"/>
+        <source>Ctrl+3</source>
+        <translation>Ctrl+3</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="332"/>
         <location filename="../build/ui_mainwindow.h" line="505"/>
         <source>&amp;Info</source>
         <translation>&amp;Info</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="341"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="335"/>
+        <location filename="../build/ui_mainwindow.h" line="506"/>
+        <source>Ctrl+4</source>
+        <translation>Ctrl+4</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="340"/>
         <location filename="../build/ui_mainwindow.h" line="507"/>
         <source>&amp;All</source>
         <translation>&amp;Alla</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="357"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="343"/>
+        <location filename="../build/ui_mainwindow.h" line="508"/>
+        <source>Ctrl+1</source>
+        <translation>Ctrl+1</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="348"/>
+        <location filename="../build/ui_mainwindow.h" line="509"/>
+        <source>P&amp;revious DC</source>
+        <translation>Fö&amp;regående dykdator</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="351"/>
+        <location filename="../build/ui_mainwindow.h" line="510"/>
+        <source>Left</source>
+        <translation>Vänster</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="356"/>
         <location filename="../build/ui_mainwindow.h" line="511"/>
         <source>&amp;Next DC</source>
         <translation>&amp;Nästa dykdator</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="365"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="359"/>
+        <location filename="../build/ui_mainwindow.h" line="512"/>
+        <source>Right</source>
+        <translation>Höger</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="364"/>
         <location filename="../build/ui_mainwindow.h" line="513"/>
         <source>&amp;About Subsurface</source>
         <translation>Om Subsurface(&amp;a)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="381"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="372"/>
+        <location filename="../build/ui_mainwindow.h" line="514"/>
+        <source>User &amp;manual</source>
+        <translation>Användar&amp;manual</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="375"/>
+        <location filename="../build/ui_mainwindow.h" line="515"/>
+        <source>F1</source>
+        <translation>F1</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="380"/>
         <location filename="../build/ui_mainwindow.h" line="516"/>
         <source>&amp;Globe</source>
         <translation>&amp;Globen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="403"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="383"/>
+        <location filename="../build/ui_mainwindow.h" line="517"/>
+        <source>Ctrl+5</source>
+        <translation>Ctrl+5</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="388"/>
+        <location filename="../build/ui_mainwindow.h" line="518"/>
+        <source>P&amp;lan dive</source>
+        <translation>P&amp;lanera dyk</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="391"/>
+        <location filename="../build/ui_mainwindow.h" line="519"/>
+        <source>Ctrl+L</source>
+        <translation>Ctrl+L</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="396"/>
+        <location filename="../build/ui_mainwindow.h" line="520"/>
+        <source>&amp;Import log files</source>
+        <translation>&amp;Importera loggfiler</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="399"/>
+        <location filename="../build/ui_mainwindow.h" line="522"/>
+        <source>Import divelog files from other applications</source>
+        <translation>Importera loggfiler ifrån andra applikationer</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="402"/>
         <location filename="../build/ui_mainwindow.h" line="524"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="408"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="407"/>
         <location filename="../build/ui_mainwindow.h" line="525"/>
         <source>Import &amp;from divelogs.de</source>
         <translation>Importera &amp;från divelogs.de</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="416"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="415"/>
         <location filename="../build/ui_mainwindow.h" line="526"/>
         <source>&amp;Full screen</source>
         <translation>&amp;Fullskärm</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="419"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="418"/>
         <location filename="../build/ui_mainwindow.h" line="528"/>
         <source>Toggle full screen</source>
         <translation>Växla fullskärmsläge</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="447"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="421"/>
+        <location filename="../build/ui_mainwindow.h" line="530"/>
+        <source>F11</source>
+        <translation>F11</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="446"/>
         <location filename="../build/ui_mainwindow.h" line="531"/>
         <source>&amp;Check for updates</source>
         <translation>&amp;Sök efter uppdateringar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="452"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="451"/>
         <location filename="../build/ui_mainwindow.h" line="532"/>
         <source>&amp;Export</source>
         <translation>&amp;Exportera</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="458"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="454"/>
+        <location filename="../build/ui_mainwindow.h" line="534"/>
+        <source>Export dive logs</source>
+        <translation>Exportera dykloggar</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="457"/>
         <location filename="../build/ui_mainwindow.h" line="536"/>
         <source>Ctrl+E</source>
         <translation>Ctrl+E</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="466"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="462"/>
+        <location filename="../build/ui_mainwindow.h" line="537"/>
+        <source>Configure &amp;dive computer</source>
+        <translation>Konfigurera &amp;dykdatorer</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="465"/>
         <location filename="../build/ui_mainwindow.h" line="538"/>
         <source>Ctrl+Shift+C</source>
         <translation>Ctrl+Shift+C</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="474"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="473"/>
         <location filename="../build/ui_mainwindow.h" line="539"/>
         <source>Edit &amp;dive in planner</source>
         <translation>Redigera &amp;dyk i dykplaneraren</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="486"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="485"/>
         <location filename="../build/ui_mainwindow.h" line="540"/>
         <source>Toggle pO₂ graph</source>
         <translation>Växla pO₂ graf</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="498"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="497"/>
         <location filename="../build/ui_mainwindow.h" line="541"/>
         <source>Toggle pN₂ graph</source>
         <translation>Växla pN₂ graf</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="642"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="509"/>
+        <location filename="../build/ui_mainwindow.h" line="542"/>
+        <source>Toggle pHe graph</source>
+        <translation>Slå av/på pHe grafen</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="521"/>
+        <location filename="../build/ui_mainwindow.h" line="543"/>
+        <source>Toggle DC reported ceiling</source>
+        <translation>Slå av/på dykdatorrapporterat takinformation</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="533"/>
+        <location filename="../build/ui_mainwindow.h" line="544"/>
+        <source>Toggle calculated ceiling</source>
+        <translation>Slå av/på  beräknad takinformation</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="545"/>
+        <location filename="../build/ui_mainwindow.h" line="545"/>
+        <source>Toggle calculating all tissues</source>
+        <translation>Slå av/på beräkningen av alla vävnader</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="557"/>
+        <location filename="../build/ui_mainwindow.h" line="546"/>
+        <source>Toggle calculated ceiling with 3m increments</source>
+        <translation>Slå av/på beräknad takinformation i 3m steg</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="569"/>
+        <location filename="../build/ui_mainwindow.h" line="547"/>
+        <source>Toggle heart rate</source>
+        <translation>Slå av/på hjärtrytm</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="581"/>
+        <location filename="../build/ui_mainwindow.h" line="548"/>
+        <source>Toggle MOD</source>
+        <translation>Slå av/på MOD</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="593"/>
+        <location filename="../build/ui_mainwindow.h" line="549"/>
+        <source>Toggle EAD, END, EADD</source>
+        <translation>Slå av/på EAD, END, EADD</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="605"/>
+        <location filename="../build/ui_mainwindow.h" line="550"/>
+        <source>Toggle NDL, TTS</source>
+        <translation> Slå av/på NDL, TTS</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="617"/>
+        <location filename="../build/ui_mainwindow.h" line="551"/>
+        <source>Toggle SAC rate</source>
+        <translation>Slå av/på SAC</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="629"/>
+        <location filename="../build/ui_mainwindow.h" line="552"/>
+        <source>Toggle ruler</source>
+        <translation>Slå av/på mätverktyget</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="641"/>
         <location filename="../build/ui_mainwindow.h" line="553"/>
         <source>Scale graph</source>
         <translation>Skala graf</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="654"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="653"/>
         <location filename="../build/ui_mainwindow.h" line="554"/>
         <source>Toggle pictures</source>
         <translation>Växla bilder</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="666"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="665"/>
         <location filename="../build/ui_mainwindow.h" line="555"/>
         <source>Toggle tank bar</source>
         <translation>Växla flaskgrafen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="674"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="673"/>
         <location filename="../build/ui_mainwindow.h" line="556"/>
         <source>&amp;Filter divelist</source>
         <translation>&amp;Filtrera dyklista</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="689"/>
-        <location filename="../build/ui_mainwindow.h" line="558"/>
-        <source>Toggle tissue graph</source>
-        <translation>Växla vävnadsgraf</translation>
+        <location filename="../desktop-widgets/mainwindow.ui" line="676"/>
+        <location filename="../build/ui_mainwindow.h" line="557"/>
+        <source>Ctrl+F</source>
+        <translation>Ctrl+F</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="694"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="688"/>
+        <source>Toggle tissue heat-map</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="693"/>
         <location filename="../build/ui_mainwindow.h" line="559"/>
         <source>User &amp;survey</source>
         <translation>&amp;Användarundersökning</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="699"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="698"/>
         <location filename="../build/ui_mainwindow.h" line="560"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="238"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="231"/>
         <source>&amp;Undo</source>
         <translation>&amp;Ångra</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="702"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="701"/>
         <location filename="../build/ui_mainwindow.h" line="561"/>
         <source>Ctrl+Z</source>
         <translation>Ctrl+Z</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="707"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="706"/>
         <location filename="../build/ui_mainwindow.h" line="562"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="239"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="232"/>
         <source>&amp;Redo</source>
         <translation>&amp;Gör om</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="710"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="709"/>
         <location filename="../build/ui_mainwindow.h" line="563"/>
         <source>Ctrl+Shift+Z</source>
         <translation>Ctrl+Shift+Z</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="715"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="714"/>
         <location filename="../build/ui_mainwindow.h" line="564"/>
         <source>&amp;Find moved images</source>
         <translation>&amp;Hitta flyttade bilder</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="720"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="719"/>
         <source>Open c&amp;loud storage</source>
         <translation>Öppna molnlagring</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="725"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="724"/>
         <source>Save to clo&amp;ud storage</source>
         <translation>Spara till molnlagring</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="730"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="729"/>
         <location filename="../build/ui_mainwindow.h" line="567"/>
         <source>&amp;Manage dive sites</source>
         <translation>&amp;Hanter dykplatser</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="735"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="734"/>
         <source>Dive Site &amp;Edit</source>
         <translation>Dykplats redigering</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="740"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="739"/>
         <source>Facebook</source>
         <translation>Facebook</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="745"/>
-        <source>Add GPS location here</source>
-        <translation>Lägg till GPS position här</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="677"/>
-        <location filename="../build/ui_mainwindow.h" line="557"/>
-        <source>Ctrl+F</source>
-        <translation>Ctrl+F</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="213"/>
-        <location filename="../build/ui_mainwindow.h" line="478"/>
-        <source>&amp;Print</source>
-        <translation>&amp;Skriv ut</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="224"/>
-        <location filename="../build/ui_mainwindow.h" line="481"/>
-        <source>Ctrl+,</source>
-        <translation>Ctrl+,</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="232"/>
-        <location filename="../build/ui_mainwindow.h" line="482"/>
-        <source>&amp;Quit</source>
-        <translation>&amp;Avsluta</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="243"/>
-        <location filename="../build/ui_mainwindow.h" line="484"/>
-        <source>Import from &amp;dive computer</source>
-        <translation>Ladda ner från dykdator</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="254"/>
-        <location filename="../build/ui_mainwindow.h" line="487"/>
-        <source>Ctrl+G</source>
-        <translation>Ctrl+G</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="267"/>
-        <location filename="../build/ui_mainwindow.h" line="490"/>
-        <source>Ctrl++</source>
-        <translation>Ctrl++</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="293"/>
-        <location filename="../build/ui_mainwindow.h" line="496"/>
-        <source>&amp;Renumber</source>
-        <translation>&amp;Renumrering</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="296"/>
-        <location filename="../build/ui_mainwindow.h" line="497"/>
-        <source>Ctrl+R</source>
-        <translation>Ctrl+R</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="312"/>
-        <location filename="../build/ui_mainwindow.h" line="500"/>
-        <source>Ctrl+Y</source>
-        <translation>Ctrl+Y</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="392"/>
-        <location filename="../build/ui_mainwindow.h" line="519"/>
-        <source>Ctrl+L</source>
-        <translation>Ctrl+L</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="216"/>
-        <location filename="../build/ui_mainwindow.h" line="479"/>
-        <source>Ctrl+P</source>
-        <translation>Ctrl+P</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="235"/>
-        <location filename="../build/ui_mainwindow.h" line="483"/>
-        <source>Ctrl+Q</source>
-        <translation>Ctrl+Q</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="246"/>
-        <location filename="../build/ui_mainwindow.h" line="485"/>
-        <source>Ctrl+D</source>
-        <translation>Ctrl+D</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="264"/>
-        <location filename="../build/ui_mainwindow.h" line="489"/>
-        <source>&amp;Add dive</source>
-        <translation>Lägg till dyk</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="304"/>
-        <location filename="../build/ui_mainwindow.h" line="498"/>
-        <source>Auto &amp;group</source>
-        <translation>Autogruppering</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="309"/>
-        <location filename="../build/ui_mainwindow.h" line="499"/>
-        <source>&amp;Yearly statistics</source>
-        <translation>&amp;Årsstatistik</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="317"/>
-        <location filename="../build/ui_mainwindow.h" line="501"/>
-        <source>&amp;Dive list</source>
-        <translation>Dyklista</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="320"/>
-        <location filename="../build/ui_mainwindow.h" line="502"/>
-        <source>Ctrl+2</source>
-        <translation>Ctrl+2</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="328"/>
-        <location filename="../build/ui_mainwindow.h" line="504"/>
-        <source>Ctrl+3</source>
-        <translation>Ctrl+3</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="336"/>
-        <location filename="../build/ui_mainwindow.h" line="506"/>
-        <source>Ctrl+4</source>
-        <translation>Ctrl+4</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="344"/>
-        <location filename="../build/ui_mainwindow.h" line="508"/>
-        <source>Ctrl+1</source>
-        <translation>Ctrl+1</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="349"/>
-        <location filename="../build/ui_mainwindow.h" line="509"/>
-        <source>P&amp;revious DC</source>
-        <translation>Fö&amp;regående dykdator</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="352"/>
-        <location filename="../build/ui_mainwindow.h" line="510"/>
-        <source>Left</source>
-        <translation>Vänster</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="360"/>
-        <location filename="../build/ui_mainwindow.h" line="512"/>
-        <source>Right</source>
-        <translation>Höger</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="373"/>
-        <location filename="../build/ui_mainwindow.h" line="514"/>
-        <source>User &amp;manual</source>
-        <translation>Användar&amp;manual</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="376"/>
-        <location filename="../build/ui_mainwindow.h" line="515"/>
-        <source>F1</source>
-        <translation>F1</translation>
+        <location filename="../desktop-widgets/mainwindow.ui" line="744"/>
+        <source>Take cloud storage online</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="384"/>
-        <location filename="../build/ui_mainwindow.h" line="517"/>
-        <source>Ctrl+5</source>
-        <translation>Ctrl+5</translation>
+        <location filename="../build/ui_mainwindow.h" line="558"/>
+        <source>Toggle tissue graph</source>
+        <translation>Växla vävnadsgraf</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="389"/>
-        <location filename="../build/ui_mainwindow.h" line="518"/>
-        <source>P&amp;lan dive</source>
-        <translation>P&amp;lanera dyk</translation>
+        <location filename="../build/ui_mainwindow.h" line="565"/>
+        <source>Open cloud storage</source>
+        <translation>Öppna molnlagring</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="397"/>
-        <location filename="../build/ui_mainwindow.h" line="520"/>
-        <source>&amp;Import log files</source>
-        <translation>&amp;Importera loggfiler</translation>
+        <location filename="../build/ui_mainwindow.h" line="566"/>
+        <source>Save to cloud storage</source>
+        <translation>Spara till molnlagring</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="400"/>
-        <location filename="../build/ui_mainwindow.h" line="522"/>
-        <source>Import divelog files from other applications</source>
-        <translation>Importera loggfiler ifrån andra applikationer</translation>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="331"/>
+        <source>Connect to</source>
+        <translation>Anslut till</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="422"/>
-        <location filename="../build/ui_mainwindow.h" line="530"/>
-        <source>F11</source>
-        <translation>F11</translation>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="493"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="538"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1545"/>
+        <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="../desktop-widgets/mainwindow.cpp" line="505"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="499"/>
         <source>Open file</source>
         <translation>Öppna fil</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="509"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="503"/>
         <location filename="../desktop-widgets/mainwindow.cpp" line="614"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1972"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1978"/>
         <source>Cancel</source>
         <translation>Avbryt</translation>
     </message>
@@ -5246,6 +5358,16 @@ mixas av luft och:
         <translation>Scannar bilder...(detta kan ta ett tag)</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="649"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="796"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="977"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="983"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1849"/>
+        <source>Warning</source>
+        <translation>Varning</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="674"/>
         <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>
@@ -5261,125 +5383,98 @@ mixas av luft och:
         <translation>Skriv ut körtidstabell</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="982"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
+        <source>Trying to replan a dive that&apos;s not a planned dive.</source>
+        <translation>Försöker planera om ett dyk som inte är en dykplan.</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="977"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1849"/>
+        <source>Please, first finish the current edition before trying to do another.</source>
+        <translation>Först avsluta den aktuella ändringen innan du försöker göra en annan.</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="983"/>
         <source>Trying to edit a dive that&apos;s not a manually added dive.</source>
         <translation>Försöker ändra ett dyk som inte är ett manuellt inlagt dyk.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1243"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1030"/>
+        <source>Yearly statistics</source>
+        <translation>Årsstatistik</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1244"/>
         <source>Do you want to save the changes that you made in the file %1?</source>
         <translation>Vill du spara ändringarna som du gjort i filen %1?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1246"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1247"/>
         <source>Do you want to save the changes that you made in the data file?</source>
         <translation>Vill du spara ändringarna som du gjort i filen?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1251"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1252"/>
         <source>Save changes?</source>
         <translation>Spara ändringar?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1587"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1253"/>
+        <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="../desktop-widgets/mainwindow.cpp" line="1572"/>
         <source>Save file as</source>
         <translation>Spara fil som</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1682"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1573"/>
+        <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
+        <translation>Subsurface XML filer (*.ssrf *.xml *.XML)</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1670"/>
+        <source>[local cache for] %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1672"/>
         <source>[cloud storage for] %1</source>
         <translation>[molnlatgring för] %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1782"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1788"/>
         <source>Opening datafile from older version</source>
         <translation>Öppnar datafil från en äldre version</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1783"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1789"/>
         <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly.
 Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source>
         <translation>Du öppnade en datafil från en äldre version av Subsurface. Vi rekommenderar att du läser manualen för att lära dig om förändringarna i den nya versionen, speciellt om dykplats administrationen som har ändrats signifikant.
 Subsurface har redan försökt att fylla i datat men det kan vara värt besväret att titta på den nya dykplats administrationen och se till att allt ser bra ut.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1794"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1800"/>
         <source>Open dive log file</source>
         <translation>Öppna dyklogg</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1795"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1801"/>
         <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;All files (*)</source>
         <translation>Dyklogg filer  (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;All files (*)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1972"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1978"/>
         <source>Contacting cloud service...</source>
         <translation>Kontaktar molntjänst...</translation>
     </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1252"/>
-        <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="../desktop-widgets/mainwindow.cpp" line="649"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="796"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="976"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="982"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/>
-        <source>Warning</source>
-        <translation>Varning</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="499"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="544"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1560"/>
-        <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="../desktop-widgets/mainwindow.cpp" line="338"/>
-        <source>Connect to</source>
-        <translation>Anslut till</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
-        <source>Trying to replan a dive that&apos;s not a planned dive.</source>
-        <translation>Försöker planera om ett dyk som inte är en dykplan.</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1029"/>
-        <source>Yearly statistics</source>
-        <translation>Årsstatistik</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1588"/>
-        <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
-        <translation>Subsurface XML filer (*.ssrf *.xml *.XML)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="976"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/>
-        <source>Please, first finish the current edition before trying to do another.</source>
-        <translation>Först avsluta den aktuella ändringen innan du försöker göra en annan.</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_mainwindow.h" line="565"/>
-        <source>Open cloud storage</source>
-        <translation>Öppna molnlagring</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_mainwindow.h" line="566"/>
-        <source>Save to cloud storage</source>
-        <translation>Spara till molnlagring</translation>
-    </message>
 </context>
 <context>
     <name>MultiFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="733"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="731"/>
         <source>Filter shows %1 (of %2) dives</source>
         <translation>Filter visar %1 (av %2) dyk</translation>
     </message>
@@ -5387,12 +5482,12 @@ Subsurface har redan försökt att fylla i datat men det kan vara värt besväre
 <context>
     <name>OstcFirmwareCheck</name>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="269"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="271"/>
         <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source>
         <translation>Du borde uppdatera mjukvaran i din dykdator: du har version %1 men den senaste stabila versionen är %2</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="273"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="275"/>
         <source>
 
 Please start Bluetooth on your OSTC Sport and do the same preparations as for a logbook download before continuing with the update</source>
@@ -5401,27 +5496,27 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 Vänligen starta blåtand på din OSTC Sport och gör samma förberedelser som för loggboks nerladdning innan du fortsätter med uppdateringen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="274"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="276"/>
         <source>Not now</source>
         <translation>Inte nu</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="275"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="277"/>
         <source>Update firmware</source>
         <translation>Uppdatera firmware</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="277"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="279"/>
         <source>Firmware upgrade notice</source>
         <translation>Mjukvaruuppdaterings notis</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="295"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="297"/>
         <source>Save the downloaded firmware as</source>
         <translation>Spara nerladdad firmware som</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="296"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="298"/>
         <source>HEX files (*.hex)</source>
         <translation>HEX filer (*.hex)</translation>
     </message>
@@ -5429,79 +5524,89 @@ Vänligen starta blåtand på din OSTC Sport och gör samma förberedelser som f
 <context>
     <name>PlannerSettingsWidget</name>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="322"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="302"/>
         <source>Open circuit</source>
         <translation>Öppet system</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="322"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="302"/>
         <source>CCR</source>
         <translation>CCR</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="322"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="302"/>
         <source>pSCR</source>
         <translation>pSCR</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="421"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="388"/>
         <source>ft/min</source>
         <translation>ft/min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="422"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="389"/>
         <source>Last stop at 20ft</source>
         <translation>Sista stoppet på 20ft</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="423"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="390"/>
         <source>50% avg. depth to 20ft</source>
         <translation>50% av snittdjup till 20ft</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="424"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="391"/>
         <source>20ft to surface</source>
         <translation>20ft till ytan</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="426"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="392"/>
+        <source>ft</source>
+        <translation>ft</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="394"/>
         <source>m/min</source>
         <translation>m/min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="427"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="395"/>
         <source>Last stop at 6m</source>
         <translation>Sista stoppet på 6m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="428"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="396"/>
         <source>50% avg. depth to 6m</source>
         <translation>50% av snittdjup till 6m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="429"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="397"/>
         <source>6m to surface</source>
         <translation>6m till ytan</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="432"/>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="433"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="398"/>
+        <source>m</source>
+        <translation>m</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="401"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="402"/>
         <source>cuft/min</source>
         <translation>cuft/min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="441"/>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="442"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="410"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="411"/>
         <source>ℓ/min</source>
         <translation>ℓ/min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="451"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="420"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="456"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="425"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
@@ -5651,6 +5756,11 @@ Vänligen starta blåtand på din OSTC Sport och gör samma förberedelser som f
 <context>
     <name>PreferencesDialog</name>
     <message>
+        <location filename="../build/ui_preferences.h" line="1283"/>
+        <source>Preferences</source>
+        <translation>Inställningar</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1288"/>
         <source>Defaults</source>
         <translation>Standardvärden</translation>
@@ -5686,6 +5796,11 @@ Vänligen starta blåtand på din OSTC Sport och gör samma förberedelser som f
         <translation>Geografisk referens</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1303"/>
+        <source>Lists and tables</source>
+        <translation>Listor och tabeller</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1304"/>
         <source>Font</source>
         <translation>Font</translation>
@@ -5701,6 +5816,11 @@ Vänligen starta blåtand på din OSTC Sport och gör samma förberedelser som f
         <translation>Dyk</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1307"/>
+        <source>Default dive log file</source>
+        <translation>Standard dykloggfil</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1308"/>
         <source>No default file</source>
         <translation>Ingen standardfil</translation>
@@ -5731,6 +5851,21 @@ Vänligen starta blåtand på din OSTC Sport och gör samma förberedelser som f
         <translation>...</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1314"/>
+        <source>Display invalid</source>
+        <translation>Display ogiltig</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1316"/>
+        <source>Default cylinder</source>
+        <translation>Standardflaska</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1317"/>
+        <source>Use default cylinder</source>
+        <translation>Använd standardflaska</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1318"/>
         <source>Animations</source>
         <translation>Animationer</translation>
@@ -5761,40 +5896,24 @@ Vänligen starta blåtand på din OSTC Sport och gör samma förberedelser som f
         <translation>System</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1401"/>
-        <source>Dive site geo lookup</source>
-        <translation>Dykplats geouppslag</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1402"/>
-        <source>Enable geocoding for dive site management</source>
-        <translation>Aktivera geokodning för dykplats administration</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1403"/>
-        <source>Parse site without GPS data</source>
-        <translation>Tolka plats utan GPS data</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1404"/>
-        <source>Same format for existing dives</source>
-        <translation>Samma format för befintliga dyk</translation>
+        <location filename="../build/ui_preferences.h" line="1324"/>
+        <source>&amp;Metric</source>
+        <translation>&amp;Metrisk</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1405"/>
-        <source>Dive Site Layout</source>
-        <translation>Dykplats layouten</translation>
+        <location filename="../build/ui_preferences.h" line="1325"/>
+        <source>Imperial</source>
+        <translation>Imperial</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1406"/>
-        <location filename="../build/ui_preferences.h" line="1407"/>
-        <source>/</source>
-        <translation>/</translation>
+        <location filename="../build/ui_preferences.h" line="1326"/>
+        <source>Personali&amp;ze</source>
+        <translation>Personifiera</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1325"/>
-        <source>Imperial</source>
-        <translation>Imperial</translation>
+        <location filename="../build/ui_preferences.h" line="1327"/>
+        <source>Individual settings</source>
+        <translation>Individuella inställningar</translation>
     </message>
     <message>
         <location filename="../build/ui_preferences.h" line="1328"/>
@@ -5812,6 +5931,11 @@ Vänligen starta blåtand på din OSTC Sport och gör samma förberedelser som f
         <translation>fot</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1331"/>
+        <source>Pressure</source>
+        <translation>Tryck</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1332"/>
         <location filename="../build/ui_preferences.h" line="1366"/>
         <source>bar</source>
@@ -5823,11 +5947,26 @@ Vänligen starta blåtand på din OSTC Sport och gör samma förberedelser som f
         <translation>psi</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1334"/>
+        <source>Volume</source>
+        <translation>Volym</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1335"/>
+        <source>&amp;liter</source>
+        <translation>&amp;liter</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1336"/>
         <source>cu ft</source>
         <translation>ft³</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1337"/>
+        <source>Temperature</source>
+        <translation>Temperatur</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1338"/>
         <source>celsius</source>
         <translation>celsius</translation>
@@ -5838,11 +5977,121 @@ Vänligen starta blåtand på din OSTC Sport och gör samma förberedelser som f
         <translation>fahrenheit</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1340"/>
+        <source>Weight</source>
+        <translation>Vikt</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1341"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1342"/>
+        <source>lbs</source>
+        <translation>pund</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1343"/>
+        <source>Time units</source>
+        <translation>Tidsenheter</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1344"/>
+        <source>Ascent/descent speed denominator</source>
+        <translation>Hastighetsnämnare</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1345"/>
+        <source>Minutes</source>
+        <translation>Minuter</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1346"/>
+        <source>Seconds</source>
+        <translation>Sekunder</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1347"/>
+        <source>GPS coordinates</source>
+        <translation>GPS kordinater</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1348"/>
+        <source>Location Display</source>
+        <translation>Platsvisning</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1349"/>
+        <source>traditional (dms)</source>
+        <translation>traditionell (dms)</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1350"/>
+        <source>decimal</source>
+        <translation>decimal</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1351"/>
+        <source>Show</source>
+        <translation>Visa</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1352"/>
+        <source>Threshold when showing pO₂</source>
+        <translation>Tröskelvärde vid visning av pO₂</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1353"/>
+        <source>Threshold when showing pN₂</source>
+        <translation>Tröskelvärde vid visning av pN₂</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1354"/>
+        <source>Threshold when showing pHe</source>
+        <translation>Tröskelvärde vid visning av pHe</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1355"/>
+        <source>Max pO₂ when showing MOD</source>
+        <translation>Maximalt pO₂, för visning av MOD</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1356"/>
+        <source>Draw dive computer reported ceiling red</source>
+        <translation>Visa dykdatorrapporterad takinformation i rött</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1357"/>
+        <source>Show unused cylinders in Equipment tab</source>
+        <translation>Visa oanvända flaskor i utrustningsfliken</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1358"/>
+        <source>Show average depth</source>
+        <translation>Visa medeldjup</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1359"/>
+        <source>Misc</source>
+        <translation>Blandat</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1360"/>
+        <source>GFLow</source>
+        <translation>GFLow</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1361"/>
+        <source>GFHigh</source>
+        <translation>GFHigh</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1362"/>
+        <source>GFLow at max depth</source>
+        <translation>GFLow på maxdjup</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1363"/>
         <source>CCR: show setpoints when viewing pO₂</source>
         <translation>CCR: visa setpoint när pO₂ visas</translation>
@@ -5888,14 +6137,19 @@ Vänligen starta blåtand på din OSTC Sport och gör samma förberedelser som f
         <translation>Systemets standardvärde</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1374"/>
+        <source>Filter</source>
+        <translation>Filter</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1375"/>
         <source>Proxy</source>
         <translation>Proxy</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1379"/>
-        <source>Proxy type</source>
-        <translation>Proxy typ</translation>
+        <location filename="../build/ui_preferences.h" line="1376"/>
+        <source>Port</source>
+        <translation>Port</translation>
     </message>
     <message>
         <location filename="../build/ui_preferences.h" line="1377"/>
@@ -5903,16 +6157,16 @@ Vänligen starta blåtand på din OSTC Sport och gör samma förberedelser som f
         <translation>Värd</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1376"/>
-        <source>Port</source>
-        <translation>Port</translation>
-    </message>
-    <message>
         <location filename="../build/ui_preferences.h" line="1378"/>
         <source>Requires authentication</source>
         <translation>Kräver authentisering</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1379"/>
+        <source>Proxy type</source>
+        <translation>Proxy typ</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1380"/>
         <source>Username</source>
         <translation>Användarnamn</translation>
@@ -5924,46 +6178,6 @@ Vänligen starta blåtand på din OSTC Sport och gör samma förberedelser som f
         <translation>Lösenord</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1400"/>
-        <source>Disconnect from Facebook</source>
-        <translation>Logga ut fron facebook</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1374"/>
-        <source>Filter</source>
-        <translation>Filter</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1331"/>
-        <source>Pressure</source>
-        <translation>Tryck</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1303"/>
-        <source>Lists and tables</source>
-        <translation>Listor och tabeller</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1307"/>
-        <source>Default dive log file</source>
-        <translation>Standard dykloggfil</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1314"/>
-        <source>Display invalid</source>
-        <translation>Display ogiltig</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1316"/>
-        <source>Default cylinder</source>
-        <translation>Standardflaska</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1317"/>
-        <source>Use default cylinder</source>
-        <translation>Använd standardflaska</translation>
-    </message>
-    <message>
         <location filename="../build/ui_preferences.h" line="1382"/>
         <source>Subsurface cloud storage</source>
         <translation>Subsurface molnlagring</translation>
@@ -6004,149 +6218,40 @@ Vänligen starta blåtand på din OSTC Sport och gör samma förberedelser som f
         <translation>Spara användarid lokalt?</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1334"/>
-        <source>Volume</source>
-        <translation>Volym</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1337"/>
-        <source>Temperature</source>
-        <translation>Temperatur</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1340"/>
-        <source>Weight</source>
-        <translation>Vikt</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1342"/>
-        <source>lbs</source>
-        <translation>pund</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1343"/>
-        <source>Time units</source>
-        <translation>Tidsenheter</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1345"/>
-        <source>Minutes</source>
-        <translation>Minuter</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1346"/>
-        <source>Seconds</source>
-        <translation>Sekunder</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1351"/>
-        <source>Show</source>
-        <translation>Visa</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1362"/>
-        <source>GFLow at max depth</source>
-        <translation>GFLow på maxdjup</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1359"/>
-        <source>Misc</source>
-        <translation>Blandat</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1283"/>
-        <source>Preferences</source>
-        <translation>Inställningar</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1324"/>
-        <source>&amp;Metric</source>
-        <translation>&amp;Metrisk</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1326"/>
-        <source>Personali&amp;ze</source>
-        <translation>Personifiera</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1327"/>
-        <source>Individual settings</source>
-        <translation>Individuella inställningar</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1335"/>
-        <source>&amp;liter</source>
-        <translation>&amp;liter</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1344"/>
-        <source>Ascent/descent speed denominator</source>
-        <translation>Hastighetsnämnare</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1347"/>
-        <source>GPS coordinates</source>
-        <translation>GPS kordinater</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1348"/>
-        <source>Location Display</source>
-        <translation>Platsvisning</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1349"/>
-        <source>traditional (dms)</source>
-        <translation>traditionell (dms)</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1350"/>
-        <source>decimal</source>
-        <translation>decimal</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1352"/>
-        <source>Threshold when showing pO₂</source>
-        <translation>Tröskelvärde vid visning av pO₂</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1353"/>
-        <source>Threshold when showing pN₂</source>
-        <translation>Tröskelvärde vid visning av pN₂</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1354"/>
-        <source>Threshold when showing pHe</source>
-        <translation>Tröskelvärde vid visning av pHe</translation>
+        <location filename="../build/ui_preferences.h" line="1400"/>
+        <source>Disconnect from Facebook</source>
+        <translation>Logga ut fron facebook</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1355"/>
-        <source>Max pO₂ when showing MOD</source>
-        <translation>Maximalt pO₂, för visning av MOD</translation>
+        <location filename="../build/ui_preferences.h" line="1401"/>
+        <source>Dive site geo lookup</source>
+        <translation>Dykplats geouppslag</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1356"/>
-        <source>Draw dive computer reported ceiling red</source>
-        <translation>Visa dykdatorrapporterad takinformation i rött</translation>
+        <location filename="../build/ui_preferences.h" line="1402"/>
+        <source>Enable geocoding for dive site management</source>
+        <translation>Aktivera geokodning för dykplats administration</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1357"/>
-        <source>Show unused cylinders in Equipment tab</source>
-        <translation>Visa oanvända flaskor i utrustningsfliken</translation>
+        <location filename="../build/ui_preferences.h" line="1403"/>
+        <source>Parse site without GPS data</source>
+        <translation>Tolka plats utan GPS data</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1358"/>
-        <source>Show average depth</source>
-        <translation>Visa medeldjup</translation>
+        <location filename="../build/ui_preferences.h" line="1404"/>
+        <source>Same format for existing dives</source>
+        <translation>Samma format för befintliga dyk</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1360"/>
-        <source>GFLow</source>
-        <translation>GFLow</translation>
+        <location filename="../build/ui_preferences.h" line="1405"/>
+        <source>Dive Site Layout</source>
+        <translation>Dykplats layouten</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1361"/>
-        <source>GFHigh</source>
-        <translation>GFHigh</translation>
+        <location filename="../build/ui_preferences.h" line="1406"/>
+        <location filename="../build/ui_preferences.h" line="1407"/>
+        <source>/</source>
+        <translation>/</translation>
     </message>
 </context>
 <context>
@@ -6202,106 +6307,136 @@ Vänligen starta blåtand på din OSTC Sport och gör samma förberedelser som f
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="20"/>
-        <source>Show</source>
-        <translation>Visa</translation>
+        <source>Gas pressure display setup</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="29"/>
-        <source>Threshold when showing pO₂</source>
-        <translation>Tröskelvärde vid visning av pO₂</translation>
+        <source>Threshold for pO₂ (bar)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="49"/>
-        <source>Threshold when showing pN₂</source>
-        <translation>Tröskelvärde vid visning av pN₂</translation>
+        <source>Threshold for pN₂ (bar)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="69"/>
-        <source>Threshold when showing pHe</source>
-        <translation>Tröskelvärde vid visning av pHe</translation>
+        <source>Threshold for pHe (bar)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="89"/>
-        <source>Max pO₂ when showing MOD</source>
-        <translation>Maximalt pO₂, för visning av MOD</translation>
+        <source>pO₂ in calculating MOD (bar)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="106"/>
+        <source>CCR options:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="113"/>
+        <source>Dive planner default setpoint (bar)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="133"/>
+        <source>Show setpoints when viewing pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="140"/>
+        <source>Show individual O₂ sensor values when viewing pO₂</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="109"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="150"/>
+        <source>Ceiling display setup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="159"/>
         <source>Draw dive computer reported ceiling red</source>
         <translation>Visa dykdatorrapporterad takinformation i rött</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="116"/>
-        <source>Show unused cylinders in Equipment tab</source>
-        <translation>Visa oanvända flaskor i utrustningsfliken</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="169"/>
+        <source>Algorithm for calculated ceiling:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="123"/>
-        <source>Show mean depth</source>
-        <translation>Visa medeldjup</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="176"/>
+        <source>VPM-B</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="133"/>
-        <source>Misc</source>
-        <translation>Blandat</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="183"/>
+        <source>VPM-B Conservatism</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="149"/>
-        <source>bar</source>
-        <translation>bar</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="193"/>
+        <source>+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="165"/>
-        <source>Default CCR set-point for dive planning</source>
-        <translation>Standard CCR setpoint för dykplanering</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="206"/>
+        <source>Bühlmann</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="172"/>
-        <source>pSCR O₂ metabolism rate</source>
-        <translation>pSCR O₂ metabolismhastiget</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="216"/>
+        <source>GFHigh</source>
+        <translation>GFHigh</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="179"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="236"/>
         <source>GFLow</source>
         <translation>GFLow</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="186"/>
-        <source>GFHigh</source>
-        <translation>GFHigh</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="256"/>
+        <source>GFLow at max depth</source>
+        <translation>GFLow på maxdjup</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="203"/>
-        <source>ℓ/min</source>
-        <translation>ℓ/min</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="263"/>
+        <source>pSCR options:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="213"/>
-        <source>pSCR ratio</source>
-        <translation>pSCR ratio</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="270"/>
+        <source>Metabolic rate (ℓ O₂/min)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="223"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="287"/>
+        <source>Dilution ratio</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="300"/>
         <source>1:</source>
         <translation>1:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="230"/>
-        <source>CCR: show individual O₂ sensor values when viewing pO₂</source>
-        <translation>CCR: visa enskilda O₂ sensor värden när pO₂ visas</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="310"/>
+        <source>Misc</source>
+        <translation>Blandat</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="237"/>
-        <source>CCR: show setpoints when viewing pO₂</source>
-        <translation>CCR: visa setpoint när pO₂ visas</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="316"/>
+        <source>Show unused cylinders in Equipment tab</source>
+        <translation>Visa oanvända flaskor i utrustningsfliken</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="244"/>
-        <source>GFLow at max depth</source>
-        <translation>GFLow på maxdjup</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="323"/>
+        <source>Show mean depth in Profile</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="10"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="9"/>
         <source>Graph</source>
         <translation>Graf</translation>
     </message>
@@ -6370,15 +6505,29 @@ Vänligen starta blåtand på din OSTC Sport och gör samma förberedelser som f
         <translation>Språk</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="57"/>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="53"/>
         <source>Restart required</source>
         <translation>Omstart krävs</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="58"/>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="54"/>
         <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="../desktop-widgets/preferences/preferences_language.cpp" line="76"/>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="82"/>
+        <source>Literal characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="77"/>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="83"/>
+        <source>Non-special character(s) in time format.
+These will be used as is. This might not be what you intended.
+See http://doc.qt.io/qt-5/qdatetime.html#toString</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PreferencesNetwork</name>
@@ -6425,7 +6574,7 @@ Vänligen starta blåtand på din OSTC Sport och gör samma förberedelser som f
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_network.ui" line="156"/>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="148"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="134"/>
         <source>Subsurface cloud storage</source>
         <translation>Subsurface molnlagring</translation>
     </message>
@@ -6470,39 +6619,39 @@ Vänligen starta blåtand på din OSTC Sport och gör samma förberedelser som f
         <translation>Spara användarid lokalt?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="11"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="10"/>
         <source>Network</source>
         <translation>Nätverk</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="15"/>
         <source>No proxy</source>
         <translation>Ingen proxy</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/>
         <source>System proxy</source>
         <translation>System proxy</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/>
         <source>HTTP proxy</source>
         <translation>HTTP proxy</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="19"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/>
         <source>SOCKS proxy</source>
         <translation>SOCKS proxy</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="75"/>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="97"/>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="110"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="72"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="93"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="106"/>
         <source>Cloud storage email and password can only consist of letters, numbers, and &apos;.&apos;, &apos;-&apos;, &apos;_&apos;, and &apos;+&apos;.</source>
         <translation>Molnlagrings email och lösenord kan bara beså av bokstäver, siffror samt &apos;.&apos;, &apos;-&apos;, &apos;_&apos; och &apos;+&apos;.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="146"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="132"/>
         <source>Subsurface cloud storage (credentials verified)</source>
         <translation>Subsurface molnlagring (verifierade referenser)</translation>
     </message>
@@ -6660,7 +6809,7 @@ Vänligen starta blåtand på din OSTC Sport och gör samma förberedelser som f
         <translation>decimal</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="8"/>
+        <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="7"/>
         <source>Units</source>
         <translation>Enheter</translation>
     </message>
@@ -6668,17 +6817,17 @@ Vänligen starta blåtand på din OSTC Sport och gör samma förberedelser som f
 <context>
     <name>PrintDialog</name>
     <message>
-        <location filename="../desktop-widgets/printdialog.cpp" line="118"/>
-        <source>&amp;Preview</source>
-        <translation>Förhandsvisning</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/printdialog.cpp" line="115"/>
+        <location filename="../desktop-widgets/printdialog.cpp" line="102"/>
         <source>P&amp;rint</source>
         <translation>Skriv ut</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/printdialog.cpp" line="130"/>
+        <location filename="../desktop-widgets/printdialog.cpp" line="105"/>
+        <source>&amp;Preview</source>
+        <translation>Förhandsvisning</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/printdialog.cpp" line="117"/>
         <source>Print</source>
         <translation>Skriv ut</translation>
     </message>
@@ -6686,19 +6835,10 @@ Vänligen starta blåtand på din OSTC Sport och gör samma förberedelser som f
 <context>
     <name>PrintOptions</name>
     <message>
-        <location filename="../build/ui_printoptions.h" line="150"/>
-        <source>&amp;Table print</source>
-        <translation>&amp;Tabell utskrift</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_printoptions.h" line="158"/>
-        <source>One dive per page</source>
-        <translation>Ett dyk per sida</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_printoptions.h" line="159"/>
-        <source>Two dives per page</source>
-        <translation>2 dyk per sida</translation>
+        <location filename="../desktop-widgets/printoptions.ui" line="29"/>
+        <location filename="../build/ui_printoptions.h" line="148"/>
+        <source>Print type</source>
+        <translation>Utskriftstyp</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/printoptions.ui" line="41"/>
@@ -6758,10 +6898,19 @@ Vänligen starta blåtand på din OSTC Sport och gör samma förberedelser som f
         <translation>Importera</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/printoptions.ui" line="29"/>
-        <location filename="../build/ui_printoptions.h" line="148"/>
-        <source>Print type</source>
-        <translation>Utskriftstyp</translation>
+        <location filename="../build/ui_printoptions.h" line="150"/>
+        <source>&amp;Table print</source>
+        <translation>&amp;Tabell utskrift</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_printoptions.h" line="158"/>
+        <source>One dive per page</source>
+        <translation>Ett dyk per sida</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_printoptions.h" line="159"/>
+        <source>Two dives per page</source>
+        <translation>2 dyk per sida</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/printoptions.cpp" line="128"/>
@@ -6803,103 +6952,103 @@ Vänligen starta blåtand på din OSTC Sport och gör samma förberedelser som f
         <translation>Okänd dykdator</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="755"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="752"/>
         <source>Show NDL / TTS was disabled because of excessive processing time</source>
         <translation>Visa NDL / TTS stängdes av pga att det tog för lång tid att beräkna</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1344"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1338"/>
         <source>Make first divecomputer</source>
         <translation>Gör till första dykdator</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1346"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1340"/>
         <source>Delete this divecomputer</source>
         <translation>Ta bort den här dykdatorn</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1360"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1354"/>
         <source>Add gas change</source>
         <translation>Lägg till gasbyte</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1363"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1357"/>
         <source> (Tank %1)</source>
         <translation> (Flaska %1)</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1371"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1365"/>
         <source>Add set-point change</source>
         <translation>Lägg till set-point byte</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1373"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1367"/>
         <source>Add bookmark</source>
         <translation>Lägg till bokmärke</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1377"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1371"/>
         <source>Edit the profile</source>
         <translation>Editera profilen</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1381"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1375"/>
         <source>Remove event</source>
         <translation>Ta bort händelse</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1386"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1380"/>
         <source>Hide similar events</source>
         <translation>Göm liknande händelser</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1393"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1387"/>
         <source>Edit name</source>
         <translation>Ändra namn</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1422"/>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1429"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1416"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1423"/>
         <source>Adjust pressure of tank %1 (currently interpolated as %2)</source>
         <translation>Förändra trycket i flaska %1 (nu beräknat till %2)</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1444"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1438"/>
         <source>Unhide all events</source>
         <translation>Visa alla händelser</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1479"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1473"/>
         <source>Hide events</source>
         <translation>Göm händelser</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1479"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1473"/>
         <source>Hide all %1 events?</source>
         <translation>Göm alla %1händelser</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1514"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1508"/>
         <source>Remove the selected event?</source>
         <translation>Ta bort markerad händelse</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1515"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1509"/>
         <source>%1 @ %2:%3</source>
         <translation>%1 @ %2:%3</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1638"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1632"/>
         <source>Edit name of bookmark</source>
         <translation>Ändra namnet på bokmärket</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1639"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1633"/>
         <source>Custom name:</source>
         <translation>Valt namn:</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1644"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1638"/>
         <source>Name is too long!</source>
         <translation>Namnet är för långt!</translation>
     </message>
@@ -6907,91 +7056,101 @@ Vänligen starta blåtand på din OSTC Sport och gör samma förberedelser som f
 <context>
     <name>QMLManager</name>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="95"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="97"/>
         <source>Starting...</source>
         <translation>Startar...</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="202"/>
         <source>working in no-cloud mode</source>
         <translation>Arbetar i molnfritt läge</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="213"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="216"/>
         <source>no cloud credentials</source>
         <translation>inga moln referenser</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="214"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="270"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="217"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="269"/>
         <source>Please enter valid cloud credentials.</source>
         <translation>Vänligen ange giltiga moln referenser</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="285"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="284"/>
         <source>Attempting to open cloud storage with new credentials</source>
         <translation>Försöker öppna moln lagring med nya referenser</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="304"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="306"/>
         <source>Testing cloud credentials</source>
         <translation>Testar moln referenser</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="331"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="320"/>
+        <source>No response from cloud server to validate the credentials</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="329"/>
+        <source>Cannot connect to cloud storage - cloud account not verified</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="361"/>
         <source>Cloud credentials are invalid</source>
         <translation>Moln referenser är ogiltiga</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="344"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="374"/>
         <source>Cannot open cloud storage: Error creating https connection</source>
         <translation>Kan inte öppna moln lagring: Gick inte skapa https koppling</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="357"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="387"/>
         <source>Cannot open cloud storage: %1</source>
         <translation>Kan inte öppna molnlagring: %1</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="369"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="399"/>
         <source>Cannot connect to cloud storage</source>
         <translation>Kan inte ansluta till moln lagring</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="411"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="441"/>
         <source>Cloud storage error: %1</source>
         <translation>Molnlagrings fel: %1</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="501"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="531"/>
         <source>Failed to connect to cloud server, reverting to no cloud status</source>
         <translation>Misslyckades ansluta till moln server, återgår till molnfri status</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="520"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="550"/>
         <source>Cloud storage open successfully. No dives in dive list.</source>
         <translation>Molnlagring öppnades framgångsrikt. Inga dyk i dyklistan</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="689"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="690"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="721"/>
         <source>h</source>
         <translation>h</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="689"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="690"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="691"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="721"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="722"/>
         <source>min</source>
         <translation>Min</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="689"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/>
         <source>sec</source>
         <translation>sek</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="1041"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="1102"/>
         <source>Unknown GPS location</source>
         <translation>Okänd GPS position</translation>
     </message>
@@ -6999,126 +7158,126 @@ Vänligen starta blåtand på din OSTC Sport och gör samma förberedelser som f
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../core/qthelper.cpp" line="866"/>
-        <location filename="../core/qthelper.cpp" line="1214"/>
-        <source>AIR</source>
-        <translation>LUFT</translation>
+        <location filename="../core/gpslocation.h" line="13"/>
+        <source>Waiting to aquire GPS location</source>
+        <translation>Väntar på att få GPS position</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="1214"/>
-        <source>OXYGEN</source>
-        <translation>OXYGEN</translation>
+        <location filename="../core/qthelper.cpp" line="766"/>
+        <location filename="../core/qthelper.cpp" line="1275"/>
+        <source>m</source>
+        <translation>m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="59"/>
-        <source>Remove this point</source>
-        <translation>Ta bort denna punkt</translation>
+        <location filename="../core/qthelper.cpp" line="768"/>
+        <location filename="../core/qthelper.cpp" line="1274"/>
+        <source>ft</source>
+        <translation>ft</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="32"/>
-        <source>Average</source>
-        <translation>Genomsnitt</translation>
+        <location filename="../core/qthelper.cpp" line="794"/>
+        <source>C</source>
+        <translation>C</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="35"/>
-        <source>Minimum</source>
-        <translation>Minimum</translation>
+        <location filename="../core/qthelper.cpp" line="796"/>
+        <source>F</source>
+        <translation>F</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="38"/>
-        <source>Maximum</source>
-        <translation>Maximum</translation>
+        <location filename="../core/qthelper.cpp" line="821"/>
+        <location filename="../core/qthelper.cpp" line="1250"/>
+        <source>kg</source>
+        <translation>kg</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/globe.cpp" line="327"/>
-        <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>
+        <location filename="../core/qthelper.cpp" line="823"/>
+        <location filename="../core/qthelper.cpp" line="1251"/>
+        <source>lbs</source>
+        <translation>pund</translation>
     </message>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="28"/>
-        <source>unknown</source>
-        <translation>okänd</translation>
+        <location filename="../core/qthelper.cpp" line="848"/>
+        <location filename="../core/qthelper.cpp" line="1300"/>
+        <source>bar</source>
+        <translation>bar</translation>
     </message>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="105"/>
-        <source>h:</source>
-        <translation>h:</translation>
+        <location filename="../core/qthelper.cpp" line="850"/>
+        <location filename="../core/qthelper.cpp" line="1299"/>
+        <source>psi</source>
+        <translation>psi</translation>
     </message>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="105"/>
-        <source>min</source>
-        <translation>Min</translation>
+        <location filename="../core/qthelper.cpp" line="871"/>
+        <location filename="../core/qthelper.cpp" line="1235"/>
+        <source>AIR</source>
+        <translation>LUFT</translation>
     </message>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="337"/>
-        <source>Multiple</source>
-        <translation>Multipla</translation>
+        <location filename="../core/qthelper.cpp" line="873"/>
+        <source>EAN</source>
+        <translation>EAN</translation>
     </message>
     <message numerus="yes">
-        <location filename="../core/qthelper.cpp" line="957"/>
+        <location filename="../core/qthelper.cpp" line="962"/>
         <source>(%n dive(s))</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="816"/>
-        <location filename="../core/qthelper.cpp" line="1228"/>
-        <source>kg</source>
-        <translation>kg</translation>
+        <location filename="../core/qthelper.cpp" line="1235"/>
+        <source>OXYGEN</source>
+        <translation>OXYGEN</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="818"/>
-        <location filename="../core/qthelper.cpp" line="1229"/>
-        <source>lbs</source>
-        <translation>pund</translation>
+        <location filename="../core/qthelper.cpp" line="1322"/>
+        <source>l</source>
+        <translation>l</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="763"/>
-        <location filename="../core/qthelper.cpp" line="1252"/>
-        <source>ft</source>
-        <translation>ft</translation>
+        <location filename="../core/qthelper.cpp" line="1323"/>
+        <source>cuft</source>
+        <translation>ft³</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="761"/>
-        <location filename="../core/qthelper.cpp" line="1253"/>
-        <source>m</source>
-        <translation>m</translation>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="29"/>
+        <source>unknown</source>
+        <translation>okänd</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="789"/>
-        <source>C</source>
-        <translation>C</translation>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="114"/>
+        <source>h:</source>
+        <translation>h:</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="791"/>
-        <source>F</source>
-        <translation>F</translation>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="114"/>
+        <source>min</source>
+        <translation>Min</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="845"/>
-        <location filename="../core/qthelper.cpp" line="1275"/>
-        <source>psi</source>
-        <translation>psi</translation>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="63"/>
+        <source>Remove this point</source>
+        <translation>Ta bort denna punkt</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="843"/>
-        <location filename="../core/qthelper.cpp" line="1276"/>
-        <source>bar</source>
-        <translation>bar</translation>
+        <location filename="../desktop-widgets/globe.cpp" line="327"/>
+        <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>
     <message>
-        <location filename="../core/qthelper.cpp" line="868"/>
-        <source>EAN</source>
-        <translation>EAN</translation>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="32"/>
+        <source>Average</source>
+        <translation>Genomsnitt</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="1298"/>
-        <source>l</source>
-        <translation>l</translation>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="35"/>
+        <source>Minimum</source>
+        <translation>Minimum</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="1299"/>
-        <source>cuft</source>
-        <translation>ft³</translation>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="38"/>
+        <source>Maximum</source>
+        <translation>Maximum</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="625"/>
@@ -7140,17 +7299,12 @@ Vänligen starta blåtand på din OSTC Sport och gör samma förberedelser som f
         <source>Malformed XML response. Line %1: %2</source>
         <translation>Felformaterat XML svar. Rad %1: %2</translation>
     </message>
-    <message>
-        <location filename="../core/gpslocation.h" line="13"/>
-        <source>Waiting to aquire GPS location</source>
-        <translation>Väntar på att få GPS position</translation>
-    </message>
 </context>
 <context>
     <name>ReadSettingsThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1651"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1676"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1640"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1665"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Den här möjligheten är inte än tillgänglig för denna dykdator dator.</translation>
     </message>
@@ -7179,7 +7333,7 @@ Vänligen starta blåtand på din OSTC Sport och gör samma förberedelser som f
 <context>
     <name>ResetSettingsThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1775"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1764"/>
         <source>Reset settings failed!</source>
         <translation>Inställnings återställning misslyckades!</translation>
     </message>
@@ -7217,6 +7371,12 @@ Vänligen starta blåtand på din OSTC Sport och gör samma förberedelser som f
 <context>
     <name>ShiftImageTimesDialog</name>
     <message>
+        <location filename="../desktop-widgets/shiftimagetimes.ui" line="23"/>
+        <location filename="../build/ui_shiftimagetimes.h" line="184"/>
+        <source>Shift selected image times</source>
+        <translation>Korrigera tid i valda bilder</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/shiftimagetimes.ui" line="34"/>
         <location filename="../build/ui_shiftimagetimes.h" line="185"/>
         <source>Shift times of image(s) by</source>
@@ -7229,12 +7389,6 @@ Vänligen starta blåtand på din OSTC Sport och gör samma förberedelser som f
         <translation>h:mm</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/shiftimagetimes.ui" line="23"/>
-        <location filename="../build/ui_shiftimagetimes.h" line="184"/>
-        <source>Shift selected image times</source>
-        <translation>Korrigera tid i valda bilder</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/shiftimagetimes.ui" line="105"/>
         <location filename="../build/ui_shiftimagetimes.h" line="187"/>
         <source>Earlier</source>
@@ -7286,12 +7440,12 @@ Alla bilder har inte en tidstämpel mellan
         <translation>Vilket datum och tid visas på bilden?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="297"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="296"/>
         <source>Open image file</source>
         <translation>Öppna bildfler</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="299"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="298"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>Bildfiler (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -7449,54 +7603,54 @@ Alla bilder har inte en tidstämpel mellan
 <context>
     <name>SocialNetworkDialog</name>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="339"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="284"/>
         <source>Dive date: %1 
 </source>
         <translation>Dykdatum: %1 
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="342"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="287"/>
         <source>Duration: %1 
 </source>
         <translation>Varaktighet: %1 
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="343"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="288"/>
         <source>h:</source>
         <comment>abbreviation for hours plus separator</comment>
         <translation>h:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="344"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="289"/>
         <source>min</source>
         <comment>abbreviation for minutes</comment>
         <translation>Min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="347"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="292"/>
         <source>Dive location: %1 
 </source>
         <translation>Dykplats: %1 
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="350"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="295"/>
         <source>Buddy: %1 
 </source>
         <translation>Parkamrat: %1 
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="353"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="298"/>
         <source>Divemaster: %1 
 </source>
         <translation>Divemaster: %1 
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="356"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="301"/>
         <source>
 %1</source>
         <translation>
@@ -7582,12 +7736,21 @@ Alla bilder har inte en tidstämpel mellan
     <name>StartPage</name>
     <message>
         <location filename="../mobile-widgets/qml/StartPage.qml" line="19"/>
-        <source>To use Subsurface-mobile with Subsurface cloud storage, please enteryour cloud credentials.
-
-To use Subsurface-mobile only with local data on this device, tap on the no cloud icon below.</source>
-        <translation>För att använda Subsurface-mobile med Subsurface molnlagring, vänligen ange dina moln referenser.
+        <source>To use Subsurface-mobile with Subsurface cloud storage, please enter your cloud credentials.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/StartPage.qml" line="20"/>
+        <source>If this is the first time you use Subsurface cloud storage, enter a valid email (all lower case) and a password of your choice (letters and numbers). The server will send a PIN to the email address provided that you will have to enter here.
 
-För att använda Subsurface-mobile enbart med lokal data på denna enheten, klicka på den molnfria ikonen nedan.</translation>
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/StartPage.qml" line="23"/>
+        <source>To use Subsurface-mobile only with local data on this device, tap on the no cloud icon below.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -7625,7 +7788,12 @@ För att använda Subsurface-mobile enbart med lokal data på denna enheten, kli
 <context>
     <name>SubsurfaceWebServices</name>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="419"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="395"/>
+        <source>Enter User ID and click Download</source>
+        <translation>Mata in användarid och klicka på nerladdning</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="417"/>
         <source>Webservice</source>
         <translation>Webbtjänst</translation>
     </message>
@@ -7650,30 +7818,25 @@ För att använda Subsurface-mobile enbart med lokal data på denna enheten, kli
         <translation>Kontaktfel:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="557"/>
-        <source>Download successful</source>
-        <translation>Nedladdningen lyckades</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="551"/>
         <source>Invalid user identifier!</source>
         <translation>Ogiltigt användarid!</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="397"/>
-        <source>Enter User ID and click Download</source>
-        <translation>Mata in användarid och klicka på nerladdning</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="554"/>
         <source>Cannot parse response!</source>
         <translation>Kan inte tolka respons</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="557"/>
+        <source>Download successful</source>
+        <translation>Nedladdningen lyckades</translation>
+    </message>
 </context>
 <context>
     <name>SuitFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="674"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="672"/>
         <source>Suits: </source>
         <translation>Dräkter:</translation>
     </message>
@@ -7681,7 +7844,7 @@ För att använda Subsurface-mobile enbart med lokal data på denna enheten, kli
 <context>
     <name>SuitsFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="123"/>
+        <location filename="../qt-models/filtermodels.cpp" line="128"/>
         <source>No suit set</source>
         <translation>Ingen dräkt vald</translation>
     </message>
@@ -7700,7 +7863,7 @@ För att använda Subsurface-mobile enbart med lokal data på denna enheten, kli
 <context>
     <name>TagFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="595"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="593"/>
         <source>Tags: </source>
         <translation>Taggar:</translation>
     </message>
@@ -7708,7 +7871,7 @@ För att använda Subsurface-mobile enbart med lokal data på denna enheten, kli
 <context>
     <name>TagFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="148"/>
+        <location filename="../qt-models/filtermodels.cpp" line="153"/>
         <source>Empty tags</source>
         <translation>Toma taggar</translation>
     </message>
@@ -7734,6 +7897,11 @@ För att använda Subsurface-mobile enbart med lokal data på denna enheten, kli
 <context>
     <name>TemplateEdit</name>
     <message>
+        <location filename="../desktop-widgets/templateedit.ui" line="14"/>
+        <source>Edit template</source>
+        <translation>Ändra mall</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/templateedit.ui" line="37"/>
         <source>Preview</source>
         <translation>Förhandsvisning</translation>
@@ -7779,11 +7947,6 @@ För att använda Subsurface-mobile enbart med lokal data på denna enheten, kli
         <translation>Fontstorlek</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/templateedit.ui" line="14"/>
-        <source>Edit template</source>
-        <translation>Ändra mall</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/templateedit.ui" line="165"/>
         <source>Color palette</source>
         <translation>Färgpalett</translation>
@@ -7965,7 +8128,7 @@ För att använda Subsurface-mobile enbart med lokal data på denna enheten, kli
 <context>
     <name>TextHyperlinkEventFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="817"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="815"/>
         <source>%1click to visit %2</source>
         <translation>%1klicka för att besöka %2</translation>
     </message>
@@ -7981,102 +8144,107 @@ För att använda Subsurface-mobile enbart med lokal data på denna enheten, kli
 <context>
     <name>TripItem</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="67"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="68"/>
         <source>(%1 shown)</source>
         <translation>(%1 visad)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="194"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="197"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="215"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="200"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="218"/>
         <source>Rating</source>
         <translation>Rankning</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
         <source>Depth(%1)</source>
         <translation>Ljup(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="206"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="224"/>
         <source>Duration</source>
         <translation>Varaktighet</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="209"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="227"/>
         <source>Temp(%1%2)</source>
         <translation>Temperatur(%1%2)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
         <source>Weight(%1)</source>
         <translation>Vikt(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
         <source>lbs</source>
         <translation>pund</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="215"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="233"/>
         <source>Suit</source>
         <translation>Dräkt</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="218"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="236"/>
         <source>Cyl</source>
         <translation>Cyl</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="239"/>
         <source>Gas</source>
         <translation>Gas</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="244"/>
         <source>SAC(%1)</source>
         <translation>SAC(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="244"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="229"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="247"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="232"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="250"/>
         <source>Max CNS</source>
         <translation>Max CNS</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="235"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="253"/>
+        <source>Photos before/during/after dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="256"/>
         <source>Location</source>
         <translation>Plats</translation>
     </message>
@@ -8099,72 +8267,73 @@ För att använda Subsurface-mobile enbart med lokal data på denna enheten, kli
 <context>
     <name>UpdateManager</name>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="69"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="61"/>
         <source>Check for updates.</source>
         <translation>Sök efter uppdateringar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="70"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="62"/>
         <source>Subsurface was unable to check for updates.</source>
         <translation>Subsurface kunde inte kolla efter uppdateringar.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="75"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="67"/>
         <source>The following error occurred:</source>
         <translation>Följande fel inträffade:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="76"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="68"/>
         <source>Please check your internet connection.</source>
         <translation>Verifiera att du har en fungerande uppkoppling till internet.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="86"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="78"/>
         <source>You are using the latest version of Subsurface.</source>
         <translation>Du använder dig av den senaste versionen av Subsurface.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="89"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="81"/>
         <source>A new version of Subsurface is available.&lt;br/&gt;Click on:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; to download it.</source>
         <translation>En ny version av Subsurface finns tillgänglig.&lt;br/&gt;Klicka på:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; för att ladda ner den.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="95"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="87"/>
         <source>A new version of Subsurface is available.</source>
         <translation>En ny version av Subsurface finns tillgänglig.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="96"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="88"/>
         <source>Latest version is %1, please check %2 our download page %3 for information in how to update.</source>
         <translation>Senaste versionen är %1, vänligen se %2 vår nerladningssida %3 för information om du uppdaterar.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="106"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="98"/>
         <source>Newest release version is </source>
         <translation>Senast släppta version är</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="107"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="99"/>
         <source>The server returned the following information:</source>
         <translation>Servern returnerade följande information:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="125"/>
-        <source>Subsurface is checking every two weeks if a new version is available. If you don&apos;t want Subsurface to continue checking, please click Decline.</source>
-        <translation>Subsurface kollar varannan vecka om det har kommit en ny version. Om du inte vill att Subsurface skall göra det vänligen klicka på Avslå</translation>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="117"/>
+        <source>Subsurface is checking every two weeks if a new version is available. 
+ If you don&apos;t want Subsurface to continue checking, please click Decline.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="126"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="119"/>
         <source>Decline</source>
         <translation>Avslå</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="127"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="120"/>
         <source>Accept</source>
         <translation>Acceptera</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="129"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="122"/>
         <source>Automatic check for updates</source>
         <translation>Sök efter uppdateringar automatiskt</translation>
     </message>
@@ -8186,24 +8355,6 @@ För att använda Subsurface-mobile enbart med lokal data på denna enheten, kli
 <context>
     <name>UserSurvey</name>
     <message>
-        <location filename="../desktop-widgets/usersurvey.ui" line="44"/>
-        <location filename="../build/ui_usersurvey.h" line="151"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;We would love to learn more about our users, their preferences and their usage habits. Please spare a minute to fill out this form and submit it to the Subsurface team.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Vi skulle vilja lära oss mer om våra användare, vad ni fördrar och hur ni använder programmet. Teamet som gör denna programvara skulle gärna vilja lära sig mer om våra användare. Ta gärna en minut och fyll i detta formulär och skicka in det till oss.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/usersurvey.ui" line="115"/>
-        <location filename="../build/ui_usersurvey.h" line="156"/>
-        <source>Other software/sources</source>
-        <translation>Andra mjukvaror/källor</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/usersurvey.ui" line="128"/>
-        <location filename="../build/ui_usersurvey.h" line="157"/>
-        <source>Manually entering dives</source>
-        <translation>Manuella importer</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="14"/>
         <location filename="../build/ui_usersurvey.h" line="149"/>
         <source>User survey</source>
@@ -8216,6 +8367,12 @@ För att använda Subsurface-mobile enbart med lokal data på denna enheten, kli
         <translation>Subsurface användarundersökning</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/usersurvey.ui" line="44"/>
+        <location filename="../build/ui_usersurvey.h" line="151"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;We would love to learn more about our users, their preferences and their usage habits. Please spare a minute to fill out this form and submit it to the Subsurface team.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Vi skulle vilja lära oss mer om våra användare, vad ni fördrar och hur ni använder programmet. Teamet som gör denna programvara skulle gärna vilja lära sig mer om våra användare. Ta gärna en minut och fyll i detta formulär och skicka in det till oss.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="63"/>
         <location filename="../build/ui_usersurvey.h" line="152"/>
         <source>Technical diver</source>
@@ -8240,6 +8397,18 @@ För att använda Subsurface-mobile enbart med lokal data på denna enheten, kli
         <translation>Kompatibel dykdator</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/usersurvey.ui" line="115"/>
+        <location filename="../build/ui_usersurvey.h" line="156"/>
+        <source>Other software/sources</source>
+        <translation>Andra mjukvaror/källor</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/usersurvey.ui" line="128"/>
+        <location filename="../build/ui_usersurvey.h" line="157"/>
+        <source>Manually entering dives</source>
+        <translation>Manuella importer</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="141"/>
         <location filename="../build/ui_usersurvey.h" line="158"/>
         <source>Android/iPhone companion app</source>
@@ -8270,6 +8439,11 @@ För att använda Subsurface-mobile enbart med lokal data på denna enheten, kli
         <translation>Var importerar du data ifrån?</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/usersurvey.cpp" line="18"/>
+        <source>Send</source>
+        <translation>Skicka</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/usersurvey.cpp" line="43"/>
         <source>
 Operating system: %1</source>
@@ -8312,19 +8486,14 @@ Language: %1</source>
         <translation>Fråga senare</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/usersurvey.cpp" line="101"/>
-        <source>Submit user survey.</source>
-        <translation>Skicka in användarundersökningen.</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/usersurvey.cpp" line="82"/>
         <source>Ask again?</source>
         <translation>Fråga igen?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/usersurvey.cpp" line="18"/>
-        <source>Send</source>
-        <translation>Skicka</translation>
+        <location filename="../desktop-widgets/usersurvey.cpp" line="101"/>
+        <source>Submit user survey.</source>
+        <translation>Skicka in användarundersökningen.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/usersurvey.cpp" line="102"/>
@@ -8416,12 +8585,12 @@ Language: %1</source>
         <translation>Ladda upp</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="324"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="325"/>
         <source>Operation timed out</source>
         <translation>Begäran tog för lång tid</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="345"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="346"/>
         <source>Transferring data...</source>
         <translation>Överför data...</translation>
     </message>
@@ -8456,18 +8625,18 @@ Language: %1</source>
 <context>
     <name>WriteSettingsThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1702"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1709"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1718"/>
-        <source>Failed!</source>
-        <translation>Misslyckad!</translation>
-    </message>
-    <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1700"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1721"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1689"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1710"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Den här möjligheten är inte än tillgänglig för denna dykdator dator.</translation>
     </message>
+    <message>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1691"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1698"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1707"/>
+        <source>Failed!</source>
+        <translation>Misslyckad!</translation>
+    </message>
 </context>
 <context>
     <name>YearlyStatisticsModel</name>
@@ -8589,7 +8758,7 @@ Medel</translation>
 <context>
     <name>getextFromC</name>
     <message>
-        <location filename="../core/libdivecomputer.c" line="674"/>
+        <location filename="../core/libdivecomputer.c" line="737"/>
         <source>Error parsing the header</source>
         <translation>Misslyckades läsa sidhuvudet</translation>
     </message>
@@ -8597,38 +8766,377 @@ Medel</translation>
 <context>
     <name>gettextFromC</name>
     <message>
+        <location filename="../core/cochran.c" line="309"/>
+        <location filename="../core/cochran.c" line="315"/>
+        <location filename="../core/cochran.c" line="385"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>deco stop</source>
+        <translation>dekostopp</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="336"/>
+        <location filename="../core/cochran.c" line="390"/>
+        <location filename="../core/file.c" line="777"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>ascent</source>
+        <translation>uppstigning</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="342"/>
+        <location filename="../core/file.c" line="755"/>
+        <source>battery</source>
+        <translation>batteri</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="348"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
+        <source>OLF</source>
+        <translation>OLF</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="353"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
+        <source>maxdepth</source>
+        <translation>Maxdjup</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="358"/>
+        <location filename="../core/cochran.c" line="404"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
+        <source>pO₂</source>
+        <translation>pO₂</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="365"/>
+        <location filename="../core/cochran.c" line="414"/>
+        <location filename="../core/cochran.c" line="421"/>
+        <location filename="../core/file.c" line="868"/>
+        <location filename="../core/libdivecomputer.c" line="225"/>
+        <location filename="../core/libdivecomputer.c" line="228"/>
+        <source>gaschange</source>
+        <translation>gasbyte</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="370"/>
+        <location filename="../core/cochran.c" line="409"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>rbt</source>
+        <translation>rbt</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="379"/>
+        <location filename="../core/cochran.c" line="426"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>ceiling</source>
+        <translation>ceiling</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="395"/>
+        <location filename="../core/libdivecomputer.c" line="224"/>
+        <source>transmitter</source>
+        <translation>sändare</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="153"/>
+        <source>Error: the file does not appear to be a DATATRAK divelog</source>
+        <translation>Fel: filen verkar inte vara någon DATATRAK dykkogg</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="286"/>
+        <source>clear</source>
+        <translation>klart</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="289"/>
+        <source>misty</source>
+        <translation>disigt</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="292"/>
+        <source>fog</source>
+        <translation>dimma</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="295"/>
+        <source>rain</source>
+        <translation>regn</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="298"/>
+        <source>storm</source>
+        <translation>storm</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="301"/>
+        <source>snow</source>
+        <translation>snö</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="321"/>
+        <source>No suit</source>
+        <translation>Ingen dräkt</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="324"/>
+        <source>Shorty</source>
+        <translation>Shorty</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="327"/>
+        <source>Combi</source>
+        <translation>Kombi</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="330"/>
+        <source>Wet suit</source>
+        <translation>Våtdräkt</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="333"/>
+        <source>Semidry suit</source>
+        <translation>Semidrydräkt</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="336"/>
+        <source>Dry suit</source>
+        <translation>Torrdräkt</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="396"/>
+        <source>no stop</source>
+        <translation>no stop</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="398"/>
+        <location filename="../core/dive.c" line="29"/>
+        <source>deco</source>
+        <translation>deko</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="400"/>
+        <source>single ascent</source>
+        <translation>enkel uppstigning</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="402"/>
+        <source>multiple ascent</source>
+        <translation>multipla uppstigningar</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="404"/>
+        <location filename="../core/dive.c" line="27"/>
+        <source>fresh</source>
+        <translation>färsk</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="406"/>
+        <source>salt water</source>
+        <translation>salt vatten</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="431"/>
+        <source>sight seeing</source>
+        <translation>sightseeing</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="433"/>
+        <source>club dive</source>
+        <translation>klubbdyk</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="435"/>
+        <location filename="../core/dive.c" line="28"/>
+        <source>instructor</source>
+        <translation>Instruktör</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="437"/>
+        <source>instruction</source>
+        <translation>instruktion</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="439"/>
+        <location filename="../core/dive.c" line="27"/>
+        <source>night</source>
+        <translation>natt</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="441"/>
+        <location filename="../core/dive.c" line="25"/>
+        <source>cave</source>
+        <translation>grotta</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="443"/>
+        <location filename="../core/dive.c" line="24"/>
+        <source>ice</source>
+        <translation>is</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="445"/>
+        <source>search</source>
+        <translation>sök</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="455"/>
+        <location filename="../core/dive.c" line="25"/>
+        <source>wreck</source>
+        <translation>vrak</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="457"/>
+        <location filename="../core/dive.c" line="26"/>
+        <source>river</source>
+        <translation>älv</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="459"/>
+        <location filename="../core/dive.c" line="23"/>
+        <source>drift</source>
+        <translation>ström</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="461"/>
+        <location filename="../core/dive.c" line="28"/>
+        <source>photo</source>
+        <translation>foto</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="463"/>
+        <source>other</source>
+        <translation>Övrigt</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="474"/>
+        <source>Other activities</source>
+        <translation>Andra aktiviteter</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="498"/>
+        <source>Datatrak/Wlog notes</source>
+        <translation>Datatrak/Wlog anteckningar</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="537"/>
+        <source>Manually entered dive</source>
+        <translation>Manuellt inlagdt dyk</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="588"/>
+        <source>Unknown</source>
+        <translation>okänd</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="674"/>
+        <source>Error: couldn&apos;t open the file %s</source>
+        <translation>Fel: kunde inte öppna filen %s</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="687"/>
+        <source>Error: no dive</source>
+        <translation>Fel: inget dyk</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="23"/>
+        <source>boat</source>
+        <translation>båt</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="23"/>
+        <source>shore</source>
+        <translation>strand</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="24"/>
+        <source>deep</source>
+        <translation>djup</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="24"/>
+        <source>cavern</source>
+        <translation>cavern</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="25"/>
+        <source>altitude</source>
+        <translation>höjd</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="26"/>
+        <source>pool</source>
+        <translation>pool</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="26"/>
+        <source>lake</source>
+        <translation>sjö</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="27"/>
+        <source>student</source>
+        <translation>student</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="28"/>
+        <source>video</source>
+        <translation>video</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="33"/>
+        <source>OC-gas</source>
+        <translation>OC-gas</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="33"/>
+        <source>diluent</source>
+        <translation>diluent</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="33"/>
+        <location filename="../core/equipment.c" line="88"/>
+        <location filename="../core/planner.c" line="1436"/>
+        <location filename="../core/planner.c" line="1439"/>
+        <source>oxygen</source>
+        <translation>oxygen</translation>
+    </message>
+    <message>
         <location filename="../core/dive.c" line="181"/>
         <source>pascal</source>
         <translation>pascal</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="186"/>
-        <location filename="../core/qthelper.cpp" line="669"/>
+        <location filename="../core/qthelper.cpp" line="674"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="190"/>
-        <location filename="../core/qthelper.cpp" line="672"/>
+        <location filename="../core/qthelper.cpp" line="677"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
+        <location filename="../core/dive.c" line="227"/>
+        <source>ℓ</source>
+        <translation>ℓ</translation>
+    </message>
+    <message>
         <location filename="../core/dive.c" line="232"/>
         <source>cuft</source>
         <translation>ft³</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="269"/>
-        <location filename="../core/qthelper.cpp" line="590"/>
-        <location filename="../core/qthelper.cpp" line="605"/>
+        <location filename="../core/qthelper.cpp" line="595"/>
+        <location filename="../core/qthelper.cpp" line="610"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="274"/>
-        <location filename="../core/qthelper.cpp" line="593"/>
-        <location filename="../core/qthelper.cpp" line="607"/>
+        <location filename="../core/qthelper.cpp" line="598"/>
+        <location filename="../core/qthelper.cpp" line="612"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
@@ -8654,53 +9162,58 @@ Medel</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="325"/>
-        <location filename="../core/qthelper.cpp" line="616"/>
-        <location filename="../core/qthelper.cpp" line="626"/>
+        <location filename="../core/qthelper.cpp" line="621"/>
+        <location filename="../core/qthelper.cpp" line="631"/>
         <source>lbs</source>
         <translation>pund</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="329"/>
-        <location filename="../core/qthelper.cpp" line="614"/>
-        <location filename="../core/qthelper.cpp" line="624"/>
+        <location filename="../core/qthelper.cpp" line="619"/>
+        <location filename="../core/qthelper.cpp" line="629"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="1772"/>
+        <location filename="../core/dive.c" line="1751"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) eller (%s)</translation>
     </message>
     <message>
-        <location filename="../core/divelist.c" line="484"/>
+        <location filename="../core/divelist.c" line="487"/>
         <location filename="../core/equipment.c" line="84"/>
-        <location filename="../core/planner.c" line="1411"/>
-        <location filename="../core/planner.c" line="1414"/>
+        <location filename="../core/planner.c" line="1432"/>
+        <location filename="../core/planner.c" line="1435"/>
         <source>air</source>
         <translation>luft</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="197"/>
+        <location filename="../core/equipment.c" line="86"/>
+        <source>EAN%d</source>
+        <translation>EAN%d</translation>
+    </message>
+    <message>
+        <location filename="../core/equipment.c" line="198"/>
         <source>integrated</source>
         <translation>integrerat</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="198"/>
+        <location filename="../core/equipment.c" line="199"/>
         <source>belt</source>
         <translation>bälte</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="199"/>
+        <location filename="../core/equipment.c" line="200"/>
         <source>ankle</source>
         <translation>ankel</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="200"/>
+        <location filename="../core/equipment.c" line="201"/>
         <source>backplate weight</source>
         <translation>Ryggplattans vikt</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="201"/>
+        <location filename="../core/equipment.c" line="202"/>
         <source>clip-on</source>
         <translation>clip-on</translation>
     </message>
@@ -8713,8 +9226,8 @@ Medel</translation>
         <location filename="../core/file.c" line="121"/>
         <location filename="../core/file.c" line="512"/>
         <location filename="../core/file.c" line="597"/>
-        <location filename="../core/file.c" line="924"/>
-        <location filename="../core/file.c" line="1056"/>
+        <location filename="../core/file.c" line="909"/>
+        <location filename="../core/file.c" line="1092"/>
         <location filename="../core/ostctools.c" line="80"/>
         <source>Failed to read &apos;%s&apos;</source>
         <translation>Kunde inte öppna &apos;%s&apos;</translation>
@@ -8772,486 +9285,496 @@ Medel</translation>
         <translation>O₂ kalibrering</translation>
     </message>
     <message>
-        <location filename="../core/file.c" line="887"/>
-        <source>No matching DC found for file &apos;%s&apos;</source>
-        <translation>Ingen matchande dykdator för filen &apos;%s&apos;</translation>
+        <location filename="../core/git-access.c" line="134"/>
+        <source>Local cache directory %s corrupted - can&apos;t sync with Subsurface cloud storage</source>
+        <translation>Lokal cache katalog %s är trasig - kan inte synkronisera med Subsurface molnlagring</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>none</source>
-        <translation>inget</translation>
+        <location filename="../core/git-access.c" line="157"/>
+        <location filename="../core/git-access.c" line="177"/>
+        <source>Could not update local cache to newer remote data</source>
+        <translation>Kunde inte uppdatera lokal cache med nyare extern data</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="309"/>
-        <location filename="../core/cochran.c" line="315"/>
-        <location filename="../core/cochran.c" line="385"/>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>deco stop</source>
-        <translation>dekostopp</translation>
+        <location filename="../core/git-access.c" line="170"/>
+        <source>Subsurface cloud storage corrupted</source>
+        <translation>Subsurface molnlagring skadades</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="342"/>
-        <location filename="../core/file.c" line="755"/>
-        <source>battery</source>
-        <translation>batteri</translation>
+        <location filename="../core/git-access.c" line="284"/>
+        <source>Could not update Subsurface cloud storage, try again later</source>
+        <translation>Kunde inte uppdatera Subsurface molnlagring, försök igen senare</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="370"/>
-        <location filename="../core/cochran.c" line="409"/>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>rbt</source>
-        <translation>rbt</translation>
+        <location filename="../core/git-access.c" line="344"/>
+        <source>Remote storage and local data diverged. Error: merge failed (%s)</source>
+        <translation>Extern lagring och lokal data separerade. Fel: sammanfogning misslyckades (%s)</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="336"/>
-        <location filename="../core/cochran.c" line="390"/>
-        <location filename="../core/file.c" line="777"/>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>ascent</source>
-        <translation>uppstigning</translation>
+        <location filename="../core/git-access.c" line="374"/>
+        <source>Remote storage and local data diverged. Cannot combine local and remote changes</source>
+        <translation>Extern lagring och lokal data separerade. Kan inte kombinera lokala och externa ändringar</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="379"/>
-        <location filename="../core/cochran.c" line="426"/>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>ceiling</source>
-        <translation>ceiling</translation>
+        <location filename="../core/git-access.c" line="408"/>
+        <source>Remote storage and local data diverged</source>
+        <translation>Extern lagring och lokal data separerade</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>workload</source>
-        <translation>arbetsbelastning</translation>
+        <location filename="../core/git-access.c" line="411"/>
+        <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source>
+        <translation>Extern lagring och lokal data separerade. Fel: skrivning av data misslyckades (%s)</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="395"/>
-        <location filename="../core/libdivecomputer.c" line="203"/>
-        <source>transmitter</source>
-        <translation>sändare</translation>
+        <location filename="../core/git-access.c" line="420"/>
+        <source>Problems with local cache of Subsurface cloud data</source>
+        <translation>Problem med lokal cache av Subsurface molndata</translation>
+    </message>
+    <message>
+        <location filename="../core/git-access.c" line="421"/>
+        <source>Moved cache data to %s. Please try the operation again.</source>
+        <translation>Flyttade cache data till %s. Vänligen försök igen.</translation>
+    </message>
+    <message>
+        <location filename="../core/git-access.c" line="743"/>
+        <source>Error connecting to Subsurface cloud storage</source>
+        <translation>Fel på uppkopplingen mot Subsurface molntjänst</translation>
+    </message>
+    <message>
+        <location filename="../core/git-access.c" line="746"/>
+        <source>git clone of %s failed (%s)</source>
+        <translation>git clone av %s misslyckades (%s)</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="210"/>
+        <location filename="../core/parse-xml.c" line="3317"/>
+        <location filename="../core/uemis-downloader.c" line="134"/>
+        <source>unknown</source>
+        <translation>okänd</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>none</source>
+        <translation>inget</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="203"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>workload</source>
+        <translation>arbetsbelastning</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="224"/>
         <source>violation</source>
         <translation>kränkning</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="203"/>
+        <location filename="../core/libdivecomputer.c" line="224"/>
         <source>bookmark</source>
         <translation>bokmärke</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="203"/>
+        <location filename="../core/libdivecomputer.c" line="224"/>
         <source>surface</source>
         <translation>ytan</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="203"/>
+        <location filename="../core/libdivecomputer.c" line="224"/>
         <source>safety stop</source>
         <translation>säkerhetsstopp</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="365"/>
-        <location filename="../core/cochran.c" line="414"/>
-        <location filename="../core/cochran.c" line="421"/>
-        <location filename="../core/file.c" line="868"/>
-        <location filename="../core/libdivecomputer.c" line="204"/>
-        <location filename="../core/libdivecomputer.c" line="207"/>
-        <source>gaschange</source>
-        <translation>gasbyte</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="204"/>
+        <location filename="../core/libdivecomputer.c" line="225"/>
         <source>safety stop (voluntary)</source>
         <translation>säkerhetsstopp (frivilligt)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="204"/>
+        <location filename="../core/libdivecomputer.c" line="225"/>
         <source>safety stop (mandatory)</source>
         <translation>säkerhetsstopp (obligatoriskt)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="205"/>
+        <location filename="../core/libdivecomputer.c" line="226"/>
         <source>deepstop</source>
         <translation>djupstopp</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="205"/>
+        <location filename="../core/libdivecomputer.c" line="226"/>
         <source>ceiling (safety stop)</source>
         <translation>ceiling (säkerhetsstopp)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="205"/>
-        <source>divetime</source>
-        <translation>dyktid</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="205"/>
+        <location filename="../core/libdivecomputer.c" line="226"/>
         <source>below floor</source>
         <comment>event showing dive is below deco floor and adding deco time</comment>
         <translation>under golv</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="353"/>
-        <location filename="../core/libdivecomputer.c" line="206"/>
-        <source>maxdepth</source>
-        <translation>Maxdjup</translation>
-    </message>
-    <message>
-        <location filename="../core/cochran.c" line="348"/>
-        <location filename="../core/libdivecomputer.c" line="206"/>
-        <source>OLF</source>
-        <translation>OLF</translation>
+        <location filename="../core/libdivecomputer.c" line="226"/>
+        <source>divetime</source>
+        <translation>dyktid</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="206"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
         <source>airtime</source>
         <translation>gastid</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="206"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
         <source>rgbm</source>
         <translation>rgbm</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="206"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
         <source>heading</source>
         <translation>riktning</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="358"/>
-        <location filename="../core/cochran.c" line="404"/>
-        <location filename="../core/libdivecomputer.c" line="206"/>
-        <source>pO₂</source>
-        <translation>pO₂</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="207"/>
+        <location filename="../core/libdivecomputer.c" line="228"/>
         <source>tissue level warning</source>
         <translation>vävnadsnivå</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="207"/>
+        <location filename="../core/libdivecomputer.c" line="228"/>
         <source>non stop time</source>
         <translation>non stop tid</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="224"/>
+        <location filename="../core/libdivecomputer.c" line="237"/>
         <source>invalid event number</source>
         <translation>okänt händelsenummer</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="658"/>
-        <source>Unable to create parser for %s %s</source>
-        <translation>Kan inte skapa parser för %s %s</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="664"/>
-        <source>Error registering the data</source>
-        <translation>Kunde inte registrera parser-data</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="495"/>
+        <location filename="../core/libdivecomputer.c" line="553"/>
         <source>Error parsing the datetime</source>
         <translation>Kunde inte tolka tid och datum</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="513"/>
+        <location filename="../core/libdivecomputer.c" line="571"/>
         <source>Dive %d: %s</source>
         <translation>Dyk #%d: %s</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="519"/>
+        <location filename="../core/libdivecomputer.c" line="577"/>
         <source>Error parsing the divetime</source>
         <translation>Kunde inte tolka dyktid</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="529"/>
+        <location filename="../core/libdivecomputer.c" line="587"/>
         <source>Error parsing the maxdepth</source>
         <translation>Kunde inte tolka maxdjup</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="548"/>
+        <location filename="../core/libdivecomputer.c" line="606"/>
         <source>Error parsing temperature</source>
         <translation>Misslyckas läsa temperatur</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="568"/>
+        <location filename="../core/libdivecomputer.c" line="626"/>
         <source>Error parsing the gas mix count</source>
         <translation>Kunde inte tolka antal gasblandningar</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="580"/>
+        <location filename="../core/libdivecomputer.c" line="638"/>
         <source>Error obtaining water salinity</source>
         <translation>Kunde inte ladda vattnets salthalt</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="589"/>
+        <location filename="../core/libdivecomputer.c" line="647"/>
         <source>Error obtaining surface pressure</source>
         <translation>Kunde inte få tag i tyck vid ytan</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="614"/>
+        <location filename="../core/libdivecomputer.c" line="672"/>
         <source>Error obtaining divemode</source>
         <translation>Misslyckades läsa dykläge</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="634"/>
+        <location filename="../core/libdivecomputer.c" line="692"/>
         <source>Error parsing the gas mix</source>
         <translation>Kunde inte tolka gasblandning</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="684"/>
+        <location filename="../core/libdivecomputer.c" line="717"/>
+        <source>Unable to create parser for %s %s</source>
+        <translation>Kan inte skapa parser för %s %s</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="723"/>
+        <source>Error registering the data</source>
+        <translation>Kunde inte registrera parser-data</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="744"/>
         <source>Error parsing the samples</source>
         <translation>Kunde inte tolka sampel</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="822"/>
+        <location filename="../core/libdivecomputer.c" line="882"/>
         <source>Event: waiting for user action</source>
         <translation>Händelse: väntar på användaren</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="830"/>
+        <location filename="../core/libdivecomputer.c" line="890"/>
         <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="../core/libdivecomputer.c" line="894"/>
+        <location filename="../core/libdivecomputer.c" line="954"/>
         <source>Error registering the event handler.</source>
         <translation>Kunde inte registrera event-funktion</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="899"/>
+        <location filename="../core/libdivecomputer.c" line="959"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Kunde inte registrera avbrytningsrutin</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="920"/>
+        <location filename="../core/libdivecomputer.c" line="980"/>
         <source>Dive data import error</source>
         <translation>Lyckades inte importera dykdata</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="959"/>
+        <location filename="../core/libdivecomputer.c" line="1019"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Kan inte skapa libdivecomputer context</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="966"/>
+        <location filename="../core/libdivecomputer.c" line="1026"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Kunde inte öppna fil %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="992"/>
+        <location filename="../core/libdivecomputer.c" line="1048"/>
         <source>Insufficient privileges to open the device %s %s (%s)</source>
         <translation>Otillräckliga rättigheter för att öppna enheten %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../core/parse-xml.c" line="517"/>
-        <source>Strange percentage reading %s
+        <location filename="../core/load-git.c" line="194"/>
+        <location filename="../core/parse-xml.c" line="1242"/>
+        <source>multiple GPS locations for this dive site; also %s
 </source>
-        <translation>Konstig procent läsning %s
+        <translation>multipla GPS positioner för denna dykplats; även %s
 </translation>
     </message>
     <message>
-        <location filename="../core/load-git.c" line="194"/>
-        <location filename="../core/parse-xml.c" line="1238"/>
-        <source>multiple GPS locations for this dive site; also %s
+        <location filename="../core/load-git.c" line="222"/>
+        <location filename="../core/parse-xml.c" line="1304"/>
+        <source>additional name for site: %s
 </source>
-        <translation>multipla GPS positioner för denna dykplats; även %s
+        <translation>alternativt namn för platsen: %s
+</translation>
+    </message>
+    <message>
+        <location filename="../core/ostctools.c" line="120"/>
+        <location filename="../core/ostctools.c" line="152"/>
+        <source>Unknown DC in dive %d</source>
+        <translation>Okänd dykdator i dyk %d</translation>
+    </message>
+    <message>
+        <location filename="../core/ostctools.c" line="165"/>
+        <source>Error - %s - parsing dive %d</source>
+        <translation>Fel - %s - vid läsning av dyk %d</translation>
+    </message>
+    <message>
+        <location filename="../core/parse-xml.c" line="517"/>
+        <source>Strange percentage reading %s
+</source>
+        <translation>Konstig procent läsning %s
 </translation>
     </message>
     <message>
-        <location filename="../core/parse-xml.c" line="2044"/>
+        <location filename="../core/parse-xml.c" line="2051"/>
         <source>Failed to parse &apos;%s&apos;</source>
         <translation>Kunde inte läsa &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../core/parse-xml.c" line="3741"/>
+        <location filename="../core/parse-xml.c" line="3774"/>
         <source>Can&apos;t open stylesheet %s</source>
         <translation>Kunde inte öppna formatmall %s</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="86"/>
-        <source>EAN%d</source>
-        <translation>EAN%d</translation>
+        <location filename="../core/planner.c" line="555"/>
+        <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE %s ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source>
+        <translation>VARNING: DET HÄR ÄR EN NY IMPLEMENTATION AV %s ALGORITMEN OCH EN DYKPLANERARE BASERAD PÅ DENNA. DEN HAR BARA FÅTT EN BEGRÄNSAD MÄNGD TESTNING. VI REKOMENDERAR STARKT ATT INTE PLANERA DYK ENBART BASERADE PÅ DEN INFORMATION SOM GES HÄR.</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="1032"/>
-        <location filename="../core/planner.c" line="1184"/>
-        <source>Can&apos;t find gas %s</source>
-        <translation>Kan inte hitta gas %s</translation>
+        <location filename="../core/planner.c" line="569"/>
+        <source>Decompression calculation aborted due to excessive time</source>
+        <translation>Dekompressionsberäkningarna avbröts för de tog för lång tid</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="368"/>
-        <source>Too many gas mixes</source>
-        <translation>För många gasblandningar</translation>
+        <location filename="../core/planner.c" line="571"/>
+        <location filename="../core/planner.c" line="829"/>
+        <location filename="../core/planner.c" line="834"/>
+        <location filename="../core/planner.c" line="860"/>
+        <location filename="../core/planner.c" line="870"/>
+        <source>Warning:</source>
+        <translation>Varning:</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="568"/>
-        <source>Decompression calculation aborted due to excessive time</source>
-        <translation>Dekompressionsberäkningarna avbröts för de tog för lång tid</translation>
+        <location filename="../core/planner.c" line="581"/>
+        <source>based on Bühlmann ZHL-16C with GFlow = %d and GFhigh = %d</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="586"/>
+        <source>based on VPM-B at nominal conservatism</source>
+        <translation>baserad på VPM-B med nominal konservatism</translation>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="588"/>
+        <source>based on VPM-B at +%d conservatism</source>
+        <translation>baserad på VPM-B med +%d konservatism</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="592"/>
+        <location filename="../core/planner.c" line="590"/>
+        <source>, effective GF=%d/%d</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="594"/>
+        <source>recreational mode based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source>
+        <translation>sportdykarversion baserad på Bühlmann ZHL-16B med GFlow = %d och GFhigh = %d</translation>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="598"/>
         <source>Subsurface dive plan</source>
         <translation>Subsurface dykplan</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="596"/>
-        <source>depth</source>
-        <translation>djup</translation>
+        <location filename="../core/planner.c" line="599"/>
+        <source>&lt;div&gt;Runtime: %dmin&lt;/div&gt;&lt;br&gt;</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="602"/>
-        <source>runtime</source>
-        <translation>körtid</translation>
+        <location filename="../core/planner.c" line="604"/>
+        <source>depth</source>
+        <translation>djup</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="599"/>
+        <location filename="../core/planner.c" line="607"/>
         <source>duration</source>
         <translation>varaktighet</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="554"/>
-        <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE %s ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source>
-        <translation>VARNING: DET HÄR ÄR EN NY IMPLEMENTATION AV %s ALGORITMEN OCH EN DYKPLANERARE BASERAD PÅ DENNA. DEN HAR BARA FÅTT EN BEGRÄNSAD MÄNGD TESTNING. VI REKOMENDERAR STARKT ATT INTE PLANERA DYK ENBART BASERADE PÅ DEN INFORMATION SOM GES HÄR.</translation>
+        <location filename="../core/planner.c" line="610"/>
+        <source>runtime</source>
+        <translation>körtid</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="605"/>
+        <location filename="../core/planner.c" line="613"/>
         <source>gas</source>
         <translation>gas</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="648"/>
+        <location filename="../core/planner.c" line="656"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation>Förflytta till %.*f %s på %d:%02d min - körtid %d:%02u på %s (SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="656"/>
+        <location filename="../core/planner.c" line="664"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source>
         <translation>Förflytta till %.*f %s på %d:%02d min - körtid %d:%02u på %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="669"/>
+        <location filename="../core/planner.c" line="677"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation>Stanna på %.*f %s i %d:%02d min - körtid %d:%02u på %s (SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="676"/>
+        <location filename="../core/planner.c" line="684"/>
         <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 - körtid %d:%02u på %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="721"/>
+        <location filename="../core/planner.c" line="729"/>
         <source>%3.0f%s</source>
         <translation>%3.0f%s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="724"/>
-        <location filename="../core/planner.c" line="728"/>
+        <location filename="../core/planner.c" line="732"/>
+        <location filename="../core/planner.c" line="736"/>
         <source>%3dmin</source>
         <translation>%3dmin</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="737"/>
-        <location filename="../core/planner.c" line="749"/>
+        <location filename="../core/planner.c" line="745"/>
+        <location filename="../core/planner.c" line="757"/>
         <source>(SP = %.1fbar)</source>
         <translation>(SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="772"/>
+        <location filename="../core/planner.c" line="780"/>
         <source>Switch gas to %s (SP = %.1fbar)</source>
         <translation>Byt gas till %s (SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="774"/>
+        <location filename="../core/planner.c" line="782"/>
         <source>Switch gas to %s</source>
         <translation>Byt gas till %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="793"/>
+        <location filename="../core/planner.c" line="801"/>
         <source>CNS</source>
         <translation>CNS</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="795"/>
+        <location filename="../core/planner.c" line="803"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="799"/>
+        <location filename="../core/planner.c" line="807"/>
         <source>Gas consumption (CCR legs excluded):</source>
         <translation>Gasförbrukning (CCR-delar exkluderade):</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="801"/>
+        <location filename="../core/planner.c" line="809"/>
         <source>Gas consumption:</source>
         <translation>Gasförbrukning:</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="570"/>
-        <location filename="../core/planner.c" line="821"/>
-        <location filename="../core/planner.c" line="826"/>
-        <location filename="../core/planner.c" line="851"/>
-        <location filename="../core/planner.c" line="861"/>
-        <source>Warning:</source>
-        <translation>Varning:</translation>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="580"/>
-        <source>based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source>
-        <translation>baserad på Bühlmann ZHL-16B med GFlow = %d och GFhigh = %d</translation>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="584"/>
-        <source>based on VPM-B at nominal conservatism</source>
-        <translation>baserad på VPM-B med nominal konservatism</translation>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="586"/>
-        <source>based on VPM-B at +%d conservatism</source>
-        <translation>baserad på VPM-B med +%d konservatism</translation>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="588"/>
-        <source>recreational mode based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source>
-        <translation>sportdykarversion baserad på Bühlmann ZHL-16B med GFlow = %d och GFhigh = %d</translation>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="822"/>
+        <location filename="../core/planner.c" line="830"/>
         <source>this is more gas than available in the specified cylinder!</source>
         <translation>det här är mer gas än vad som finns tillgängligt i angiven cylinder!</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="827"/>
+        <location filename="../core/planner.c" line="835"/>
         <source>not enough reserve for gas sharing on ascent!</source>
         <translation>inte nog med reserver för att kunna dela gas under uppstigningen!</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="829"/>
+        <location filename="../core/planner.c" line="837"/>
         <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source>
         <translation>%.0f%s/%.0f%s av %s (%.0f%s/%.0f%s vid planerad uppstigning)</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="831"/>
+        <location filename="../core/planner.c" line="839"/>
         <source>%.0f%s (%.0f%s during planned ascent) of %s</source>
         <translation>%.0f%s (%.0f%s under planerad uppstigning) av %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="848"/>
+        <location filename="../core/planner.c" line="857"/>
         <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
         <translation>högt pO₂ %.2f vid %d:%02u med gas %s på djup %.*f %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="858"/>
+        <location filename="../core/planner.c" line="867"/>
         <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
         <translation>lågt pO₂ värde %.2f vid %d:%02u med gas %s på djup %.*f %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="1419"/>
+        <location filename="../core/planner.c" line="1194"/>
+        <source>Can&apos;t find gas %s</source>
+        <translation>Kan inte hitta gas %s</translation>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="1440"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1280"/>
+        <location filename="../core/profile.c" line="1298"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
@@ -9260,70 +9783,70 @@ D: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1283"/>
+        <location filename="../core/profile.c" line="1301"/>
         <source>P: %d%s
 </source>
         <translation>P: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1287"/>
+        <location filename="../core/profile.c" line="1305"/>
         <source>T: %.1f%s
 </source>
         <translation>T: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1293"/>
+        <location filename="../core/profile.c" line="1311"/>
         <source>V: %.1f%s
 </source>
         <translation>V: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1296"/>
+        <location filename="../core/profile.c" line="1314"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation>SAC: %.*f%s/min
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1298"/>
+        <location filename="../core/profile.c" line="1316"/>
         <source>CNS: %u%%
 </source>
         <translation>CNS: %u%%
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1300"/>
+        <location filename="../core/profile.c" line="1318"/>
         <source>pO%s: %.2fbar
 </source>
         <translation>pO%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1302"/>
+        <location filename="../core/profile.c" line="1320"/>
         <source>pN%s: %.2fbar
 </source>
         <translation>pN%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1304"/>
+        <location filename="../core/profile.c" line="1322"/>
         <source>pHe: %.2fbar
 </source>
         <translation>pHe: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1307"/>
+        <location filename="../core/profile.c" line="1325"/>
         <source>MOD: %d%s
 </source>
         <translation>MOD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1314"/>
+        <location filename="../core/profile.c" line="1332"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
@@ -9332,7 +9855,7 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1318"/>
+        <location filename="../core/profile.c" line="1336"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
@@ -9341,174 +9864,179 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1331"/>
+        <location filename="../core/profile.c" line="1349"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation>Säkerhetsstopp: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1334"/>
+        <location filename="../core/profile.c" line="1352"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation>Säkerhetsstopp: okänd tid @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1339"/>
+        <location filename="../core/profile.c" line="1357"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation>Deko: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1342"/>
+        <location filename="../core/profile.c" line="1360"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation>Deko: okänd tid @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1346"/>
+        <location filename="../core/profile.c" line="1364"/>
         <source>In deco
 </source>
         <translation>I Deko
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1348"/>
+        <location filename="../core/profile.c" line="1366"/>
         <source>NDL: %umin
 </source>
         <translation>NDL: %umin
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1351"/>
+        <location filename="../core/profile.c" line="1369"/>
         <source>TTS: %umin
 </source>
         <translation>TTS: %umin
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1354"/>
+        <location filename="../core/profile.c" line="1372"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation>Deko: %umin @ %.0f%s (calc)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1362"/>
+        <location filename="../core/profile.c" line="1380"/>
         <source>In deco (calc)
 </source>
         <translation>I deko (calc)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1365"/>
+        <location filename="../core/profile.c" line="1383"/>
         <source>NDL: %umin (calc)
 </source>
         <translation>NDL: %umin (calc)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1367"/>
+        <location filename="../core/profile.c" line="1385"/>
         <source>NDL: &gt;2h (calc)
 </source>
         <translation>NDL: &gt;2h (beräknad)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1371"/>
+        <location filename="../core/profile.c" line="1389"/>
         <source>TTS: %umin (calc)
 </source>
         <translation>TTS: %umin (calc)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1373"/>
+        <location filename="../core/profile.c" line="1391"/>
         <source>TTS: &gt;2h (calc)
 </source>
         <translation>TTS: &gt;2h (beräknad)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1376"/>
+        <location filename="../core/profile.c" line="1394"/>
         <source>RBT: %umin
 </source>
         <translation>RBT: %umin
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1379"/>
+        <location filename="../core/profile.c" line="1397"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation>Beräknat tak %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1385"/>
+        <location filename="../core/profile.c" line="1403"/>
         <source>Tissue %.0fmin: %.1f%s
 </source>
         <translation>Vävnad %.0fmin: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1391"/>
+        <location filename="../core/profile.c" line="1409"/>
         <source>heartbeat: %d
 </source>
         <translation>hjärtrytm: %d
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1393"/>
+        <location filename="../core/profile.c" line="1411"/>
         <source>bearing: %d
 </source>
         <translation>kurs: %d
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1396"/>
+        <location filename="../core/profile.c" line="1414"/>
         <source>mean depth to here %.1f%s
 </source>
         <translation>medeldjup fram tills hit %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1491"/>
+        <location filename="../core/profile.c" line="1515"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1495"/>
-        <location filename="../core/profile.c" line="1499"/>
-        <location filename="../core/profile.c" line="1503"/>
+        <location filename="../core/profile.c" line="1519"/>
+        <location filename="../core/profile.c" line="1523"/>
+        <location filename="../core/profile.c" line="1527"/>
         <source>%s %sD:%.1f%s</source>
         <translation>%s %sD:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1507"/>
+        <location filename="../core/profile.c" line="1531"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sD:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1511"/>
+        <location filename="../core/profile.c" line="1535"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1515"/>
-        <location filename="../core/profile.c" line="1519"/>
+        <location filename="../core/profile.c" line="1539"/>
+        <location filename="../core/profile.c" line="1543"/>
         <source>%s %sV:%.2f%s</source>
         <translation>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1526"/>
+        <location filename="../core/profile.c" line="1550"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s</translation>
     </message>
     <message>
+        <location filename="../core/profile.c" line="1575"/>
+        <source>%s SAC:%.*f %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../core/qthelper.cpp" line="67"/>
         <source>%1km</source>
         <translation>%1km</translation>
@@ -9529,446 +10057,460 @@ EADD: %d%s
         <translation>%1yd</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="635"/>
+        <location filename="../core/qthelper.cpp" line="91"/>
+        <location filename="../core/qthelper.cpp" line="226"/>
+        <source>N</source>
+        <translation>N</translation>
+    </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="91"/>
+        <location filename="../core/qthelper.cpp" line="227"/>
+        <source>S</source>
+        <translation>S</translation>
+    </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="92"/>
+        <location filename="../core/qthelper.cpp" line="228"/>
+        <source>E</source>
+        <translation>E</translation>
+    </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="92"/>
+        <location filename="../core/qthelper.cpp" line="229"/>
+        <source>W</source>
+        <translation>W</translation>
+    </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="640"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="638"/>
+        <location filename="../core/qthelper.cpp" line="643"/>
         <source>F</source>
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="23"/>
-        <source>boat</source>
-        <translation>båt</translation>
+        <location filename="../core/save-html.c" line="469"/>
+        <location filename="../core/save-html.c" line="553"/>
+        <location filename="../core/worldmap-save.c" line="111"/>
+        <source>Can&apos;t open file %s</source>
+        <translation>Kan inte öppna fil %s</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="23"/>
-        <source>shore</source>
-        <translation>strand</translation>
+        <location filename="../core/save-html.c" line="488"/>
+        <source>Number</source>
+        <translation>Nummer</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="459"/>
-        <location filename="../core/dive.c" line="23"/>
-        <source>drift</source>
-        <translation>ström</translation>
+        <location filename="../core/save-html.c" line="489"/>
+        <source>Date</source>
+        <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="24"/>
-        <source>deep</source>
-        <translation>djup</translation>
+        <location filename="../core/save-html.c" line="490"/>
+        <source>Time</source>
+        <translation>Tid</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="24"/>
-        <source>cavern</source>
-        <translation>cavern</translation>
+        <location filename="../core/save-html.c" line="491"/>
+        <source>Location</source>
+        <translation>Plats</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="443"/>
-        <location filename="../core/dive.c" line="24"/>
-        <source>ice</source>
-        <translation>is</translation>
+        <location filename="../core/save-html.c" line="492"/>
+        <source>Air temp.</source>
+        <translation>Lufttemp</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="445"/>
-        <source>search</source>
-        <translation>sök</translation>
+        <location filename="../core/save-html.c" line="493"/>
+        <source>Water temp.</source>
+        <translation>Vattentemperatur</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="455"/>
-        <location filename="../core/dive.c" line="25"/>
-        <source>wreck</source>
-        <translation>vrak</translation>
+        <location filename="../core/save-html.c" line="494"/>
+        <source>Dives</source>
+        <translation>Dyk</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="441"/>
-        <location filename="../core/dive.c" line="25"/>
-        <source>cave</source>
-        <translation>grotta</translation>
+        <location filename="../core/save-html.c" line="495"/>
+        <source>Expand all</source>
+        <translation>Expandera alla</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="25"/>
-        <source>altitude</source>
-        <translation>höjd</translation>
+        <location filename="../core/save-html.c" line="496"/>
+        <source>Collapse all</source>
+        <translation>Sammanslå alla</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="26"/>
-        <source>pool</source>
-        <translation>pool</translation>
+        <location filename="../core/save-html.c" line="497"/>
+        <source>Trips</source>
+        <translation>Resor</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="26"/>
-        <source>lake</source>
-        <translation>sjö</translation>
+        <location filename="../core/save-html.c" line="498"/>
+        <source>Statistics</source>
+        <translation>Statistik</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="457"/>
-        <location filename="../core/dive.c" line="26"/>
-        <source>river</source>
-        <translation>älv</translation>
+        <location filename="../core/save-html.c" line="499"/>
+        <source>Advanced search</source>
+        <translation>Avancerad sökning</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="439"/>
-        <location filename="../core/dive.c" line="27"/>
-        <source>night</source>
-        <translation>natt</translation>
+        <location filename="../core/save-html.c" line="502"/>
+        <source>Rating</source>
+        <translation>Rankning</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="153"/>
-        <source>Error: the file does not appear to be a DATATRAK divelog</source>
-        <translation>Fel: filen verkar inte vara någon DATATRAK dykkogg</translation>
+        <location filename="../core/save-html.c" line="503"/>
+        <source>Visibility</source>
+        <translation>Synlighet</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="286"/>
-        <source>clear</source>
-        <translation>klart</translation>
+        <location filename="../core/save-html.c" line="504"/>
+        <source>Duration</source>
+        <translation>Varaktighet</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="289"/>
-        <source>misty</source>
-        <translation>disigt</translation>
+        <location filename="../core/save-html.c" line="505"/>
+        <source>Divemaster</source>
+        <translation>Divemaster</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="292"/>
-        <source>fog</source>
-        <translation>dimma</translation>
+        <location filename="../core/save-html.c" line="506"/>
+        <source>Buddy</source>
+        <translation>Parkamrat</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="295"/>
-        <source>rain</source>
-        <translation>regn</translation>
+        <location filename="../core/save-html.c" line="507"/>
+        <source>Suit</source>
+        <translation>Dräkt</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="298"/>
-        <source>storm</source>
-        <translation>storm</translation>
+        <location filename="../core/save-html.c" line="508"/>
+        <source>Tags</source>
+        <translation>Taggar</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="301"/>
-        <source>snow</source>
-        <translation>snö</translation>
+        <location filename="../core/save-html.c" line="509"/>
+        <location filename="../smtk-import/smartrak.c" line="251"/>
+        <location filename="../smtk-import/smartrak.c" line="321"/>
+        <source>Notes</source>
+        <translation>Anteckningar</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="321"/>
-        <source>No suit</source>
-        <translation>Ingen dräkt</translation>
+        <location filename="../core/save-html.c" line="510"/>
+        <source>Show more details</source>
+        <translation>Visa mer deltaljer</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="324"/>
-        <source>Shorty</source>
-        <translation>Shorty</translation>
+        <location filename="../core/save-html.c" line="513"/>
+        <source>Yearly statistics</source>
+        <translation>Årsstatistik</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="327"/>
-        <source>Combi</source>
-        <translation>Kombi</translation>
+        <location filename="../core/save-html.c" line="514"/>
+        <source>Year</source>
+        <translation>År</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="330"/>
-        <source>Wet suit</source>
-        <translation>Våtdräkt</translation>
+        <location filename="../core/save-html.c" line="515"/>
+        <source>Total time</source>
+        <translation>Total tid</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="333"/>
-        <source>Semidry suit</source>
-        <translation>Semidrydräkt</translation>
+        <location filename="../core/save-html.c" line="516"/>
+        <source>Average time</source>
+        <translation>Genomsnittlig tid</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="336"/>
-        <source>Dry suit</source>
-        <translation>Torrdräkt</translation>
+        <location filename="../core/save-html.c" line="517"/>
+        <source>Shortest time</source>
+        <translation>Kortaste tid</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="396"/>
-        <source>no stop</source>
-        <translation>no stop</translation>
+        <location filename="../core/save-html.c" line="518"/>
+        <source>Longest time</source>
+        <translation>Längsta tid</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="400"/>
-        <source>single ascent</source>
-        <translation>enkel uppstigning</translation>
+        <location filename="../core/save-html.c" line="519"/>
+        <source>Average depth</source>
+        <translation>Genomsnittligt djup</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="402"/>
-        <source>multiple ascent</source>
-        <translation>multipla uppstigningar</translation>
+        <location filename="../core/save-html.c" line="520"/>
+        <source>Min. depth</source>
+        <translation>Minsta. ljup</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="404"/>
-        <location filename="../core/dive.c" line="27"/>
-        <source>fresh</source>
-        <translation>färsk</translation>
+        <location filename="../core/save-html.c" line="521"/>
+        <source>Max. depth</source>
+        <translation>Maxdjup</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="406"/>
-        <source>salt water</source>
-        <translation>salt vatten</translation>
+        <location filename="../core/save-html.c" line="522"/>
+        <source>Average SAC</source>
+        <translation>Genomsnittlig SAC</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="431"/>
-        <source>sight seeing</source>
-        <translation>sightseeing</translation>
+        <location filename="../core/save-html.c" line="523"/>
+        <source>Min. SAC</source>
+        <translation>Minsta. SAC</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="433"/>
-        <source>club dive</source>
-        <translation>klubbdyk</translation>
+        <location filename="../core/save-html.c" line="524"/>
+        <source>Max. SAC</source>
+        <translation>Största. SAC</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="437"/>
-        <source>instruction</source>
-        <translation>instruktion</translation>
+        <location filename="../core/save-html.c" line="525"/>
+        <source>Average temp.</source>
+        <translation>Genomsnittlig temp.</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="463"/>
-        <source>other</source>
-        <translation>Övrigt</translation>
+        <location filename="../core/save-html.c" line="526"/>
+        <source>Min. temp.</source>
+        <translation>Minsta temp.</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="474"/>
-        <source>Other activities</source>
-        <translation>Andra aktiviteter</translation>
+        <location filename="../core/save-html.c" line="527"/>
+        <source>Max. temp.</source>
+        <translation>Största temp.</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="498"/>
-        <source>Datatrak/Wlog notes</source>
-        <translation>Datatrak/Wlog anteckningar</translation>
+        <location filename="../core/save-html.c" line="528"/>
+        <source>Back to list</source>
+        <translation>Tillbaka till listan</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="537"/>
-        <source>Manually entered dive</source>
-        <translation>Manuellt inlagdt dyk</translation>
+        <location filename="../core/save-html.c" line="531"/>
+        <source>Dive No.</source>
+        <translation>Dyknumer</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="588"/>
-        <source>Unknown</source>
-        <translation>okänd</translation>
+        <location filename="../core/save-html.c" line="532"/>
+        <source>Dive profile</source>
+        <translation>Dykprofil</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="674"/>
-        <source>Error: couldn&apos;t open the file %s</source>
-        <translation>Fel: kunde inte öppna filen %s</translation>
+        <location filename="../core/save-html.c" line="533"/>
+        <source>Dive information</source>
+        <translation>Dykinformation</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="687"/>
-        <source>Error: no dive</source>
-        <translation>Fel: inget dyk</translation>
+        <location filename="../core/save-html.c" line="534"/>
+        <source>Dive equipment</source>
+        <translation>Dykutrustning</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="27"/>
-        <source>student</source>
-        <translation>student</translation>
+        <location filename="../core/save-html.c" line="535"/>
+        <location filename="../core/save-html.c" line="542"/>
+        <source>Type</source>
+        <translation>Typ</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="461"/>
-        <location filename="../core/dive.c" line="28"/>
-        <source>photo</source>
-        <translation>foto</translation>
+        <location filename="../core/save-html.c" line="536"/>
+        <source>Size</source>
+        <translation>Storlek</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="28"/>
-        <source>video</source>
-        <translation>video</translation>
+        <location filename="../core/save-html.c" line="537"/>
+        <source>Work pressure</source>
+        <translation>Arbetstryck</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="435"/>
-        <location filename="../core/dive.c" line="28"/>
-        <source>instructor</source>
-        <translation>Instruktör</translation>
+        <location filename="../core/save-html.c" line="538"/>
+        <source>Start pressure</source>
+        <translation>Starttryck</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="398"/>
-        <location filename="../core/dive.c" line="29"/>
-        <source>deco</source>
-        <translation>deko</translation>
+        <location filename="../core/save-html.c" line="539"/>
+        <source>End pressure</source>
+        <translation>Sluttryck</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="33"/>
-        <source>OC-gas</source>
-        <translation>OC-gas</translation>
+        <location filename="../core/save-html.c" line="540"/>
+        <source>Gas</source>
+        <translation>Gas</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="33"/>
-        <source>diluent</source>
-        <translation>diluent</translation>
+        <location filename="../core/save-html.c" line="541"/>
+        <source>Weight</source>
+        <translation>Vikt</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="33"/>
-        <location filename="../core/equipment.c" line="88"/>
-        <location filename="../core/planner.c" line="1415"/>
-        <location filename="../core/planner.c" line="1418"/>
-        <source>oxygen</source>
-        <translation>oxygen</translation>
+        <location filename="../core/save-html.c" line="543"/>
+        <source>Events</source>
+        <translation>Händelser</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="227"/>
-        <source>ℓ</source>
-        <translation>ℓ</translation>
+        <location filename="../core/save-html.c" line="544"/>
+        <source>Name</source>
+        <translation>Namn</translation>
+    </message>
+    <message>
+        <location filename="../core/save-html.c" line="545"/>
+        <source>Value</source>
+        <translation>Värde</translation>
+    </message>
+    <message>
+        <location filename="../core/save-html.c" line="546"/>
+        <source>Coordinates</source>
+        <translation>Koordinater</translation>
+    </message>
+    <message>
+        <location filename="../core/save-html.c" line="547"/>
+        <source>Dive status</source>
+        <translation>Dykstatus</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="239"/>
+        <location filename="../core/statistics.c" line="242"/>
         <source>more than %d days</source>
         <translation>mer än %d dagar</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="246"/>
+        <location filename="../core/statistics.c" line="249"/>
         <source>%dd %dh %dmin</source>
         <translation>%dd %dt %dmin</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="249"/>
+        <location filename="../core/statistics.c" line="252"/>
         <source>%dmin %dsecs</source>
         <translation>%dmin %dsek</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="251"/>
+        <location filename="../core/statistics.c" line="254"/>
         <source>%dh %dmin</source>
         <translation>%dt %dmin</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="263"/>
+        <location filename="../core/statistics.c" line="266"/>
         <source>for dives #</source>
         <translation>för dykningar #</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="269"/>
+        <location filename="../core/statistics.c" line="272"/>
         <source>for selected dives</source>
         <translation>för utvalda dyk</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="304"/>
+        <location filename="../core/statistics.c" line="307"/>
         <source>for dive #%d</source>
         <translation>Dyk #%d </translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="306"/>
+        <location filename="../core/statistics.c" line="309"/>
         <source>for selected dive</source>
         <translation>för valt dyk</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="308"/>
+        <location filename="../core/statistics.c" line="311"/>
         <source>for all dives</source>
         <translation>för alla dyk</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="310"/>
+        <location filename="../core/statistics.c" line="313"/>
         <source>(no dives)</source>
         <translation>(inga dyk)</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Sun</source>
         <translation>sön</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Mon</source>
         <translation>mån</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Tue</source>
         <translation>tis</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Wed</source>
         <translation>ons</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Thu</source>
         <translation>tor</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Fri</source>
         <translation>fre</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Sat</source>
         <translation>lör</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Jan</source>
         <translation>jan</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Feb</source>
         <translation>feb</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Mar</source>
         <translation>mar</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Apr</source>
         <translation>apr</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>May</source>
         <translation>maj</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Jun</source>
         <translation>jun</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Jul</source>
         <translation>jul</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Aug</source>
         <translation>aug</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Sep</source>
         <translation>sep</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Oct</source>
         <translation>okt</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Nov</source>
         <translation>nov</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Dec</source>
         <translation>dec</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="191"/>
-        <location filename="../core/parse-xml.c" line="3284"/>
-        <location filename="../core/uemis-downloader.c" line="134"/>
-        <source>unknown</source>
-        <translation>okänd</translation>
-    </message>
-    <message>
-        <location filename="../core/uemis-downloader.c" line="467"/>
-        <source>data</source>
-        <translation>data</translation>
-    </message>
-    <message>
-        <location filename="../core/uemis-downloader.c" line="447"/>
-        <source>%s %s</source>
-        <translation>%s %s</translation>
-    </message>
-    <message>
         <location filename="../core/uemis-downloader.c" line="27"/>
         <source>Uemis Zurich: the file system is almost full.
 Disconnect/reconnect the dive computer
@@ -9999,6 +10541,16 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation>Inga dyk att ladda ner</translation>
     </message>
     <message>
+        <location filename="../core/uemis-downloader.c" line="447"/>
+        <source>%s %s</source>
+        <translation>%s %s</translation>
+    </message>
+    <message>
+        <location filename="../core/uemis-downloader.c" line="467"/>
+        <source>data</source>
+        <translation>data</translation>
+    </message>
+    <message>
         <location filename="../core/uemis-downloader.c" line="495"/>
         <source>divelog #</source>
         <translation>dyklogg #</translation>
@@ -10169,281 +10721,6 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation>Lågt batteri varsel</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="469"/>
-        <location filename="../core/save-html.c" line="553"/>
-        <location filename="../core/worldmap-save.c" line="111"/>
-        <source>Can&apos;t open file %s</source>
-        <translation>Kan inte öppna fil %s</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="488"/>
-        <source>Number</source>
-        <translation>Nummer</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="489"/>
-        <source>Date</source>
-        <translation>Datum</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="490"/>
-        <source>Time</source>
-        <translation>Tid</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="491"/>
-        <source>Location</source>
-        <translation>Plats</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="492"/>
-        <source>Air temp.</source>
-        <translation>Lufttemp</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="493"/>
-        <source>Water temp.</source>
-        <translation>Vattentemperatur</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="498"/>
-        <source>Statistics</source>
-        <translation>Statistik</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="502"/>
-        <source>Rating</source>
-        <translation>Rankning</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="503"/>
-        <source>Visibility</source>
-        <translation>Synlighet</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="504"/>
-        <source>Duration</source>
-        <translation>Varaktighet</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="494"/>
-        <source>Dives</source>
-        <translation>Dyk</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="495"/>
-        <source>Expand all</source>
-        <translation>Expandera alla</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="496"/>
-        <source>Collapse all</source>
-        <translation>Sammanslå alla</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="497"/>
-        <source>Trips</source>
-        <translation>Resor</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="499"/>
-        <source>Advanced search</source>
-        <translation>Avancerad sökning</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="505"/>
-        <source>Divemaster</source>
-        <translation>Divemaster</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="506"/>
-        <source>Buddy</source>
-        <translation>Parkamrat</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="507"/>
-        <source>Suit</source>
-        <translation>Dräkt</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="508"/>
-        <source>Tags</source>
-        <translation>Taggar</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="509"/>
-        <location filename="../smtk-import/smartrak.c" line="251"/>
-        <location filename="../smtk-import/smartrak.c" line="321"/>
-        <source>Notes</source>
-        <translation>Anteckningar</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="510"/>
-        <source>Show more details</source>
-        <translation>Visa mer deltaljer</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="513"/>
-        <source>Yearly statistics</source>
-        <translation>Årsstatistik</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="514"/>
-        <source>Year</source>
-        <translation>År</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="515"/>
-        <source>Total time</source>
-        <translation>Total tid</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="516"/>
-        <source>Average time</source>
-        <translation>Genomsnittlig tid</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="517"/>
-        <source>Shortest time</source>
-        <translation>Kortaste tid</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="518"/>
-        <source>Longest time</source>
-        <translation>Längsta tid</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="519"/>
-        <source>Average depth</source>
-        <translation>Genomsnittligt djup</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="520"/>
-        <source>Min. depth</source>
-        <translation>Minsta. ljup</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="521"/>
-        <source>Max. depth</source>
-        <translation>Maxdjup</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="523"/>
-        <source>Min. SAC</source>
-        <translation>Minsta. SAC</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="524"/>
-        <source>Max. SAC</source>
-        <translation>Största. SAC</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="525"/>
-        <source>Average temp.</source>
-        <translation>Genomsnittlig temp.</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="526"/>
-        <source>Min. temp.</source>
-        <translation>Minsta temp.</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="527"/>
-        <source>Max. temp.</source>
-        <translation>Största temp.</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="528"/>
-        <source>Back to list</source>
-        <translation>Tillbaka till listan</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="534"/>
-        <source>Dive equipment</source>
-        <translation>Dykutrustning</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="537"/>
-        <source>Work pressure</source>
-        <translation>Arbetstryck</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="538"/>
-        <source>Start pressure</source>
-        <translation>Starttryck</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="539"/>
-        <source>End pressure</source>
-        <translation>Sluttryck</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="547"/>
-        <source>Dive status</source>
-        <translation>Dykstatus</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="522"/>
-        <source>Average SAC</source>
-        <translation>Genomsnittlig SAC</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="531"/>
-        <source>Dive No.</source>
-        <translation>Dyknumer</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="532"/>
-        <source>Dive profile</source>
-        <translation>Dykprofil</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="533"/>
-        <source>Dive information</source>
-        <translation>Dykinformation</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="535"/>
-        <location filename="../core/save-html.c" line="542"/>
-        <source>Type</source>
-        <translation>Typ</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="536"/>
-        <source>Size</source>
-        <translation>Storlek</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="540"/>
-        <source>Gas</source>
-        <translation>Gas</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="541"/>
-        <source>Weight</source>
-        <translation>Vikt</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="543"/>
-        <source>Events</source>
-        <translation>Händelser</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="544"/>
-        <source>Name</source>
-        <translation>Namn</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="545"/>
-        <source>Value</source>
-        <translation>Värde</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="546"/>
-        <source>Coordinates</source>
-        <translation>Koordinater</translation>
-    </message>
-    <message>
         <location filename="../core/worldmap-save.c" line="39"/>
         <source>Date:</source>
         <translation>Datum:</translation>
@@ -10489,110 +10766,6 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation>Anteckningar:</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="91"/>
-        <location filename="../core/qthelper.cpp" line="226"/>
-        <source>N</source>
-        <translation>N</translation>
-    </message>
-    <message>
-        <location filename="../core/qthelper.cpp" line="91"/>
-        <location filename="../core/qthelper.cpp" line="227"/>
-        <source>S</source>
-        <translation>S</translation>
-    </message>
-    <message>
-        <location filename="../core/qthelper.cpp" line="92"/>
-        <location filename="../core/qthelper.cpp" line="228"/>
-        <source>E</source>
-        <translation>E</translation>
-    </message>
-    <message>
-        <location filename="../core/qthelper.cpp" line="92"/>
-        <location filename="../core/qthelper.cpp" line="229"/>
-        <source>W</source>
-        <translation>W</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="341"/>
-        <source>Remote storage and local data diverged. Error: merge failed (%s)</source>
-        <translation>Extern lagring och lokal data separerade. Fel: sammanfogning misslyckades (%s)</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="134"/>
-        <source>Local cache directory %s corrupted - can&apos;t sync with Subsurface cloud storage</source>
-        <translation>Lokal cache katalog %s är trasig - kan inte synkronisera med Subsurface molnlagring</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="157"/>
-        <location filename="../core/git-access.c" line="177"/>
-        <source>Could not update local cache to newer remote data</source>
-        <translation>Kunde inte uppdatera lokal cache med nyare extern data</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="170"/>
-        <source>Subsurface cloud storage corrupted</source>
-        <translation>Subsurface molnlagring skadades</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="285"/>
-        <source>Could not update Subsurface cloud storage, try again later</source>
-        <translation>Kunde inte uppdatera Subsurface molnlagring, försök igen senare</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="371"/>
-        <source>Remote storage and local data diverged. Cannot combine local and remote changes</source>
-        <translation>Extern lagring och lokal data separerade. Kan inte kombinera lokala och externa ändringar</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="405"/>
-        <source>Remote storage and local data diverged</source>
-        <translation>Extern lagring och lokal data separerade</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="408"/>
-        <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source>
-        <translation>Extern lagring och lokal data separerade. Fel: skrivning av data misslyckades (%s)</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="417"/>
-        <source>Problems with local cache of Subsurface cloud data</source>
-        <translation>Problem med lokal cache av Subsurface molndata</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="418"/>
-        <source>Moved cache data to %s. Please try the operation again.</source>
-        <translation>Flyttade cache data till %s. Vänligen försök igen.</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="737"/>
-        <source>Error connecting to Subsurface cloud storage</source>
-        <translation>Fel på uppkopplingen mot Subsurface molntjänst</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="740"/>
-        <source>git clone of %s failed (%s)</source>
-        <translation>git clone av %s misslyckades (%s)</translation>
-    </message>
-    <message>
-        <location filename="../core/load-git.c" line="222"/>
-        <location filename="../core/parse-xml.c" line="1300"/>
-        <source>additional name for site: %s
-</source>
-        <translation>alternativt namn för platsen: %s
-</translation>
-    </message>
-    <message>
-        <location filename="../core/ostctools.c" line="120"/>
-        <location filename="../core/ostctools.c" line="152"/>
-        <source>Unknown DC in dive %d</source>
-        <translation>Okänd dykdator i dyk %d</translation>
-    </message>
-    <message>
-        <location filename="../core/ostctools.c" line="165"/>
-        <source>Error - %s - parsing dive %d</source>
-        <translation>Fel - %s - vid läsning av dyk %d</translation>
-    </message>
-    <message>
         <location filename="../smtk-import/smartrak.c" line="247"/>
         <source>Built</source>
         <translation>Byggd</translation>
@@ -10676,117 +10849,117 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation>Subsurface-mobile</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="91"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="103"/>
         <source>Subsurface</source>
         <translation>Subsurface</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="97"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="110"/>
         <source>Dive list</source>
         <translation>Dyklista</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="112"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="125"/>
         <source>Cloud credentials</source>
         <translation>Moln referenser</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="126"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="139"/>
         <source>Manage dives</source>
         <translation>Hantera dyk</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="138"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="141"/>
         <source>Add dive manually</source>
         <translation>Lägg till dyk manuellt</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="146"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="149"/>
         <source>Manual sync with cloud</source>
         <translation>Manuellt synkronisera med molnet</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="164"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="167"/>
         <source>Offline mode</source>
         <translation>Ouppkopplat läge</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="164"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="167"/>
         <source>Enable auto cloud sync</source>
         <translation>Aktivera automatisk molnsynkronisering</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="182"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="187"/>
         <source>GPS</source>
         <translation>GPS</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="185"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="190"/>
         <source>GPS-tag dives</source>
         <translation>GPS-tagga dyk</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="192"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="197"/>
         <source>Upload GPS data</source>
         <translation>Ladda upp GPS data</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="199"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="204"/>
         <source>Download GPS data</source>
         <translation>Ladda ner GPS data</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="206"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="211"/>
         <source>Show GPS fixes</source>
         <translation>Visa GPS position</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="215"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="220"/>
         <source>Clear GPS cache</source>
         <translation>Rensa GPS cache</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="221"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="226"/>
         <source>Preferences</source>
         <translation>Inställningar</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="230"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="237"/>
         <source>Developer</source>
         <translation>Utvecklare</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="232"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="239"/>
         <source>App log</source>
         <translation>App logg</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="239"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="246"/>
         <source>Theme information</source>
         <translation>Tema information</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="246"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="253"/>
         <source>User manual</source>
         <translation>Användarmanual</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="252"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="259"/>
         <source>About</source>
         <translation>Om</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="283"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="304"/>
         <source>Run location service</source>
         <translation>Kör positions tjänst</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="283"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="304"/>
         <source>No GPS source available</source>
         <translation>Inga GPS källor tillgängliga</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="295"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="316"/>
         <source>Actions</source>
         <translation>Händelser</translation>
     </message>
@@ -10867,6 +11040,24 @@ p, li { white-space: pre-wrap; }
         <translation>m/min</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="121"/>
+        <location filename="../build/ui_plannerSettings.h" line="425"/>
+        <source>75% to 50% avg. depth</source>
+        <translation>75% till 50% av snittdjup</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="138"/>
+        <location filename="../build/ui_plannerSettings.h" line="427"/>
+        <source>50% avg. depth to 6m</source>
+        <translation>50% av snittdjup till 6m</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="155"/>
+        <location filename="../build/ui_plannerSettings.h" line="429"/>
+        <source>6m to surface</source>
+        <translation>6m till ytan</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="175"/>
         <location filename="../build/ui_plannerSettings.h" line="431"/>
         <source>Descent</source>
@@ -10890,12 +11081,35 @@ p, li { white-space: pre-wrap; }
         <translation>VPM-B</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="268"/>
+        <source>Bühlmann deco</source>
+        <translation>Bühlmann deco</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="278"/>
         <location filename="../build/ui_plannerSettings.h" line="445"/>
         <source>Reserve gas</source>
         <translation>Gasreserv</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="288"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="549"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="578"/>
+        <location filename="../build/ui_plannerSettings.h" line="446"/>
+        <location filename="../build/ui_plannerSettings.h" line="459"/>
+        <location filename="../build/ui_plannerSettings.h" line="461"/>
+        <source>bar</source>
+        <translation>bar</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="307"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="416"/>
+        <location filename="../build/ui_plannerSettings.h" line="437"/>
+        <location filename="../build/ui_plannerSettings.h" line="440"/>
+        <source>%</source>
+        <translation>%</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="320"/>
         <location filename="../build/ui_plannerSettings.h" line="449"/>
         <source>Postpone gas change if a stop is not required</source>
@@ -10914,12 +11128,10 @@ p, li { white-space: pre-wrap; }
         <translation>GF low</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="307"/>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="416"/>
-        <location filename="../build/ui_plannerSettings.h" line="437"/>
-        <location filename="../build/ui_plannerSettings.h" line="440"/>
-        <source>%</source>
-        <translation>%</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="353"/>
+        <location filename="../build/ui_plannerSettings.h" line="436"/>
+        <source>Plan backgas breaks</source>
+        <translation>Planera pauser på bakgas</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="360"/>
@@ -10928,10 +11140,10 @@ p, li { white-space: pre-wrap; }
         <translation>GF high</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="429"/>
-        <location filename="../build/ui_plannerSettings.h" line="441"/>
-        <source>Drop to first depth</source>
-        <translation>Ner till första djup</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="370"/>
+        <location filename="../build/ui_plannerSettings.h" line="453"/>
+        <source>min</source>
+        <translation>Min</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="389"/>
@@ -10940,163 +11152,139 @@ p, li { white-space: pre-wrap; }
         <translation>Sista stoppet på 6m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="353"/>
-        <location filename="../build/ui_plannerSettings.h" line="436"/>
-        <source>Plan backgas breaks</source>
-        <translation>Planera pauser på bakgas</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="396"/>
+        <source>Maximize bottom time allowed by gas and no decompression limits</source>
+        <translation>Maximal bottentid som tillåts av gas och direktuppstignings gränser</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="515"/>
-        <location filename="../build/ui_plannerSettings.h" line="455"/>
-        <source>Gas options</source>
-        <translation>Gasval</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="399"/>
+        <location filename="../build/ui_plannerSettings.h" line="443"/>
+        <source>Recreational mode</source>
+        <translation>Sportdykar version</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="594"/>
-        <location filename="../build/ui_plannerSettings.h" line="456"/>
-        <source>Bottom SAC</source>
-        <translation>Botten SAC</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="429"/>
+        <location filename="../build/ui_plannerSettings.h" line="441"/>
+        <source>Drop to first depth</source>
+        <translation>Ner till första djup</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="692"/>
-        <location filename="../build/ui_plannerSettings.h" line="457"/>
-        <source>Deco SAC</source>
-        <translation>Deko SAC</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="436"/>
+        <location filename="../build/ui_plannerSettings.h" line="452"/>
+        <source>Min. switch duration</source>
+        <translation>Min. bytes tid</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="601"/>
-        <location filename="../build/ui_plannerSettings.h" line="458"/>
-        <source>Bottom pO₂</source>
-        <translation>pO₂ under bottenfas</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="459"/>
+        <location filename="../build/ui_plannerSettings.h" line="444"/>
+        <source>Safety stop</source>
+        <translation>säkerhetsstopp</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="685"/>
-        <location filename="../build/ui_plannerSettings.h" line="460"/>
-        <source>Deco pO₂</source>
-        <translation>pO₂ under deko</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="495"/>
+        <source>Conservatism level</source>
+        <translation>Konservatism nivå</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="515"/>
+        <location filename="../build/ui_plannerSettings.h" line="455"/>
+        <source>Gas options</source>
+        <translation>Gasval</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="565"/>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="672"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="698"/>
         <location filename="../build/ui_plannerSettings.h" line="462"/>
         <location filename="../build/ui_plannerSettings.h" line="463"/>
         <source>ℓ/min</source>
         <translation>ℓ/min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="632"/>
-        <location filename="../build/ui_plannerSettings.h" line="468"/>
-        <source>Display runtime</source>
-        <translation>Visa körtid</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="645"/>
-        <location filename="../build/ui_plannerSettings.h" line="472"/>
-        <source>Display segment duration</source>
-        <translation>Visa stoppens tid</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="655"/>
-        <location filename="../build/ui_plannerSettings.h" line="476"/>
-        <source>Display transitions in deco</source>
-        <translation>Visa byten av djup</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="662"/>
-        <location filename="../build/ui_plannerSettings.h" line="477"/>
-        <source>Verbatim dive plan</source>
-        <translation>Utskriven dykplan</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="288"/>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="549"/>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="578"/>
-        <location filename="../build/ui_plannerSettings.h" line="446"/>
-        <location filename="../build/ui_plannerSettings.h" line="459"/>
-        <location filename="../build/ui_plannerSettings.h" line="461"/>
-        <source>bar</source>
-        <translation>bar</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="121"/>
-        <location filename="../build/ui_plannerSettings.h" line="425"/>
-        <source>75% to 50% avg. depth</source>
-        <translation>75% till 50% av snittdjup</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="138"/>
-        <location filename="../build/ui_plannerSettings.h" line="427"/>
-        <source>50% avg. depth to 6m</source>
-        <translation>50% av snittdjup till 6m</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="155"/>
-        <location filename="../build/ui_plannerSettings.h" line="429"/>
-        <source>6m to surface</source>
-        <translation>6m till ytan</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="268"/>
-        <source>Bühlmann deco</source>
-        <translation>Bühlmann deco</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="370"/>
-        <location filename="../build/ui_plannerSettings.h" line="453"/>
-        <source>min</source>
-        <translation>Min</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="396"/>
-        <source>Maximize bottom time allowed by gas and no decompression limits</source>
-        <translation>Maximal bottentid som tillåts av gas och direktuppstignings gränser</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="594"/>
+        <source>m</source>
+        <translation>m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="399"/>
-        <location filename="../build/ui_plannerSettings.h" line="443"/>
-        <source>Recreational mode</source>
-        <translation>Sportdykar version</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="606"/>
+        <source>Used to calculate best mix. Select best mix depth in &apos;Available gases&apos; table by entering gas depth, followed by &quot;B&quot; (best trimix mix) or &quot;BN&quot; (best nitrox mix)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="436"/>
-        <location filename="../build/ui_plannerSettings.h" line="452"/>
-        <source>Min. switch duration</source>
-        <translation>Min. bytes tid</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="613"/>
+        <location filename="../build/ui_plannerSettings.h" line="456"/>
+        <source>Bottom SAC</source>
+        <translation>Botten SAC</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="459"/>
-        <location filename="../build/ui_plannerSettings.h" line="444"/>
-        <source>Safety stop</source>
-        <translation>säkerhetsstopp</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="620"/>
+        <location filename="../build/ui_plannerSettings.h" line="458"/>
+        <source>Bottom pO₂</source>
+        <translation>pO₂ under bottenfas</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="495"/>
-        <source>Conservatism level</source>
-        <translation>Konservatism nivå</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="627"/>
+        <source>Best mix END</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="608"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="634"/>
         <location filename="../build/ui_plannerSettings.h" line="464"/>
         <source>Notes</source>
         <translation>Anteckningar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="629"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="655"/>
         <location filename="../build/ui_plannerSettings.h" line="466"/>
         <source>In dive plan, show runtime (absolute time) of stops</source>
         <translation>I dykplanen, visa körtid (absolut tid) av stop</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="642"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="658"/>
+        <location filename="../build/ui_plannerSettings.h" line="468"/>
+        <source>Display runtime</source>
+        <translation>Visa körtid</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="668"/>
         <location filename="../build/ui_plannerSettings.h" line="470"/>
         <source>In dive plan, show duration (relative time) of stops</source>
         <translation>I dykplanen, visa stopptid (relativ tid) av stop</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="652"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="671"/>
+        <location filename="../build/ui_plannerSettings.h" line="472"/>
+        <source>Display segment duration</source>
+        <translation>Visa stoppens tid</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="678"/>
         <location filename="../build/ui_plannerSettings.h" line="474"/>
         <source>In diveplan, list transitions or treat them as implicit</source>
         <translation>I dykplanen, visa förflyttningar eller hantera dem som implicita</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="681"/>
+        <location filename="../build/ui_plannerSettings.h" line="476"/>
+        <source>Display transitions in deco</source>
+        <translation>Visa byten av djup</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="688"/>
+        <location filename="../build/ui_plannerSettings.h" line="477"/>
+        <source>Verbatim dive plan</source>
+        <translation>Utskriven dykplan</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="711"/>
+        <location filename="../build/ui_plannerSettings.h" line="460"/>
+        <source>Deco pO₂</source>
+        <translation>pO₂ under deko</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="718"/>
+        <location filename="../build/ui_plannerSettings.h" line="457"/>
+        <source>Deco SAC</source>
+        <translation>Deko SAC</translation>
+    </message>
 </context>
 </TS>
\ No newline at end of file
diff --git a/translations/subsurface_tr.ts b/translations/subsurface_tr.ts
index 4db639b36..23ef508f3 100644
--- a/translations/subsurface_tr.ts
+++ b/translations/subsurface_tr.ts
@@ -105,6 +105,11 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="56"/>
+        <source>Could not initialize Winsock version 2.2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="134"/>
         <source>Trying to turn on the local Bluetooth device...</source>
         <translation type="unfinished"/>
@@ -115,6 +120,11 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="167"/>
+        <source>Remote devices list was cleared.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="183"/>
         <source>Scanning for remote devices...</source>
         <translation type="unfinished"/>
@@ -125,6 +135,22 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="208"/>
+        <source>The local Bluetooth device was %1.</source>
+        <extracomment>%1 will be replaced with &quot;turned on&quot; or &quot;turned off&quot;</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
+        <source>turned on</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
+        <source>turned off</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="225"/>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="339"/>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="359"/>
@@ -172,37 +198,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="352"/>
-        <source>Device %1 was paired and is authorized.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="56"/>
-        <source>Could not initialize Winsock version 2.2</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="167"/>
-        <source>Remote devices list was cleared.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="208"/>
-        <source>The local Bluetooth device was %1.</source>
-        <extracomment>%1 will be replaced with &quot;turned on&quot; or &quot;turned off&quot;</extracomment>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
-        <source>turned on</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
-        <source>turned off</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="307"/>
         <source>Remove pairing</source>
         <translation type="unfinished"/>
@@ -228,6 +223,11 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="352"/>
+        <source>Device %1 was paired and is authorized.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="378"/>
         <source>The device %1 can now be used for connection. You can press the Save button.</source>
         <translation type="unfinished"/>
@@ -286,12 +286,12 @@
 <context>
     <name>BuddyFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="621"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="619"/>
         <source>Person: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="622"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="620"/>
         <source>Searches for buddies and divemasters</source>
         <translation type="unfinished"/>
     </message>
@@ -299,7 +299,7 @@
 <context>
     <name>BuddyFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="243"/>
+        <location filename="../qt-models/filtermodels.cpp" line="248"/>
         <source>No buddies</source>
         <translation type="unfinished"/>
     </message>
@@ -307,25 +307,30 @@
 <context>
     <name>CloudCredentials</name>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="49"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="50"/>
         <source>Cloud credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="55"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="56"/>
         <source>Email</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="67"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="68"/>
         <source>Password</source>
         <translation>Parola</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="90"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="92"/>
         <source>Show password</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="97"/>
+        <source>PIN</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>ColumnNameProvider</name>
@@ -381,6 +386,16 @@
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
+        <source>Max. depth</source>
+        <translation>Azami derinlik</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
+        <source>Avg. depth</source>
+        <translation>Ort. derinlik</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
         <source>Divemaster</source>
         <translation>Divemaster(Dalış lideri)</translation>
     </message>
@@ -391,6 +406,11 @@
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
+        <source>Suit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
         <source>Notes</source>
         <translation>Notlar</translation>
     </message>
@@ -410,21 +430,6 @@
         <translation>Su sıcaklığı.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
-        <source>Max. depth</source>
-        <translation>Azami derinlik</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
-        <source>Avg. depth</source>
-        <translation>Ort. derinlik</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
-        <source>Suit</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="44"/>
         <source>O₂</source>
         <translation>O₂</translation>
@@ -538,7 +543,7 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/configuredivecomputer.cpp" line="660"/>
+        <location filename="../core/configuredivecomputer.cpp" line="656"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation type="unfinished"/>
     </message>
@@ -558,11 +563,19 @@
         <translation>Cihaz veya bağlama noktası</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="170"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1520"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1533"/>
-        <source>...</source>
-        <translation>...</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="47"/>
+        <source>Connect via Bluetooth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="54"/>
+        <source>Connect</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="64"/>
+        <source>Disconnect</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="80"/>
@@ -571,12 +584,24 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="90"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1523"/>
+        <source>Read settings from backup file or from device before writing to the device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="93"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1525"/>
         <source>Save changes to device</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="116"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1527"/>
+        <source>Read settings from backup file or from device before writing to a backup file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="119"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1529"/>
         <source>Backup</source>
@@ -595,14 +620,39 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="163"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1532"/>
+        <source>Save libdivecomputer logfile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="170"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1520"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1533"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="177"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1534"/>
         <source>Cancel</source>
         <translation>İptal</translation>
     </message>
     <message>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1539"/>
-        <source>OSTC 3</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="214"/>
+        <source>OSTC 3,Sport,Cr,2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="223"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1541"/>
+        <source>Suunto Vyper family</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="232"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1543"/>
+        <source>OSTC, Mk.2/2N/2C</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -616,40 +666,56 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="326"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1656"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1943"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1546"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1726"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1766"/>
-        <source>Serial No.</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="260"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1575"/>
+        <source>Eco</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="349"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1679"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1980"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1547"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1727"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1767"/>
-        <source>Firmware version</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="265"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1576"/>
+        <source>Medium</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="538"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1713"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1990"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1548"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1729"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1768"/>
-        <source>Custom text</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="270"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1577"/>
+        <source>High</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="385"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1549"/>
-        <source>Language</source>
-        <translation>Lisan</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="278"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="826"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="849"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="875"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="927"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="993"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1019"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1101"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1117"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1450"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2278"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2382"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2408"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2434"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2474"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2497"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1586"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1621"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1623"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1625"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1628"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1637"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1638"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1710"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1785"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1789"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1801"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1803"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1806"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1807"/>
+        <source>%</source>
+        <translation>%</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="289"/>
@@ -676,46 +742,38 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="579"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1557"/>
-        <source>Dive mode</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="556"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1560"/>
-        <source>OC</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="313"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1582"/>
+        <source>m/°C</source>
+        <translation>m/°C</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="561"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1561"/>
-        <source>CC</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="318"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1583"/>
+        <source>ft/°F</source>
+        <translation>ft/°F</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="566"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2336"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1562"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1793"/>
-        <source>Gauge</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="326"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1656"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1943"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1546"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1726"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1766"/>
+        <source>Serial No.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="571"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1563"/>
-        <source>Apnea</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="349"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1679"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1980"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1547"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1727"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1767"/>
+        <source>Firmware version</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="395"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2063"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1565"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1780"/>
-        <source>Date format</source>
-        <translation>Tarih biçimi</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="360"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1568"/>
         <source>MMDDYY</source>
@@ -734,107 +792,146 @@
         <translation>YYAAGG</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1042"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2457"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1639"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1805"/>
-        <source>Saturation</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="385"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1549"/>
+        <source>Language</source>
+        <translation>Lisan</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="395"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2063"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1565"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1780"/>
+        <source>Date format</source>
+        <translation>Tarih biçimi</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="405"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1572"/>
+        <source>Brightness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="278"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="826"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="849"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="875"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="927"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="993"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1019"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1101"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1117"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1450"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2278"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2382"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2408"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2434"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2474"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2497"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1586"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1621"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1623"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1625"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1628"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1637"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1638"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1710"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1785"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1789"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1801"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1803"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1806"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1807"/>
-        <source>%</source>
-        <translation>%</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="415"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1850"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1579"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1753"/>
+        <source>Units</source>
+        <translation>Birimler</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="865"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2261"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1624"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1784"/>
-        <source>Desaturation</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="425"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1585"/>
+        <source>Salinity (0-5%)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="983"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2398"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1636"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1800"/>
-        <source>Last deco</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="438"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1615"/>
+        <source>Reset device to default settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="711"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="736"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="758"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="904"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2181"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2206"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2228"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2307"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1626"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1786"/>
-        <source> m</source>
-        <translation>m</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="452"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1590"/>
+        <source>230LSB/Gauss</source>
+        <translation>230LSB/Gauss</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="405"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1572"/>
-        <source>Brightness</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="457"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1591"/>
+        <source>330LSB/Gauss</source>
+        <translation>330LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="462"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1592"/>
+        <source>390LSB/Gauss</source>
+        <translation>390LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="467"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1593"/>
+        <source>440LSB/Gauss</source>
+        <translation>440LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="472"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1594"/>
+        <source>660LSB/Gauss</source>
+        <translation>660LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="477"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1595"/>
+        <source>820LSB/Gauss</source>
+        <translation>820LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="482"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1596"/>
+        <source>1090LSB/Gauss</source>
+        <translation>1090LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="487"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1597"/>
+        <source>1370LSB/Gauss</source>
+        <translation>1370LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="521"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1587"/>
+        <source>Compass gain</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="260"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1575"/>
-        <source>Eco</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="531"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1799"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1745"/>
+        <source>Computer model</source>
+        <translation>Bilgisayar modeli</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="538"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1713"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1990"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1548"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1729"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1768"/>
+        <source>Custom text</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="265"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1576"/>
-        <source>Medium</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="556"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1560"/>
+        <source>OC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="270"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1577"/>
-        <source>High</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="561"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1561"/>
+        <source>CC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="603"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2034"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1599"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1779"/>
-        <source>Sampling rate</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="566"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2336"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1562"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1793"/>
+        <source>Gauge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="571"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1563"/>
+        <source>Apnea</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="579"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1557"/>
+        <source>Dive mode</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -852,29 +949,11 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="415"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1850"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1579"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1753"/>
-        <source>Units</source>
-        <translation>Birimler</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="313"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1582"/>
-        <source>m/°C</source>
-        <translation>m/°C</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="318"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1583"/>
-        <source>ft/°F</source>
-        <translation>ft/°F</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="644"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1605"/>
-        <source>Dive mode color</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="603"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2034"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1599"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1779"/>
+        <source>Sampling rate</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -902,12 +981,6 @@
         <translation>Mavi</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="425"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1585"/>
-        <source>Salinity (0-5%)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="637"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2092"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1613"/>
@@ -916,89 +989,79 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="521"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1587"/>
-        <source>Compass gain</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="644"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1605"/>
+        <source>Dive mode color</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="90"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1523"/>
-        <source>Read settings from backup file or from device before writing to the device</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="654"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2020"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1614"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1771"/>
+        <source>Show safety stop</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="116"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1527"/>
-        <source>Read settings from backup file or from device before writing to a backup file</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="661"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2145"/>
+        <source>End Depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="232"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1543"/>
-        <source>OSTC, Mk.2/2N/2C</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="671"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2162"/>
+        <source> s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="452"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1590"/>
-        <source>230LSB/Gauss</source>
-        <translation>230LSB/Gauss</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="457"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1591"/>
-        <source>330LSB/Gauss</source>
-        <translation>330LSB/Gauss</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="462"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1592"/>
-        <source>390LSB/Gauss</source>
-        <translation>390LSB/Gauss</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="467"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1593"/>
-        <source>440LSB/Gauss</source>
-        <translation>440LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="687"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1953"/>
+        <source>Length</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="472"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1594"/>
-        <source>660LSB/Gauss</source>
-        <translation>660LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="694"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2138"/>
+        <source>Start Depth</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="477"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1595"/>
-        <source>820LSB/Gauss</source>
-        <translation>820LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="701"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2152"/>
+        <source>Reset Depth</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="482"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1596"/>
-        <source>1090LSB/Gauss</source>
-        <translation>1090LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="711"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="736"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="758"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="904"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2181"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2206"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2228"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2307"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1626"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1786"/>
+        <source> m</source>
+        <translation>m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="487"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1597"/>
-        <source>1370LSB/Gauss</source>
-        <translation>1370LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="778"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2248"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1643"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1810"/>
+        <source>Advanced settings</source>
+        <translation>Gelişmiş ayarlar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="654"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2020"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1614"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1771"/>
-        <source>Show safety stop</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="784"/>
+        <source>Left button sensitivity</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="438"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1615"/>
-        <source>Reset device to default settings</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="791"/>
+        <source>Always show ppO2</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1010,20 +1073,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="223"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1541"/>
-        <source>Suunto Vyper family</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="778"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2248"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1643"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1810"/>
-        <source>Advanced settings</source>
-        <translation>Gelişmiş ayarlar</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="805"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2271"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1618"/>
@@ -1054,6 +1103,14 @@
         <translation>EFYüksek</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="865"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2261"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1624"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1784"/>
+        <source>Desaturation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="917"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2320"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1627"/>
@@ -1068,14 +1125,6 @@
         <translation> mbar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="973"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2369"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1630"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1788"/>
-        <source> min</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="960"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2331"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1633"/>
@@ -1084,63 +1133,28 @@
         <translation>ZH-L16</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="47"/>
-        <source>Connect via Bluetooth</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="163"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1532"/>
-        <source>Save libdivecomputer logfile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="661"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2145"/>
-        <source>End Depth</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="671"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2162"/>
-        <source> s</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="687"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1953"/>
-        <source>Length</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="694"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2138"/>
-        <source>Start Depth</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="701"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2152"/>
-        <source>Reset Depth</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="965"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1634"/>
+        <source>ZH-L16+GF</source>
+        <translation>ZH-L16+GF</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="784"/>
-        <source>Left button sensitivity</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="973"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2369"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1630"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1788"/>
+        <source> min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="791"/>
-        <source>Always show ppO2</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="983"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2398"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1636"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1800"/>
+        <source>Last deco</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="965"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1634"/>
-        <source>ZH-L16+GF</source>
-        <translation>ZH-L16+GF</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1009"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2424"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1640"/>
@@ -1157,6 +1171,14 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1042"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2457"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1639"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1805"/>
+        <source>Saturation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1052"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1642"/>
         <source>Flip screen</source>
@@ -1168,12 +1190,22 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1066"/>
+        <source>MOD warning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1073"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2513"/>
         <source>Graphical speed indicator</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1080"/>
+        <source>Dynamic ascent rate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1087"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2552"/>
         <source>Bottom gas consumption</source>
@@ -1186,6 +1218,14 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1133"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1149"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2520"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2536"/>
+        <source> ℓ/min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1165"/>
         <source>Temperature sensor offset</source>
         <translation type="unfinished"/>
@@ -1204,6 +1244,18 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1235"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1320"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2610"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2695"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1645"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1668"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1812"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1835"/>
+        <source>%O₂</source>
+        <translation>%O₂</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1240"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1325"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2615"/>
@@ -1322,15 +1374,9 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1691"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1858"/>
-        <source>Set point [cbar]</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1693"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1860"/>
-        <source>Change depth [m]</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1405"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2770"/>
+        <source>Setpoint</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1370,6 +1416,12 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1443"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1709"/>
+        <source>O₂ in calibration gas</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1467"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1713"/>
         <source>Fixed setpoint</source>
@@ -1400,101 +1452,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1748"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1733"/>
-        <source>P1 (medium)</source>
-        <extracomment>Suunto safety level</extracomment>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1753"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1734"/>
-        <source>P2 (high)</source>
-        <extracomment>Suunto safety level</extracomment>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1792"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1744"/>
-        <source>Total dive time</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2109"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1769"/>
-        <source>kg/ℓ</source>
-        <translation>kg/ℓ</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2346"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1795"/>
-        <source>Apnoea</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1583"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1722"/>
-        <source>Safety level</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="54"/>
-        <source>Connect</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="64"/>
-        <source>Disconnect</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="214"/>
-        <source>OSTC 3,Sport,Cr,2</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1066"/>
-        <source>MOD warning</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1080"/>
-        <source>Dynamic ascent rate</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1133"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1149"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2520"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2536"/>
-        <source> ℓ/min</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1235"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1320"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2610"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2695"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1645"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1668"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1812"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1835"/>
-        <source>%O₂</source>
-        <translation>%O₂</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1405"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2770"/>
-        <source>Setpoint</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1443"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1709"/>
-        <source>O₂ in calibration gas</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1535"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2843"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1719"/>
@@ -1511,6 +1468,12 @@
         <translation>pO₂ asgari</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1583"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1722"/>
+        <source>Safety level</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1609"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1723"/>
         <source>Altitude range</source>
@@ -1544,6 +1507,20 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1748"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1733"/>
+        <source>P1 (medium)</source>
+        <extracomment>Suunto safety level</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1753"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1734"/>
+        <source>P2 (high)</source>
+        <extracomment>Suunto safety level</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1761"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1736"/>
         <source>Sample rate</source>
@@ -1568,11 +1545,10 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="531"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1799"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1745"/>
-        <source>Computer model</source>
-        <translation>Bilgisayar modeli</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1792"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1744"/>
+        <source>Total dive time</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1816"/>
@@ -1637,12 +1613,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2099"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1765"/>
-        <source>Salinity</source>
-        <translation>Tuzluluk</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2074"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1774"/>
         <source>MM/DD/YY</source>
@@ -1661,12 +1631,30 @@
         <translation>YY/AA/GG</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2099"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1765"/>
+        <source>Salinity</source>
+        <translation>Tuzluluk</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2109"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1769"/>
+        <source>kg/ℓ</source>
+        <translation>kg/ℓ</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2341"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1794"/>
         <source>ZH-L16 CC</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2346"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1795"/>
+        <source>Apnoea</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2351"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1796"/>
         <source>L16-GF OC</source>
@@ -1685,85 +1673,110 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1108"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1129"/>
-        <source>Backup files (*.xml)</source>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1539"/>
+        <source>OSTC 3</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1113"/>
-        <source>An error occurred while saving the backup file.
-%1</source>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1691"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1858"/>
+        <source>Set point [cbar]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1116"/>
-        <source>Backup succeeded</source>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1693"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1860"/>
+        <source>Change depth [m]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1117"/>
-        <source>Your settings have been saved to: %1</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1110"/>
+        <source>Backup dive computer settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1107"/>
-        <source>Backup dive computer settings</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1111"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1132"/>
+        <source>Backup files (*.xml)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1112"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1115"/>
         <source>XML backup error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1128"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1116"/>
+        <source>An error occurred while saving the backup file.
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1119"/>
+        <source>Backup succeeded</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1120"/>
+        <source>Your settings have been saved to: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1131"/>
         <source>Restore dive computer settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1134"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1137"/>
         <source>XML restore error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1135"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1138"/>
         <source>An error occurred while restoring the backup file.
 %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1139"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1142"/>
         <source>Restore succeeded</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1140"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1143"/>
         <source>Your settings have been restored successfully.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1150"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1153"/>
         <source>Select firmware file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1151"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1154"/>
         <source>All files (*.*)</source>
         <translation>Tüm dosyalar (*.*)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1207"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1210"/>
         <source>Choose file for divecomputer download logfile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1208"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1211"/>
         <source>Log files (*.log)</source>
         <translation>Kayıt dosyaları (*.log)</translation>
     </message>
 </context>
 <context>
+    <name>ContextDrawer</name>
+    <message>
+        <location filename="../mobile-widgets/qml/kirigami/src/controls/ContextDrawer.qml" line="76"/>
+        <source>Actions</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>CylindersModel</name>
     <message>
         <location filename="../qt-models/cylindermodel.cpp" line="16"/>
@@ -1777,11 +1790,6 @@
     </message>
     <message>
         <location filename="../qt-models/cylindermodel.cpp" line="16"/>
-        <source>He%</source>
-        <translation>He%</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="16"/>
         <source>Work press.</source>
         <translation>Çalışma basıncı</translation>
     </message>
@@ -1801,8 +1809,23 @@
         <translation>O₂%</translation>
     </message>
     <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="16"/>
+        <source>He%</source>
+        <translation>He%</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
+        <source>Deco switch at</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../qt-models/cylindermodel.cpp" line="17"/>
-        <source>Switch at</source>
+        <source>Bot. MOD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
+        <source>MND</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1821,17 +1844,32 @@
         <translation>ℓ</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="161"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="177"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation>Buraya tıklayarak bu tüp kaldırılır.</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="383"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="180"/>
+        <source>Switch depth for deco gas. Calculated using Deco pO₂ preference, unless set manually.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="183"/>
+        <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to &apos;*&apos; for best O₂% for max depth.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="186"/>
+        <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to &apos;*&apos; for best He% for max depth.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="444"/>
         <source>Cylinder cannot be removed</source>
         <translation>Tüp kaldırılamaz</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="384"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="445"/>
         <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source>
         <translation type="unfinished"/>
     </message>
@@ -1851,42 +1889,24 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="80"/>
-        <location filename="../build/ui_divecomponentselection.h" line="142"/>
-        <source>Suit</source>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="73"/>
+        <location filename="../build/ui_divecomponentselection.h" line="141"/>
+        <source>Dive site</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="122"/>
-        <location filename="../build/ui_divecomponentselection.h" line="148"/>
-        <source>Divemaster</source>
-        <translation>Divemaster(Dalış lideri)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="129"/>
-        <location filename="../build/ui_divecomponentselection.h" line="149"/>
-        <source>Buddy</source>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="80"/>
+        <location filename="../build/ui_divecomponentselection.h" line="142"/>
+        <source>Suit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="136"/>
-        <location filename="../build/ui_divecomponentselection.h" line="150"/>
-        <source>Rating</source>
-        <translation>Değerlendirme</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="87"/>
         <location filename="../build/ui_divecomponentselection.h" line="143"/>
         <source>Visibility</source>
         <translation>Görünütlük</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="73"/>
-        <location filename="../build/ui_divecomponentselection.h" line="141"/>
-        <source>Dive site</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="94"/>
         <location filename="../build/ui_divecomponentselection.h" line="144"/>
         <source>Notes</source>
@@ -1910,10 +1930,34 @@
         <source>Cylinders</source>
         <translation>Tüpler</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="122"/>
+        <location filename="../build/ui_divecomponentselection.h" line="148"/>
+        <source>Divemaster</source>
+        <translation>Divemaster(Dalış lideri)</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="129"/>
+        <location filename="../build/ui_divecomponentselection.h" line="149"/>
+        <source>Buddy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="136"/>
+        <location filename="../build/ui_divecomponentselection.h" line="150"/>
+        <source>Rating</source>
+        <translation>Değerlendirme</translation>
+    </message>
 </context>
 <context>
     <name>DiveComputerManagementDialog</name>
     <message>
+        <location filename="../desktop-widgets/divecomputermanagementdialog.ui" line="17"/>
+        <location filename="../build/ui_divecomputermanagementdialog.h" line="65"/>
+        <source>Edit dive computer nicknames</source>
+        <translation>Dalış bilgisayarı rumuzları düzenle</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divecomputermanagementdialog.cpp" line="49"/>
         <source>Remove the selected dive computer?</source>
         <translation>Seçili dalış bilgisayarı kaldırılsın mı ?</translation>
@@ -1925,12 +1969,6 @@
         <translation>Seçilenleri dalış bilgisayarından
 kaldırmak istediğinizden emin misiniz?</translation>
     </message>
-    <message>
-        <location filename="../desktop-widgets/divecomputermanagementdialog.ui" line="17"/>
-        <location filename="../build/ui_divecomputermanagementdialog.h" line="65"/>
-        <source>Edit dive computer nicknames</source>
-        <translation>Dalış bilgisayarı rumuzları düzenle</translation>
-    </message>
 </context>
 <context>
     <name>DiveComputerModel</name>
@@ -1958,17 +1996,17 @@ kaldırmak istediğinizden emin misiniz?</translation>
 <context>
     <name>DiveDetails</name>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="33"/>
+        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="38"/>
         <source>Dive details</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="67"/>
+        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="72"/>
         <source>Delete dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="84"/>
+        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="89"/>
         <source>Show on map</source>
         <translation type="unfinished"/>
     </message>
@@ -1976,88 +2014,93 @@ kaldırmak istediğinizden emin misiniz?</translation>
 <context>
     <name>DiveDetailsEdit</name>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="74"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="80"/>
         <source>Dive %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="78"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="84"/>
         <source>Date:</source>
         <translation>Tarih:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="86"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="92"/>
         <source>Location:</source>
         <translation>Konum:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="95"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="101"/>
         <source>Coordinates:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="104"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="110"/>
         <source>Use current
 GPS location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="118"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="124"/>
         <source>Depth:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="127"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="133"/>
         <source>Duration:</source>
         <translation>Süre:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="137"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="143"/>
         <source>Air Temp:</source>
         <translation>Hava Sıcaklığı:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="146"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="152"/>
         <source>Water Temp:</source>
         <translation>Su Sıcaklığı:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="155"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="161"/>
         <source>Suit:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="164"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="176"/>
         <source>Buddy:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="173"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="191"/>
         <source>Dive Master:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="182"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="206"/>
         <source>Weight:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="192"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="216"/>
+        <source>Cylinder:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="231"/>
         <source>Gas mix:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="203"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="241"/>
         <source>Start Pressure:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="213"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="250"/>
         <source>End Pressure:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="224"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="260"/>
         <source>Notes:</source>
         <translation>Notlar:</translation>
     </message>
@@ -2095,42 +2138,42 @@ GPS location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="159"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="158"/>
         <source>Air Temp:</source>
         <translation>Hava Sıcaklığı:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="175"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="172"/>
         <source>Cylinder:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="189"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="185"/>
         <source>Water Temp:</source>
         <translation>Su Sıcaklığı:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="205"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="198"/>
         <source>Dive Master:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="220"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="211"/>
         <source>Weight:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="249"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="224"/>
         <source>Buddy:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="263"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="237"/>
         <source>SAC:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="280"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="252"/>
         <source>Notes</source>
         <translation>Notlar</translation>
     </message>
@@ -2138,18 +2181,18 @@ GPS location:</source>
 <context>
     <name>DiveEventItem</name>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="134"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="165"/>
         <source>Manual switch to OC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="136"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="167"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="137"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="168"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation>son</translation>
@@ -2158,27 +2201,27 @@ GPS location:</source>
 <context>
     <name>DiveImportedModel</name>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="646"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="656"/>
         <source>Date/time</source>
         <translation>Tarih/zaman</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="648"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="658"/>
         <source>Duration</source>
         <translation>Süre</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="650"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="660"/>
         <source>Depth</source>
         <translation>Derinlik</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="672"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="682"/>
         <source>h:</source>
         <translation>s:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="672"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="682"/>
         <source>min</source>
         <translation>dak</translation>
     </message>
@@ -2187,8 +2230,8 @@ GPS location:</source>
     <name>DiveList</name>
     <message>
         <location filename="../mobile-widgets/qml/DiveList.qml" line="12"/>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="226"/>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="232"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="227"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="233"/>
         <source>Dive list</source>
         <translation type="unfinished"/>
     </message>
@@ -2203,110 +2246,115 @@ GPS location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="222"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="223"/>
         <source>Cloud credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="228"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="229"/>
         <source>Please tap the &apos;+&apos; button to add a dive</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="248"/>
+        <source>No dives in dive list</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DiveListView</name>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="846"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="849"/>
         <source>Expand all</source>
         <translation>Hepsini aç</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="848"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="851"/>
         <source>Collapse all</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="852"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="855"/>
         <source>Collapse others</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="856"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="859"/>
         <source>Remove dive(s) from trip</source>
         <translation>Geziden dalış kaldır</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="857"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="860"/>
         <source>Create new trip above</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="871"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="874"/>
         <source>Add dive(s) to trip immediately above</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="873"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="876"/>
         <source>Add dive(s) to trip immediately below</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="877"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="880"/>
         <source>Merge trip with trip above</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="878"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="881"/>
         <source>Merge trip with trip below</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="882"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="885"/>
         <source>Delete dive(s)</source>
         <translation>Dalış sil</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="884"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="887"/>
         <source>Mark dive(s) invalid</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="888"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="891"/>
         <source>Merge selected dives</source>
         <translation>Seçili dalışları birleştir</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="890"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="893"/>
         <source>Renumber dive(s)</source>
         <translation>Dalışları yeniden numaralandır</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="891"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="894"/>
         <source>Shift dive times</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="892"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="895"/>
         <source>Split selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="893"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="896"/>
         <source>Load image(s) from file(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="894"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="897"/>
         <source>Load image(s) from web</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="917"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="919"/>
         <source>Open image files</source>
         <translation>Görüntü dosyalarını aç</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="917"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="919"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>Görüntü dosyaları (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -2327,56 +2375,6 @@ GPS location:</source>
 <context>
     <name>DiveLogExportDialog</name>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="103"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="351"/>
-        <source>Export format</source>
-        <translation>Dışa aktarma biçimi</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="134"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="353"/>
-        <source>UDDF</source>
-        <translation>UDDF</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="187"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="358"/>
-        <source>Worldmap</source>
-        <translation>Dünya haritası</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="197"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="359"/>
-        <source>I&amp;mage depths</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="243"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="360"/>
-        <source>Selection</source>
-        <translation>Seçim</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="252"/>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="346"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="361"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="372"/>
-        <source>Selected dives</source>
-        <translation>Seçili dalışlar</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="262"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="362"/>
-        <source>All dives</source>
-        <translation>Tüm dalışlar</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="306"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="396"/>
-        <source>HTML</source>
-        <translation>HTML</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="14"/>
         <location filename="../build/ui_divelogexportdialog.h" line="349"/>
         <source>Export dive log files</source>
@@ -2389,12 +2387,24 @@ GPS location:</source>
         <translation>Genel dışarı aktar</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="103"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="351"/>
+        <source>Export format</source>
+        <translation>Dışa aktarma biçimi</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="115"/>
         <location filename="../build/ui_divelogexportdialog.h" line="352"/>
         <source>Subsurface &amp;XML</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="134"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="353"/>
+        <source>UDDF</source>
+        <translation>UDDF</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="147"/>
         <location filename="../build/ui_divelogexportdialog.h" line="354"/>
         <source>di&amp;velogs.de</source>
@@ -2419,238 +2429,297 @@ GPS location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="275"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="187"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="358"/>
+        <source>Worldmap</source>
+        <translation>Dünya haritası</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="197"/>
+        <source>TeX</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="207"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="359"/>
+        <source>I&amp;mage depths</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="253"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="360"/>
+        <source>Selection</source>
+        <translation>Seçim</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="262"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="356"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="361"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="372"/>
+        <source>Selected dives</source>
+        <translation>Seçili dalışlar</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="272"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="362"/>
+        <source>All dives</source>
+        <translation>Tüm dalışlar</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="285"/>
         <location filename="../build/ui_divelogexportdialog.h" line="363"/>
         <source>CSV units</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="288"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="298"/>
         <location filename="../build/ui_divelogexportdialog.h" line="366"/>
         <source>Metric</source>
         <translation>Metrik</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="293"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="303"/>
         <location filename="../build/ui_divelogexportdialog.h" line="367"/>
         <source>Imperial</source>
         <translation>Emperyal</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="324"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="316"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="396"/>
+        <source>HTML</source>
+        <translation>HTML</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="334"/>
         <location filename="../build/ui_divelogexportdialog.h" line="370"/>
         <source>General settings</source>
         <translation>Genel ayarlar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="330"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="340"/>
         <location filename="../build/ui_divelogexportdialog.h" line="371"/>
         <source>Subsurface numbers</source>
         <translation>Subsurface numaraları</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="359"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="369"/>
         <location filename="../build/ui_divelogexportdialog.h" line="373"/>
         <source>Export yearly statistics</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="375"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="385"/>
         <location filename="../build/ui_divelogexportdialog.h" line="374"/>
         <source>All di&amp;ves</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="385"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="395"/>
         <location filename="../build/ui_divelogexportdialog.h" line="375"/>
         <source>Export list only</source>
         <translation>Sadece listeyi dışarı aktar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="392"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="402"/>
         <location filename="../build/ui_divelogexportdialog.h" line="376"/>
         <source>Export photos</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="408"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="418"/>
         <location filename="../build/ui_divelogexportdialog.h" line="377"/>
         <source>Style options</source>
         <translation>Stil seçenekleri</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="423"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="433"/>
         <location filename="../build/ui_divelogexportdialog.h" line="378"/>
         <source>Font</source>
         <translation>Yazı tipi</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="433"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="443"/>
         <location filename="../build/ui_divelogexportdialog.h" line="379"/>
         <source>Font size</source>
         <translation>Yazı tipi boyutu</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="444"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="454"/>
         <location filename="../build/ui_divelogexportdialog.h" line="382"/>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="449"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="459"/>
         <location filename="../build/ui_divelogexportdialog.h" line="383"/>
         <source>10</source>
         <translation>10</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="454"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="464"/>
         <location filename="../build/ui_divelogexportdialog.h" line="384"/>
         <source>12</source>
         <translation>12</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="459"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="469"/>
         <location filename="../build/ui_divelogexportdialog.h" line="385"/>
         <source>14</source>
         <translation>14</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="464"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="474"/>
         <location filename="../build/ui_divelogexportdialog.h" line="386"/>
         <source>16</source>
         <translation>16</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="469"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="479"/>
         <location filename="../build/ui_divelogexportdialog.h" line="387"/>
         <source>18</source>
         <translation>18</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="474"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="484"/>
         <location filename="../build/ui_divelogexportdialog.h" line="388"/>
         <source>20</source>
         <translation>20</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="482"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="492"/>
         <location filename="../build/ui_divelogexportdialog.h" line="390"/>
         <source>Theme</source>
         <translation>Tema</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="493"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="503"/>
         <location filename="../build/ui_divelogexportdialog.h" line="393"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="95"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="99"/>
         <source>Light</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="498"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="508"/>
         <location filename="../build/ui_divelogexportdialog.h" line="394"/>
         <source>Sand</source>
         <translation>kum</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="134"/>
-        <source>UDDF files (*.uddf *.UDDF)</source>
-        <translation>UDDF dosyaları (*.uddf *.UDDF)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="142"/>
-        <source>CSV files (*.csv *.CSV)</source>
-        <translation>CSV dosyaları (*.csv *.CSV)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="74"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="76"/>
         <source>Generic format that is used for data exchange between a variety of diving related programs.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="76"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="78"/>
         <source>Comma separated values describing the dive profile.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="78"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="80"/>
         <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="80"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="82"/>
         <source>Send the dive data to divelogs.de website.</source>
         <translation>Divelogs.de web sitesine dalış verilerini gönder.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="82"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="84"/>
         <source>Send the dive data to dive-share.appspot.com website</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="84"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="86"/>
         <source>HTML export of the dive locations, visualized on a world map.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="86"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="88"/>
         <source>Subsurface native XML format.</source>
         <translation>Subsurface doğal XML biçimi</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="88"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="90"/>
         <source>Write depths of images to file.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="133"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="92"/>
+        <source>Write dive as TeX macros to file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="137"/>
         <source>Export UDDF file as</source>
         <translation>UDDF dosyası olarak dışarı aktar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="137"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/>
+        <source>UDDF files (*.uddf *.UDDF)</source>
+        <translation>UDDF dosyaları (*.uddf *.UDDF)</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divelogexportdialog.cpp" line="141"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="145"/>
         <source>Export CSV file as</source>
         <translation>CSV dosyası olarak dışarı aktar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="148"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="142"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="146"/>
+        <source>CSV files (*.csv *.CSV)</source>
+        <translation>CSV dosyaları (*.csv *.CSV)</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="152"/>
         <source>Export world map</source>
         <translation>Dünya haritasını dışarı aktar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="149"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="169"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="153"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="177"/>
         <source>HTML files (*.html)</source>
         <translation>HTML dosyaları (*.html)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="153"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="157"/>
         <source>Export Subsurface XML</source>
         <translation>Subsurface XML dışa aktar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="158"/>
         <source>XML files (*.xml *.ssrf)</source>
         <translation>XML dosyaları (*.xml *.ssrf)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="162"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="166"/>
         <source>Save image depths</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="168"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="170"/>
+        <source>Export to TeX file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="170"/>
+        <source>TeX files (*.tex)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="176"/>
         <source>Export HTML files as</source>
         <translation>HTML dosyası olarak dışarı aktar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="184"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="192"/>
         <source>Please wait, exporting...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="219"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="227"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="311"/>
         <source>Can&apos;t open file %s</source>
         <translation>%s dosyası açılamıyor</translation>
     </message>
@@ -2664,25 +2733,6 @@ GPS location:</source>
         <translation>Dalış kayıt dosyalarını içe aktar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="643"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="727"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="856"/>
-        <source>Time</source>
-        <translation>Zaman</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.ui" line="127"/>
-        <location filename="../build/ui_divelogimportdialog.h" line="164"/>
-        <source>Metric</source>
-        <translation>Metrik</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.ui" line="132"/>
-        <location filename="../build/ui_divelogimportdialog.h" line="165"/>
-        <source>Imperial</source>
-        <translation>Emperyal</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divelogimportdialog.ui" line="89"/>
         <location filename="../build/ui_divelogimportdialog.h" line="152"/>
         <source>dd.mm.yyyy</source>
@@ -2701,74 +2751,6 @@ GPS location:</source>
         <translation>yyyy-aa-gg</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.ui" line="155"/>
-        <location filename="../build/ui_divelogimportdialog.h" line="167"/>
-        <source>Drag the tags above to each corresponding column below</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="641"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="729"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="852"/>
-        <source>Dive #</source>
-        <translation>Dalış #</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="642"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="723"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="854"/>
-        <source>Date</source>
-        <translation>Tarih</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="644"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="858"/>
-        <source>Duration</source>
-        <translation>Süre</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="655"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="862"/>
-        <source>GPS</source>
-        <translation>GPS</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="645"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="864"/>
-        <source>Max. depth</source>
-        <translation>Azami derinlik</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="646"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="866"/>
-        <source>Avg. depth</source>
-        <translation>Ort. derinlik</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="658"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="872"/>
-        <source>Suit</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="663"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="878"/>
-        <source>Tags</source>
-        <translation>Etiketler</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="652"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="894"/>
-        <source>O₂</source>
-        <translation>O₂</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="653"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="896"/>
-        <source>He</source>
-        <translation>He</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divelogimportdialog.ui" line="108"/>
         <location filename="../build/ui_divelogimportdialog.h" line="158"/>
         <source>Seconds</source>
@@ -2787,183 +2769,269 @@ GPS location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="654"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="860"/>
-        <source>Location</source>
-        <translation>Konum</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.ui" line="127"/>
+        <location filename="../build/ui_divelogimportdialog.h" line="164"/>
+        <source>Metric</source>
+        <translation>Metrik</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="354"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="499"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="505"/>
+        <location filename="../desktop-widgets/divelogimportdialog.ui" line="132"/>
+        <location filename="../build/ui_divelogimportdialog.h" line="165"/>
+        <source>Imperial</source>
+        <translation>Emperyal</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.ui" line="155"/>
+        <location filename="../build/ui_divelogimportdialog.h" line="167"/>
+        <source>Drag the tags above to each corresponding column below</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="355"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="528"/>
         <source>Tab</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="575"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="598"/>
         <source>Some column headers were pre-populated; please drag and drop the headers so they match the column they are in.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="613"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="731"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="782"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="848"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="636"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="761"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="857"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="925"/>
         <source>Sample time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="615"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="733"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="784"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="638"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="763"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="859"/>
         <source>Sample depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="617"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="735"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="786"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="640"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="765"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="861"/>
         <source>Sample temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="621"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="739"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="790"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="642"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="767"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="863"/>
+        <source>Sample pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="644"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="769"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="865"/>
         <source>Sample sensor1 pO₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="623"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="741"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="792"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="646"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="771"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="867"/>
         <source>Sample sensor2 pO₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="625"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="743"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="794"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="648"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="773"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="869"/>
         <source>Sample sensor3 pO₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="633"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="751"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="802"/>
-        <source>Sample stopdepth</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="650"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="775"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="871"/>
+        <source>Sample CNS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="637"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="755"/>
-        <source>Sample setpoint</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="652"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="777"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="873"/>
+        <source>Sample NDL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="619"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="737"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="788"/>
-        <source>Sample pO₂</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="654"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="779"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="875"/>
+        <source>Sample TTS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="627"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="745"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="796"/>
-        <source>Sample CNS</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="656"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="781"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="877"/>
+        <source>Sample stopdepth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="629"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="747"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="798"/>
-        <source>Sample NDL</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="658"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="783"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="879"/>
+        <source>Sample pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="631"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="749"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="800"/>
-        <source>Sample TTS</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="660"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="785"/>
+        <source>Sample setpoint</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="635"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="664"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="759"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="929"/>
+        <source>Dive #</source>
+        <translation>Dalış #</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="665"/>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="753"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="804"/>
-        <source>Sample pressure</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="931"/>
+        <source>Date</source>
+        <translation>Tarih</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="656"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="868"/>
-        <source>Divemaster</source>
-        <translation>Divemaster(Dalış lideri)</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="666"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="757"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="933"/>
+        <source>Time</source>
+        <translation>Zaman</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="657"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="870"/>
-        <source>Buddy</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="667"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="935"/>
+        <source>Duration</source>
+        <translation>Süre</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="659"/>
-        <source>Rating</source>
-        <translation>Değerlendirme</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="668"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="941"/>
+        <source>Max. depth</source>
+        <translation>Azami derinlik</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="660"/>
-        <source>Visibility</source>
-        <translation>Görünütlük</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="669"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="943"/>
+        <source>Avg. depth</source>
+        <translation>Ort. derinlik</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="661"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="874"/>
-        <source>Notes</source>
-        <translation>Notlar</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="670"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="975"/>
+        <source>Air temp.</source>
+        <translation>Hava sıcaklığı.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="662"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="876"/>
-        <source>Weight</source>
-        <translation>Ağırlık</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="671"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="977"/>
+        <source>Water temp.</source>
+        <translation>Su sıcaklığı.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="649"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="888"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="672"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="965"/>
         <source>Cyl. size</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="650"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="890"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="673"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="967"/>
         <source>Start pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="651"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="892"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="674"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="969"/>
         <source>End pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="647"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="898"/>
-        <source>Air temp.</source>
-        <translation>Hava sıcaklığı.</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="675"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="971"/>
+        <source>O₂</source>
+        <translation>O₂</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="648"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="900"/>
-        <source>Water temp.</source>
-        <translation>Su sıcaklığı.</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="676"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="973"/>
+        <source>He</source>
+        <translation>He</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="677"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="937"/>
+        <source>Location</source>
+        <translation>Konum</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="678"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="939"/>
+        <source>GPS</source>
+        <translation>GPS</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="679"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="945"/>
+        <source>Divemaster</source>
+        <translation>Divemaster(Dalış lideri)</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="680"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="947"/>
+        <source>Buddy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="681"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="949"/>
+        <source>Suit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="682"/>
+        <source>Rating</source>
+        <translation>Değerlendirme</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="683"/>
+        <source>Visibility</source>
+        <translation>Görünütlük</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="684"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="951"/>
+        <source>Notes</source>
+        <translation>Notlar</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="685"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="953"/>
+        <source>Weight</source>
+        <translation>Ağırlık</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="686"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="955"/>
+        <source>Tags</source>
+        <translation>Etiketler</translation>
     </message>
 </context>
 <context>
     <name>DiveObjectHelper</name>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="287"/>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="323"/>
         <source>%1 dive(s)</source>
         <translation type="unfinished"/>
     </message>
@@ -2971,18 +3039,18 @@ GPS location:</source>
 <context>
     <name>DivePlanner</name>
     <message>
-        <location filename="../desktop-widgets/diveplanner.ui" line="152"/>
-        <location filename="../build/ui_diveplanner.h" line="190"/>
-        <source>Altitude</source>
-        <translation>İrtifa</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/diveplanner.ui" line="109"/>
         <location filename="../build/ui_diveplanner.h" line="189"/>
         <source>Planned dive time</source>
         <translation>Planlanan dalış zamanı</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/diveplanner.ui" line="152"/>
+        <location filename="../build/ui_diveplanner.h" line="190"/>
+        <source>Altitude</source>
+        <translation>İrtifa</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/diveplanner.ui" line="159"/>
         <location filename="../build/ui_diveplanner.h" line="191"/>
         <source>ATM pressure</source>
@@ -3016,32 +3084,32 @@ GPS location:</source>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="134"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="136"/>
         <source>unknown</source>
         <translation>bilinmeyen</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="312"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="326"/>
         <source>Final depth</source>
         <translation>Final derinlik</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="314"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="328"/>
         <source>Run time</source>
         <translation>Çalışma süresi</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="316"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="330"/>
         <source>Duration</source>
         <translation>Süre</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="318"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="332"/>
         <source>Used gas</source>
         <translation>Gaz kullanımı</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="320"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="334"/>
         <source>CC setpoint</source>
         <translation type="unfinished"/>
     </message>
@@ -3049,22 +3117,22 @@ GPS location:</source>
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="108"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="112"/>
         <source>Dive planner points</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="112"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="116"/>
         <source>Available gases</source>
         <translation>Mevcut gazlar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="137"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="143"/>
         <source>Add dive data point</source>
         <translation>Dalış veri noktası ekle</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="146"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="152"/>
         <source>Save new</source>
         <translation type="unfinished"/>
     </message>
@@ -3097,11 +3165,36 @@ GPS location:</source>
         <translation>Renk</translation>
     </message>
     <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="124"/>
+        <source>User entered</source>
+        <translation>Kullanıcı girdisi</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="126"/>
+        <source>Cylinder index</source>
+        <translation>Tüp indeksi</translation>
+    </message>
+    <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="128"/>
         <source>Pressure S</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="130"/>
+        <source>Pressure I</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="132"/>
+        <source>Ceiling</source>
+        <translation>Tavan</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="134"/>
+        <source>SAC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="136"/>
         <source>pN₂</source>
         <translation>pN₂</translation>
@@ -3137,48 +3230,23 @@ GPS location:</source>
         <translation>Sensör 3</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="152"/>
-        <source>Heart rate</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="156"/>
-        <source>Mean depth @ s</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="150"/>
         <source>Ambient pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="154"/>
-        <source>Gradient factor</source>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="152"/>
+        <source>Heart rate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="130"/>
-        <source>Pressure I</source>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="154"/>
+        <source>Gradient factor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="124"/>
-        <source>User entered</source>
-        <translation>Kullanıcı girdisi</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="126"/>
-        <source>Cylinder index</source>
-        <translation>Tüp indeksi</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="132"/>
-        <source>Ceiling</source>
-        <translation>Tavan</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="134"/>
-        <source>SAC</source>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="156"/>
+        <source>Mean depth @ s</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -3246,310 +3314,314 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="395"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="441"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="434"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="483"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="398"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="444"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="437"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="486"/>
         <source>Date</source>
         <translation>Tarih</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="401"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="447"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="440"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="489"/>
         <source>Rating</source>
         <translation>Değerlendirme</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="404"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="443"/>
         <source>Depth</source>
         <translation>Derinlik</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="410"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="446"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="495"/>
+        <source>Duration</source>
+        <translation>Süre</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="449"/>
         <source>Temp</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="413"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="452"/>
         <source>Weight</source>
         <translation>Ağırlık</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="425"/>
-        <source>SAC</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
-        <source>m</source>
-        <translation>m</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
-        <source>ft</source>
-        <translation>fit</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
-        <source>Weight(%1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="416"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="462"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="455"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="504"/>
         <source>Suit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="419"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="465"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="458"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="507"/>
         <source>Cyl</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="422"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="468"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="461"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="510"/>
         <source>Gas</source>
         <translation>Gaz</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
-        <source>SAC(%1)</source>
+        <location filename="../qt-models/divetripmodel.cpp" line="464"/>
+        <source>SAC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
-        <source>/min</source>
-        <translation type="unfinished"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="467"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="518"/>
+        <source>OTU</source>
+        <translation>OZB</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="431"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="479"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="470"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="521"/>
         <source>Max CNS</source>
         <translation>Azami MSS</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="434"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="482"/>
-        <source>Location</source>
-        <translation>Konum</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
+        <source>Photos</source>
+        <translation>Fotoğraflar</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
-        <source>kg</source>
-        <translation>kg</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="476"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="527"/>
+        <source>Location</source>
+        <translation>Konum</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="492"/>
         <source>Depth(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="407"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="453"/>
-        <source>Duration</source>
-        <translation>Süre</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="492"/>
+        <source>m</source>
+        <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="456"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="492"/>
+        <source>ft</source>
+        <translation>fit</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="498"/>
         <source>Temp(%1%2)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="501"/>
+        <source>Weight(%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="501"/>
+        <source>kg</source>
+        <translation>kg</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="501"/>
         <source>lbs</source>
         <translation>libre</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="428"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="476"/>
-        <source>OTU</source>
-        <translation>OZB</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="515"/>
+        <source>SAC(%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="515"/>
+        <source>/min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="524"/>
+        <source>Photos before/during/after dive</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="164"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="165"/>
         <source>no dives were selected</source>
         <translation>Hiçbir dalış seçilmedi</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="174"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="175"/>
         <source>stylesheet to export to divelogs.de is not found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="184"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="185"/>
         <source>failed to create zip file for upload: %s</source>
         <translation>yükleme için zip dosyası oluşturma başarısız oldu: %s</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="236"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="237"/>
         <source>internal error</source>
         <translation>iç hata</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="244"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="245"/>
         <source>Conversion of dive %1 to divelogs.de format failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="272"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="273"/>
         <source>error writing zip file: %s zip error %d system error %d - %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="745"/>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="935"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="936"/>
         <source>Done</source>
         <translation>Bitti</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="778"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="779"/>
         <source>Uploading dive list...</source>
         <translation>Dalış listesi yükleniyor ...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="810"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="811"/>
         <source>Downloading dive list...</source>
         <translation>Dalış listesi indiriliyor ...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="851"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="852"/>
         <source>Downloading %1 dives...</source>
         <translation>%1 dalış indiriliyor...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="885"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="886"/>
         <source>Download finished - %1</source>
         <translation>İndirme bitti- %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="899"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="900"/>
         <source>Problem with download</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="900"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="901"/>
         <source>The archive could not be opened:
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="909"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="910"/>
         <source>Corrupted download</source>
         <translation>İndirme bozuk</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="910"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="911"/>
         <source>The archive could not be opened:
 %1</source>
         <translation>Arşiv açılamadı:
 %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="937"/>
+        <source>Upload finished</source>
+        <translation>Yükleme bitti</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="950"/>
         <source>Upload failed</source>
         <translation>Yükleme başarısız oldu</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="952"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="953"/>
         <source>Upload successful</source>
         <translation>Yükleme başarılı</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="955"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="956"/>
         <source>Login failed</source>
         <translation>Giriş başarısız</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="958"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="959"/>
         <source>Cannot parse response</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="970"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="971"/>
         <source>Error: %1</source>
         <translation>Hata: %1</translation>
     </message>
-    <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="936"/>
-        <source>Upload finished</source>
-        <translation>Yükleme bitti</translation>
-    </message>
 </context>
 <context>
     <name>DownloadFromDCWidget</name>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="185"/>
-        <source>Error</source>
-        <translation>Hata</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="436"/>
-        <source>Retry</source>
-        <translation>Yeniden dene</translation>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="107"/>
+        <source>Download</source>
+        <translation>İndir</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="280"/>
-        <source>Find Uemis dive computer</source>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="110"/>
+        <source>Choose Bluetooth download mode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="101"/>
-        <source>Download</source>
-        <translation>İndir</translation>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="191"/>
+        <source>Error</source>
+        <translation>Hata</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="104"/>
-        <source>Choose Bluetooth download mode</source>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="286"/>
+        <source>Find Uemis dive computer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="382"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="392"/>
         <source>Choose file for divecomputer download logfile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="383"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="393"/>
         <source>Log files (*.log)</source>
         <translation>Kayıt dosyaları (*.log)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="398"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="408"/>
         <source>Warning</source>
         <translation>Uyarı</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="399"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="409"/>
         <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="410"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="420"/>
         <source>Choose file for divecomputer binary dump file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="411"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="421"/>
         <source>Dump files (*.bin)</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="446"/>
+        <source>Retry</source>
+        <translation>Yeniden dene</translation>
+    </message>
 </context>
 <context>
     <name>DownloadFromDiveComputer</name>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="139"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="275"/>
-        <source>Vendor</source>
-        <translation>Satıcı</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="14"/>
         <location filename="../build/ui_downloadfromdivecomputer.h" line="265"/>
         <source>Download from dive computer</source>
@@ -3562,17 +3634,6 @@ p, li { white-space: pre-wrap; }
         <translation>Cihaz veya bağlama noktası</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="122"/>
-        <source>Choose Bluetooth download mode</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="149"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="276"/>
-        <source>Dive computer</source>
-        <translation>Dalış bilgisayarı</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="66"/>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="101"/>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="115"/>
@@ -3596,11 +3657,46 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="87"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="270"/>
+        <source>Download into new trip</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="94"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="271"/>
+        <source>Save libdivecomputer logfile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="108"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="273"/>
+        <source>Save libdivecomputer dumpfile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="122"/>
+        <source>Choose Bluetooth download mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="129"/>
         <source>Select a remote Bluetooth device.</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="139"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="275"/>
+        <source>Vendor</source>
+        <translation>Satıcı</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="149"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="276"/>
+        <source>Dive computer</source>
+        <translation>Dalış bilgisayarı</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/>
         <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="52"/>
         <location filename="../build/ui_downloadfromdivecomputer.h" line="277"/>
@@ -3608,18 +3704,6 @@ p, li { white-space: pre-wrap; }
         <translation>İndir</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="284"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="281"/>
-        <source>OK</source>
-        <translation>TAMAM</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="291"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="282"/>
-        <source>Cancel</source>
-        <translation>İptal</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="226"/>
         <location filename="../build/ui_downloadfromdivecomputer.h" line="278"/>
         <source>Downloaded dives</source>
@@ -3638,22 +3722,16 @@ p, li { white-space: pre-wrap; }
         <translation>Tümü seçimsiz</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="94"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="271"/>
-        <source>Save libdivecomputer logfile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="108"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="273"/>
-        <source>Save libdivecomputer dumpfile</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="284"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="281"/>
+        <source>OK</source>
+        <translation>TAMAM</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="87"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="270"/>
-        <source>Download into new trip</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="291"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="282"/>
+        <source>Cancel</source>
+        <translation>İptal</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="16"/>
@@ -3743,12 +3821,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="297"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="242"/>
         <source>To disconnect Subsurface from your Facebook account, use the button below</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="306"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="251"/>
         <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source>
         <translation type="unfinished"/>
     </message>
@@ -3756,22 +3834,22 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>FacebookManager</name>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="266"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="211"/>
         <source>Photo upload sucessfull</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="267"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="212"/>
         <source>Your dive profile was updated to Facebook.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="271"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="216"/>
         <source>Photo upload failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="272"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="217"/>
         <source>Your dive profile was not updated to Facebook, 
  please send the following to the developer. 
 </source>
@@ -3831,17 +3909,25 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>FirmwareUpdateThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1750"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1739"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1755"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1744"/>
         <source>Firmware update failed!</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
+    <name>GlobalDrawer</name>
+    <message>
+        <location filename="../mobile-widgets/qml/kirigami/src/controls/GlobalDrawer.qml" line="364"/>
+        <source>Back</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>GlobeGPS</name>
     <message>
         <location filename="../desktop-widgets/globe.cpp" line="124"/>
@@ -3857,27 +3943,27 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="40"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="32"/>
         <source>Date: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="50"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="42"/>
         <source>Name: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="60"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="52"/>
         <source>Latitude: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="69"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="61"/>
         <source>Longitude: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="113"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="105"/>
         <source>List of stored GPS fixes</source>
         <translation type="unfinished"/>
     </message>
@@ -3906,7 +3992,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>LocationFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="648"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="646"/>
         <source>Location: </source>
         <translation>Konum:</translation>
     </message>
@@ -3947,7 +4033,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>LocationFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="299"/>
+        <location filename="../qt-models/filtermodels.cpp" line="304"/>
         <source>No location set</source>
         <translation type="unfinished"/>
     </message>
@@ -4068,20 +4154,55 @@ p, li { white-space: pre-wrap; }
     </message>
 </context>
 <context>
-    <name>MainForm.ui</name>
+    <name>MainTab</name>
     <message>
-        <location filename="../packaging/ios/Subsurface-mobile/MainForm.ui.qml" line="17"/>
-        <source>Press Me 1</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/maintab.ui" line="18"/>
+        <location filename="../desktop-widgets/maintab.ui" line="439"/>
+        <location filename="../build/ui_maintab.h" line="961"/>
+        <location filename="../build/ui_maintab.h" line="963"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="539"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="571"/>
+        <source>Notes</source>
+        <translation>Notlar</translation>
     </message>
     <message>
-        <location filename="../packaging/ios/Subsurface-mobile/MainForm.ui.qml" line="22"/>
-        <source>Press Me 2</source>
+        <location filename="../desktop-widgets/maintab.ui" line="21"/>
+        <location filename="../build/ui_maintab.h" line="964"/>
+        <source>General notes about the current selection</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>MainTab</name>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="92"/>
+        <location filename="../desktop-widgets/maintab.ui" line="646"/>
+        <location filename="../build/ui_maintab.h" line="947"/>
+        <location filename="../build/ui_maintab.h" line="967"/>
+        <source>Date</source>
+        <translation>Tarih</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="102"/>
+        <location filename="../build/ui_maintab.h" line="948"/>
+        <source>Time</source>
+        <translation>Zaman</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="112"/>
+        <location filename="../desktop-widgets/maintab.ui" line="836"/>
+        <location filename="../build/ui_maintab.h" line="949"/>
+        <location filename="../build/ui_maintab.h" line="987"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="306"/>
+        <source>Air temp.</source>
+        <translation>Hava sıcaklığı.</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="122"/>
+        <location filename="../desktop-widgets/maintab.ui" line="855"/>
+        <location filename="../build/ui_maintab.h" line="950"/>
+        <location filename="../build/ui_maintab.h" line="989"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="307"/>
+        <source>Water temp.</source>
+        <translation>Su sıcaklığı.</translation>
+    </message>
     <message>
         <location filename="../desktop-widgets/maintab.ui" line="184"/>
         <location filename="../build/ui_maintab.h" line="951"/>
@@ -4090,6 +4211,17 @@ p, li { white-space: pre-wrap; }
         <translation>Konum</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="214"/>
+        <source>Edit dive site</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="217"/>
+        <location filename="../build/ui_maintab.h" line="953"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="252"/>
         <location filename="../build/ui_maintab.h" line="954"/>
         <source>Divemaster</source>
@@ -4102,12 +4234,6 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.ui" line="387"/>
-        <location filename="../build/ui_maintab.h" line="959"/>
-        <source>Tags</source>
-        <translation>Etiketler</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/maintab.ui" line="308"/>
         <location filename="../build/ui_maintab.h" line="956"/>
         <source>Rating</source>
@@ -4126,57 +4252,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="387"/>
+        <location filename="../build/ui_maintab.h" line="959"/>
+        <source>Tags</source>
+        <translation>Etiketler</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="397"/>
         <location filename="../build/ui_maintab.h" line="960"/>
         <source>Dive mode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.ui" line="112"/>
-        <location filename="../desktop-widgets/maintab.ui" line="836"/>
-        <location filename="../build/ui_maintab.h" line="949"/>
-        <location filename="../build/ui_maintab.h" line="987"/>
-        <location filename="../desktop-widgets/maintab.cpp" line="306"/>
-        <source>Air temp.</source>
-        <translation>Hava sıcaklığı.</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="122"/>
-        <location filename="../desktop-widgets/maintab.ui" line="855"/>
-        <location filename="../build/ui_maintab.h" line="950"/>
-        <location filename="../build/ui_maintab.h" line="989"/>
-        <location filename="../desktop-widgets/maintab.cpp" line="307"/>
-        <source>Water temp.</source>
-        <translation>Su sıcaklığı.</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="18"/>
-        <location filename="../desktop-widgets/maintab.ui" line="439"/>
-        <location filename="../build/ui_maintab.h" line="961"/>
-        <location filename="../build/ui_maintab.h" line="963"/>
-        <location filename="../desktop-widgets/maintab.cpp" line="539"/>
-        <location filename="../desktop-widgets/maintab.cpp" line="571"/>
-        <source>Notes</source>
-        <translation>Notlar</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="21"/>
-        <location filename="../build/ui_maintab.h" line="964"/>
-        <source>General notes about the current selection</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="214"/>
-        <source>Edit dive site</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="217"/>
-        <location filename="../build/ui_maintab.h" line="953"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/maintab.ui" line="491"/>
         <location filename="../build/ui_maintab.h" line="965"/>
         <source>Equipment</source>
@@ -4201,6 +4288,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="665"/>
+        <location filename="../build/ui_maintab.h" line="969"/>
+        <source>Interval</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="684"/>
         <location filename="../build/ui_maintab.h" line="971"/>
         <source>Gases used</source>
@@ -4213,18 +4306,38 @@ p, li { white-space: pre-wrap; }
         <translation>Tüketilen gaz</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="722"/>
+        <location filename="../desktop-widgets/maintab.ui" line="1094"/>
+        <location filename="../build/ui_maintab.h" line="975"/>
+        <location filename="../build/ui_maintab.h" line="1003"/>
+        <source>SAC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="741"/>
         <location filename="../build/ui_maintab.h" line="977"/>
         <source>CNS</source>
         <translation>MSS</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="760"/>
+        <location filename="../build/ui_maintab.h" line="979"/>
+        <source>OTU</source>
+        <translation>OZB</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="779"/>
         <location filename="../build/ui_maintab.h" line="981"/>
         <source>Max. depth</source>
         <translation>Azami derinlik</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="798"/>
+        <location filename="../build/ui_maintab.h" line="983"/>
+        <source>Avg. depth</source>
+        <translation>Ort. derinlik</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="817"/>
         <location filename="../build/ui_maintab.h" line="985"/>
         <source>Air pressure</source>
@@ -4237,82 +4350,6 @@ p, li { white-space: pre-wrap; }
         <translation>Dalış süresi</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.ui" line="933"/>
-        <location filename="../build/ui_maintab.h" line="1007"/>
-        <source>Simple statistics about the selection</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1039"/>
-        <location filename="../build/ui_maintab.h" line="999"/>
-        <source>Total time</source>
-        <translation>Toplam süre</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1106"/>
-        <location filename="../build/ui_maintab.h" line="1004"/>
-        <source>Gas consumption</source>
-        <translation>Gaz tüketimi</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1151"/>
-        <location filename="../build/ui_maintab.h" line="1009"/>
-        <source>All photos from the current selection</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1177"/>
-        <location filename="../build/ui_maintab.h" line="1010"/>
-        <source>Extra data</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1180"/>
-        <location filename="../build/ui_maintab.h" line="1011"/>
-        <source>Adittional data from the dive computer</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="92"/>
-        <location filename="../desktop-widgets/maintab.ui" line="646"/>
-        <location filename="../build/ui_maintab.h" line="947"/>
-        <location filename="../build/ui_maintab.h" line="967"/>
-        <source>Date</source>
-        <translation>Tarih</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="102"/>
-        <location filename="../build/ui_maintab.h" line="948"/>
-        <source>Time</source>
-        <translation>Zaman</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="665"/>
-        <location filename="../build/ui_maintab.h" line="969"/>
-        <source>Interval</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="722"/>
-        <location filename="../desktop-widgets/maintab.ui" line="1094"/>
-        <location filename="../build/ui_maintab.h" line="975"/>
-        <location filename="../build/ui_maintab.h" line="1003"/>
-        <source>SAC</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="798"/>
-        <location filename="../build/ui_maintab.h" line="983"/>
-        <source>Avg. depth</source>
-        <translation>Ort. derinlik</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="760"/>
-        <location filename="../build/ui_maintab.h" line="979"/>
-        <source>OTU</source>
-        <translation>OZB</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/maintab.ui" line="893"/>
         <location filename="../build/ui_maintab.h" line="993"/>
         <source>Salinity</source>
@@ -4325,22 +4362,34 @@ p, li { white-space: pre-wrap; }
         <translation>İstatistikler</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="933"/>
+        <location filename="../build/ui_maintab.h" line="1007"/>
+        <source>Simple statistics about the selection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="986"/>
         <location filename="../build/ui_maintab.h" line="996"/>
         <source>Depth</source>
         <translation>Derinlik</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="998"/>
+        <location filename="../build/ui_maintab.h" line="997"/>
+        <source>Duration</source>
+        <translation>Süre</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="1027"/>
         <location filename="../build/ui_maintab.h" line="998"/>
         <source>Temperature</source>
         <translation>Sıcaklık</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.ui" line="998"/>
-        <location filename="../build/ui_maintab.h" line="997"/>
-        <source>Duration</source>
-        <translation>Süre</translation>
+        <location filename="../desktop-widgets/maintab.ui" line="1039"/>
+        <location filename="../build/ui_maintab.h" line="999"/>
+        <source>Total time</source>
+        <translation>Toplam süre</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/maintab.ui" line="1058"/>
@@ -4349,20 +4398,34 @@ p, li { white-space: pre-wrap; }
         <translation>Dalışlar</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="1106"/>
+        <location filename="../build/ui_maintab.h" line="1004"/>
+        <source>Gas consumption</source>
+        <translation>Gaz tüketimi</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="1148"/>
         <location filename="../build/ui_maintab.h" line="1008"/>
         <source>Photos</source>
         <translation>Fotoğraflar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.cpp" line="88"/>
-        <source>Cylinders</source>
-        <translation>Tüpler</translation>
+        <location filename="../desktop-widgets/maintab.ui" line="1151"/>
+        <location filename="../build/ui_maintab.h" line="1009"/>
+        <source>All photos from the current selection</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.cpp" line="92"/>
-        <source>Weights</source>
-        <translation>Ağırlıklar</translation>
+        <location filename="../desktop-widgets/maintab.ui" line="1177"/>
+        <location filename="../build/ui_maintab.h" line="1010"/>
+        <source>Extra data</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="1180"/>
+        <location filename="../build/ui_maintab.h" line="1011"/>
+        <source>Adittional data from the dive computer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/maintab.cpp" line="63"/>
@@ -4375,11 +4438,21 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.cpp" line="88"/>
+        <source>Cylinders</source>
+        <translation>Tüpler</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.cpp" line="89"/>
         <source>Add cylinder</source>
         <translation>Tüp ekle</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.cpp" line="92"/>
+        <source>Weights</source>
+        <translation>Ağırlıklar</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.cpp" line="93"/>
         <source>Add weight system</source>
         <translation type="unfinished"/>
@@ -4570,659 +4643,685 @@ mixed from Air and using:
         <translation>&amp;Dosya</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="455"/>
-        <location filename="../build/ui_mainwindow.h" line="534"/>
-        <source>Export dive logs</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="510"/>
-        <location filename="../build/ui_mainwindow.h" line="542"/>
-        <source>Toggle pHe graph</source>
-        <translation>pHe grafik değiştir</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="546"/>
-        <location filename="../build/ui_mainwindow.h" line="545"/>
-        <source>Toggle calculating all tissues</source>
-        <translation>Tüm doku hesaplamalarını değiştir</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="522"/>
-        <location filename="../build/ui_mainwindow.h" line="543"/>
-        <source>Toggle DC reported ceiling</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="534"/>
-        <location filename="../build/ui_mainwindow.h" line="544"/>
-        <source>Toggle calculated ceiling</source>
-        <translation>Hesaplanan tavanı değiştir</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="606"/>
-        <location filename="../build/ui_mainwindow.h" line="550"/>
-        <source>Toggle NDL, TTS</source>
-        <translation>NDL, YZ geçişi</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="558"/>
-        <location filename="../build/ui_mainwindow.h" line="546"/>
-        <source>Toggle calculated ceiling with 3m increments</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="463"/>
-        <location filename="../build/ui_mainwindow.h" line="537"/>
-        <source>Configure &amp;dive computer</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="570"/>
-        <location filename="../build/ui_mainwindow.h" line="547"/>
-        <source>Toggle heart rate</source>
-        <translation>Kalp atış hızı geçişi</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="582"/>
-        <location filename="../build/ui_mainwindow.h" line="548"/>
-        <source>Toggle MOD</source>
-        <translation>MOD değiştir</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="594"/>
-        <location filename="../build/ui_mainwindow.h" line="549"/>
-        <source>Toggle EAD, END, EADD</source>
-        <translation>EHD,  END, EHYD değiştir</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="618"/>
-        <location filename="../build/ui_mainwindow.h" line="551"/>
-        <source>Toggle SAC rate</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="630"/>
-        <location filename="../build/ui_mainwindow.h" line="552"/>
-        <source>Toggle ruler</source>
-        <translation>Cetvel geçişi</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="86"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="87"/>
         <location filename="../build/ui_mainwindow.h" line="569"/>
         <source>&amp;Log</source>
         <translation>&amp;Kayıt</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="105"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="104"/>
         <location filename="../build/ui_mainwindow.h" line="570"/>
         <source>&amp;View</source>
         <translation>&amp;Görünüm</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="121"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="120"/>
         <location filename="../build/ui_mainwindow.h" line="571"/>
         <source>&amp;Help</source>
         <translation>&amp;Yardım</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="130"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="129"/>
         <location filename="../build/ui_mainwindow.h" line="572"/>
         <source>&amp;Import</source>
         <translation>&amp;İçe Aktar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="139"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="138"/>
         <location filename="../build/ui_mainwindow.h" line="573"/>
         <source>&amp;Edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="144"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="143"/>
         <source>Share on</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="158"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="157"/>
         <location filename="../build/ui_mainwindow.h" line="453"/>
         <source>&amp;New logbook</source>
         <translation>&amp;Yeni seyir defteri</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="161"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="160"/>
         <location filename="../build/ui_mainwindow.h" line="455"/>
         <source>New</source>
         <translation>Yeni</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="164"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="163"/>
         <location filename="../build/ui_mainwindow.h" line="457"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="169"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="168"/>
         <location filename="../build/ui_mainwindow.h" line="458"/>
         <source>&amp;Open logbook</source>
         <translation>&amp;Seyir defteri aç</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="172"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="171"/>
         <location filename="../build/ui_mainwindow.h" line="460"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="508"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="502"/>
         <source>Open</source>
         <translation>Aç</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="175"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="174"/>
         <location filename="../build/ui_mainwindow.h" line="462"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="180"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="179"/>
         <location filename="../build/ui_mainwindow.h" line="463"/>
         <source>&amp;Save</source>
         <translation>&amp;Kaydet</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="183"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="182"/>
         <location filename="../build/ui_mainwindow.h" line="465"/>
         <source>Save</source>
         <translation>Kaydet</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="186"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="185"/>
         <location filename="../build/ui_mainwindow.h" line="467"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="191"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="190"/>
         <location filename="../build/ui_mainwindow.h" line="468"/>
         <source>Sa&amp;ve as</source>
         <translation>&amp;Farklı kaydet</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="194"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="193"/>
         <location filename="../build/ui_mainwindow.h" line="470"/>
         <source>Save as</source>
         <translation>Farklı kaydet</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="197"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="196"/>
         <location filename="../build/ui_mainwindow.h" line="472"/>
         <source>Ctrl+Shift+S</source>
         <translation>Ctrl+Shift+S</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="202"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="201"/>
         <location filename="../build/ui_mainwindow.h" line="473"/>
         <source>&amp;Close</source>
         <translation>&amp;Kapat</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="205"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="204"/>
         <location filename="../build/ui_mainwindow.h" line="475"/>
         <source>Close</source>
         <translation>Kapat</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="208"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="207"/>
         <location filename="../build/ui_mainwindow.h" line="477"/>
         <source>Ctrl+W</source>
         <translation>Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="221"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="212"/>
+        <location filename="../build/ui_mainwindow.h" line="478"/>
+        <source>&amp;Print</source>
+        <translation>&amp;Yazdır</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="215"/>
+        <location filename="../build/ui_mainwindow.h" line="479"/>
+        <source>Ctrl+P</source>
+        <translation>Ctrl+P</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="220"/>
         <location filename="../build/ui_mainwindow.h" line="480"/>
         <source>P&amp;references</source>
         <translation>&amp;Tercihler</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="251"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="223"/>
+        <location filename="../build/ui_mainwindow.h" line="481"/>
+        <source>Ctrl+,</source>
+        <translation>Ctrl+,</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="231"/>
+        <location filename="../build/ui_mainwindow.h" line="482"/>
+        <source>&amp;Quit</source>
+        <translation>&amp;Çıkış</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="234"/>
+        <location filename="../build/ui_mainwindow.h" line="483"/>
+        <source>Ctrl+Q</source>
+        <translation>Ctrl+Q</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="242"/>
+        <location filename="../build/ui_mainwindow.h" line="484"/>
+        <source>Import from &amp;dive computer</source>
+        <translation>&amp;Dalış bilgisayarından içe aktar</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="245"/>
+        <location filename="../build/ui_mainwindow.h" line="485"/>
+        <source>Ctrl+D</source>
+        <translation>Ctrl+D</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="250"/>
         <location filename="../build/ui_mainwindow.h" line="486"/>
         <source>Import &amp;GPS data from Subsurface web service</source>
         <translation>&amp;Subsurface web hizmetinden GPS verilerini içe aktar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="259"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="253"/>
+        <location filename="../build/ui_mainwindow.h" line="487"/>
+        <source>Ctrl+G</source>
+        <translation>Ctrl+G</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="258"/>
         <location filename="../build/ui_mainwindow.h" line="488"/>
         <source>Edit device &amp;names</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="272"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="263"/>
+        <location filename="../build/ui_mainwindow.h" line="489"/>
+        <source>&amp;Add dive</source>
+        <translation>&amp;Dalış ekle</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="266"/>
+        <location filename="../build/ui_mainwindow.h" line="490"/>
+        <source>Ctrl++</source>
+        <translation>Ctrl++</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="271"/>
         <location filename="../build/ui_mainwindow.h" line="491"/>
         <source>&amp;Edit dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="277"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="276"/>
         <location filename="../build/ui_mainwindow.h" line="492"/>
         <source>&amp;Copy dive components</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="280"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="279"/>
         <location filename="../build/ui_mainwindow.h" line="493"/>
         <source>Ctrl+C</source>
         <translation>Ctrl+C</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="285"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="284"/>
         <location filename="../build/ui_mainwindow.h" line="494"/>
         <source>&amp;Paste dive components</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="288"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="287"/>
         <location filename="../build/ui_mainwindow.h" line="495"/>
         <source>Ctrl+V</source>
         <translation>Ctrl+V</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="325"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="292"/>
+        <location filename="../build/ui_mainwindow.h" line="496"/>
+        <source>&amp;Renumber</source>
+        <translation>&amp;Yeniden numarala</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="295"/>
+        <location filename="../build/ui_mainwindow.h" line="497"/>
+        <source>Ctrl+R</source>
+        <translation>Ctrl+R</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="303"/>
+        <location filename="../build/ui_mainwindow.h" line="498"/>
+        <source>Auto &amp;group</source>
+        <translation>&amp;Otomatik grup</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="308"/>
+        <location filename="../build/ui_mainwindow.h" line="499"/>
+        <source>&amp;Yearly statistics</source>
+        <translation>&amp;Yıllık istatistikler</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="311"/>
+        <location filename="../build/ui_mainwindow.h" line="500"/>
+        <source>Ctrl+Y</source>
+        <translation>Ctrl+Y</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="316"/>
+        <location filename="../build/ui_mainwindow.h" line="501"/>
+        <source>&amp;Dive list</source>
+        <translation>&amp;Dalış listesi</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="319"/>
+        <location filename="../build/ui_mainwindow.h" line="502"/>
+        <source>Ctrl+2</source>
+        <translation>Ctrl+2</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="324"/>
         <location filename="../build/ui_mainwindow.h" line="503"/>
         <source>&amp;Profile</source>
         <translation>&amp;Profil</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="333"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="327"/>
+        <location filename="../build/ui_mainwindow.h" line="504"/>
+        <source>Ctrl+3</source>
+        <translation>Ctrl+3</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="332"/>
         <location filename="../build/ui_mainwindow.h" line="505"/>
         <source>&amp;Info</source>
         <translation>&amp;Bilgi</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="341"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="335"/>
+        <location filename="../build/ui_mainwindow.h" line="506"/>
+        <source>Ctrl+4</source>
+        <translation>Ctrl+4</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="340"/>
         <location filename="../build/ui_mainwindow.h" line="507"/>
         <source>&amp;All</source>
         <translation>&amp;Tümü</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="357"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="343"/>
+        <location filename="../build/ui_mainwindow.h" line="508"/>
+        <source>Ctrl+1</source>
+        <translation>Ctrl+1</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="348"/>
+        <location filename="../build/ui_mainwindow.h" line="509"/>
+        <source>P&amp;revious DC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="351"/>
+        <location filename="../build/ui_mainwindow.h" line="510"/>
+        <source>Left</source>
+        <translation>Sol</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="356"/>
         <location filename="../build/ui_mainwindow.h" line="511"/>
         <source>&amp;Next DC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="365"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="359"/>
+        <location filename="../build/ui_mainwindow.h" line="512"/>
+        <source>Right</source>
+        <translation>Sağ</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="364"/>
         <location filename="../build/ui_mainwindow.h" line="513"/>
         <source>&amp;About Subsurface</source>
         <translation>&amp;Subsurface Hakkında</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="381"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="372"/>
+        <location filename="../build/ui_mainwindow.h" line="514"/>
+        <source>User &amp;manual</source>
+        <translation>&amp;Kullanıcı rehberi</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="375"/>
+        <location filename="../build/ui_mainwindow.h" line="515"/>
+        <source>F1</source>
+        <translation>F1</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="380"/>
         <location filename="../build/ui_mainwindow.h" line="516"/>
         <source>&amp;Globe</source>
         <translation>&amp;Dünya</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="403"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="383"/>
+        <location filename="../build/ui_mainwindow.h" line="517"/>
+        <source>Ctrl+5</source>
+        <translation>Ctrl+5</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="388"/>
+        <location filename="../build/ui_mainwindow.h" line="518"/>
+        <source>P&amp;lan dive</source>
+        <translation>&amp;Dalış planı</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="391"/>
+        <location filename="../build/ui_mainwindow.h" line="519"/>
+        <source>Ctrl+L</source>
+        <translation>Ctrl+L</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="396"/>
+        <location filename="../build/ui_mainwindow.h" line="520"/>
+        <source>&amp;Import log files</source>
+        <translation>&amp;Kayıt dosyalarını içe aktar</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="399"/>
+        <location filename="../build/ui_mainwindow.h" line="522"/>
+        <source>Import divelog files from other applications</source>
+        <translation>Diğer uygulamalardan dalış kayıt dosyalarını içe aktar</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="402"/>
         <location filename="../build/ui_mainwindow.h" line="524"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="408"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="407"/>
         <location filename="../build/ui_mainwindow.h" line="525"/>
         <source>Import &amp;from divelogs.de</source>
         <translation>&amp;divelogs.de&apos;den içe aktar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="416"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="415"/>
         <location filename="../build/ui_mainwindow.h" line="526"/>
         <source>&amp;Full screen</source>
         <translation>&amp;Tam ekran</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="419"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="418"/>
         <location filename="../build/ui_mainwindow.h" line="528"/>
         <source>Toggle full screen</source>
         <translation>Tam ekran geçişi</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="447"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="421"/>
+        <location filename="../build/ui_mainwindow.h" line="530"/>
+        <source>F11</source>
+        <translation>F11</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="446"/>
         <location filename="../build/ui_mainwindow.h" line="531"/>
         <source>&amp;Check for updates</source>
         <translation>&amp;Güncellemeler için denetle</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="452"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="451"/>
         <location filename="../build/ui_mainwindow.h" line="532"/>
         <source>&amp;Export</source>
         <translation>&amp;Dışa aktar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="458"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="454"/>
+        <location filename="../build/ui_mainwindow.h" line="534"/>
+        <source>Export dive logs</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="457"/>
         <location filename="../build/ui_mainwindow.h" line="536"/>
         <source>Ctrl+E</source>
         <translation>Ctrl+E</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="466"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="462"/>
+        <location filename="../build/ui_mainwindow.h" line="537"/>
+        <source>Configure &amp;dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="465"/>
         <location filename="../build/ui_mainwindow.h" line="538"/>
         <source>Ctrl+Shift+C</source>
         <translation>Ctrl+Shift+C</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="474"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="473"/>
         <location filename="../build/ui_mainwindow.h" line="539"/>
         <source>Edit &amp;dive in planner</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="486"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="485"/>
         <location filename="../build/ui_mainwindow.h" line="540"/>
         <source>Toggle pO₂ graph</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="498"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="497"/>
         <location filename="../build/ui_mainwindow.h" line="541"/>
         <source>Toggle pN₂ graph</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="642"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="509"/>
+        <location filename="../build/ui_mainwindow.h" line="542"/>
+        <source>Toggle pHe graph</source>
+        <translation>pHe grafik değiştir</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="521"/>
+        <location filename="../build/ui_mainwindow.h" line="543"/>
+        <source>Toggle DC reported ceiling</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="533"/>
+        <location filename="../build/ui_mainwindow.h" line="544"/>
+        <source>Toggle calculated ceiling</source>
+        <translation>Hesaplanan tavanı değiştir</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="545"/>
+        <location filename="../build/ui_mainwindow.h" line="545"/>
+        <source>Toggle calculating all tissues</source>
+        <translation>Tüm doku hesaplamalarını değiştir</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="557"/>
+        <location filename="../build/ui_mainwindow.h" line="546"/>
+        <source>Toggle calculated ceiling with 3m increments</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="569"/>
+        <location filename="../build/ui_mainwindow.h" line="547"/>
+        <source>Toggle heart rate</source>
+        <translation>Kalp atış hızı geçişi</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="581"/>
+        <location filename="../build/ui_mainwindow.h" line="548"/>
+        <source>Toggle MOD</source>
+        <translation>MOD değiştir</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="593"/>
+        <location filename="../build/ui_mainwindow.h" line="549"/>
+        <source>Toggle EAD, END, EADD</source>
+        <translation>EHD,  END, EHYD değiştir</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="605"/>
+        <location filename="../build/ui_mainwindow.h" line="550"/>
+        <source>Toggle NDL, TTS</source>
+        <translation>NDL, YZ geçişi</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="617"/>
+        <location filename="../build/ui_mainwindow.h" line="551"/>
+        <source>Toggle SAC rate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="629"/>
+        <location filename="../build/ui_mainwindow.h" line="552"/>
+        <source>Toggle ruler</source>
+        <translation>Cetvel geçişi</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="641"/>
         <location filename="../build/ui_mainwindow.h" line="553"/>
         <source>Scale graph</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="654"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="653"/>
         <location filename="../build/ui_mainwindow.h" line="554"/>
         <source>Toggle pictures</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="666"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="665"/>
         <location filename="../build/ui_mainwindow.h" line="555"/>
         <source>Toggle tank bar</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="674"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="673"/>
         <location filename="../build/ui_mainwindow.h" line="556"/>
         <source>&amp;Filter divelist</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="689"/>
-        <location filename="../build/ui_mainwindow.h" line="558"/>
-        <source>Toggle tissue graph</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="676"/>
+        <location filename="../build/ui_mainwindow.h" line="557"/>
+        <source>Ctrl+F</source>
+        <translation>Ctrl+F</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="688"/>
+        <source>Toggle tissue heat-map</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="694"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="693"/>
         <location filename="../build/ui_mainwindow.h" line="559"/>
         <source>User &amp;survey</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="699"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="698"/>
         <location filename="../build/ui_mainwindow.h" line="560"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="238"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="231"/>
         <source>&amp;Undo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="702"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="701"/>
         <location filename="../build/ui_mainwindow.h" line="561"/>
         <source>Ctrl+Z</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="707"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="706"/>
         <location filename="../build/ui_mainwindow.h" line="562"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="239"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="232"/>
         <source>&amp;Redo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="710"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="709"/>
         <location filename="../build/ui_mainwindow.h" line="563"/>
         <source>Ctrl+Shift+Z</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="715"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="714"/>
         <location filename="../build/ui_mainwindow.h" line="564"/>
         <source>&amp;Find moved images</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="720"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="719"/>
         <source>Open c&amp;loud storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="725"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="724"/>
         <source>Save to clo&amp;ud storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="730"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="729"/>
         <location filename="../build/ui_mainwindow.h" line="567"/>
         <source>&amp;Manage dive sites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="735"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="734"/>
         <source>Dive Site &amp;Edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="740"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="739"/>
         <source>Facebook</source>
         <translation>Facebook</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="745"/>
-        <source>Add GPS location here</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="744"/>
+        <source>Take cloud storage online</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="677"/>
-        <location filename="../build/ui_mainwindow.h" line="557"/>
-        <source>Ctrl+F</source>
-        <translation>Ctrl+F</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="213"/>
-        <location filename="../build/ui_mainwindow.h" line="478"/>
-        <source>&amp;Print</source>
-        <translation>&amp;Yazdır</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="224"/>
-        <location filename="../build/ui_mainwindow.h" line="481"/>
-        <source>Ctrl+,</source>
-        <translation>Ctrl+,</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="232"/>
-        <location filename="../build/ui_mainwindow.h" line="482"/>
-        <source>&amp;Quit</source>
-        <translation>&amp;Çıkış</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="243"/>
-        <location filename="../build/ui_mainwindow.h" line="484"/>
-        <source>Import from &amp;dive computer</source>
-        <translation>&amp;Dalış bilgisayarından içe aktar</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="254"/>
-        <location filename="../build/ui_mainwindow.h" line="487"/>
-        <source>Ctrl+G</source>
-        <translation>Ctrl+G</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="267"/>
-        <location filename="../build/ui_mainwindow.h" line="490"/>
-        <source>Ctrl++</source>
-        <translation>Ctrl++</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="293"/>
-        <location filename="../build/ui_mainwindow.h" line="496"/>
-        <source>&amp;Renumber</source>
-        <translation>&amp;Yeniden numarala</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="296"/>
-        <location filename="../build/ui_mainwindow.h" line="497"/>
-        <source>Ctrl+R</source>
-        <translation>Ctrl+R</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="312"/>
-        <location filename="../build/ui_mainwindow.h" line="500"/>
-        <source>Ctrl+Y</source>
-        <translation>Ctrl+Y</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="392"/>
-        <location filename="../build/ui_mainwindow.h" line="519"/>
-        <source>Ctrl+L</source>
-        <translation>Ctrl+L</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="216"/>
-        <location filename="../build/ui_mainwindow.h" line="479"/>
-        <source>Ctrl+P</source>
-        <translation>Ctrl+P</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="235"/>
-        <location filename="../build/ui_mainwindow.h" line="483"/>
-        <source>Ctrl+Q</source>
-        <translation>Ctrl+Q</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="246"/>
-        <location filename="../build/ui_mainwindow.h" line="485"/>
-        <source>Ctrl+D</source>
-        <translation>Ctrl+D</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="264"/>
-        <location filename="../build/ui_mainwindow.h" line="489"/>
-        <source>&amp;Add dive</source>
-        <translation>&amp;Dalış ekle</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="304"/>
-        <location filename="../build/ui_mainwindow.h" line="498"/>
-        <source>Auto &amp;group</source>
-        <translation>&amp;Otomatik grup</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="309"/>
-        <location filename="../build/ui_mainwindow.h" line="499"/>
-        <source>&amp;Yearly statistics</source>
-        <translation>&amp;Yıllık istatistikler</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="317"/>
-        <location filename="../build/ui_mainwindow.h" line="501"/>
-        <source>&amp;Dive list</source>
-        <translation>&amp;Dalış listesi</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="320"/>
-        <location filename="../build/ui_mainwindow.h" line="502"/>
-        <source>Ctrl+2</source>
-        <translation>Ctrl+2</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="328"/>
-        <location filename="../build/ui_mainwindow.h" line="504"/>
-        <source>Ctrl+3</source>
-        <translation>Ctrl+3</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="336"/>
-        <location filename="../build/ui_mainwindow.h" line="506"/>
-        <source>Ctrl+4</source>
-        <translation>Ctrl+4</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="344"/>
-        <location filename="../build/ui_mainwindow.h" line="508"/>
-        <source>Ctrl+1</source>
-        <translation>Ctrl+1</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="349"/>
-        <location filename="../build/ui_mainwindow.h" line="509"/>
-        <source>P&amp;revious DC</source>
+        <location filename="../build/ui_mainwindow.h" line="558"/>
+        <source>Toggle tissue graph</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="352"/>
-        <location filename="../build/ui_mainwindow.h" line="510"/>
-        <source>Left</source>
-        <translation>Sol</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="360"/>
-        <location filename="../build/ui_mainwindow.h" line="512"/>
-        <source>Right</source>
-        <translation>Sağ</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="373"/>
-        <location filename="../build/ui_mainwindow.h" line="514"/>
-        <source>User &amp;manual</source>
-        <translation>&amp;Kullanıcı rehberi</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="376"/>
-        <location filename="../build/ui_mainwindow.h" line="515"/>
-        <source>F1</source>
-        <translation>F1</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="384"/>
-        <location filename="../build/ui_mainwindow.h" line="517"/>
-        <source>Ctrl+5</source>
-        <translation>Ctrl+5</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="389"/>
-        <location filename="../build/ui_mainwindow.h" line="518"/>
-        <source>P&amp;lan dive</source>
-        <translation>&amp;Dalış planı</translation>
+        <location filename="../build/ui_mainwindow.h" line="565"/>
+        <source>Open cloud storage</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="397"/>
-        <location filename="../build/ui_mainwindow.h" line="520"/>
-        <source>&amp;Import log files</source>
-        <translation>&amp;Kayıt dosyalarını içe aktar</translation>
+        <location filename="../build/ui_mainwindow.h" line="566"/>
+        <source>Save to cloud storage</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="400"/>
-        <location filename="../build/ui_mainwindow.h" line="522"/>
-        <source>Import divelog files from other applications</source>
-        <translation>Diğer uygulamalardan dalış kayıt dosyalarını içe aktar</translation>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="331"/>
+        <source>Connect to</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="422"/>
-        <location filename="../build/ui_mainwindow.h" line="530"/>
-        <source>F11</source>
-        <translation>F11</translation>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="493"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="538"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1545"/>
+        <source>Please save or cancel the current dive edit before opening a new file.</source>
+        <translation>Lütfen yeni bir dosya açmadan önce geçerli dalışı düzenle, kaydet veya iptal et.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="505"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="499"/>
         <source>Open file</source>
         <translation>Dosya aç</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="509"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="503"/>
         <location filename="../desktop-widgets/mainwindow.cpp" line="614"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1972"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1978"/>
         <source>Cancel</source>
         <translation>İptal</translation>
     </message>
@@ -5242,6 +5341,16 @@ mixed from Air and using:
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="649"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="796"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="977"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="983"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1849"/>
+        <source>Warning</source>
+        <translation>Uyarı</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="674"/>
         <source>Please save or cancel the current dive edit before closing the file.</source>
         <translation>Dosyayı kapatmadan önce geçerli dalışı düzenle, kaydet veya iptal et.</translation>
@@ -5257,124 +5366,97 @@ mixed from Air and using:
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="982"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
+        <source>Trying to replan a dive that&apos;s not a planned dive.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="977"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1849"/>
+        <source>Please, first finish the current edition before trying to do another.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="983"/>
         <source>Trying to edit a dive that&apos;s not a manually added dive.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1243"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1030"/>
+        <source>Yearly statistics</source>
+        <translation>Yıllık istatistikler</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1244"/>
         <source>Do you want to save the changes that you made in the file %1?</source>
         <translation>%1 dosyasında yapılan değişiklikleri kaydetmek istiyor musunuz?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1246"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1247"/>
         <source>Do you want to save the changes that you made in the data file?</source>
         <translation>Veri dosyasında yapılan değişiklikleri kaydetmek istiyor musunuz?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1251"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1252"/>
         <source>Save changes?</source>
         <translation>Değişiklikler kaydedilsin mi ?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1587"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1253"/>
+        <source>Changes will be lost if you don&apos;t save them.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1572"/>
         <source>Save file as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1682"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1573"/>
+        <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
+        <translation>Subsurface XML dosyaları (*.ssrf *.xml *.XML)</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1670"/>
+        <source>[local cache for] %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1672"/>
         <source>[cloud storage for] %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1782"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1788"/>
         <source>Opening datafile from older version</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1783"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1789"/>
         <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly.
 Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1794"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1800"/>
         <source>Open dive log file</source>
         <translation>Dalış kayıt dosyasını aç</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1795"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1801"/>
         <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1972"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1978"/>
         <source>Contacting cloud service...</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1252"/>
-        <source>Changes will be lost if you don&apos;t save them.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="649"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="796"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="976"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="982"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/>
-        <source>Warning</source>
-        <translation>Uyarı</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="499"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="544"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1560"/>
-        <source>Please save or cancel the current dive edit before opening a new file.</source>
-        <translation>Lütfen yeni bir dosya açmadan önce geçerli dalışı düzenle, kaydet veya iptal et.</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="338"/>
-        <source>Connect to</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
-        <source>Trying to replan a dive that&apos;s not a planned dive.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1029"/>
-        <source>Yearly statistics</source>
-        <translation>Yıllık istatistikler</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1588"/>
-        <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
-        <translation>Subsurface XML dosyaları (*.ssrf *.xml *.XML)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="976"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/>
-        <source>Please, first finish the current edition before trying to do another.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../build/ui_mainwindow.h" line="565"/>
-        <source>Open cloud storage</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../build/ui_mainwindow.h" line="566"/>
-        <source>Save to cloud storage</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>MultiFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="733"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="731"/>
         <source>Filter shows %1 (of %2) dives</source>
         <translation type="unfinished"/>
     </message>
@@ -5382,39 +5464,39 @@ Subsurface has already tried to pre-populate the data but it might be worth whil
 <context>
     <name>OstcFirmwareCheck</name>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="269"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="271"/>
         <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="273"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="275"/>
         <source>
 
 Please start Bluetooth on your OSTC Sport and do the same preparations as for a logbook download before continuing with the update</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="274"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="276"/>
         <source>Not now</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="275"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="277"/>
         <source>Update firmware</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="277"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="279"/>
         <source>Firmware upgrade notice</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="295"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="297"/>
         <source>Save the downloaded firmware as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="296"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="298"/>
         <source>HEX files (*.hex)</source>
         <translation>HEX dosyaları (*.hex)</translation>
     </message>
@@ -5422,79 +5504,89 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PlannerSettingsWidget</name>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="322"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="302"/>
         <source>Open circuit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="322"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="302"/>
         <source>CCR</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="322"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="302"/>
         <source>pSCR</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="421"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="388"/>
         <source>ft/min</source>
         <translation>fit/dak</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="422"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="389"/>
         <source>Last stop at 20ft</source>
         <translation>20 fit son durak</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="423"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="390"/>
         <source>50% avg. depth to 20ft</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="424"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="391"/>
         <source>20ft to surface</source>
         <translation>Yüzeye 20 fit</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="426"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="392"/>
+        <source>ft</source>
+        <translation>fit</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="394"/>
         <source>m/min</source>
         <translation>m/dak</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="427"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="395"/>
         <source>Last stop at 6m</source>
         <translation>6m son durak</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="428"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="396"/>
         <source>50% avg. depth to 6m</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="429"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="397"/>
         <source>6m to surface</source>
         <translation>yüzeye 6m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="432"/>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="433"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="398"/>
+        <source>m</source>
+        <translation>m</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="401"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="402"/>
         <source>cuft/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="441"/>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="442"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="410"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="411"/>
         <source>ℓ/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="451"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="420"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="456"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="425"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
@@ -5644,6 +5736,11 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PreferencesDialog</name>
     <message>
+        <location filename="../build/ui_preferences.h" line="1283"/>
+        <source>Preferences</source>
+        <translation>Tercihler</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1288"/>
         <source>Defaults</source>
         <translation>Varsayılanlar</translation>
@@ -5679,6 +5776,11 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1303"/>
+        <source>Lists and tables</source>
+        <translation>Liste ve tablolar</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1304"/>
         <source>Font</source>
         <translation>Yazı tipi</translation>
@@ -5694,6 +5796,11 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>Dalışlar</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1307"/>
+        <source>Default dive log file</source>
+        <translation>Varsayılan dalış kayıt dosyası</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1308"/>
         <source>No default file</source>
         <translation type="unfinished"/>
@@ -5724,6 +5831,21 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>...</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1314"/>
+        <source>Display invalid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1316"/>
+        <source>Default cylinder</source>
+        <translation>Varsayılan tüp</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1317"/>
+        <source>Use default cylinder</source>
+        <translation>Varsayılan tüpü kullan</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1318"/>
         <source>Animations</source>
         <translation>Animasyonlar</translation>
@@ -5754,42 +5876,26 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>Sistem</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1401"/>
-        <source>Dive site geo lookup</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1402"/>
-        <source>Enable geocoding for dive site management</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1403"/>
-        <source>Parse site without GPS data</source>
+        <location filename="../build/ui_preferences.h" line="1324"/>
+        <source>&amp;Metric</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1404"/>
-        <source>Same format for existing dives</source>
-        <translation type="unfinished"/>
+        <location filename="../build/ui_preferences.h" line="1325"/>
+        <source>Imperial</source>
+        <translation>Emperyal</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1405"/>
-        <source>Dive Site Layout</source>
+        <location filename="../build/ui_preferences.h" line="1326"/>
+        <source>Personali&amp;ze</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1406"/>
-        <location filename="../build/ui_preferences.h" line="1407"/>
-        <source>/</source>
+        <location filename="../build/ui_preferences.h" line="1327"/>
+        <source>Individual settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1325"/>
-        <source>Imperial</source>
-        <translation>Emperyal</translation>
-    </message>
-    <message>
         <location filename="../build/ui_preferences.h" line="1328"/>
         <source>Depth</source>
         <translation>Derinlik</translation>
@@ -5805,6 +5911,11 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>fit</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1331"/>
+        <source>Pressure</source>
+        <translation>Basınç</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1332"/>
         <location filename="../build/ui_preferences.h" line="1366"/>
         <source>bar</source>
@@ -5816,11 +5927,26 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>psi</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1334"/>
+        <source>Volume</source>
+        <translation>Hacim</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1335"/>
+        <source>&amp;liter</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1336"/>
         <source>cu ft</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1337"/>
+        <source>Temperature</source>
+        <translation>Sıcaklık</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1338"/>
         <source>celsius</source>
         <translation>santigrat</translation>
@@ -5831,11 +5957,121 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>fahrenhayt</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1340"/>
+        <source>Weight</source>
+        <translation>Ağırlık</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1341"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1342"/>
+        <source>lbs</source>
+        <translation>libre</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1343"/>
+        <source>Time units</source>
+        <translation>Zaman birimleri</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1344"/>
+        <source>Ascent/descent speed denominator</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1345"/>
+        <source>Minutes</source>
+        <translation>Dakika</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1346"/>
+        <source>Seconds</source>
+        <translation>Saniye</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1347"/>
+        <source>GPS coordinates</source>
+        <translation>GPS koordinatları</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1348"/>
+        <source>Location Display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1349"/>
+        <source>traditional (dms)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1350"/>
+        <source>decimal</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1351"/>
+        <source>Show</source>
+        <translation>Göster</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1352"/>
+        <source>Threshold when showing pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1353"/>
+        <source>Threshold when showing pN₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1354"/>
+        <source>Threshold when showing pHe</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1355"/>
+        <source>Max pO₂ when showing MOD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1356"/>
+        <source>Draw dive computer reported ceiling red</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1357"/>
+        <source>Show unused cylinders in Equipment tab</source>
+        <translation>Ekipman sekmesinde kullanılmayan tüpleri göster</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1358"/>
+        <source>Show average depth</source>
+        <translation>Ortalama derinliği göster</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1359"/>
+        <source>Misc</source>
+        <translation>Çeşitli</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1360"/>
+        <source>GFLow</source>
+        <translation>EFDüşük</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1361"/>
+        <source>GFHigh</source>
+        <translation>EFYüksek</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1362"/>
+        <source>GFLow at max depth</source>
+        <translation>Azami derinlikte EFDüşük</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1363"/>
         <source>CCR: show setpoints when viewing pO₂</source>
         <translation type="unfinished"/>
@@ -5881,13 +6117,18 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>Varsayılan sistem</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1374"/>
+        <source>Filter</source>
+        <translation>Filtre</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1375"/>
         <source>Proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1379"/>
-        <source>Proxy type</source>
+        <location filename="../build/ui_preferences.h" line="1376"/>
+        <source>Port</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -5896,16 +6137,16 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1376"/>
-        <source>Port</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../build/ui_preferences.h" line="1378"/>
         <source>Requires authentication</source>
         <translation>Kimlik doğrulaması gerektirir</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1379"/>
+        <source>Proxy type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1380"/>
         <source>Username</source>
         <translation>Kullanıcı adı</translation>
@@ -5917,46 +6158,6 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>Parola</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1400"/>
-        <source>Disconnect from Facebook</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1374"/>
-        <source>Filter</source>
-        <translation>Filtre</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1331"/>
-        <source>Pressure</source>
-        <translation>Basınç</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1303"/>
-        <source>Lists and tables</source>
-        <translation>Liste ve tablolar</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1307"/>
-        <source>Default dive log file</source>
-        <translation>Varsayılan dalış kayıt dosyası</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1314"/>
-        <source>Display invalid</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1316"/>
-        <source>Default cylinder</source>
-        <translation>Varsayılan tüp</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1317"/>
-        <source>Use default cylinder</source>
-        <translation>Varsayılan tüpü kullan</translation>
-    </message>
-    <message>
         <location filename="../build/ui_preferences.h" line="1382"/>
         <source>Subsurface cloud storage</source>
         <translation type="unfinished"/>
@@ -5997,150 +6198,41 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>Yerel kullanıcı kimliği kaydedilsin mi ?</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1334"/>
-        <source>Volume</source>
-        <translation>Hacim</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1337"/>
-        <source>Temperature</source>
-        <translation>Sıcaklık</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1340"/>
-        <source>Weight</source>
-        <translation>Ağırlık</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1342"/>
-        <source>lbs</source>
-        <translation>libre</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1343"/>
-        <source>Time units</source>
-        <translation>Zaman birimleri</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1345"/>
-        <source>Minutes</source>
-        <translation>Dakika</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1346"/>
-        <source>Seconds</source>
-        <translation>Saniye</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1351"/>
-        <source>Show</source>
-        <translation>Göster</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1362"/>
-        <source>GFLow at max depth</source>
-        <translation>Azami derinlikte EFDüşük</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1359"/>
-        <source>Misc</source>
-        <translation>Çeşitli</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1283"/>
-        <source>Preferences</source>
-        <translation>Tercihler</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1324"/>
-        <source>&amp;Metric</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1326"/>
-        <source>Personali&amp;ze</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1327"/>
-        <source>Individual settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1335"/>
-        <source>&amp;liter</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1344"/>
-        <source>Ascent/descent speed denominator</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1347"/>
-        <source>GPS coordinates</source>
-        <translation>GPS koordinatları</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1348"/>
-        <source>Location Display</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1349"/>
-        <source>traditional (dms)</source>
+        <location filename="../build/ui_preferences.h" line="1400"/>
+        <source>Disconnect from Facebook</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1350"/>
-        <source>decimal</source>
+        <location filename="../build/ui_preferences.h" line="1401"/>
+        <source>Dive site geo lookup</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1352"/>
-        <source>Threshold when showing pO₂</source>
+        <location filename="../build/ui_preferences.h" line="1402"/>
+        <source>Enable geocoding for dive site management</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1353"/>
-        <source>Threshold when showing pN₂</source>
+        <location filename="../build/ui_preferences.h" line="1403"/>
+        <source>Parse site without GPS data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1354"/>
-        <source>Threshold when showing pHe</source>
+        <location filename="../build/ui_preferences.h" line="1404"/>
+        <source>Same format for existing dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1355"/>
-        <source>Max pO₂ when showing MOD</source>
+        <location filename="../build/ui_preferences.h" line="1405"/>
+        <source>Dive Site Layout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1356"/>
-        <source>Draw dive computer reported ceiling red</source>
+        <location filename="../build/ui_preferences.h" line="1406"/>
+        <location filename="../build/ui_preferences.h" line="1407"/>
+        <source>/</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1357"/>
-        <source>Show unused cylinders in Equipment tab</source>
-        <translation>Ekipman sekmesinde kullanılmayan tüpleri göster</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1358"/>
-        <source>Show average depth</source>
-        <translation>Ortalama derinliği göster</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1360"/>
-        <source>GFLow</source>
-        <translation>EFDüşük</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1361"/>
-        <source>GFHigh</source>
-        <translation>EFYüksek</translation>
-    </message>
 </context>
 <context>
     <name>PreferencesGeoreference</name>
@@ -6195,106 +6287,136 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="20"/>
-        <source>Show</source>
-        <translation>Göster</translation>
+        <source>Gas pressure display setup</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="29"/>
-        <source>Threshold when showing pO₂</source>
+        <source>Threshold for pO₂ (bar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="49"/>
-        <source>Threshold when showing pN₂</source>
+        <source>Threshold for pN₂ (bar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="69"/>
-        <source>Threshold when showing pHe</source>
+        <source>Threshold for pHe (bar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="89"/>
-        <source>Max pO₂ when showing MOD</source>
+        <source>pO₂ in calculating MOD (bar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="109"/>
-        <source>Draw dive computer reported ceiling red</source>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="106"/>
+        <source>CCR options:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="116"/>
-        <source>Show unused cylinders in Equipment tab</source>
-        <translation>Ekipman sekmesinde kullanılmayan tüpleri göster</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="113"/>
+        <source>Dive planner default setpoint (bar)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="123"/>
-        <source>Show mean depth</source>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="133"/>
+        <source>Show setpoints when viewing pO₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="133"/>
-        <source>Misc</source>
-        <translation>Çeşitli</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="140"/>
+        <source>Show individual O₂ sensor values when viewing pO₂</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="149"/>
-        <source>bar</source>
-        <translation>bar</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="150"/>
+        <source>Ceiling display setup</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="165"/>
-        <source>Default CCR set-point for dive planning</source>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="159"/>
+        <source>Draw dive computer reported ceiling red</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="172"/>
-        <source>pSCR O₂ metabolism rate</source>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="169"/>
+        <source>Algorithm for calculated ceiling:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="179"/>
-        <source>GFLow</source>
-        <translation>EFDüşük</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="176"/>
+        <source>VPM-B</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="183"/>
+        <source>VPM-B Conservatism</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="186"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="193"/>
+        <source>+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="206"/>
+        <source>Bühlmann</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="216"/>
         <source>GFHigh</source>
         <translation>EFYüksek</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="203"/>
-        <source>ℓ/min</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="236"/>
+        <source>GFLow</source>
+        <translation>EFDüşük</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="213"/>
-        <source>pSCR ratio</source>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="256"/>
+        <source>GFLow at max depth</source>
+        <translation>Azami derinlikte EFDüşük</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="263"/>
+        <source>pSCR options:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="223"/>
-        <source>1:</source>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="270"/>
+        <source>Metabolic rate (ℓ O₂/min)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="230"/>
-        <source>CCR: show individual O₂ sensor values when viewing pO₂</source>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="287"/>
+        <source>Dilution ratio</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="237"/>
-        <source>CCR: show setpoints when viewing pO₂</source>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="300"/>
+        <source>1:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="244"/>
-        <source>GFLow at max depth</source>
-        <translation>Azami derinlikte EFDüşük</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="310"/>
+        <source>Misc</source>
+        <translation>Çeşitli</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="316"/>
+        <source>Show unused cylinders in Equipment tab</source>
+        <translation>Ekipman sekmesinde kullanılmayan tüpleri göster</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="10"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="323"/>
+        <source>Show mean depth in Profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="9"/>
         <source>Graph</source>
         <translation>Grafik</translation>
     </message>
@@ -6363,15 +6485,29 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>Lisan</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="57"/>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="53"/>
         <source>Restart required</source>
         <translation>Yeniden başlatma gerekli</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="58"/>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="54"/>
         <source>To correctly load a new language you must restart Subsurface.</source>
         <translation>Subsurface yeni bir dil yüklemek için yeniden başlatmanız gerekir.</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="76"/>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="82"/>
+        <source>Literal characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="77"/>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="83"/>
+        <source>Non-special character(s) in time format.
+These will be used as is. This might not be what you intended.
+See http://doc.qt.io/qt-5/qdatetime.html#toString</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PreferencesNetwork</name>
@@ -6418,7 +6554,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_network.ui" line="156"/>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="148"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="134"/>
         <source>Subsurface cloud storage</source>
         <translation type="unfinished"/>
     </message>
@@ -6463,39 +6599,39 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>Yerel kullanıcı kimliği kaydedilsin mi ?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="11"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="10"/>
         <source>Network</source>
         <translation>Ağ</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="15"/>
         <source>No proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/>
         <source>System proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/>
         <source>HTTP proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="19"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/>
         <source>SOCKS proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="75"/>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="97"/>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="110"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="72"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="93"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="106"/>
         <source>Cloud storage email and password can only consist of letters, numbers, and &apos;.&apos;, &apos;-&apos;, &apos;_&apos;, and &apos;+&apos;.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="146"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="132"/>
         <source>Subsurface cloud storage (credentials verified)</source>
         <translation type="unfinished"/>
     </message>
@@ -6653,7 +6789,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="8"/>
+        <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="7"/>
         <source>Units</source>
         <translation>Birimler</translation>
     </message>
@@ -6661,17 +6797,17 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PrintDialog</name>
     <message>
-        <location filename="../desktop-widgets/printdialog.cpp" line="118"/>
-        <source>&amp;Preview</source>
-        <translation>&amp;Önizleme</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/printdialog.cpp" line="115"/>
+        <location filename="../desktop-widgets/printdialog.cpp" line="102"/>
         <source>P&amp;rint</source>
         <translation>&amp;Yazdır</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/printdialog.cpp" line="130"/>
+        <location filename="../desktop-widgets/printdialog.cpp" line="105"/>
+        <source>&amp;Preview</source>
+        <translation>&amp;Önizleme</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/printdialog.cpp" line="117"/>
         <source>Print</source>
         <translation>Yazdır</translation>
     </message>
@@ -6679,19 +6815,10 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PrintOptions</name>
     <message>
-        <location filename="../build/ui_printoptions.h" line="150"/>
-        <source>&amp;Table print</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../build/ui_printoptions.h" line="158"/>
-        <source>One dive per page</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../build/ui_printoptions.h" line="159"/>
-        <source>Two dives per page</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/printoptions.ui" line="29"/>
+        <location filename="../build/ui_printoptions.h" line="148"/>
+        <source>Print type</source>
+        <translation>Baskı türü</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/printoptions.ui" line="41"/>
@@ -6751,10 +6878,19 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/printoptions.ui" line="29"/>
-        <location filename="../build/ui_printoptions.h" line="148"/>
-        <source>Print type</source>
-        <translation>Baskı türü</translation>
+        <location filename="../build/ui_printoptions.h" line="150"/>
+        <source>&amp;Table print</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../build/ui_printoptions.h" line="158"/>
+        <source>One dive per page</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../build/ui_printoptions.h" line="159"/>
+        <source>Two dives per page</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/printoptions.cpp" line="128"/>
@@ -6796,103 +6932,103 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="755"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="752"/>
         <source>Show NDL / TTS was disabled because of excessive processing time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1344"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1338"/>
         <source>Make first divecomputer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1346"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1340"/>
         <source>Delete this divecomputer</source>
         <translation>Dalış bilgisayarı sil</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1360"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1354"/>
         <source>Add gas change</source>
         <translation>Gaz değişimi ekle</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1363"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1357"/>
         <source> (Tank %1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1371"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1365"/>
         <source>Add set-point change</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1373"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1367"/>
         <source>Add bookmark</source>
         <translation>Yerimi ekle</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1377"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1371"/>
         <source>Edit the profile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1381"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1375"/>
         <source>Remove event</source>
         <translation>OLay kaldır</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1386"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1380"/>
         <source>Hide similar events</source>
         <translation>Benzer olayları gizle</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1393"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1387"/>
         <source>Edit name</source>
         <translation>İsmi düzenle</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1422"/>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1429"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1416"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1423"/>
         <source>Adjust pressure of tank %1 (currently interpolated as %2)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1444"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1438"/>
         <source>Unhide all events</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1479"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1473"/>
         <source>Hide events</source>
         <translation>Olayları gizle</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1479"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1473"/>
         <source>Hide all %1 events?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1514"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1508"/>
         <source>Remove the selected event?</source>
         <translation>Seçili olayları kaldırılsın mı ?</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1515"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1509"/>
         <source>%1 @ %2:%3</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1638"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1632"/>
         <source>Edit name of bookmark</source>
         <translation>Yeriminde ismi düzenle</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1639"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1633"/>
         <source>Custom name:</source>
         <translation>Özel isim:</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1644"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1638"/>
         <source>Name is too long!</source>
         <translation>İsim çok uzun!</translation>
     </message>
@@ -6900,91 +7036,101 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>QMLManager</name>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="95"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="97"/>
         <source>Starting...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="202"/>
         <source>working in no-cloud mode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="213"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="216"/>
         <source>no cloud credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="214"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="270"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="217"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="269"/>
         <source>Please enter valid cloud credentials.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="285"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="284"/>
         <source>Attempting to open cloud storage with new credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="304"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="306"/>
         <source>Testing cloud credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="331"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="320"/>
+        <source>No response from cloud server to validate the credentials</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="329"/>
+        <source>Cannot connect to cloud storage - cloud account not verified</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="361"/>
         <source>Cloud credentials are invalid</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="344"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="374"/>
         <source>Cannot open cloud storage: Error creating https connection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="357"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="387"/>
         <source>Cannot open cloud storage: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="369"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="399"/>
         <source>Cannot connect to cloud storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="411"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="441"/>
         <source>Cloud storage error: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="501"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="531"/>
         <source>Failed to connect to cloud server, reverting to no cloud status</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="520"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="550"/>
         <source>Cloud storage open successfully. No dives in dive list.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="689"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="690"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="721"/>
         <source>h</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="689"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="690"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="691"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="721"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="722"/>
         <source>min</source>
         <translation>dak</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="689"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/>
         <source>sec</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="1041"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="1102"/>
         <source>Unknown GPS location</source>
         <translation type="unfinished"/>
     </message>
@@ -6992,126 +7138,126 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../core/qthelper.cpp" line="866"/>
-        <location filename="../core/qthelper.cpp" line="1214"/>
-        <source>AIR</source>
-        <translation>HAVA</translation>
+        <location filename="../core/gpslocation.h" line="13"/>
+        <source>Waiting to aquire GPS location</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="1214"/>
-        <source>OXYGEN</source>
-        <translation type="unfinished"/>
+        <location filename="../core/qthelper.cpp" line="766"/>
+        <location filename="../core/qthelper.cpp" line="1275"/>
+        <source>m</source>
+        <translation>m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="59"/>
-        <source>Remove this point</source>
-        <translation>Bu noktayı kaldır</translation>
+        <location filename="../core/qthelper.cpp" line="768"/>
+        <location filename="../core/qthelper.cpp" line="1274"/>
+        <source>ft</source>
+        <translation>fit</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="32"/>
-        <source>Average</source>
-        <translation>Ortalama</translation>
+        <location filename="../core/qthelper.cpp" line="794"/>
+        <source>C</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="35"/>
-        <source>Minimum</source>
-        <translation>Asgari</translation>
+        <location filename="../core/qthelper.cpp" line="796"/>
+        <source>F</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="38"/>
-        <source>Maximum</source>
-        <translation>Azami</translation>
+        <location filename="../core/qthelper.cpp" line="821"/>
+        <location filename="../core/qthelper.cpp" line="1250"/>
+        <source>kg</source>
+        <translation>kg</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/globe.cpp" line="327"/>
-        <source>Move the map and double-click to set the dive location</source>
-        <translation type="unfinished"/>
+        <location filename="../core/qthelper.cpp" line="823"/>
+        <location filename="../core/qthelper.cpp" line="1251"/>
+        <source>lbs</source>
+        <translation>libre</translation>
     </message>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="28"/>
-        <source>unknown</source>
-        <translation>bilinmeyen</translation>
+        <location filename="../core/qthelper.cpp" line="848"/>
+        <location filename="../core/qthelper.cpp" line="1300"/>
+        <source>bar</source>
+        <translation>bar</translation>
     </message>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="105"/>
-        <source>h:</source>
-        <translation>s:</translation>
+        <location filename="../core/qthelper.cpp" line="850"/>
+        <location filename="../core/qthelper.cpp" line="1299"/>
+        <source>psi</source>
+        <translation>psi</translation>
     </message>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="105"/>
-        <source>min</source>
-        <translation>dak</translation>
+        <location filename="../core/qthelper.cpp" line="871"/>
+        <location filename="../core/qthelper.cpp" line="1235"/>
+        <source>AIR</source>
+        <translation>HAVA</translation>
     </message>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="337"/>
-        <source>Multiple</source>
+        <location filename="../core/qthelper.cpp" line="873"/>
+        <source>EAN</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="../core/qthelper.cpp" line="957"/>
+        <location filename="../core/qthelper.cpp" line="962"/>
         <source>(%n dive(s))</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="816"/>
-        <location filename="../core/qthelper.cpp" line="1228"/>
-        <source>kg</source>
-        <translation>kg</translation>
+        <location filename="../core/qthelper.cpp" line="1235"/>
+        <source>OXYGEN</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="818"/>
-        <location filename="../core/qthelper.cpp" line="1229"/>
-        <source>lbs</source>
-        <translation>libre</translation>
+        <location filename="../core/qthelper.cpp" line="1322"/>
+        <source>l</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="763"/>
-        <location filename="../core/qthelper.cpp" line="1252"/>
-        <source>ft</source>
-        <translation>fit</translation>
+        <location filename="../core/qthelper.cpp" line="1323"/>
+        <source>cuft</source>
+        <translation>fitküp</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="761"/>
-        <location filename="../core/qthelper.cpp" line="1253"/>
-        <source>m</source>
-        <translation>m</translation>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="29"/>
+        <source>unknown</source>
+        <translation>bilinmeyen</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="789"/>
-        <source>C</source>
-        <translation type="unfinished"/>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="114"/>
+        <source>h:</source>
+        <translation>s:</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="791"/>
-        <source>F</source>
-        <translation type="unfinished"/>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="114"/>
+        <source>min</source>
+        <translation>dak</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="845"/>
-        <location filename="../core/qthelper.cpp" line="1275"/>
-        <source>psi</source>
-        <translation>psi</translation>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="63"/>
+        <source>Remove this point</source>
+        <translation>Bu noktayı kaldır</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="843"/>
-        <location filename="../core/qthelper.cpp" line="1276"/>
-        <source>bar</source>
-        <translation>bar</translation>
+        <location filename="../desktop-widgets/globe.cpp" line="327"/>
+        <source>Move the map and double-click to set the dive location</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="868"/>
-        <source>EAN</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="32"/>
+        <source>Average</source>
+        <translation>Ortalama</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="1298"/>
-        <source>l</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="35"/>
+        <source>Minimum</source>
+        <translation>Asgari</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="1299"/>
-        <source>cuft</source>
-        <translation>fitküp</translation>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="38"/>
+        <source>Maximum</source>
+        <translation>Azami</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="625"/>
@@ -7133,17 +7279,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <source>Malformed XML response. Line %1: %2</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../core/gpslocation.h" line="13"/>
-        <source>Waiting to aquire GPS location</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>ReadSettingsThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1651"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1676"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1640"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1665"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation type="unfinished"/>
     </message>
@@ -7172,7 +7313,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ResetSettingsThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1775"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1764"/>
         <source>Reset settings failed!</source>
         <translation type="unfinished"/>
     </message>
@@ -7210,6 +7351,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ShiftImageTimesDialog</name>
     <message>
+        <location filename="../desktop-widgets/shiftimagetimes.ui" line="23"/>
+        <location filename="../build/ui_shiftimagetimes.h" line="184"/>
+        <source>Shift selected image times</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/shiftimagetimes.ui" line="34"/>
         <location filename="../build/ui_shiftimagetimes.h" line="185"/>
         <source>Shift times of image(s) by</source>
@@ -7222,12 +7369,6 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>s:dd</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/shiftimagetimes.ui" line="23"/>
-        <location filename="../build/ui_shiftimagetimes.h" line="184"/>
-        <source>Shift selected image times</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/shiftimagetimes.ui" line="105"/>
         <location filename="../build/ui_shiftimagetimes.h" line="187"/>
         <source>Earlier</source>
@@ -7277,12 +7418,12 @@ Not all images have timestamps in the range between
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="297"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="296"/>
         <source>Open image file</source>
         <translation>Görüntü dosyası aç</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="299"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="298"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>Görüntü dosyaları (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -7440,51 +7581,51 @@ Not all images have timestamps in the range between
 <context>
     <name>SocialNetworkDialog</name>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="339"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="284"/>
         <source>Dive date: %1 
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="342"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="287"/>
         <source>Duration: %1 
 </source>
         <translation>Süre: %1 
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="343"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="288"/>
         <source>h:</source>
         <comment>abbreviation for hours plus separator</comment>
         <translation>s:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="344"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="289"/>
         <source>min</source>
         <comment>abbreviation for minutes</comment>
         <translation>dak</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="347"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="292"/>
         <source>Dive location: %1 
 </source>
         <translation>Dalış konumu: %1 
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="350"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="295"/>
         <source>Buddy: %1 
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="353"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="298"/>
         <source>Divemaster: %1 
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="356"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="301"/>
         <source>
 %1</source>
         <translation>
@@ -7570,9 +7711,20 @@ Not all images have timestamps in the range between
     <name>StartPage</name>
     <message>
         <location filename="../mobile-widgets/qml/StartPage.qml" line="19"/>
-        <source>To use Subsurface-mobile with Subsurface cloud storage, please enteryour cloud credentials.
+        <source>To use Subsurface-mobile with Subsurface cloud storage, please enter your cloud credentials.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/StartPage.qml" line="20"/>
+        <source>If this is the first time you use Subsurface cloud storage, enter a valid email (all lower case) and a password of your choice (letters and numbers). The server will send a PIN to the email address provided that you will have to enter here.
 
-To use Subsurface-mobile only with local data on this device, tap on the no cloud icon below.</source>
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/StartPage.qml" line="23"/>
+        <source>To use Subsurface-mobile only with local data on this device, tap on the no cloud icon below.</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -7611,7 +7763,12 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>SubsurfaceWebServices</name>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="419"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="395"/>
+        <source>Enter User ID and click Download</source>
+        <translation>Kullanıcı kimliğini gir ve indir tıkla</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="417"/>
         <source>Webservice</source>
         <translation>Webservisi</translation>
     </message>
@@ -7636,30 +7793,25 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
         <translation>Bağlantı hatası: </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="557"/>
-        <source>Download successful</source>
-        <translation>İndirme başarılı</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="551"/>
         <source>Invalid user identifier!</source>
         <translation>Geçersiz kullanıcı tanımlayıcı!</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="397"/>
-        <source>Enter User ID and click Download</source>
-        <translation>Kullanıcı kimliğini gir ve indir tıkla</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="554"/>
         <source>Cannot parse response!</source>
         <translation>Yanıt ayrıştırılamaz!</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="557"/>
+        <source>Download successful</source>
+        <translation>İndirme başarılı</translation>
+    </message>
 </context>
 <context>
     <name>SuitFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="674"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="672"/>
         <source>Suits: </source>
         <translation type="unfinished"/>
     </message>
@@ -7667,7 +7819,7 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>SuitsFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="123"/>
+        <location filename="../qt-models/filtermodels.cpp" line="128"/>
         <source>No suit set</source>
         <translation type="unfinished"/>
     </message>
@@ -7686,7 +7838,7 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>TagFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="595"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="593"/>
         <source>Tags: </source>
         <translation>Etiketler:</translation>
     </message>
@@ -7694,7 +7846,7 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>TagFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="148"/>
+        <location filename="../qt-models/filtermodels.cpp" line="153"/>
         <source>Empty tags</source>
         <translation type="unfinished"/>
     </message>
@@ -7720,6 +7872,11 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>TemplateEdit</name>
     <message>
+        <location filename="../desktop-widgets/templateedit.ui" line="14"/>
+        <source>Edit template</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/templateedit.ui" line="37"/>
         <source>Preview</source>
         <translation type="unfinished"/>
@@ -7765,11 +7922,6 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
         <translation>Yazı tipi boyutu</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/templateedit.ui" line="14"/>
-        <source>Edit template</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/templateedit.ui" line="165"/>
         <source>Color palette</source>
         <translation type="unfinished"/>
@@ -7951,85 +8103,12 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>TextHyperlinkEventFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="817"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="815"/>
         <source>%1click to visit %2</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>ThemeTest</name>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="29"/>
-        <source>Theme Information</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="33"/>
-        <source>Screen</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="42"/>
-        <source>Geometry (pixels):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="49"/>
-        <source>Geometry (gridUnits):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="56"/>
-        <source>Units.gridUnit:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="63"/>
-        <source>Units.devicePixelRatio:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="70"/>
-        <source>Font Metrics</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="76"/>
-        <source>FontMetrics pointSize:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="83"/>
-        <source>FontMetrics pixelSize:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="90"/>
-        <source>FontMetrics devicePixelRatio:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="97"/>
-        <source>Text item pixelSize:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="104"/>
-        <source>Text item pointSize:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="111"/>
-        <source>Pixel density:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="118"/>
-        <source>Height of default font:</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
     <name>ToolTipItem</name>
     <message>
         <location filename="../profile-widget/divetooltipitem.cpp" line="136"/>
@@ -8040,102 +8119,107 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>TripItem</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="67"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="68"/>
         <source>(%1 shown)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="194"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="197"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="215"/>
         <source>Date</source>
         <translation>Tarih</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="200"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="218"/>
         <source>Rating</source>
         <translation>Değerlendirme</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
         <source>Depth(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
         <source>ft</source>
         <translation>fit</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="206"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="224"/>
         <source>Duration</source>
         <translation>Süre</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="209"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="227"/>
         <source>Temp(%1%2)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
         <source>Weight(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
         <source>lbs</source>
         <translation>libre</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="215"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="233"/>
         <source>Suit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="218"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="236"/>
         <source>Cyl</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="239"/>
         <source>Gas</source>
         <translation>Gaz</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="244"/>
         <source>SAC(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="244"/>
         <source>/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="229"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="247"/>
         <source>OTU</source>
         <translation>OZB</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="232"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="250"/>
         <source>Max CNS</source>
         <translation>Azami MSS</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="235"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="253"/>
+        <source>Photos before/during/after dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="256"/>
         <source>Location</source>
         <translation>Konum</translation>
     </message>
@@ -8158,72 +8242,73 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>UpdateManager</name>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="69"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="61"/>
         <source>Check for updates.</source>
         <translation>Güncellemeler için denetle</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="70"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="62"/>
         <source>Subsurface was unable to check for updates.</source>
         <translation>Subsurface güncellemeleri kontrol edemedi.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="75"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="67"/>
         <source>The following error occurred:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="76"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="68"/>
         <source>Please check your internet connection.</source>
         <translation>Lütfen internet bağlantınızı kontrol edin.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="86"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="78"/>
         <source>You are using the latest version of Subsurface.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="89"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="81"/>
         <source>A new version of Subsurface is available.&lt;br/&gt;Click on:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; to download it.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="95"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="87"/>
         <source>A new version of Subsurface is available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="96"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="88"/>
         <source>Latest version is %1, please check %2 our download page %3 for information in how to update.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="106"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="98"/>
         <source>Newest release version is </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="107"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="99"/>
         <source>The server returned the following information:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="125"/>
-        <source>Subsurface is checking every two weeks if a new version is available. If you don&apos;t want Subsurface to continue checking, please click Decline.</source>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="117"/>
+        <source>Subsurface is checking every two weeks if a new version is available. 
+ If you don&apos;t want Subsurface to continue checking, please click Decline.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="126"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="119"/>
         <source>Decline</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="127"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="120"/>
         <source>Accept</source>
         <translation>Uygula</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="129"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="122"/>
         <source>Automatic check for updates</source>
         <translation>Güncellemeler için otomatik denetle</translation>
     </message>
@@ -8245,24 +8330,6 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>UserSurvey</name>
     <message>
-        <location filename="../desktop-widgets/usersurvey.ui" line="44"/>
-        <location filename="../build/ui_usersurvey.h" line="151"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;We would love to learn more about our users, their preferences and their usage habits. Please spare a minute to fill out this form and submit it to the Subsurface team.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/usersurvey.ui" line="115"/>
-        <location filename="../build/ui_usersurvey.h" line="156"/>
-        <source>Other software/sources</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/usersurvey.ui" line="128"/>
-        <location filename="../build/ui_usersurvey.h" line="157"/>
-        <source>Manually entering dives</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="14"/>
         <location filename="../build/ui_usersurvey.h" line="149"/>
         <source>User survey</source>
@@ -8275,6 +8342,12 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
         <translation>Subsurface kullanıcı anketi</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/usersurvey.ui" line="44"/>
+        <location filename="../build/ui_usersurvey.h" line="151"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;We would love to learn more about our users, their preferences and their usage habits. Please spare a minute to fill out this form and submit it to the Subsurface team.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="63"/>
         <location filename="../build/ui_usersurvey.h" line="152"/>
         <source>Technical diver</source>
@@ -8299,6 +8372,18 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/usersurvey.ui" line="115"/>
+        <location filename="../build/ui_usersurvey.h" line="156"/>
+        <source>Other software/sources</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/usersurvey.ui" line="128"/>
+        <location filename="../build/ui_usersurvey.h" line="157"/>
+        <source>Manually entering dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="141"/>
         <location filename="../build/ui_usersurvey.h" line="158"/>
         <source>Android/iPhone companion app</source>
@@ -8329,6 +8414,11 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/usersurvey.cpp" line="18"/>
+        <source>Send</source>
+        <translation>Gönder</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/usersurvey.cpp" line="43"/>
         <source>
 Operating system: %1</source>
@@ -8372,19 +8462,14 @@ Lisan: %1</translation>
         <translation>Daha sonra sor</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/usersurvey.cpp" line="101"/>
-        <source>Submit user survey.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/usersurvey.cpp" line="82"/>
         <source>Ask again?</source>
         <translation>Tekrar soruyorum ?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/usersurvey.cpp" line="18"/>
-        <source>Send</source>
-        <translation>Gönder</translation>
+        <location filename="../desktop-widgets/usersurvey.cpp" line="101"/>
+        <source>Submit user survey.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/usersurvey.cpp" line="102"/>
@@ -8476,12 +8561,12 @@ Lisan: %1</translation>
         <translation>Yükle</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="324"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="325"/>
         <source>Operation timed out</source>
         <translation>İşlem zaman aşımı</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="345"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="346"/>
         <source>Transferring data...</source>
         <translation type="unfinished"/>
     </message>
@@ -8501,7 +8586,7 @@ Lisan: %1</translation>
     <message>
         <location filename="../qt-models/weightmodel.cpp" line="77"/>
         <source>Clicking here will remove this weight system.</source>
-        <translation>Ağırlık sistemi buraya tıklayarak kaldırılır.</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -8516,18 +8601,18 @@ Lisan: %1</translation>
 <context>
     <name>WriteSettingsThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1702"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1709"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1718"/>
-        <source>Failed!</source>
-        <translation>Başarısız!</translation>
-    </message>
-    <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1700"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1721"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1689"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1710"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1691"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1698"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1707"/>
+        <source>Failed!</source>
+        <translation>Başarısız!</translation>
+    </message>
 </context>
 <context>
     <name>YearlyStatisticsModel</name>
@@ -8651,7 +8736,7 @@ Ortalama</translation>
 <context>
     <name>getextFromC</name>
     <message>
-        <location filename="../core/libdivecomputer.c" line="674"/>
+        <location filename="../core/libdivecomputer.c" line="737"/>
         <source>Error parsing the header</source>
         <translation type="unfinished"/>
     </message>
@@ -8659,38 +8744,377 @@ Ortalama</translation>
 <context>
     <name>gettextFromC</name>
     <message>
+        <location filename="../core/cochran.c" line="309"/>
+        <location filename="../core/cochran.c" line="315"/>
+        <location filename="../core/cochran.c" line="385"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>deco stop</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="336"/>
+        <location filename="../core/cochran.c" line="390"/>
+        <location filename="../core/file.c" line="777"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>ascent</source>
+        <translation>çıkış</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="342"/>
+        <location filename="../core/file.c" line="755"/>
+        <source>battery</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="348"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
+        <source>OLF</source>
+        <translation>OLB</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="353"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
+        <source>maxdepth</source>
+        <translation>azamiderinlik</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="358"/>
+        <location filename="../core/cochran.c" line="404"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
+        <source>pO₂</source>
+        <translation>pO₂</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="365"/>
+        <location filename="../core/cochran.c" line="414"/>
+        <location filename="../core/cochran.c" line="421"/>
+        <location filename="../core/file.c" line="868"/>
+        <location filename="../core/libdivecomputer.c" line="225"/>
+        <location filename="../core/libdivecomputer.c" line="228"/>
+        <source>gaschange</source>
+        <translation>gazdeğişimi</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="370"/>
+        <location filename="../core/cochran.c" line="409"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>rbt</source>
+        <translation>kdz</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="379"/>
+        <location filename="../core/cochran.c" line="426"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>ceiling</source>
+        <translation>tavan</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="395"/>
+        <location filename="../core/libdivecomputer.c" line="224"/>
+        <source>transmitter</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="153"/>
+        <source>Error: the file does not appear to be a DATATRAK divelog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="286"/>
+        <source>clear</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="289"/>
+        <source>misty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="292"/>
+        <source>fog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="295"/>
+        <source>rain</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="298"/>
+        <source>storm</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="301"/>
+        <source>snow</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="321"/>
+        <source>No suit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="324"/>
+        <source>Shorty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="327"/>
+        <source>Combi</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="330"/>
+        <source>Wet suit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="333"/>
+        <source>Semidry suit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="336"/>
+        <source>Dry suit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="396"/>
+        <source>no stop</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="398"/>
+        <location filename="../core/dive.c" line="29"/>
+        <source>deco</source>
+        <translation>deco</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="400"/>
+        <source>single ascent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="402"/>
+        <source>multiple ascent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="404"/>
+        <location filename="../core/dive.c" line="27"/>
+        <source>fresh</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="406"/>
+        <source>salt water</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="431"/>
+        <source>sight seeing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="433"/>
+        <source>club dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="435"/>
+        <location filename="../core/dive.c" line="28"/>
+        <source>instructor</source>
+        <translation>Eğitmen</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="437"/>
+        <source>instruction</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="439"/>
+        <location filename="../core/dive.c" line="27"/>
+        <source>night</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="441"/>
+        <location filename="../core/dive.c" line="25"/>
+        <source>cave</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="443"/>
+        <location filename="../core/dive.c" line="24"/>
+        <source>ice</source>
+        <translation>buz</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="445"/>
+        <source>search</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="455"/>
+        <location filename="../core/dive.c" line="25"/>
+        <source>wreck</source>
+        <translation>enkaz</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="457"/>
+        <location filename="../core/dive.c" line="26"/>
+        <source>river</source>
+        <translation>nehir</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="459"/>
+        <location filename="../core/dive.c" line="23"/>
+        <source>drift</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="461"/>
+        <location filename="../core/dive.c" line="28"/>
+        <source>photo</source>
+        <translation>fotoğraf</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="463"/>
+        <source>other</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="474"/>
+        <source>Other activities</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="498"/>
+        <source>Datatrak/Wlog notes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="537"/>
+        <source>Manually entered dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="588"/>
+        <source>Unknown</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="674"/>
+        <source>Error: couldn&apos;t open the file %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="687"/>
+        <source>Error: no dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="23"/>
+        <source>boat</source>
+        <translation>tekne</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="23"/>
+        <source>shore</source>
+        <translation>sahil</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="24"/>
+        <source>deep</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="24"/>
+        <source>cavern</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="25"/>
+        <source>altitude</source>
+        <translation>irtifa</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="26"/>
+        <source>pool</source>
+        <translation>gölet</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="26"/>
+        <source>lake</source>
+        <translation>göl</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="27"/>
+        <source>student</source>
+        <translation>stajer</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="28"/>
+        <source>video</source>
+        <translation>video</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="33"/>
+        <source>OC-gas</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="33"/>
+        <source>diluent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="33"/>
+        <location filename="../core/equipment.c" line="88"/>
+        <location filename="../core/planner.c" line="1436"/>
+        <location filename="../core/planner.c" line="1439"/>
+        <source>oxygen</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../core/dive.c" line="181"/>
         <source>pascal</source>
         <translation>paskal</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="186"/>
-        <location filename="../core/qthelper.cpp" line="669"/>
+        <location filename="../core/qthelper.cpp" line="674"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="190"/>
-        <location filename="../core/qthelper.cpp" line="672"/>
+        <location filename="../core/qthelper.cpp" line="677"/>
         <source>psi</source>
-        <translation>psi</translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="227"/>
+        <source>ℓ</source>
+        <translation>ℓ</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="232"/>
         <source>cuft</source>
-        <translation>fitküp</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../core/dive.c" line="269"/>
-        <location filename="../core/qthelper.cpp" line="590"/>
-        <location filename="../core/qthelper.cpp" line="605"/>
+        <location filename="../core/qthelper.cpp" line="595"/>
+        <location filename="../core/qthelper.cpp" line="610"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="274"/>
-        <location filename="../core/qthelper.cpp" line="593"/>
-        <location filename="../core/qthelper.cpp" line="607"/>
+        <location filename="../core/qthelper.cpp" line="598"/>
+        <location filename="../core/qthelper.cpp" line="612"/>
         <source>ft</source>
         <translation>fit</translation>
     </message>
@@ -8716,53 +9140,58 @@ Ortalama</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="325"/>
-        <location filename="../core/qthelper.cpp" line="616"/>
-        <location filename="../core/qthelper.cpp" line="626"/>
+        <location filename="../core/qthelper.cpp" line="621"/>
+        <location filename="../core/qthelper.cpp" line="631"/>
         <source>lbs</source>
         <translation>libre</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="329"/>
-        <location filename="../core/qthelper.cpp" line="614"/>
-        <location filename="../core/qthelper.cpp" line="624"/>
+        <location filename="../core/qthelper.cpp" line="619"/>
+        <location filename="../core/qthelper.cpp" line="629"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="1772"/>
+        <location filename="../core/dive.c" line="1751"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) veya (%s)</translation>
     </message>
     <message>
-        <location filename="../core/divelist.c" line="484"/>
+        <location filename="../core/divelist.c" line="487"/>
         <location filename="../core/equipment.c" line="84"/>
-        <location filename="../core/planner.c" line="1411"/>
-        <location filename="../core/planner.c" line="1414"/>
+        <location filename="../core/planner.c" line="1432"/>
+        <location filename="../core/planner.c" line="1435"/>
         <source>air</source>
         <translation>hava</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="197"/>
+        <location filename="../core/equipment.c" line="86"/>
+        <source>EAN%d</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/equipment.c" line="198"/>
         <source>integrated</source>
         <translation>entegre</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="198"/>
+        <location filename="../core/equipment.c" line="199"/>
         <source>belt</source>
         <translation>kemer</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="199"/>
+        <location filename="../core/equipment.c" line="200"/>
         <source>ankle</source>
         <translation>ayak bileği</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="200"/>
+        <location filename="../core/equipment.c" line="201"/>
         <source>backplate weight</source>
         <translation>arka plaka ağırlığı</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="201"/>
+        <location filename="../core/equipment.c" line="202"/>
         <source>clip-on</source>
         <translation>klipsli</translation>
     </message>
@@ -8775,11 +9204,11 @@ Ortalama</translation>
         <location filename="../core/file.c" line="121"/>
         <location filename="../core/file.c" line="512"/>
         <location filename="../core/file.c" line="597"/>
-        <location filename="../core/file.c" line="924"/>
-        <location filename="../core/file.c" line="1056"/>
+        <location filename="../core/file.c" line="909"/>
+        <location filename="../core/file.c" line="1092"/>
         <location filename="../core/ostctools.c" line="80"/>
         <source>Failed to read &apos;%s&apos;</source>
-        <translation>&apos;%s&apos; okunamadı</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../core/file.c" line="398"/>
@@ -8834,550 +9263,559 @@ Ortalama</translation>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/file.c" line="887"/>
-        <source>No matching DC found for file &apos;%s&apos;</source>
+        <location filename="../core/git-access.c" line="134"/>
+        <source>Local cache directory %s corrupted - can&apos;t sync with Subsurface cloud storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>none</source>
-        <translation>hiçbiri</translation>
+        <location filename="../core/git-access.c" line="157"/>
+        <location filename="../core/git-access.c" line="177"/>
+        <source>Could not update local cache to newer remote data</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="309"/>
-        <location filename="../core/cochran.c" line="315"/>
-        <location filename="../core/cochran.c" line="385"/>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>deco stop</source>
+        <location filename="../core/git-access.c" line="170"/>
+        <source>Subsurface cloud storage corrupted</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="342"/>
-        <location filename="../core/file.c" line="755"/>
-        <source>battery</source>
+        <location filename="../core/git-access.c" line="284"/>
+        <source>Could not update Subsurface cloud storage, try again later</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="370"/>
-        <location filename="../core/cochran.c" line="409"/>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>rbt</source>
-        <translation>kdz</translation>
+        <location filename="../core/git-access.c" line="344"/>
+        <source>Remote storage and local data diverged. Error: merge failed (%s)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="336"/>
-        <location filename="../core/cochran.c" line="390"/>
-        <location filename="../core/file.c" line="777"/>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>ascent</source>
-        <translation>çıkış</translation>
+        <location filename="../core/git-access.c" line="374"/>
+        <source>Remote storage and local data diverged. Cannot combine local and remote changes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="379"/>
-        <location filename="../core/cochran.c" line="426"/>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>ceiling</source>
-        <translation>tavan</translation>
+        <location filename="../core/git-access.c" line="408"/>
+        <source>Remote storage and local data diverged</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>workload</source>
-        <translation>iş yükü</translation>
+        <location filename="../core/git-access.c" line="411"/>
+        <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="395"/>
-        <location filename="../core/libdivecomputer.c" line="203"/>
-        <source>transmitter</source>
+        <location filename="../core/git-access.c" line="420"/>
+        <source>Problems with local cache of Subsurface cloud data</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/git-access.c" line="421"/>
+        <source>Moved cache data to %s. Please try the operation again.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="203"/>
+        <location filename="../core/git-access.c" line="743"/>
+        <source>Error connecting to Subsurface cloud storage</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/git-access.c" line="746"/>
+        <source>git clone of %s failed (%s)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="210"/>
+        <location filename="../core/parse-xml.c" line="3317"/>
+        <location filename="../core/uemis-downloader.c" line="134"/>
+        <source>unknown</source>
+        <translation>bilinmeyen</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>none</source>
+        <translation>hiçbiri</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>workload</source>
+        <translation>iş yükü</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="224"/>
         <source>violation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="203"/>
+        <location filename="../core/libdivecomputer.c" line="224"/>
         <source>bookmark</source>
         <translation>yerimi</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="203"/>
+        <location filename="../core/libdivecomputer.c" line="224"/>
         <source>surface</source>
         <translation>yüzey</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="203"/>
+        <location filename="../core/libdivecomputer.c" line="224"/>
         <source>safety stop</source>
         <translation>güvenlik durağı</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="365"/>
-        <location filename="../core/cochran.c" line="414"/>
-        <location filename="../core/cochran.c" line="421"/>
-        <location filename="../core/file.c" line="868"/>
-        <location filename="../core/libdivecomputer.c" line="204"/>
-        <location filename="../core/libdivecomputer.c" line="207"/>
-        <source>gaschange</source>
-        <translation>gazdeğişimi</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="204"/>
+        <location filename="../core/libdivecomputer.c" line="225"/>
         <source>safety stop (voluntary)</source>
         <translation>güvenlik durağı (gönüllü)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="204"/>
+        <location filename="../core/libdivecomputer.c" line="225"/>
         <source>safety stop (mandatory)</source>
         <translation>güvenlik durağı (zorunlu)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="205"/>
+        <location filename="../core/libdivecomputer.c" line="226"/>
         <source>deepstop</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="205"/>
+        <location filename="../core/libdivecomputer.c" line="226"/>
         <source>ceiling (safety stop)</source>
         <translation>Tavan (güvenlik durağı)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="205"/>
-        <source>divetime</source>
-        <translation>dalış zamanı</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="205"/>
+        <location filename="../core/libdivecomputer.c" line="226"/>
         <source>below floor</source>
         <comment>event showing dive is below deco floor and adding deco time</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="353"/>
-        <location filename="../core/libdivecomputer.c" line="206"/>
-        <source>maxdepth</source>
-        <translation>azamiderinlik</translation>
-    </message>
-    <message>
-        <location filename="../core/cochran.c" line="348"/>
-        <location filename="../core/libdivecomputer.c" line="206"/>
-        <source>OLF</source>
-        <translation>OLB</translation>
+        <location filename="../core/libdivecomputer.c" line="226"/>
+        <source>divetime</source>
+        <translation>dalış zamanı</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="206"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
         <source>airtime</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="206"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
         <source>rgbm</source>
         <translation>igbm</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="206"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
         <source>heading</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="358"/>
-        <location filename="../core/cochran.c" line="404"/>
-        <location filename="../core/libdivecomputer.c" line="206"/>
-        <source>pO₂</source>
-        <translation>pO₂</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="207"/>
+        <location filename="../core/libdivecomputer.c" line="228"/>
         <source>tissue level warning</source>
         <translation>doku seviye uyarısı</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="207"/>
+        <location filename="../core/libdivecomputer.c" line="228"/>
         <source>non stop time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="224"/>
+        <location filename="../core/libdivecomputer.c" line="237"/>
         <source>invalid event number</source>
         <translation>geçersiz olay numarası</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="658"/>
-        <source>Unable to create parser for %s %s</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="664"/>
-        <source>Error registering the data</source>
-        <translation>Veri kaydedilirken hata</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="495"/>
+        <location filename="../core/libdivecomputer.c" line="553"/>
         <source>Error parsing the datetime</source>
         <translation>Tarih saat ayrıştırma hatası</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="513"/>
+        <location filename="../core/libdivecomputer.c" line="571"/>
         <source>Dive %d: %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="519"/>
+        <location filename="../core/libdivecomputer.c" line="577"/>
         <source>Error parsing the divetime</source>
         <translation>Dalış zamanı ayrıştırma hatası</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="529"/>
+        <location filename="../core/libdivecomputer.c" line="587"/>
         <source>Error parsing the maxdepth</source>
         <translation>Azami derinlik ayrıştırma hatası</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="548"/>
+        <location filename="../core/libdivecomputer.c" line="606"/>
         <source>Error parsing temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="568"/>
+        <location filename="../core/libdivecomputer.c" line="626"/>
         <source>Error parsing the gas mix count</source>
         <translation>Gaz karışım sayısını ayrıştırma hatası</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="580"/>
+        <location filename="../core/libdivecomputer.c" line="638"/>
         <source>Error obtaining water salinity</source>
         <translation>Su tuzluluğu edinme hatası</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="589"/>
+        <location filename="../core/libdivecomputer.c" line="647"/>
         <source>Error obtaining surface pressure</source>
         <translation>Yüzey basıncı edinme hatası</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="614"/>
+        <location filename="../core/libdivecomputer.c" line="672"/>
         <source>Error obtaining divemode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="634"/>
+        <location filename="../core/libdivecomputer.c" line="692"/>
         <source>Error parsing the gas mix</source>
         <translation>Gaz karışımı ayrıştırma hatası</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="684"/>
+        <location filename="../core/libdivecomputer.c" line="717"/>
+        <source>Unable to create parser for %s %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="723"/>
+        <source>Error registering the data</source>
+        <translation>Veri kaydedilirken hata</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="744"/>
         <source>Error parsing the samples</source>
         <translation>Örnekleri ayrıştırma hatası</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="822"/>
+        <location filename="../core/libdivecomputer.c" line="882"/>
         <source>Event: waiting for user action</source>
         <translation>Olay: kullanıcı eylemi bekleniyor</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="830"/>
+        <location filename="../core/libdivecomputer.c" line="890"/>
         <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source>
         <translation>model=%u (0x%08x), firmware=%u (0x%08x), seri=%u (0x%08x)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="894"/>
+        <location filename="../core/libdivecomputer.c" line="954"/>
         <source>Error registering the event handler.</source>
         <translation>Olay işleyicisi kayıt hatası.</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="899"/>
+        <location filename="../core/libdivecomputer.c" line="959"/>
         <source>Error registering the cancellation handler.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="920"/>
+        <location filename="../core/libdivecomputer.c" line="980"/>
         <source>Dive data import error</source>
         <translation>Dalış verisi içe aktarma hatası</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="959"/>
+        <location filename="../core/libdivecomputer.c" line="1019"/>
         <source>Unable to create libdivecomputer context</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="966"/>
+        <location filename="../core/libdivecomputer.c" line="1026"/>
         <source>Unable to open %s %s (%s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="992"/>
+        <location filename="../core/libdivecomputer.c" line="1048"/>
         <source>Insufficient privileges to open the device %s %s (%s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/parse-xml.c" line="517"/>
-        <source>Strange percentage reading %s
+        <location filename="../core/load-git.c" line="194"/>
+        <location filename="../core/parse-xml.c" line="1242"/>
+        <source>multiple GPS locations for this dive site; also %s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/load-git.c" line="194"/>
-        <location filename="../core/parse-xml.c" line="1238"/>
-        <source>multiple GPS locations for this dive site; also %s
+        <location filename="../core/load-git.c" line="222"/>
+        <location filename="../core/parse-xml.c" line="1304"/>
+        <source>additional name for site: %s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/ostctools.c" line="120"/>
+        <location filename="../core/ostctools.c" line="152"/>
+        <source>Unknown DC in dive %d</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/ostctools.c" line="165"/>
+        <source>Error - %s - parsing dive %d</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/parse-xml.c" line="517"/>
+        <source>Strange percentage reading %s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/parse-xml.c" line="2044"/>
+        <location filename="../core/parse-xml.c" line="2051"/>
         <source>Failed to parse &apos;%s&apos;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/parse-xml.c" line="3741"/>
+        <location filename="../core/parse-xml.c" line="3774"/>
         <source>Can&apos;t open stylesheet %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="86"/>
-        <source>EAN%d</source>
+        <location filename="../core/planner.c" line="555"/>
+        <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE %s ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="1032"/>
-        <location filename="../core/planner.c" line="1184"/>
-        <source>Can&apos;t find gas %s</source>
-        <translation>%s gaz bulunamıyor</translation>
+        <location filename="../core/planner.c" line="569"/>
+        <source>Decompression calculation aborted due to excessive time</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="368"/>
-        <source>Too many gas mixes</source>
-        <translation>Çok fazla gaz karışımı</translation>
+        <location filename="../core/planner.c" line="571"/>
+        <location filename="../core/planner.c" line="829"/>
+        <location filename="../core/planner.c" line="834"/>
+        <location filename="../core/planner.c" line="860"/>
+        <location filename="../core/planner.c" line="870"/>
+        <source>Warning:</source>
+        <translation>Uyarı:</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="568"/>
-        <source>Decompression calculation aborted due to excessive time</source>
+        <location filename="../core/planner.c" line="581"/>
+        <source>based on Bühlmann ZHL-16C with GFlow = %d and GFhigh = %d</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="586"/>
+        <source>based on VPM-B at nominal conservatism</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="592"/>
+        <location filename="../core/planner.c" line="588"/>
+        <source>based on VPM-B at +%d conservatism</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="590"/>
+        <source>, effective GF=%d/%d</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="594"/>
+        <source>recreational mode based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="598"/>
         <source>Subsurface dive plan</source>
         <translation>Subsurface dalış planı</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="596"/>
-        <source>depth</source>
-        <translation>derinlik</translation>
+        <location filename="../core/planner.c" line="599"/>
+        <source>&lt;div&gt;Runtime: %dmin&lt;/div&gt;&lt;br&gt;</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="602"/>
-        <source>runtime</source>
-        <translation>çalışma süresi</translation>
+        <location filename="../core/planner.c" line="604"/>
+        <source>depth</source>
+        <translation>derinlik</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="599"/>
+        <location filename="../core/planner.c" line="607"/>
         <source>duration</source>
         <translation>süre</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="554"/>
-        <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE %s ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source>
-        <translation type="unfinished"/>
+        <location filename="../core/planner.c" line="610"/>
+        <source>runtime</source>
+        <translation>çalışma süresi</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="605"/>
+        <location filename="../core/planner.c" line="613"/>
         <source>gas</source>
         <translation>gaz</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="648"/>
+        <location filename="../core/planner.c" line="656"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="656"/>
+        <location filename="../core/planner.c" line="664"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="669"/>
+        <location filename="../core/planner.c" line="677"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="676"/>
+        <location filename="../core/planner.c" line="684"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="721"/>
+        <location filename="../core/planner.c" line="729"/>
         <source>%3.0f%s</source>
         <translation>%3.0f%s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="724"/>
-        <location filename="../core/planner.c" line="728"/>
+        <location filename="../core/planner.c" line="732"/>
+        <location filename="../core/planner.c" line="736"/>
         <source>%3dmin</source>
         <translation>%3ddak</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="737"/>
-        <location filename="../core/planner.c" line="749"/>
+        <location filename="../core/planner.c" line="745"/>
+        <location filename="../core/planner.c" line="757"/>
         <source>(SP = %.1fbar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="772"/>
+        <location filename="../core/planner.c" line="780"/>
         <source>Switch gas to %s (SP = %.1fbar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="774"/>
+        <location filename="../core/planner.c" line="782"/>
         <source>Switch gas to %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="793"/>
+        <location filename="../core/planner.c" line="801"/>
         <source>CNS</source>
         <translation>MSS</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="795"/>
+        <location filename="../core/planner.c" line="803"/>
         <source>OTU</source>
         <translation>OZB</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="799"/>
+        <location filename="../core/planner.c" line="807"/>
         <source>Gas consumption (CCR legs excluded):</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="801"/>
+        <location filename="../core/planner.c" line="809"/>
         <source>Gas consumption:</source>
         <translation>Gaz tüketimi:</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="570"/>
-        <location filename="../core/planner.c" line="821"/>
-        <location filename="../core/planner.c" line="826"/>
-        <location filename="../core/planner.c" line="851"/>
-        <location filename="../core/planner.c" line="861"/>
-        <source>Warning:</source>
-        <translation>Uyarı:</translation>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="580"/>
-        <source>based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="584"/>
-        <source>based on VPM-B at nominal conservatism</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="586"/>
-        <source>based on VPM-B at +%d conservatism</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="588"/>
-        <source>recreational mode based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="822"/>
+        <location filename="../core/planner.c" line="830"/>
         <source>this is more gas than available in the specified cylinder!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="827"/>
+        <location filename="../core/planner.c" line="835"/>
         <source>not enough reserve for gas sharing on ascent!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="829"/>
+        <location filename="../core/planner.c" line="837"/>
         <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="831"/>
+        <location filename="../core/planner.c" line="839"/>
         <source>%.0f%s (%.0f%s during planned ascent) of %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="848"/>
+        <location filename="../core/planner.c" line="857"/>
         <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="858"/>
+        <location filename="../core/planner.c" line="867"/>
         <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="1419"/>
+        <location filename="../core/planner.c" line="1194"/>
+        <source>Can&apos;t find gas %s</source>
+        <translation>%s gaz bulunamıyor</translation>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="1440"/>
         <source>ean</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1280"/>
+        <location filename="../core/profile.c" line="1298"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1283"/>
+        <location filename="../core/profile.c" line="1301"/>
         <source>P: %d%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1287"/>
+        <location filename="../core/profile.c" line="1305"/>
         <source>T: %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1293"/>
+        <location filename="../core/profile.c" line="1311"/>
         <source>V: %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1296"/>
+        <location filename="../core/profile.c" line="1314"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1298"/>
+        <location filename="../core/profile.c" line="1316"/>
         <source>CNS: %u%%
 </source>
         <translation>MSS: %u%%
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1300"/>
+        <location filename="../core/profile.c" line="1318"/>
         <source>pO%s: %.2fbar
 </source>
         <translation>pO%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1302"/>
+        <location filename="../core/profile.c" line="1320"/>
         <source>pN%s: %.2fbar
 </source>
         <translation>pN%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1304"/>
+        <location filename="../core/profile.c" line="1322"/>
         <source>pHe: %.2fbar
 </source>
         <translation>pHe: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1307"/>
+        <location filename="../core/profile.c" line="1325"/>
         <source>MOD: %d%s
 </source>
         <translation>MOD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1314"/>
+        <location filename="../core/profile.c" line="1332"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
@@ -9386,7 +9824,7 @@ EHYD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1318"/>
+        <location filename="../core/profile.c" line="1336"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
@@ -9395,158 +9833,163 @@ EHYD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1331"/>
+        <location filename="../core/profile.c" line="1349"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1334"/>
+        <location filename="../core/profile.c" line="1352"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1339"/>
+        <location filename="../core/profile.c" line="1357"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation>Deco: %udak @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1342"/>
+        <location filename="../core/profile.c" line="1360"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation>Deco: bilinmeyen zaman @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1346"/>
+        <location filename="../core/profile.c" line="1364"/>
         <source>In deco
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1348"/>
+        <location filename="../core/profile.c" line="1366"/>
         <source>NDL: %umin
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1351"/>
+        <location filename="../core/profile.c" line="1369"/>
         <source>TTS: %umin
 </source>
         <translation>YZ: %udak
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1354"/>
+        <location filename="../core/profile.c" line="1372"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1362"/>
+        <location filename="../core/profile.c" line="1380"/>
         <source>In deco (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1365"/>
+        <location filename="../core/profile.c" line="1383"/>
         <source>NDL: %umin (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1367"/>
+        <location filename="../core/profile.c" line="1385"/>
         <source>NDL: &gt;2h (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1371"/>
+        <location filename="../core/profile.c" line="1389"/>
         <source>TTS: %umin (calc)
 </source>
         <translation>YZ: %udak (hesap)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1373"/>
+        <location filename="../core/profile.c" line="1391"/>
         <source>TTS: &gt;2h (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1376"/>
+        <location filename="../core/profile.c" line="1394"/>
         <source>RBT: %umin
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1379"/>
+        <location filename="../core/profile.c" line="1397"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1385"/>
+        <location filename="../core/profile.c" line="1403"/>
         <source>Tissue %.0fmin: %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1391"/>
+        <location filename="../core/profile.c" line="1409"/>
         <source>heartbeat: %d
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1393"/>
+        <location filename="../core/profile.c" line="1411"/>
         <source>bearing: %d
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1396"/>
+        <location filename="../core/profile.c" line="1414"/>
         <source>mean depth to here %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1491"/>
+        <location filename="../core/profile.c" line="1515"/>
         <source>%sT: %d:%02d min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1495"/>
-        <location filename="../core/profile.c" line="1499"/>
-        <location filename="../core/profile.c" line="1503"/>
+        <location filename="../core/profile.c" line="1519"/>
+        <location filename="../core/profile.c" line="1523"/>
+        <location filename="../core/profile.c" line="1527"/>
         <source>%s %sD:%.1f%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1507"/>
+        <location filename="../core/profile.c" line="1531"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1511"/>
+        <location filename="../core/profile.c" line="1535"/>
         <source>%s%sV:%.2f%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1515"/>
-        <location filename="../core/profile.c" line="1519"/>
+        <location filename="../core/profile.c" line="1539"/>
+        <location filename="../core/profile.c" line="1543"/>
         <source>%s %sV:%.2f%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1526"/>
+        <location filename="../core/profile.c" line="1550"/>
         <source>%s %sP:%d %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../core/profile.c" line="1575"/>
+        <source>%s SAC:%.*f %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../core/qthelper.cpp" line="67"/>
         <source>%1km</source>
         <translation type="unfinished"/>
@@ -9567,446 +10010,460 @@ EHYD: %d%s
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="635"/>
+        <location filename="../core/qthelper.cpp" line="91"/>
+        <location filename="../core/qthelper.cpp" line="226"/>
+        <source>N</source>
+        <translation>K</translation>
+    </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="91"/>
+        <location filename="../core/qthelper.cpp" line="227"/>
+        <source>S</source>
+        <translation>G</translation>
+    </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="92"/>
+        <location filename="../core/qthelper.cpp" line="228"/>
+        <source>E</source>
+        <translation>D</translation>
+    </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="92"/>
+        <location filename="../core/qthelper.cpp" line="229"/>
+        <source>W</source>
+        <translation>B</translation>
+    </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="640"/>
         <source>C</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="638"/>
+        <location filename="../core/qthelper.cpp" line="643"/>
         <source>F</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/dive.c" line="23"/>
-        <source>boat</source>
-        <translation>tekne</translation>
+        <location filename="../core/save-html.c" line="469"/>
+        <location filename="../core/save-html.c" line="553"/>
+        <location filename="../core/worldmap-save.c" line="111"/>
+        <source>Can&apos;t open file %s</source>
+        <translation>%s dosyası açılamıyor</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="23"/>
-        <source>shore</source>
-        <translation>sahil</translation>
+        <location filename="../core/save-html.c" line="488"/>
+        <source>Number</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="459"/>
-        <location filename="../core/dive.c" line="23"/>
-        <source>drift</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="489"/>
+        <source>Date</source>
+        <translation>Tarih</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="24"/>
-        <source>deep</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="490"/>
+        <source>Time</source>
+        <translation>Zaman</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="24"/>
-        <source>cavern</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="491"/>
+        <source>Location</source>
+        <translation>Konum</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="443"/>
-        <location filename="../core/dive.c" line="24"/>
-        <source>ice</source>
-        <translation>buz</translation>
+        <location filename="../core/save-html.c" line="492"/>
+        <source>Air temp.</source>
+        <translation>Hava sıcaklığı.</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="445"/>
-        <source>search</source>
+        <location filename="../core/save-html.c" line="493"/>
+        <source>Water temp.</source>
+        <translation>Su sıcaklığı.</translation>
+    </message>
+    <message>
+        <location filename="../core/save-html.c" line="494"/>
+        <source>Dives</source>
+        <translation>Dalışlar</translation>
+    </message>
+    <message>
+        <location filename="../core/save-html.c" line="495"/>
+        <source>Expand all</source>
+        <translation>Hepsini aç</translation>
+    </message>
+    <message>
+        <location filename="../core/save-html.c" line="496"/>
+        <source>Collapse all</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="455"/>
-        <location filename="../core/dive.c" line="25"/>
-        <source>wreck</source>
-        <translation>enkaz</translation>
+        <location filename="../core/save-html.c" line="497"/>
+        <source>Trips</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="441"/>
-        <location filename="../core/dive.c" line="25"/>
-        <source>cave</source>
+        <location filename="../core/save-html.c" line="498"/>
+        <source>Statistics</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/dive.c" line="25"/>
-        <source>altitude</source>
-        <translation>irtifa</translation>
+        <location filename="../core/save-html.c" line="499"/>
+        <source>Advanced search</source>
+        <translation>Gelişmiş arama</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="26"/>
-        <source>pool</source>
-        <translation>gölet</translation>
+        <location filename="../core/save-html.c" line="502"/>
+        <source>Rating</source>
+        <translation>Değerlendirme</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="26"/>
-        <source>lake</source>
-        <translation>göl</translation>
+        <location filename="../core/save-html.c" line="503"/>
+        <source>Visibility</source>
+        <translation>Görünütlük</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="457"/>
-        <location filename="../core/dive.c" line="26"/>
-        <source>river</source>
-        <translation>nehir</translation>
+        <location filename="../core/save-html.c" line="504"/>
+        <source>Duration</source>
+        <translation>Süre</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="439"/>
-        <location filename="../core/dive.c" line="27"/>
-        <source>night</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="505"/>
+        <source>Divemaster</source>
+        <translation>Divemaster(Dalış lideri)</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="153"/>
-        <source>Error: the file does not appear to be a DATATRAK divelog</source>
+        <location filename="../core/save-html.c" line="506"/>
+        <source>Buddy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="286"/>
-        <source>clear</source>
+        <location filename="../core/save-html.c" line="507"/>
+        <source>Suit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="289"/>
-        <source>misty</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="508"/>
+        <source>Tags</source>
+        <translation>Etiketler</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="292"/>
-        <source>fog</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="509"/>
+        <location filename="../smtk-import/smartrak.c" line="251"/>
+        <location filename="../smtk-import/smartrak.c" line="321"/>
+        <source>Notes</source>
+        <translation>Notlar</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="295"/>
-        <source>rain</source>
+        <location filename="../core/save-html.c" line="510"/>
+        <source>Show more details</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="298"/>
-        <source>storm</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="513"/>
+        <source>Yearly statistics</source>
+        <translation>Yıllık istatistikler</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="301"/>
-        <source>snow</source>
+        <location filename="../core/save-html.c" line="514"/>
+        <source>Year</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="321"/>
-        <source>No suit</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="515"/>
+        <source>Total time</source>
+        <translation>Toplam süre</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="324"/>
-        <source>Shorty</source>
+        <location filename="../core/save-html.c" line="516"/>
+        <source>Average time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="327"/>
-        <source>Combi</source>
+        <location filename="../core/save-html.c" line="517"/>
+        <source>Shortest time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="330"/>
-        <source>Wet suit</source>
+        <location filename="../core/save-html.c" line="518"/>
+        <source>Longest time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="333"/>
-        <source>Semidry suit</source>
+        <location filename="../core/save-html.c" line="519"/>
+        <source>Average depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="336"/>
-        <source>Dry suit</source>
+        <location filename="../core/save-html.c" line="520"/>
+        <source>Min. depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="396"/>
-        <source>no stop</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="521"/>
+        <source>Max. depth</source>
+        <translation>Azami derinlik</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="400"/>
-        <source>single ascent</source>
+        <location filename="../core/save-html.c" line="522"/>
+        <source>Average SAC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="402"/>
-        <source>multiple ascent</source>
+        <location filename="../core/save-html.c" line="523"/>
+        <source>Min. SAC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="404"/>
-        <location filename="../core/dive.c" line="27"/>
-        <source>fresh</source>
+        <location filename="../core/save-html.c" line="524"/>
+        <source>Max. SAC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="406"/>
-        <source>salt water</source>
+        <location filename="../core/save-html.c" line="525"/>
+        <source>Average temp.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="431"/>
-        <source>sight seeing</source>
+        <location filename="../core/save-html.c" line="526"/>
+        <source>Min. temp.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="433"/>
-        <source>club dive</source>
+        <location filename="../core/save-html.c" line="527"/>
+        <source>Max. temp.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="437"/>
-        <source>instruction</source>
+        <location filename="../core/save-html.c" line="528"/>
+        <source>Back to list</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="463"/>
-        <source>other</source>
+        <location filename="../core/save-html.c" line="531"/>
+        <source>Dive No.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="474"/>
-        <source>Other activities</source>
+        <location filename="../core/save-html.c" line="532"/>
+        <source>Dive profile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="498"/>
-        <source>Datatrak/Wlog notes</source>
+        <location filename="../core/save-html.c" line="533"/>
+        <source>Dive information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="537"/>
-        <source>Manually entered dive</source>
+        <location filename="../core/save-html.c" line="534"/>
+        <source>Dive equipment</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="588"/>
-        <source>Unknown</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="535"/>
+        <location filename="../core/save-html.c" line="542"/>
+        <source>Type</source>
+        <translation>Tür</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="674"/>
-        <source>Error: couldn&apos;t open the file %s</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="536"/>
+        <source>Size</source>
+        <translation>Boyut</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="687"/>
-        <source>Error: no dive</source>
+        <location filename="../core/save-html.c" line="537"/>
+        <source>Work pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/dive.c" line="27"/>
-        <source>student</source>
-        <translation>stajer</translation>
+        <location filename="../core/save-html.c" line="538"/>
+        <source>Start pressure</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="461"/>
-        <location filename="../core/dive.c" line="28"/>
-        <source>photo</source>
-        <translation>fotoğraf</translation>
+        <location filename="../core/save-html.c" line="539"/>
+        <source>End pressure</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/dive.c" line="28"/>
-        <source>video</source>
-        <translation>video</translation>
+        <location filename="../core/save-html.c" line="540"/>
+        <source>Gas</source>
+        <translation>Gaz</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="435"/>
-        <location filename="../core/dive.c" line="28"/>
-        <source>instructor</source>
-        <translation>Eğitmen</translation>
+        <location filename="../core/save-html.c" line="541"/>
+        <source>Weight</source>
+        <translation>Ağırlık</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="398"/>
-        <location filename="../core/dive.c" line="29"/>
-        <source>deco</source>
-        <translation>deco</translation>
+        <location filename="../core/save-html.c" line="543"/>
+        <source>Events</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/dive.c" line="33"/>
-        <source>OC-gas</source>
+        <location filename="../core/save-html.c" line="544"/>
+        <source>Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/dive.c" line="33"/>
-        <source>diluent</source>
+        <location filename="../core/save-html.c" line="545"/>
+        <source>Value</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/dive.c" line="33"/>
-        <location filename="../core/equipment.c" line="88"/>
-        <location filename="../core/planner.c" line="1415"/>
-        <location filename="../core/planner.c" line="1418"/>
-        <source>oxygen</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="546"/>
+        <source>Coordinates</source>
+        <translation>Koordinatlar</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="227"/>
-        <source>ℓ</source>
-        <translation>ℓ</translation>
+        <location filename="../core/save-html.c" line="547"/>
+        <source>Dive status</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="239"/>
+        <location filename="../core/statistics.c" line="242"/>
         <source>more than %d days</source>
         <translation>%d günden fazla</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="246"/>
+        <location filename="../core/statistics.c" line="249"/>
         <source>%dd %dh %dmin</source>
         <translation>%dg %ds %ddak</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="249"/>
+        <location filename="../core/statistics.c" line="252"/>
         <source>%dmin %dsecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="251"/>
+        <location filename="../core/statistics.c" line="254"/>
         <source>%dh %dmin</source>
         <translation>%ds %ddak</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="263"/>
+        <location filename="../core/statistics.c" line="266"/>
         <source>for dives #</source>
         <translation>dalışlar için #</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="269"/>
+        <location filename="../core/statistics.c" line="272"/>
         <source>for selected dives</source>
         <translation>seçilen dalışlar için</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="304"/>
+        <location filename="../core/statistics.c" line="307"/>
         <source>for dive #%d</source>
         <translation>dalış için #%d</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="306"/>
+        <location filename="../core/statistics.c" line="309"/>
         <source>for selected dive</source>
         <translation>seçili dalışlar için</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="308"/>
+        <location filename="../core/statistics.c" line="311"/>
         <source>for all dives</source>
         <translation>tüm dalışlar için</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="310"/>
+        <location filename="../core/statistics.c" line="313"/>
         <source>(no dives)</source>
         <translation>(dalış yok)</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Sun</source>
         <translation>Pazar</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Mon</source>
         <translation>Pazartesi</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Tue</source>
         <translation>Salı</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Wed</source>
         <translation>Çarşamba</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Thu</source>
         <translation>Perşembe</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Fri</source>
         <translation>Cuma</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Sat</source>
         <translation>Cumartesi</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Jan</source>
         <translation>Ocak</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Feb</source>
         <translation>Şubat</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Mar</source>
         <translation>Mart</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Apr</source>
         <translation>Nisan</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>May</source>
         <translation>Mayıs</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Jun</source>
         <translation>Haziran</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Jul</source>
         <translation>Temmuz</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Aug</source>
         <translation>Ağustos</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Sep</source>
         <translation>Eylül</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Oct</source>
         <translation>Ekim</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Nov</source>
         <translation>Kasım</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Dec</source>
         <translation>Aralık</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="191"/>
-        <location filename="../core/parse-xml.c" line="3284"/>
-        <location filename="../core/uemis-downloader.c" line="134"/>
-        <source>unknown</source>
-        <translation>bilinmeyen</translation>
-    </message>
-    <message>
-        <location filename="../core/uemis-downloader.c" line="467"/>
-        <source>data</source>
-        <translation>veri</translation>
-    </message>
-    <message>
-        <location filename="../core/uemis-downloader.c" line="447"/>
-        <source>%s %s</source>
-        <translation>%s %s</translation>
-    </message>
-    <message>
         <location filename="../core/uemis-downloader.c" line="27"/>
         <source>Uemis Zurich: the file system is almost full.
 Disconnect/reconnect the dive computer
@@ -10032,6 +10489,16 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../core/uemis-downloader.c" line="447"/>
+        <source>%s %s</source>
+        <translation>%s %s</translation>
+    </message>
+    <message>
+        <location filename="../core/uemis-downloader.c" line="467"/>
+        <source>data</source>
+        <translation>veri</translation>
+    </message>
+    <message>
         <location filename="../core/uemis-downloader.c" line="495"/>
         <source>divelog #</source>
         <translation type="unfinished"/>
@@ -10202,281 +10669,6 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="469"/>
-        <location filename="../core/save-html.c" line="553"/>
-        <location filename="../core/worldmap-save.c" line="111"/>
-        <source>Can&apos;t open file %s</source>
-        <translation>%s dosyası açılamıyor</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="488"/>
-        <source>Number</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="489"/>
-        <source>Date</source>
-        <translation>Tarih</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="490"/>
-        <source>Time</source>
-        <translation>Zaman</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="491"/>
-        <source>Location</source>
-        <translation>Konum</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="492"/>
-        <source>Air temp.</source>
-        <translation>Hava sıcaklığı.</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="493"/>
-        <source>Water temp.</source>
-        <translation>Su sıcaklığı.</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="498"/>
-        <source>Statistics</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="502"/>
-        <source>Rating</source>
-        <translation>Değerlendirme</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="503"/>
-        <source>Visibility</source>
-        <translation>Görünütlük</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="504"/>
-        <source>Duration</source>
-        <translation>Süre</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="494"/>
-        <source>Dives</source>
-        <translation>Dalışlar</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="495"/>
-        <source>Expand all</source>
-        <translation>Hepsini aç</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="496"/>
-        <source>Collapse all</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="497"/>
-        <source>Trips</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="499"/>
-        <source>Advanced search</source>
-        <translation>Gelişmiş arama</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="505"/>
-        <source>Divemaster</source>
-        <translation>Divemaster(Dalış lideri)</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="506"/>
-        <source>Buddy</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="507"/>
-        <source>Suit</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="508"/>
-        <source>Tags</source>
-        <translation>Etiketler</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="509"/>
-        <location filename="../smtk-import/smartrak.c" line="251"/>
-        <location filename="../smtk-import/smartrak.c" line="321"/>
-        <source>Notes</source>
-        <translation>Notlar</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="510"/>
-        <source>Show more details</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="513"/>
-        <source>Yearly statistics</source>
-        <translation>Yıllık istatistikler</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="514"/>
-        <source>Year</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="515"/>
-        <source>Total time</source>
-        <translation>Toplam süre</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="516"/>
-        <source>Average time</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="517"/>
-        <source>Shortest time</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="518"/>
-        <source>Longest time</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="519"/>
-        <source>Average depth</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="520"/>
-        <source>Min. depth</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="521"/>
-        <source>Max. depth</source>
-        <translation>Azami derinlik</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="523"/>
-        <source>Min. SAC</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="524"/>
-        <source>Max. SAC</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="525"/>
-        <source>Average temp.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="526"/>
-        <source>Min. temp.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="527"/>
-        <source>Max. temp.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="528"/>
-        <source>Back to list</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="534"/>
-        <source>Dive equipment</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="537"/>
-        <source>Work pressure</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="538"/>
-        <source>Start pressure</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="539"/>
-        <source>End pressure</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="547"/>
-        <source>Dive status</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="522"/>
-        <source>Average SAC</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="531"/>
-        <source>Dive No.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="532"/>
-        <source>Dive profile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="533"/>
-        <source>Dive information</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="535"/>
-        <location filename="../core/save-html.c" line="542"/>
-        <source>Type</source>
-        <translation>Tür</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="536"/>
-        <source>Size</source>
-        <translation>Boyut</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="540"/>
-        <source>Gas</source>
-        <translation>Gaz</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="541"/>
-        <source>Weight</source>
-        <translation>Ağırlık</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="543"/>
-        <source>Events</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="544"/>
-        <source>Name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="545"/>
-        <source>Value</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="546"/>
-        <source>Coordinates</source>
-        <translation>Koordinatlar</translation>
-    </message>
-    <message>
         <location filename="../core/worldmap-save.c" line="39"/>
         <source>Date:</source>
         <translation>Tarih:</translation>
@@ -10522,109 +10714,6 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation>Notlar:</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="91"/>
-        <location filename="../core/qthelper.cpp" line="226"/>
-        <source>N</source>
-        <translation>K</translation>
-    </message>
-    <message>
-        <location filename="../core/qthelper.cpp" line="91"/>
-        <location filename="../core/qthelper.cpp" line="227"/>
-        <source>S</source>
-        <translation>G</translation>
-    </message>
-    <message>
-        <location filename="../core/qthelper.cpp" line="92"/>
-        <location filename="../core/qthelper.cpp" line="228"/>
-        <source>E</source>
-        <translation>D</translation>
-    </message>
-    <message>
-        <location filename="../core/qthelper.cpp" line="92"/>
-        <location filename="../core/qthelper.cpp" line="229"/>
-        <source>W</source>
-        <translation>B</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="341"/>
-        <source>Remote storage and local data diverged. Error: merge failed (%s)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="134"/>
-        <source>Local cache directory %s corrupted - can&apos;t sync with Subsurface cloud storage</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="157"/>
-        <location filename="../core/git-access.c" line="177"/>
-        <source>Could not update local cache to newer remote data</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="170"/>
-        <source>Subsurface cloud storage corrupted</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="285"/>
-        <source>Could not update Subsurface cloud storage, try again later</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="371"/>
-        <source>Remote storage and local data diverged. Cannot combine local and remote changes</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="405"/>
-        <source>Remote storage and local data diverged</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="408"/>
-        <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="417"/>
-        <source>Problems with local cache of Subsurface cloud data</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="418"/>
-        <source>Moved cache data to %s. Please try the operation again.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="737"/>
-        <source>Error connecting to Subsurface cloud storage</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="740"/>
-        <source>git clone of %s failed (%s)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/load-git.c" line="222"/>
-        <location filename="../core/parse-xml.c" line="1300"/>
-        <source>additional name for site: %s
-</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/ostctools.c" line="120"/>
-        <location filename="../core/ostctools.c" line="152"/>
-        <source>Unknown DC in dive %d</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/ostctools.c" line="165"/>
-        <source>Error - %s - parsing dive %d</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../smtk-import/smartrak.c" line="247"/>
         <source>Built</source>
         <translation type="unfinished"/>
@@ -10708,155 +10797,120 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="91"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="103"/>
         <source>Subsurface</source>
         <translation>Subsurface</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="97"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="110"/>
         <source>Dive list</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="112"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="125"/>
         <source>Cloud credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="126"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="139"/>
         <source>Manage dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="138"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="141"/>
         <source>Add dive manually</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="146"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="149"/>
         <source>Manual sync with cloud</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="164"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="167"/>
         <source>Offline mode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="164"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="167"/>
         <source>Enable auto cloud sync</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="182"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="187"/>
         <source>GPS</source>
         <translation>GPS</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="185"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="190"/>
         <source>GPS-tag dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="192"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="197"/>
         <source>Upload GPS data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="199"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="204"/>
         <source>Download GPS data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="206"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="211"/>
         <source>Show GPS fixes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="215"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="220"/>
         <source>Clear GPS cache</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="221"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="226"/>
         <source>Preferences</source>
         <translation>Tercihler</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="230"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="237"/>
         <source>Developer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="232"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="239"/>
         <source>App log</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="239"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="246"/>
         <source>Theme information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="246"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="253"/>
         <source>User manual</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="252"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="259"/>
         <source>About</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="283"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="304"/>
         <source>Run location service</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="283"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="304"/>
         <source>No GPS source available</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="295"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="316"/>
         <source>Actions</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="9"/>
-        <source>Hello World</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="13"/>
-        <source>File</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="15"/>
-        <source>&amp;Open</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="19"/>
-        <source>Exit</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="27"/>
-        <source>Button 1 pressed</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="28"/>
-        <source>Button 2 pressed</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="33"/>
-        <source>May I have your attention, please?</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>plannerDetails</name>
@@ -10930,6 +10984,24 @@ p, li { white-space: pre-wrap; }
         <translation>m/dak</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="121"/>
+        <location filename="../build/ui_plannerSettings.h" line="425"/>
+        <source>75% to 50% avg. depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="138"/>
+        <location filename="../build/ui_plannerSettings.h" line="427"/>
+        <source>50% avg. depth to 6m</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="155"/>
+        <location filename="../build/ui_plannerSettings.h" line="429"/>
+        <source>6m to surface</source>
+        <translation>yüzeye 6m</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="175"/>
         <location filename="../build/ui_plannerSettings.h" line="431"/>
         <source>Descent</source>
@@ -10953,12 +11025,35 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="268"/>
+        <source>Bühlmann deco</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="278"/>
         <location filename="../build/ui_plannerSettings.h" line="445"/>
         <source>Reserve gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="288"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="549"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="578"/>
+        <location filename="../build/ui_plannerSettings.h" line="446"/>
+        <location filename="../build/ui_plannerSettings.h" line="459"/>
+        <location filename="../build/ui_plannerSettings.h" line="461"/>
+        <source>bar</source>
+        <translation>bar</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="307"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="416"/>
+        <location filename="../build/ui_plannerSettings.h" line="437"/>
+        <location filename="../build/ui_plannerSettings.h" line="440"/>
+        <source>%</source>
+        <translation>%</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="320"/>
         <location filename="../build/ui_plannerSettings.h" line="449"/>
         <source>Postpone gas change if a stop is not required</source>
@@ -10977,12 +11072,10 @@ p, li { white-space: pre-wrap; }
         <translation>EF düşük</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="307"/>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="416"/>
-        <location filename="../build/ui_plannerSettings.h" line="437"/>
-        <location filename="../build/ui_plannerSettings.h" line="440"/>
-        <source>%</source>
-        <translation>%</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="353"/>
+        <location filename="../build/ui_plannerSettings.h" line="436"/>
+        <source>Plan backgas breaks</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="360"/>
@@ -10991,10 +11084,10 @@ p, li { white-space: pre-wrap; }
         <translation>EF yüksek</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="429"/>
-        <location filename="../build/ui_plannerSettings.h" line="441"/>
-        <source>Drop to first depth</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="370"/>
+        <location filename="../build/ui_plannerSettings.h" line="453"/>
+        <source>min</source>
+        <translation>dak</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="389"/>
@@ -11003,162 +11096,138 @@ p, li { white-space: pre-wrap; }
         <translation>6m son durak</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="353"/>
-        <location filename="../build/ui_plannerSettings.h" line="436"/>
-        <source>Plan backgas breaks</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="396"/>
+        <source>Maximize bottom time allowed by gas and no decompression limits</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="515"/>
-        <location filename="../build/ui_plannerSettings.h" line="455"/>
-        <source>Gas options</source>
-        <translation>Gaz seçenekleri</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="399"/>
+        <location filename="../build/ui_plannerSettings.h" line="443"/>
+        <source>Recreational mode</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="594"/>
-        <location filename="../build/ui_plannerSettings.h" line="456"/>
-        <source>Bottom SAC</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="429"/>
+        <location filename="../build/ui_plannerSettings.h" line="441"/>
+        <source>Drop to first depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="692"/>
-        <location filename="../build/ui_plannerSettings.h" line="457"/>
-        <source>Deco SAC</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="436"/>
+        <location filename="../build/ui_plannerSettings.h" line="452"/>
+        <source>Min. switch duration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="601"/>
-        <location filename="../build/ui_plannerSettings.h" line="458"/>
-        <source>Bottom pO₂</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="459"/>
+        <location filename="../build/ui_plannerSettings.h" line="444"/>
+        <source>Safety stop</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="685"/>
-        <location filename="../build/ui_plannerSettings.h" line="460"/>
-        <source>Deco pO₂</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="495"/>
+        <source>Conservatism level</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="515"/>
+        <location filename="../build/ui_plannerSettings.h" line="455"/>
+        <source>Gas options</source>
+        <translation>Gaz seçenekleri</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="565"/>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="672"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="698"/>
         <location filename="../build/ui_plannerSettings.h" line="462"/>
         <location filename="../build/ui_plannerSettings.h" line="463"/>
         <source>ℓ/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="632"/>
-        <location filename="../build/ui_plannerSettings.h" line="468"/>
-        <source>Display runtime</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="645"/>
-        <location filename="../build/ui_plannerSettings.h" line="472"/>
-        <source>Display segment duration</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="594"/>
+        <source>m</source>
+        <translation>m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="655"/>
-        <location filename="../build/ui_plannerSettings.h" line="476"/>
-        <source>Display transitions in deco</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="606"/>
+        <source>Used to calculate best mix. Select best mix depth in &apos;Available gases&apos; table by entering gas depth, followed by &quot;B&quot; (best trimix mix) or &quot;BN&quot; (best nitrox mix)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="662"/>
-        <location filename="../build/ui_plannerSettings.h" line="477"/>
-        <source>Verbatim dive plan</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="613"/>
+        <location filename="../build/ui_plannerSettings.h" line="456"/>
+        <source>Bottom SAC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="288"/>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="549"/>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="578"/>
-        <location filename="../build/ui_plannerSettings.h" line="446"/>
-        <location filename="../build/ui_plannerSettings.h" line="459"/>
-        <location filename="../build/ui_plannerSettings.h" line="461"/>
-        <source>bar</source>
-        <translation>bar</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="121"/>
-        <location filename="../build/ui_plannerSettings.h" line="425"/>
-        <source>75% to 50% avg. depth</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="620"/>
+        <location filename="../build/ui_plannerSettings.h" line="458"/>
+        <source>Bottom pO₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="138"/>
-        <location filename="../build/ui_plannerSettings.h" line="427"/>
-        <source>50% avg. depth to 6m</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="627"/>
+        <source>Best mix END</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="155"/>
-        <location filename="../build/ui_plannerSettings.h" line="429"/>
-        <source>6m to surface</source>
-        <translation>yüzeye 6m</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="634"/>
+        <location filename="../build/ui_plannerSettings.h" line="464"/>
+        <source>Notes</source>
+        <translation>Notlar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="268"/>
-        <source>Bühlmann deco</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="655"/>
+        <location filename="../build/ui_plannerSettings.h" line="466"/>
+        <source>In dive plan, show runtime (absolute time) of stops</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="370"/>
-        <location filename="../build/ui_plannerSettings.h" line="453"/>
-        <source>min</source>
-        <translation>dak</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="396"/>
-        <source>Maximize bottom time allowed by gas and no decompression limits</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="658"/>
+        <location filename="../build/ui_plannerSettings.h" line="468"/>
+        <source>Display runtime</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="399"/>
-        <location filename="../build/ui_plannerSettings.h" line="443"/>
-        <source>Recreational mode</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="668"/>
+        <location filename="../build/ui_plannerSettings.h" line="470"/>
+        <source>In dive plan, show duration (relative time) of stops</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="436"/>
-        <location filename="../build/ui_plannerSettings.h" line="452"/>
-        <source>Min. switch duration</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="671"/>
+        <location filename="../build/ui_plannerSettings.h" line="472"/>
+        <source>Display segment duration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="459"/>
-        <location filename="../build/ui_plannerSettings.h" line="444"/>
-        <source>Safety stop</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="678"/>
+        <location filename="../build/ui_plannerSettings.h" line="474"/>
+        <source>In diveplan, list transitions or treat them as implicit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="495"/>
-        <source>Conservatism level</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="681"/>
+        <location filename="../build/ui_plannerSettings.h" line="476"/>
+        <source>Display transitions in deco</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="608"/>
-        <location filename="../build/ui_plannerSettings.h" line="464"/>
-        <source>Notes</source>
-        <translation>Notlar</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="629"/>
-        <location filename="../build/ui_plannerSettings.h" line="466"/>
-        <source>In dive plan, show runtime (absolute time) of stops</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="688"/>
+        <location filename="../build/ui_plannerSettings.h" line="477"/>
+        <source>Verbatim dive plan</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="642"/>
-        <location filename="../build/ui_plannerSettings.h" line="470"/>
-        <source>In dive plan, show duration (relative time) of stops</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="711"/>
+        <location filename="../build/ui_plannerSettings.h" line="460"/>
+        <source>Deco pO₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="652"/>
-        <location filename="../build/ui_plannerSettings.h" line="474"/>
-        <source>In diveplan, list transitions or treat them as implicit</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="718"/>
+        <location filename="../build/ui_plannerSettings.h" line="457"/>
+        <source>Deco SAC</source>
         <translation type="unfinished"/>
     </message>
 </context>
diff --git a/translations/subsurface_vi.ts b/translations/subsurface_vi.ts
index 243e6f53b..828bcef51 100644
--- a/translations/subsurface_vi.ts
+++ b/translations/subsurface_vi.ts
@@ -105,6 +105,11 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="56"/>
+        <source>Could not initialize Winsock version 2.2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="134"/>
         <source>Trying to turn on the local Bluetooth device...</source>
         <translation type="unfinished"/>
@@ -115,6 +120,11 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="167"/>
+        <source>Remote devices list was cleared.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="183"/>
         <source>Scanning for remote devices...</source>
         <translation type="unfinished"/>
@@ -125,6 +135,22 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="208"/>
+        <source>The local Bluetooth device was %1.</source>
+        <extracomment>%1 will be replaced with &quot;turned on&quot; or &quot;turned off&quot;</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
+        <source>turned on</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
+        <source>turned off</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="225"/>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="339"/>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="359"/>
@@ -172,37 +198,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="352"/>
-        <source>Device %1 was paired and is authorized.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="56"/>
-        <source>Could not initialize Winsock version 2.2</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="167"/>
-        <source>Remote devices list was cleared.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="208"/>
-        <source>The local Bluetooth device was %1.</source>
-        <extracomment>%1 will be replaced with &quot;turned on&quot; or &quot;turned off&quot;</extracomment>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
-        <source>turned on</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
-        <source>turned off</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="307"/>
         <source>Remove pairing</source>
         <translation type="unfinished"/>
@@ -228,6 +223,11 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="352"/>
+        <source>Device %1 was paired and is authorized.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="378"/>
         <source>The device %1 can now be used for connection. You can press the Save button.</source>
         <translation type="unfinished"/>
@@ -286,12 +286,12 @@
 <context>
     <name>BuddyFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="621"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="619"/>
         <source>Person: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="622"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="620"/>
         <source>Searches for buddies and divemasters</source>
         <translation type="unfinished"/>
     </message>
@@ -299,7 +299,7 @@
 <context>
     <name>BuddyFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="243"/>
+        <location filename="../qt-models/filtermodels.cpp" line="248"/>
         <source>No buddies</source>
         <translation type="unfinished"/>
     </message>
@@ -307,25 +307,30 @@
 <context>
     <name>CloudCredentials</name>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="49"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="50"/>
         <source>Cloud credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="55"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="56"/>
         <source>Email</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="67"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="68"/>
         <source>Password</source>
         <translation>Mật khẩu</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="90"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="92"/>
         <source>Show password</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="97"/>
+        <source>PIN</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>ColumnNameProvider</name>
@@ -381,6 +386,16 @@
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
+        <source>Max. depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
+        <source>Avg. depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
         <source>Divemaster</source>
         <translation>Người lặn giỏi nhất</translation>
     </message>
@@ -391,6 +406,11 @@
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
+        <source>Suit</source>
+        <translation>Đồ lặn</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
         <source>Notes</source>
         <translation>Ghi chú</translation>
     </message>
@@ -410,21 +430,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
-        <source>Max. depth</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
-        <source>Avg. depth</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
-        <source>Suit</source>
-        <translation>Đồ lặn</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="44"/>
         <source>O₂</source>
         <translation type="unfinished"/>
@@ -538,7 +543,7 @@
         <translation>Không thể tạo nội dung cho thiết bị đo lặn</translation>
     </message>
     <message>
-        <location filename="../core/configuredivecomputer.cpp" line="660"/>
+        <location filename="../core/configuredivecomputer.cpp" line="656"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation type="unfinished"/>
     </message>
@@ -558,25 +563,45 @@
         <translation>Thiết bị hoặc điểm kết nối</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="170"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1520"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1533"/>
-        <source>...</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="47"/>
+        <source>Connect via Bluetooth</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="54"/>
+        <source>Connect</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="64"/>
+        <source>Disconnect</source>
+        <translation>Ngắt kết nối</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="80"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1521"/>
         <source>Retrieve available details</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="90"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1523"/>
+        <source>Read settings from backup file or from device before writing to the device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="93"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1525"/>
         <source>Save changes to device</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="116"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1527"/>
+        <source>Read settings from backup file or from device before writing to a backup file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="119"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1529"/>
         <source>Backup</source>
@@ -595,14 +620,39 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="163"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1532"/>
+        <source>Save libdivecomputer logfile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="170"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1520"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1533"/>
+        <source>...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="177"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1534"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1539"/>
-        <source>OSTC 3</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="214"/>
+        <source>OSTC 3,Sport,Cr,2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="223"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1541"/>
+        <source>Suunto Vyper family</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="232"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1543"/>
+        <source>OSTC, Mk.2/2N/2C</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -616,39 +666,55 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="326"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1656"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1943"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1546"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1726"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1766"/>
-        <source>Serial No.</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="260"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1575"/>
+        <source>Eco</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="349"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1679"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1980"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1547"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1727"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1767"/>
-        <source>Firmware version</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="265"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1576"/>
+        <source>Medium</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="538"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1713"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1990"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1548"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1729"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1768"/>
-        <source>Custom text</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="270"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1577"/>
+        <source>High</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="385"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1549"/>
-        <source>Language</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="278"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="826"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="849"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="875"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="927"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="993"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1019"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1101"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1117"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1450"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2278"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2382"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2408"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2434"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2474"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2497"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1586"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1621"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1623"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1625"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1628"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1637"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1638"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1710"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1785"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1789"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1801"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1803"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1806"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1807"/>
+        <source>%</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -676,35 +742,59 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="579"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1557"/>
-        <source>Dive mode</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="313"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1582"/>
+        <source>m/°C</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="556"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1560"/>
-        <source>OC</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="318"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1583"/>
+        <source>ft/°F</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="561"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1561"/>
-        <source>CC</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="326"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1656"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1943"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1546"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1726"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1766"/>
+        <source>Serial No.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="566"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2336"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1562"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1793"/>
-        <source>Gauge</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="349"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1679"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1980"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1547"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1727"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1767"/>
+        <source>Firmware version</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="571"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1563"/>
-        <source>Apnea</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="360"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1568"/>
+        <source>MMDDYY</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="365"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1569"/>
+        <source>DDMMYY</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="370"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1570"/>
+        <source>YYMMDD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="385"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1549"/>
+        <source>Language</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -716,165 +806,154 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="360"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1568"/>
-        <source>MMDDYY</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="405"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1572"/>
+        <source>Brightness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="365"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1569"/>
-        <source>DDMMYY</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="415"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1850"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1579"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1753"/>
+        <source>Units</source>
+        <translation>Đơn vị</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="425"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1585"/>
+        <source>Salinity (0-5%)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="370"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1570"/>
-        <source>YYMMDD</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="438"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1615"/>
+        <source>Reset device to default settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1042"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2457"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1639"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1805"/>
-        <source>Saturation</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="452"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1590"/>
+        <source>230LSB/Gauss</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="278"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="826"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="849"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="875"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="927"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="993"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1019"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1101"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1117"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1450"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2278"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2382"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2408"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2434"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2474"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2497"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1586"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1621"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1623"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1625"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1628"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1637"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1638"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1710"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1785"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1789"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1801"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1803"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1806"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1807"/>
-        <source>%</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="457"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1591"/>
+        <source>330LSB/Gauss</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="865"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2261"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1624"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1784"/>
-        <source>Desaturation</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="462"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1592"/>
+        <source>390LSB/Gauss</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="983"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2398"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1636"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1800"/>
-        <source>Last deco</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="467"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1593"/>
+        <source>440LSB/Gauss</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="711"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="736"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="758"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="904"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2181"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2206"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2228"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2307"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1626"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1786"/>
-        <source> m</source>
-        <translation>m</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="472"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1594"/>
+        <source>660LSB/Gauss</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="405"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1572"/>
-        <source>Brightness</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="477"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1595"/>
+        <source>820LSB/Gauss</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="260"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1575"/>
-        <source>Eco</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="482"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1596"/>
+        <source>1090LSB/Gauss</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="265"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1576"/>
-        <source>Medium</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="487"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1597"/>
+        <source>1370LSB/Gauss</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="270"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1577"/>
-        <source>High</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="521"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1587"/>
+        <source>Compass gain</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="603"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2034"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1599"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1779"/>
-        <source>Sampling rate</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="531"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1799"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1745"/>
+        <source>Computer model</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="590"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1602"/>
-        <source>2s</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="538"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1713"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1990"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1548"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1729"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1768"/>
+        <source>Custom text</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="595"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1769"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1603"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1739"/>
-        <source>10s</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="556"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1560"/>
+        <source>OC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="415"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1850"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1579"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1753"/>
-        <source>Units</source>
-        <translation>Đơn vị</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="561"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1561"/>
+        <source>CC</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="313"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1582"/>
-        <source>m/°C</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="566"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2336"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1562"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1793"/>
+        <source>Gauge</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="318"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1583"/>
-        <source>ft/°F</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="571"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1563"/>
+        <source>Apnea</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="644"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1605"/>
-        <source>Dive mode color</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="579"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1557"/>
+        <source>Dive mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="590"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1602"/>
+        <source>2s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="595"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1769"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1603"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1739"/>
+        <source>10s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="603"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2034"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1599"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1779"/>
+        <source>Sampling rate</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -902,12 +981,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="425"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1585"/>
-        <source>Salinity (0-5%)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="637"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2092"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1613"/>
@@ -916,89 +989,79 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="521"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1587"/>
-        <source>Compass gain</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="90"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1523"/>
-        <source>Read settings from backup file or from device before writing to the device</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="116"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1527"/>
-        <source>Read settings from backup file or from device before writing to a backup file</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="232"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1543"/>
-        <source>OSTC, Mk.2/2N/2C</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="644"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1605"/>
+        <source>Dive mode color</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="452"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1590"/>
-        <source>230LSB/Gauss</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="654"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2020"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1614"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1771"/>
+        <source>Show safety stop</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="457"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1591"/>
-        <source>330LSB/Gauss</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="661"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2145"/>
+        <source>End Depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="462"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1592"/>
-        <source>390LSB/Gauss</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="671"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2162"/>
+        <source> s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="467"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1593"/>
-        <source>440LSB/Gauss</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="687"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1953"/>
+        <source>Length</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="472"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1594"/>
-        <source>660LSB/Gauss</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="694"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2138"/>
+        <source>Start Depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="477"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1595"/>
-        <source>820LSB/Gauss</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="701"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2152"/>
+        <source>Reset Depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="482"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1596"/>
-        <source>1090LSB/Gauss</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="711"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="736"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="758"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="904"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2181"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2206"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2228"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2307"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1626"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1786"/>
+        <source> m</source>
+        <translation>m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="487"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1597"/>
-        <source>1370LSB/Gauss</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="778"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2248"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1643"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1810"/>
+        <source>Advanced settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="654"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2020"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1614"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1771"/>
-        <source>Show safety stop</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="784"/>
+        <source>Left button sensitivity</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="438"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1615"/>
-        <source>Reset device to default settings</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="791"/>
+        <source>Always show ppO2</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1010,20 +1073,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="223"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1541"/>
-        <source>Suunto Vyper family</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="778"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2248"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1643"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1810"/>
-        <source>Advanced settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="805"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2271"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1618"/>
@@ -1054,6 +1103,14 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="865"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2261"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1624"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1784"/>
+        <source>Desaturation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="917"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2320"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1627"/>
@@ -1068,14 +1125,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="973"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2369"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1630"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1788"/>
-        <source> min</source>
-        <translation>nhỏ nhất</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="960"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2331"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1633"/>
@@ -1084,60 +1133,25 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="47"/>
-        <source>Connect via Bluetooth</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="163"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1532"/>
-        <source>Save libdivecomputer logfile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="661"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2145"/>
-        <source>End Depth</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="671"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2162"/>
-        <source> s</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="687"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1953"/>
-        <source>Length</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="694"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2138"/>
-        <source>Start Depth</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="701"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2152"/>
-        <source>Reset Depth</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="784"/>
-        <source>Left button sensitivity</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="965"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1634"/>
+        <source>ZH-L16+GF</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="791"/>
-        <source>Always show ppO2</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="973"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2369"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1630"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1788"/>
+        <source> min</source>
+        <translation>nhỏ nhất</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="965"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1634"/>
-        <source>ZH-L16+GF</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="983"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2398"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1636"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1800"/>
+        <source>Last deco</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1157,6 +1171,14 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1042"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2457"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1639"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1805"/>
+        <source>Saturation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1052"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1642"/>
         <source>Flip screen</source>
@@ -1168,12 +1190,22 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1066"/>
+        <source>MOD warning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1073"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2513"/>
         <source>Graphical speed indicator</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1080"/>
+        <source>Dynamic ascent rate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1087"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2552"/>
         <source>Bottom gas consumption</source>
@@ -1186,6 +1218,14 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1133"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1149"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2520"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2536"/>
+        <source> ℓ/min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1165"/>
         <source>Temperature sensor offset</source>
         <translation type="unfinished"/>
@@ -1204,6 +1244,18 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1235"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1320"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2610"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2695"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1645"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1668"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1812"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1835"/>
+        <source>%O₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1240"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1325"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2615"/>
@@ -1322,15 +1374,9 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1691"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1858"/>
-        <source>Set point [cbar]</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1693"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1860"/>
-        <source>Change depth [m]</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1405"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2770"/>
+        <source>Setpoint</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1370,6 +1416,12 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1443"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1709"/>
+        <source>O₂ in calibration gas</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1467"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1713"/>
         <source>Fixed setpoint</source>
@@ -1400,101 +1452,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1748"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1733"/>
-        <source>P1 (medium)</source>
-        <extracomment>Suunto safety level</extracomment>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1753"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1734"/>
-        <source>P2 (high)</source>
-        <extracomment>Suunto safety level</extracomment>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1792"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1744"/>
-        <source>Total dive time</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2109"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1769"/>
-        <source>kg/ℓ</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2346"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1795"/>
-        <source>Apnoea</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1583"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1722"/>
-        <source>Safety level</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="54"/>
-        <source>Connect</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="64"/>
-        <source>Disconnect</source>
-        <translation>Ngắt kết nối</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="214"/>
-        <source>OSTC 3,Sport,Cr,2</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1066"/>
-        <source>MOD warning</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1080"/>
-        <source>Dynamic ascent rate</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1133"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1149"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2520"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2536"/>
-        <source> ℓ/min</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1235"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1320"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2610"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2695"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1645"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1668"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1812"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1835"/>
-        <source>%O₂</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1405"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2770"/>
-        <source>Setpoint</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1443"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1709"/>
-        <source>O₂ in calibration gas</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1535"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2843"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1719"/>
@@ -1511,6 +1468,12 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1583"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1722"/>
+        <source>Safety level</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1609"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1723"/>
         <source>Altitude range</source>
@@ -1544,6 +1507,20 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1748"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1733"/>
+        <source>P1 (medium)</source>
+        <extracomment>Suunto safety level</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1753"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1734"/>
+        <source>P2 (high)</source>
+        <extracomment>Suunto safety level</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1761"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1736"/>
         <source>Sample rate</source>
@@ -1568,10 +1545,9 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="531"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1799"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1745"/>
-        <source>Computer model</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1792"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1744"/>
+        <source>Total dive time</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1637,12 +1613,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2099"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1765"/>
-        <source>Salinity</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2074"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1774"/>
         <source>MM/DD/YY</source>
@@ -1661,12 +1631,30 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2099"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1765"/>
+        <source>Salinity</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2109"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1769"/>
+        <source>kg/ℓ</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2341"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1794"/>
         <source>ZH-L16 CC</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2346"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1795"/>
+        <source>Apnoea</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2351"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1796"/>
         <source>L16-GF OC</source>
@@ -1685,85 +1673,110 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1108"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1129"/>
-        <source>Backup files (*.xml)</source>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1539"/>
+        <source>OSTC 3</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1113"/>
-        <source>An error occurred while saving the backup file.
-%1</source>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1691"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1858"/>
+        <source>Set point [cbar]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1116"/>
-        <source>Backup succeeded</source>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1693"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1860"/>
+        <source>Change depth [m]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1117"/>
-        <source>Your settings have been saved to: %1</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1110"/>
+        <source>Backup dive computer settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1107"/>
-        <source>Backup dive computer settings</source>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1111"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1132"/>
+        <source>Backup files (*.xml)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1112"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1115"/>
         <source>XML backup error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1128"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1116"/>
+        <source>An error occurred while saving the backup file.
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1119"/>
+        <source>Backup succeeded</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1120"/>
+        <source>Your settings have been saved to: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1131"/>
         <source>Restore dive computer settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1134"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1137"/>
         <source>XML restore error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1135"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1138"/>
         <source>An error occurred while restoring the backup file.
 %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1139"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1142"/>
         <source>Restore succeeded</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1140"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1143"/>
         <source>Your settings have been restored successfully.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1150"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1153"/>
         <source>Select firmware file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1151"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1154"/>
         <source>All files (*.*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1207"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1210"/>
         <source>Choose file for divecomputer download logfile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1208"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1211"/>
         <source>Log files (*.log)</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
+    <name>ContextDrawer</name>
+    <message>
+        <location filename="../mobile-widgets/qml/kirigami/src/controls/ContextDrawer.qml" line="76"/>
+        <source>Actions</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>CylindersModel</name>
     <message>
         <location filename="../qt-models/cylindermodel.cpp" line="16"/>
@@ -1777,11 +1790,6 @@
     </message>
     <message>
         <location filename="../qt-models/cylindermodel.cpp" line="16"/>
-        <source>He%</source>
-        <translation>Anh ấy%</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="16"/>
         <source>Work press.</source>
         <translation>Ấn làm việc.</translation>
     </message>
@@ -1801,9 +1809,24 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="16"/>
+        <source>He%</source>
+        <translation>Anh ấy%</translation>
+    </message>
+    <message>
         <location filename="../qt-models/cylindermodel.cpp" line="17"/>
-        <source>Switch at</source>
-        <translation>Chuyển đổi tại</translation>
+        <source>Deco switch at</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
+        <source>Bot. MOD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
+        <source>MND</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-models/cylindermodel.cpp" line="17"/>
@@ -1821,17 +1844,32 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="161"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="177"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation>Click vào đây sẽ loại bỏ này xi lanh.</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="383"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="180"/>
+        <source>Switch depth for deco gas. Calculated using Deco pO₂ preference, unless set manually.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="183"/>
+        <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to &apos;*&apos; for best O₂% for max depth.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="186"/>
+        <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to &apos;*&apos; for best He% for max depth.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="444"/>
         <source>Cylinder cannot be removed</source>
         <translation>Xi lanh không thể được gỡ bỏ</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="384"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="445"/>
         <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source>
         <translation>Khí này hiện đang được sử dụng. Chỉ các xi lanh không được sử dụng khi lặn có thể được gỡ bỏ.</translation>
     </message>
@@ -1851,42 +1889,24 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="73"/>
+        <location filename="../build/ui_divecomponentselection.h" line="141"/>
+        <source>Dive site</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="80"/>
         <location filename="../build/ui_divecomponentselection.h" line="142"/>
         <source>Suit</source>
         <translation>Đồ lặn</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="122"/>
-        <location filename="../build/ui_divecomponentselection.h" line="148"/>
-        <source>Divemaster</source>
-        <translation>Người lặn giỏi nhất</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="129"/>
-        <location filename="../build/ui_divecomponentselection.h" line="149"/>
-        <source>Buddy</source>
-        <translation>Bạn</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="136"/>
-        <location filename="../build/ui_divecomponentselection.h" line="150"/>
-        <source>Rating</source>
-        <translation>Xếp hạng</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="87"/>
         <location filename="../build/ui_divecomponentselection.h" line="143"/>
         <source>Visibility</source>
         <translation>Tầm nhìn</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="73"/>
-        <location filename="../build/ui_divecomponentselection.h" line="141"/>
-        <source>Dive site</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="94"/>
         <location filename="../build/ui_divecomponentselection.h" line="144"/>
         <source>Notes</source>
@@ -1910,10 +1930,34 @@
         <source>Cylinders</source>
         <translation>Xilanh</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="122"/>
+        <location filename="../build/ui_divecomponentselection.h" line="148"/>
+        <source>Divemaster</source>
+        <translation>Người lặn giỏi nhất</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="129"/>
+        <location filename="../build/ui_divecomponentselection.h" line="149"/>
+        <source>Buddy</source>
+        <translation>Bạn</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="136"/>
+        <location filename="../build/ui_divecomponentselection.h" line="150"/>
+        <source>Rating</source>
+        <translation>Xếp hạng</translation>
+    </message>
 </context>
 <context>
     <name>DiveComputerManagementDialog</name>
     <message>
+        <location filename="../desktop-widgets/divecomputermanagementdialog.ui" line="17"/>
+        <location filename="../build/ui_divecomputermanagementdialog.h" line="65"/>
+        <source>Edit dive computer nicknames</source>
+        <translation>Chỉnh sửa tên thiết bị lặn</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divecomputermanagementdialog.cpp" line="49"/>
         <source>Remove the selected dive computer?</source>
         <translation>Loại bỏ các Máy Lặn đã chọn?</translation>
@@ -1925,12 +1969,6 @@
         <translation>Bạn có chắc bạn muốn
 bỏ các máy lặn đã được chọn?</translation>
     </message>
-    <message>
-        <location filename="../desktop-widgets/divecomputermanagementdialog.ui" line="17"/>
-        <location filename="../build/ui_divecomputermanagementdialog.h" line="65"/>
-        <source>Edit dive computer nicknames</source>
-        <translation>Chỉnh sửa tên thiết bị lặn</translation>
-    </message>
 </context>
 <context>
     <name>DiveComputerModel</name>
@@ -1958,17 +1996,17 @@ bỏ các máy lặn đã được chọn?</translation>
 <context>
     <name>DiveDetails</name>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="33"/>
+        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="38"/>
         <source>Dive details</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="67"/>
+        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="72"/>
         <source>Delete dive</source>
         <translation>Xóa lần lặn</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="84"/>
+        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="89"/>
         <source>Show on map</source>
         <translation type="unfinished"/>
     </message>
@@ -1976,88 +2014,93 @@ bỏ các máy lặn đã được chọn?</translation>
 <context>
     <name>DiveDetailsEdit</name>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="74"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="80"/>
         <source>Dive %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="78"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="84"/>
         <source>Date:</source>
         <translation>Ngày tháng:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="86"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="92"/>
         <source>Location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="95"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="101"/>
         <source>Coordinates:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="104"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="110"/>
         <source>Use current
 GPS location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="118"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="124"/>
         <source>Depth:</source>
         <translation>Độ sâu:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="127"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="133"/>
         <source>Duration:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="137"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="143"/>
         <source>Air Temp:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="146"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="152"/>
         <source>Water Temp:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="155"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="161"/>
         <source>Suit:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="164"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="176"/>
         <source>Buddy:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="173"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="191"/>
         <source>Dive Master:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="182"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="206"/>
         <source>Weight:</source>
         <translation>Cân nặng:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="192"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="216"/>
+        <source>Cylinder:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="231"/>
         <source>Gas mix:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="203"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="241"/>
         <source>Start Pressure:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="213"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="250"/>
         <source>End Pressure:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="224"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="260"/>
         <source>Notes:</source>
         <translation type="unfinished"/>
     </message>
@@ -2095,42 +2138,42 @@ GPS location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="159"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="158"/>
         <source>Air Temp:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="175"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="172"/>
         <source>Cylinder:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="189"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="185"/>
         <source>Water Temp:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="205"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="198"/>
         <source>Dive Master:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="220"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="211"/>
         <source>Weight:</source>
         <translation>Cân nặng:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="249"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="224"/>
         <source>Buddy:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="263"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="237"/>
         <source>SAC:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="280"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="252"/>
         <source>Notes</source>
         <translation>Ghi chú</translation>
     </message>
@@ -2138,18 +2181,18 @@ GPS location:</source>
 <context>
     <name>DiveEventItem</name>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="134"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="165"/>
         <source>Manual switch to OC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="136"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="167"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation>bắt đầu</translation>
     </message>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="137"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="168"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation>kết thúc</translation>
@@ -2158,27 +2201,27 @@ GPS location:</source>
 <context>
     <name>DiveImportedModel</name>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="646"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="656"/>
         <source>Date/time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="648"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="658"/>
         <source>Duration</source>
         <translation>Độ dài</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="650"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="660"/>
         <source>Depth</source>
         <translation>Độ sâu</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="672"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="682"/>
         <source>h:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="672"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="682"/>
         <source>min</source>
         <translation>nhỏ nhất</translation>
     </message>
@@ -2187,8 +2230,8 @@ GPS location:</source>
     <name>DiveList</name>
     <message>
         <location filename="../mobile-widgets/qml/DiveList.qml" line="12"/>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="226"/>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="232"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="227"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="233"/>
         <source>Dive list</source>
         <translation type="unfinished"/>
     </message>
@@ -2203,110 +2246,115 @@ GPS location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="222"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="223"/>
         <source>Cloud credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="228"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="229"/>
         <source>Please tap the &apos;+&apos; button to add a dive</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="248"/>
+        <source>No dives in dive list</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DiveListView</name>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="846"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="849"/>
         <source>Expand all</source>
         <translation>Mở rộng tất cả</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="848"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="851"/>
         <source>Collapse all</source>
         <translation>Mở ra tất cả</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="852"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="855"/>
         <source>Collapse others</source>
         <translation>Mở ra tất cả</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="856"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="859"/>
         <source>Remove dive(s) from trip</source>
         <translation>Loại bỏ (các)máy lặn từ chuyến đi</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="857"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="860"/>
         <source>Create new trip above</source>
         <translation>Tạo một chuyến đi mới phía trước</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="871"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="874"/>
         <source>Add dive(s) to trip immediately above</source>
         <translation>Thêm (các)chuyến đi lặn ngay lập tức ở trên</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="873"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="876"/>
         <source>Add dive(s) to trip immediately below</source>
         <translation>Thêm (các)chuyến đi lặn ngay lập tức ở dưới</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="877"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="880"/>
         <source>Merge trip with trip above</source>
         <translation>Gập chuyến đi với chuyến đi trước</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="878"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="881"/>
         <source>Merge trip with trip below</source>
         <translation>Gộp chuyến đi với chuyến đi bên dưới</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="882"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="885"/>
         <source>Delete dive(s)</source>
         <translation>Xóa (các)lần lặn</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="884"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="887"/>
         <source>Mark dive(s) invalid</source>
         <translation>Đánh dấu (các)lần lặn không hợp lệ</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="888"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="891"/>
         <source>Merge selected dives</source>
         <translation>Hợp nhất các lần lặn được chọn</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="890"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="893"/>
         <source>Renumber dive(s)</source>
         <translation>Đánh dấu lại (các)lần lặn</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="891"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="894"/>
         <source>Shift dive times</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="892"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="895"/>
         <source>Split selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="893"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="896"/>
         <source>Load image(s) from file(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="894"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="897"/>
         <source>Load image(s) from web</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="917"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="919"/>
         <source>Open image files</source>
         <translation>Mở tập tin hình ảnh</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="917"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="919"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>Tập tin hình ảnh (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -2327,56 +2375,6 @@ GPS location:</source>
 <context>
     <name>DiveLogExportDialog</name>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="103"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="351"/>
-        <source>Export format</source>
-        <translation>Định dạng của dữ liệu xuất</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="134"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="353"/>
-        <source>UDDF</source>
-        <translation>UDDF</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="187"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="358"/>
-        <source>Worldmap</source>
-        <translation>Bản đồ thế giới</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="197"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="359"/>
-        <source>I&amp;mage depths</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="243"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="360"/>
-        <source>Selection</source>
-        <translation>Lựa chọn</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="252"/>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="346"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="361"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="372"/>
-        <source>Selected dives</source>
-        <translation>Các lần lặn đã được chọn</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="262"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="362"/>
-        <source>All dives</source>
-        <translation>Tất cả các lần lặn</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="306"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="396"/>
-        <source>HTML</source>
-        <translation>HTML</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="14"/>
         <location filename="../build/ui_divelogexportdialog.h" line="349"/>
         <source>Export dive log files</source>
@@ -2389,12 +2387,24 @@ GPS location:</source>
         <translation>Chỉnh sửa chung cho xuất dữ liệu</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="103"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="351"/>
+        <source>Export format</source>
+        <translation>Định dạng của dữ liệu xuất</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="115"/>
         <location filename="../build/ui_divelogexportdialog.h" line="352"/>
         <source>Subsurface &amp;XML</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="134"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="353"/>
+        <source>UDDF</source>
+        <translation>UDDF</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="147"/>
         <location filename="../build/ui_divelogexportdialog.h" line="354"/>
         <source>di&amp;velogs.de</source>
@@ -2419,238 +2429,297 @@ GPS location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="275"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="187"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="358"/>
+        <source>Worldmap</source>
+        <translation>Bản đồ thế giới</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="197"/>
+        <source>TeX</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="207"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="359"/>
+        <source>I&amp;mage depths</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="253"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="360"/>
+        <source>Selection</source>
+        <translation>Lựa chọn</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="262"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="356"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="361"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="372"/>
+        <source>Selected dives</source>
+        <translation>Các lần lặn đã được chọn</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="272"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="362"/>
+        <source>All dives</source>
+        <translation>Tất cả các lần lặn</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="285"/>
         <location filename="../build/ui_divelogexportdialog.h" line="363"/>
         <source>CSV units</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="288"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="298"/>
         <location filename="../build/ui_divelogexportdialog.h" line="366"/>
         <source>Metric</source>
         <translation>Số liệu</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="293"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="303"/>
         <location filename="../build/ui_divelogexportdialog.h" line="367"/>
         <source>Imperial</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="324"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="316"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="396"/>
+        <source>HTML</source>
+        <translation>HTML</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="334"/>
         <location filename="../build/ui_divelogexportdialog.h" line="370"/>
         <source>General settings</source>
         <translation>Cài đặt chung</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="330"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="340"/>
         <location filename="../build/ui_divelogexportdialog.h" line="371"/>
         <source>Subsurface numbers</source>
         <translation>Số hiệu Subsurface</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="359"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="369"/>
         <location filename="../build/ui_divelogexportdialog.h" line="373"/>
         <source>Export yearly statistics</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="375"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="385"/>
         <location filename="../build/ui_divelogexportdialog.h" line="374"/>
         <source>All di&amp;ves</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="385"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="395"/>
         <location filename="../build/ui_divelogexportdialog.h" line="375"/>
         <source>Export list only</source>
         <translation>Chỉ danh sách xuất dữ liệu</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="392"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="402"/>
         <location filename="../build/ui_divelogexportdialog.h" line="376"/>
         <source>Export photos</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="408"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="418"/>
         <location filename="../build/ui_divelogexportdialog.h" line="377"/>
         <source>Style options</source>
         <translation>Chỉnh phần trang trí</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="423"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="433"/>
         <location filename="../build/ui_divelogexportdialog.h" line="378"/>
         <source>Font</source>
         <translation>Kiểu chữ</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="433"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="443"/>
         <location filename="../build/ui_divelogexportdialog.h" line="379"/>
         <source>Font size</source>
         <translation>Kích thước kiểu chữ</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="444"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="454"/>
         <location filename="../build/ui_divelogexportdialog.h" line="382"/>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="449"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="459"/>
         <location filename="../build/ui_divelogexportdialog.h" line="383"/>
         <source>10</source>
         <translation>10</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="454"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="464"/>
         <location filename="../build/ui_divelogexportdialog.h" line="384"/>
         <source>12</source>
         <translation>12</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="459"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="469"/>
         <location filename="../build/ui_divelogexportdialog.h" line="385"/>
         <source>14</source>
         <translation>14</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="464"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="474"/>
         <location filename="../build/ui_divelogexportdialog.h" line="386"/>
         <source>16</source>
         <translation>16</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="469"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="479"/>
         <location filename="../build/ui_divelogexportdialog.h" line="387"/>
         <source>18</source>
         <translation>18</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="474"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="484"/>
         <location filename="../build/ui_divelogexportdialog.h" line="388"/>
         <source>20</source>
         <translation>20</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="482"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="492"/>
         <location filename="../build/ui_divelogexportdialog.h" line="390"/>
         <source>Theme</source>
         <translation>Giao diện</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="493"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="503"/>
         <location filename="../build/ui_divelogexportdialog.h" line="393"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="95"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="99"/>
         <source>Light</source>
         <translation>Sáng</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="498"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="508"/>
         <location filename="../build/ui_divelogexportdialog.h" line="394"/>
         <source>Sand</source>
         <translation>Cát</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="134"/>
-        <source>UDDF files (*.uddf *.UDDF)</source>
-        <translation>UDDF files (*.uddf *.UDDF)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="142"/>
-        <source>CSV files (*.csv *.CSV)</source>
-        <translation>CSV files (*.csv *.CSV)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="74"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="76"/>
         <source>Generic format that is used for data exchange between a variety of diving related programs.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="76"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="78"/>
         <source>Comma separated values describing the dive profile.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="78"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="80"/>
         <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="80"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="82"/>
         <source>Send the dive data to divelogs.de website.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="82"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="84"/>
         <source>Send the dive data to dive-share.appspot.com website</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="84"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="86"/>
         <source>HTML export of the dive locations, visualized on a world map.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="86"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="88"/>
         <source>Subsurface native XML format.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="88"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="90"/>
         <source>Write depths of images to file.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="133"/>
-        <source>Export UDDF file as</source>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="92"/>
+        <source>Write dive as TeX macros to file.</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.cpp" line="137"/>
+        <source>Export UDDF file as</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/>
+        <source>UDDF files (*.uddf *.UDDF)</source>
+        <translation>UDDF files (*.uddf *.UDDF)</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divelogexportdialog.cpp" line="141"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="145"/>
         <source>Export CSV file as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="148"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="142"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="146"/>
+        <source>CSV files (*.csv *.CSV)</source>
+        <translation>CSV files (*.csv *.CSV)</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="152"/>
         <source>Export world map</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="149"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="169"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="153"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="177"/>
         <source>HTML files (*.html)</source>
         <translation>HTML files (*.html)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="153"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="157"/>
         <source>Export Subsurface XML</source>
         <translation>Xuất dữ liệu dưới dạng Subsurface XML</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="158"/>
         <source>XML files (*.xml *.ssrf)</source>
         <translation>XML files (*.xml *.ssrf)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="162"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="166"/>
         <source>Save image depths</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="168"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="170"/>
+        <source>Export to TeX file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="170"/>
+        <source>TeX files (*.tex)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="176"/>
         <source>Export HTML files as</source>
         <translation>Xuất dữ liệu từ tập tin HTML dưới dạng</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="184"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="192"/>
         <source>Please wait, exporting...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="219"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="227"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="311"/>
         <source>Can&apos;t open file %s</source>
         <translation type="unfinished"/>
     </message>
@@ -2664,25 +2733,6 @@ GPS location:</source>
         <translation>Nhập dữ liệu từ tập tin ghi nhận các lần lặn</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="643"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="727"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="856"/>
-        <source>Time</source>
-        <translation>Thời gian</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.ui" line="127"/>
-        <location filename="../build/ui_divelogimportdialog.h" line="164"/>
-        <source>Metric</source>
-        <translation>Số liệu</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.ui" line="132"/>
-        <location filename="../build/ui_divelogimportdialog.h" line="165"/>
-        <source>Imperial</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divelogimportdialog.ui" line="89"/>
         <location filename="../build/ui_divelogimportdialog.h" line="152"/>
         <source>dd.mm.yyyy</source>
@@ -2701,269 +2751,287 @@ GPS location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.ui" line="155"/>
-        <location filename="../build/ui_divelogimportdialog.h" line="167"/>
-        <source>Drag the tags above to each corresponding column below</source>
+        <location filename="../desktop-widgets/divelogimportdialog.ui" line="108"/>
+        <location filename="../build/ui_divelogimportdialog.h" line="158"/>
+        <source>Seconds</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="641"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="729"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="852"/>
-        <source>Dive #</source>
+        <location filename="../desktop-widgets/divelogimportdialog.ui" line="113"/>
+        <location filename="../build/ui_divelogimportdialog.h" line="159"/>
+        <source>Minutes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="642"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="723"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="854"/>
-        <source>Date</source>
-        <translation>Ngày tháng</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.ui" line="118"/>
+        <location filename="../build/ui_divelogimportdialog.h" line="160"/>
+        <source>Minutes:seconds</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="644"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="858"/>
-        <source>Duration</source>
-        <translation>Độ dài</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.ui" line="127"/>
+        <location filename="../build/ui_divelogimportdialog.h" line="164"/>
+        <source>Metric</source>
+        <translation>Số liệu</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="655"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="862"/>
-        <source>GPS</source>
+        <location filename="../desktop-widgets/divelogimportdialog.ui" line="132"/>
+        <location filename="../build/ui_divelogimportdialog.h" line="165"/>
+        <source>Imperial</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="645"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="864"/>
-        <source>Max. depth</source>
+        <location filename="../desktop-widgets/divelogimportdialog.ui" line="155"/>
+        <location filename="../build/ui_divelogimportdialog.h" line="167"/>
+        <source>Drag the tags above to each corresponding column below</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="646"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="866"/>
-        <source>Avg. depth</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="355"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="528"/>
+        <source>Tab</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="658"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="872"/>
-        <source>Suit</source>
-        <translation>Đồ lặn</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="598"/>
+        <source>Some column headers were pre-populated; please drag and drop the headers so they match the column they are in.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="663"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="878"/>
-        <source>Tags</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="636"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="761"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="857"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="925"/>
+        <source>Sample time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="652"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="894"/>
-        <source>O₂</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="638"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="763"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="859"/>
+        <source>Sample depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="653"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="896"/>
-        <source>He</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="640"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="765"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="861"/>
+        <source>Sample temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.ui" line="108"/>
-        <location filename="../build/ui_divelogimportdialog.h" line="158"/>
-        <source>Seconds</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="642"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="767"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="863"/>
+        <source>Sample pO₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.ui" line="113"/>
-        <location filename="../build/ui_divelogimportdialog.h" line="159"/>
-        <source>Minutes</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="644"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="769"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="865"/>
+        <source>Sample sensor1 pO₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.ui" line="118"/>
-        <location filename="../build/ui_divelogimportdialog.h" line="160"/>
-        <source>Minutes:seconds</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="646"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="771"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="867"/>
+        <source>Sample sensor2 pO₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="654"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="860"/>
-        <source>Location</source>
-        <translation>Địa điểm</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="648"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="773"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="869"/>
+        <source>Sample sensor3 pO₂</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="354"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="499"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="505"/>
-        <source>Tab</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="650"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="775"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="871"/>
+        <source>Sample CNS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="575"/>
-        <source>Some column headers were pre-populated; please drag and drop the headers so they match the column they are in.</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="652"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="777"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="873"/>
+        <source>Sample NDL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="613"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="731"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="782"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="848"/>
-        <source>Sample time</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="654"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="779"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="875"/>
+        <source>Sample TTS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="615"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="733"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="784"/>
-        <source>Sample depth</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="656"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="781"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="877"/>
+        <source>Sample stopdepth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="617"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="735"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="786"/>
-        <source>Sample temperature</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="658"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="783"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="879"/>
+        <source>Sample pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="621"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="739"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="790"/>
-        <source>Sample sensor1 pO₂</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="660"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="785"/>
+        <source>Sample setpoint</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="623"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="741"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="792"/>
-        <source>Sample sensor2 pO₂</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="664"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="759"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="929"/>
+        <source>Dive #</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="625"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="743"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="794"/>
-        <source>Sample sensor3 pO₂</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="665"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="753"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="931"/>
+        <source>Date</source>
+        <translation>Ngày tháng</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="666"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="757"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="933"/>
+        <source>Time</source>
+        <translation>Thời gian</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="667"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="935"/>
+        <source>Duration</source>
+        <translation>Độ dài</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="668"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="941"/>
+        <source>Max. depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="633"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="751"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="802"/>
-        <source>Sample stopdepth</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="669"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="943"/>
+        <source>Avg. depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="637"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="755"/>
-        <source>Sample setpoint</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="670"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="975"/>
+        <source>Air temp.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="619"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="737"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="788"/>
-        <source>Sample pO₂</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="671"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="977"/>
+        <source>Water temp.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="627"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="745"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="796"/>
-        <source>Sample CNS</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="672"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="965"/>
+        <source>Cyl. size</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="629"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="747"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="798"/>
-        <source>Sample NDL</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="673"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="967"/>
+        <source>Start pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="631"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="749"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="800"/>
-        <source>Sample TTS</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="674"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="969"/>
+        <source>End pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="635"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="753"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="804"/>
-        <source>Sample pressure</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="675"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="971"/>
+        <source>O₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="656"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="868"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="676"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="973"/>
+        <source>He</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="677"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="937"/>
+        <source>Location</source>
+        <translation>Địa điểm</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="678"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="939"/>
+        <source>GPS</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="679"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="945"/>
         <source>Divemaster</source>
         <translation>Người lặn giỏi nhất</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="657"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="870"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="680"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="947"/>
         <source>Buddy</source>
         <translation>Bạn</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="659"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="681"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="949"/>
+        <source>Suit</source>
+        <translation>Đồ lặn</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="682"/>
         <source>Rating</source>
         <translation>Xếp hạng</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="660"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="683"/>
         <source>Visibility</source>
         <translation>Tầm nhìn</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="661"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="874"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="684"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="951"/>
         <source>Notes</source>
         <translation>Ghi chú</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="662"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="876"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="685"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="953"/>
         <source>Weight</source>
         <translation>Cân nặng</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="649"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="888"/>
-        <source>Cyl. size</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="650"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="890"/>
-        <source>Start pressure</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="651"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="892"/>
-        <source>End pressure</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="647"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="898"/>
-        <source>Air temp.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="648"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="900"/>
-        <source>Water temp.</source>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="686"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="955"/>
+        <source>Tags</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DiveObjectHelper</name>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="287"/>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="323"/>
         <source>%1 dive(s)</source>
         <translation type="unfinished"/>
     </message>
@@ -2971,18 +3039,18 @@ GPS location:</source>
 <context>
     <name>DivePlanner</name>
     <message>
-        <location filename="../desktop-widgets/diveplanner.ui" line="152"/>
-        <location filename="../build/ui_diveplanner.h" line="190"/>
-        <source>Altitude</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/diveplanner.ui" line="109"/>
         <location filename="../build/ui_diveplanner.h" line="189"/>
         <source>Planned dive time</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/diveplanner.ui" line="152"/>
+        <location filename="../build/ui_diveplanner.h" line="190"/>
+        <source>Altitude</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/diveplanner.ui" line="159"/>
         <location filename="../build/ui_diveplanner.h" line="191"/>
         <source>ATM pressure</source>
@@ -3016,32 +3084,32 @@ GPS location:</source>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="134"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="136"/>
         <source>unknown</source>
         <translation>chưa rõ</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="312"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="326"/>
         <source>Final depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="314"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="328"/>
         <source>Run time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="316"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="330"/>
         <source>Duration</source>
         <translation>Độ dài</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="318"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="332"/>
         <source>Used gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="320"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="334"/>
         <source>CC setpoint</source>
         <translation type="unfinished"/>
     </message>
@@ -3049,22 +3117,22 @@ GPS location:</source>
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="108"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="112"/>
         <source>Dive planner points</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="112"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="116"/>
         <source>Available gases</source>
         <translation>Dưỡng khí hiện có</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="137"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="143"/>
         <source>Add dive data point</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="146"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="152"/>
         <source>Save new</source>
         <translation type="unfinished"/>
     </message>
@@ -3097,11 +3165,36 @@ GPS location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="124"/>
+        <source>User entered</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="126"/>
+        <source>Cylinder index</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="128"/>
         <source>Pressure S</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="130"/>
+        <source>Pressure I</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="132"/>
+        <source>Ceiling</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="134"/>
+        <source>SAC</source>
+        <translation>SAC</translation>
+    </message>
+    <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="136"/>
         <source>pN₂</source>
         <translation type="unfinished"/>
@@ -3137,50 +3230,25 @@ GPS location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="152"/>
-        <source>Heart rate</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="156"/>
-        <source>Mean depth @ s</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="150"/>
         <source>Ambient pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="154"/>
-        <source>Gradient factor</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="130"/>
-        <source>Pressure I</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="124"/>
-        <source>User entered</source>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="152"/>
+        <source>Heart rate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="126"/>
-        <source>Cylinder index</source>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="154"/>
+        <source>Gradient factor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="132"/>
-        <source>Ceiling</source>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="156"/>
+        <source>Mean depth @ s</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="134"/>
-        <source>SAC</source>
-        <translation>SAC</translation>
-    </message>
 </context>
 <context>
     <name>DiveShareExportDialog</name>
@@ -3246,309 +3314,313 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="395"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="441"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="434"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="483"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="398"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="444"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="437"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="486"/>
         <source>Date</source>
         <translation>Ngày tháng</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="401"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="447"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="440"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="489"/>
         <source>Rating</source>
         <translation>Xếp hạng</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="404"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="443"/>
         <source>Depth</source>
         <translation>Độ sâu</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="410"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="446"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="495"/>
+        <source>Duration</source>
+        <translation>Độ dài</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="449"/>
         <source>Temp</source>
         <translation>Nhiệt độ</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="413"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="452"/>
         <source>Weight</source>
         <translation>Cân nặng</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="425"/>
-        <source>SAC</source>
-        <translation>SAC</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
-        <source>m</source>
-        <translation>m</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
-        <source>ft</source>
-        <translation>ft</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
-        <source>Weight(%1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="416"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="462"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="455"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="504"/>
         <source>Suit</source>
         <translation>Đồ lặn</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="419"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="465"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="458"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="507"/>
         <source>Cyl</source>
         <translation>Xlanh</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="422"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="468"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="461"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="510"/>
         <source>Gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
-        <source>SAC(%1)</source>
-        <translation type="unfinished"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="464"/>
+        <source>SAC</source>
+        <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
-        <source>/min</source>
-        <translation>/nhỏ nhất</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="467"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="518"/>
+        <source>OTU</source>
+        <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="431"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="479"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="470"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="521"/>
         <source>Max CNS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="434"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="482"/>
-        <source>Location</source>
-        <translation>Địa điểm</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
+        <source>Photos</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
-        <source>kg</source>
-        <translation>ký</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="476"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="527"/>
+        <source>Location</source>
+        <translation>Địa điểm</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="492"/>
         <source>Depth(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="407"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="453"/>
-        <source>Duration</source>
-        <translation>Độ dài</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="492"/>
+        <source>m</source>
+        <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="456"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="492"/>
+        <source>ft</source>
+        <translation>ft</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="498"/>
         <source>Temp(%1%2)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="501"/>
+        <source>Weight(%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="501"/>
+        <source>kg</source>
+        <translation>ký</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="501"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="428"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="476"/>
-        <source>OTU</source>
-        <translation>OTU</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="515"/>
+        <source>SAC(%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="515"/>
+        <source>/min</source>
+        <translation>/nhỏ nhất</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="524"/>
+        <source>Photos before/during/after dive</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="164"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="165"/>
         <source>no dives were selected</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="174"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="175"/>
         <source>stylesheet to export to divelogs.de is not found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="184"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="185"/>
         <source>failed to create zip file for upload: %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="236"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="237"/>
         <source>internal error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="244"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="245"/>
         <source>Conversion of dive %1 to divelogs.de format failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="272"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="273"/>
         <source>error writing zip file: %s zip error %d system error %d - %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="745"/>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="935"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="936"/>
         <source>Done</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="778"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="779"/>
         <source>Uploading dive list...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="810"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="811"/>
         <source>Downloading dive list...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="851"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="852"/>
         <source>Downloading %1 dives...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="885"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="886"/>
         <source>Download finished - %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="899"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="900"/>
         <source>Problem with download</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="900"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="901"/>
         <source>The archive could not be opened:
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="909"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="910"/>
         <source>Corrupted download</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="910"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="911"/>
         <source>The archive could not be opened:
 %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="937"/>
+        <source>Upload finished</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="950"/>
         <source>Upload failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="952"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="953"/>
         <source>Upload successful</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="955"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="956"/>
         <source>Login failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="958"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="959"/>
         <source>Cannot parse response</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="970"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="971"/>
         <source>Error: %1</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="936"/>
-        <source>Upload finished</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>DownloadFromDCWidget</name>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="185"/>
-        <source>Error</source>
-        <translation>Lỗi</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="436"/>
-        <source>Retry</source>
-        <translation>Thử lại</translation>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="107"/>
+        <source>Download</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="280"/>
-        <source>Find Uemis dive computer</source>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="110"/>
+        <source>Choose Bluetooth download mode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="101"/>
-        <source>Download</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="191"/>
+        <source>Error</source>
+        <translation>Lỗi</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="104"/>
-        <source>Choose Bluetooth download mode</source>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="286"/>
+        <source>Find Uemis dive computer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="382"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="392"/>
         <source>Choose file for divecomputer download logfile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="383"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="393"/>
         <source>Log files (*.log)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="398"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="408"/>
         <source>Warning</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="399"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="409"/>
         <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="410"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="420"/>
         <source>Choose file for divecomputer binary dump file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="411"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="421"/>
         <source>Dump files (*.bin)</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="446"/>
+        <source>Retry</source>
+        <translation>Thử lại</translation>
+    </message>
 </context>
 <context>
     <name>DownloadFromDiveComputer</name>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="139"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="275"/>
-        <source>Vendor</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="14"/>
         <location filename="../build/ui_downloadfromdivecomputer.h" line="265"/>
         <source>Download from dive computer</source>
@@ -3561,17 +3633,6 @@ p, li { white-space: pre-wrap; }
         <translation>Thiết bị hoặc điểm kết nối</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="122"/>
-        <source>Choose Bluetooth download mode</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="149"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="276"/>
-        <source>Dive computer</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="66"/>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="101"/>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="115"/>
@@ -3595,27 +3656,50 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="87"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="270"/>
+        <source>Download into new trip</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="94"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="271"/>
+        <source>Save libdivecomputer logfile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="108"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="273"/>
+        <source>Save libdivecomputer dumpfile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="122"/>
+        <source>Choose Bluetooth download mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="129"/>
         <source>Select a remote Bluetooth device.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="52"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="277"/>
-        <source>Download</source>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="139"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="275"/>
+        <source>Vendor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="284"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="281"/>
-        <source>OK</source>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="149"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="276"/>
+        <source>Dive computer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="291"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="282"/>
-        <source>Cancel</source>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="52"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="277"/>
+        <source>Download</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -3637,21 +3721,15 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="94"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="271"/>
-        <source>Save libdivecomputer logfile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="108"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="273"/>
-        <source>Save libdivecomputer dumpfile</source>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="284"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="281"/>
+        <source>OK</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="87"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="270"/>
-        <source>Download into new trip</source>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="291"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="282"/>
+        <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -3742,12 +3820,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="297"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="242"/>
         <source>To disconnect Subsurface from your Facebook account, use the button below</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="306"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="251"/>
         <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source>
         <translation type="unfinished"/>
     </message>
@@ -3755,22 +3833,22 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>FacebookManager</name>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="266"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="211"/>
         <source>Photo upload sucessfull</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="267"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="212"/>
         <source>Your dive profile was updated to Facebook.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="271"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="216"/>
         <source>Photo upload failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="272"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="217"/>
         <source>Your dive profile was not updated to Facebook, 
  please send the following to the developer. 
 </source>
@@ -3830,17 +3908,25 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>FirmwareUpdateThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1750"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1739"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1755"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1744"/>
         <source>Firmware update failed!</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
+    <name>GlobalDrawer</name>
+    <message>
+        <location filename="../mobile-widgets/qml/kirigami/src/controls/GlobalDrawer.qml" line="364"/>
+        <source>Back</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>GlobeGPS</name>
     <message>
         <location filename="../desktop-widgets/globe.cpp" line="124"/>
@@ -3856,27 +3942,27 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="40"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="32"/>
         <source>Date: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="50"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="42"/>
         <source>Name: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="60"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="52"/>
         <source>Latitude: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="69"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="61"/>
         <source>Longitude: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="113"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="105"/>
         <source>List of stored GPS fixes</source>
         <translation type="unfinished"/>
     </message>
@@ -3905,7 +3991,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>LocationFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="648"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="646"/>
         <source>Location: </source>
         <translation type="unfinished"/>
     </message>
@@ -3946,7 +4032,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>LocationFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="299"/>
+        <location filename="../qt-models/filtermodels.cpp" line="304"/>
         <source>No location set</source>
         <translation type="unfinished"/>
     </message>
@@ -4067,20 +4153,55 @@ p, li { white-space: pre-wrap; }
     </message>
 </context>
 <context>
-    <name>MainForm.ui</name>
+    <name>MainTab</name>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="18"/>
+        <location filename="../desktop-widgets/maintab.ui" line="439"/>
+        <location filename="../build/ui_maintab.h" line="961"/>
+        <location filename="../build/ui_maintab.h" line="963"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="539"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="571"/>
+        <source>Notes</source>
+        <translation>Ghi chú</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="21"/>
+        <location filename="../build/ui_maintab.h" line="964"/>
+        <source>General notes about the current selection</source>
+        <translation type="unfinished"/>
+    </message>
     <message>
-        <location filename="../packaging/ios/Subsurface-mobile/MainForm.ui.qml" line="17"/>
-        <source>Press Me 1</source>
+        <location filename="../desktop-widgets/maintab.ui" line="92"/>
+        <location filename="../desktop-widgets/maintab.ui" line="646"/>
+        <location filename="../build/ui_maintab.h" line="947"/>
+        <location filename="../build/ui_maintab.h" line="967"/>
+        <source>Date</source>
+        <translation>Ngày tháng</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="102"/>
+        <location filename="../build/ui_maintab.h" line="948"/>
+        <source>Time</source>
+        <translation>Thời gian</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="112"/>
+        <location filename="../desktop-widgets/maintab.ui" line="836"/>
+        <location filename="../build/ui_maintab.h" line="949"/>
+        <location filename="../build/ui_maintab.h" line="987"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="306"/>
+        <source>Air temp.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../packaging/ios/Subsurface-mobile/MainForm.ui.qml" line="22"/>
-        <source>Press Me 2</source>
+        <location filename="../desktop-widgets/maintab.ui" line="122"/>
+        <location filename="../desktop-widgets/maintab.ui" line="855"/>
+        <location filename="../build/ui_maintab.h" line="950"/>
+        <location filename="../build/ui_maintab.h" line="989"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="307"/>
+        <source>Water temp.</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>MainTab</name>
     <message>
         <location filename="../desktop-widgets/maintab.ui" line="184"/>
         <location filename="../build/ui_maintab.h" line="951"/>
@@ -4089,6 +4210,17 @@ p, li { white-space: pre-wrap; }
         <translation>Địa điểm</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="214"/>
+        <source>Edit dive site</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="217"/>
+        <location filename="../build/ui_maintab.h" line="953"/>
+        <source>...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="252"/>
         <location filename="../build/ui_maintab.h" line="954"/>
         <source>Divemaster</source>
@@ -4101,12 +4233,6 @@ p, li { white-space: pre-wrap; }
         <translation>Bạn</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.ui" line="387"/>
-        <location filename="../build/ui_maintab.h" line="959"/>
-        <source>Tags</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/maintab.ui" line="308"/>
         <location filename="../build/ui_maintab.h" line="956"/>
         <source>Rating</source>
@@ -4125,54 +4251,15 @@ p, li { white-space: pre-wrap; }
         <translation>Đồ lặn</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.ui" line="397"/>
-        <location filename="../build/ui_maintab.h" line="960"/>
-        <source>Dive mode</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="112"/>
-        <location filename="../desktop-widgets/maintab.ui" line="836"/>
-        <location filename="../build/ui_maintab.h" line="949"/>
-        <location filename="../build/ui_maintab.h" line="987"/>
-        <location filename="../desktop-widgets/maintab.cpp" line="306"/>
-        <source>Air temp.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="122"/>
-        <location filename="../desktop-widgets/maintab.ui" line="855"/>
-        <location filename="../build/ui_maintab.h" line="950"/>
-        <location filename="../build/ui_maintab.h" line="989"/>
-        <location filename="../desktop-widgets/maintab.cpp" line="307"/>
-        <source>Water temp.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="18"/>
-        <location filename="../desktop-widgets/maintab.ui" line="439"/>
-        <location filename="../build/ui_maintab.h" line="961"/>
-        <location filename="../build/ui_maintab.h" line="963"/>
-        <location filename="../desktop-widgets/maintab.cpp" line="539"/>
-        <location filename="../desktop-widgets/maintab.cpp" line="571"/>
-        <source>Notes</source>
-        <translation>Ghi chú</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="21"/>
-        <location filename="../build/ui_maintab.h" line="964"/>
-        <source>General notes about the current selection</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="214"/>
-        <source>Edit dive site</source>
+        <location filename="../desktop-widgets/maintab.ui" line="387"/>
+        <location filename="../build/ui_maintab.h" line="959"/>
+        <source>Tags</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.ui" line="217"/>
-        <location filename="../build/ui_maintab.h" line="953"/>
-        <source>...</source>
+        <location filename="../desktop-widgets/maintab.ui" line="397"/>
+        <location filename="../build/ui_maintab.h" line="960"/>
+        <source>Dive mode</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -4200,6 +4287,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="665"/>
+        <location filename="../build/ui_maintab.h" line="969"/>
+        <source>Interval</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="684"/>
         <location filename="../build/ui_maintab.h" line="971"/>
         <source>Gases used</source>
@@ -4212,18 +4305,38 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="722"/>
+        <location filename="../desktop-widgets/maintab.ui" line="1094"/>
+        <location filename="../build/ui_maintab.h" line="975"/>
+        <location filename="../build/ui_maintab.h" line="1003"/>
+        <source>SAC</source>
+        <translation>SAC</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="741"/>
         <location filename="../build/ui_maintab.h" line="977"/>
         <source>CNS</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="760"/>
+        <location filename="../build/ui_maintab.h" line="979"/>
+        <source>OTU</source>
+        <translation>OTU</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="779"/>
         <location filename="../build/ui_maintab.h" line="981"/>
         <source>Max. depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="798"/>
+        <location filename="../build/ui_maintab.h" line="983"/>
+        <source>Avg. depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="817"/>
         <location filename="../build/ui_maintab.h" line="985"/>
         <source>Air pressure</source>
@@ -4236,82 +4349,6 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.ui" line="933"/>
-        <location filename="../build/ui_maintab.h" line="1007"/>
-        <source>Simple statistics about the selection</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1039"/>
-        <location filename="../build/ui_maintab.h" line="999"/>
-        <source>Total time</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1106"/>
-        <location filename="../build/ui_maintab.h" line="1004"/>
-        <source>Gas consumption</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1151"/>
-        <location filename="../build/ui_maintab.h" line="1009"/>
-        <source>All photos from the current selection</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1177"/>
-        <location filename="../build/ui_maintab.h" line="1010"/>
-        <source>Extra data</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1180"/>
-        <location filename="../build/ui_maintab.h" line="1011"/>
-        <source>Adittional data from the dive computer</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="92"/>
-        <location filename="../desktop-widgets/maintab.ui" line="646"/>
-        <location filename="../build/ui_maintab.h" line="947"/>
-        <location filename="../build/ui_maintab.h" line="967"/>
-        <source>Date</source>
-        <translation>Ngày tháng</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="102"/>
-        <location filename="../build/ui_maintab.h" line="948"/>
-        <source>Time</source>
-        <translation>Thời gian</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="665"/>
-        <location filename="../build/ui_maintab.h" line="969"/>
-        <source>Interval</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="722"/>
-        <location filename="../desktop-widgets/maintab.ui" line="1094"/>
-        <location filename="../build/ui_maintab.h" line="975"/>
-        <location filename="../build/ui_maintab.h" line="1003"/>
-        <source>SAC</source>
-        <translation>SAC</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="798"/>
-        <location filename="../build/ui_maintab.h" line="983"/>
-        <source>Avg. depth</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="760"/>
-        <location filename="../build/ui_maintab.h" line="979"/>
-        <source>OTU</source>
-        <translation>OTU</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/maintab.ui" line="893"/>
         <location filename="../build/ui_maintab.h" line="993"/>
         <source>Salinity</source>
@@ -4324,22 +4361,34 @@ p, li { white-space: pre-wrap; }
         <translation>Trạng thái</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="933"/>
+        <location filename="../build/ui_maintab.h" line="1007"/>
+        <source>Simple statistics about the selection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="986"/>
         <location filename="../build/ui_maintab.h" line="996"/>
         <source>Depth</source>
         <translation>Độ sâu</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="998"/>
+        <location filename="../build/ui_maintab.h" line="997"/>
+        <source>Duration</source>
+        <translation>Độ dài</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="1027"/>
         <location filename="../build/ui_maintab.h" line="998"/>
         <source>Temperature</source>
         <translation>Nhiệt độ</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.ui" line="998"/>
-        <location filename="../build/ui_maintab.h" line="997"/>
-        <source>Duration</source>
-        <translation>Độ dài</translation>
+        <location filename="../desktop-widgets/maintab.ui" line="1039"/>
+        <location filename="../build/ui_maintab.h" line="999"/>
+        <source>Total time</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/maintab.ui" line="1058"/>
@@ -4348,19 +4397,33 @@ p, li { white-space: pre-wrap; }
         <translation>Lần lặn</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="1106"/>
+        <location filename="../build/ui_maintab.h" line="1004"/>
+        <source>Gas consumption</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="1148"/>
         <location filename="../build/ui_maintab.h" line="1008"/>
         <source>Photos</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.cpp" line="88"/>
-        <source>Cylinders</source>
-        <translation>Xilanh</translation>
+        <location filename="../desktop-widgets/maintab.ui" line="1151"/>
+        <location filename="../build/ui_maintab.h" line="1009"/>
+        <source>All photos from the current selection</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.cpp" line="92"/>
-        <source>Weights</source>
+        <location filename="../desktop-widgets/maintab.ui" line="1177"/>
+        <location filename="../build/ui_maintab.h" line="1010"/>
+        <source>Extra data</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="1180"/>
+        <location filename="../build/ui_maintab.h" line="1011"/>
+        <source>Adittional data from the dive computer</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -4374,11 +4437,21 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.cpp" line="88"/>
+        <source>Cylinders</source>
+        <translation>Xilanh</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.cpp" line="89"/>
         <source>Add cylinder</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.cpp" line="92"/>
+        <source>Weights</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.cpp" line="93"/>
         <source>Add weight system</source>
         <translation type="unfinished"/>
@@ -4569,659 +4642,685 @@ mixed from Air and using:
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="455"/>
-        <location filename="../build/ui_mainwindow.h" line="534"/>
-        <source>Export dive logs</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="510"/>
-        <location filename="../build/ui_mainwindow.h" line="542"/>
-        <source>Toggle pHe graph</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="546"/>
-        <location filename="../build/ui_mainwindow.h" line="545"/>
-        <source>Toggle calculating all tissues</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="522"/>
-        <location filename="../build/ui_mainwindow.h" line="543"/>
-        <source>Toggle DC reported ceiling</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="534"/>
-        <location filename="../build/ui_mainwindow.h" line="544"/>
-        <source>Toggle calculated ceiling</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="606"/>
-        <location filename="../build/ui_mainwindow.h" line="550"/>
-        <source>Toggle NDL, TTS</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="558"/>
-        <location filename="../build/ui_mainwindow.h" line="546"/>
-        <source>Toggle calculated ceiling with 3m increments</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="463"/>
-        <location filename="../build/ui_mainwindow.h" line="537"/>
-        <source>Configure &amp;dive computer</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="570"/>
-        <location filename="../build/ui_mainwindow.h" line="547"/>
-        <source>Toggle heart rate</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="582"/>
-        <location filename="../build/ui_mainwindow.h" line="548"/>
-        <source>Toggle MOD</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="594"/>
-        <location filename="../build/ui_mainwindow.h" line="549"/>
-        <source>Toggle EAD, END, EADD</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="618"/>
-        <location filename="../build/ui_mainwindow.h" line="551"/>
-        <source>Toggle SAC rate</source>
-        <translation>SAC</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="630"/>
-        <location filename="../build/ui_mainwindow.h" line="552"/>
-        <source>Toggle ruler</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="86"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="87"/>
         <location filename="../build/ui_mainwindow.h" line="569"/>
         <source>&amp;Log</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="105"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="104"/>
         <location filename="../build/ui_mainwindow.h" line="570"/>
         <source>&amp;View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="121"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="120"/>
         <location filename="../build/ui_mainwindow.h" line="571"/>
         <source>&amp;Help</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="130"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="129"/>
         <location filename="../build/ui_mainwindow.h" line="572"/>
         <source>&amp;Import</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="139"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="138"/>
         <location filename="../build/ui_mainwindow.h" line="573"/>
         <source>&amp;Edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="144"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="143"/>
         <source>Share on</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="158"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="157"/>
         <location filename="../build/ui_mainwindow.h" line="453"/>
         <source>&amp;New logbook</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="161"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="160"/>
         <location filename="../build/ui_mainwindow.h" line="455"/>
         <source>New</source>
         <translation>Mới</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="164"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="163"/>
         <location filename="../build/ui_mainwindow.h" line="457"/>
         <source>Ctrl+N</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="169"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="168"/>
         <location filename="../build/ui_mainwindow.h" line="458"/>
         <source>&amp;Open logbook</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="172"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="171"/>
         <location filename="../build/ui_mainwindow.h" line="460"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="508"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="502"/>
         <source>Open</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="175"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="174"/>
         <location filename="../build/ui_mainwindow.h" line="462"/>
         <source>Ctrl+O</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="180"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="179"/>
         <location filename="../build/ui_mainwindow.h" line="463"/>
         <source>&amp;Save</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="183"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="182"/>
         <location filename="../build/ui_mainwindow.h" line="465"/>
         <source>Save</source>
         <translation>Lưu lại</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="186"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="185"/>
         <location filename="../build/ui_mainwindow.h" line="467"/>
         <source>Ctrl+S</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="191"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="190"/>
         <location filename="../build/ui_mainwindow.h" line="468"/>
         <source>Sa&amp;ve as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="194"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="193"/>
         <location filename="../build/ui_mainwindow.h" line="470"/>
         <source>Save as</source>
         <translation>Lưu dưới dạng</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="197"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="196"/>
         <location filename="../build/ui_mainwindow.h" line="472"/>
         <source>Ctrl+Shift+S</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="202"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="201"/>
         <location filename="../build/ui_mainwindow.h" line="473"/>
         <source>&amp;Close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="205"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="204"/>
         <location filename="../build/ui_mainwindow.h" line="475"/>
         <source>Close</source>
         <translation>Đóng lại</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="208"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="207"/>
         <location filename="../build/ui_mainwindow.h" line="477"/>
         <source>Ctrl+W</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="221"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="212"/>
+        <location filename="../build/ui_mainwindow.h" line="478"/>
+        <source>&amp;Print</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="215"/>
+        <location filename="../build/ui_mainwindow.h" line="479"/>
+        <source>Ctrl+P</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="220"/>
         <location filename="../build/ui_mainwindow.h" line="480"/>
         <source>P&amp;references</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="251"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="223"/>
+        <location filename="../build/ui_mainwindow.h" line="481"/>
+        <source>Ctrl+,</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="231"/>
+        <location filename="../build/ui_mainwindow.h" line="482"/>
+        <source>&amp;Quit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="234"/>
+        <location filename="../build/ui_mainwindow.h" line="483"/>
+        <source>Ctrl+Q</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="242"/>
+        <location filename="../build/ui_mainwindow.h" line="484"/>
+        <source>Import from &amp;dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="245"/>
+        <location filename="../build/ui_mainwindow.h" line="485"/>
+        <source>Ctrl+D</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="250"/>
         <location filename="../build/ui_mainwindow.h" line="486"/>
         <source>Import &amp;GPS data from Subsurface web service</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="259"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="253"/>
+        <location filename="../build/ui_mainwindow.h" line="487"/>
+        <source>Ctrl+G</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="258"/>
         <location filename="../build/ui_mainwindow.h" line="488"/>
         <source>Edit device &amp;names</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="272"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="263"/>
+        <location filename="../build/ui_mainwindow.h" line="489"/>
+        <source>&amp;Add dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="266"/>
+        <location filename="../build/ui_mainwindow.h" line="490"/>
+        <source>Ctrl++</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="271"/>
         <location filename="../build/ui_mainwindow.h" line="491"/>
         <source>&amp;Edit dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="277"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="276"/>
         <location filename="../build/ui_mainwindow.h" line="492"/>
         <source>&amp;Copy dive components</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="280"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="279"/>
         <location filename="../build/ui_mainwindow.h" line="493"/>
         <source>Ctrl+C</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="285"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="284"/>
         <location filename="../build/ui_mainwindow.h" line="494"/>
         <source>&amp;Paste dive components</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="288"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="287"/>
         <location filename="../build/ui_mainwindow.h" line="495"/>
         <source>Ctrl+V</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="325"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="292"/>
+        <location filename="../build/ui_mainwindow.h" line="496"/>
+        <source>&amp;Renumber</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="295"/>
+        <location filename="../build/ui_mainwindow.h" line="497"/>
+        <source>Ctrl+R</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="303"/>
+        <location filename="../build/ui_mainwindow.h" line="498"/>
+        <source>Auto &amp;group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="308"/>
+        <location filename="../build/ui_mainwindow.h" line="499"/>
+        <source>&amp;Yearly statistics</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="311"/>
+        <location filename="../build/ui_mainwindow.h" line="500"/>
+        <source>Ctrl+Y</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="316"/>
+        <location filename="../build/ui_mainwindow.h" line="501"/>
+        <source>&amp;Dive list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="319"/>
+        <location filename="../build/ui_mainwindow.h" line="502"/>
+        <source>Ctrl+2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="324"/>
         <location filename="../build/ui_mainwindow.h" line="503"/>
         <source>&amp;Profile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="333"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="327"/>
+        <location filename="../build/ui_mainwindow.h" line="504"/>
+        <source>Ctrl+3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="332"/>
         <location filename="../build/ui_mainwindow.h" line="505"/>
         <source>&amp;Info</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="341"/>
-        <location filename="../build/ui_mainwindow.h" line="507"/>
-        <source>&amp;All</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="335"/>
+        <location filename="../build/ui_mainwindow.h" line="506"/>
+        <source>Ctrl+4</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="357"/>
-        <location filename="../build/ui_mainwindow.h" line="511"/>
-        <source>&amp;Next DC</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="340"/>
+        <location filename="../build/ui_mainwindow.h" line="507"/>
+        <source>&amp;All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="365"/>
-        <location filename="../build/ui_mainwindow.h" line="513"/>
-        <source>&amp;About Subsurface</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="343"/>
+        <location filename="../build/ui_mainwindow.h" line="508"/>
+        <source>Ctrl+1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="381"/>
-        <location filename="../build/ui_mainwindow.h" line="516"/>
-        <source>&amp;Globe</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="348"/>
+        <location filename="../build/ui_mainwindow.h" line="509"/>
+        <source>P&amp;revious DC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="403"/>
-        <location filename="../build/ui_mainwindow.h" line="524"/>
-        <source>Ctrl+I</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="351"/>
+        <location filename="../build/ui_mainwindow.h" line="510"/>
+        <source>Left</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="408"/>
-        <location filename="../build/ui_mainwindow.h" line="525"/>
-        <source>Import &amp;from divelogs.de</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="356"/>
+        <location filename="../build/ui_mainwindow.h" line="511"/>
+        <source>&amp;Next DC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="416"/>
-        <location filename="../build/ui_mainwindow.h" line="526"/>
-        <source>&amp;Full screen</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="359"/>
+        <location filename="../build/ui_mainwindow.h" line="512"/>
+        <source>Right</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="419"/>
-        <location filename="../build/ui_mainwindow.h" line="528"/>
-        <source>Toggle full screen</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="364"/>
+        <location filename="../build/ui_mainwindow.h" line="513"/>
+        <source>&amp;About Subsurface</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="447"/>
-        <location filename="../build/ui_mainwindow.h" line="531"/>
-        <source>&amp;Check for updates</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="372"/>
+        <location filename="../build/ui_mainwindow.h" line="514"/>
+        <source>User &amp;manual</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="452"/>
-        <location filename="../build/ui_mainwindow.h" line="532"/>
-        <source>&amp;Export</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="375"/>
+        <location filename="../build/ui_mainwindow.h" line="515"/>
+        <source>F1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="458"/>
-        <location filename="../build/ui_mainwindow.h" line="536"/>
-        <source>Ctrl+E</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="380"/>
+        <location filename="../build/ui_mainwindow.h" line="516"/>
+        <source>&amp;Globe</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="466"/>
-        <location filename="../build/ui_mainwindow.h" line="538"/>
-        <source>Ctrl+Shift+C</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="383"/>
+        <location filename="../build/ui_mainwindow.h" line="517"/>
+        <source>Ctrl+5</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="474"/>
-        <location filename="../build/ui_mainwindow.h" line="539"/>
-        <source>Edit &amp;dive in planner</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="388"/>
+        <location filename="../build/ui_mainwindow.h" line="518"/>
+        <source>P&amp;lan dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="486"/>
-        <location filename="../build/ui_mainwindow.h" line="540"/>
-        <source>Toggle pO₂ graph</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="391"/>
+        <location filename="../build/ui_mainwindow.h" line="519"/>
+        <source>Ctrl+L</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="498"/>
-        <location filename="../build/ui_mainwindow.h" line="541"/>
-        <source>Toggle pN₂ graph</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="396"/>
+        <location filename="../build/ui_mainwindow.h" line="520"/>
+        <source>&amp;Import log files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="642"/>
-        <location filename="../build/ui_mainwindow.h" line="553"/>
-        <source>Scale graph</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="399"/>
+        <location filename="../build/ui_mainwindow.h" line="522"/>
+        <source>Import divelog files from other applications</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="654"/>
-        <location filename="../build/ui_mainwindow.h" line="554"/>
-        <source>Toggle pictures</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="402"/>
+        <location filename="../build/ui_mainwindow.h" line="524"/>
+        <source>Ctrl+I</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="666"/>
-        <location filename="../build/ui_mainwindow.h" line="555"/>
-        <source>Toggle tank bar</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="407"/>
+        <location filename="../build/ui_mainwindow.h" line="525"/>
+        <source>Import &amp;from divelogs.de</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="674"/>
-        <location filename="../build/ui_mainwindow.h" line="556"/>
-        <source>&amp;Filter divelist</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="415"/>
+        <location filename="../build/ui_mainwindow.h" line="526"/>
+        <source>&amp;Full screen</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="689"/>
-        <location filename="../build/ui_mainwindow.h" line="558"/>
-        <source>Toggle tissue graph</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="418"/>
+        <location filename="../build/ui_mainwindow.h" line="528"/>
+        <source>Toggle full screen</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="694"/>
-        <location filename="../build/ui_mainwindow.h" line="559"/>
-        <source>User &amp;survey</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="421"/>
+        <location filename="../build/ui_mainwindow.h" line="530"/>
+        <source>F11</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="699"/>
-        <location filename="../build/ui_mainwindow.h" line="560"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="238"/>
-        <source>&amp;Undo</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="446"/>
+        <location filename="../build/ui_mainwindow.h" line="531"/>
+        <source>&amp;Check for updates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="702"/>
-        <location filename="../build/ui_mainwindow.h" line="561"/>
-        <source>Ctrl+Z</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="451"/>
+        <location filename="../build/ui_mainwindow.h" line="532"/>
+        <source>&amp;Export</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="707"/>
-        <location filename="../build/ui_mainwindow.h" line="562"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="239"/>
-        <source>&amp;Redo</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="454"/>
+        <location filename="../build/ui_mainwindow.h" line="534"/>
+        <source>Export dive logs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="710"/>
-        <location filename="../build/ui_mainwindow.h" line="563"/>
-        <source>Ctrl+Shift+Z</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="457"/>
+        <location filename="../build/ui_mainwindow.h" line="536"/>
+        <source>Ctrl+E</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="715"/>
-        <location filename="../build/ui_mainwindow.h" line="564"/>
-        <source>&amp;Find moved images</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="462"/>
+        <location filename="../build/ui_mainwindow.h" line="537"/>
+        <source>Configure &amp;dive computer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="720"/>
-        <source>Open c&amp;loud storage</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="465"/>
+        <location filename="../build/ui_mainwindow.h" line="538"/>
+        <source>Ctrl+Shift+C</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="725"/>
-        <source>Save to clo&amp;ud storage</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="473"/>
+        <location filename="../build/ui_mainwindow.h" line="539"/>
+        <source>Edit &amp;dive in planner</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="730"/>
-        <location filename="../build/ui_mainwindow.h" line="567"/>
-        <source>&amp;Manage dive sites</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="485"/>
+        <location filename="../build/ui_mainwindow.h" line="540"/>
+        <source>Toggle pO₂ graph</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="735"/>
-        <source>Dive Site &amp;Edit</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="497"/>
+        <location filename="../build/ui_mainwindow.h" line="541"/>
+        <source>Toggle pN₂ graph</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="740"/>
-        <source>Facebook</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="509"/>
+        <location filename="../build/ui_mainwindow.h" line="542"/>
+        <source>Toggle pHe graph</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="745"/>
-        <source>Add GPS location here</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="521"/>
+        <location filename="../build/ui_mainwindow.h" line="543"/>
+        <source>Toggle DC reported ceiling</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="677"/>
-        <location filename="../build/ui_mainwindow.h" line="557"/>
-        <source>Ctrl+F</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="533"/>
+        <location filename="../build/ui_mainwindow.h" line="544"/>
+        <source>Toggle calculated ceiling</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="213"/>
-        <location filename="../build/ui_mainwindow.h" line="478"/>
-        <source>&amp;Print</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="545"/>
+        <location filename="../build/ui_mainwindow.h" line="545"/>
+        <source>Toggle calculating all tissues</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="224"/>
-        <location filename="../build/ui_mainwindow.h" line="481"/>
-        <source>Ctrl+,</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="557"/>
+        <location filename="../build/ui_mainwindow.h" line="546"/>
+        <source>Toggle calculated ceiling with 3m increments</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="232"/>
-        <location filename="../build/ui_mainwindow.h" line="482"/>
-        <source>&amp;Quit</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="569"/>
+        <location filename="../build/ui_mainwindow.h" line="547"/>
+        <source>Toggle heart rate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="243"/>
-        <location filename="../build/ui_mainwindow.h" line="484"/>
-        <source>Import from &amp;dive computer</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="581"/>
+        <location filename="../build/ui_mainwindow.h" line="548"/>
+        <source>Toggle MOD</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="254"/>
-        <location filename="../build/ui_mainwindow.h" line="487"/>
-        <source>Ctrl+G</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="593"/>
+        <location filename="../build/ui_mainwindow.h" line="549"/>
+        <source>Toggle EAD, END, EADD</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="267"/>
-        <location filename="../build/ui_mainwindow.h" line="490"/>
-        <source>Ctrl++</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="605"/>
+        <location filename="../build/ui_mainwindow.h" line="550"/>
+        <source>Toggle NDL, TTS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="293"/>
-        <location filename="../build/ui_mainwindow.h" line="496"/>
-        <source>&amp;Renumber</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="617"/>
+        <location filename="../build/ui_mainwindow.h" line="551"/>
+        <source>Toggle SAC rate</source>
+        <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="296"/>
-        <location filename="../build/ui_mainwindow.h" line="497"/>
-        <source>Ctrl+R</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="629"/>
+        <location filename="../build/ui_mainwindow.h" line="552"/>
+        <source>Toggle ruler</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="312"/>
-        <location filename="../build/ui_mainwindow.h" line="500"/>
-        <source>Ctrl+Y</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="641"/>
+        <location filename="../build/ui_mainwindow.h" line="553"/>
+        <source>Scale graph</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="392"/>
-        <location filename="../build/ui_mainwindow.h" line="519"/>
-        <source>Ctrl+L</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="653"/>
+        <location filename="../build/ui_mainwindow.h" line="554"/>
+        <source>Toggle pictures</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="216"/>
-        <location filename="../build/ui_mainwindow.h" line="479"/>
-        <source>Ctrl+P</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="665"/>
+        <location filename="../build/ui_mainwindow.h" line="555"/>
+        <source>Toggle tank bar</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="235"/>
-        <location filename="../build/ui_mainwindow.h" line="483"/>
-        <source>Ctrl+Q</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="673"/>
+        <location filename="../build/ui_mainwindow.h" line="556"/>
+        <source>&amp;Filter divelist</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="246"/>
-        <location filename="../build/ui_mainwindow.h" line="485"/>
-        <source>Ctrl+D</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="676"/>
+        <location filename="../build/ui_mainwindow.h" line="557"/>
+        <source>Ctrl+F</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="264"/>
-        <location filename="../build/ui_mainwindow.h" line="489"/>
-        <source>&amp;Add dive</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="688"/>
+        <source>Toggle tissue heat-map</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="304"/>
-        <location filename="../build/ui_mainwindow.h" line="498"/>
-        <source>Auto &amp;group</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="693"/>
+        <location filename="../build/ui_mainwindow.h" line="559"/>
+        <source>User &amp;survey</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="309"/>
-        <location filename="../build/ui_mainwindow.h" line="499"/>
-        <source>&amp;Yearly statistics</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="698"/>
+        <location filename="../build/ui_mainwindow.h" line="560"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="231"/>
+        <source>&amp;Undo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="317"/>
-        <location filename="../build/ui_mainwindow.h" line="501"/>
-        <source>&amp;Dive list</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="701"/>
+        <location filename="../build/ui_mainwindow.h" line="561"/>
+        <source>Ctrl+Z</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="320"/>
-        <location filename="../build/ui_mainwindow.h" line="502"/>
-        <source>Ctrl+2</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="706"/>
+        <location filename="../build/ui_mainwindow.h" line="562"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="232"/>
+        <source>&amp;Redo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="328"/>
-        <location filename="../build/ui_mainwindow.h" line="504"/>
-        <source>Ctrl+3</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="709"/>
+        <location filename="../build/ui_mainwindow.h" line="563"/>
+        <source>Ctrl+Shift+Z</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="336"/>
-        <location filename="../build/ui_mainwindow.h" line="506"/>
-        <source>Ctrl+4</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="714"/>
+        <location filename="../build/ui_mainwindow.h" line="564"/>
+        <source>&amp;Find moved images</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="344"/>
-        <location filename="../build/ui_mainwindow.h" line="508"/>
-        <source>Ctrl+1</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="719"/>
+        <source>Open c&amp;loud storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="349"/>
-        <location filename="../build/ui_mainwindow.h" line="509"/>
-        <source>P&amp;revious DC</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="724"/>
+        <source>Save to clo&amp;ud storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="352"/>
-        <location filename="../build/ui_mainwindow.h" line="510"/>
-        <source>Left</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="729"/>
+        <location filename="../build/ui_mainwindow.h" line="567"/>
+        <source>&amp;Manage dive sites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="360"/>
-        <location filename="../build/ui_mainwindow.h" line="512"/>
-        <source>Right</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="734"/>
+        <source>Dive Site &amp;Edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="373"/>
-        <location filename="../build/ui_mainwindow.h" line="514"/>
-        <source>User &amp;manual</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="739"/>
+        <source>Facebook</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="376"/>
-        <location filename="../build/ui_mainwindow.h" line="515"/>
-        <source>F1</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="744"/>
+        <source>Take cloud storage online</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="384"/>
-        <location filename="../build/ui_mainwindow.h" line="517"/>
-        <source>Ctrl+5</source>
+        <location filename="../build/ui_mainwindow.h" line="558"/>
+        <source>Toggle tissue graph</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="389"/>
-        <location filename="../build/ui_mainwindow.h" line="518"/>
-        <source>P&amp;lan dive</source>
+        <location filename="../build/ui_mainwindow.h" line="565"/>
+        <source>Open cloud storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="397"/>
-        <location filename="../build/ui_mainwindow.h" line="520"/>
-        <source>&amp;Import log files</source>
+        <location filename="../build/ui_mainwindow.h" line="566"/>
+        <source>Save to cloud storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="400"/>
-        <location filename="../build/ui_mainwindow.h" line="522"/>
-        <source>Import divelog files from other applications</source>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="331"/>
+        <source>Connect to</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="422"/>
-        <location filename="../build/ui_mainwindow.h" line="530"/>
-        <source>F11</source>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="493"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="538"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1545"/>
+        <source>Please save or cancel the current dive edit before opening a new file.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="505"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="499"/>
         <source>Open file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="509"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="503"/>
         <location filename="../desktop-widgets/mainwindow.cpp" line="614"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1972"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1978"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
@@ -5241,6 +5340,16 @@ mixed from Air and using:
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="649"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="796"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="977"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="983"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1849"/>
+        <source>Warning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="674"/>
         <source>Please save or cancel the current dive edit before closing the file.</source>
         <translation type="unfinished"/>
@@ -5256,124 +5365,97 @@ mixed from Air and using:
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="982"/>
-        <source>Trying to edit a dive that&apos;s not a manually added dive.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1243"/>
-        <source>Do you want to save the changes that you made in the file %1?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1246"/>
-        <source>Do you want to save the changes that you made in the data file?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1251"/>
-        <source>Save changes?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1587"/>
-        <source>Save file as</source>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
+        <source>Trying to replan a dive that&apos;s not a planned dive.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1682"/>
-        <source>[cloud storage for] %1</source>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="977"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1849"/>
+        <source>Please, first finish the current edition before trying to do another.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1782"/>
-        <source>Opening datafile from older version</source>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="983"/>
+        <source>Trying to edit a dive that&apos;s not a manually added dive.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1783"/>
-        <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly.
-Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1030"/>
+        <source>Yearly statistics</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1794"/>
-        <source>Open dive log file</source>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1244"/>
+        <source>Do you want to save the changes that you made in the file %1?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1795"/>
-        <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;All files (*)</source>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1247"/>
+        <source>Do you want to save the changes that you made in the data file?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1972"/>
-        <source>Contacting cloud service...</source>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1252"/>
+        <source>Save changes?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1252"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1253"/>
         <source>Changes will be lost if you don&apos;t save them.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="649"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="796"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="976"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="982"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/>
-        <source>Warning</source>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1572"/>
+        <source>Save file as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="499"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="544"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1560"/>
-        <source>Please save or cancel the current dive edit before opening a new file.</source>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1573"/>
+        <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="338"/>
-        <source>Connect to</source>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1670"/>
+        <source>[local cache for] %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
-        <source>Trying to replan a dive that&apos;s not a planned dive.</source>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1672"/>
+        <source>[cloud storage for] %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1029"/>
-        <source>Yearly statistics</source>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1788"/>
+        <source>Opening datafile from older version</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1588"/>
-        <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1789"/>
+        <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly.
+Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="976"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/>
-        <source>Please, first finish the current edition before trying to do another.</source>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1800"/>
+        <source>Open dive log file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_mainwindow.h" line="565"/>
-        <source>Open cloud storage</source>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1801"/>
+        <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_mainwindow.h" line="566"/>
-        <source>Save to cloud storage</source>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1978"/>
+        <source>Contacting cloud service...</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>MultiFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="733"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="731"/>
         <source>Filter shows %1 (of %2) dives</source>
         <translation type="unfinished"/>
     </message>
@@ -5381,39 +5463,39 @@ Subsurface has already tried to pre-populate the data but it might be worth whil
 <context>
     <name>OstcFirmwareCheck</name>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="269"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="271"/>
         <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="273"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="275"/>
         <source>
 
 Please start Bluetooth on your OSTC Sport and do the same preparations as for a logbook download before continuing with the update</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="274"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="276"/>
         <source>Not now</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="275"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="277"/>
         <source>Update firmware</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="277"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="279"/>
         <source>Firmware upgrade notice</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="295"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="297"/>
         <source>Save the downloaded firmware as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="296"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="298"/>
         <source>HEX files (*.hex)</source>
         <translation type="unfinished"/>
     </message>
@@ -5421,79 +5503,89 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PlannerSettingsWidget</name>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="322"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="302"/>
         <source>Open circuit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="322"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="302"/>
         <source>CCR</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="322"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="302"/>
         <source>pSCR</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="421"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="388"/>
         <source>ft/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="422"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="389"/>
         <source>Last stop at 20ft</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="423"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="390"/>
         <source>50% avg. depth to 20ft</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="424"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="391"/>
         <source>20ft to surface</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="426"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="392"/>
+        <source>ft</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="394"/>
         <source>m/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="427"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="395"/>
         <source>Last stop at 6m</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="428"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="396"/>
         <source>50% avg. depth to 6m</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="429"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="397"/>
         <source>6m to surface</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="432"/>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="433"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="398"/>
+        <source>m</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="401"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="402"/>
         <source>cuft/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="441"/>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="442"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="410"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="411"/>
         <source>ℓ/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="451"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="420"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="456"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="425"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
@@ -5643,6 +5735,11 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PreferencesDialog</name>
     <message>
+        <location filename="../build/ui_preferences.h" line="1283"/>
+        <source>Preferences</source>
+        <translation>Tùy biến</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1288"/>
         <source>Defaults</source>
         <translation type="unfinished"/>
@@ -5678,6 +5775,11 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1303"/>
+        <source>Lists and tables</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1304"/>
         <source>Font</source>
         <translation>Kiểu chữ</translation>
@@ -5693,6 +5795,11 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>Lần lặn</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1307"/>
+        <source>Default dive log file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1308"/>
         <source>No default file</source>
         <translation type="unfinished"/>
@@ -5723,6 +5830,21 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1314"/>
+        <source>Display invalid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1316"/>
+        <source>Default cylinder</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1317"/>
+        <source>Use default cylinder</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1318"/>
         <source>Animations</source>
         <translation type="unfinished"/>
@@ -5753,39 +5875,23 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1401"/>
-        <source>Dive site geo lookup</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1402"/>
-        <source>Enable geocoding for dive site management</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1403"/>
-        <source>Parse site without GPS data</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1404"/>
-        <source>Same format for existing dives</source>
+        <location filename="../build/ui_preferences.h" line="1324"/>
+        <source>&amp;Metric</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1405"/>
-        <source>Dive Site Layout</source>
+        <location filename="../build/ui_preferences.h" line="1325"/>
+        <source>Imperial</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1406"/>
-        <location filename="../build/ui_preferences.h" line="1407"/>
-        <source>/</source>
+        <location filename="../build/ui_preferences.h" line="1326"/>
+        <source>Personali&amp;ze</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1325"/>
-        <source>Imperial</source>
+        <location filename="../build/ui_preferences.h" line="1327"/>
+        <source>Individual settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -5804,6 +5910,11 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1331"/>
+        <source>Pressure</source>
+        <translation>Áp suất</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1332"/>
         <location filename="../build/ui_preferences.h" line="1366"/>
         <source>bar</source>
@@ -5815,11 +5926,26 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>psi</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1334"/>
+        <source>Volume</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1335"/>
+        <source>&amp;liter</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1336"/>
         <source>cu ft</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1337"/>
+        <source>Temperature</source>
+        <translation>Nhiệt độ</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1338"/>
         <source>celsius</source>
         <translation type="unfinished"/>
@@ -5830,314 +5956,280 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1340"/>
+        <source>Weight</source>
+        <translation>Cân nặng</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1341"/>
         <source>kg</source>
         <translation>ký</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1363"/>
-        <source>CCR: show setpoints when viewing pO₂</source>
-        <translation type="unfinished"/>
+        <location filename="../build/ui_preferences.h" line="1342"/>
+        <source>lbs</source>
+        <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1364"/>
-        <source>CCR: show individual O₂ sensor values when viewing pO₂</source>
+        <location filename="../build/ui_preferences.h" line="1343"/>
+        <source>Time units</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1365"/>
-        <source>Default CCR set-point for dive planning</source>
+        <location filename="../build/ui_preferences.h" line="1344"/>
+        <source>Ascent/descent speed denominator</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1367"/>
-        <source>pSCR O₂ metabolism rate</source>
+        <location filename="../build/ui_preferences.h" line="1345"/>
+        <source>Minutes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1368"/>
-        <source>pSCR ratio</source>
+        <location filename="../build/ui_preferences.h" line="1346"/>
+        <source>Seconds</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1369"/>
-        <source>ℓ/min</source>
+        <location filename="../build/ui_preferences.h" line="1347"/>
+        <source>GPS coordinates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1371"/>
-        <source>1:</source>
+        <location filename="../build/ui_preferences.h" line="1348"/>
+        <source>Location Display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1372"/>
-        <source>UI language</source>
+        <location filename="../build/ui_preferences.h" line="1349"/>
+        <source>traditional (dms)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1373"/>
-        <source>System default</source>
+        <location filename="../build/ui_preferences.h" line="1350"/>
+        <source>decimal</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1375"/>
-        <source>Proxy</source>
+        <location filename="../build/ui_preferences.h" line="1351"/>
+        <source>Show</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1379"/>
-        <source>Proxy type</source>
+        <location filename="../build/ui_preferences.h" line="1352"/>
+        <source>Threshold when showing pO₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1377"/>
-        <source>Host</source>
+        <location filename="../build/ui_preferences.h" line="1353"/>
+        <source>Threshold when showing pN₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1376"/>
-        <source>Port</source>
+        <location filename="../build/ui_preferences.h" line="1354"/>
+        <source>Threshold when showing pHe</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1378"/>
-        <source>Requires authentication</source>
+        <location filename="../build/ui_preferences.h" line="1355"/>
+        <source>Max pO₂ when showing MOD</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1380"/>
-        <source>Username</source>
+        <location filename="../build/ui_preferences.h" line="1356"/>
+        <source>Draw dive computer reported ceiling red</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1381"/>
-        <location filename="../build/ui_preferences.h" line="1387"/>
-        <source>Password</source>
-        <translation>Mật khẩu</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1400"/>
-        <source>Disconnect from Facebook</source>
+        <location filename="../build/ui_preferences.h" line="1357"/>
+        <source>Show unused cylinders in Equipment tab</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1374"/>
-        <source>Filter</source>
-        <translation>Bộ lọc</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1331"/>
-        <source>Pressure</source>
-        <translation>Áp suất</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1303"/>
-        <source>Lists and tables</source>
+        <location filename="../build/ui_preferences.h" line="1358"/>
+        <source>Show average depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1307"/>
-        <source>Default dive log file</source>
+        <location filename="../build/ui_preferences.h" line="1359"/>
+        <source>Misc</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1314"/>
-        <source>Display invalid</source>
+        <location filename="../build/ui_preferences.h" line="1360"/>
+        <source>GFLow</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1316"/>
-        <source>Default cylinder</source>
+        <location filename="../build/ui_preferences.h" line="1361"/>
+        <source>GFHigh</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1317"/>
-        <source>Use default cylinder</source>
+        <location filename="../build/ui_preferences.h" line="1362"/>
+        <source>GFLow at max depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1382"/>
-        <source>Subsurface cloud storage</source>
+        <location filename="../build/ui_preferences.h" line="1363"/>
+        <source>CCR: show setpoints when viewing pO₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1386"/>
-        <source>Email address</source>
-        <translation>Địa chỉ email</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1388"/>
-        <source>Verification PIN</source>
+        <location filename="../build/ui_preferences.h" line="1364"/>
+        <source>CCR: show individual O₂ sensor values when viewing pO₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1395"/>
-        <source>Sync to cloud in the background?</source>
+        <location filename="../build/ui_preferences.h" line="1365"/>
+        <source>Default CCR set-point for dive planning</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1396"/>
-        <source>Save Password locally?</source>
+        <location filename="../build/ui_preferences.h" line="1367"/>
+        <source>pSCR O₂ metabolism rate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1397"/>
-        <source>Subsurface web service</source>
+        <location filename="../build/ui_preferences.h" line="1368"/>
+        <source>pSCR ratio</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1398"/>
-        <source>Default user ID</source>
+        <location filename="../build/ui_preferences.h" line="1369"/>
+        <source>ℓ/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1399"/>
-        <source>Save user ID locally?</source>
+        <location filename="../build/ui_preferences.h" line="1371"/>
+        <source>1:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1334"/>
-        <source>Volume</source>
+        <location filename="../build/ui_preferences.h" line="1372"/>
+        <source>UI language</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1337"/>
-        <source>Temperature</source>
-        <translation>Nhiệt độ</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1340"/>
-        <source>Weight</source>
-        <translation>Cân nặng</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1342"/>
-        <source>lbs</source>
-        <translation>lbs</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1343"/>
-        <source>Time units</source>
+        <location filename="../build/ui_preferences.h" line="1373"/>
+        <source>System default</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1345"/>
-        <source>Minutes</source>
-        <translation type="unfinished"/>
+        <location filename="../build/ui_preferences.h" line="1374"/>
+        <source>Filter</source>
+        <translation>Bộ lọc</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1346"/>
-        <source>Seconds</source>
+        <location filename="../build/ui_preferences.h" line="1375"/>
+        <source>Proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1351"/>
-        <source>Show</source>
+        <location filename="../build/ui_preferences.h" line="1376"/>
+        <source>Port</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1362"/>
-        <source>GFLow at max depth</source>
+        <location filename="../build/ui_preferences.h" line="1377"/>
+        <source>Host</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1359"/>
-        <source>Misc</source>
+        <location filename="../build/ui_preferences.h" line="1378"/>
+        <source>Requires authentication</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1283"/>
-        <source>Preferences</source>
-        <translation>Tùy biến</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1324"/>
-        <source>&amp;Metric</source>
+        <location filename="../build/ui_preferences.h" line="1379"/>
+        <source>Proxy type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1326"/>
-        <source>Personali&amp;ze</source>
+        <location filename="../build/ui_preferences.h" line="1380"/>
+        <source>Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1327"/>
-        <source>Individual settings</source>
-        <translation type="unfinished"/>
+        <location filename="../build/ui_preferences.h" line="1381"/>
+        <location filename="../build/ui_preferences.h" line="1387"/>
+        <source>Password</source>
+        <translation>Mật khẩu</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1335"/>
-        <source>&amp;liter</source>
+        <location filename="../build/ui_preferences.h" line="1382"/>
+        <source>Subsurface cloud storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1344"/>
-        <source>Ascent/descent speed denominator</source>
-        <translation type="unfinished"/>
+        <location filename="../build/ui_preferences.h" line="1386"/>
+        <source>Email address</source>
+        <translation>Địa chỉ email</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1347"/>
-        <source>GPS coordinates</source>
+        <location filename="../build/ui_preferences.h" line="1388"/>
+        <source>Verification PIN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1348"/>
-        <source>Location Display</source>
+        <location filename="../build/ui_preferences.h" line="1395"/>
+        <source>Sync to cloud in the background?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1349"/>
-        <source>traditional (dms)</source>
+        <location filename="../build/ui_preferences.h" line="1396"/>
+        <source>Save Password locally?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1350"/>
-        <source>decimal</source>
+        <location filename="../build/ui_preferences.h" line="1397"/>
+        <source>Subsurface web service</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1352"/>
-        <source>Threshold when showing pO₂</source>
+        <location filename="../build/ui_preferences.h" line="1398"/>
+        <source>Default user ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1353"/>
-        <source>Threshold when showing pN₂</source>
+        <location filename="../build/ui_preferences.h" line="1399"/>
+        <source>Save user ID locally?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1354"/>
-        <source>Threshold when showing pHe</source>
+        <location filename="../build/ui_preferences.h" line="1400"/>
+        <source>Disconnect from Facebook</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1355"/>
-        <source>Max pO₂ when showing MOD</source>
+        <location filename="../build/ui_preferences.h" line="1401"/>
+        <source>Dive site geo lookup</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1356"/>
-        <source>Draw dive computer reported ceiling red</source>
+        <location filename="../build/ui_preferences.h" line="1402"/>
+        <source>Enable geocoding for dive site management</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1357"/>
-        <source>Show unused cylinders in Equipment tab</source>
+        <location filename="../build/ui_preferences.h" line="1403"/>
+        <source>Parse site without GPS data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1358"/>
-        <source>Show average depth</source>
+        <location filename="../build/ui_preferences.h" line="1404"/>
+        <source>Same format for existing dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1360"/>
-        <source>GFLow</source>
+        <location filename="../build/ui_preferences.h" line="1405"/>
+        <source>Dive Site Layout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1361"/>
-        <source>GFHigh</source>
+        <location filename="../build/ui_preferences.h" line="1406"/>
+        <location filename="../build/ui_preferences.h" line="1407"/>
+        <source>/</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -6194,106 +6286,136 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="20"/>
-        <source>Show</source>
+        <source>Gas pressure display setup</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="29"/>
-        <source>Threshold when showing pO₂</source>
+        <source>Threshold for pO₂ (bar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="49"/>
-        <source>Threshold when showing pN₂</source>
+        <source>Threshold for pN₂ (bar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="69"/>
-        <source>Threshold when showing pHe</source>
+        <source>Threshold for pHe (bar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="89"/>
-        <source>Max pO₂ when showing MOD</source>
+        <source>pO₂ in calculating MOD (bar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="109"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="106"/>
+        <source>CCR options:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="113"/>
+        <source>Dive planner default setpoint (bar)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="133"/>
+        <source>Show setpoints when viewing pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="140"/>
+        <source>Show individual O₂ sensor values when viewing pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="150"/>
+        <source>Ceiling display setup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="159"/>
         <source>Draw dive computer reported ceiling red</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="116"/>
-        <source>Show unused cylinders in Equipment tab</source>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="169"/>
+        <source>Algorithm for calculated ceiling:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="123"/>
-        <source>Show mean depth</source>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="176"/>
+        <source>VPM-B</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="133"/>
-        <source>Misc</source>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="183"/>
+        <source>VPM-B Conservatism</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="149"/>
-        <source>bar</source>
-        <translation>bar</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="193"/>
+        <source>+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="165"/>
-        <source>Default CCR set-point for dive planning</source>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="206"/>
+        <source>Bühlmann</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="172"/>
-        <source>pSCR O₂ metabolism rate</source>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="216"/>
+        <source>GFHigh</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="179"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="236"/>
         <source>GFLow</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="186"/>
-        <source>GFHigh</source>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="256"/>
+        <source>GFLow at max depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="203"/>
-        <source>ℓ/min</source>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="263"/>
+        <source>pSCR options:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="213"/>
-        <source>pSCR ratio</source>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="270"/>
+        <source>Metabolic rate (ℓ O₂/min)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="223"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="287"/>
+        <source>Dilution ratio</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="300"/>
         <source>1:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="230"/>
-        <source>CCR: show individual O₂ sensor values when viewing pO₂</source>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="310"/>
+        <source>Misc</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="237"/>
-        <source>CCR: show setpoints when viewing pO₂</source>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="316"/>
+        <source>Show unused cylinders in Equipment tab</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="244"/>
-        <source>GFLow at max depth</source>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="323"/>
+        <source>Show mean depth in Profile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="10"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="9"/>
         <source>Graph</source>
         <translation type="unfinished"/>
     </message>
@@ -6362,15 +6484,29 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="57"/>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="53"/>
         <source>Restart required</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="58"/>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="54"/>
         <source>To correctly load a new language you must restart Subsurface.</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="76"/>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="82"/>
+        <source>Literal characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="77"/>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="83"/>
+        <source>Non-special character(s) in time format.
+These will be used as is. This might not be what you intended.
+See http://doc.qt.io/qt-5/qdatetime.html#toString</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PreferencesNetwork</name>
@@ -6417,7 +6553,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_network.ui" line="156"/>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="148"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="134"/>
         <source>Subsurface cloud storage</source>
         <translation type="unfinished"/>
     </message>
@@ -6462,39 +6598,39 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="11"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="10"/>
         <source>Network</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="15"/>
         <source>No proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/>
         <source>System proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/>
         <source>HTTP proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="19"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/>
         <source>SOCKS proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="75"/>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="97"/>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="110"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="72"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="93"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="106"/>
         <source>Cloud storage email and password can only consist of letters, numbers, and &apos;.&apos;, &apos;-&apos;, &apos;_&apos;, and &apos;+&apos;.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="146"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="132"/>
         <source>Subsurface cloud storage (credentials verified)</source>
         <translation type="unfinished"/>
     </message>
@@ -6652,7 +6788,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="8"/>
+        <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="7"/>
         <source>Units</source>
         <translation>Đơn vị</translation>
     </message>
@@ -6660,17 +6796,17 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PrintDialog</name>
     <message>
-        <location filename="../desktop-widgets/printdialog.cpp" line="118"/>
-        <source>&amp;Preview</source>
+        <location filename="../desktop-widgets/printdialog.cpp" line="102"/>
+        <source>P&amp;rint</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/printdialog.cpp" line="115"/>
-        <source>P&amp;rint</source>
+        <location filename="../desktop-widgets/printdialog.cpp" line="105"/>
+        <source>&amp;Preview</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/printdialog.cpp" line="130"/>
+        <location filename="../desktop-widgets/printdialog.cpp" line="117"/>
         <source>Print</source>
         <translation type="unfinished"/>
     </message>
@@ -6678,19 +6814,10 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PrintOptions</name>
     <message>
-        <location filename="../build/ui_printoptions.h" line="150"/>
-        <source>&amp;Table print</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../build/ui_printoptions.h" line="158"/>
-        <source>One dive per page</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../build/ui_printoptions.h" line="159"/>
-        <source>Two dives per page</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/printoptions.ui" line="29"/>
+        <location filename="../build/ui_printoptions.h" line="148"/>
+        <source>Print type</source>
+        <translation>Loại in</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/printoptions.ui" line="41"/>
@@ -6750,10 +6877,19 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/printoptions.ui" line="29"/>
-        <location filename="../build/ui_printoptions.h" line="148"/>
-        <source>Print type</source>
-        <translation>Loại in</translation>
+        <location filename="../build/ui_printoptions.h" line="150"/>
+        <source>&amp;Table print</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../build/ui_printoptions.h" line="158"/>
+        <source>One dive per page</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../build/ui_printoptions.h" line="159"/>
+        <source>Two dives per page</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/printoptions.cpp" line="128"/>
@@ -6795,103 +6931,103 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="755"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="752"/>
         <source>Show NDL / TTS was disabled because of excessive processing time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1344"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1338"/>
         <source>Make first divecomputer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1346"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1340"/>
         <source>Delete this divecomputer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1360"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1354"/>
         <source>Add gas change</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1363"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1357"/>
         <source> (Tank %1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1371"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1365"/>
         <source>Add set-point change</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1373"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1367"/>
         <source>Add bookmark</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1377"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1371"/>
         <source>Edit the profile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1381"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1375"/>
         <source>Remove event</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1386"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1380"/>
         <source>Hide similar events</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1393"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1387"/>
         <source>Edit name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1422"/>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1429"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1416"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1423"/>
         <source>Adjust pressure of tank %1 (currently interpolated as %2)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1444"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1438"/>
         <source>Unhide all events</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1479"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1473"/>
         <source>Hide events</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1479"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1473"/>
         <source>Hide all %1 events?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1514"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1508"/>
         <source>Remove the selected event?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1515"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1509"/>
         <source>%1 @ %2:%3</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1638"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1632"/>
         <source>Edit name of bookmark</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1639"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1633"/>
         <source>Custom name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1644"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1638"/>
         <source>Name is too long!</source>
         <translation type="unfinished"/>
     </message>
@@ -6899,91 +7035,101 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>QMLManager</name>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="95"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="97"/>
         <source>Starting...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="202"/>
         <source>working in no-cloud mode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="213"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="216"/>
         <source>no cloud credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="214"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="270"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="217"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="269"/>
         <source>Please enter valid cloud credentials.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="285"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="284"/>
         <source>Attempting to open cloud storage with new credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="304"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="306"/>
         <source>Testing cloud credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="331"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="320"/>
+        <source>No response from cloud server to validate the credentials</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="329"/>
+        <source>Cannot connect to cloud storage - cloud account not verified</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="361"/>
         <source>Cloud credentials are invalid</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="344"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="374"/>
         <source>Cannot open cloud storage: Error creating https connection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="357"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="387"/>
         <source>Cannot open cloud storage: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="369"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="399"/>
         <source>Cannot connect to cloud storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="411"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="441"/>
         <source>Cloud storage error: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="501"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="531"/>
         <source>Failed to connect to cloud server, reverting to no cloud status</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="520"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="550"/>
         <source>Cloud storage open successfully. No dives in dive list.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="689"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="690"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="721"/>
         <source>h</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="689"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="690"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="691"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="721"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="722"/>
         <source>min</source>
         <translation>nhỏ nhất</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="689"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/>
         <source>sec</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="1041"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="1102"/>
         <source>Unknown GPS location</source>
         <translation type="unfinished"/>
     </message>
@@ -6991,126 +7137,126 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../core/qthelper.cpp" line="866"/>
-        <location filename="../core/qthelper.cpp" line="1214"/>
-        <source>AIR</source>
-        <translation>KHÔNG KHÍ</translation>
+        <location filename="../core/gpslocation.h" line="13"/>
+        <source>Waiting to aquire GPS location</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="1214"/>
-        <source>OXYGEN</source>
-        <translation type="unfinished"/>
+        <location filename="../core/qthelper.cpp" line="766"/>
+        <location filename="../core/qthelper.cpp" line="1275"/>
+        <source>m</source>
+        <translation>m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="59"/>
-        <source>Remove this point</source>
-        <translation type="unfinished"/>
+        <location filename="../core/qthelper.cpp" line="768"/>
+        <location filename="../core/qthelper.cpp" line="1274"/>
+        <source>ft</source>
+        <translation>ft</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="32"/>
-        <source>Average</source>
-        <translation>Trung bình</translation>
+        <location filename="../core/qthelper.cpp" line="794"/>
+        <source>C</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="35"/>
-        <source>Minimum</source>
-        <translation>Nhỏ nhất</translation>
+        <location filename="../core/qthelper.cpp" line="796"/>
+        <source>F</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="38"/>
-        <source>Maximum</source>
-        <translation>Tối đa</translation>
+        <location filename="../core/qthelper.cpp" line="821"/>
+        <location filename="../core/qthelper.cpp" line="1250"/>
+        <source>kg</source>
+        <translation>ký</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/globe.cpp" line="327"/>
-        <source>Move the map and double-click to set the dive location</source>
-        <translation type="unfinished"/>
+        <location filename="../core/qthelper.cpp" line="823"/>
+        <location filename="../core/qthelper.cpp" line="1251"/>
+        <source>lbs</source>
+        <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="28"/>
-        <source>unknown</source>
-        <translation>chưa rõ</translation>
+        <location filename="../core/qthelper.cpp" line="848"/>
+        <location filename="../core/qthelper.cpp" line="1300"/>
+        <source>bar</source>
+        <translation>bar</translation>
     </message>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="105"/>
-        <source>h:</source>
-        <translation type="unfinished"/>
+        <location filename="../core/qthelper.cpp" line="850"/>
+        <location filename="../core/qthelper.cpp" line="1299"/>
+        <source>psi</source>
+        <translation>psi</translation>
     </message>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="105"/>
-        <source>min</source>
-        <translation>nhỏ nhất</translation>
+        <location filename="../core/qthelper.cpp" line="871"/>
+        <location filename="../core/qthelper.cpp" line="1235"/>
+        <source>AIR</source>
+        <translation>KHÔNG KHÍ</translation>
     </message>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="337"/>
-        <source>Multiple</source>
+        <location filename="../core/qthelper.cpp" line="873"/>
+        <source>EAN</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="../core/qthelper.cpp" line="957"/>
+        <location filename="../core/qthelper.cpp" line="962"/>
         <source>(%n dive(s))</source>
         <translation type="unfinished"><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="816"/>
-        <location filename="../core/qthelper.cpp" line="1228"/>
-        <source>kg</source>
-        <translation>ký</translation>
+        <location filename="../core/qthelper.cpp" line="1235"/>
+        <source>OXYGEN</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="818"/>
-        <location filename="../core/qthelper.cpp" line="1229"/>
-        <source>lbs</source>
-        <translation>lbs</translation>
+        <location filename="../core/qthelper.cpp" line="1322"/>
+        <source>l</source>
+        <translation>l</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="763"/>
-        <location filename="../core/qthelper.cpp" line="1252"/>
-        <source>ft</source>
-        <translation>ft</translation>
+        <location filename="../core/qthelper.cpp" line="1323"/>
+        <source>cuft</source>
+        <translation>cuft</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="761"/>
-        <location filename="../core/qthelper.cpp" line="1253"/>
-        <source>m</source>
-        <translation>m</translation>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="29"/>
+        <source>unknown</source>
+        <translation>chưa rõ</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="789"/>
-        <source>C</source>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="114"/>
+        <source>h:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="791"/>
-        <source>F</source>
-        <translation type="unfinished"/>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="114"/>
+        <source>min</source>
+        <translation>nhỏ nhất</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="845"/>
-        <location filename="../core/qthelper.cpp" line="1275"/>
-        <source>psi</source>
-        <translation>psi</translation>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="63"/>
+        <source>Remove this point</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="843"/>
-        <location filename="../core/qthelper.cpp" line="1276"/>
-        <source>bar</source>
-        <translation>bar</translation>
+        <location filename="../desktop-widgets/globe.cpp" line="327"/>
+        <source>Move the map and double-click to set the dive location</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="868"/>
-        <source>EAN</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="32"/>
+        <source>Average</source>
+        <translation>Trung bình</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="1298"/>
-        <source>l</source>
-        <translation>l</translation>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="35"/>
+        <source>Minimum</source>
+        <translation>Nhỏ nhất</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="1299"/>
-        <source>cuft</source>
-        <translation>cuft</translation>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="38"/>
+        <source>Maximum</source>
+        <translation>Tối đa</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="625"/>
@@ -7132,17 +7278,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <source>Malformed XML response. Line %1: %2</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../core/gpslocation.h" line="13"/>
-        <source>Waiting to aquire GPS location</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>ReadSettingsThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1651"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1676"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1640"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1665"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation type="unfinished"/>
     </message>
@@ -7171,7 +7312,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ResetSettingsThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1775"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1764"/>
         <source>Reset settings failed!</source>
         <translation type="unfinished"/>
     </message>
@@ -7209,6 +7350,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ShiftImageTimesDialog</name>
     <message>
+        <location filename="../desktop-widgets/shiftimagetimes.ui" line="23"/>
+        <location filename="../build/ui_shiftimagetimes.h" line="184"/>
+        <source>Shift selected image times</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/shiftimagetimes.ui" line="34"/>
         <location filename="../build/ui_shiftimagetimes.h" line="185"/>
         <source>Shift times of image(s) by</source>
@@ -7221,12 +7368,6 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/shiftimagetimes.ui" line="23"/>
-        <location filename="../build/ui_shiftimagetimes.h" line="184"/>
-        <source>Shift selected image times</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/shiftimagetimes.ui" line="105"/>
         <location filename="../build/ui_shiftimagetimes.h" line="187"/>
         <source>Earlier</source>
@@ -7276,12 +7417,12 @@ Not all images have timestamps in the range between
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="297"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="296"/>
         <source>Open image file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="299"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="298"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>Tập tin hình ảnh (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -7439,49 +7580,49 @@ Not all images have timestamps in the range between
 <context>
     <name>SocialNetworkDialog</name>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="339"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="284"/>
         <source>Dive date: %1 
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="342"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="287"/>
         <source>Duration: %1 
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="343"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="288"/>
         <source>h:</source>
         <comment>abbreviation for hours plus separator</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="344"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="289"/>
         <source>min</source>
         <comment>abbreviation for minutes</comment>
         <translation>nhỏ nhất</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="347"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="292"/>
         <source>Dive location: %1 
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="350"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="295"/>
         <source>Buddy: %1 
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="353"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="298"/>
         <source>Divemaster: %1 
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="356"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="301"/>
         <source>
 %1</source>
         <translation type="unfinished"/>
@@ -7566,9 +7707,20 @@ Not all images have timestamps in the range between
     <name>StartPage</name>
     <message>
         <location filename="../mobile-widgets/qml/StartPage.qml" line="19"/>
-        <source>To use Subsurface-mobile with Subsurface cloud storage, please enteryour cloud credentials.
+        <source>To use Subsurface-mobile with Subsurface cloud storage, please enter your cloud credentials.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/StartPage.qml" line="20"/>
+        <source>If this is the first time you use Subsurface cloud storage, enter a valid email (all lower case) and a password of your choice (letters and numbers). The server will send a PIN to the email address provided that you will have to enter here.
 
-To use Subsurface-mobile only with local data on this device, tap on the no cloud icon below.</source>
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/StartPage.qml" line="23"/>
+        <source>To use Subsurface-mobile only with local data on this device, tap on the no cloud icon below.</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -7607,7 +7759,12 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>SubsurfaceWebServices</name>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="419"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="395"/>
+        <source>Enter User ID and click Download</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="417"/>
         <source>Webservice</source>
         <translation>Dịch vụ web</translation>
     </message>
@@ -7632,30 +7789,25 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="557"/>
-        <source>Download successful</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="551"/>
         <source>Invalid user identifier!</source>
         <translation>Nhận dạng người dùng không hợp lệ!</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="397"/>
-        <source>Enter User ID and click Download</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="554"/>
         <source>Cannot parse response!</source>
         <translation>Không nhận được trả lời!</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="557"/>
+        <source>Download successful</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>SuitFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="674"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="672"/>
         <source>Suits: </source>
         <translation type="unfinished"/>
     </message>
@@ -7663,7 +7815,7 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>SuitsFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="123"/>
+        <location filename="../qt-models/filtermodels.cpp" line="128"/>
         <source>No suit set</source>
         <translation type="unfinished"/>
     </message>
@@ -7682,7 +7834,7 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>TagFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="595"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="593"/>
         <source>Tags: </source>
         <translation type="unfinished"/>
     </message>
@@ -7690,7 +7842,7 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>TagFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="148"/>
+        <location filename="../qt-models/filtermodels.cpp" line="153"/>
         <source>Empty tags</source>
         <translation type="unfinished"/>
     </message>
@@ -7716,6 +7868,11 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>TemplateEdit</name>
     <message>
+        <location filename="../desktop-widgets/templateedit.ui" line="14"/>
+        <source>Edit template</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/templateedit.ui" line="37"/>
         <source>Preview</source>
         <translation type="unfinished"/>
@@ -7761,11 +7918,6 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
         <translation>Kích thước kiểu chữ</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/templateedit.ui" line="14"/>
-        <source>Edit template</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/templateedit.ui" line="165"/>
         <source>Color palette</source>
         <translation type="unfinished"/>
@@ -7947,85 +8099,12 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>TextHyperlinkEventFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="817"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="815"/>
         <source>%1click to visit %2</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>ThemeTest</name>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="29"/>
-        <source>Theme Information</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="33"/>
-        <source>Screen</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="42"/>
-        <source>Geometry (pixels):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="49"/>
-        <source>Geometry (gridUnits):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="56"/>
-        <source>Units.gridUnit:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="63"/>
-        <source>Units.devicePixelRatio:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="70"/>
-        <source>Font Metrics</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="76"/>
-        <source>FontMetrics pointSize:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="83"/>
-        <source>FontMetrics pixelSize:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="90"/>
-        <source>FontMetrics devicePixelRatio:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="97"/>
-        <source>Text item pixelSize:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="104"/>
-        <source>Text item pointSize:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="111"/>
-        <source>Pixel density:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="118"/>
-        <source>Height of default font:</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
     <name>ToolTipItem</name>
     <message>
         <location filename="../profile-widget/divetooltipitem.cpp" line="136"/>
@@ -8036,102 +8115,107 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>TripItem</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="67"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="68"/>
         <source>(%1 shown)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="194"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="197"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="215"/>
         <source>Date</source>
         <translation>Ngày tháng</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="200"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="218"/>
         <source>Rating</source>
         <translation>Xếp hạng</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
         <source>Depth(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="206"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="224"/>
         <source>Duration</source>
         <translation>Độ dài</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="209"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="227"/>
         <source>Temp(%1%2)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
         <source>Weight(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
         <source>kg</source>
         <translation>ký</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="215"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="233"/>
         <source>Suit</source>
         <translation>Đồ lặn</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="218"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="236"/>
         <source>Cyl</source>
         <translation>Xlanh</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="239"/>
         <source>Gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="244"/>
         <source>SAC(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="244"/>
         <source>/min</source>
         <translation>/nhỏ nhất</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="229"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="247"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="232"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="250"/>
         <source>Max CNS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="235"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="253"/>
+        <source>Photos before/during/after dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="256"/>
         <source>Location</source>
         <translation>Địa điểm</translation>
     </message>
@@ -8154,72 +8238,73 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>UpdateManager</name>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="69"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="61"/>
         <source>Check for updates.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="70"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="62"/>
         <source>Subsurface was unable to check for updates.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="75"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="67"/>
         <source>The following error occurred:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="76"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="68"/>
         <source>Please check your internet connection.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="86"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="78"/>
         <source>You are using the latest version of Subsurface.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="89"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="81"/>
         <source>A new version of Subsurface is available.&lt;br/&gt;Click on:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; to download it.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="95"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="87"/>
         <source>A new version of Subsurface is available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="96"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="88"/>
         <source>Latest version is %1, please check %2 our download page %3 for information in how to update.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="106"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="98"/>
         <source>Newest release version is </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="107"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="99"/>
         <source>The server returned the following information:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="125"/>
-        <source>Subsurface is checking every two weeks if a new version is available. If you don&apos;t want Subsurface to continue checking, please click Decline.</source>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="117"/>
+        <source>Subsurface is checking every two weeks if a new version is available. 
+ If you don&apos;t want Subsurface to continue checking, please click Decline.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="126"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="119"/>
         <source>Decline</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="127"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="120"/>
         <source>Accept</source>
         <translation>Chấp nhậ</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="129"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="122"/>
         <source>Automatic check for updates</source>
         <translation type="unfinished"/>
     </message>
@@ -8241,24 +8326,6 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>UserSurvey</name>
     <message>
-        <location filename="../desktop-widgets/usersurvey.ui" line="44"/>
-        <location filename="../build/ui_usersurvey.h" line="151"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;We would love to learn more about our users, their preferences and their usage habits. Please spare a minute to fill out this form and submit it to the Subsurface team.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/usersurvey.ui" line="115"/>
-        <location filename="../build/ui_usersurvey.h" line="156"/>
-        <source>Other software/sources</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/usersurvey.ui" line="128"/>
-        <location filename="../build/ui_usersurvey.h" line="157"/>
-        <source>Manually entering dives</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="14"/>
         <location filename="../build/ui_usersurvey.h" line="149"/>
         <source>User survey</source>
@@ -8271,6 +8338,12 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/usersurvey.ui" line="44"/>
+        <location filename="../build/ui_usersurvey.h" line="151"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;We would love to learn more about our users, their preferences and their usage habits. Please spare a minute to fill out this form and submit it to the Subsurface team.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="63"/>
         <location filename="../build/ui_usersurvey.h" line="152"/>
         <source>Technical diver</source>
@@ -8295,6 +8368,18 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/usersurvey.ui" line="115"/>
+        <location filename="../build/ui_usersurvey.h" line="156"/>
+        <source>Other software/sources</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/usersurvey.ui" line="128"/>
+        <location filename="../build/ui_usersurvey.h" line="157"/>
+        <source>Manually entering dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="141"/>
         <location filename="../build/ui_usersurvey.h" line="158"/>
         <source>Android/iPhone companion app</source>
@@ -8325,6 +8410,11 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/usersurvey.cpp" line="18"/>
+        <source>Send</source>
+        <translation>Gửi</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/usersurvey.cpp" line="43"/>
         <source>
 Operating system: %1</source>
@@ -8364,19 +8454,14 @@ Language: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/usersurvey.cpp" line="101"/>
-        <source>Submit user survey.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/usersurvey.cpp" line="82"/>
         <source>Ask again?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/usersurvey.cpp" line="18"/>
-        <source>Send</source>
-        <translation>Gửi</translation>
+        <location filename="../desktop-widgets/usersurvey.cpp" line="101"/>
+        <source>Submit user survey.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/usersurvey.cpp" line="102"/>
@@ -8468,12 +8553,12 @@ Language: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="324"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="325"/>
         <source>Operation timed out</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="345"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="346"/>
         <source>Transferring data...</source>
         <translation type="unfinished"/>
     </message>
@@ -8508,16 +8593,16 @@ Language: %1</source>
 <context>
     <name>WriteSettingsThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1702"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1709"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1718"/>
-        <source>Failed!</source>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1689"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1710"/>
+        <source>This feature is not yet available for the selected dive computer.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1700"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1721"/>
-        <source>This feature is not yet available for the selected dive computer.</source>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1691"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1698"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1707"/>
+        <source>Failed!</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -8634,7 +8719,7 @@ Maximum</source>
 <context>
     <name>getextFromC</name>
     <message>
-        <location filename="../core/libdivecomputer.c" line="674"/>
+        <location filename="../core/libdivecomputer.c" line="737"/>
         <source>Error parsing the header</source>
         <translation type="unfinished"/>
     </message>
@@ -8642,38 +8727,377 @@ Maximum</source>
 <context>
     <name>gettextFromC</name>
     <message>
+        <location filename="../core/cochran.c" line="309"/>
+        <location filename="../core/cochran.c" line="315"/>
+        <location filename="../core/cochran.c" line="385"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>deco stop</source>
+        <translation>dừng lại deco</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="336"/>
+        <location filename="../core/cochran.c" line="390"/>
+        <location filename="../core/file.c" line="777"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>ascent</source>
+        <translation>đường dốc</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="342"/>
+        <location filename="../core/file.c" line="755"/>
+        <source>battery</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="348"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
+        <source>OLF</source>
+        <translation>OLF</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="353"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
+        <source>maxdepth</source>
+        <translation>độ sâu tối đa</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="358"/>
+        <location filename="../core/cochran.c" line="404"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
+        <source>pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="365"/>
+        <location filename="../core/cochran.c" line="414"/>
+        <location filename="../core/cochran.c" line="421"/>
+        <location filename="../core/file.c" line="868"/>
+        <location filename="../core/libdivecomputer.c" line="225"/>
+        <location filename="../core/libdivecomputer.c" line="228"/>
+        <source>gaschange</source>
+        <translation>thay đổi dưỡng khí</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="370"/>
+        <location filename="../core/cochran.c" line="409"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>rbt</source>
+        <translation>rbt</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="379"/>
+        <location filename="../core/cochran.c" line="426"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>ceiling</source>
+        <translation>trần</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="395"/>
+        <location filename="../core/libdivecomputer.c" line="224"/>
+        <source>transmitter</source>
+        <translation>máy phát radio</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="153"/>
+        <source>Error: the file does not appear to be a DATATRAK divelog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="286"/>
+        <source>clear</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="289"/>
+        <source>misty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="292"/>
+        <source>fog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="295"/>
+        <source>rain</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="298"/>
+        <source>storm</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="301"/>
+        <source>snow</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="321"/>
+        <source>No suit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="324"/>
+        <source>Shorty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="327"/>
+        <source>Combi</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="330"/>
+        <source>Wet suit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="333"/>
+        <source>Semidry suit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="336"/>
+        <source>Dry suit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="396"/>
+        <source>no stop</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="398"/>
+        <location filename="../core/dive.c" line="29"/>
+        <source>deco</source>
+        <translation>deco</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="400"/>
+        <source>single ascent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="402"/>
+        <source>multiple ascent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="404"/>
+        <location filename="../core/dive.c" line="27"/>
+        <source>fresh</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="406"/>
+        <source>salt water</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="431"/>
+        <source>sight seeing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="433"/>
+        <source>club dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="435"/>
+        <location filename="../core/dive.c" line="28"/>
+        <source>instructor</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="437"/>
+        <source>instruction</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="439"/>
+        <location filename="../core/dive.c" line="27"/>
+        <source>night</source>
+        <translation>ban đêm</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="441"/>
+        <location filename="../core/dive.c" line="25"/>
+        <source>cave</source>
+        <translation>hang động</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="443"/>
+        <location filename="../core/dive.c" line="24"/>
+        <source>ice</source>
+        <translation>băng</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="445"/>
+        <source>search</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="455"/>
+        <location filename="../core/dive.c" line="25"/>
+        <source>wreck</source>
+        <translation>vật trôi dạt</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="457"/>
+        <location filename="../core/dive.c" line="26"/>
+        <source>river</source>
+        <translation>sông</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="459"/>
+        <location filename="../core/dive.c" line="23"/>
+        <source>drift</source>
+        <translation>độ trôi</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="461"/>
+        <location filename="../core/dive.c" line="28"/>
+        <source>photo</source>
+        <translation>hình ảnh</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="463"/>
+        <source>other</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="474"/>
+        <source>Other activities</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="498"/>
+        <source>Datatrak/Wlog notes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="537"/>
+        <source>Manually entered dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="588"/>
+        <source>Unknown</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="674"/>
+        <source>Error: couldn&apos;t open the file %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="687"/>
+        <source>Error: no dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="23"/>
+        <source>boat</source>
+        <translation>thuyền</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="23"/>
+        <source>shore</source>
+        <translation>bờ biển</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="24"/>
+        <source>deep</source>
+        <translation>sâu</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="24"/>
+        <source>cavern</source>
+        <translation>hang lớn</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="25"/>
+        <source>altitude</source>
+        <translation>độ cao so với mặt biển</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="26"/>
+        <source>pool</source>
+        <translation>ao</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="26"/>
+        <source>lake</source>
+        <translation>hồ</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="27"/>
+        <source>student</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="28"/>
+        <source>video</source>
+        <translation>video</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="33"/>
+        <source>OC-gas</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="33"/>
+        <source>diluent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="33"/>
+        <location filename="../core/equipment.c" line="88"/>
+        <location filename="../core/planner.c" line="1436"/>
+        <location filename="../core/planner.c" line="1439"/>
+        <source>oxygen</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../core/dive.c" line="181"/>
         <source>pascal</source>
         <translation>pascal</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="186"/>
-        <location filename="../core/qthelper.cpp" line="669"/>
+        <location filename="../core/qthelper.cpp" line="674"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="190"/>
-        <location filename="../core/qthelper.cpp" line="672"/>
+        <location filename="../core/qthelper.cpp" line="677"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
+        <location filename="../core/dive.c" line="227"/>
+        <source>ℓ</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../core/dive.c" line="232"/>
         <source>cuft</source>
         <translation>cuft</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="269"/>
-        <location filename="../core/qthelper.cpp" line="590"/>
-        <location filename="../core/qthelper.cpp" line="605"/>
+        <location filename="../core/qthelper.cpp" line="595"/>
+        <location filename="../core/qthelper.cpp" line="610"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="274"/>
-        <location filename="../core/qthelper.cpp" line="593"/>
-        <location filename="../core/qthelper.cpp" line="607"/>
+        <location filename="../core/qthelper.cpp" line="598"/>
+        <location filename="../core/qthelper.cpp" line="612"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
@@ -8699,53 +9123,58 @@ Maximum</source>
     </message>
     <message>
         <location filename="../core/dive.c" line="325"/>
-        <location filename="../core/qthelper.cpp" line="616"/>
-        <location filename="../core/qthelper.cpp" line="626"/>
+        <location filename="../core/qthelper.cpp" line="621"/>
+        <location filename="../core/qthelper.cpp" line="631"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="329"/>
-        <location filename="../core/qthelper.cpp" line="614"/>
-        <location filename="../core/qthelper.cpp" line="624"/>
+        <location filename="../core/qthelper.cpp" line="619"/>
+        <location filename="../core/qthelper.cpp" line="629"/>
         <source>kg</source>
         <translation>ký</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="1772"/>
+        <location filename="../core/dive.c" line="1751"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) hoặc (%s)</translation>
     </message>
     <message>
-        <location filename="../core/divelist.c" line="484"/>
+        <location filename="../core/divelist.c" line="487"/>
         <location filename="../core/equipment.c" line="84"/>
-        <location filename="../core/planner.c" line="1411"/>
-        <location filename="../core/planner.c" line="1414"/>
+        <location filename="../core/planner.c" line="1432"/>
+        <location filename="../core/planner.c" line="1435"/>
         <source>air</source>
         <translation>không khí</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="197"/>
+        <location filename="../core/equipment.c" line="86"/>
+        <source>EAN%d</source>
+        <translation>EAN%d</translation>
+    </message>
+    <message>
+        <location filename="../core/equipment.c" line="198"/>
         <source>integrated</source>
         <translation>được tích hợp</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="198"/>
+        <location filename="../core/equipment.c" line="199"/>
         <source>belt</source>
         <translation>dây ràng</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="199"/>
+        <location filename="../core/equipment.c" line="200"/>
         <source>ankle</source>
         <translation>mắt cá chân</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="200"/>
+        <location filename="../core/equipment.c" line="201"/>
         <source>backplate weight</source>
         <translation>cân nặng giáp che</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="201"/>
+        <location filename="../core/equipment.c" line="202"/>
         <source>clip-on</source>
         <translation>clip-on</translation>
     </message>
@@ -8758,8 +9187,8 @@ Maximum</source>
         <location filename="../core/file.c" line="121"/>
         <location filename="../core/file.c" line="512"/>
         <location filename="../core/file.c" line="597"/>
-        <location filename="../core/file.c" line="924"/>
-        <location filename="../core/file.c" line="1056"/>
+        <location filename="../core/file.c" line="909"/>
+        <location filename="../core/file.c" line="1092"/>
         <location filename="../core/ostctools.c" line="80"/>
         <source>Failed to read &apos;%s&apos;</source>
         <translation>Thất bại khi đọc dữ liệu &apos;%s&apos;</translation>
@@ -8817,707 +9246,721 @@ Maximum</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/file.c" line="887"/>
-        <source>No matching DC found for file &apos;%s&apos;</source>
+        <location filename="../core/git-access.c" line="134"/>
+        <source>Local cache directory %s corrupted - can&apos;t sync with Subsurface cloud storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>none</source>
-        <translation>không</translation>
+        <location filename="../core/git-access.c" line="157"/>
+        <location filename="../core/git-access.c" line="177"/>
+        <source>Could not update local cache to newer remote data</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="309"/>
-        <location filename="../core/cochran.c" line="315"/>
-        <location filename="../core/cochran.c" line="385"/>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>deco stop</source>
-        <translation>dừng lại deco</translation>
+        <location filename="../core/git-access.c" line="170"/>
+        <source>Subsurface cloud storage corrupted</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="342"/>
-        <location filename="../core/file.c" line="755"/>
-        <source>battery</source>
+        <location filename="../core/git-access.c" line="284"/>
+        <source>Could not update Subsurface cloud storage, try again later</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="370"/>
-        <location filename="../core/cochran.c" line="409"/>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>rbt</source>
-        <translation>rbt</translation>
+        <location filename="../core/git-access.c" line="344"/>
+        <source>Remote storage and local data diverged. Error: merge failed (%s)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="336"/>
-        <location filename="../core/cochran.c" line="390"/>
-        <location filename="../core/file.c" line="777"/>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>ascent</source>
-        <translation>đường dốc</translation>
+        <location filename="../core/git-access.c" line="374"/>
+        <source>Remote storage and local data diverged. Cannot combine local and remote changes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="379"/>
-        <location filename="../core/cochran.c" line="426"/>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>ceiling</source>
-        <translation>trần</translation>
+        <location filename="../core/git-access.c" line="408"/>
+        <source>Remote storage and local data diverged</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>workload</source>
-        <translation>tải công việc</translation>
+        <location filename="../core/git-access.c" line="411"/>
+        <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="395"/>
-        <location filename="../core/libdivecomputer.c" line="203"/>
-        <source>transmitter</source>
-        <translation>máy phát radio</translation>
+        <location filename="../core/git-access.c" line="420"/>
+        <source>Problems with local cache of Subsurface cloud data</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/git-access.c" line="421"/>
+        <source>Moved cache data to %s. Please try the operation again.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/git-access.c" line="743"/>
+        <source>Error connecting to Subsurface cloud storage</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/git-access.c" line="746"/>
+        <source>git clone of %s failed (%s)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="210"/>
+        <location filename="../core/parse-xml.c" line="3317"/>
+        <location filename="../core/uemis-downloader.c" line="134"/>
+        <source>unknown</source>
+        <translation>chưa rõ</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="203"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>none</source>
+        <translation>không</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>workload</source>
+        <translation>tải công việc</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="224"/>
         <source>violation</source>
         <translation>độ xâm phạm</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="203"/>
+        <location filename="../core/libdivecomputer.c" line="224"/>
         <source>bookmark</source>
         <translation>đánh dấu</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="203"/>
+        <location filename="../core/libdivecomputer.c" line="224"/>
         <source>surface</source>
         <translation>bề mặt</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="203"/>
+        <location filename="../core/libdivecomputer.c" line="224"/>
         <source>safety stop</source>
         <translation>dừng an toàn</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="365"/>
-        <location filename="../core/cochran.c" line="414"/>
-        <location filename="../core/cochran.c" line="421"/>
-        <location filename="../core/file.c" line="868"/>
-        <location filename="../core/libdivecomputer.c" line="204"/>
-        <location filename="../core/libdivecomputer.c" line="207"/>
-        <source>gaschange</source>
-        <translation>thay đổi dưỡng khí</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="204"/>
+        <location filename="../core/libdivecomputer.c" line="225"/>
         <source>safety stop (voluntary)</source>
         <translation>dừng an toàn (tự nguyện)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="204"/>
+        <location filename="../core/libdivecomputer.c" line="225"/>
         <source>safety stop (mandatory)</source>
         <translation>dừng an toàn (bắt buộc)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="205"/>
+        <location filename="../core/libdivecomputer.c" line="226"/>
         <source>deepstop</source>
         <translation>deepstop</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="205"/>
+        <location filename="../core/libdivecomputer.c" line="226"/>
         <source>ceiling (safety stop)</source>
         <translation>trần (độ an toàn)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="205"/>
-        <source>divetime</source>
-        <translation>thời gian lặn</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="205"/>
+        <location filename="../core/libdivecomputer.c" line="226"/>
         <source>below floor</source>
         <comment>event showing dive is below deco floor and adding deco time</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="353"/>
-        <location filename="../core/libdivecomputer.c" line="206"/>
-        <source>maxdepth</source>
-        <translation>độ sâu tối đa</translation>
-    </message>
-    <message>
-        <location filename="../core/cochran.c" line="348"/>
-        <location filename="../core/libdivecomputer.c" line="206"/>
-        <source>OLF</source>
-        <translation>OLF</translation>
+        <location filename="../core/libdivecomputer.c" line="226"/>
+        <source>divetime</source>
+        <translation>thời gian lặn</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="206"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
         <source>airtime</source>
         <translation>thời gian không khí</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="206"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
         <source>rgbm</source>
         <translation>rgbm</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="206"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
         <source>heading</source>
         <translation>thẳng tiến</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="358"/>
-        <location filename="../core/cochran.c" line="404"/>
-        <location filename="../core/libdivecomputer.c" line="206"/>
-        <source>pO₂</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="207"/>
+        <location filename="../core/libdivecomputer.c" line="228"/>
         <source>tissue level warning</source>
         <translation>cảnh báo cấp độ mô</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="207"/>
+        <location filename="../core/libdivecomputer.c" line="228"/>
         <source>non stop time</source>
         <translation>không dừng lại thời gian</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="224"/>
+        <location filename="../core/libdivecomputer.c" line="237"/>
         <source>invalid event number</source>
         <translation>chỉ số sự kiện không hợp lệ</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="658"/>
-        <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="../core/libdivecomputer.c" line="664"/>
-        <source>Error registering the data</source>
-        <translation>Lỗi khi đăng ký dữ liệu</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="495"/>
+        <location filename="../core/libdivecomputer.c" line="553"/>
         <source>Error parsing the datetime</source>
         <translation>Lỗi khi chuyển thông số thời gian</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="513"/>
+        <location filename="../core/libdivecomputer.c" line="571"/>
         <source>Dive %d: %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="519"/>
+        <location filename="../core/libdivecomputer.c" line="577"/>
         <source>Error parsing the divetime</source>
         <translation>Lỗi khi chuyển thông số thời gian lặn</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="529"/>
+        <location filename="../core/libdivecomputer.c" line="587"/>
         <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="../core/libdivecomputer.c" line="548"/>
+        <location filename="../core/libdivecomputer.c" line="606"/>
         <source>Error parsing temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="568"/>
+        <location filename="../core/libdivecomputer.c" line="626"/>
         <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="../core/libdivecomputer.c" line="580"/>
+        <location filename="../core/libdivecomputer.c" line="638"/>
         <source>Error obtaining water salinity</source>
         <translation>Lỗi khi thu nhận độ mặn của nước</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="589"/>
+        <location filename="../core/libdivecomputer.c" line="647"/>
         <source>Error obtaining surface pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="614"/>
+        <location filename="../core/libdivecomputer.c" line="672"/>
         <source>Error obtaining divemode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="634"/>
+        <location filename="../core/libdivecomputer.c" line="692"/>
         <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="../core/libdivecomputer.c" line="684"/>
+        <location filename="../core/libdivecomputer.c" line="717"/>
+        <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="../core/libdivecomputer.c" line="723"/>
+        <source>Error registering the data</source>
+        <translation>Lỗi khi đăng ký dữ liệu</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="744"/>
         <source>Error parsing the samples</source>
         <translation>Lỗi khi chuyển thông số các mẫu</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="822"/>
+        <location filename="../core/libdivecomputer.c" line="882"/>
         <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="../core/libdivecomputer.c" line="830"/>
+        <location filename="../core/libdivecomputer.c" line="890"/>
         <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="../core/libdivecomputer.c" line="894"/>
+        <location filename="../core/libdivecomputer.c" line="954"/>
         <source>Error registering the event handler.</source>
         <translation>Lỗi khi đăng ký quản lý sự kiện.</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="899"/>
+        <location filename="../core/libdivecomputer.c" line="959"/>
         <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="../core/libdivecomputer.c" line="920"/>
+        <location filename="../core/libdivecomputer.c" line="980"/>
         <source>Dive data import error</source>
         <translation>Lỗi khi nhập dữ liệu lặn</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="959"/>
+        <location filename="../core/libdivecomputer.c" line="1019"/>
         <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="../core/libdivecomputer.c" line="966"/>
+        <location filename="../core/libdivecomputer.c" line="1026"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Không thể mở %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="992"/>
+        <location filename="../core/libdivecomputer.c" line="1048"/>
         <source>Insufficient privileges to open the device %s %s (%s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/parse-xml.c" line="517"/>
-        <source>Strange percentage reading %s
+        <location filename="../core/load-git.c" line="194"/>
+        <location filename="../core/parse-xml.c" line="1242"/>
+        <source>multiple GPS locations for this dive site; also %s
 </source>
-        <translation>Đang đọc tỉ lệ lạ %s
-</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/load-git.c" line="194"/>
-        <location filename="../core/parse-xml.c" line="1238"/>
-        <source>multiple GPS locations for this dive site; also %s
+        <location filename="../core/load-git.c" line="222"/>
+        <location filename="../core/parse-xml.c" line="1304"/>
+        <source>additional name for site: %s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/parse-xml.c" line="2044"/>
+        <location filename="../core/ostctools.c" line="120"/>
+        <location filename="../core/ostctools.c" line="152"/>
+        <source>Unknown DC in dive %d</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/ostctools.c" line="165"/>
+        <source>Error - %s - parsing dive %d</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/parse-xml.c" line="517"/>
+        <source>Strange percentage reading %s
+</source>
+        <translation>Đang đọc tỉ lệ lạ %s
+</translation>
+    </message>
+    <message>
+        <location filename="../core/parse-xml.c" line="2051"/>
         <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="../core/parse-xml.c" line="3741"/>
+        <location filename="../core/parse-xml.c" line="3774"/>
         <source>Can&apos;t open stylesheet %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="86"/>
-        <source>EAN%d</source>
-        <translation>EAN%d</translation>
+        <location filename="../core/planner.c" line="555"/>
+        <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE %s ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="1032"/>
-        <location filename="../core/planner.c" line="1184"/>
-        <source>Can&apos;t find gas %s</source>
+        <location filename="../core/planner.c" line="569"/>
+        <source>Decompression calculation aborted due to excessive time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="368"/>
-        <source>Too many gas mixes</source>
-        <translation>Quá nhiều dưỡng khí được trộn</translation>
+        <location filename="../core/planner.c" line="571"/>
+        <location filename="../core/planner.c" line="829"/>
+        <location filename="../core/planner.c" line="834"/>
+        <location filename="../core/planner.c" line="860"/>
+        <location filename="../core/planner.c" line="870"/>
+        <source>Warning:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="568"/>
-        <source>Decompression calculation aborted due to excessive time</source>
+        <location filename="../core/planner.c" line="581"/>
+        <source>based on Bühlmann ZHL-16C with GFlow = %d and GFhigh = %d</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="592"/>
-        <source>Subsurface dive plan</source>
+        <location filename="../core/planner.c" line="586"/>
+        <source>based on VPM-B at nominal conservatism</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="596"/>
-        <source>depth</source>
+        <location filename="../core/planner.c" line="588"/>
+        <source>based on VPM-B at +%d conservatism</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="602"/>
-        <source>runtime</source>
+        <location filename="../core/planner.c" line="590"/>
+        <source>, effective GF=%d/%d</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="594"/>
+        <source>recreational mode based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="598"/>
+        <source>Subsurface dive plan</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../core/planner.c" line="599"/>
+        <source>&lt;div&gt;Runtime: %dmin&lt;/div&gt;&lt;br&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="604"/>
+        <source>depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="607"/>
         <source>duration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="554"/>
-        <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE %s ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source>
+        <location filename="../core/planner.c" line="610"/>
+        <source>runtime</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="605"/>
+        <location filename="../core/planner.c" line="613"/>
         <source>gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="648"/>
+        <location filename="../core/planner.c" line="656"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="656"/>
+        <location filename="../core/planner.c" line="664"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="669"/>
+        <location filename="../core/planner.c" line="677"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="676"/>
+        <location filename="../core/planner.c" line="684"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="721"/>
+        <location filename="../core/planner.c" line="729"/>
         <source>%3.0f%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="724"/>
-        <location filename="../core/planner.c" line="728"/>
+        <location filename="../core/planner.c" line="732"/>
+        <location filename="../core/planner.c" line="736"/>
         <source>%3dmin</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="737"/>
-        <location filename="../core/planner.c" line="749"/>
+        <location filename="../core/planner.c" line="745"/>
+        <location filename="../core/planner.c" line="757"/>
         <source>(SP = %.1fbar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="772"/>
+        <location filename="../core/planner.c" line="780"/>
         <source>Switch gas to %s (SP = %.1fbar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="774"/>
+        <location filename="../core/planner.c" line="782"/>
         <source>Switch gas to %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="793"/>
+        <location filename="../core/planner.c" line="801"/>
         <source>CNS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="795"/>
+        <location filename="../core/planner.c" line="803"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="799"/>
+        <location filename="../core/planner.c" line="807"/>
         <source>Gas consumption (CCR legs excluded):</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="801"/>
+        <location filename="../core/planner.c" line="809"/>
         <source>Gas consumption:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="570"/>
-        <location filename="../core/planner.c" line="821"/>
-        <location filename="../core/planner.c" line="826"/>
-        <location filename="../core/planner.c" line="851"/>
-        <location filename="../core/planner.c" line="861"/>
-        <source>Warning:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="580"/>
-        <source>based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="584"/>
-        <source>based on VPM-B at nominal conservatism</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="586"/>
-        <source>based on VPM-B at +%d conservatism</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="588"/>
-        <source>recreational mode based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="822"/>
+        <location filename="../core/planner.c" line="830"/>
         <source>this is more gas than available in the specified cylinder!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="827"/>
+        <location filename="../core/planner.c" line="835"/>
         <source>not enough reserve for gas sharing on ascent!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="829"/>
+        <location filename="../core/planner.c" line="837"/>
         <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="831"/>
+        <location filename="../core/planner.c" line="839"/>
         <source>%.0f%s (%.0f%s during planned ascent) of %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="848"/>
+        <location filename="../core/planner.c" line="857"/>
         <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="858"/>
+        <location filename="../core/planner.c" line="867"/>
         <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="1419"/>
+        <location filename="../core/planner.c" line="1194"/>
+        <source>Can&apos;t find gas %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="1440"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1280"/>
+        <location filename="../core/profile.c" line="1298"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1283"/>
+        <location filename="../core/profile.c" line="1301"/>
         <source>P: %d%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1287"/>
+        <location filename="../core/profile.c" line="1305"/>
         <source>T: %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1293"/>
+        <location filename="../core/profile.c" line="1311"/>
         <source>V: %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1296"/>
+        <location filename="../core/profile.c" line="1314"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1298"/>
+        <location filename="../core/profile.c" line="1316"/>
         <source>CNS: %u%%
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1300"/>
+        <location filename="../core/profile.c" line="1318"/>
         <source>pO%s: %.2fbar
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1302"/>
+        <location filename="../core/profile.c" line="1320"/>
         <source>pN%s: %.2fbar
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1304"/>
+        <location filename="../core/profile.c" line="1322"/>
         <source>pHe: %.2fbar
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1307"/>
+        <location filename="../core/profile.c" line="1325"/>
         <source>MOD: %d%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1314"/>
+        <location filename="../core/profile.c" line="1332"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1318"/>
+        <location filename="../core/profile.c" line="1336"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1331"/>
+        <location filename="../core/profile.c" line="1349"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1334"/>
+        <location filename="../core/profile.c" line="1352"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1339"/>
+        <location filename="../core/profile.c" line="1357"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1342"/>
+        <location filename="../core/profile.c" line="1360"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1346"/>
+        <location filename="../core/profile.c" line="1364"/>
         <source>In deco
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1348"/>
+        <location filename="../core/profile.c" line="1366"/>
         <source>NDL: %umin
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1351"/>
+        <location filename="../core/profile.c" line="1369"/>
         <source>TTS: %umin
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1354"/>
+        <location filename="../core/profile.c" line="1372"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1362"/>
+        <location filename="../core/profile.c" line="1380"/>
         <source>In deco (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1365"/>
+        <location filename="../core/profile.c" line="1383"/>
         <source>NDL: %umin (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1367"/>
+        <location filename="../core/profile.c" line="1385"/>
         <source>NDL: &gt;2h (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1371"/>
+        <location filename="../core/profile.c" line="1389"/>
         <source>TTS: %umin (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1373"/>
+        <location filename="../core/profile.c" line="1391"/>
         <source>TTS: &gt;2h (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1376"/>
+        <location filename="../core/profile.c" line="1394"/>
         <source>RBT: %umin
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1379"/>
+        <location filename="../core/profile.c" line="1397"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1385"/>
+        <location filename="../core/profile.c" line="1403"/>
         <source>Tissue %.0fmin: %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1391"/>
+        <location filename="../core/profile.c" line="1409"/>
         <source>heartbeat: %d
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1393"/>
+        <location filename="../core/profile.c" line="1411"/>
         <source>bearing: %d
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1396"/>
+        <location filename="../core/profile.c" line="1414"/>
         <source>mean depth to here %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1491"/>
+        <location filename="../core/profile.c" line="1515"/>
         <source>%sT: %d:%02d min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1495"/>
-        <location filename="../core/profile.c" line="1499"/>
-        <location filename="../core/profile.c" line="1503"/>
+        <location filename="../core/profile.c" line="1519"/>
+        <location filename="../core/profile.c" line="1523"/>
+        <location filename="../core/profile.c" line="1527"/>
         <source>%s %sD:%.1f%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1507"/>
+        <location filename="../core/profile.c" line="1531"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1511"/>
+        <location filename="../core/profile.c" line="1535"/>
         <source>%s%sV:%.2f%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1515"/>
-        <location filename="../core/profile.c" line="1519"/>
+        <location filename="../core/profile.c" line="1539"/>
+        <location filename="../core/profile.c" line="1543"/>
         <source>%s %sV:%.2f%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1526"/>
+        <location filename="../core/profile.c" line="1550"/>
         <source>%s %sP:%d %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../core/profile.c" line="1575"/>
+        <source>%s SAC:%.*f %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../core/qthelper.cpp" line="67"/>
         <source>%1km</source>
         <translation type="unfinished"/>
@@ -9538,446 +9981,460 @@ EADD: %d%s
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="635"/>
+        <location filename="../core/qthelper.cpp" line="91"/>
+        <location filename="../core/qthelper.cpp" line="226"/>
+        <source>N</source>
+        <translation>N</translation>
+    </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="91"/>
+        <location filename="../core/qthelper.cpp" line="227"/>
+        <source>S</source>
+        <translation>S</translation>
+    </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="92"/>
+        <location filename="../core/qthelper.cpp" line="228"/>
+        <source>E</source>
+        <translation>E</translation>
+    </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="92"/>
+        <location filename="../core/qthelper.cpp" line="229"/>
+        <source>W</source>
+        <translation>W</translation>
+    </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="640"/>
         <source>C</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="638"/>
+        <location filename="../core/qthelper.cpp" line="643"/>
         <source>F</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/dive.c" line="23"/>
-        <source>boat</source>
-        <translation>thuyền</translation>
+        <location filename="../core/save-html.c" line="469"/>
+        <location filename="../core/save-html.c" line="553"/>
+        <location filename="../core/worldmap-save.c" line="111"/>
+        <source>Can&apos;t open file %s</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/dive.c" line="23"/>
-        <source>shore</source>
-        <translation>bờ biển</translation>
+        <location filename="../core/save-html.c" line="488"/>
+        <source>Number</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="459"/>
-        <location filename="../core/dive.c" line="23"/>
-        <source>drift</source>
-        <translation>độ trôi</translation>
+        <location filename="../core/save-html.c" line="489"/>
+        <source>Date</source>
+        <translation>Ngày tháng</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="24"/>
-        <source>deep</source>
-        <translation>sâu</translation>
+        <location filename="../core/save-html.c" line="490"/>
+        <source>Time</source>
+        <translation>Thời gian</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="24"/>
-        <source>cavern</source>
-        <translation>hang lớn</translation>
+        <location filename="../core/save-html.c" line="491"/>
+        <source>Location</source>
+        <translation>Địa điểm</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="443"/>
-        <location filename="../core/dive.c" line="24"/>
-        <source>ice</source>
-        <translation>băng</translation>
+        <location filename="../core/save-html.c" line="492"/>
+        <source>Air temp.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="445"/>
-        <source>search</source>
+        <location filename="../core/save-html.c" line="493"/>
+        <source>Water temp.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="455"/>
-        <location filename="../core/dive.c" line="25"/>
-        <source>wreck</source>
-        <translation>vật trôi dạt</translation>
+        <location filename="../core/save-html.c" line="494"/>
+        <source>Dives</source>
+        <translation>Lần lặn</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="441"/>
-        <location filename="../core/dive.c" line="25"/>
-        <source>cave</source>
-        <translation>hang động</translation>
+        <location filename="../core/save-html.c" line="495"/>
+        <source>Expand all</source>
+        <translation>Mở rộng tất cả</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="25"/>
-        <source>altitude</source>
-        <translation>độ cao so với mặt biển</translation>
+        <location filename="../core/save-html.c" line="496"/>
+        <source>Collapse all</source>
+        <translation>Mở ra tất cả</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="26"/>
-        <source>pool</source>
-        <translation>ao</translation>
+        <location filename="../core/save-html.c" line="497"/>
+        <source>Trips</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/dive.c" line="26"/>
-        <source>lake</source>
-        <translation>hồ</translation>
+        <location filename="../core/save-html.c" line="498"/>
+        <source>Statistics</source>
+        <translation>Thống kê</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="457"/>
-        <location filename="../core/dive.c" line="26"/>
-        <source>river</source>
-        <translation>sông</translation>
+        <location filename="../core/save-html.c" line="499"/>
+        <source>Advanced search</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="439"/>
-        <location filename="../core/dive.c" line="27"/>
-        <source>night</source>
-        <translation>ban đêm</translation>
+        <location filename="../core/save-html.c" line="502"/>
+        <source>Rating</source>
+        <translation>Xếp hạng</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="153"/>
-        <source>Error: the file does not appear to be a DATATRAK divelog</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="503"/>
+        <source>Visibility</source>
+        <translation>Tầm nhìn</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="286"/>
-        <source>clear</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="504"/>
+        <source>Duration</source>
+        <translation>Độ dài</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="289"/>
-        <source>misty</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="505"/>
+        <source>Divemaster</source>
+        <translation>Người lặn giỏi nhất</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="292"/>
-        <source>fog</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="506"/>
+        <source>Buddy</source>
+        <translation>Bạn</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="295"/>
-        <source>rain</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="507"/>
+        <source>Suit</source>
+        <translation>Đồ lặn</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="298"/>
-        <source>storm</source>
+        <location filename="../core/save-html.c" line="508"/>
+        <source>Tags</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="301"/>
-        <source>snow</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="509"/>
+        <location filename="../smtk-import/smartrak.c" line="251"/>
+        <location filename="../smtk-import/smartrak.c" line="321"/>
+        <source>Notes</source>
+        <translation>Ghi chú</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="321"/>
-        <source>No suit</source>
+        <location filename="../core/save-html.c" line="510"/>
+        <source>Show more details</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="324"/>
-        <source>Shorty</source>
+        <location filename="../core/save-html.c" line="513"/>
+        <source>Yearly statistics</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="327"/>
-        <source>Combi</source>
-        <translation type="unfinished"/>
+        <location filename="../core/save-html.c" line="514"/>
+        <source>Year</source>
+        <translation>Năm</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="330"/>
-        <source>Wet suit</source>
+        <location filename="../core/save-html.c" line="515"/>
+        <source>Total time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="333"/>
-        <source>Semidry suit</source>
+        <location filename="../core/save-html.c" line="516"/>
+        <source>Average time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="336"/>
-        <source>Dry suit</source>
+        <location filename="../core/save-html.c" line="517"/>
+        <source>Shortest time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="396"/>
-        <source>no stop</source>
+        <location filename="../core/save-html.c" line="518"/>
+        <source>Longest time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="400"/>
-        <source>single ascent</source>
+        <location filename="../core/save-html.c" line="519"/>
+        <source>Average depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="402"/>
-        <source>multiple ascent</source>
+        <location filename="../core/save-html.c" line="520"/>
+        <source>Min. depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="404"/>
-        <location filename="../core/dive.c" line="27"/>
-        <source>fresh</source>
+        <location filename="../core/save-html.c" line="521"/>
+        <source>Max. depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="406"/>
-        <source>salt water</source>
+        <location filename="../core/save-html.c" line="522"/>
+        <source>Average SAC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="431"/>
-        <source>sight seeing</source>
+        <location filename="../core/save-html.c" line="523"/>
+        <source>Min. SAC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="433"/>
-        <source>club dive</source>
+        <location filename="../core/save-html.c" line="524"/>
+        <source>Max. SAC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="437"/>
-        <source>instruction</source>
+        <location filename="../core/save-html.c" line="525"/>
+        <source>Average temp.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="463"/>
-        <source>other</source>
+        <location filename="../core/save-html.c" line="526"/>
+        <source>Min. temp.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="474"/>
-        <source>Other activities</source>
+        <location filename="../core/save-html.c" line="527"/>
+        <source>Max. temp.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="498"/>
-        <source>Datatrak/Wlog notes</source>
+        <location filename="../core/save-html.c" line="528"/>
+        <source>Back to list</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="537"/>
-        <source>Manually entered dive</source>
+        <location filename="../core/save-html.c" line="531"/>
+        <source>Dive No.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="588"/>
-        <source>Unknown</source>
+        <location filename="../core/save-html.c" line="532"/>
+        <source>Dive profile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="674"/>
-        <source>Error: couldn&apos;t open the file %s</source>
+        <location filename="../core/save-html.c" line="533"/>
+        <source>Dive information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="687"/>
-        <source>Error: no dive</source>
+        <location filename="../core/save-html.c" line="534"/>
+        <source>Dive equipment</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/dive.c" line="27"/>
-        <source>student</source>
+        <location filename="../core/save-html.c" line="535"/>
+        <location filename="../core/save-html.c" line="542"/>
+        <source>Type</source>
+        <translation>Loại</translation>
+    </message>
+    <message>
+        <location filename="../core/save-html.c" line="536"/>
+        <source>Size</source>
+        <translation>Kích thước</translation>
+    </message>
+    <message>
+        <location filename="../core/save-html.c" line="537"/>
+        <source>Work pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="461"/>
-        <location filename="../core/dive.c" line="28"/>
-        <source>photo</source>
-        <translation>hình ảnh</translation>
+        <location filename="../core/save-html.c" line="538"/>
+        <source>Start pressure</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/dive.c" line="28"/>
-        <source>video</source>
-        <translation>video</translation>
+        <location filename="../core/save-html.c" line="539"/>
+        <source>End pressure</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="435"/>
-        <location filename="../core/dive.c" line="28"/>
-        <source>instructor</source>
+        <location filename="../core/save-html.c" line="540"/>
+        <source>Gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="398"/>
-        <location filename="../core/dive.c" line="29"/>
-        <source>deco</source>
-        <translation>deco</translation>
+        <location filename="../core/save-html.c" line="541"/>
+        <source>Weight</source>
+        <translation>Cân nặng</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="33"/>
-        <source>OC-gas</source>
+        <location filename="../core/save-html.c" line="543"/>
+        <source>Events</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/dive.c" line="33"/>
-        <source>diluent</source>
+        <location filename="../core/save-html.c" line="544"/>
+        <source>Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/dive.c" line="33"/>
-        <location filename="../core/equipment.c" line="88"/>
-        <location filename="../core/planner.c" line="1415"/>
-        <location filename="../core/planner.c" line="1418"/>
-        <source>oxygen</source>
+        <location filename="../core/save-html.c" line="545"/>
+        <source>Value</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/dive.c" line="227"/>
-        <source>ℓ</source>
+        <location filename="../core/save-html.c" line="546"/>
+        <source>Coordinates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/save-html.c" line="547"/>
+        <source>Dive status</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="239"/>
+        <location filename="../core/statistics.c" line="242"/>
         <source>more than %d days</source>
         <translation>đã hơn %d ngày</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="246"/>
+        <location filename="../core/statistics.c" line="249"/>
         <source>%dd %dh %dmin</source>
         <translation>%dd %dh %dmin</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="249"/>
+        <location filename="../core/statistics.c" line="252"/>
         <source>%dmin %dsecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="251"/>
+        <location filename="../core/statistics.c" line="254"/>
         <source>%dh %dmin</source>
         <translation>%dh %dmin</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="263"/>
+        <location filename="../core/statistics.c" line="266"/>
         <source>for dives #</source>
         <translation>cho các lần lặn #</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="269"/>
+        <location filename="../core/statistics.c" line="272"/>
         <source>for selected dives</source>
         <translation>cho các lần lặn được chọn</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="304"/>
+        <location filename="../core/statistics.c" line="307"/>
         <source>for dive #%d</source>
         <translation>cho lần lặn #%d</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="306"/>
+        <location filename="../core/statistics.c" line="309"/>
         <source>for selected dive</source>
         <translation>cho lần lặn được chọn</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="308"/>
+        <location filename="../core/statistics.c" line="311"/>
         <source>for all dives</source>
         <translation>cho mọi lần lặn</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="310"/>
+        <location filename="../core/statistics.c" line="313"/>
         <source>(no dives)</source>
         <translation>(không có cuộc lặn nào)</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Sun</source>
         <translation>CN</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Mon</source>
         <translation>T2</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Tue</source>
         <translation>T3</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Wed</source>
         <translation>T4</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Thu</source>
         <translation>T5</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Fri</source>
         <translation>T6</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Sat</source>
         <translation>T7</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Jan</source>
         <translation>Th1</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Feb</source>
         <translation>Th2</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Mar</source>
         <translation>Th3</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Apr</source>
         <translation>Apr</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>May</source>
         <translation>Th5</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Jun</source>
         <translation>Th6</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Jul</source>
         <translation>Th7</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Aug</source>
         <translation>Th8</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Sep</source>
         <translation>Th9</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Oct</source>
         <translation>Th10</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Nov</source>
         <translation>Th11</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Dec</source>
         <translation>Th12</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="191"/>
-        <location filename="../core/parse-xml.c" line="3284"/>
-        <location filename="../core/uemis-downloader.c" line="134"/>
-        <source>unknown</source>
-        <translation>chưa rõ</translation>
-    </message>
-    <message>
-        <location filename="../core/uemis-downloader.c" line="467"/>
-        <source>data</source>
-        <translation>dữ liệu</translation>
-    </message>
-    <message>
-        <location filename="../core/uemis-downloader.c" line="447"/>
-        <source>%s %s</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../core/uemis-downloader.c" line="27"/>
         <source>Uemis Zurich: the file system is almost full.
 Disconnect/reconnect the dive computer
@@ -10003,6 +10460,16 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../core/uemis-downloader.c" line="447"/>
+        <source>%s %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/uemis-downloader.c" line="467"/>
+        <source>data</source>
+        <translation>dữ liệu</translation>
+    </message>
+    <message>
         <location filename="../core/uemis-downloader.c" line="495"/>
         <source>divelog #</source>
         <translation type="unfinished"/>
@@ -10173,281 +10640,6 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="469"/>
-        <location filename="../core/save-html.c" line="553"/>
-        <location filename="../core/worldmap-save.c" line="111"/>
-        <source>Can&apos;t open file %s</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="488"/>
-        <source>Number</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="489"/>
-        <source>Date</source>
-        <translation>Ngày tháng</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="490"/>
-        <source>Time</source>
-        <translation>Thời gian</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="491"/>
-        <source>Location</source>
-        <translation>Địa điểm</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="492"/>
-        <source>Air temp.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="493"/>
-        <source>Water temp.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="498"/>
-        <source>Statistics</source>
-        <translation>Thống kê</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="502"/>
-        <source>Rating</source>
-        <translation>Xếp hạng</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="503"/>
-        <source>Visibility</source>
-        <translation>Tầm nhìn</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="504"/>
-        <source>Duration</source>
-        <translation>Độ dài</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="494"/>
-        <source>Dives</source>
-        <translation>Lần lặn</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="495"/>
-        <source>Expand all</source>
-        <translation>Mở rộng tất cả</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="496"/>
-        <source>Collapse all</source>
-        <translation>Mở ra tất cả</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="497"/>
-        <source>Trips</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="499"/>
-        <source>Advanced search</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="505"/>
-        <source>Divemaster</source>
-        <translation>Người lặn giỏi nhất</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="506"/>
-        <source>Buddy</source>
-        <translation>Bạn</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="507"/>
-        <source>Suit</source>
-        <translation>Đồ lặn</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="508"/>
-        <source>Tags</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="509"/>
-        <location filename="../smtk-import/smartrak.c" line="251"/>
-        <location filename="../smtk-import/smartrak.c" line="321"/>
-        <source>Notes</source>
-        <translation>Ghi chú</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="510"/>
-        <source>Show more details</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="513"/>
-        <source>Yearly statistics</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="514"/>
-        <source>Year</source>
-        <translation>Năm</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="515"/>
-        <source>Total time</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="516"/>
-        <source>Average time</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="517"/>
-        <source>Shortest time</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="518"/>
-        <source>Longest time</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="519"/>
-        <source>Average depth</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="520"/>
-        <source>Min. depth</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="521"/>
-        <source>Max. depth</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="523"/>
-        <source>Min. SAC</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="524"/>
-        <source>Max. SAC</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="525"/>
-        <source>Average temp.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="526"/>
-        <source>Min. temp.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="527"/>
-        <source>Max. temp.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="528"/>
-        <source>Back to list</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="534"/>
-        <source>Dive equipment</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="537"/>
-        <source>Work pressure</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="538"/>
-        <source>Start pressure</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="539"/>
-        <source>End pressure</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="547"/>
-        <source>Dive status</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="522"/>
-        <source>Average SAC</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="531"/>
-        <source>Dive No.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="532"/>
-        <source>Dive profile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="533"/>
-        <source>Dive information</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="535"/>
-        <location filename="../core/save-html.c" line="542"/>
-        <source>Type</source>
-        <translation>Loại</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="536"/>
-        <source>Size</source>
-        <translation>Kích thước</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="540"/>
-        <source>Gas</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="541"/>
-        <source>Weight</source>
-        <translation>Cân nặng</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="543"/>
-        <source>Events</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="544"/>
-        <source>Name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="545"/>
-        <source>Value</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="546"/>
-        <source>Coordinates</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../core/worldmap-save.c" line="39"/>
         <source>Date:</source>
         <translation>Ngày tháng:</translation>
@@ -10493,109 +10685,6 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="91"/>
-        <location filename="../core/qthelper.cpp" line="226"/>
-        <source>N</source>
-        <translation>N</translation>
-    </message>
-    <message>
-        <location filename="../core/qthelper.cpp" line="91"/>
-        <location filename="../core/qthelper.cpp" line="227"/>
-        <source>S</source>
-        <translation>S</translation>
-    </message>
-    <message>
-        <location filename="../core/qthelper.cpp" line="92"/>
-        <location filename="../core/qthelper.cpp" line="228"/>
-        <source>E</source>
-        <translation>E</translation>
-    </message>
-    <message>
-        <location filename="../core/qthelper.cpp" line="92"/>
-        <location filename="../core/qthelper.cpp" line="229"/>
-        <source>W</source>
-        <translation>W</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="341"/>
-        <source>Remote storage and local data diverged. Error: merge failed (%s)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="134"/>
-        <source>Local cache directory %s corrupted - can&apos;t sync with Subsurface cloud storage</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="157"/>
-        <location filename="../core/git-access.c" line="177"/>
-        <source>Could not update local cache to newer remote data</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="170"/>
-        <source>Subsurface cloud storage corrupted</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="285"/>
-        <source>Could not update Subsurface cloud storage, try again later</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="371"/>
-        <source>Remote storage and local data diverged. Cannot combine local and remote changes</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="405"/>
-        <source>Remote storage and local data diverged</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="408"/>
-        <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="417"/>
-        <source>Problems with local cache of Subsurface cloud data</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="418"/>
-        <source>Moved cache data to %s. Please try the operation again.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="737"/>
-        <source>Error connecting to Subsurface cloud storage</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="740"/>
-        <source>git clone of %s failed (%s)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/load-git.c" line="222"/>
-        <location filename="../core/parse-xml.c" line="1300"/>
-        <source>additional name for site: %s
-</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/ostctools.c" line="120"/>
-        <location filename="../core/ostctools.c" line="152"/>
-        <source>Unknown DC in dive %d</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/ostctools.c" line="165"/>
-        <source>Error - %s - parsing dive %d</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../smtk-import/smartrak.c" line="247"/>
         <source>Built</source>
         <translation type="unfinished"/>
@@ -10679,155 +10768,120 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="91"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="103"/>
         <source>Subsurface</source>
         <translation>Subsurface</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="97"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="110"/>
         <source>Dive list</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="112"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="125"/>
         <source>Cloud credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="126"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="139"/>
         <source>Manage dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="138"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="141"/>
         <source>Add dive manually</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="146"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="149"/>
         <source>Manual sync with cloud</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="164"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="167"/>
         <source>Offline mode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="164"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="167"/>
         <source>Enable auto cloud sync</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="182"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="187"/>
         <source>GPS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="185"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="190"/>
         <source>GPS-tag dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="192"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="197"/>
         <source>Upload GPS data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="199"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="204"/>
         <source>Download GPS data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="206"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="211"/>
         <source>Show GPS fixes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="215"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="220"/>
         <source>Clear GPS cache</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="221"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="226"/>
         <source>Preferences</source>
         <translation>Tùy biến</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="230"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="237"/>
         <source>Developer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="232"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="239"/>
         <source>App log</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="239"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="246"/>
         <source>Theme information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="246"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="253"/>
         <source>User manual</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="252"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="259"/>
         <source>About</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="283"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="304"/>
         <source>Run location service</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="283"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="304"/>
         <source>No GPS source available</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="295"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="316"/>
         <source>Actions</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="9"/>
-        <source>Hello World</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="13"/>
-        <source>File</source>
-        <translation>Tập tin</translation>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="15"/>
-        <source>&amp;Open</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="19"/>
-        <source>Exit</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="27"/>
-        <source>Button 1 pressed</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="28"/>
-        <source>Button 2 pressed</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="33"/>
-        <source>May I have your attention, please?</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>plannerDetails</name>
@@ -10901,6 +10955,24 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="121"/>
+        <location filename="../build/ui_plannerSettings.h" line="425"/>
+        <source>75% to 50% avg. depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="138"/>
+        <location filename="../build/ui_plannerSettings.h" line="427"/>
+        <source>50% avg. depth to 6m</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="155"/>
+        <location filename="../build/ui_plannerSettings.h" line="429"/>
+        <source>6m to surface</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="175"/>
         <location filename="../build/ui_plannerSettings.h" line="431"/>
         <source>Descent</source>
@@ -10924,12 +10996,35 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="268"/>
+        <source>Bühlmann deco</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="278"/>
         <location filename="../build/ui_plannerSettings.h" line="445"/>
         <source>Reserve gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="288"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="549"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="578"/>
+        <location filename="../build/ui_plannerSettings.h" line="446"/>
+        <location filename="../build/ui_plannerSettings.h" line="459"/>
+        <location filename="../build/ui_plannerSettings.h" line="461"/>
+        <source>bar</source>
+        <translation>bar</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="307"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="416"/>
+        <location filename="../build/ui_plannerSettings.h" line="437"/>
+        <location filename="../build/ui_plannerSettings.h" line="440"/>
+        <source>%</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="320"/>
         <location filename="../build/ui_plannerSettings.h" line="449"/>
         <source>Postpone gas change if a stop is not required</source>
@@ -10948,11 +11043,9 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="307"/>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="416"/>
-        <location filename="../build/ui_plannerSettings.h" line="437"/>
-        <location filename="../build/ui_plannerSettings.h" line="440"/>
-        <source>%</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="353"/>
+        <location filename="../build/ui_plannerSettings.h" line="436"/>
+        <source>Plan backgas breaks</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -10962,10 +11055,10 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="429"/>
-        <location filename="../build/ui_plannerSettings.h" line="441"/>
-        <source>Drop to first depth</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="370"/>
+        <location filename="../build/ui_plannerSettings.h" line="453"/>
+        <source>min</source>
+        <translation>nhỏ nhất</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="389"/>
@@ -10974,162 +11067,138 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="353"/>
-        <location filename="../build/ui_plannerSettings.h" line="436"/>
-        <source>Plan backgas breaks</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="396"/>
+        <source>Maximize bottom time allowed by gas and no decompression limits</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="515"/>
-        <location filename="../build/ui_plannerSettings.h" line="455"/>
-        <source>Gas options</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="399"/>
+        <location filename="../build/ui_plannerSettings.h" line="443"/>
+        <source>Recreational mode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="594"/>
-        <location filename="../build/ui_plannerSettings.h" line="456"/>
-        <source>Bottom SAC</source>
-        <translation>SAC</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="692"/>
-        <location filename="../build/ui_plannerSettings.h" line="457"/>
-        <source>Deco SAC</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="429"/>
+        <location filename="../build/ui_plannerSettings.h" line="441"/>
+        <source>Drop to first depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="601"/>
-        <location filename="../build/ui_plannerSettings.h" line="458"/>
-        <source>Bottom pO₂</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="436"/>
+        <location filename="../build/ui_plannerSettings.h" line="452"/>
+        <source>Min. switch duration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="685"/>
-        <location filename="../build/ui_plannerSettings.h" line="460"/>
-        <source>Deco pO₂</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="459"/>
+        <location filename="../build/ui_plannerSettings.h" line="444"/>
+        <source>Safety stop</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="565"/>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="672"/>
-        <location filename="../build/ui_plannerSettings.h" line="462"/>
-        <location filename="../build/ui_plannerSettings.h" line="463"/>
-        <source>ℓ/min</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="495"/>
+        <source>Conservatism level</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="632"/>
-        <location filename="../build/ui_plannerSettings.h" line="468"/>
-        <source>Display runtime</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="515"/>
+        <location filename="../build/ui_plannerSettings.h" line="455"/>
+        <source>Gas options</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="645"/>
-        <location filename="../build/ui_plannerSettings.h" line="472"/>
-        <source>Display segment duration</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="565"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="698"/>
+        <location filename="../build/ui_plannerSettings.h" line="462"/>
+        <location filename="../build/ui_plannerSettings.h" line="463"/>
+        <source>ℓ/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="655"/>
-        <location filename="../build/ui_plannerSettings.h" line="476"/>
-        <source>Display transitions in deco</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="594"/>
+        <source>m</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="662"/>
-        <location filename="../build/ui_plannerSettings.h" line="477"/>
-        <source>Verbatim dive plan</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="606"/>
+        <source>Used to calculate best mix. Select best mix depth in &apos;Available gases&apos; table by entering gas depth, followed by &quot;B&quot; (best trimix mix) or &quot;BN&quot; (best nitrox mix)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="288"/>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="549"/>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="578"/>
-        <location filename="../build/ui_plannerSettings.h" line="446"/>
-        <location filename="../build/ui_plannerSettings.h" line="459"/>
-        <location filename="../build/ui_plannerSettings.h" line="461"/>
-        <source>bar</source>
-        <translation>bar</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="613"/>
+        <location filename="../build/ui_plannerSettings.h" line="456"/>
+        <source>Bottom SAC</source>
+        <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="121"/>
-        <location filename="../build/ui_plannerSettings.h" line="425"/>
-        <source>75% to 50% avg. depth</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="620"/>
+        <location filename="../build/ui_plannerSettings.h" line="458"/>
+        <source>Bottom pO₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="138"/>
-        <location filename="../build/ui_plannerSettings.h" line="427"/>
-        <source>50% avg. depth to 6m</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="627"/>
+        <source>Best mix END</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="155"/>
-        <location filename="../build/ui_plannerSettings.h" line="429"/>
-        <source>6m to surface</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="634"/>
+        <location filename="../build/ui_plannerSettings.h" line="464"/>
+        <source>Notes</source>
+        <translation>Ghi chú</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="268"/>
-        <source>Bühlmann deco</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="655"/>
+        <location filename="../build/ui_plannerSettings.h" line="466"/>
+        <source>In dive plan, show runtime (absolute time) of stops</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="370"/>
-        <location filename="../build/ui_plannerSettings.h" line="453"/>
-        <source>min</source>
-        <translation>nhỏ nhất</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="396"/>
-        <source>Maximize bottom time allowed by gas and no decompression limits</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="658"/>
+        <location filename="../build/ui_plannerSettings.h" line="468"/>
+        <source>Display runtime</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="399"/>
-        <location filename="../build/ui_plannerSettings.h" line="443"/>
-        <source>Recreational mode</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="668"/>
+        <location filename="../build/ui_plannerSettings.h" line="470"/>
+        <source>In dive plan, show duration (relative time) of stops</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="436"/>
-        <location filename="../build/ui_plannerSettings.h" line="452"/>
-        <source>Min. switch duration</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="671"/>
+        <location filename="../build/ui_plannerSettings.h" line="472"/>
+        <source>Display segment duration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="459"/>
-        <location filename="../build/ui_plannerSettings.h" line="444"/>
-        <source>Safety stop</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="678"/>
+        <location filename="../build/ui_plannerSettings.h" line="474"/>
+        <source>In diveplan, list transitions or treat them as implicit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="495"/>
-        <source>Conservatism level</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="681"/>
+        <location filename="../build/ui_plannerSettings.h" line="476"/>
+        <source>Display transitions in deco</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="608"/>
-        <location filename="../build/ui_plannerSettings.h" line="464"/>
-        <source>Notes</source>
-        <translation>Ghi chú</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="629"/>
-        <location filename="../build/ui_plannerSettings.h" line="466"/>
-        <source>In dive plan, show runtime (absolute time) of stops</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="688"/>
+        <location filename="../build/ui_plannerSettings.h" line="477"/>
+        <source>Verbatim dive plan</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="642"/>
-        <location filename="../build/ui_plannerSettings.h" line="470"/>
-        <source>In dive plan, show duration (relative time) of stops</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="711"/>
+        <location filename="../build/ui_plannerSettings.h" line="460"/>
+        <source>Deco pO₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="652"/>
-        <location filename="../build/ui_plannerSettings.h" line="474"/>
-        <source>In diveplan, list transitions or treat them as implicit</source>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="718"/>
+        <location filename="../build/ui_plannerSettings.h" line="457"/>
+        <source>Deco SAC</source>
         <translation type="unfinished"/>
     </message>
 </context>
diff --git a/translations/subsurface_zh_TW.ts b/translations/subsurface_zh_TW.ts
index 915b394dc..ad291aeb3 100644
--- a/translations/subsurface_zh_TW.ts
+++ b/translations/subsurface_zh_TW.ts
@@ -105,6 +105,11 @@
         <translation>名稱: </translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="56"/>
+        <source>Could not initialize Winsock version 2.2</source>
+        <translation>Winsock 2.2 無法成功初始化</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="134"/>
         <source>Trying to turn on the local Bluetooth device...</source>
         <translation>嘗試開啟本地端藍芽裝置...</translation>
@@ -115,6 +120,11 @@
         <translation>嘗試關閉本地端藍芽裝置...</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="167"/>
+        <source>Remote devices list was cleared.</source>
+        <translation>遠端裝置表單被清除. </translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="183"/>
         <source>Scanning for remote devices...</source>
         <translation>掃描遠端裝置...</translation>
@@ -125,6 +135,22 @@
         <translation>掃描完成</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="208"/>
+        <source>The local Bluetooth device was %1.</source>
+        <extracomment>%1 will be replaced with &quot;turned on&quot; or &quot;turned off&quot;</extracomment>
+        <translation>%1 是本地端藍芽裝置. </translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
+        <source>turned on</source>
+        <translation>開啟</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
+        <source>turned off</source>
+        <translation>關閉</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="225"/>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="339"/>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="359"/>
@@ -172,37 +198,6 @@
         <translation>配對</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="352"/>
-        <source>Device %1 was paired and is authorized.</source>
-        <translation>裝置 %1 已配對且授權成功. </translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="56"/>
-        <source>Could not initialize Winsock version 2.2</source>
-        <translation>Winsock 2.2 無法成功初始化</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="167"/>
-        <source>Remote devices list was cleared.</source>
-        <translation>遠端裝置表單被清除. </translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="208"/>
-        <source>The local Bluetooth device was %1.</source>
-        <extracomment>%1 will be replaced with &quot;turned on&quot; or &quot;turned off&quot;</extracomment>
-        <translation>%1 是本地端藍芽裝置. </translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
-        <source>turned on</source>
-        <translation>開啟</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
-        <source>turned off</source>
-        <translation>關閉</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="307"/>
         <source>Remove pairing</source>
         <translation>移除配對</translation>
@@ -228,6 +223,11 @@
         <translation>裝置 %1 已配對. </translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="352"/>
+        <source>Device %1 was paired and is authorized.</source>
+        <translation>裝置 %1 已配對且授權成功. </translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="378"/>
         <source>The device %1 can now be used for connection. You can press the Save button.</source>
         <translation>裝置 %1 現在已可接受連線. 可按下儲存按鈕繼續. </translation>
@@ -286,12 +286,12 @@
 <context>
     <name>BuddyFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="621"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="619"/>
         <source>Person: </source>
         <translation>人名: </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="622"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="620"/>
         <source>Searches for buddies and divemasters</source>
         <translation>搜尋潛伴與潛導</translation>
     </message>
@@ -299,7 +299,7 @@
 <context>
     <name>BuddyFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="243"/>
+        <location filename="../qt-models/filtermodels.cpp" line="248"/>
         <source>No buddies</source>
         <translation>無潛伴</translation>
     </message>
@@ -307,25 +307,30 @@
 <context>
     <name>CloudCredentials</name>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="49"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="50"/>
         <source>Cloud credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="55"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="56"/>
         <source>Email</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="67"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="68"/>
         <source>Password</source>
         <translation>密碼</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="90"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="92"/>
         <source>Show password</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="97"/>
+        <source>PIN</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>ColumnNameProvider</name>
@@ -381,6 +386,16 @@
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
+        <source>Max. depth</source>
+        <translation>最大深度</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
+        <source>Avg. depth</source>
+        <translation>平均深度</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
         <source>Divemaster</source>
         <translation>潛導</translation>
     </message>
@@ -391,6 +406,11 @@
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
+        <source>Suit</source>
+        <translation>防寒衣</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
         <source>Notes</source>
         <translation>記錄</translation>
     </message>
@@ -410,21 +430,6 @@
         <translation>水溫</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
-        <source>Max. depth</source>
-        <translation>最大深度</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
-        <source>Avg. depth</source>
-        <translation>平均深度</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
-        <source>Suit</source>
-        <translation>防寒衣</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="44"/>
         <source>O₂</source>
         <translation>O₂</translation>
@@ -538,7 +543,7 @@
         <translation>無法建立 libdivecomputer 上下文</translation>
     </message>
     <message>
-        <location filename="../core/configuredivecomputer.cpp" line="660"/>
+        <location filename="../core/configuredivecomputer.cpp" line="656"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation>無法與潛水電腦建立連線</translation>
     </message>
@@ -558,11 +563,19 @@
         <translation>裝置或連接處</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="170"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1520"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1533"/>
-        <source>...</source>
-        <translation>...</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="47"/>
+        <source>Connect via Bluetooth</source>
+        <translation>透過藍芽連接</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="54"/>
+        <source>Connect</source>
+        <translation>連接</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="64"/>
+        <source>Disconnect</source>
+        <translation>中斷</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="80"/>
@@ -571,12 +584,24 @@
         <translation>回復可用資料</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="90"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1523"/>
+        <source>Read settings from backup file or from device before writing to the device</source>
+        <translation>自備份檔案，或還未的寫入裝置，讀取設定</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="93"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1525"/>
         <source>Save changes to device</source>
         <translation>儲存變更部分至裝置</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="116"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1527"/>
+        <source>Read settings from backup file or from device before writing to a backup file</source>
+        <translation>自備份檔案，或還未寫入備份檔案的裝置，讀取設定</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="119"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1529"/>
         <source>Backup</source>
@@ -595,15 +620,40 @@
         <translation>更新韌體</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="163"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1532"/>
+        <source>Save libdivecomputer logfile</source>
+        <translation>儲存 libdivecomputer 日誌檔案</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="170"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1520"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1533"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="177"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1534"/>
         <source>Cancel</source>
         <translation>取消</translation>
     </message>
     <message>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1539"/>
-        <source>OSTC 3</source>
-        <translation>OSTC 3</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="214"/>
+        <source>OSTC 3,Sport,Cr,2</source>
+        <translation>OSTC 3,Sport,Cr,2</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="223"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1541"/>
+        <source>Suunto Vyper family</source>
+        <translation>Suunto Vyper家族</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="232"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1543"/>
+        <source>OSTC, Mk.2/2N/2C</source>
+        <translation>OSTC, Mk.2/2N/2C</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="253"/>
@@ -616,40 +666,56 @@
         <translation>基本設定</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="326"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1656"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1943"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1546"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1726"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1766"/>
-        <source>Serial No.</source>
-        <translation>序號</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="260"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1575"/>
+        <source>Eco</source>
+        <translation>Eco</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="349"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1679"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1980"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1547"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1727"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1767"/>
-        <source>Firmware version</source>
-        <translation>韌體版本</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="265"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1576"/>
+        <source>Medium</source>
+        <translation>中</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="538"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1713"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1990"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1548"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1729"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1768"/>
-        <source>Custom text</source>
-        <translation>自訂文字格式</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="270"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1577"/>
+        <source>High</source>
+        <translation>高</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="385"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1549"/>
-        <source>Language</source>
-        <translation>語言</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="278"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="826"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="849"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="875"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="927"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="993"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1019"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1101"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1117"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1450"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2278"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2382"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2408"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2434"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2474"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2497"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1586"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1621"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1623"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1625"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1628"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1637"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1638"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1710"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1785"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1789"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1801"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1803"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1806"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1807"/>
+        <source>%</source>
+        <translation>%</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="289"/>
@@ -676,44 +742,36 @@
         <translation>Italian</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="579"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1557"/>
-        <source>Dive mode</source>
-        <translation>潛水模式</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="556"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1560"/>
-        <source>OC</source>
-        <translation>OC</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="561"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1561"/>
-        <source>CC</source>
-        <translation>CC</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="313"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1582"/>
+        <source>m/°C</source>
+        <translation>m/°C</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="566"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2336"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1562"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1793"/>
-        <source>Gauge</source>
-        <translation>Gauge</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="318"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1583"/>
+        <source>ft/°F</source>
+        <translation>ft/°F</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="571"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1563"/>
-        <source>Apnea</source>
-        <translation>Apnea</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="326"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1656"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1943"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1546"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1726"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1766"/>
+        <source>Serial No.</source>
+        <translation>序號</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="395"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2063"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1565"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1780"/>
-        <source>Date format</source>
-        <translation>日期格式</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="349"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1679"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1980"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1547"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1727"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1767"/>
+        <source>Firmware version</source>
+        <translation>韌體版本</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="360"/>
@@ -734,108 +792,147 @@
         <translation>YYMMDD</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1042"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2457"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1639"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1805"/>
-        <source>Saturation</source>
-        <translation>飽和</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="385"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1549"/>
+        <source>Language</source>
+        <translation>語言</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="278"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="826"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="849"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="875"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="927"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="993"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1019"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1101"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1117"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1450"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2278"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2382"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2408"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2434"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2474"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2497"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1586"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1621"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1623"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1625"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1628"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1637"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1638"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1710"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1785"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1789"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1801"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1803"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1806"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1807"/>
-        <source>%</source>
-        <translation>%</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="395"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2063"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1565"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1780"/>
+        <source>Date format</source>
+        <translation>日期格式</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="865"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2261"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1624"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1784"/>
-        <source>Desaturation</source>
-        <translation>未飽和</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="405"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1572"/>
+        <source>Brightness</source>
+        <translation>亮度</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="983"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2398"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1636"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1800"/>
-        <source>Last deco</source>
-        <translation>最後減壓</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="415"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1850"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1579"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1753"/>
+        <source>Units</source>
+        <translation>單位</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="711"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="736"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="758"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="904"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2181"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2206"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2228"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2307"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1626"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1786"/>
-        <source> m</source>
-        <translation>m</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="425"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1585"/>
+        <source>Salinity (0-5%)</source>
+        <translation>鹽度 (0-5%)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="405"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1572"/>
-        <source>Brightness</source>
-        <translation>亮度</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="438"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1615"/>
+        <source>Reset device to default settings</source>
+        <translation>重置裝置至原始設定</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="260"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1575"/>
-        <source>Eco</source>
-        <translation>Eco</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="452"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1590"/>
+        <source>230LSB/Gauss</source>
+        <translation>230LSB/Gauss</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="265"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1576"/>
-        <source>Medium</source>
-        <translation>中</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="457"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1591"/>
+        <source>330LSB/Gauss</source>
+        <translation>330LSB/Gauss</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="270"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1577"/>
-        <source>High</source>
-        <translation>高</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="462"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1592"/>
+        <source>390LSB/Gauss</source>
+        <translation>390LSB/Gauss</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="603"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2034"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1599"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1779"/>
-        <source>Sampling rate</source>
-        <translation>取樣速率</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="467"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1593"/>
+        <source>440LSB/Gauss</source>
+        <translation>440LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="472"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1594"/>
+        <source>660LSB/Gauss</source>
+        <translation>660LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="477"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1595"/>
+        <source>820LSB/Gauss</source>
+        <translation>820LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="482"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1596"/>
+        <source>1090LSB/Gauss</source>
+        <translation>1090LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="487"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1597"/>
+        <source>1370LSB/Gauss</source>
+        <translation>1370LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="521"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1587"/>
+        <source>Compass gain</source>
+        <translation>羅盤增益</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="531"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1799"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1745"/>
+        <source>Computer model</source>
+        <translation>電腦模型</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="538"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1713"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1990"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1548"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1729"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1768"/>
+        <source>Custom text</source>
+        <translation>自訂文字格式</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="556"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1560"/>
+        <source>OC</source>
+        <translation>OC</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="561"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1561"/>
+        <source>CC</source>
+        <translation>CC</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="566"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2336"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1562"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1793"/>
+        <source>Gauge</source>
+        <translation>Gauge</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="571"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1563"/>
+        <source>Apnea</source>
+        <translation>Apnea</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="579"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1557"/>
+        <source>Dive mode</source>
+        <translation>潛水模式</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="590"/>
@@ -852,30 +949,12 @@
         <translation>10s</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="415"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1850"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1579"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1753"/>
-        <source>Units</source>
-        <translation>單位</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="313"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1582"/>
-        <source>m/°C</source>
-        <translation>m/°C</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="318"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1583"/>
-        <source>ft/°F</source>
-        <translation>ft/°F</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="644"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1605"/>
-        <source>Dive mode color</source>
-        <translation>潛水模式顏色</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="603"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2034"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1599"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1779"/>
+        <source>Sampling rate</source>
+        <translation>取樣速率</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="614"/>
@@ -902,12 +981,6 @@
         <translation>藍色</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="425"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1585"/>
-        <source>Salinity (0-5%)</source>
-        <translation>鹽度 (0-5%)</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="637"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2092"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1613"/>
@@ -916,90 +989,80 @@
         <translation>同步潛水電腦時間</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="521"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1587"/>
-        <source>Compass gain</source>
-        <translation>羅盤增益</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="90"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1523"/>
-        <source>Read settings from backup file or from device before writing to the device</source>
-        <translation>自備份檔案，或還未的寫入裝置，讀取設定</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="116"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1527"/>
-        <source>Read settings from backup file or from device before writing to a backup file</source>
-        <translation>自備份檔案，或還未寫入備份檔案的裝置，讀取設定</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="232"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1543"/>
-        <source>OSTC, Mk.2/2N/2C</source>
-        <translation>OSTC, Mk.2/2N/2C</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="644"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1605"/>
+        <source>Dive mode color</source>
+        <translation>潛水模式顏色</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="452"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1590"/>
-        <source>230LSB/Gauss</source>
-        <translation>230LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="654"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2020"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1614"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1771"/>
+        <source>Show safety stop</source>
+        <translation>顯示安全停留</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="457"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1591"/>
-        <source>330LSB/Gauss</source>
-        <translation>330LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="661"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2145"/>
+        <source>End Depth</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="462"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1592"/>
-        <source>390LSB/Gauss</source>
-        <translation>390LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="671"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2162"/>
+        <source> s</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="467"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1593"/>
-        <source>440LSB/Gauss</source>
-        <translation>440LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="687"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1953"/>
+        <source>Length</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="472"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1594"/>
-        <source>660LSB/Gauss</source>
-        <translation>660LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="694"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2138"/>
+        <source>Start Depth</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="477"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1595"/>
-        <source>820LSB/Gauss</source>
-        <translation>820LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="701"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2152"/>
+        <source>Reset Depth</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="482"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1596"/>
-        <source>1090LSB/Gauss</source>
-        <translation>1090LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="711"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="736"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="758"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="904"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2181"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2206"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2228"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2307"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1626"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1786"/>
+        <source> m</source>
+        <translation>m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="487"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1597"/>
-        <source>1370LSB/Gauss</source>
-        <translation>1370LSB/Gauss</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="778"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2248"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1643"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1810"/>
+        <source>Advanced settings</source>
+        <translation>進階設定</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="654"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2020"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1614"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1771"/>
-        <source>Show safety stop</source>
-        <translation>顯示安全停留</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="784"/>
+        <source>Left button sensitivity</source>
+        <translation>左邊按鈕靈敏度</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="438"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1615"/>
-        <source>Reset device to default settings</source>
-        <translation>重置裝置至原始設定</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="791"/>
+        <source>Always show ppO2</source>
+        <translation>總是顯示 ppO2</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="798"/>
@@ -1010,20 +1073,6 @@
         <translation>可在水下選取Alt GF</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="223"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1541"/>
-        <source>Suunto Vyper family</source>
-        <translation>Suunto Vyper家族</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="778"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2248"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1643"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1810"/>
-        <source>Advanced settings</source>
-        <translation>進階設定</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="805"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2271"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1618"/>
@@ -1054,6 +1103,14 @@
         <translation>GFhigh</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="865"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2261"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1624"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1784"/>
+        <source>Desaturation</source>
+        <translation>未飽和</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="917"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2320"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1627"/>
@@ -1068,14 +1125,6 @@
         <translation> mbar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="973"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2369"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1630"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1788"/>
-        <source> min</source>
-        <translation>min</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="960"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2331"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1633"/>
@@ -1084,63 +1133,28 @@
         <translation>ZH-L16</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="47"/>
-        <source>Connect via Bluetooth</source>
-        <translation>透過藍芽連接</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="163"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1532"/>
-        <source>Save libdivecomputer logfile</source>
-        <translation>儲存 libdivecomputer 日誌檔案</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="661"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2145"/>
-        <source>End Depth</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="671"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2162"/>
-        <source> s</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="687"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1953"/>
-        <source>Length</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="694"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2138"/>
-        <source>Start Depth</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="701"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2152"/>
-        <source>Reset Depth</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="784"/>
-        <source>Left button sensitivity</source>
-        <translation>左邊按鈕靈敏度</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="791"/>
-        <source>Always show ppO2</source>
-        <translation>總是顯示 ppO2</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="965"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1634"/>
         <source>ZH-L16+GF</source>
         <translation>ZH-L16+GF</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="973"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2369"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1630"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1788"/>
+        <source> min</source>
+        <translation>min</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="983"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2398"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1636"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1800"/>
+        <source>Last deco</source>
+        <translation>最後減壓</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1009"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2424"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1640"/>
@@ -1157,6 +1171,14 @@
         <translation>Alt GF高</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1042"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2457"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1639"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1805"/>
+        <source>Saturation</source>
+        <translation>飽和</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1052"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1642"/>
         <source>Flip screen</source>
@@ -1168,12 +1190,22 @@
         <translation>右邊按鈕靈敏度</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1066"/>
+        <source>MOD warning</source>
+        <translation>MOD 警示</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1073"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2513"/>
         <source>Graphical speed indicator</source>
         <translation>圖形化速度指示器</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1080"/>
+        <source>Dynamic ascent rate</source>
+        <translation>動態上升速率</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1087"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2552"/>
         <source>Bottom gas consumption</source>
@@ -1186,6 +1218,14 @@
         <translation>減壓氣體消耗</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1133"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1149"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2520"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2536"/>
+        <source> ℓ/min</source>
+        <translation>ℓ/min</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1165"/>
         <source>Temperature sensor offset</source>
         <translation type="unfinished"/>
@@ -1204,6 +1244,18 @@
         <translation>氣體設定</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1235"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1320"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2610"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2695"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1645"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1668"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1812"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1835"/>
+        <source>%O₂</source>
+        <translation>%O₂</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1240"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1325"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2615"/>
@@ -1322,16 +1374,10 @@
         <translation>Dil 5</translation>
     </message>
     <message>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1691"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1858"/>
-        <source>Set point [cbar]</source>
-        <translation>Set point [cbar]</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1693"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1860"/>
-        <source>Change depth [m]</source>
-        <translation>變更深度 [m]</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1405"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2770"/>
+        <source>Setpoint</source>
+        <translation>Setpoint</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1415"/>
@@ -1370,6 +1416,12 @@
         <translation>SP 5</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1443"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1709"/>
+        <source>O₂ in calibration gas</source>
+        <translation>校正氣體的O₂</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1467"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1713"/>
         <source>Fixed setpoint</source>
@@ -1400,101 +1452,6 @@
         <translation> cbar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1748"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1733"/>
-        <source>P1 (medium)</source>
-        <extracomment>Suunto safety level</extracomment>
-        <translation>P1 (普通)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1753"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1734"/>
-        <source>P2 (high)</source>
-        <extracomment>Suunto safety level</extracomment>
-        <translation>P2 (高)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1792"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1744"/>
-        <source>Total dive time</source>
-        <translation>總潛水時間</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2109"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1769"/>
-        <source>kg/ℓ</source>
-        <translation>kg/ℓ</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2346"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1795"/>
-        <source>Apnoea</source>
-        <translation>Apnoea</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1583"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1722"/>
-        <source>Safety level</source>
-        <translation>安全等級</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="54"/>
-        <source>Connect</source>
-        <translation>連接</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="64"/>
-        <source>Disconnect</source>
-        <translation>中斷</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="214"/>
-        <source>OSTC 3,Sport,Cr,2</source>
-        <translation>OSTC 3,Sport,Cr,2</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1066"/>
-        <source>MOD warning</source>
-        <translation>MOD 警示</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1080"/>
-        <source>Dynamic ascent rate</source>
-        <translation>動態上升速率</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1133"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1149"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2520"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2536"/>
-        <source> ℓ/min</source>
-        <translation>ℓ/min</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1235"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1320"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2610"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2695"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1645"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1668"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1812"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1835"/>
-        <source>%O₂</source>
-        <translation>%O₂</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1405"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2770"/>
-        <source>Setpoint</source>
-        <translation>Setpoint</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1443"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1709"/>
-        <source>O₂ in calibration gas</source>
-        <translation>校正氣體的O₂</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1535"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2843"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1719"/>
@@ -1511,6 +1468,12 @@
         <translation>pO₂ min</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1583"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1722"/>
+        <source>Safety level</source>
+        <translation>安全等級</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1609"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1723"/>
         <source>Altitude range</source>
@@ -1544,6 +1507,20 @@
         <translation>P0 (無)</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1748"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1733"/>
+        <source>P1 (medium)</source>
+        <extracomment>Suunto safety level</extracomment>
+        <translation>P1 (普通)</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1753"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1734"/>
+        <source>P2 (high)</source>
+        <extracomment>Suunto safety level</extracomment>
+        <translation>P2 (高)</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1761"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1736"/>
         <source>Sample rate</source>
@@ -1568,11 +1545,10 @@
         <translation>60s</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="531"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1799"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1745"/>
-        <source>Computer model</source>
-        <translation>電腦模型</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1792"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1744"/>
+        <source>Total dive time</source>
+        <translation>總潛水時間</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1816"/>
@@ -1637,12 +1613,6 @@
         <translation>時間警示</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2099"/>
-        <location filename="../build/ui_configuredivecomputerdialog.h" line="1765"/>
-        <source>Salinity</source>
-        <translation>鹽度</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2074"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1774"/>
         <source>MM/DD/YY</source>
@@ -1661,12 +1631,30 @@
         <translation>YY/MM/DD</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2099"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1765"/>
+        <source>Salinity</source>
+        <translation>鹽度</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2109"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1769"/>
+        <source>kg/ℓ</source>
+        <translation>kg/ℓ</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2341"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1794"/>
         <source>ZH-L16 CC</source>
         <translation>ZH-L16 CC</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2346"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1795"/>
+        <source>Apnoea</source>
+        <translation>Apnoea</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2351"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1796"/>
         <source>L16-GF OC</source>
@@ -1685,87 +1673,112 @@
         <translation>PSCR-GF</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1108"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1129"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1539"/>
+        <source>OSTC 3</source>
+        <translation>OSTC 3</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1691"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1858"/>
+        <source>Set point [cbar]</source>
+        <translation>Set point [cbar]</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1693"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1860"/>
+        <source>Change depth [m]</source>
+        <translation>變更深度 [m]</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1110"/>
+        <source>Backup dive computer settings</source>
+        <translation>備份潛水電腦設定</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1111"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1132"/>
         <source>Backup files (*.xml)</source>
         <translation>備份檔案 (*.xml)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1113"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1115"/>
+        <source>XML backup error</source>
+        <translation>XML備份錯誤</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1116"/>
         <source>An error occurred while saving the backup file.
 %1</source>
         <translation>儲存備份檔案時發生錯誤。
 %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1116"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1119"/>
         <source>Backup succeeded</source>
         <translation>備份成功</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1117"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1120"/>
         <source>Your settings have been saved to: %1</source>
         <translation>設定會儲存至：%1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1107"/>
-        <source>Backup dive computer settings</source>
-        <translation>備份潛水電腦設定</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1112"/>
-        <source>XML backup error</source>
-        <translation>XML備份錯誤</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1128"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1131"/>
         <source>Restore dive computer settings</source>
         <translation>還原潛水電腦設定</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1134"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1137"/>
         <source>XML restore error</source>
         <translation>XML還原錯誤</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1135"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1138"/>
         <source>An error occurred while restoring the backup file.
 %1</source>
         <translation>還原備份檔案時發生錯誤。
 %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1139"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1142"/>
         <source>Restore succeeded</source>
         <translation>還原成功</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1140"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1143"/>
         <source>Your settings have been restored successfully.</source>
         <translation>設定被還原成功．</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1150"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1153"/>
         <source>Select firmware file</source>
         <translation>選擇韌體檔案</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1151"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1154"/>
         <source>All files (*.*)</source>
         <translation>所有檔案 (*.*)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1207"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1210"/>
         <source>Choose file for divecomputer download logfile</source>
         <translation>選擇記錄檔供潛水電腦下載日誌檔</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1208"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1211"/>
         <source>Log files (*.log)</source>
         <translation>記錄檔 (*.log)</translation>
     </message>
 </context>
 <context>
+    <name>ContextDrawer</name>
+    <message>
+        <location filename="../mobile-widgets/qml/kirigami/src/controls/ContextDrawer.qml" line="76"/>
+        <source>Actions</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>CylindersModel</name>
     <message>
         <location filename="../qt-models/cylindermodel.cpp" line="16"/>
@@ -1779,11 +1792,6 @@
     </message>
     <message>
         <location filename="../qt-models/cylindermodel.cpp" line="16"/>
-        <source>He%</source>
-        <translation>He%</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="16"/>
         <source>Work press.</source>
         <translation>工作壓力</translation>
     </message>
@@ -1803,9 +1811,24 @@
         <translation>O₂%</translation>
     </message>
     <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="16"/>
+        <source>He%</source>
+        <translation>He%</translation>
+    </message>
+    <message>
         <location filename="../qt-models/cylindermodel.cpp" line="17"/>
-        <source>Switch at</source>
-        <translation>交換於</translation>
+        <source>Deco switch at</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
+        <source>Bot. MOD</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
+        <source>MND</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-models/cylindermodel.cpp" line="17"/>
@@ -1823,17 +1846,32 @@
         <translation>ℓ</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="161"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="177"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation>於此處按下將移除此氣瓶.</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="383"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="180"/>
+        <source>Switch depth for deco gas. Calculated using Deco pO₂ preference, unless set manually.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="183"/>
+        <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to &apos;*&apos; for best O₂% for max depth.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="186"/>
+        <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to &apos;*&apos; for best He% for max depth.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="444"/>
         <source>Cylinder cannot be removed</source>
         <translation>氣瓶無法移除</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="384"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="445"/>
         <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source>
         <translation>此氣瓶仍在使用中，在潛水中，只有未使用的氣瓶可被移除。</translation>
     </message>
@@ -1853,42 +1891,24 @@
         <translation>欲複製的欄位資料</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="73"/>
+        <location filename="../build/ui_divecomponentselection.h" line="141"/>
+        <source>Dive site</source>
+        <translation>潛點</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="80"/>
         <location filename="../build/ui_divecomponentselection.h" line="142"/>
         <source>Suit</source>
         <translation>防寒衣</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="122"/>
-        <location filename="../build/ui_divecomponentselection.h" line="148"/>
-        <source>Divemaster</source>
-        <translation>潛導</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="129"/>
-        <location filename="../build/ui_divecomponentselection.h" line="149"/>
-        <source>Buddy</source>
-        <translation>潛伴</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="136"/>
-        <location filename="../build/ui_divecomponentselection.h" line="150"/>
-        <source>Rating</source>
-        <translation>評分</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="87"/>
         <location filename="../build/ui_divecomponentselection.h" line="143"/>
         <source>Visibility</source>
         <translation>能見度</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="73"/>
-        <location filename="../build/ui_divecomponentselection.h" line="141"/>
-        <source>Dive site</source>
-        <translation>潛點</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="94"/>
         <location filename="../build/ui_divecomponentselection.h" line="144"/>
         <source>Notes</source>
@@ -1912,10 +1932,34 @@
         <source>Cylinders</source>
         <translation>氣瓶</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="122"/>
+        <location filename="../build/ui_divecomponentselection.h" line="148"/>
+        <source>Divemaster</source>
+        <translation>潛導</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="129"/>
+        <location filename="../build/ui_divecomponentselection.h" line="149"/>
+        <source>Buddy</source>
+        <translation>潛伴</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="136"/>
+        <location filename="../build/ui_divecomponentselection.h" line="150"/>
+        <source>Rating</source>
+        <translation>評分</translation>
+    </message>
 </context>
 <context>
     <name>DiveComputerManagementDialog</name>
     <message>
+        <location filename="../desktop-widgets/divecomputermanagementdialog.ui" line="17"/>
+        <location filename="../build/ui_divecomputermanagementdialog.h" line="65"/>
+        <source>Edit dive computer nicknames</source>
+        <translation>編輯潛水電腦別名</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divecomputermanagementdialog.cpp" line="49"/>
         <source>Remove the selected dive computer?</source>
         <translation>是否移除所選擇的潛水電腦？</translation>
@@ -1927,12 +1971,6 @@
         <translation>您確認要
 移除選擇的潛水電腦?</translation>
     </message>
-    <message>
-        <location filename="../desktop-widgets/divecomputermanagementdialog.ui" line="17"/>
-        <location filename="../build/ui_divecomputermanagementdialog.h" line="65"/>
-        <source>Edit dive computer nicknames</source>
-        <translation>編輯潛水電腦別名</translation>
-    </message>
 </context>
 <context>
     <name>DiveComputerModel</name>
@@ -1960,17 +1998,17 @@
 <context>
     <name>DiveDetails</name>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="33"/>
+        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="38"/>
         <source>Dive details</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="67"/>
+        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="72"/>
         <source>Delete dive</source>
         <translation>刪除此潛水</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="84"/>
+        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="89"/>
         <source>Show on map</source>
         <translation type="unfinished"/>
     </message>
@@ -1978,88 +2016,93 @@
 <context>
     <name>DiveDetailsEdit</name>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="74"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="80"/>
         <source>Dive %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="78"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="84"/>
         <source>Date:</source>
         <translation>日期:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="86"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="92"/>
         <source>Location:</source>
         <translation>位置:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="95"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="101"/>
         <source>Coordinates:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="104"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="110"/>
         <source>Use current
 GPS location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="118"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="124"/>
         <source>Depth:</source>
         <translation>深度:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="127"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="133"/>
         <source>Duration:</source>
         <translation>時間:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="137"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="143"/>
         <source>Air Temp:</source>
         <translation>氣溫:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="146"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="152"/>
         <source>Water Temp:</source>
         <translation>水溫:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="155"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="161"/>
         <source>Suit:</source>
         <translation>防寒衣：</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="164"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="176"/>
         <source>Buddy:</source>
         <translation>潛伴:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="173"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="191"/>
         <source>Dive Master:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="182"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="206"/>
         <source>Weight:</source>
         <translation>重量:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="192"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="216"/>
+        <source>Cylinder:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="231"/>
         <source>Gas mix:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="203"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="241"/>
         <source>Start Pressure:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="213"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="250"/>
         <source>End Pressure:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="224"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="260"/>
         <source>Notes:</source>
         <translation>記錄:</translation>
     </message>
@@ -2097,42 +2140,42 @@ GPS location:</source>
         <translation>防寒衣：</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="159"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="158"/>
         <source>Air Temp:</source>
         <translation>氣溫:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="175"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="172"/>
         <source>Cylinder:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="189"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="185"/>
         <source>Water Temp:</source>
         <translation>水溫:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="205"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="198"/>
         <source>Dive Master:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="220"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="211"/>
         <source>Weight:</source>
         <translation>重量:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="249"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="224"/>
         <source>Buddy:</source>
         <translation>潛伴:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="263"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="237"/>
         <source>SAC:</source>
         <translation>耗氣率: </translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="280"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="252"/>
         <source>Notes</source>
         <translation>記錄</translation>
     </message>
@@ -2140,18 +2183,18 @@ GPS location:</source>
 <context>
     <name>DiveEventItem</name>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="134"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="165"/>
         <source>Manual switch to OC</source>
         <translation>手動切換至 OC</translation>
     </message>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="136"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="167"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation>開始</translation>
     </message>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="137"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="168"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation>結束</translation>
@@ -2160,27 +2203,27 @@ GPS location:</source>
 <context>
     <name>DiveImportedModel</name>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="646"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="656"/>
         <source>Date/time</source>
         <translation>日期/時間</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="648"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="658"/>
         <source>Duration</source>
         <translation>區間</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="650"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="660"/>
         <source>Depth</source>
         <translation>深度</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="672"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="682"/>
         <source>h:</source>
         <translation>h:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="672"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="682"/>
         <source>min</source>
         <translation>min</translation>
     </message>
@@ -2189,8 +2232,8 @@ GPS location:</source>
     <name>DiveList</name>
     <message>
         <location filename="../mobile-widgets/qml/DiveList.qml" line="12"/>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="226"/>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="232"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="227"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="233"/>
         <source>Dive list</source>
         <translation type="unfinished"/>
     </message>
@@ -2205,110 +2248,115 @@ GPS location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="222"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="223"/>
         <source>Cloud credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="228"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="229"/>
         <source>Please tap the &apos;+&apos; button to add a dive</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="248"/>
+        <source>No dives in dive list</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DiveListView</name>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="846"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="849"/>
         <source>Expand all</source>
         <translation>全部展開</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="848"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="851"/>
         <source>Collapse all</source>
         <translation>全部摺疊</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="852"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="855"/>
         <source>Collapse others</source>
         <translation>摺疊其它</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="856"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="859"/>
         <source>Remove dive(s) from trip</source>
         <translation>從旅程中移除潛水記錄(多支)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="857"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="860"/>
         <source>Create new trip above</source>
         <translation>設定為新的旅程</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="871"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="874"/>
         <source>Add dive(s) to trip immediately above</source>
         <translation>於上方增加潛水記錄(多支)至旅程中</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="873"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="876"/>
         <source>Add dive(s) to trip immediately below</source>
         <translation>於下方增加潛水記錄(多支)至旅程中</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="877"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="880"/>
         <source>Merge trip with trip above</source>
         <translation>與上方旅程合併</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="878"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="881"/>
         <source>Merge trip with trip below</source>
         <translation>與下方旅程合併</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="882"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="885"/>
         <source>Delete dive(s)</source>
         <translation>刪除潛水記錄(多支)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="884"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="887"/>
         <source>Mark dive(s) invalid</source>
         <translation>標示為無效的潛水記錄(多支)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="888"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="891"/>
         <source>Merge selected dives</source>
         <translation>合併所選擇的潛水記錄</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="890"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="893"/>
         <source>Renumber dive(s)</source>
         <translation>為潛水記錄(多支)重新編號</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="891"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="894"/>
         <source>Shift dive times</source>
         <translation>移動潛水時間</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="892"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="895"/>
         <source>Split selected dives</source>
         <translation>分開所選擇的潛水</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="893"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="896"/>
         <source>Load image(s) from file(s)</source>
         <translation>從多檔案載入圖片</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="894"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="897"/>
         <source>Load image(s) from web</source>
         <translation>從網路載入圖片</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="917"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="919"/>
         <source>Open image files</source>
         <translation>開啟影像檔</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="917"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="919"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>影像檔案 (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -2329,56 +2377,6 @@ GPS location:</source>
 <context>
     <name>DiveLogExportDialog</name>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="103"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="351"/>
-        <source>Export format</source>
-        <translation>匯出格式</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="134"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="353"/>
-        <source>UDDF</source>
-        <translation>UDDF</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="187"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="358"/>
-        <source>Worldmap</source>
-        <translation>世界地圖</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="197"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="359"/>
-        <source>I&amp;mage depths</source>
-        <translation>照片深度</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="243"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="360"/>
-        <source>Selection</source>
-        <translation>選擇</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="252"/>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="346"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="361"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="372"/>
-        <source>Selected dives</source>
-        <translation>選擇的潛水</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="262"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="362"/>
-        <source>All dives</source>
-        <translation>所有潛水</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="306"/>
-        <location filename="../build/ui_divelogexportdialog.h" line="396"/>
-        <source>HTML</source>
-        <translation>HTML</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="14"/>
         <location filename="../build/ui_divelogexportdialog.h" line="349"/>
         <source>Export dive log files</source>
@@ -2391,12 +2389,24 @@ GPS location:</source>
         <translation>一般匯出</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="103"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="351"/>
+        <source>Export format</source>
+        <translation>匯出格式</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="115"/>
         <location filename="../build/ui_divelogexportdialog.h" line="352"/>
         <source>Subsurface &amp;XML</source>
         <translation>Subsurface &amp;XML</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="134"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="353"/>
+        <source>UDDF</source>
+        <translation>UDDF</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="147"/>
         <location filename="../build/ui_divelogexportdialog.h" line="354"/>
         <source>di&amp;velogs.de</source>
@@ -2421,238 +2431,297 @@ GPS location:</source>
         <translation>CSV 潛水資料</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="275"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="187"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="358"/>
+        <source>Worldmap</source>
+        <translation>世界地圖</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="197"/>
+        <source>TeX</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="207"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="359"/>
+        <source>I&amp;mage depths</source>
+        <translation>照片深度</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="253"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="360"/>
+        <source>Selection</source>
+        <translation>選擇</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="262"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="356"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="361"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="372"/>
+        <source>Selected dives</source>
+        <translation>選擇的潛水</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="272"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="362"/>
+        <source>All dives</source>
+        <translation>所有潛水</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="285"/>
         <location filename="../build/ui_divelogexportdialog.h" line="363"/>
         <source>CSV units</source>
         <translation>CSV 單位</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="288"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="298"/>
         <location filename="../build/ui_divelogexportdialog.h" line="366"/>
         <source>Metric</source>
         <translation>公制</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="293"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="303"/>
         <location filename="../build/ui_divelogexportdialog.h" line="367"/>
         <source>Imperial</source>
         <translation>英制</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="324"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="316"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="396"/>
+        <source>HTML</source>
+        <translation>HTML</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="334"/>
         <location filename="../build/ui_divelogexportdialog.h" line="370"/>
         <source>General settings</source>
         <translation>一般設定</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="330"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="340"/>
         <location filename="../build/ui_divelogexportdialog.h" line="371"/>
         <source>Subsurface numbers</source>
         <translation>Subsurface numbers</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="359"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="369"/>
         <location filename="../build/ui_divelogexportdialog.h" line="373"/>
         <source>Export yearly statistics</source>
         <translation>輸出年統計資料</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="375"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="385"/>
         <location filename="../build/ui_divelogexportdialog.h" line="374"/>
         <source>All di&amp;ves</source>
         <translation>所有潛水</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="385"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="395"/>
         <location filename="../build/ui_divelogexportdialog.h" line="375"/>
         <source>Export list only</source>
         <translation>只匯出清單</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="392"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="402"/>
         <location filename="../build/ui_divelogexportdialog.h" line="376"/>
         <source>Export photos</source>
         <translation>匯出照片</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="408"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="418"/>
         <location filename="../build/ui_divelogexportdialog.h" line="377"/>
         <source>Style options</source>
         <translation>樣式選項</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="423"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="433"/>
         <location filename="../build/ui_divelogexportdialog.h" line="378"/>
         <source>Font</source>
         <translation>字型</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="433"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="443"/>
         <location filename="../build/ui_divelogexportdialog.h" line="379"/>
         <source>Font size</source>
         <translation>字型大小</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="444"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="454"/>
         <location filename="../build/ui_divelogexportdialog.h" line="382"/>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="449"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="459"/>
         <location filename="../build/ui_divelogexportdialog.h" line="383"/>
         <source>10</source>
         <translation>10</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="454"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="464"/>
         <location filename="../build/ui_divelogexportdialog.h" line="384"/>
         <source>12</source>
         <translation>12</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="459"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="469"/>
         <location filename="../build/ui_divelogexportdialog.h" line="385"/>
         <source>14</source>
         <translation>14</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="464"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="474"/>
         <location filename="../build/ui_divelogexportdialog.h" line="386"/>
         <source>16</source>
         <translation>16</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="469"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="479"/>
         <location filename="../build/ui_divelogexportdialog.h" line="387"/>
         <source>18</source>
         <translation>18</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="474"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="484"/>
         <location filename="../build/ui_divelogexportdialog.h" line="388"/>
         <source>20</source>
         <translation>20</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="482"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="492"/>
         <location filename="../build/ui_divelogexportdialog.h" line="390"/>
         <source>Theme</source>
         <translation>主題</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="493"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="503"/>
         <location filename="../build/ui_divelogexportdialog.h" line="393"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="95"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="99"/>
         <source>Light</source>
         <translation>Light</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="498"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="508"/>
         <location filename="../build/ui_divelogexportdialog.h" line="394"/>
         <source>Sand</source>
         <translation>Sand</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="134"/>
-        <source>UDDF files (*.uddf *.UDDF)</source>
-        <translation>UDDF 檔案 (*.uddf *.UDDF)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="142"/>
-        <source>CSV files (*.csv *.CSV)</source>
-        <translation>CSV 檔案 (*.csv *.CSV)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="74"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="76"/>
         <source>Generic format that is used for data exchange between a variety of diving related programs.</source>
         <translation>通用格式是於不同潛水程式中，做為資料交換使用。</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="76"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="78"/>
         <source>Comma separated values describing the dive profile.</source>
         <translation>描述潛水摘要時，請以逗號分隔資料。</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="78"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="80"/>
         <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source>
         <translation>包含大部分潛水細節但不包含摘要部分，資料以逗號分隔。</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="80"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="82"/>
         <source>Send the dive data to divelogs.de website.</source>
         <translation>傳送潛水資料至 divelogs.de 網站。</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="82"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="84"/>
         <source>Send the dive data to dive-share.appspot.com website</source>
         <translation>傳送潛水資料至 dive-share.appspot.com</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="84"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="86"/>
         <source>HTML export of the dive locations, visualized on a world map.</source>
         <translation>匯出潛點位置至 HTML，並繪製於地圖上。</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="86"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="88"/>
         <source>Subsurface native XML format.</source>
         <translation>Subsurface 原生 XML 格式</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="88"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="90"/>
         <source>Write depths of images to file.</source>
         <translation>寫入影像深度至檔案中</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="133"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="92"/>
+        <source>Write dive as TeX macros to file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="137"/>
         <source>Export UDDF file as</source>
         <translation>匯出 UDDF 檔案為</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="137"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/>
+        <source>UDDF files (*.uddf *.UDDF)</source>
+        <translation>UDDF 檔案 (*.uddf *.UDDF)</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divelogexportdialog.cpp" line="141"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="145"/>
         <source>Export CSV file as</source>
         <translation>匯出 CSV 檔案為</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="148"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="142"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="146"/>
+        <source>CSV files (*.csv *.CSV)</source>
+        <translation>CSV 檔案 (*.csv *.CSV)</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="152"/>
         <source>Export world map</source>
         <translation>匯出地圖</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="149"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="169"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="153"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="177"/>
         <source>HTML files (*.html)</source>
         <translation>HTML 檔案 (*.html)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="153"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="157"/>
         <source>Export Subsurface XML</source>
         <translation>匯出 Subsurface XML</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="158"/>
         <source>XML files (*.xml *.ssrf)</source>
         <translation>XML 檔案 (*.xml *.ssrf)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="162"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="166"/>
         <source>Save image depths</source>
         <translation>儲存影像深度</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="168"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="170"/>
+        <source>Export to TeX file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="170"/>
+        <source>TeX files (*.tex)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="176"/>
         <source>Export HTML files as</source>
         <translation>匯出 HTML 檔案為</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="184"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="192"/>
         <source>Please wait, exporting...</source>
         <translation>請稍待, 匯出中...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="219"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="227"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="311"/>
         <source>Can&apos;t open file %s</source>
         <translation>無法開啟檔案 %s</translation>
     </message>
@@ -2666,25 +2735,6 @@ GPS location:</source>
         <translation>載入潛水檔案</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="643"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="727"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="856"/>
-        <source>Time</source>
-        <translation>時間</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.ui" line="127"/>
-        <location filename="../build/ui_divelogimportdialog.h" line="164"/>
-        <source>Metric</source>
-        <translation>公制</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.ui" line="132"/>
-        <location filename="../build/ui_divelogimportdialog.h" line="165"/>
-        <source>Imperial</source>
-        <translation>英制</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divelogimportdialog.ui" line="89"/>
         <location filename="../build/ui_divelogimportdialog.h" line="152"/>
         <source>dd.mm.yyyy</source>
@@ -2703,74 +2753,6 @@ GPS location:</source>
         <translation>yyyy-mm-dd</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.ui" line="155"/>
-        <location filename="../build/ui_divelogimportdialog.h" line="167"/>
-        <source>Drag the tags above to each corresponding column below</source>
-        <translation>拖拉標籤至每個相關的欄位下方</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="641"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="729"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="852"/>
-        <source>Dive #</source>
-        <translation>潛水號#</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="642"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="723"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="854"/>
-        <source>Date</source>
-        <translation>日期</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="644"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="858"/>
-        <source>Duration</source>
-        <translation>區間</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="655"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="862"/>
-        <source>GPS</source>
-        <translation>GPS</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="645"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="864"/>
-        <source>Max. depth</source>
-        <translation>最大深度</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="646"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="866"/>
-        <source>Avg. depth</source>
-        <translation>平均深度</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="658"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="872"/>
-        <source>Suit</source>
-        <translation>防寒衣</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="663"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="878"/>
-        <source>Tags</source>
-        <translation>標籤</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="652"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="894"/>
-        <source>O₂</source>
-        <translation>O₂</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="653"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="896"/>
-        <source>He</source>
-        <translation>He</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divelogimportdialog.ui" line="108"/>
         <location filename="../build/ui_divelogimportdialog.h" line="158"/>
         <source>Seconds</source>
@@ -2789,183 +2771,269 @@ GPS location:</source>
         <translation>分:秒</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="654"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="860"/>
-        <source>Location</source>
-        <translation>位置</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.ui" line="127"/>
+        <location filename="../build/ui_divelogimportdialog.h" line="164"/>
+        <source>Metric</source>
+        <translation>公制</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.ui" line="132"/>
+        <location filename="../build/ui_divelogimportdialog.h" line="165"/>
+        <source>Imperial</source>
+        <translation>英制</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.ui" line="155"/>
+        <location filename="../build/ui_divelogimportdialog.h" line="167"/>
+        <source>Drag the tags above to each corresponding column below</source>
+        <translation>拖拉標籤至每個相關的欄位下方</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="354"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="499"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="505"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="355"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="528"/>
         <source>Tab</source>
         <translation>標籤</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="575"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="598"/>
         <source>Some column headers were pre-populated; please drag and drop the headers so they match the column they are in.</source>
         <translation>部分欄位標籤是預先產生，請拖拉標籤使其能符合實際意義</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="613"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="731"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="782"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="848"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="636"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="761"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="857"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="925"/>
         <source>Sample time</source>
         <translation>取樣時間</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="615"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="733"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="784"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="638"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="763"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="859"/>
         <source>Sample depth</source>
         <translation>取樣深度</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="617"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="735"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="786"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="640"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="765"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="861"/>
         <source>Sample temperature</source>
         <translation>取樣溫度</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="621"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="739"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="790"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="642"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="767"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="863"/>
+        <source>Sample pO₂</source>
+        <translation>取樣 pO₂</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="644"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="769"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="865"/>
         <source>Sample sensor1 pO₂</source>
         <translation>取樣感測器 1 pO₂</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="623"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="741"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="792"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="646"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="771"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="867"/>
         <source>Sample sensor2 pO₂</source>
         <translation>取樣感測器 2 pO₂</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="625"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="743"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="794"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="648"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="773"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="869"/>
         <source>Sample sensor3 pO₂</source>
         <translation>取樣感測器 3 pO₂</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="633"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="751"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="802"/>
-        <source>Sample stopdepth</source>
-        <translation>取樣停留深度</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="637"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="755"/>
-        <source>Sample setpoint</source>
-        <translation>取樣設定點</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="619"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="737"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="788"/>
-        <source>Sample pO₂</source>
-        <translation>取樣 pO₂</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="627"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="745"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="796"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="650"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="775"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="871"/>
         <source>Sample CNS</source>
         <translation>取樣 CNS</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="629"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="747"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="798"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="652"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="777"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="873"/>
         <source>Sample NDL</source>
         <translation>取樣 NDL</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="631"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="749"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="800"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="654"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="779"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="875"/>
         <source>Sample TTS</source>
         <translation>取樣 TTS</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="635"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="753"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="804"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="656"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="781"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="877"/>
+        <source>Sample stopdepth</source>
+        <translation>取樣停留深度</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="658"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="783"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="879"/>
         <source>Sample pressure</source>
         <translation>取樣壓力</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="656"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="868"/>
-        <source>Divemaster</source>
-        <translation>潛導</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="660"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="785"/>
+        <source>Sample setpoint</source>
+        <translation>取樣設定點</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="657"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="870"/>
-        <source>Buddy</source>
-        <translation>潛伴</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="664"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="759"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="929"/>
+        <source>Dive #</source>
+        <translation>潛水號#</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="659"/>
-        <source>Rating</source>
-        <translation>評分</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="665"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="753"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="931"/>
+        <source>Date</source>
+        <translation>日期</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="660"/>
-        <source>Visibility</source>
-        <translation>能見度</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="666"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="757"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="933"/>
+        <source>Time</source>
+        <translation>時間</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="661"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="874"/>
-        <source>Notes</source>
-        <translation>記錄</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="667"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="935"/>
+        <source>Duration</source>
+        <translation>區間</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="662"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="876"/>
-        <source>Weight</source>
-        <translation>重量</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="668"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="941"/>
+        <source>Max. depth</source>
+        <translation>最大深度</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="669"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="943"/>
+        <source>Avg. depth</source>
+        <translation>平均深度</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="670"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="975"/>
+        <source>Air temp.</source>
+        <translation>氣溫</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="671"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="977"/>
+        <source>Water temp.</source>
+        <translation>水溫</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="649"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="888"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="672"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="965"/>
         <source>Cyl. size</source>
         <translation>氣瓶大小</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="650"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="890"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="673"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="967"/>
         <source>Start pressure</source>
         <translation>開始壓力</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="651"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="892"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="674"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="969"/>
         <source>End pressure</source>
         <translation>結束壓力</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="647"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="898"/>
-        <source>Air temp.</source>
-        <translation>氣溫</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="675"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="971"/>
+        <source>O₂</source>
+        <translation>O₂</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="648"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="900"/>
-        <source>Water temp.</source>
-        <translation>水溫</translation>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="676"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="973"/>
+        <source>He</source>
+        <translation>He</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="677"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="937"/>
+        <source>Location</source>
+        <translation>位置</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="678"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="939"/>
+        <source>GPS</source>
+        <translation>GPS</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="679"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="945"/>
+        <source>Divemaster</source>
+        <translation>潛導</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="680"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="947"/>
+        <source>Buddy</source>
+        <translation>潛伴</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="681"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="949"/>
+        <source>Suit</source>
+        <translation>防寒衣</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="682"/>
+        <source>Rating</source>
+        <translation>評分</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="683"/>
+        <source>Visibility</source>
+        <translation>能見度</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="684"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="951"/>
+        <source>Notes</source>
+        <translation>記錄</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="685"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="953"/>
+        <source>Weight</source>
+        <translation>重量</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="686"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="955"/>
+        <source>Tags</source>
+        <translation>標籤</translation>
     </message>
 </context>
 <context>
     <name>DiveObjectHelper</name>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="287"/>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="323"/>
         <source>%1 dive(s)</source>
         <translation type="unfinished"/>
     </message>
@@ -2973,18 +3041,18 @@ GPS location:</source>
 <context>
     <name>DivePlanner</name>
     <message>
-        <location filename="../desktop-widgets/diveplanner.ui" line="152"/>
-        <location filename="../build/ui_diveplanner.h" line="190"/>
-        <source>Altitude</source>
-        <translation>海拔</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/diveplanner.ui" line="109"/>
         <location filename="../build/ui_diveplanner.h" line="189"/>
         <source>Planned dive time</source>
         <translation>計畫潛水時間</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/diveplanner.ui" line="152"/>
+        <location filename="../build/ui_diveplanner.h" line="190"/>
+        <source>Altitude</source>
+        <translation>海拔</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/diveplanner.ui" line="159"/>
         <location filename="../build/ui_diveplanner.h" line="191"/>
         <source>ATM pressure</source>
@@ -3018,32 +3086,32 @@ GPS location:</source>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="134"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="136"/>
         <source>unknown</source>
         <translation>未知</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="312"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="326"/>
         <source>Final depth</source>
         <translation>最後深度</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="314"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="328"/>
         <source>Run time</source>
         <translation>持續時間</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="316"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="330"/>
         <source>Duration</source>
         <translation>區間</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="318"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="332"/>
         <source>Used gas</source>
         <translation>使用氣量</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="320"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="334"/>
         <source>CC setpoint</source>
         <translation>CC 設定點</translation>
     </message>
@@ -3051,22 +3119,22 @@ GPS location:</source>
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="108"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="112"/>
         <source>Dive planner points</source>
         <translation>潛水計畫指示</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="112"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="116"/>
         <source>Available gases</source>
         <translation>可用氣瓶</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="137"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="143"/>
         <source>Add dive data point</source>
         <translation>新增潛水資料點</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="146"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="152"/>
         <source>Save new</source>
         <translation>另存</translation>
     </message>
@@ -3099,11 +3167,36 @@ GPS location:</source>
         <translation>顔色</translation>
     </message>
     <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="124"/>
+        <source>User entered</source>
+        <translation>使用者輸入</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="126"/>
+        <source>Cylinder index</source>
+        <translation>氣瓶編號</translation>
+    </message>
+    <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="128"/>
         <source>Pressure S</source>
         <translation>壓力S</translation>
     </message>
     <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="130"/>
+        <source>Pressure I</source>
+        <translation>壓力I</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="132"/>
+        <source>Ceiling</source>
+        <translation>上限深度</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="134"/>
+        <source>SAC</source>
+        <translation>耗氣率</translation>
+    </message>
+    <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="136"/>
         <source>pN₂</source>
         <translation>pN₂</translation>
@@ -3139,49 +3232,24 @@ GPS location:</source>
         <translation>Sensor 3</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="152"/>
-        <source>Heart rate</source>
-        <translation>心率</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="156"/>
-        <source>Mean depth @ s</source>
-        <translation>平均深度 @ s</translation>
-    </message>
-    <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="150"/>
         <source>Ambient pressure</source>
         <translation>環境壓力</translation>
     </message>
     <message>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="152"/>
+        <source>Heart rate</source>
+        <translation>心率</translation>
+    </message>
+    <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="154"/>
         <source>Gradient factor</source>
         <translation>梯度因子</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="130"/>
-        <source>Pressure I</source>
-        <translation>壓力I</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="124"/>
-        <source>User entered</source>
-        <translation>使用者輸入</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="126"/>
-        <source>Cylinder index</source>
-        <translation>氣瓶編號</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="132"/>
-        <source>Ceiling</source>
-        <translation>上限深度</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="134"/>
-        <source>SAC</source>
-        <translation>耗氣率</translation>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="156"/>
+        <source>Mean depth @ s</source>
+        <translation>平均深度 @ s</translation>
     </message>
 </context>
 <context>
@@ -3252,311 +3320,315 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="395"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="441"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="434"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="483"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="398"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="444"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="437"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="486"/>
         <source>Date</source>
         <translation>日期</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="401"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="447"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="440"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="489"/>
         <source>Rating</source>
         <translation>評分</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="404"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="443"/>
         <source>Depth</source>
         <translation>深度</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="410"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="446"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="495"/>
+        <source>Duration</source>
+        <translation>區間</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="449"/>
         <source>Temp</source>
         <translation>溫度</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="413"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="452"/>
         <source>Weight</source>
         <translation>重量</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="425"/>
-        <source>SAC</source>
-        <translation>耗氣率</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
-        <source>m</source>
-        <translation>m</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
-        <source>ft</source>
-        <translation>ft</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
-        <source>Weight(%1)</source>
-        <translation>重量(%1)</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="416"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="462"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="455"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="504"/>
         <source>Suit</source>
         <translation>防寒衣</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="419"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="465"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="458"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="507"/>
         <source>Cyl</source>
         <translation>氣瓶</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="422"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="468"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="461"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="510"/>
         <source>Gas</source>
         <translation>氣體</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
-        <source>SAC(%1)</source>
-        <translation>SAC(%1)</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="464"/>
+        <source>SAC</source>
+        <translation>耗氣率</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
-        <source>/min</source>
-        <translation>/min</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="467"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="518"/>
+        <source>OTU</source>
+        <translation>氧容許量 OTU</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="431"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="479"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="470"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="521"/>
         <source>Max CNS</source>
         <translation>最大 CNS</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="434"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="482"/>
-        <source>Location</source>
-        <translation>位置</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
+        <source>Photos</source>
+        <translation>照片</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
-        <source>kg</source>
-        <translation>kg</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="476"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="527"/>
+        <source>Location</source>
+        <translation>位置</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="492"/>
         <source>Depth(%1)</source>
         <translation>深度(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="407"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="453"/>
-        <source>Duration</source>
-        <translation>區間</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="492"/>
+        <source>m</source>
+        <translation>m</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="492"/>
+        <source>ft</source>
+        <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="456"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="498"/>
         <source>Temp(%1%2)</source>
         <translation>溫度(%1%2)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="501"/>
+        <source>Weight(%1)</source>
+        <translation>重量(%1)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="501"/>
+        <source>kg</source>
+        <translation>kg</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="501"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="428"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="476"/>
-        <source>OTU</source>
-        <translation>氧容許量 OTU</translation>
+        <location filename="../qt-models/divetripmodel.cpp" line="515"/>
+        <source>SAC(%1)</source>
+        <translation>SAC(%1)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="515"/>
+        <source>/min</source>
+        <translation>/min</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="524"/>
+        <source>Photos before/during/after dive</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="164"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="165"/>
         <source>no dives were selected</source>
         <translation>未選取任何潛水</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="174"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="175"/>
         <source>stylesheet to export to divelogs.de is not found</source>
         <translation>輸出至 divelogs.de 的表格格式不存在</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="184"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="185"/>
         <source>failed to create zip file for upload: %s</source>
         <translation>建立 zip 壓縮檔上傳失敗: %s</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="236"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="237"/>
         <source>internal error</source>
         <translation>內部錯誤</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="244"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="245"/>
         <source>Conversion of dive %1 to divelogs.de format failed</source>
         <translation>轉換潛水 %1 至 divelogs.de 格式錯誤</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="272"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="273"/>
         <source>error writing zip file: %s zip error %d system error %d - %s</source>
         <translation>寫入 ZIP 檔案: %s 發生錯誤 %d 系統錯誤 %d - %s</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="745"/>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="935"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="936"/>
         <source>Done</source>
         <translation>完成</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="778"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="779"/>
         <source>Uploading dive list...</source>
         <translation>上傳潛水列表...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="810"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="811"/>
         <source>Downloading dive list...</source>
         <translation>下載潛水列表...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="851"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="852"/>
         <source>Downloading %1 dives...</source>
         <translation>下載 %1 潛水...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="885"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="886"/>
         <source>Download finished - %1</source>
         <translation>下載結束 - %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="899"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="900"/>
         <source>Problem with download</source>
         <translation>下載發生錯誤</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="900"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="901"/>
         <source>The archive could not be opened:
 </source>
         <translation>存檔無法被開啟: 
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="909"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="910"/>
         <source>Corrupted download</source>
         <translation>中斷下載</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="910"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="911"/>
         <source>The archive could not be opened:
 %1</source>
         <translation>此存檔無法被開啟:
 %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="937"/>
+        <source>Upload finished</source>
+        <translation>上傳結束</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="950"/>
         <source>Upload failed</source>
         <translation>上傳失敗</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="952"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="953"/>
         <source>Upload successful</source>
         <translation>上傳成功</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="955"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="956"/>
         <source>Login failed</source>
         <translation>登入失敗</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="958"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="959"/>
         <source>Cannot parse response</source>
         <translation>回覆無法解析</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="970"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="971"/>
         <source>Error: %1</source>
         <translation>錯誤: %1</translation>
     </message>
-    <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="936"/>
-        <source>Upload finished</source>
-        <translation>上傳結束</translation>
-    </message>
 </context>
 <context>
     <name>DownloadFromDCWidget</name>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="185"/>
-        <source>Error</source>
-        <translation>錯誤</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="436"/>
-        <source>Retry</source>
-        <translation>重試</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="280"/>
-        <source>Find Uemis dive computer</source>
-        <translation>搜索Uemis潛水設備</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="101"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="107"/>
         <source>Download</source>
         <translation>下載</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="104"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="110"/>
         <source>Choose Bluetooth download mode</source>
         <translation>選擇藍芽下載模式</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="382"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="191"/>
+        <source>Error</source>
+        <translation>錯誤</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="286"/>
+        <source>Find Uemis dive computer</source>
+        <translation>搜索Uemis潛水設備</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="392"/>
         <source>Choose file for divecomputer download logfile</source>
         <translation>選擇記錄檔供潛水電腦下載日誌檔</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="383"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="393"/>
         <source>Log files (*.log)</source>
         <translation>記錄檔 (*.log)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="398"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="408"/>
         <source>Warning</source>
         <translation>提醒</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="399"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="409"/>
         <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source>
         <translation>儲存潛水電腦傾印資訊並不會下載潛水記錄</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="410"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="420"/>
         <source>Choose file for divecomputer binary dump file</source>
         <translation>選擇檔案供潛水電腦記錄傾印資訊</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="411"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="421"/>
         <source>Dump files (*.bin)</source>
         <translation>傾印檔 (*bin)</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="446"/>
+        <source>Retry</source>
+        <translation>重試</translation>
+    </message>
 </context>
 <context>
     <name>DownloadFromDiveComputer</name>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="139"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="275"/>
-        <source>Vendor</source>
-        <translation>廠牌</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="14"/>
         <location filename="../build/ui_downloadfromdivecomputer.h" line="265"/>
         <source>Download from dive computer</source>
@@ -3569,17 +3641,6 @@ p, li { white-space: pre-wrap; }
         <translation>裝置或連接處</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="122"/>
-        <source>Choose Bluetooth download mode</source>
-        <translation>選擇藍芽下載模式</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="149"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="276"/>
-        <source>Dive computer</source>
-        <translation>潛水電腦</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="66"/>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="101"/>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="115"/>
@@ -3603,11 +3664,46 @@ p, li { white-space: pre-wrap; }
         <translation>總是保留已下載的潛水</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="87"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="270"/>
+        <source>Download into new trip</source>
+        <translation>下載至新的旅程</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="94"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="271"/>
+        <source>Save libdivecomputer logfile</source>
+        <translation>儲存 libdivecomputer 日誌檔案</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="108"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="273"/>
+        <source>Save libdivecomputer dumpfile</source>
+        <translation>儲存 libdivecomputer 傾印檔案</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="122"/>
+        <source>Choose Bluetooth download mode</source>
+        <translation>選擇藍芽下載模式</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="129"/>
         <source>Select a remote Bluetooth device.</source>
         <translation>選擇遠端藍芽裝置. </translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="139"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="275"/>
+        <source>Vendor</source>
+        <translation>廠牌</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="149"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="276"/>
+        <source>Dive computer</source>
+        <translation>潛水電腦</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/>
         <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="52"/>
         <location filename="../build/ui_downloadfromdivecomputer.h" line="277"/>
@@ -3615,18 +3711,6 @@ p, li { white-space: pre-wrap; }
         <translation>下載</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="284"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="281"/>
-        <source>OK</source>
-        <translation>確認</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="291"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="282"/>
-        <source>Cancel</source>
-        <translation>取消</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="226"/>
         <location filename="../build/ui_downloadfromdivecomputer.h" line="278"/>
         <source>Downloaded dives</source>
@@ -3645,22 +3729,16 @@ p, li { white-space: pre-wrap; }
         <translation>取消選擇全部</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="94"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="271"/>
-        <source>Save libdivecomputer logfile</source>
-        <translation>儲存 libdivecomputer 日誌檔案</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="108"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="273"/>
-        <source>Save libdivecomputer dumpfile</source>
-        <translation>儲存 libdivecomputer 傾印檔案</translation>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="284"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="281"/>
+        <source>OK</source>
+        <translation>確認</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="87"/>
-        <location filename="../build/ui_downloadfromdivecomputer.h" line="270"/>
-        <source>Download into new trip</source>
-        <translation>下載至新的旅程</translation>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="291"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="282"/>
+        <source>Cancel</source>
+        <translation>取消</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="16"/>
@@ -3750,12 +3828,12 @@ p, li { white-space: pre-wrap; }
         <translation>與 facebook 地圖位置連結</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="297"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="242"/>
         <source>To disconnect Subsurface from your Facebook account, use the button below</source>
         <translation>使用底下按鈕，中斷 Subsurface 與 Facebook 帳號連線</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="306"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="251"/>
         <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source>
         <translation>請先登入連結 Facebook 帳號。來啟動 Subsurface 發布潛水記錄至您的時間表</translation>
     </message>
@@ -3763,22 +3841,22 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>FacebookManager</name>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="266"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="211"/>
         <source>Photo upload sucessfull</source>
         <translation>照片上傳成功</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="267"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="212"/>
         <source>Your dive profile was updated to Facebook.</source>
         <translation>你的潛水記錄已上傳至Facebook</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="271"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="216"/>
         <source>Photo upload failed</source>
         <translation>照片上傳失敗</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="272"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="217"/>
         <source>Your dive profile was not updated to Facebook, 
  please send the following to the developer. 
 </source>
@@ -3840,17 +3918,25 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>FirmwareUpdateThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1750"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1739"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>此功能目前並不支援所選取的潛水電腦</translation>
     </message>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1755"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1744"/>
         <source>Firmware update failed!</source>
         <translation>韌體上傳失敗！</translation>
     </message>
 </context>
 <context>
+    <name>GlobalDrawer</name>
+    <message>
+        <location filename="../mobile-widgets/qml/kirigami/src/controls/GlobalDrawer.qml" line="364"/>
+        <source>Back</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>GlobeGPS</name>
     <message>
         <location filename="../desktop-widgets/globe.cpp" line="124"/>
@@ -3866,27 +3952,27 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="40"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="32"/>
         <source>Date: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="50"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="42"/>
         <source>Name: </source>
         <translation>名稱: </translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="60"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="52"/>
         <source>Latitude: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="69"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="61"/>
         <source>Longitude: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/GpsList.qml" line="113"/>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="105"/>
         <source>List of stored GPS fixes</source>
         <translation type="unfinished"/>
     </message>
@@ -3915,7 +4001,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>LocationFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="648"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="646"/>
         <source>Location: </source>
         <translation>位置：</translation>
     </message>
@@ -3956,7 +4042,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>LocationFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="299"/>
+        <location filename="../qt-models/filtermodels.cpp" line="304"/>
         <source>No location set</source>
         <translation>無位置組合</translation>
     </message>
@@ -4078,20 +4164,55 @@ p, li { white-space: pre-wrap; }
     </message>
 </context>
 <context>
-    <name>MainForm.ui</name>
+    <name>MainTab</name>
     <message>
-        <location filename="../packaging/ios/Subsurface-mobile/MainForm.ui.qml" line="17"/>
-        <source>Press Me 1</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/maintab.ui" line="18"/>
+        <location filename="../desktop-widgets/maintab.ui" line="439"/>
+        <location filename="../build/ui_maintab.h" line="961"/>
+        <location filename="../build/ui_maintab.h" line="963"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="539"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="571"/>
+        <source>Notes</source>
+        <translation>記錄</translation>
     </message>
     <message>
-        <location filename="../packaging/ios/Subsurface-mobile/MainForm.ui.qml" line="22"/>
-        <source>Press Me 2</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/maintab.ui" line="21"/>
+        <location filename="../build/ui_maintab.h" line="964"/>
+        <source>General notes about the current selection</source>
+        <translation>現在選取的相關記錄</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="92"/>
+        <location filename="../desktop-widgets/maintab.ui" line="646"/>
+        <location filename="../build/ui_maintab.h" line="947"/>
+        <location filename="../build/ui_maintab.h" line="967"/>
+        <source>Date</source>
+        <translation>日期</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="102"/>
+        <location filename="../build/ui_maintab.h" line="948"/>
+        <source>Time</source>
+        <translation>時間</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="112"/>
+        <location filename="../desktop-widgets/maintab.ui" line="836"/>
+        <location filename="../build/ui_maintab.h" line="949"/>
+        <location filename="../build/ui_maintab.h" line="987"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="306"/>
+        <source>Air temp.</source>
+        <translation>氣溫</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="122"/>
+        <location filename="../desktop-widgets/maintab.ui" line="855"/>
+        <location filename="../build/ui_maintab.h" line="950"/>
+        <location filename="../build/ui_maintab.h" line="989"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="307"/>
+        <source>Water temp.</source>
+        <translation>水溫</translation>
     </message>
-</context>
-<context>
-    <name>MainTab</name>
     <message>
         <location filename="../desktop-widgets/maintab.ui" line="184"/>
         <location filename="../build/ui_maintab.h" line="951"/>
@@ -4100,6 +4221,17 @@ p, li { white-space: pre-wrap; }
         <translation>位置</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="214"/>
+        <source>Edit dive site</source>
+        <translation>編輯潛點</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="217"/>
+        <location filename="../build/ui_maintab.h" line="953"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="252"/>
         <location filename="../build/ui_maintab.h" line="954"/>
         <source>Divemaster</source>
@@ -4112,12 +4244,6 @@ p, li { white-space: pre-wrap; }
         <translation>潛伴</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.ui" line="387"/>
-        <location filename="../build/ui_maintab.h" line="959"/>
-        <source>Tags</source>
-        <translation>標籤</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/maintab.ui" line="308"/>
         <location filename="../build/ui_maintab.h" line="956"/>
         <source>Rating</source>
@@ -4136,57 +4262,18 @@ p, li { white-space: pre-wrap; }
         <translation>防寒衣</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="387"/>
+        <location filename="../build/ui_maintab.h" line="959"/>
+        <source>Tags</source>
+        <translation>標籤</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="397"/>
         <location filename="../build/ui_maintab.h" line="960"/>
         <source>Dive mode</source>
         <translation>潛水模式</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.ui" line="112"/>
-        <location filename="../desktop-widgets/maintab.ui" line="836"/>
-        <location filename="../build/ui_maintab.h" line="949"/>
-        <location filename="../build/ui_maintab.h" line="987"/>
-        <location filename="../desktop-widgets/maintab.cpp" line="306"/>
-        <source>Air temp.</source>
-        <translation>氣溫</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="122"/>
-        <location filename="../desktop-widgets/maintab.ui" line="855"/>
-        <location filename="../build/ui_maintab.h" line="950"/>
-        <location filename="../build/ui_maintab.h" line="989"/>
-        <location filename="../desktop-widgets/maintab.cpp" line="307"/>
-        <source>Water temp.</source>
-        <translation>水溫</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="18"/>
-        <location filename="../desktop-widgets/maintab.ui" line="439"/>
-        <location filename="../build/ui_maintab.h" line="961"/>
-        <location filename="../build/ui_maintab.h" line="963"/>
-        <location filename="../desktop-widgets/maintab.cpp" line="539"/>
-        <location filename="../desktop-widgets/maintab.cpp" line="571"/>
-        <source>Notes</source>
-        <translation>記錄</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="21"/>
-        <location filename="../build/ui_maintab.h" line="964"/>
-        <source>General notes about the current selection</source>
-        <translation>現在選取的相關記錄</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="214"/>
-        <source>Edit dive site</source>
-        <translation>編輯潛點</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="217"/>
-        <location filename="../build/ui_maintab.h" line="953"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/maintab.ui" line="491"/>
         <location filename="../build/ui_maintab.h" line="965"/>
         <source>Equipment</source>
@@ -4211,6 +4298,12 @@ p, li { white-space: pre-wrap; }
         <translation>潛水資訊</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="665"/>
+        <location filename="../build/ui_maintab.h" line="969"/>
+        <source>Interval</source>
+        <translation>水面休息時間</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="684"/>
         <location filename="../build/ui_maintab.h" line="971"/>
         <source>Gases used</source>
@@ -4223,18 +4316,38 @@ p, li { white-space: pre-wrap; }
         <translation>氣體消耗</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="722"/>
+        <location filename="../desktop-widgets/maintab.ui" line="1094"/>
+        <location filename="../build/ui_maintab.h" line="975"/>
+        <location filename="../build/ui_maintab.h" line="1003"/>
+        <source>SAC</source>
+        <translation>耗氣率</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="741"/>
         <location filename="../build/ui_maintab.h" line="977"/>
         <source>CNS</source>
         <translation>CNS</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="760"/>
+        <location filename="../build/ui_maintab.h" line="979"/>
+        <source>OTU</source>
+        <translation>氧容許量 OTU</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="779"/>
         <location filename="../build/ui_maintab.h" line="981"/>
         <source>Max. depth</source>
         <translation>最大深度</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="798"/>
+        <location filename="../build/ui_maintab.h" line="983"/>
+        <source>Avg. depth</source>
+        <translation>平均深度</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="817"/>
         <location filename="../build/ui_maintab.h" line="985"/>
         <source>Air pressure</source>
@@ -4247,82 +4360,6 @@ p, li { white-space: pre-wrap; }
         <translation>潛水時間</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.ui" line="933"/>
-        <location filename="../build/ui_maintab.h" line="1007"/>
-        <source>Simple statistics about the selection</source>
-        <translation>有關所選取的摘要資訊</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1039"/>
-        <location filename="../build/ui_maintab.h" line="999"/>
-        <source>Total time</source>
-        <translation>全部時間</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1106"/>
-        <location filename="../build/ui_maintab.h" line="1004"/>
-        <source>Gas consumption</source>
-        <translation>氣體消耗</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1151"/>
-        <location filename="../build/ui_maintab.h" line="1009"/>
-        <source>All photos from the current selection</source>
-        <translation>選擇的所有照片</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1177"/>
-        <location filename="../build/ui_maintab.h" line="1010"/>
-        <source>Extra data</source>
-        <translation>其它資料</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="1180"/>
-        <location filename="../build/ui_maintab.h" line="1011"/>
-        <source>Adittional data from the dive computer</source>
-        <translation>潛水電腦中的附加資料</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="92"/>
-        <location filename="../desktop-widgets/maintab.ui" line="646"/>
-        <location filename="../build/ui_maintab.h" line="947"/>
-        <location filename="../build/ui_maintab.h" line="967"/>
-        <source>Date</source>
-        <translation>日期</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="102"/>
-        <location filename="../build/ui_maintab.h" line="948"/>
-        <source>Time</source>
-        <translation>時間</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="665"/>
-        <location filename="../build/ui_maintab.h" line="969"/>
-        <source>Interval</source>
-        <translation>水面休息時間</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="722"/>
-        <location filename="../desktop-widgets/maintab.ui" line="1094"/>
-        <location filename="../build/ui_maintab.h" line="975"/>
-        <location filename="../build/ui_maintab.h" line="1003"/>
-        <source>SAC</source>
-        <translation>耗氣率</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="798"/>
-        <location filename="../build/ui_maintab.h" line="983"/>
-        <source>Avg. depth</source>
-        <translation>平均深度</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/maintab.ui" line="760"/>
-        <location filename="../build/ui_maintab.h" line="979"/>
-        <source>OTU</source>
-        <translation>氧容許量 OTU</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/maintab.ui" line="893"/>
         <location filename="../build/ui_maintab.h" line="993"/>
         <source>Salinity</source>
@@ -4335,22 +4372,34 @@ p, li { white-space: pre-wrap; }
         <translation>統計</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="933"/>
+        <location filename="../build/ui_maintab.h" line="1007"/>
+        <source>Simple statistics about the selection</source>
+        <translation>有關所選取的摘要資訊</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="986"/>
         <location filename="../build/ui_maintab.h" line="996"/>
         <source>Depth</source>
         <translation>深度</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="998"/>
+        <location filename="../build/ui_maintab.h" line="997"/>
+        <source>Duration</source>
+        <translation>區間</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="1027"/>
         <location filename="../build/ui_maintab.h" line="998"/>
         <source>Temperature</source>
         <translation>溫度</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.ui" line="998"/>
-        <location filename="../build/ui_maintab.h" line="997"/>
-        <source>Duration</source>
-        <translation>區間</translation>
+        <location filename="../desktop-widgets/maintab.ui" line="1039"/>
+        <location filename="../build/ui_maintab.h" line="999"/>
+        <source>Total time</source>
+        <translation>全部時間</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/maintab.ui" line="1058"/>
@@ -4359,20 +4408,34 @@ p, li { white-space: pre-wrap; }
         <translation>潛水</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.ui" line="1106"/>
+        <location filename="../build/ui_maintab.h" line="1004"/>
+        <source>Gas consumption</source>
+        <translation>氣體消耗</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.ui" line="1148"/>
         <location filename="../build/ui_maintab.h" line="1008"/>
         <source>Photos</source>
         <translation>照片</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.cpp" line="88"/>
-        <source>Cylinders</source>
-        <translation>氣瓶</translation>
+        <location filename="../desktop-widgets/maintab.ui" line="1151"/>
+        <location filename="../build/ui_maintab.h" line="1009"/>
+        <source>All photos from the current selection</source>
+        <translation>選擇的所有照片</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/maintab.cpp" line="92"/>
-        <source>Weights</source>
-        <translation>配重</translation>
+        <location filename="../desktop-widgets/maintab.ui" line="1177"/>
+        <location filename="../build/ui_maintab.h" line="1010"/>
+        <source>Extra data</source>
+        <translation>其它資料</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.ui" line="1180"/>
+        <location filename="../build/ui_maintab.h" line="1011"/>
+        <source>Adittional data from the dive computer</source>
+        <translation>潛水電腦中的附加資料</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/maintab.cpp" line="63"/>
@@ -4385,11 +4448,21 @@ p, li { white-space: pre-wrap; }
         <translation>取消變更</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.cpp" line="88"/>
+        <source>Cylinders</source>
+        <translation>氣瓶</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.cpp" line="89"/>
         <source>Add cylinder</source>
         <translation>新增氣瓶</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/maintab.cpp" line="92"/>
+        <source>Weights</source>
+        <translation>配重</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/maintab.cpp" line="93"/>
         <source>Add weight system</source>
         <translation>新增配重系統</translation>
@@ -4582,659 +4655,685 @@ mixed from Air and using:
         <translation>檔案</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="455"/>
-        <location filename="../build/ui_mainwindow.h" line="534"/>
-        <source>Export dive logs</source>
-        <translation>匯出潛水記錄</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="510"/>
-        <location filename="../build/ui_mainwindow.h" line="542"/>
-        <source>Toggle pHe graph</source>
-        <translation>切換 pHe 圖表</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="546"/>
-        <location filename="../build/ui_mainwindow.h" line="545"/>
-        <source>Toggle calculating all tissues</source>
-        <translation>切換計算所有的組織</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="522"/>
-        <location filename="../build/ui_mainwindow.h" line="543"/>
-        <source>Toggle DC reported ceiling</source>
-        <translation>切換 DC 回報的上限深度</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="534"/>
-        <location filename="../build/ui_mainwindow.h" line="544"/>
-        <source>Toggle calculated ceiling</source>
-        <translation>切換計算的上限深度</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="606"/>
-        <location filename="../build/ui_mainwindow.h" line="550"/>
-        <source>Toggle NDL, TTS</source>
-        <translation>切換 NDL, TTS</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="558"/>
-        <location filename="../build/ui_mainwindow.h" line="546"/>
-        <source>Toggle calculated ceiling with 3m increments</source>
-        <translation>切換以每次增加 3m 計算的上限深度</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="463"/>
-        <location filename="../build/ui_mainwindow.h" line="537"/>
-        <source>Configure &amp;dive computer</source>
-        <translation>潛水電腦設定</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="570"/>
-        <location filename="../build/ui_mainwindow.h" line="547"/>
-        <source>Toggle heart rate</source>
-        <translation>切換心跳率</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="582"/>
-        <location filename="../build/ui_mainwindow.h" line="548"/>
-        <source>Toggle MOD</source>
-        <translation>切換 MOD</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="594"/>
-        <location filename="../build/ui_mainwindow.h" line="549"/>
-        <source>Toggle EAD, END, EADD</source>
-        <translation>切換 EAD, END, EADD</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="618"/>
-        <location filename="../build/ui_mainwindow.h" line="551"/>
-        <source>Toggle SAC rate</source>
-        <translation>切換 SAC 率</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="630"/>
-        <location filename="../build/ui_mainwindow.h" line="552"/>
-        <source>Toggle ruler</source>
-        <translation>切換規則</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="86"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="87"/>
         <location filename="../build/ui_mainwindow.h" line="569"/>
         <source>&amp;Log</source>
         <translation>日誌</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="105"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="104"/>
         <location filename="../build/ui_mainwindow.h" line="570"/>
         <source>&amp;View</source>
         <translation>檢視</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="121"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="120"/>
         <location filename="../build/ui_mainwindow.h" line="571"/>
         <source>&amp;Help</source>
         <translation>幫助</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="130"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="129"/>
         <location filename="../build/ui_mainwindow.h" line="572"/>
         <source>&amp;Import</source>
         <translation>匯入</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="139"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="138"/>
         <location filename="../build/ui_mainwindow.h" line="573"/>
         <source>&amp;Edit</source>
         <translation>編輯</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="144"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="143"/>
         <source>Share on</source>
         <translation>分享到</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="158"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="157"/>
         <location filename="../build/ui_mainwindow.h" line="453"/>
         <source>&amp;New logbook</source>
         <translation>建立新日誌</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="161"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="160"/>
         <location filename="../build/ui_mainwindow.h" line="455"/>
         <source>New</source>
         <translation>建立</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="164"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="163"/>
         <location filename="../build/ui_mainwindow.h" line="457"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="169"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="168"/>
         <location filename="../build/ui_mainwindow.h" line="458"/>
         <source>&amp;Open logbook</source>
         <translation>開啟日誌</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="172"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="171"/>
         <location filename="../build/ui_mainwindow.h" line="460"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="508"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="502"/>
         <source>Open</source>
         <translation>開啟</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="175"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="174"/>
         <location filename="../build/ui_mainwindow.h" line="462"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="180"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="179"/>
         <location filename="../build/ui_mainwindow.h" line="463"/>
         <source>&amp;Save</source>
         <translation>儲存</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="183"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="182"/>
         <location filename="../build/ui_mainwindow.h" line="465"/>
         <source>Save</source>
         <translation>儲存</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="186"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="185"/>
         <location filename="../build/ui_mainwindow.h" line="467"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="191"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="190"/>
         <location filename="../build/ui_mainwindow.h" line="468"/>
         <source>Sa&amp;ve as</source>
         <translation>另存為</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="194"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="193"/>
         <location filename="../build/ui_mainwindow.h" line="470"/>
         <source>Save as</source>
         <translation>另存為</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="197"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="196"/>
         <location filename="../build/ui_mainwindow.h" line="472"/>
         <source>Ctrl+Shift+S</source>
         <translation>Ctrl+Shift+S</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="202"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="201"/>
         <location filename="../build/ui_mainwindow.h" line="473"/>
         <source>&amp;Close</source>
         <translation>關閉</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="205"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="204"/>
         <location filename="../build/ui_mainwindow.h" line="475"/>
         <source>Close</source>
         <translation>關閉</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="208"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="207"/>
         <location filename="../build/ui_mainwindow.h" line="477"/>
         <source>Ctrl+W</source>
         <translation>Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="221"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="212"/>
+        <location filename="../build/ui_mainwindow.h" line="478"/>
+        <source>&amp;Print</source>
+        <translation>列印</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="215"/>
+        <location filename="../build/ui_mainwindow.h" line="479"/>
+        <source>Ctrl+P</source>
+        <translation>Ctrl+P</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="220"/>
         <location filename="../build/ui_mainwindow.h" line="480"/>
         <source>P&amp;references</source>
         <translation>設置</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="251"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="223"/>
+        <location filename="../build/ui_mainwindow.h" line="481"/>
+        <source>Ctrl+,</source>
+        <translation>Ctrl+,</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="231"/>
+        <location filename="../build/ui_mainwindow.h" line="482"/>
+        <source>&amp;Quit</source>
+        <translation>結束</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="234"/>
+        <location filename="../build/ui_mainwindow.h" line="483"/>
+        <source>Ctrl+Q</source>
+        <translation>Ctrl+Q</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="242"/>
+        <location filename="../build/ui_mainwindow.h" line="484"/>
+        <source>Import from &amp;dive computer</source>
+        <translation>從潛水電腦匯入</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="245"/>
+        <location filename="../build/ui_mainwindow.h" line="485"/>
+        <source>Ctrl+D</source>
+        <translation>Ctrl+D</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="250"/>
         <location filename="../build/ui_mainwindow.h" line="486"/>
         <source>Import &amp;GPS data from Subsurface web service</source>
         <translation>自 Subsurface 網路服務匯入 GPS 資料</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="259"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="253"/>
+        <location filename="../build/ui_mainwindow.h" line="487"/>
+        <source>Ctrl+G</source>
+        <translation>Ctrl+G</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="258"/>
         <location filename="../build/ui_mainwindow.h" line="488"/>
         <source>Edit device &amp;names</source>
         <translation>編輯裝置名稱</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="272"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="263"/>
+        <location filename="../build/ui_mainwindow.h" line="489"/>
+        <source>&amp;Add dive</source>
+        <translation>新增潛水</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="266"/>
+        <location filename="../build/ui_mainwindow.h" line="490"/>
+        <source>Ctrl++</source>
+        <translation>Ctrl++</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="271"/>
         <location filename="../build/ui_mainwindow.h" line="491"/>
         <source>&amp;Edit dive</source>
         <translation>編輯潛水</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="277"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="276"/>
         <location filename="../build/ui_mainwindow.h" line="492"/>
         <source>&amp;Copy dive components</source>
         <translation>拷貝潛水配件</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="280"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="279"/>
         <location filename="../build/ui_mainwindow.h" line="493"/>
         <source>Ctrl+C</source>
         <translation>Ctrl+C</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="285"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="284"/>
         <location filename="../build/ui_mainwindow.h" line="494"/>
         <source>&amp;Paste dive components</source>
         <translation>貼上潛水配件</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="288"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="287"/>
         <location filename="../build/ui_mainwindow.h" line="495"/>
         <source>Ctrl+V</source>
         <translation>Ctrl+V</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="325"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="292"/>
+        <location filename="../build/ui_mainwindow.h" line="496"/>
+        <source>&amp;Renumber</source>
+        <translation>重新編號</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="295"/>
+        <location filename="../build/ui_mainwindow.h" line="497"/>
+        <source>Ctrl+R</source>
+        <translation>Ctrl+R</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="303"/>
+        <location filename="../build/ui_mainwindow.h" line="498"/>
+        <source>Auto &amp;group</source>
+        <translation>自動群組</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="308"/>
+        <location filename="../build/ui_mainwindow.h" line="499"/>
+        <source>&amp;Yearly statistics</source>
+        <translation>年統計</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="311"/>
+        <location filename="../build/ui_mainwindow.h" line="500"/>
+        <source>Ctrl+Y</source>
+        <translation>Ctrl+Y</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="316"/>
+        <location filename="../build/ui_mainwindow.h" line="501"/>
+        <source>&amp;Dive list</source>
+        <translation>潛水列表</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="319"/>
+        <location filename="../build/ui_mainwindow.h" line="502"/>
+        <source>Ctrl+2</source>
+        <translation>Ctrl+2</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="324"/>
         <location filename="../build/ui_mainwindow.h" line="503"/>
         <source>&amp;Profile</source>
         <translation>描述</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="333"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="327"/>
+        <location filename="../build/ui_mainwindow.h" line="504"/>
+        <source>Ctrl+3</source>
+        <translation>Ctrl+3</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="332"/>
         <location filename="../build/ui_mainwindow.h" line="505"/>
         <source>&amp;Info</source>
         <translation>資訊</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="341"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="335"/>
+        <location filename="../build/ui_mainwindow.h" line="506"/>
+        <source>Ctrl+4</source>
+        <translation>Ctrl+4</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="340"/>
         <location filename="../build/ui_mainwindow.h" line="507"/>
         <source>&amp;All</source>
         <translation>全部</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="357"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="343"/>
+        <location filename="../build/ui_mainwindow.h" line="508"/>
+        <source>Ctrl+1</source>
+        <translation>Ctrl+1</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="348"/>
+        <location filename="../build/ui_mainwindow.h" line="509"/>
+        <source>P&amp;revious DC</source>
+        <translation>上一個 DC</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="351"/>
+        <location filename="../build/ui_mainwindow.h" line="510"/>
+        <source>Left</source>
+        <translation>左邊</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="356"/>
         <location filename="../build/ui_mainwindow.h" line="511"/>
         <source>&amp;Next DC</source>
         <translation>下一個 DC</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="365"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="359"/>
+        <location filename="../build/ui_mainwindow.h" line="512"/>
+        <source>Right</source>
+        <translation>右邊</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="364"/>
         <location filename="../build/ui_mainwindow.h" line="513"/>
         <source>&amp;About Subsurface</source>
         <translation>關於 Subsurface</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="381"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="372"/>
+        <location filename="../build/ui_mainwindow.h" line="514"/>
+        <source>User &amp;manual</source>
+        <translation>使用者說明</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="375"/>
+        <location filename="../build/ui_mainwindow.h" line="515"/>
+        <source>F1</source>
+        <translation>F1</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="380"/>
         <location filename="../build/ui_mainwindow.h" line="516"/>
         <source>&amp;Globe</source>
         <translation>地圖</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="403"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="383"/>
+        <location filename="../build/ui_mainwindow.h" line="517"/>
+        <source>Ctrl+5</source>
+        <translation>Ctrl+5</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="388"/>
+        <location filename="../build/ui_mainwindow.h" line="518"/>
+        <source>P&amp;lan dive</source>
+        <translation>計畫潛水</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="391"/>
+        <location filename="../build/ui_mainwindow.h" line="519"/>
+        <source>Ctrl+L</source>
+        <translation>Ctrl+L</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="396"/>
+        <location filename="../build/ui_mainwindow.h" line="520"/>
+        <source>&amp;Import log files</source>
+        <translation>匯入日誌檔案</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="399"/>
+        <location filename="../build/ui_mainwindow.h" line="522"/>
+        <source>Import divelog files from other applications</source>
+        <translation>從其他程序導入潛水檔案文件</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="402"/>
         <location filename="../build/ui_mainwindow.h" line="524"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="408"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="407"/>
         <location filename="../build/ui_mainwindow.h" line="525"/>
         <source>Import &amp;from divelogs.de</source>
         <translation>自 Divelogs.de 匯入</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="416"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="415"/>
         <location filename="../build/ui_mainwindow.h" line="526"/>
         <source>&amp;Full screen</source>
         <translation>全螢幕</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="419"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="418"/>
         <location filename="../build/ui_mainwindow.h" line="528"/>
         <source>Toggle full screen</source>
         <translation>切換為全螢幕</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="447"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="421"/>
+        <location filename="../build/ui_mainwindow.h" line="530"/>
+        <source>F11</source>
+        <translation>F11</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="446"/>
         <location filename="../build/ui_mainwindow.h" line="531"/>
         <source>&amp;Check for updates</source>
         <translation>檢查有無更新</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="452"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="451"/>
         <location filename="../build/ui_mainwindow.h" line="532"/>
         <source>&amp;Export</source>
         <translation>匯出</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="458"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="454"/>
+        <location filename="../build/ui_mainwindow.h" line="534"/>
+        <source>Export dive logs</source>
+        <translation>匯出潛水記錄</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="457"/>
         <location filename="../build/ui_mainwindow.h" line="536"/>
         <source>Ctrl+E</source>
         <translation>Ctrl+E</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="466"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="462"/>
+        <location filename="../build/ui_mainwindow.h" line="537"/>
+        <source>Configure &amp;dive computer</source>
+        <translation>潛水電腦設定</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="465"/>
         <location filename="../build/ui_mainwindow.h" line="538"/>
         <source>Ctrl+Shift+C</source>
         <translation>Ctrl+Shift+C</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="474"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="473"/>
         <location filename="../build/ui_mainwindow.h" line="539"/>
         <source>Edit &amp;dive in planner</source>
         <translation>編輯潛水計畫</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="486"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="485"/>
         <location filename="../build/ui_mainwindow.h" line="540"/>
         <source>Toggle pO₂ graph</source>
         <translation>切換pO₂圖表</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="498"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="497"/>
         <location filename="../build/ui_mainwindow.h" line="541"/>
         <source>Toggle pN₂ graph</source>
         <translation>切換pN₂圖表</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="642"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="509"/>
+        <location filename="../build/ui_mainwindow.h" line="542"/>
+        <source>Toggle pHe graph</source>
+        <translation>切換 pHe 圖表</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="521"/>
+        <location filename="../build/ui_mainwindow.h" line="543"/>
+        <source>Toggle DC reported ceiling</source>
+        <translation>切換 DC 回報的上限深度</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="533"/>
+        <location filename="../build/ui_mainwindow.h" line="544"/>
+        <source>Toggle calculated ceiling</source>
+        <translation>切換計算的上限深度</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="545"/>
+        <location filename="../build/ui_mainwindow.h" line="545"/>
+        <source>Toggle calculating all tissues</source>
+        <translation>切換計算所有的組織</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="557"/>
+        <location filename="../build/ui_mainwindow.h" line="546"/>
+        <source>Toggle calculated ceiling with 3m increments</source>
+        <translation>切換以每次增加 3m 計算的上限深度</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="569"/>
+        <location filename="../build/ui_mainwindow.h" line="547"/>
+        <source>Toggle heart rate</source>
+        <translation>切換心跳率</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="581"/>
+        <location filename="../build/ui_mainwindow.h" line="548"/>
+        <source>Toggle MOD</source>
+        <translation>切換 MOD</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="593"/>
+        <location filename="../build/ui_mainwindow.h" line="549"/>
+        <source>Toggle EAD, END, EADD</source>
+        <translation>切換 EAD, END, EADD</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="605"/>
+        <location filename="../build/ui_mainwindow.h" line="550"/>
+        <source>Toggle NDL, TTS</source>
+        <translation>切換 NDL, TTS</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="617"/>
+        <location filename="../build/ui_mainwindow.h" line="551"/>
+        <source>Toggle SAC rate</source>
+        <translation>切換 SAC 率</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="629"/>
+        <location filename="../build/ui_mainwindow.h" line="552"/>
+        <source>Toggle ruler</source>
+        <translation>切換規則</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="641"/>
         <location filename="../build/ui_mainwindow.h" line="553"/>
         <source>Scale graph</source>
         <translation>調整圖表比例</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="654"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="653"/>
         <location filename="../build/ui_mainwindow.h" line="554"/>
         <source>Toggle pictures</source>
         <translation>切換圖片</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="666"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="665"/>
         <location filename="../build/ui_mainwindow.h" line="555"/>
         <source>Toggle tank bar</source>
         <translation>切換氣體壓力</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="674"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="673"/>
         <location filename="../build/ui_mainwindow.h" line="556"/>
         <source>&amp;Filter divelist</source>
         <translation>過濾潛水列表</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="689"/>
-        <location filename="../build/ui_mainwindow.h" line="558"/>
-        <source>Toggle tissue graph</source>
-        <translation>切換組織圖表</translation>
+        <location filename="../desktop-widgets/mainwindow.ui" line="676"/>
+        <location filename="../build/ui_mainwindow.h" line="557"/>
+        <source>Ctrl+F</source>
+        <translation>Ctrl+F</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="688"/>
+        <source>Toggle tissue heat-map</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="694"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="693"/>
         <location filename="../build/ui_mainwindow.h" line="559"/>
         <source>User &amp;survey</source>
         <translation>使用者自訂</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="699"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="698"/>
         <location filename="../build/ui_mainwindow.h" line="560"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="238"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="231"/>
         <source>&amp;Undo</source>
         <translation>復原</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="702"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="701"/>
         <location filename="../build/ui_mainwindow.h" line="561"/>
         <source>Ctrl+Z</source>
         <translation>Ctrl+Z</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="707"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="706"/>
         <location filename="../build/ui_mainwindow.h" line="562"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="239"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="232"/>
         <source>&amp;Redo</source>
         <translation>取消還原</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="710"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="709"/>
         <location filename="../build/ui_mainwindow.h" line="563"/>
         <source>Ctrl+Shift+Z</source>
         <translation>Ctrl+Shift+Z</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="715"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="714"/>
         <location filename="../build/ui_mainwindow.h" line="564"/>
         <source>&amp;Find moved images</source>
         <translation>搜尋移動的照片</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="720"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="719"/>
         <source>Open c&amp;loud storage</source>
         <translation>開啟雲端裝置</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="725"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="724"/>
         <source>Save to clo&amp;ud storage</source>
         <translation>儲存至雲端裝置</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="730"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="729"/>
         <location filename="../build/ui_mainwindow.h" line="567"/>
         <source>&amp;Manage dive sites</source>
         <translation>管理潛點</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="735"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="734"/>
         <source>Dive Site &amp;Edit</source>
         <translation>潛點編輯</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="740"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="739"/>
         <source>Facebook</source>
         <translation>Facebook</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="745"/>
-        <source>Add GPS location here</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="744"/>
+        <source>Take cloud storage online</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="677"/>
-        <location filename="../build/ui_mainwindow.h" line="557"/>
-        <source>Ctrl+F</source>
-        <translation>Ctrl+F</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="213"/>
-        <location filename="../build/ui_mainwindow.h" line="478"/>
-        <source>&amp;Print</source>
-        <translation>列印</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="224"/>
-        <location filename="../build/ui_mainwindow.h" line="481"/>
-        <source>Ctrl+,</source>
-        <translation>Ctrl+,</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="232"/>
-        <location filename="../build/ui_mainwindow.h" line="482"/>
-        <source>&amp;Quit</source>
-        <translation>結束</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="243"/>
-        <location filename="../build/ui_mainwindow.h" line="484"/>
-        <source>Import from &amp;dive computer</source>
-        <translation>從潛水電腦匯入</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="254"/>
-        <location filename="../build/ui_mainwindow.h" line="487"/>
-        <source>Ctrl+G</source>
-        <translation>Ctrl+G</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="267"/>
-        <location filename="../build/ui_mainwindow.h" line="490"/>
-        <source>Ctrl++</source>
-        <translation>Ctrl++</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="293"/>
-        <location filename="../build/ui_mainwindow.h" line="496"/>
-        <source>&amp;Renumber</source>
-        <translation>重新編號</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="296"/>
-        <location filename="../build/ui_mainwindow.h" line="497"/>
-        <source>Ctrl+R</source>
-        <translation>Ctrl+R</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="312"/>
-        <location filename="../build/ui_mainwindow.h" line="500"/>
-        <source>Ctrl+Y</source>
-        <translation>Ctrl+Y</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="392"/>
-        <location filename="../build/ui_mainwindow.h" line="519"/>
-        <source>Ctrl+L</source>
-        <translation>Ctrl+L</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="216"/>
-        <location filename="../build/ui_mainwindow.h" line="479"/>
-        <source>Ctrl+P</source>
-        <translation>Ctrl+P</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="235"/>
-        <location filename="../build/ui_mainwindow.h" line="483"/>
-        <source>Ctrl+Q</source>
-        <translation>Ctrl+Q</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="246"/>
-        <location filename="../build/ui_mainwindow.h" line="485"/>
-        <source>Ctrl+D</source>
-        <translation>Ctrl+D</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="264"/>
-        <location filename="../build/ui_mainwindow.h" line="489"/>
-        <source>&amp;Add dive</source>
-        <translation>新增潛水</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="304"/>
-        <location filename="../build/ui_mainwindow.h" line="498"/>
-        <source>Auto &amp;group</source>
-        <translation>自動群組</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="309"/>
-        <location filename="../build/ui_mainwindow.h" line="499"/>
-        <source>&amp;Yearly statistics</source>
-        <translation>年統計</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="317"/>
-        <location filename="../build/ui_mainwindow.h" line="501"/>
-        <source>&amp;Dive list</source>
-        <translation>潛水列表</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="320"/>
-        <location filename="../build/ui_mainwindow.h" line="502"/>
-        <source>Ctrl+2</source>
-        <translation>Ctrl+2</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="328"/>
-        <location filename="../build/ui_mainwindow.h" line="504"/>
-        <source>Ctrl+3</source>
-        <translation>Ctrl+3</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="336"/>
-        <location filename="../build/ui_mainwindow.h" line="506"/>
-        <source>Ctrl+4</source>
-        <translation>Ctrl+4</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="344"/>
-        <location filename="../build/ui_mainwindow.h" line="508"/>
-        <source>Ctrl+1</source>
-        <translation>Ctrl+1</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="349"/>
-        <location filename="../build/ui_mainwindow.h" line="509"/>
-        <source>P&amp;revious DC</source>
-        <translation>上一個 DC</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="352"/>
-        <location filename="../build/ui_mainwindow.h" line="510"/>
-        <source>Left</source>
-        <translation>左邊</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="360"/>
-        <location filename="../build/ui_mainwindow.h" line="512"/>
-        <source>Right</source>
-        <translation>右邊</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="373"/>
-        <location filename="../build/ui_mainwindow.h" line="514"/>
-        <source>User &amp;manual</source>
-        <translation>使用者說明</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="376"/>
-        <location filename="../build/ui_mainwindow.h" line="515"/>
-        <source>F1</source>
-        <translation>F1</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="384"/>
-        <location filename="../build/ui_mainwindow.h" line="517"/>
-        <source>Ctrl+5</source>
-        <translation>Ctrl+5</translation>
+        <location filename="../build/ui_mainwindow.h" line="558"/>
+        <source>Toggle tissue graph</source>
+        <translation>切換組織圖表</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="389"/>
-        <location filename="../build/ui_mainwindow.h" line="518"/>
-        <source>P&amp;lan dive</source>
-        <translation>計畫潛水</translation>
+        <location filename="../build/ui_mainwindow.h" line="565"/>
+        <source>Open cloud storage</source>
+        <translation>開啟雲端裝置</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="397"/>
-        <location filename="../build/ui_mainwindow.h" line="520"/>
-        <source>&amp;Import log files</source>
-        <translation>匯入日誌檔案</translation>
+        <location filename="../build/ui_mainwindow.h" line="566"/>
+        <source>Save to cloud storage</source>
+        <translation>儲存至雲端裝置</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="400"/>
-        <location filename="../build/ui_mainwindow.h" line="522"/>
-        <source>Import divelog files from other applications</source>
-        <translation>從其他程序導入潛水檔案文件</translation>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="331"/>
+        <source>Connect to</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="422"/>
-        <location filename="../build/ui_mainwindow.h" line="530"/>
-        <source>F11</source>
-        <translation>F11</translation>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="493"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="538"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1545"/>
+        <source>Please save or cancel the current dive edit before opening a new file.</source>
+        <translation>在開啟新檔前，請儲存或取消此次潛水的編輯。</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="505"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="499"/>
         <source>Open file</source>
         <translation>開啟檔案</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="509"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="503"/>
         <location filename="../desktop-widgets/mainwindow.cpp" line="614"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1972"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1978"/>
         <source>Cancel</source>
         <translation>取消</translation>
     </message>
@@ -5254,6 +5353,16 @@ mixed from Air and using:
         <translation>掃描影像...(需要稍待一段時間)</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="649"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="796"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="977"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="983"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1849"/>
+        <source>Warning</source>
+        <translation>提醒</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="674"/>
         <source>Please save or cancel the current dive edit before closing the file.</source>
         <translation>在關閉檔案前，請儲存或取消此次潛水的編輯。</translation>
@@ -5269,125 +5378,98 @@ mixed from Air and using:
         <translation>列印操作表格</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="982"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
+        <source>Trying to replan a dive that&apos;s not a planned dive.</source>
+        <translation>嘗試針對非原計畫的潛水進行重新規畫. </translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="977"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1849"/>
+        <source>Please, first finish the current edition before trying to do another.</source>
+        <translation>請在嘗試其他編輯時先完成當前編輯</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="983"/>
         <source>Trying to edit a dive that&apos;s not a manually added dive.</source>
         <translation>嘗試編輯非手動建立的潛水記錄. </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1243"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1030"/>
+        <source>Yearly statistics</source>
+        <translation>年統計</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1244"/>
         <source>Do you want to save the changes that you made in the file %1?</source>
         <translation>您是否要對檔案 %1 所做的修改儲存? </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1246"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1247"/>
         <source>Do you want to save the changes that you made in the data file?</source>
         <translation>您是否要對資料檔案所做的修改進行儲存? </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1251"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1252"/>
         <source>Save changes?</source>
         <translation>儲存變更? </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1587"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1253"/>
+        <source>Changes will be lost if you don&apos;t save them.</source>
+        <translation>如果不進行儲存，所做變更將會遺失。</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1572"/>
         <source>Save file as</source>
         <translation>另存新檔</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1682"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1573"/>
+        <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
+        <translation>Subsurface XML 檔案 (*.ssrf *.xml *.XML)</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1670"/>
+        <source>[local cache for] %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1672"/>
         <source>[cloud storage for] %1</source>
         <translation>[雲端裝置] %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1782"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1788"/>
         <source>Opening datafile from older version</source>
         <translation>從較舊的版本中開啟資料檔案</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1783"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1789"/>
         <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly.
 Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source>
         <translation>自舊版的 Subsurface 開啟資料檔案. 建議請先在新版程式中, 閱讀相關變更, 特別是有關潛點管理的部分. 
 Subsurface 已嘗試預先填寫部分資料, 值得花些時間看看新的潛點管理系統, 並確認資料是否正確. </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1794"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1800"/>
         <source>Open dive log file</source>
         <translation>打開潛水日誌檔案</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1795"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1801"/>
         <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1972"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1978"/>
         <source>Contacting cloud service...</source>
         <translation>聯絡雲端服務...</translation>
     </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1252"/>
-        <source>Changes will be lost if you don&apos;t save them.</source>
-        <translation>如果不進行儲存，所做變更將會遺失。</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="649"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="796"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="976"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="982"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/>
-        <source>Warning</source>
-        <translation>提醒</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="499"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="544"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1560"/>
-        <source>Please save or cancel the current dive edit before opening a new file.</source>
-        <translation>在開啟新檔前，請儲存或取消此次潛水的編輯。</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="338"/>
-        <source>Connect to</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
-        <source>Trying to replan a dive that&apos;s not a planned dive.</source>
-        <translation>嘗試針對非原計畫的潛水進行重新規畫. </translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1029"/>
-        <source>Yearly statistics</source>
-        <translation>年統計</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1588"/>
-        <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
-        <translation>Subsurface XML 檔案 (*.ssrf *.xml *.XML)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="976"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/>
-        <source>Please, first finish the current edition before trying to do another.</source>
-        <translation>請在嘗試其他編輯時先完成當前編輯</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_mainwindow.h" line="565"/>
-        <source>Open cloud storage</source>
-        <translation>開啟雲端裝置</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_mainwindow.h" line="566"/>
-        <source>Save to cloud storage</source>
-        <translation>儲存至雲端裝置</translation>
-    </message>
 </context>
 <context>
     <name>MultiFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="733"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="731"/>
         <source>Filter shows %1 (of %2) dives</source>
         <translation>過濾器顯示 %1 (of %2) 潛水</translation>
     </message>
@@ -5395,12 +5477,12 @@ Subsurface 已嘗試預先填寫部分資料, 值得花些時間看看新的潛�
 <context>
     <name>OstcFirmwareCheck</name>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="269"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="271"/>
         <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source>
         <translation>請更新您的潛水電腦韌體：目前的版本 %1，最新的版本是 %2</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="273"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="275"/>
         <source>
 
 Please start Bluetooth on your OSTC Sport and do the same preparations as for a logbook download before continuing with the update</source>
@@ -5409,27 +5491,27 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 請開啟 OSTC Sport 與 logbook 的藍芽功能，在更新之前，先下載日誌</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="274"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="276"/>
         <source>Not now</source>
         <translation>非現在</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="275"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="277"/>
         <source>Update firmware</source>
         <translation>更新韌體</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="277"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="279"/>
         <source>Firmware upgrade notice</source>
         <translation>韌體升級注意</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="295"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="297"/>
         <source>Save the downloaded firmware as</source>
         <translation>另存下載的韌體至</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="296"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="298"/>
         <source>HEX files (*.hex)</source>
         <translation>HEX 檔案 (*.hex)</translation>
     </message>
@@ -5437,79 +5519,89 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PlannerSettingsWidget</name>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="322"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="302"/>
         <source>Open circuit</source>
         <translation>開放式</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="322"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="302"/>
         <source>CCR</source>
         <translation>CCR</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="322"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="302"/>
         <source>pSCR</source>
         <translation>pSCR</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="421"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="388"/>
         <source>ft/min</source>
         <translation>ft/min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="422"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="389"/>
         <source>Last stop at 20ft</source>
         <translation>上一次在20英呎停留</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="423"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="390"/>
         <source>50% avg. depth to 20ft</source>
         <translation>50% avg. depth to 20ft</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="424"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="391"/>
         <source>20ft to surface</source>
         <translation>水面下 20 英尺</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="426"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="392"/>
+        <source>ft</source>
+        <translation>ft</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="394"/>
         <source>m/min</source>
         <translation>m/min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="427"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="395"/>
         <source>Last stop at 6m</source>
         <translation>Last stop at 6m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="428"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="396"/>
         <source>50% avg. depth to 6m</source>
         <translation>50% avg. depth to 6m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="429"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="397"/>
         <source>6m to surface</source>
         <translation>水面下 6m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="432"/>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="433"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="398"/>
+        <source>m</source>
+        <translation>m</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="401"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="402"/>
         <source>cuft/min</source>
         <translation>cuft/min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="441"/>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="442"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="410"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="411"/>
         <source>ℓ/min</source>
         <translation>ℓ/min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="451"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="420"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="456"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="425"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
@@ -5659,6 +5751,11 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PreferencesDialog</name>
     <message>
+        <location filename="../build/ui_preferences.h" line="1283"/>
+        <source>Preferences</source>
+        <translation>環境設定</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1288"/>
         <source>Defaults</source>
         <translation>預設值</translation>
@@ -5694,6 +5791,11 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>座標參考</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1303"/>
+        <source>Lists and tables</source>
+        <translation>列表與表單</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1304"/>
         <source>Font</source>
         <translation>字型</translation>
@@ -5709,6 +5811,11 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>潛水</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1307"/>
+        <source>Default dive log file</source>
+        <translation>預設潛水日誌檔案</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1308"/>
         <source>No default file</source>
         <translation>無預設檔案</translation>
@@ -5739,6 +5846,21 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>...</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1314"/>
+        <source>Display invalid</source>
+        <translation>顯示無效</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1316"/>
+        <source>Default cylinder</source>
+        <translation>預設氣瓶</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1317"/>
+        <source>Use default cylinder</source>
+        <translation>使用的預設氣瓶</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1318"/>
         <source>Animations</source>
         <translation>動畫演示</translation>
@@ -5769,40 +5891,24 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>系統</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1401"/>
-        <source>Dive site geo lookup</source>
-        <translation>潛點座標搜尋</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1402"/>
-        <source>Enable geocoding for dive site management</source>
-        <translation>潛點系統管理啟用座標化</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1403"/>
-        <source>Parse site without GPS data</source>
-        <translation>解析無 GPS 資料潛點</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1404"/>
-        <source>Same format for existing dives</source>
-        <translation>現存潛水記錄使用相同格式</translation>
+        <location filename="../build/ui_preferences.h" line="1324"/>
+        <source>&amp;Metric</source>
+        <translation>公制</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1405"/>
-        <source>Dive Site Layout</source>
-        <translation>潛點資訊配置</translation>
+        <location filename="../build/ui_preferences.h" line="1325"/>
+        <source>Imperial</source>
+        <translation>英制</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1406"/>
-        <location filename="../build/ui_preferences.h" line="1407"/>
-        <source>/</source>
-        <translation>/</translation>
+        <location filename="../build/ui_preferences.h" line="1326"/>
+        <source>Personali&amp;ze</source>
+        <translation>個人化</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1325"/>
-        <source>Imperial</source>
-        <translation>英制</translation>
+        <location filename="../build/ui_preferences.h" line="1327"/>
+        <source>Individual settings</source>
+        <translation>個別設定</translation>
     </message>
     <message>
         <location filename="../build/ui_preferences.h" line="1328"/>
@@ -5820,6 +5926,11 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>feet</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1331"/>
+        <source>Pressure</source>
+        <translation>壓力</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1332"/>
         <location filename="../build/ui_preferences.h" line="1366"/>
         <source>bar</source>
@@ -5831,11 +5942,26 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>psi</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1334"/>
+        <source>Volume</source>
+        <translation>容量</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1335"/>
+        <source>&amp;liter</source>
+        <translation>&amp;liter</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1336"/>
         <source>cu ft</source>
         <translation>cu ft</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1337"/>
+        <source>Temperature</source>
+        <translation>溫度</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1338"/>
         <source>celsius</source>
         <translation>攝氏</translation>
@@ -5846,11 +5972,121 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>華氏</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1340"/>
+        <source>Weight</source>
+        <translation>重量</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1341"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1342"/>
+        <source>lbs</source>
+        <translation>lbs</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1343"/>
+        <source>Time units</source>
+        <translation>時間單位</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1344"/>
+        <source>Ascent/descent speed denominator</source>
+        <translation>上升／下降速度分母</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1345"/>
+        <source>Minutes</source>
+        <translation>分</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1346"/>
+        <source>Seconds</source>
+        <translation>秒</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1347"/>
+        <source>GPS coordinates</source>
+        <translation>GPS座標</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1348"/>
+        <source>Location Display</source>
+        <translation>位置顯示</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1349"/>
+        <source>traditional (dms)</source>
+        <translation>傳統的 (dms)</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1350"/>
+        <source>decimal</source>
+        <translation>十進制</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1351"/>
+        <source>Show</source>
+        <translation>顯示</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1352"/>
+        <source>Threshold when showing pO₂</source>
+        <translation>顯示 pO₂ 時的臨界值</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1353"/>
+        <source>Threshold when showing pN₂</source>
+        <translation>顯示 pN₂ 時的臨界值</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1354"/>
+        <source>Threshold when showing pHe</source>
+        <translation>顯示 pHe 時的臨界值</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1355"/>
+        <source>Max pO₂ when showing MOD</source>
+        <translation>顯示 MOD 時最大的 pO₂</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1356"/>
+        <source>Draw dive computer reported ceiling red</source>
+        <translation>畫出潛水設備回報的警戒上限深度</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1357"/>
+        <source>Show unused cylinders in Equipment tab</source>
+        <translation>在裝備分頁中顯示未使用的氣瓶</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1358"/>
+        <source>Show average depth</source>
+        <translation>顯示平均深度</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1359"/>
+        <source>Misc</source>
+        <translation>其它</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1360"/>
+        <source>GFLow</source>
+        <translation>GFlow</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1361"/>
+        <source>GFHigh</source>
+        <translation>GFhigh</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_preferences.h" line="1362"/>
+        <source>GFLow at max depth</source>
+        <translation>最大深度的 GFLow</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1363"/>
         <source>CCR: show setpoints when viewing pO₂</source>
         <translation>CCR: 當查看pO₂時顯示setpoints</translation>
@@ -5896,14 +6132,19 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>系統預設</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1374"/>
+        <source>Filter</source>
+        <translation>篩選器</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1375"/>
         <source>Proxy</source>
         <translation>Proxy</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1379"/>
-        <source>Proxy type</source>
-        <translation>Proxy 種類</translation>
+        <location filename="../build/ui_preferences.h" line="1376"/>
+        <source>Port</source>
+        <translation>Port</translation>
     </message>
     <message>
         <location filename="../build/ui_preferences.h" line="1377"/>
@@ -5911,16 +6152,16 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>Host</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1376"/>
-        <source>Port</source>
-        <translation>Port</translation>
-    </message>
-    <message>
         <location filename="../build/ui_preferences.h" line="1378"/>
         <source>Requires authentication</source>
         <translation>需要認證</translation>
     </message>
     <message>
+        <location filename="../build/ui_preferences.h" line="1379"/>
+        <source>Proxy type</source>
+        <translation>Proxy 種類</translation>
+    </message>
+    <message>
         <location filename="../build/ui_preferences.h" line="1380"/>
         <source>Username</source>
         <translation>使用者名稱</translation>
@@ -5932,46 +6173,6 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>密碼</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1400"/>
-        <source>Disconnect from Facebook</source>
-        <translation>與Facebook中斷連線</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1374"/>
-        <source>Filter</source>
-        <translation>篩選器</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1331"/>
-        <source>Pressure</source>
-        <translation>壓力</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1303"/>
-        <source>Lists and tables</source>
-        <translation>列表與表單</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1307"/>
-        <source>Default dive log file</source>
-        <translation>預設潛水日誌檔案</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1314"/>
-        <source>Display invalid</source>
-        <translation>顯示無效</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1316"/>
-        <source>Default cylinder</source>
-        <translation>預設氣瓶</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1317"/>
-        <source>Use default cylinder</source>
-        <translation>使用的預設氣瓶</translation>
-    </message>
-    <message>
         <location filename="../build/ui_preferences.h" line="1382"/>
         <source>Subsurface cloud storage</source>
         <translation>Subsurface 雲端裝置</translation>
@@ -6012,149 +6213,40 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>是否儲存使用者 ID 於本機？</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1334"/>
-        <source>Volume</source>
-        <translation>容量</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1337"/>
-        <source>Temperature</source>
-        <translation>溫度</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1340"/>
-        <source>Weight</source>
-        <translation>重量</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1342"/>
-        <source>lbs</source>
-        <translation>lbs</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1343"/>
-        <source>Time units</source>
-        <translation>時間單位</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1345"/>
-        <source>Minutes</source>
-        <translation>分</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1346"/>
-        <source>Seconds</source>
-        <translation>秒</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1351"/>
-        <source>Show</source>
-        <translation>顯示</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1362"/>
-        <source>GFLow at max depth</source>
-        <translation>最大深度的 GFLow</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1359"/>
-        <source>Misc</source>
-        <translation>其它</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1283"/>
-        <source>Preferences</source>
-        <translation>環境設定</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1324"/>
-        <source>&amp;Metric</source>
-        <translation>公制</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1326"/>
-        <source>Personali&amp;ze</source>
-        <translation>個人化</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1327"/>
-        <source>Individual settings</source>
-        <translation>個別設定</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1335"/>
-        <source>&amp;liter</source>
-        <translation>&amp;liter</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1344"/>
-        <source>Ascent/descent speed denominator</source>
-        <translation>上升／下降速度分母</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1347"/>
-        <source>GPS coordinates</source>
-        <translation>GPS座標</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1348"/>
-        <source>Location Display</source>
-        <translation>位置顯示</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1349"/>
-        <source>traditional (dms)</source>
-        <translation>傳統的 (dms)</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1350"/>
-        <source>decimal</source>
-        <translation>十進制</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1352"/>
-        <source>Threshold when showing pO₂</source>
-        <translation>顯示 pO₂ 時的臨界值</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1353"/>
-        <source>Threshold when showing pN₂</source>
-        <translation>顯示 pN₂ 時的臨界值</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_preferences.h" line="1354"/>
-        <source>Threshold when showing pHe</source>
-        <translation>顯示 pHe 時的臨界值</translation>
+        <location filename="../build/ui_preferences.h" line="1400"/>
+        <source>Disconnect from Facebook</source>
+        <translation>與Facebook中斷連線</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1355"/>
-        <source>Max pO₂ when showing MOD</source>
-        <translation>顯示 MOD 時最大的 pO₂</translation>
+        <location filename="../build/ui_preferences.h" line="1401"/>
+        <source>Dive site geo lookup</source>
+        <translation>潛點座標搜尋</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1356"/>
-        <source>Draw dive computer reported ceiling red</source>
-        <translation>畫出潛水設備回報的警戒上限深度</translation>
+        <location filename="../build/ui_preferences.h" line="1402"/>
+        <source>Enable geocoding for dive site management</source>
+        <translation>潛點系統管理啟用座標化</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1357"/>
-        <source>Show unused cylinders in Equipment tab</source>
-        <translation>在裝備分頁中顯示未使用的氣瓶</translation>
+        <location filename="../build/ui_preferences.h" line="1403"/>
+        <source>Parse site without GPS data</source>
+        <translation>解析無 GPS 資料潛點</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1358"/>
-        <source>Show average depth</source>
-        <translation>顯示平均深度</translation>
+        <location filename="../build/ui_preferences.h" line="1404"/>
+        <source>Same format for existing dives</source>
+        <translation>現存潛水記錄使用相同格式</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1360"/>
-        <source>GFLow</source>
-        <translation>GFlow</translation>
+        <location filename="../build/ui_preferences.h" line="1405"/>
+        <source>Dive Site Layout</source>
+        <translation>潛點資訊配置</translation>
     </message>
     <message>
-        <location filename="../build/ui_preferences.h" line="1361"/>
-        <source>GFHigh</source>
-        <translation>GFhigh</translation>
+        <location filename="../build/ui_preferences.h" line="1406"/>
+        <location filename="../build/ui_preferences.h" line="1407"/>
+        <source>/</source>
+        <translation>/</translation>
     </message>
 </context>
 <context>
@@ -6210,106 +6302,136 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="20"/>
-        <source>Show</source>
-        <translation>顯示</translation>
+        <source>Gas pressure display setup</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="29"/>
-        <source>Threshold when showing pO₂</source>
-        <translation>顯示 pO₂ 時的臨界值</translation>
+        <source>Threshold for pO₂ (bar)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="49"/>
-        <source>Threshold when showing pN₂</source>
-        <translation>顯示 pN₂ 時的臨界值</translation>
+        <source>Threshold for pN₂ (bar)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="69"/>
-        <source>Threshold when showing pHe</source>
-        <translation>顯示 pHe 時的臨界值</translation>
+        <source>Threshold for pHe (bar)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="89"/>
-        <source>Max pO₂ when showing MOD</source>
-        <translation>顯示 MOD 時最大的 pO₂</translation>
+        <source>pO₂ in calculating MOD (bar)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="106"/>
+        <source>CCR options:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="113"/>
+        <source>Dive planner default setpoint (bar)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="133"/>
+        <source>Show setpoints when viewing pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="140"/>
+        <source>Show individual O₂ sensor values when viewing pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="150"/>
+        <source>Ceiling display setup</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="109"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="159"/>
         <source>Draw dive computer reported ceiling red</source>
         <translation>畫出潛水設備回報的警戒上限深度</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="116"/>
-        <source>Show unused cylinders in Equipment tab</source>
-        <translation>在裝備分頁中顯示未使用的氣瓶</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="169"/>
+        <source>Algorithm for calculated ceiling:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="123"/>
-        <source>Show mean depth</source>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="176"/>
+        <source>VPM-B</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="133"/>
-        <source>Misc</source>
-        <translation>其它</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="183"/>
+        <source>VPM-B Conservatism</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="149"/>
-        <source>bar</source>
-        <translation>bar</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="193"/>
+        <source>+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="165"/>
-        <source>Default CCR set-point for dive planning</source>
-        <translation>計畫潛水使用預設 CCR set-point</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="206"/>
+        <source>Bühlmann</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="172"/>
-        <source>pSCR O₂ metabolism rate</source>
-        <translation>pSCR O₂ 代謝速率</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="216"/>
+        <source>GFHigh</source>
+        <translation>GFhigh</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="179"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="236"/>
         <source>GFLow</source>
         <translation>GFlow</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="186"/>
-        <source>GFHigh</source>
-        <translation>GFhigh</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="256"/>
+        <source>GFLow at max depth</source>
+        <translation>最大深度的 GFLow</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="203"/>
-        <source>ℓ/min</source>
-        <translation>ℓ/min</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="263"/>
+        <source>pSCR options:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="213"/>
-        <source>pSCR ratio</source>
-        <translation>pSCR 比例</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="270"/>
+        <source>Metabolic rate (ℓ O₂/min)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="287"/>
+        <source>Dilution ratio</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="223"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="300"/>
         <source>1:</source>
         <translation>1:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="230"/>
-        <source>CCR: show individual O₂ sensor values when viewing pO₂</source>
-        <translation>CCR: 當查看 pO₂ 時，個別顯示 O₂ 感測器數值</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="310"/>
+        <source>Misc</source>
+        <translation>其它</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="237"/>
-        <source>CCR: show setpoints when viewing pO₂</source>
-        <translation>CCR: 當查看pO₂時顯示setpoints</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="316"/>
+        <source>Show unused cylinders in Equipment tab</source>
+        <translation>在裝備分頁中顯示未使用的氣瓶</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="244"/>
-        <source>GFLow at max depth</source>
-        <translation>最大深度的 GFLow</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="323"/>
+        <source>Show mean depth in Profile</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="10"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="9"/>
         <source>Graph</source>
         <translation>圖表</translation>
     </message>
@@ -6378,15 +6500,29 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>語言</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="57"/>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="53"/>
         <source>Restart required</source>
         <translation>需要重新啟動</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="58"/>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="54"/>
         <source>To correctly load a new language you must restart Subsurface.</source>
         <translation>您必須重新啟動 Subsurface 來正確載入新的語言。</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="76"/>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="82"/>
+        <source>Literal characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="77"/>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="83"/>
+        <source>Non-special character(s) in time format.
+These will be used as is. This might not be what you intended.
+See http://doc.qt.io/qt-5/qdatetime.html#toString</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PreferencesNetwork</name>
@@ -6433,7 +6569,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_network.ui" line="156"/>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="148"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="134"/>
         <source>Subsurface cloud storage</source>
         <translation>Subsurface 雲端裝置</translation>
     </message>
@@ -6478,39 +6614,39 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>是否儲存使用者 ID 於本機？</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="11"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="10"/>
         <source>Network</source>
         <translation>網路</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="15"/>
         <source>No proxy</source>
         <translation>無 proxy</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/>
         <source>System proxy</source>
         <translation>系統 proxy</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/>
         <source>HTTP proxy</source>
         <translation>HTTP proxy</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="19"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/>
         <source>SOCKS proxy</source>
         <translation>SOCKS proxy</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="75"/>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="97"/>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="110"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="72"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="93"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="106"/>
         <source>Cloud storage email and password can only consist of letters, numbers, and &apos;.&apos;, &apos;-&apos;, &apos;_&apos;, and &apos;+&apos;.</source>
         <translation>雲端裝置 email 與密碼只接受使用字母, 數字, 與 &apos;.&apos;, &apos;-&apos;, &apos;_&apos;, 和 &apos;+&apos;. </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="146"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="132"/>
         <source>Subsurface cloud storage (credentials verified)</source>
         <translation>Subsurface 雲端裝置 (證件認證)</translation>
     </message>
@@ -6668,7 +6804,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>十進制</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="8"/>
+        <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="7"/>
         <source>Units</source>
         <translation>單位</translation>
     </message>
@@ -6676,17 +6812,17 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PrintDialog</name>
     <message>
-        <location filename="../desktop-widgets/printdialog.cpp" line="118"/>
-        <source>&amp;Preview</source>
-        <translation>預覽</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/printdialog.cpp" line="115"/>
+        <location filename="../desktop-widgets/printdialog.cpp" line="102"/>
         <source>P&amp;rint</source>
         <translation>列印</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/printdialog.cpp" line="130"/>
+        <location filename="../desktop-widgets/printdialog.cpp" line="105"/>
+        <source>&amp;Preview</source>
+        <translation>預覽</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/printdialog.cpp" line="117"/>
         <source>Print</source>
         <translation>列印</translation>
     </message>
@@ -6694,19 +6830,10 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PrintOptions</name>
     <message>
-        <location filename="../build/ui_printoptions.h" line="150"/>
-        <source>&amp;Table print</source>
-        <translation>表格列印</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_printoptions.h" line="158"/>
-        <source>One dive per page</source>
-        <translation>每頁一支潛水</translation>
-    </message>
-    <message>
-        <location filename="../build/ui_printoptions.h" line="159"/>
-        <source>Two dives per page</source>
-        <translation>每頁兩支潛水</translation>
+        <location filename="../desktop-widgets/printoptions.ui" line="29"/>
+        <location filename="../build/ui_printoptions.h" line="148"/>
+        <source>Print type</source>
+        <translation>列印類型</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/printoptions.ui" line="41"/>
@@ -6766,10 +6893,19 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>匯入</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/printoptions.ui" line="29"/>
-        <location filename="../build/ui_printoptions.h" line="148"/>
-        <source>Print type</source>
-        <translation>列印類型</translation>
+        <location filename="../build/ui_printoptions.h" line="150"/>
+        <source>&amp;Table print</source>
+        <translation>表格列印</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_printoptions.h" line="158"/>
+        <source>One dive per page</source>
+        <translation>每頁一支潛水</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_printoptions.h" line="159"/>
+        <source>Two dives per page</source>
+        <translation>每頁兩支潛水</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/printoptions.cpp" line="128"/>
@@ -6811,103 +6947,103 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>未知的潛水電腦</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="755"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="752"/>
         <source>Show NDL / TTS was disabled because of excessive processing time</source>
         <translation>當超過處理時間，顯示關閉 NDL / TTS</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1344"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1338"/>
         <source>Make first divecomputer</source>
         <translation>設定第 1 潛水電腦</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1346"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1340"/>
         <source>Delete this divecomputer</source>
         <translation>刪除此潛水電腦</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1360"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1354"/>
         <source>Add gas change</source>
         <translation>增加氣瓶交換</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1363"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1357"/>
         <source> (Tank %1)</source>
         <translation> (Tank %1)</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1371"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1365"/>
         <source>Add set-point change</source>
         <translation>增加 set-point 變更</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1373"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1367"/>
         <source>Add bookmark</source>
         <translation>新增書籤</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1377"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1371"/>
         <source>Edit the profile</source>
         <translation>編輯摘要</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1381"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1375"/>
         <source>Remove event</source>
         <translation>移除事件</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1386"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1380"/>
         <source>Hide similar events</source>
         <translation>隱藏相似事件</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1393"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1387"/>
         <source>Edit name</source>
         <translation>潛水名稱</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1422"/>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1429"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1416"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1423"/>
         <source>Adjust pressure of tank %1 (currently interpolated as %2)</source>
         <translation>調整氣瓶 %1 壓力 (以 %2 插入目前位置)</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1444"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1438"/>
         <source>Unhide all events</source>
         <translation>取消隱藏所有事件</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1479"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1473"/>
         <source>Hide events</source>
         <translation>隱藏事件</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1479"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1473"/>
         <source>Hide all %1 events?</source>
         <translation>隱藏所有 %1 事件?</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1514"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1508"/>
         <source>Remove the selected event?</source>
         <translation>移除所選擇的事件？</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1515"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1509"/>
         <source>%1 @ %2:%3</source>
         <translation>%1 @ %2:%3</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1638"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1632"/>
         <source>Edit name of bookmark</source>
         <translation>編輯書籤名稱</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1639"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1633"/>
         <source>Custom name:</source>
         <translation>自訂名稱:</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1644"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1638"/>
         <source>Name is too long!</source>
         <translation>名稱太長！</translation>
     </message>
@@ -6915,91 +7051,101 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>QMLManager</name>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="95"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="97"/>
         <source>Starting...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="202"/>
         <source>working in no-cloud mode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="213"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="216"/>
         <source>no cloud credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="214"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="270"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="217"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="269"/>
         <source>Please enter valid cloud credentials.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="285"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="284"/>
         <source>Attempting to open cloud storage with new credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="304"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="306"/>
         <source>Testing cloud credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="331"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="320"/>
+        <source>No response from cloud server to validate the credentials</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="329"/>
+        <source>Cannot connect to cloud storage - cloud account not verified</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="361"/>
         <source>Cloud credentials are invalid</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="344"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="374"/>
         <source>Cannot open cloud storage: Error creating https connection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="357"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="387"/>
         <source>Cannot open cloud storage: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="369"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="399"/>
         <source>Cannot connect to cloud storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="411"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="441"/>
         <source>Cloud storage error: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="501"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="531"/>
         <source>Failed to connect to cloud server, reverting to no cloud status</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="520"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="550"/>
         <source>Cloud storage open successfully. No dives in dive list.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="689"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="690"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="721"/>
         <source>h</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="689"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="690"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="691"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="721"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="722"/>
         <source>min</source>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="689"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/>
         <source>sec</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="1041"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="1102"/>
         <source>Unknown GPS location</source>
         <translation type="unfinished"/>
     </message>
@@ -7007,126 +7153,126 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../core/qthelper.cpp" line="866"/>
-        <location filename="../core/qthelper.cpp" line="1214"/>
-        <source>AIR</source>
-        <translation>空氣</translation>
+        <location filename="../core/gpslocation.h" line="13"/>
+        <source>Waiting to aquire GPS location</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="1214"/>
-        <source>OXYGEN</source>
-        <translation>OXYGEN</translation>
+        <location filename="../core/qthelper.cpp" line="766"/>
+        <location filename="../core/qthelper.cpp" line="1275"/>
+        <source>m</source>
+        <translation>m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="59"/>
-        <source>Remove this point</source>
-        <translation>移除此點</translation>
+        <location filename="../core/qthelper.cpp" line="768"/>
+        <location filename="../core/qthelper.cpp" line="1274"/>
+        <source>ft</source>
+        <translation>ft</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="32"/>
-        <source>Average</source>
-        <translation>平均</translation>
+        <location filename="../core/qthelper.cpp" line="794"/>
+        <source>C</source>
+        <translation>C</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="35"/>
-        <source>Minimum</source>
-        <translation>最低</translation>
+        <location filename="../core/qthelper.cpp" line="796"/>
+        <source>F</source>
+        <translation>F</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="38"/>
-        <source>Maximum</source>
-        <translation>最高</translation>
+        <location filename="../core/qthelper.cpp" line="821"/>
+        <location filename="../core/qthelper.cpp" line="1250"/>
+        <source>kg</source>
+        <translation>kg</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/globe.cpp" line="327"/>
-        <source>Move the map and double-click to set the dive location</source>
-        <translation>在地圖上移動, 並且雙擊來設定潛水位置</translation>
+        <location filename="../core/qthelper.cpp" line="823"/>
+        <location filename="../core/qthelper.cpp" line="1251"/>
+        <source>lbs</source>
+        <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="28"/>
-        <source>unknown</source>
-        <translation>未知</translation>
+        <location filename="../core/qthelper.cpp" line="848"/>
+        <location filename="../core/qthelper.cpp" line="1300"/>
+        <source>bar</source>
+        <translation>bar</translation>
     </message>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="105"/>
-        <source>h:</source>
-        <translation>h:</translation>
+        <location filename="../core/qthelper.cpp" line="850"/>
+        <location filename="../core/qthelper.cpp" line="1299"/>
+        <source>psi</source>
+        <translation>psi</translation>
     </message>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="105"/>
-        <source>min</source>
-        <translation>min</translation>
+        <location filename="../core/qthelper.cpp" line="871"/>
+        <location filename="../core/qthelper.cpp" line="1235"/>
+        <source>AIR</source>
+        <translation>空氣</translation>
     </message>
     <message>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="337"/>
-        <source>Multiple</source>
+        <location filename="../core/qthelper.cpp" line="873"/>
+        <source>EAN</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="../core/qthelper.cpp" line="957"/>
+        <location filename="../core/qthelper.cpp" line="962"/>
         <source>(%n dive(s))</source>
         <translation type="unfinished"><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="816"/>
-        <location filename="../core/qthelper.cpp" line="1228"/>
-        <source>kg</source>
-        <translation>kg</translation>
+        <location filename="../core/qthelper.cpp" line="1235"/>
+        <source>OXYGEN</source>
+        <translation>OXYGEN</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="818"/>
-        <location filename="../core/qthelper.cpp" line="1229"/>
-        <source>lbs</source>
-        <translation>lbs</translation>
+        <location filename="../core/qthelper.cpp" line="1322"/>
+        <source>l</source>
+        <translation>l</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="763"/>
-        <location filename="../core/qthelper.cpp" line="1252"/>
-        <source>ft</source>
-        <translation>ft</translation>
+        <location filename="../core/qthelper.cpp" line="1323"/>
+        <source>cuft</source>
+        <translation>cuft</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="761"/>
-        <location filename="../core/qthelper.cpp" line="1253"/>
-        <source>m</source>
-        <translation>m</translation>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="29"/>
+        <source>unknown</source>
+        <translation>未知</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="789"/>
-        <source>C</source>
-        <translation>C</translation>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="114"/>
+        <source>h:</source>
+        <translation>h:</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="791"/>
-        <source>F</source>
-        <translation>F</translation>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="114"/>
+        <source>min</source>
+        <translation>min</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="845"/>
-        <location filename="../core/qthelper.cpp" line="1275"/>
-        <source>psi</source>
-        <translation>psi</translation>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="63"/>
+        <source>Remove this point</source>
+        <translation>移除此點</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="843"/>
-        <location filename="../core/qthelper.cpp" line="1276"/>
-        <source>bar</source>
-        <translation>bar</translation>
+        <location filename="../desktop-widgets/globe.cpp" line="327"/>
+        <source>Move the map and double-click to set the dive location</source>
+        <translation>在地圖上移動, 並且雙擊來設定潛水位置</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="868"/>
-        <source>EAN</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="32"/>
+        <source>Average</source>
+        <translation>平均</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="1298"/>
-        <source>l</source>
-        <translation>l</translation>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="35"/>
+        <source>Minimum</source>
+        <translation>最低</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="1299"/>
-        <source>cuft</source>
-        <translation>cuft</translation>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="38"/>
+        <source>Maximum</source>
+        <translation>最高</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="625"/>
@@ -7148,17 +7294,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <source>Malformed XML response. Line %1: %2</source>
         <translation>異常的 XML 回應. 第 %1 行: %2</translation>
     </message>
-    <message>
-        <location filename="../core/gpslocation.h" line="13"/>
-        <source>Waiting to aquire GPS location</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>ReadSettingsThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1651"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1676"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1640"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1665"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>所選取的潛水電腦，尚未支援此功能</translation>
     </message>
@@ -7187,7 +7328,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ResetSettingsThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1775"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1764"/>
         <source>Reset settings failed!</source>
         <translation>重置設定失敗! </translation>
     </message>
@@ -7225,6 +7366,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ShiftImageTimesDialog</name>
     <message>
+        <location filename="../desktop-widgets/shiftimagetimes.ui" line="23"/>
+        <location filename="../build/ui_shiftimagetimes.h" line="184"/>
+        <source>Shift selected image times</source>
+        <translation>移動所選擇的照片時間</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/shiftimagetimes.ui" line="34"/>
         <location filename="../build/ui_shiftimagetimes.h" line="185"/>
         <source>Shift times of image(s) by</source>
@@ -7237,12 +7384,6 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>h:mm</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/shiftimagetimes.ui" line="23"/>
-        <location filename="../build/ui_shiftimagetimes.h" line="184"/>
-        <source>Shift selected image times</source>
-        <translation>移動所選擇的照片時間</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/shiftimagetimes.ui" line="105"/>
         <location filename="../build/ui_shiftimagetimes.h" line="187"/>
         <source>Earlier</source>
@@ -7294,12 +7435,12 @@ Not all images have timestamps in the range between
         <translation>哪個日期和時間將會被顯示在圖片上?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="297"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="296"/>
         <source>Open image file</source>
         <translation>開啟影像檔</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="299"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="298"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>影像檔案 (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -7457,54 +7598,54 @@ Not all images have timestamps in the range between
 <context>
     <name>SocialNetworkDialog</name>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="339"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="284"/>
         <source>Dive date: %1 
 </source>
         <translation>潛水日期: %1 
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="342"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="287"/>
         <source>Duration: %1 
 </source>
         <translation>時間: %1 
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="343"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="288"/>
         <source>h:</source>
         <comment>abbreviation for hours plus separator</comment>
         <translation>h:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="344"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="289"/>
         <source>min</source>
         <comment>abbreviation for minutes</comment>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="347"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="292"/>
         <source>Dive location: %1 
 </source>
         <translation>潛水地點: %1 
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="350"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="295"/>
         <source>Buddy: %1 
 </source>
         <translation>潛伴: %1 
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="353"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="298"/>
         <source>Divemaster: %1 
 </source>
         <translation>潛導: %1 
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="356"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="301"/>
         <source>
 %1</source>
         <translation>
@@ -7590,9 +7731,20 @@ Not all images have timestamps in the range between
     <name>StartPage</name>
     <message>
         <location filename="../mobile-widgets/qml/StartPage.qml" line="19"/>
-        <source>To use Subsurface-mobile with Subsurface cloud storage, please enteryour cloud credentials.
+        <source>To use Subsurface-mobile with Subsurface cloud storage, please enter your cloud credentials.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/StartPage.qml" line="20"/>
+        <source>If this is the first time you use Subsurface cloud storage, enter a valid email (all lower case) and a password of your choice (letters and numbers). The server will send a PIN to the email address provided that you will have to enter here.
 
-To use Subsurface-mobile only with local data on this device, tap on the no cloud icon below.</source>
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/StartPage.qml" line="23"/>
+        <source>To use Subsurface-mobile only with local data on this device, tap on the no cloud icon below.</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -7631,7 +7783,12 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>SubsurfaceWebServices</name>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="419"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="395"/>
+        <source>Enter User ID and click Download</source>
+        <translation>輸入使用者 ID 並點選下載</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="417"/>
         <source>Webservice</source>
         <translation>網頁服務</translation>
     </message>
@@ -7656,30 +7813,25 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
         <translation>連結錯誤:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="557"/>
-        <source>Download successful</source>
-        <translation>下載成功</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="551"/>
         <source>Invalid user identifier!</source>
         <translation>錯誤的使用者 Id !</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="397"/>
-        <source>Enter User ID and click Download</source>
-        <translation>輸入使用者 ID 並點選下載</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="554"/>
         <source>Cannot parse response!</source>
         <translation>回覆無法解析!</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="557"/>
+        <source>Download successful</source>
+        <translation>下載成功</translation>
+    </message>
 </context>
 <context>
     <name>SuitFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="674"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="672"/>
         <source>Suits: </source>
         <translation>潛水衣: </translation>
     </message>
@@ -7687,7 +7839,7 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>SuitsFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="123"/>
+        <location filename="../qt-models/filtermodels.cpp" line="128"/>
         <source>No suit set</source>
         <translation>無套裝組合</translation>
     </message>
@@ -7706,7 +7858,7 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>TagFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="595"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="593"/>
         <source>Tags: </source>
         <translation>標籤:</translation>
     </message>
@@ -7714,7 +7866,7 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>TagFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="148"/>
+        <location filename="../qt-models/filtermodels.cpp" line="153"/>
         <source>Empty tags</source>
         <translation>空標籤</translation>
     </message>
@@ -7740,6 +7892,11 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>TemplateEdit</name>
     <message>
+        <location filename="../desktop-widgets/templateedit.ui" line="14"/>
+        <source>Edit template</source>
+        <translation>編輯樣板</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/templateedit.ui" line="37"/>
         <source>Preview</source>
         <translation>預覽</translation>
@@ -7785,11 +7942,6 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
         <translation>字型大小</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/templateedit.ui" line="14"/>
-        <source>Edit template</source>
-        <translation>編輯樣板</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/templateedit.ui" line="165"/>
         <source>Color palette</source>
         <translation>色盤</translation>
@@ -7971,85 +8123,12 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>TextHyperlinkEventFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="817"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="815"/>
         <source>%1click to visit %2</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>ThemeTest</name>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="29"/>
-        <source>Theme Information</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="33"/>
-        <source>Screen</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="42"/>
-        <source>Geometry (pixels):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="49"/>
-        <source>Geometry (gridUnits):</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="56"/>
-        <source>Units.gridUnit:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="63"/>
-        <source>Units.devicePixelRatio:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="70"/>
-        <source>Font Metrics</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="76"/>
-        <source>FontMetrics pointSize:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="83"/>
-        <source>FontMetrics pixelSize:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="90"/>
-        <source>FontMetrics devicePixelRatio:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="97"/>
-        <source>Text item pixelSize:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="104"/>
-        <source>Text item pointSize:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="111"/>
-        <source>Pixel density:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="118"/>
-        <source>Height of default font:</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
     <name>ToolTipItem</name>
     <message>
         <location filename="../profile-widget/divetooltipitem.cpp" line="136"/>
@@ -8060,102 +8139,107 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>TripItem</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="67"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="68"/>
         <source>(%1 shown)</source>
         <translation>(%1 顯示)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="194"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="197"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="215"/>
         <source>Date</source>
         <translation>日期</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="200"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="218"/>
         <source>Rating</source>
         <translation>評分</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
         <source>Depth(%1)</source>
         <translation>深度(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="206"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="224"/>
         <source>Duration</source>
         <translation>區間</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="209"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="227"/>
         <source>Temp(%1%2)</source>
         <translation>溫度(%1%2)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
         <source>Weight(%1)</source>
         <translation>重量(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="215"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="233"/>
         <source>Suit</source>
         <translation>防寒衣</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="218"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="236"/>
         <source>Cyl</source>
         <translation>氣瓶</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="239"/>
         <source>Gas</source>
         <translation>氣體</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="244"/>
         <source>SAC(%1)</source>
         <translation>SAC(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="244"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="229"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="247"/>
         <source>OTU</source>
         <translation>氧容許量 OTU</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="232"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="250"/>
         <source>Max CNS</source>
         <translation>最大 CNS</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="235"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="253"/>
+        <source>Photos before/during/after dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="256"/>
         <source>Location</source>
         <translation>位置</translation>
     </message>
@@ -8178,72 +8262,73 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>UpdateManager</name>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="69"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="61"/>
         <source>Check for updates.</source>
         <translation>檢查有無更新。</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="70"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="62"/>
         <source>Subsurface was unable to check for updates.</source>
         <translation>Subsurface 無法確認更新。</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="75"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="67"/>
         <source>The following error occurred:</source>
         <translation>錯誤持續發生:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="76"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="68"/>
         <source>Please check your internet connection.</source>
         <translation>請確認您的網路連線。</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="86"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="78"/>
         <source>You are using the latest version of Subsurface.</source>
         <translation>您已使用最新版的 Subsurface</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="89"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="81"/>
         <source>A new version of Subsurface is available.&lt;br/&gt;Click on:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; to download it.</source>
         <translation>新版 Subsurface 已提供使用，&lt;br/&gt;點選下載：&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt;</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="95"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="87"/>
         <source>A new version of Subsurface is available.</source>
         <translation>新版 Subsurface 已提供使用．</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="96"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="88"/>
         <source>Latest version is %1, please check %2 our download page %3 for information in how to update.</source>
         <translation>最新版本是 %1，請確認 %2 於下載頁面 %3，取得更新資訊。</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="106"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="98"/>
         <source>Newest release version is </source>
         <translation>最新釋出版本是</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="107"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="99"/>
         <source>The server returned the following information:</source>
         <translation>主機回傳下列資訊：</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="125"/>
-        <source>Subsurface is checking every two weeks if a new version is available. If you don&apos;t want Subsurface to continue checking, please click Decline.</source>
-        <translation>Subsurface 每２周會自動更新檢查，確認有無新版本釋出。若不想 Subsurface 繼續檢查，請點選取消。</translation>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="117"/>
+        <source>Subsurface is checking every two weeks if a new version is available. 
+ If you don&apos;t want Subsurface to continue checking, please click Decline.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="126"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="119"/>
         <source>Decline</source>
         <translation>取消</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="127"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="120"/>
         <source>Accept</source>
         <translation>同意</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/updatemanager.cpp" line="129"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="122"/>
         <source>Automatic check for updates</source>
         <translation>自動更新檢查</translation>
     </message>
@@ -8265,24 +8350,6 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
 <context>
     <name>UserSurvey</name>
     <message>
-        <location filename="../desktop-widgets/usersurvey.ui" line="44"/>
-        <location filename="../build/ui_usersurvey.h" line="151"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;We would love to learn more about our users, their preferences and their usage habits. Please spare a minute to fill out this form and submit it to the Subsurface team.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;我們願意與使用者學習，學習他們的配置、使用習慣。請協助用１分鐘時間，填寫問卷並回傳給 Subsurface 團隊。&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/usersurvey.ui" line="115"/>
-        <location filename="../build/ui_usersurvey.h" line="156"/>
-        <source>Other software/sources</source>
-        <translation>其它軟體／來源</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/usersurvey.ui" line="128"/>
-        <location filename="../build/ui_usersurvey.h" line="157"/>
-        <source>Manually entering dives</source>
-        <translation>手動記錄潛水資料</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="14"/>
         <location filename="../build/ui_usersurvey.h" line="149"/>
         <source>User survey</source>
@@ -8295,6 +8362,12 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
         <translation>Subsurface 使用者調查</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/usersurvey.ui" line="44"/>
+        <location filename="../build/ui_usersurvey.h" line="151"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;We would love to learn more about our users, their preferences and their usage habits. Please spare a minute to fill out this form and submit it to the Subsurface team.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;我們願意與使用者學習，學習他們的配置、使用習慣。請協助用１分鐘時間，填寫問卷並回傳給 Subsurface 團隊。&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="63"/>
         <location filename="../build/ui_usersurvey.h" line="152"/>
         <source>Technical diver</source>
@@ -8319,6 +8392,18 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
         <translation>支援的潛水電腦</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/usersurvey.ui" line="115"/>
+        <location filename="../build/ui_usersurvey.h" line="156"/>
+        <source>Other software/sources</source>
+        <translation>其它軟體／來源</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/usersurvey.ui" line="128"/>
+        <location filename="../build/ui_usersurvey.h" line="157"/>
+        <source>Manually entering dives</source>
+        <translation>手動記錄潛水資料</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="141"/>
         <location filename="../build/ui_usersurvey.h" line="158"/>
         <source>Android/iPhone companion app</source>
@@ -8349,6 +8434,11 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
         <translation>您是自哪裡匯入資料？</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/usersurvey.cpp" line="18"/>
+        <source>Send</source>
+        <translation>傳送</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/usersurvey.cpp" line="43"/>
         <source>
 Operating system: %1</source>
@@ -8392,19 +8482,14 @@ Language: %1</source>
         <translation>稍後再詢問</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/usersurvey.cpp" line="101"/>
-        <source>Submit user survey.</source>
-        <translation>傳送使用者調查。</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/usersurvey.cpp" line="82"/>
         <source>Ask again?</source>
         <translation>再次詢問？</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/usersurvey.cpp" line="18"/>
-        <source>Send</source>
-        <translation>傳送</translation>
+        <location filename="../desktop-widgets/usersurvey.cpp" line="101"/>
+        <source>Submit user survey.</source>
+        <translation>傳送使用者調查。</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/usersurvey.cpp" line="102"/>
@@ -8496,12 +8581,12 @@ Language: %1</source>
         <translation>上傳</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="324"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="325"/>
         <source>Operation timed out</source>
         <translation>操作時間結束</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="345"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="346"/>
         <source>Transferring data...</source>
         <translation>傳送資料...</translation>
     </message>
@@ -8536,18 +8621,18 @@ Language: %1</source>
 <context>
     <name>WriteSettingsThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1702"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1709"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1718"/>
-        <source>Failed!</source>
-        <translation>失敗！</translation>
-    </message>
-    <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1700"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="1721"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1689"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1710"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>此功能目前並不支援所選取的潛水電腦</translation>
     </message>
+    <message>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1691"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1698"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1707"/>
+        <source>Failed!</source>
+        <translation>失敗！</translation>
+    </message>
 </context>
 <context>
     <name>YearlyStatisticsModel</name>
@@ -8672,7 +8757,7 @@ Maximum</source>
 <context>
     <name>getextFromC</name>
     <message>
-        <location filename="../core/libdivecomputer.c" line="674"/>
+        <location filename="../core/libdivecomputer.c" line="737"/>
         <source>Error parsing the header</source>
         <translation>檔頭解析錯誤</translation>
     </message>
@@ -8680,38 +8765,377 @@ Maximum</source>
 <context>
     <name>gettextFromC</name>
     <message>
+        <location filename="../core/cochran.c" line="309"/>
+        <location filename="../core/cochran.c" line="315"/>
+        <location filename="../core/cochran.c" line="385"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>deco stop</source>
+        <translation>減壓停留</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="336"/>
+        <location filename="../core/cochran.c" line="390"/>
+        <location filename="../core/file.c" line="777"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>ascent</source>
+        <translation>上升</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="342"/>
+        <location filename="../core/file.c" line="755"/>
+        <source>battery</source>
+        <translation>電池</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="348"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
+        <source>OLF</source>
+        <translation>OLF</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="353"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
+        <source>maxdepth</source>
+        <translation>最大深度</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="358"/>
+        <location filename="../core/cochran.c" line="404"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
+        <source>pO₂</source>
+        <translation>pO₂</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="365"/>
+        <location filename="../core/cochran.c" line="414"/>
+        <location filename="../core/cochran.c" line="421"/>
+        <location filename="../core/file.c" line="868"/>
+        <location filename="../core/libdivecomputer.c" line="225"/>
+        <location filename="../core/libdivecomputer.c" line="228"/>
+        <source>gaschange</source>
+        <translation>氣瓶更換</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="370"/>
+        <location filename="../core/cochran.c" line="409"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>rbt</source>
+        <translation>剩餘滯底時間</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="379"/>
+        <location filename="../core/cochran.c" line="426"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>ceiling</source>
+        <translation>上限深度</translation>
+    </message>
+    <message>
+        <location filename="../core/cochran.c" line="395"/>
+        <location filename="../core/libdivecomputer.c" line="224"/>
+        <source>transmitter</source>
+        <translation>發射器</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="153"/>
+        <source>Error: the file does not appear to be a DATATRAK divelog</source>
+        <translation>錯誤: 此檔案並非為 DATATRAK 日誌格式</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="286"/>
+        <source>clear</source>
+        <translation>清除</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="289"/>
+        <source>misty</source>
+        <translation>模糊</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="292"/>
+        <source>fog</source>
+        <translation>霧</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="295"/>
+        <source>rain</source>
+        <translation>雨</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="298"/>
+        <source>storm</source>
+        <translation>風暴</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="301"/>
+        <source>snow</source>
+        <translation>雪</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="321"/>
+        <source>No suit</source>
+        <translation>無防寒衣</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="324"/>
+        <source>Shorty</source>
+        <translation>短袖防寒衣</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="327"/>
+        <source>Combi</source>
+        <translation>Combi</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="330"/>
+        <source>Wet suit</source>
+        <translation>濕式防寒衣</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="333"/>
+        <source>Semidry suit</source>
+        <translation>半乾衣</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="336"/>
+        <source>Dry suit</source>
+        <translation>乾式防寒衣</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="396"/>
+        <source>no stop</source>
+        <translation>無停留</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="398"/>
+        <location filename="../core/dive.c" line="29"/>
+        <source>deco</source>
+        <translation>減壓</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="400"/>
+        <source>single ascent</source>
+        <translation>單一上升</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="402"/>
+        <source>multiple ascent</source>
+        <translation>多層上升</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="404"/>
+        <location filename="../core/dive.c" line="27"/>
+        <source>fresh</source>
+        <translation>新進</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="406"/>
+        <source>salt water</source>
+        <translation>鹹水</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="431"/>
+        <source>sight seeing</source>
+        <translation>觀察景象</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="433"/>
+        <source>club dive</source>
+        <translation>社團潛水</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="435"/>
+        <location filename="../core/dive.c" line="28"/>
+        <source>instructor</source>
+        <translation>教練</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="437"/>
+        <source>instruction</source>
+        <translation>指示</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="439"/>
+        <location filename="../core/dive.c" line="27"/>
+        <source>night</source>
+        <translation>夜潛</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="441"/>
+        <location filename="../core/dive.c" line="25"/>
+        <source>cave</source>
+        <translation>洞穴</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="443"/>
+        <location filename="../core/dive.c" line="24"/>
+        <source>ice</source>
+        <translation>冰潛</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="445"/>
+        <source>search</source>
+        <translation>搜尋</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="455"/>
+        <location filename="../core/dive.c" line="25"/>
+        <source>wreck</source>
+        <translation>沈船</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="457"/>
+        <location filename="../core/dive.c" line="26"/>
+        <source>river</source>
+        <translation>河流</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="459"/>
+        <location filename="../core/dive.c" line="23"/>
+        <source>drift</source>
+        <translation>放流</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="461"/>
+        <location filename="../core/dive.c" line="28"/>
+        <source>photo</source>
+        <translation>照片</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="463"/>
+        <source>other</source>
+        <translation>其他</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="474"/>
+        <source>Other activities</source>
+        <translation>其它活動</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="498"/>
+        <source>Datatrak/Wlog notes</source>
+        <translation>Datatrak/Wlog 記錄</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="537"/>
+        <source>Manually entered dive</source>
+        <translation>手動輸入潛水</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="588"/>
+        <source>Unknown</source>
+        <translation>未知</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="674"/>
+        <source>Error: couldn&apos;t open the file %s</source>
+        <translation>錯誤: 無法開啟檔案 %s</translation>
+    </message>
+    <message>
+        <location filename="../core/datatrak.c" line="687"/>
+        <source>Error: no dive</source>
+        <translation>錯誤: 無潛水</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="23"/>
+        <source>boat</source>
+        <translation>船潛</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="23"/>
+        <source>shore</source>
+        <translation>岸潛</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="24"/>
+        <source>deep</source>
+        <translation>深潛</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="24"/>
+        <source>cavern</source>
+        <translation>地洞</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="25"/>
+        <source>altitude</source>
+        <translation>高海拔</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="26"/>
+        <source>pool</source>
+        <translation>泳池</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="26"/>
+        <source>lake</source>
+        <translation>湖泊</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="27"/>
+        <source>student</source>
+        <translation>學生</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="28"/>
+        <source>video</source>
+        <translation>影片</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="33"/>
+        <source>OC-gas</source>
+        <translation>OC 氣源</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="33"/>
+        <source>diluent</source>
+        <translation>填充氣體</translation>
+    </message>
+    <message>
+        <location filename="../core/dive.c" line="33"/>
+        <location filename="../core/equipment.c" line="88"/>
+        <location filename="../core/planner.c" line="1436"/>
+        <location filename="../core/planner.c" line="1439"/>
+        <source>oxygen</source>
+        <translation>氧氣</translation>
+    </message>
+    <message>
         <location filename="../core/dive.c" line="181"/>
         <source>pascal</source>
         <translation>pascal</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="186"/>
-        <location filename="../core/qthelper.cpp" line="669"/>
+        <location filename="../core/qthelper.cpp" line="674"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="190"/>
-        <location filename="../core/qthelper.cpp" line="672"/>
+        <location filename="../core/qthelper.cpp" line="677"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
+        <location filename="../core/dive.c" line="227"/>
+        <source>ℓ</source>
+        <translation>ℓ</translation>
+    </message>
+    <message>
         <location filename="../core/dive.c" line="232"/>
         <source>cuft</source>
         <translation>cuft</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="269"/>
-        <location filename="../core/qthelper.cpp" line="590"/>
-        <location filename="../core/qthelper.cpp" line="605"/>
+        <location filename="../core/qthelper.cpp" line="595"/>
+        <location filename="../core/qthelper.cpp" line="610"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="274"/>
-        <location filename="../core/qthelper.cpp" line="593"/>
-        <location filename="../core/qthelper.cpp" line="607"/>
+        <location filename="../core/qthelper.cpp" line="598"/>
+        <location filename="../core/qthelper.cpp" line="612"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
@@ -8737,53 +9161,58 @@ Maximum</source>
     </message>
     <message>
         <location filename="../core/dive.c" line="325"/>
-        <location filename="../core/qthelper.cpp" line="616"/>
-        <location filename="../core/qthelper.cpp" line="626"/>
+        <location filename="../core/qthelper.cpp" line="621"/>
+        <location filename="../core/qthelper.cpp" line="631"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="329"/>
-        <location filename="../core/qthelper.cpp" line="614"/>
-        <location filename="../core/qthelper.cpp" line="624"/>
+        <location filename="../core/qthelper.cpp" line="619"/>
+        <location filename="../core/qthelper.cpp" line="629"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="1772"/>
+        <location filename="../core/dive.c" line="1751"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) 或 (%s)</translation>
     </message>
     <message>
-        <location filename="../core/divelist.c" line="484"/>
+        <location filename="../core/divelist.c" line="487"/>
         <location filename="../core/equipment.c" line="84"/>
-        <location filename="../core/planner.c" line="1411"/>
-        <location filename="../core/planner.c" line="1414"/>
+        <location filename="../core/planner.c" line="1432"/>
+        <location filename="../core/planner.c" line="1435"/>
         <source>air</source>
         <translation>air</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="197"/>
+        <location filename="../core/equipment.c" line="86"/>
+        <source>EAN%d</source>
+        <translation>EAN%d</translation>
+    </message>
+    <message>
+        <location filename="../core/equipment.c" line="198"/>
         <source>integrated</source>
         <translation>整合型</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="198"/>
+        <location filename="../core/equipment.c" line="199"/>
         <source>belt</source>
         <translation>配重帶</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="199"/>
+        <location filename="../core/equipment.c" line="200"/>
         <source>ankle</source>
         <translation>腳踝</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="200"/>
+        <location filename="../core/equipment.c" line="201"/>
         <source>backplate weight</source>
         <translation>背板配重</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="201"/>
+        <location filename="../core/equipment.c" line="202"/>
         <source>clip-on</source>
         <translation>吊掛式</translation>
     </message>
@@ -8796,8 +9225,8 @@ Maximum</source>
         <location filename="../core/file.c" line="121"/>
         <location filename="../core/file.c" line="512"/>
         <location filename="../core/file.c" line="597"/>
-        <location filename="../core/file.c" line="924"/>
-        <location filename="../core/file.c" line="1056"/>
+        <location filename="../core/file.c" line="909"/>
+        <location filename="../core/file.c" line="1092"/>
         <location filename="../core/ostctools.c" line="80"/>
         <source>Failed to read &apos;%s&apos;</source>
         <translation>無法讀取 &apos;%s&apos;</translation>
@@ -8855,486 +9284,496 @@ Maximum</source>
         <translation>O₂ 校正</translation>
     </message>
     <message>
-        <location filename="../core/file.c" line="887"/>
-        <source>No matching DC found for file &apos;%s&apos;</source>
-        <translation>檔案 &apos;%s&apos; 尋無匹配的 DC</translation>
+        <location filename="../core/git-access.c" line="134"/>
+        <source>Local cache directory %s corrupted - can&apos;t sync with Subsurface cloud storage</source>
+        <translation>本地端暫存目錄 %s 損壞 - 無法與 Subsurface 雲端進行同步</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>none</source>
-        <translation>無</translation>
+        <location filename="../core/git-access.c" line="157"/>
+        <location filename="../core/git-access.c" line="177"/>
+        <source>Could not update local cache to newer remote data</source>
+        <translation>無法更新本地端暫存來更新遠端資料</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="309"/>
-        <location filename="../core/cochran.c" line="315"/>
-        <location filename="../core/cochran.c" line="385"/>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>deco stop</source>
-        <translation>減壓停留</translation>
+        <location filename="../core/git-access.c" line="170"/>
+        <source>Subsurface cloud storage corrupted</source>
+        <translation>Subsurface 雲端裝置中斷</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="342"/>
-        <location filename="../core/file.c" line="755"/>
-        <source>battery</source>
-        <translation>電池</translation>
+        <location filename="../core/git-access.c" line="284"/>
+        <source>Could not update Subsurface cloud storage, try again later</source>
+        <translation>無法更新 Subsurface 雲端裝置, 請稍待後重試</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="370"/>
-        <location filename="../core/cochran.c" line="409"/>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>rbt</source>
-        <translation>剩餘滯底時間</translation>
+        <location filename="../core/git-access.c" line="344"/>
+        <source>Remote storage and local data diverged. Error: merge failed (%s)</source>
+        <translation>遠端裝置與本地端資料分歧. 錯誤: 合併失敗 (%s)</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="336"/>
-        <location filename="../core/cochran.c" line="390"/>
-        <location filename="../core/file.c" line="777"/>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>ascent</source>
-        <translation>上升</translation>
+        <location filename="../core/git-access.c" line="374"/>
+        <source>Remote storage and local data diverged. Cannot combine local and remote changes</source>
+        <translation>遠端裝置與本機端資料分歧. 無法合併本機端與遠端的差異資料</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="379"/>
-        <location filename="../core/cochran.c" line="426"/>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>ceiling</source>
-        <translation>上限深度</translation>
+        <location filename="../core/git-access.c" line="408"/>
+        <source>Remote storage and local data diverged</source>
+        <translation>遠端裝置與本機端資料分歧</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="202"/>
-        <source>workload</source>
-        <translation>工作量</translation>
+        <location filename="../core/git-access.c" line="411"/>
+        <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source>
+        <translation>遠端裝置與本機端資料分歧. 錯誤: 寫入資料失敗 (%s)</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="395"/>
-        <location filename="../core/libdivecomputer.c" line="203"/>
-        <source>transmitter</source>
-        <translation>發射器</translation>
+        <location filename="../core/git-access.c" line="420"/>
+        <source>Problems with local cache of Subsurface cloud data</source>
+        <translation>Subsurface 雲端資料於本機端的暫存錯誤</translation>
+    </message>
+    <message>
+        <location filename="../core/git-access.c" line="421"/>
+        <source>Moved cache data to %s. Please try the operation again.</source>
+        <translation>搬移暫存資料至 %s. 請再嘗試操作. </translation>
+    </message>
+    <message>
+        <location filename="../core/git-access.c" line="743"/>
+        <source>Error connecting to Subsurface cloud storage</source>
+        <translation>錯誤連結至 Subsurface 雲端裝置</translation>
+    </message>
+    <message>
+        <location filename="../core/git-access.c" line="746"/>
+        <source>git clone of %s failed (%s)</source>
+        <translation>git clone %s 失敗 (%s)</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="210"/>
+        <location filename="../core/parse-xml.c" line="3317"/>
+        <location filename="../core/uemis-downloader.c" line="134"/>
+        <source>unknown</source>
+        <translation>未知</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>none</source>
+        <translation>無</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="203"/>
+        <location filename="../core/libdivecomputer.c" line="223"/>
+        <source>workload</source>
+        <translation>工作量</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="224"/>
         <source>violation</source>
         <translation>違反</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="203"/>
+        <location filename="../core/libdivecomputer.c" line="224"/>
         <source>bookmark</source>
         <translation>書籤</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="203"/>
+        <location filename="../core/libdivecomputer.c" line="224"/>
         <source>surface</source>
         <translation>水面</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="203"/>
+        <location filename="../core/libdivecomputer.c" line="224"/>
         <source>safety stop</source>
         <translation>安全停留</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="365"/>
-        <location filename="../core/cochran.c" line="414"/>
-        <location filename="../core/cochran.c" line="421"/>
-        <location filename="../core/file.c" line="868"/>
-        <location filename="../core/libdivecomputer.c" line="204"/>
-        <location filename="../core/libdivecomputer.c" line="207"/>
-        <source>gaschange</source>
-        <translation>氣瓶更換</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="204"/>
+        <location filename="../core/libdivecomputer.c" line="225"/>
         <source>safety stop (voluntary)</source>
         <translation>安全停留 (非必要)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="204"/>
+        <location filename="../core/libdivecomputer.c" line="225"/>
         <source>safety stop (mandatory)</source>
         <translation>安全停留 (強制性)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="205"/>
+        <location filename="../core/libdivecomputer.c" line="226"/>
         <source>deepstop</source>
         <translation>深停留</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="205"/>
+        <location filename="../core/libdivecomputer.c" line="226"/>
         <source>ceiling (safety stop)</source>
         <translation>上限深度 (安全停留)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="205"/>
-        <source>divetime</source>
-        <translation>潛水時間</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="205"/>
+        <location filename="../core/libdivecomputer.c" line="226"/>
         <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="../core/cochran.c" line="353"/>
-        <location filename="../core/libdivecomputer.c" line="206"/>
-        <source>maxdepth</source>
-        <translation>最大深度</translation>
-    </message>
-    <message>
-        <location filename="../core/cochran.c" line="348"/>
-        <location filename="../core/libdivecomputer.c" line="206"/>
-        <source>OLF</source>
-        <translation>OLF</translation>
+        <location filename="../core/libdivecomputer.c" line="226"/>
+        <source>divetime</source>
+        <translation>潛水時間</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="206"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
         <source>airtime</source>
         <translation>空氣時間</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="206"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
         <source>rgbm</source>
         <translation>rgbm</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="206"/>
+        <location filename="../core/libdivecomputer.c" line="227"/>
         <source>heading</source>
         <translation>標題</translation>
     </message>
     <message>
-        <location filename="../core/cochran.c" line="358"/>
-        <location filename="../core/cochran.c" line="404"/>
-        <location filename="../core/libdivecomputer.c" line="206"/>
-        <source>pO₂</source>
-        <translation>pO₂</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="207"/>
+        <location filename="../core/libdivecomputer.c" line="228"/>
         <source>tissue level warning</source>
         <translation>組織等級警告</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="207"/>
+        <location filename="../core/libdivecomputer.c" line="228"/>
         <source>non stop time</source>
         <translation>無停留時間</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="224"/>
+        <location filename="../core/libdivecomputer.c" line="237"/>
         <source>invalid event number</source>
         <translation>錯誤的事件編號</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="658"/>
-        <source>Unable to create parser for %s %s</source>
-        <translation>無法建立解析 %s %s</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="664"/>
-        <source>Error registering the data</source>
-        <translation>錯誤的登錄資料</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="495"/>
+        <location filename="../core/libdivecomputer.c" line="553"/>
         <source>Error parsing the datetime</source>
         <translation>日期時間解析錯誤</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="513"/>
+        <location filename="../core/libdivecomputer.c" line="571"/>
         <source>Dive %d: %s</source>
         <translation>潛水 %d: %s</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="519"/>
+        <location filename="../core/libdivecomputer.c" line="577"/>
         <source>Error parsing the divetime</source>
         <translation>潛水時間解析錯誤</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="529"/>
+        <location filename="../core/libdivecomputer.c" line="587"/>
         <source>Error parsing the maxdepth</source>
         <translation>最大深度解析錯誤</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="548"/>
+        <location filename="../core/libdivecomputer.c" line="606"/>
         <source>Error parsing temperature</source>
         <translation>錯誤溫度解析</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="568"/>
+        <location filename="../core/libdivecomputer.c" line="626"/>
         <source>Error parsing the gas mix count</source>
         <translation>混合氣體數量解析錯誤</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="580"/>
+        <location filename="../core/libdivecomputer.c" line="638"/>
         <source>Error obtaining water salinity</source>
         <translation>得到錯誤的海水鹽度</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="589"/>
+        <location filename="../core/libdivecomputer.c" line="647"/>
         <source>Error obtaining surface pressure</source>
         <translation>得到錯誤的水面壓力</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="614"/>
+        <location filename="../core/libdivecomputer.c" line="672"/>
         <source>Error obtaining divemode</source>
         <translation>錯誤潛水模式取得</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="634"/>
+        <location filename="../core/libdivecomputer.c" line="692"/>
         <source>Error parsing the gas mix</source>
         <translation>混合氣體解析錯誤</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="684"/>
+        <location filename="../core/libdivecomputer.c" line="717"/>
+        <source>Unable to create parser for %s %s</source>
+        <translation>無法建立解析 %s %s</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="723"/>
+        <source>Error registering the data</source>
+        <translation>錯誤的登錄資料</translation>
+    </message>
+    <message>
+        <location filename="../core/libdivecomputer.c" line="744"/>
         <source>Error parsing the samples</source>
         <translation>樣本解析錯誤</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="822"/>
+        <location filename="../core/libdivecomputer.c" line="882"/>
         <source>Event: waiting for user action</source>
         <translation>事件: 等待使用者動作</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="830"/>
+        <location filename="../core/libdivecomputer.c" line="890"/>
         <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="../core/libdivecomputer.c" line="894"/>
+        <location filename="../core/libdivecomputer.c" line="954"/>
         <source>Error registering the event handler.</source>
         <translation>錯誤的註冊程序.</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="899"/>
+        <location filename="../core/libdivecomputer.c" line="959"/>
         <source>Error registering the cancellation handler.</source>
         <translation>錯誤的註冊取消程序.</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="920"/>
+        <location filename="../core/libdivecomputer.c" line="980"/>
         <source>Dive data import error</source>
         <translation>匯入潛水資料錯誤</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="959"/>
+        <location filename="../core/libdivecomputer.c" line="1019"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>無法建立 libdivecomputer 上下文</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="966"/>
+        <location filename="../core/libdivecomputer.c" line="1026"/>
         <source>Unable to open %s %s (%s)</source>
         <translation> 無法開啟 %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="992"/>
+        <location filename="../core/libdivecomputer.c" line="1048"/>
         <source>Insufficient privileges to open the device %s %s (%s)</source>
         <translation>無權限開啟裝置 %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../core/parse-xml.c" line="517"/>
-        <source>Strange percentage reading %s
+        <location filename="../core/load-git.c" line="194"/>
+        <location filename="../core/parse-xml.c" line="1242"/>
+        <source>multiple GPS locations for this dive site; also %s
 </source>
-        <translation>有問題的讀取比例 %s
+        <translation>此潛點有複數個 GPS位置; 並 %s
 </translation>
     </message>
     <message>
-        <location filename="../core/load-git.c" line="194"/>
-        <location filename="../core/parse-xml.c" line="1238"/>
-        <source>multiple GPS locations for this dive site; also %s
+        <location filename="../core/load-git.c" line="222"/>
+        <location filename="../core/parse-xml.c" line="1304"/>
+        <source>additional name for site: %s
 </source>
-        <translation>此潛點有複數個 GPS位置; 並 %s
+        <translation>潛點別名: %s
 </translation>
     </message>
     <message>
-        <location filename="../core/parse-xml.c" line="2044"/>
+        <location filename="../core/ostctools.c" line="120"/>
+        <location filename="../core/ostctools.c" line="152"/>
+        <source>Unknown DC in dive %d</source>
+        <translation>未知 DC 於潛水 %d</translation>
+    </message>
+    <message>
+        <location filename="../core/ostctools.c" line="165"/>
+        <source>Error - %s - parsing dive %d</source>
+        <translation>錯誤 - %s - 解析潛水 %d</translation>
+    </message>
+    <message>
+        <location filename="../core/parse-xml.c" line="517"/>
+        <source>Strange percentage reading %s
+</source>
+        <translation>有問題的讀取比例 %s
+</translation>
+    </message>
+    <message>
+        <location filename="../core/parse-xml.c" line="2051"/>
         <source>Failed to parse &apos;%s&apos;</source>
         <translation>無法解析訊息 &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../core/parse-xml.c" line="3741"/>
+        <location filename="../core/parse-xml.c" line="3774"/>
         <source>Can&apos;t open stylesheet %s</source>
         <translation>無法開啟樣式 %s</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="86"/>
-        <source>EAN%d</source>
-        <translation>EAN%d</translation>
+        <location filename="../core/planner.c" line="555"/>
+        <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE %s ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source>
+        <translation>免責聲明 / 警告: 這是使用新發展的 %s 演算法, 且使用的潛水計畫僅經過有限次數的測試. 我們強烈建議不要僅使用此處模擬結果做為計畫.</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="1032"/>
-        <location filename="../core/planner.c" line="1184"/>
-        <source>Can&apos;t find gas %s</source>
-        <translation>無法找到氣體 %s</translation>
+        <location filename="../core/planner.c" line="569"/>
+        <source>Decompression calculation aborted due to excessive time</source>
+        <translation>已超過時間，減壓計算中止</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="368"/>
-        <source>Too many gas mixes</source>
-        <translation>太多氣體混合</translation>
+        <location filename="../core/planner.c" line="571"/>
+        <location filename="../core/planner.c" line="829"/>
+        <location filename="../core/planner.c" line="834"/>
+        <location filename="../core/planner.c" line="860"/>
+        <location filename="../core/planner.c" line="870"/>
+        <source>Warning:</source>
+        <translation>提醒:</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="568"/>
-        <source>Decompression calculation aborted due to excessive time</source>
-        <translation>已超過時間，減壓計算中止</translation>
+        <location filename="../core/planner.c" line="581"/>
+        <source>based on Bühlmann ZHL-16C with GFlow = %d and GFhigh = %d</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="586"/>
+        <source>based on VPM-B at nominal conservatism</source>
+        <translation>基於 VPM-B 於公定保守等級</translation>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="588"/>
+        <source>based on VPM-B at +%d conservatism</source>
+        <translation>基於 VPM-B 於 +%d 保守等級</translation>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="590"/>
+        <source>, effective GF=%d/%d</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="594"/>
+        <source>recreational mode based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source>
+        <translation>休閒潛水模式, 基於 Bühlmann ZHL-16B 以 GFlow = %d 和 GFhigh = %d</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="592"/>
+        <location filename="../core/planner.c" line="598"/>
         <source>Subsurface dive plan</source>
         <translation>Subsurface 潛水計畫</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="596"/>
-        <source>depth</source>
-        <translation>深度</translation>
+        <location filename="../core/planner.c" line="599"/>
+        <source>&lt;div&gt;Runtime: %dmin&lt;/div&gt;&lt;br&gt;</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="602"/>
-        <source>runtime</source>
-        <translation>作業時間</translation>
+        <location filename="../core/planner.c" line="604"/>
+        <source>depth</source>
+        <translation>深度</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="599"/>
+        <location filename="../core/planner.c" line="607"/>
         <source>duration</source>
         <translation>時間</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="554"/>
-        <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE %s ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source>
-        <translation>免責聲明 / 警告: 這是使用新發展的 %s 演算法, 且使用的潛水計畫僅經過有限次數的測試. 我們強烈建議不要僅使用此處模擬結果做為計畫.</translation>
+        <location filename="../core/planner.c" line="610"/>
+        <source>runtime</source>
+        <translation>作業時間</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="605"/>
+        <location filename="../core/planner.c" line="613"/>
         <source>gas</source>
         <translation>氣體</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="648"/>
+        <location filename="../core/planner.c" line="656"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation>轉換至 %.*f %s in %d:%02d min - 運行時間 %d:%02u on %s (SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="656"/>
+        <location filename="../core/planner.c" line="664"/>
         <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="../core/planner.c" line="669"/>
+        <location filename="../core/planner.c" line="677"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation>停留於 %.*f %s for %d:%02d min - 運行時間 %d:%02u on %s (SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="676"/>
+        <location filename="../core/planner.c" line="684"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source>
         <translation>停留在 %.*f %s for %d:%02d min - 運作時間 %d:%02u 於 %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="721"/>
+        <location filename="../core/planner.c" line="729"/>
         <source>%3.0f%s</source>
         <translation>%3.0f%s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="724"/>
-        <location filename="../core/planner.c" line="728"/>
+        <location filename="../core/planner.c" line="732"/>
+        <location filename="../core/planner.c" line="736"/>
         <source>%3dmin</source>
         <translation>%3dmin</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="737"/>
-        <location filename="../core/planner.c" line="749"/>
+        <location filename="../core/planner.c" line="745"/>
+        <location filename="../core/planner.c" line="757"/>
         <source>(SP = %.1fbar)</source>
         <translation>(SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="772"/>
+        <location filename="../core/planner.c" line="780"/>
         <source>Switch gas to %s (SP = %.1fbar)</source>
         <translation>氣體交換至 %s (SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="774"/>
+        <location filename="../core/planner.c" line="782"/>
         <source>Switch gas to %s</source>
         <translation>更換氣體至 %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="793"/>
+        <location filename="../core/planner.c" line="801"/>
         <source>CNS</source>
         <translation>CNS</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="795"/>
+        <location filename="../core/planner.c" line="803"/>
         <source>OTU</source>
         <translation>氧容許量 OTU</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="799"/>
+        <location filename="../core/planner.c" line="807"/>
         <source>Gas consumption (CCR legs excluded):</source>
         <translation>氣體消耗 (排除 CCR legs):</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="801"/>
+        <location filename="../core/planner.c" line="809"/>
         <source>Gas consumption:</source>
         <translation>氣體消耗:</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="570"/>
-        <location filename="../core/planner.c" line="821"/>
-        <location filename="../core/planner.c" line="826"/>
-        <location filename="../core/planner.c" line="851"/>
-        <location filename="../core/planner.c" line="861"/>
-        <source>Warning:</source>
-        <translation>提醒:</translation>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="580"/>
-        <source>based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source>
-        <translation>基於 Bühlmann ZHL-16B, 以 GFlow = %d 和 GFhigh = %d</translation>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="584"/>
-        <source>based on VPM-B at nominal conservatism</source>
-        <translation>基於 VPM-B 於公定保守等級</translation>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="586"/>
-        <source>based on VPM-B at +%d conservatism</source>
-        <translation>基於 VPM-B 於 +%d 保守等級</translation>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="588"/>
-        <source>recreational mode based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source>
-        <translation>休閒潛水模式, 基於 Bühlmann ZHL-16B 以 GFlow = %d 和 GFhigh = %d</translation>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="822"/>
+        <location filename="../core/planner.c" line="830"/>
         <source>this is more gas than available in the specified cylinder!</source>
         <translation>指定的氣瓶氣體超過供給量！</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="827"/>
+        <location filename="../core/planner.c" line="835"/>
         <source>not enough reserve for gas sharing on ascent!</source>
         <translation>無足夠的預留氣體可供上升使用！</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="829"/>
+        <location filename="../core/planner.c" line="837"/>
         <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source>
         <translation>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s 在計畫上升中)</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="831"/>
+        <location filename="../core/planner.c" line="839"/>
         <source>%.0f%s (%.0f%s during planned ascent) of %s</source>
         <translation>%.0f%s (%.0f%s 在計畫上升期間) of %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="848"/>
+        <location filename="../core/planner.c" line="857"/>
         <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
         <translation>高 pO₂ 數值 %.2f 發生於 %d:%02u 使用氣體 %s 在深度 %.*f %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="858"/>
+        <location filename="../core/planner.c" line="867"/>
         <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
         <translation>低 pO₂ 數值 %.2f 在 %d:%02u 使用氣源 %s 停留深度 %.*f %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="1419"/>
+        <location filename="../core/planner.c" line="1194"/>
+        <source>Can&apos;t find gas %s</source>
+        <translation>無法找到氣體 %s</translation>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="1440"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1280"/>
+        <location filename="../core/profile.c" line="1298"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
@@ -9343,63 +9782,63 @@ D: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1283"/>
+        <location filename="../core/profile.c" line="1301"/>
         <source>P: %d%s
 </source>
         <translation>P: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1287"/>
+        <location filename="../core/profile.c" line="1305"/>
         <source>T: %.1f%s
 </source>
         <translation>T: %.1f%s</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1293"/>
+        <location filename="../core/profile.c" line="1311"/>
         <source>V: %.1f%s
 </source>
         <translation>V: %.1f%s</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1296"/>
+        <location filename="../core/profile.c" line="1314"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation>SAC: %.*f%s/min
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1298"/>
+        <location filename="../core/profile.c" line="1316"/>
         <source>CNS: %u%%
 </source>
         <translation>CNS: %u%%</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1300"/>
+        <location filename="../core/profile.c" line="1318"/>
         <source>pO%s: %.2fbar
 </source>
         <translation>pO%s: %.2fbar</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1302"/>
+        <location filename="../core/profile.c" line="1320"/>
         <source>pN%s: %.2fbar
 </source>
         <translation>pN%s: %.2fbar</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1304"/>
+        <location filename="../core/profile.c" line="1322"/>
         <source>pHe: %.2fbar
 </source>
         <translation>pHe: %.2fbar</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1307"/>
+        <location filename="../core/profile.c" line="1325"/>
         <source>MOD: %d%s
 </source>
         <translation>MOD: %d%s</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1314"/>
+        <location filename="../core/profile.c" line="1332"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
@@ -9408,7 +9847,7 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1318"/>
+        <location filename="../core/profile.c" line="1336"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
@@ -9417,174 +9856,179 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1331"/>
+        <location filename="../core/profile.c" line="1349"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation>安全停留: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1334"/>
+        <location filename="../core/profile.c" line="1352"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation>安全停留: 未知時間 @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1339"/>
+        <location filename="../core/profile.c" line="1357"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation>Deco: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1342"/>
+        <location filename="../core/profile.c" line="1360"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation>減壓: 未知時間 @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1346"/>
+        <location filename="../core/profile.c" line="1364"/>
         <source>In deco
 </source>
         <translation>減壓中
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1348"/>
+        <location filename="../core/profile.c" line="1366"/>
         <source>NDL: %umin
 </source>
         <translation>NDL: %umin
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1351"/>
+        <location filename="../core/profile.c" line="1369"/>
         <source>TTS: %umin
 </source>
         <translation>TTS: %umin
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1354"/>
+        <location filename="../core/profile.c" line="1372"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation>減壓: %umin @ %.0f%s (calc)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1362"/>
+        <location filename="../core/profile.c" line="1380"/>
         <source>In deco (calc)
 </source>
         <translation>減壓 (計算)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1365"/>
+        <location filename="../core/profile.c" line="1383"/>
         <source>NDL: %umin (calc)
 </source>
         <translation>NDL:%umin (預計)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1367"/>
+        <location filename="../core/profile.c" line="1385"/>
         <source>NDL: &gt;2h (calc)
 </source>
         <translation>NDL: &gt;2h (calc)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1371"/>
+        <location filename="../core/profile.c" line="1389"/>
         <source>TTS: %umin (calc)
 </source>
         <translation>TTS: %umin (calc)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1373"/>
+        <location filename="../core/profile.c" line="1391"/>
         <source>TTS: &gt;2h (calc)
 </source>
         <translation>TTS: &gt;2h (calc)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1376"/>
+        <location filename="../core/profile.c" line="1394"/>
         <source>RBT: %umin
 </source>
         <translation>RBT: %umin
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1379"/>
+        <location filename="../core/profile.c" line="1397"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation>計算的上限深度 %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1385"/>
+        <location filename="../core/profile.c" line="1403"/>
         <source>Tissue %.0fmin: %.1f%s
 </source>
         <translation>組織 %.0fmin: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1391"/>
+        <location filename="../core/profile.c" line="1409"/>
         <source>heartbeat: %d
 </source>
         <translation>心跳: %d
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1393"/>
+        <location filename="../core/profile.c" line="1411"/>
         <source>bearing: %d
 </source>
         <translation>方位: %d
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1396"/>
+        <location filename="../core/profile.c" line="1414"/>
         <source>mean depth to here %.1f%s
 </source>
         <translation>至此的平均深度 %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1491"/>
+        <location filename="../core/profile.c" line="1515"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1495"/>
-        <location filename="../core/profile.c" line="1499"/>
-        <location filename="../core/profile.c" line="1503"/>
+        <location filename="../core/profile.c" line="1519"/>
+        <location filename="../core/profile.c" line="1523"/>
+        <location filename="../core/profile.c" line="1527"/>
         <source>%s %sD:%.1f%s</source>
         <translation>%s %sD:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1507"/>
+        <location filename="../core/profile.c" line="1531"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sD:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1511"/>
+        <location filename="../core/profile.c" line="1535"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1515"/>
-        <location filename="../core/profile.c" line="1519"/>
+        <location filename="../core/profile.c" line="1539"/>
+        <location filename="../core/profile.c" line="1543"/>
         <source>%s %sV:%.2f%s</source>
         <translation>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1526"/>
+        <location filename="../core/profile.c" line="1550"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s</translation>
     </message>
     <message>
+        <location filename="../core/profile.c" line="1575"/>
+        <source>%s SAC:%.*f %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../core/qthelper.cpp" line="67"/>
         <source>%1km</source>
         <translation>%1km</translation>
@@ -9605,446 +10049,460 @@ EADD: %d%s
         <translation>%1yd</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="635"/>
+        <location filename="../core/qthelper.cpp" line="91"/>
+        <location filename="../core/qthelper.cpp" line="226"/>
+        <source>N</source>
+        <translation>N</translation>
+    </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="91"/>
+        <location filename="../core/qthelper.cpp" line="227"/>
+        <source>S</source>
+        <translation>S</translation>
+    </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="92"/>
+        <location filename="../core/qthelper.cpp" line="228"/>
+        <source>E</source>
+        <translation>E</translation>
+    </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="92"/>
+        <location filename="../core/qthelper.cpp" line="229"/>
+        <source>W</source>
+        <translation>W</translation>
+    </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="640"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="638"/>
+        <location filename="../core/qthelper.cpp" line="643"/>
         <source>F</source>
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="23"/>
-        <source>boat</source>
-        <translation>船潛</translation>
+        <location filename="../core/save-html.c" line="469"/>
+        <location filename="../core/save-html.c" line="553"/>
+        <location filename="../core/worldmap-save.c" line="111"/>
+        <source>Can&apos;t open file %s</source>
+        <translation>無法開啟檔案 %s</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="23"/>
-        <source>shore</source>
-        <translation>岸潛</translation>
+        <location filename="../core/save-html.c" line="488"/>
+        <source>Number</source>
+        <translation>編號</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="459"/>
-        <location filename="../core/dive.c" line="23"/>
-        <source>drift</source>
-        <translation>放流</translation>
+        <location filename="../core/save-html.c" line="489"/>
+        <source>Date</source>
+        <translation>日期</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="24"/>
-        <source>deep</source>
-        <translation>深潛</translation>
+        <location filename="../core/save-html.c" line="490"/>
+        <source>Time</source>
+        <translation>時間</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="24"/>
-        <source>cavern</source>
-        <translation>地洞</translation>
+        <location filename="../core/save-html.c" line="491"/>
+        <source>Location</source>
+        <translation>位置</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="443"/>
-        <location filename="../core/dive.c" line="24"/>
-        <source>ice</source>
-        <translation>冰潛</translation>
+        <location filename="../core/save-html.c" line="492"/>
+        <source>Air temp.</source>
+        <translation>氣溫</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="445"/>
-        <source>search</source>
-        <translation>搜尋</translation>
+        <location filename="../core/save-html.c" line="493"/>
+        <source>Water temp.</source>
+        <translation>水溫</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="455"/>
-        <location filename="../core/dive.c" line="25"/>
-        <source>wreck</source>
-        <translation>沈船</translation>
+        <location filename="../core/save-html.c" line="494"/>
+        <source>Dives</source>
+        <translation>潛水</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="441"/>
-        <location filename="../core/dive.c" line="25"/>
-        <source>cave</source>
-        <translation>洞穴</translation>
+        <location filename="../core/save-html.c" line="495"/>
+        <source>Expand all</source>
+        <translation>全部展開</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="25"/>
-        <source>altitude</source>
-        <translation>高海拔</translation>
+        <location filename="../core/save-html.c" line="496"/>
+        <source>Collapse all</source>
+        <translation>全部摺疊</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="26"/>
-        <source>pool</source>
-        <translation>泳池</translation>
+        <location filename="../core/save-html.c" line="497"/>
+        <source>Trips</source>
+        <translation>旅程</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="26"/>
-        <source>lake</source>
-        <translation>湖泊</translation>
+        <location filename="../core/save-html.c" line="498"/>
+        <source>Statistics</source>
+        <translation>統計</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="457"/>
-        <location filename="../core/dive.c" line="26"/>
-        <source>river</source>
-        <translation>河流</translation>
+        <location filename="../core/save-html.c" line="499"/>
+        <source>Advanced search</source>
+        <translation>進階搜尋</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="439"/>
-        <location filename="../core/dive.c" line="27"/>
-        <source>night</source>
-        <translation>夜潛</translation>
+        <location filename="../core/save-html.c" line="502"/>
+        <source>Rating</source>
+        <translation>評分</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="153"/>
-        <source>Error: the file does not appear to be a DATATRAK divelog</source>
-        <translation>錯誤: 此檔案並非為 DATATRAK 日誌格式</translation>
+        <location filename="../core/save-html.c" line="503"/>
+        <source>Visibility</source>
+        <translation>能見度</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="286"/>
-        <source>clear</source>
-        <translation>清除</translation>
+        <location filename="../core/save-html.c" line="504"/>
+        <source>Duration</source>
+        <translation>區間</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="289"/>
-        <source>misty</source>
-        <translation>模糊</translation>
+        <location filename="../core/save-html.c" line="505"/>
+        <source>Divemaster</source>
+        <translation>潛導</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="292"/>
-        <source>fog</source>
-        <translation>霧</translation>
+        <location filename="../core/save-html.c" line="506"/>
+        <source>Buddy</source>
+        <translation>潛伴</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="295"/>
-        <source>rain</source>
-        <translation>雨</translation>
+        <location filename="../core/save-html.c" line="507"/>
+        <source>Suit</source>
+        <translation>防寒衣</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="298"/>
-        <source>storm</source>
-        <translation>風暴</translation>
+        <location filename="../core/save-html.c" line="508"/>
+        <source>Tags</source>
+        <translation>標籤</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="301"/>
-        <source>snow</source>
-        <translation>雪</translation>
+        <location filename="../core/save-html.c" line="509"/>
+        <location filename="../smtk-import/smartrak.c" line="251"/>
+        <location filename="../smtk-import/smartrak.c" line="321"/>
+        <source>Notes</source>
+        <translation>記錄</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="321"/>
-        <source>No suit</source>
-        <translation>無防寒衣</translation>
+        <location filename="../core/save-html.c" line="510"/>
+        <source>Show more details</source>
+        <translation>顯示更多細節</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="324"/>
-        <source>Shorty</source>
-        <translation>短袖防寒衣</translation>
+        <location filename="../core/save-html.c" line="513"/>
+        <source>Yearly statistics</source>
+        <translation>年統計</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="327"/>
-        <source>Combi</source>
-        <translation>Combi</translation>
+        <location filename="../core/save-html.c" line="514"/>
+        <source>Year</source>
+        <translation>年</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="330"/>
-        <source>Wet suit</source>
-        <translation>濕式防寒衣</translation>
+        <location filename="../core/save-html.c" line="515"/>
+        <source>Total time</source>
+        <translation>全部時間</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="333"/>
-        <source>Semidry suit</source>
-        <translation>半乾衣</translation>
+        <location filename="../core/save-html.c" line="516"/>
+        <source>Average time</source>
+        <translation>平均時間</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="336"/>
-        <source>Dry suit</source>
-        <translation>乾式防寒衣</translation>
+        <location filename="../core/save-html.c" line="517"/>
+        <source>Shortest time</source>
+        <translation>最短時間</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="396"/>
-        <source>no stop</source>
-        <translation>無停留</translation>
+        <location filename="../core/save-html.c" line="518"/>
+        <source>Longest time</source>
+        <translation>最長時間</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="400"/>
-        <source>single ascent</source>
-        <translation>單一上升</translation>
+        <location filename="../core/save-html.c" line="519"/>
+        <source>Average depth</source>
+        <translation>平均深度</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="402"/>
-        <source>multiple ascent</source>
-        <translation>多層上升</translation>
+        <location filename="../core/save-html.c" line="520"/>
+        <source>Min. depth</source>
+        <translation>最小深度</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="404"/>
-        <location filename="../core/dive.c" line="27"/>
-        <source>fresh</source>
-        <translation>新進</translation>
+        <location filename="../core/save-html.c" line="521"/>
+        <source>Max. depth</source>
+        <translation>最大深度</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="406"/>
-        <source>salt water</source>
-        <translation>鹹水</translation>
+        <location filename="../core/save-html.c" line="522"/>
+        <source>Average SAC</source>
+        <translation>平均SAC</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="431"/>
-        <source>sight seeing</source>
-        <translation>觀察景象</translation>
+        <location filename="../core/save-html.c" line="523"/>
+        <source>Min. SAC</source>
+        <translation>最小SAC</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="433"/>
-        <source>club dive</source>
-        <translation>社團潛水</translation>
+        <location filename="../core/save-html.c" line="524"/>
+        <source>Max. SAC</source>
+        <translation>最大SAC</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="437"/>
-        <source>instruction</source>
-        <translation>指示</translation>
+        <location filename="../core/save-html.c" line="525"/>
+        <source>Average temp.</source>
+        <translation>平均溫度</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="463"/>
-        <source>other</source>
-        <translation>其他</translation>
+        <location filename="../core/save-html.c" line="526"/>
+        <source>Min. temp.</source>
+        <translation>最低溫度</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="474"/>
-        <source>Other activities</source>
-        <translation>其它活動</translation>
+        <location filename="../core/save-html.c" line="527"/>
+        <source>Max. temp.</source>
+        <translation>最高溫度</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="498"/>
-        <source>Datatrak/Wlog notes</source>
-        <translation>Datatrak/Wlog 記錄</translation>
+        <location filename="../core/save-html.c" line="528"/>
+        <source>Back to list</source>
+        <translation>回到列表</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="537"/>
-        <source>Manually entered dive</source>
-        <translation>手動輸入潛水</translation>
+        <location filename="../core/save-html.c" line="531"/>
+        <source>Dive No.</source>
+        <translation>潛水編號</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="588"/>
-        <source>Unknown</source>
-        <translation>未知</translation>
+        <location filename="../core/save-html.c" line="532"/>
+        <source>Dive profile</source>
+        <translation>潛水摘要</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="674"/>
-        <source>Error: couldn&apos;t open the file %s</source>
-        <translation>錯誤: 無法開啟檔案 %s</translation>
+        <location filename="../core/save-html.c" line="533"/>
+        <source>Dive information</source>
+        <translation>潛水資訊</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="687"/>
-        <source>Error: no dive</source>
-        <translation>錯誤: 無潛水</translation>
+        <location filename="../core/save-html.c" line="534"/>
+        <source>Dive equipment</source>
+        <translation>潛水裝備</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="27"/>
-        <source>student</source>
-        <translation>學生</translation>
+        <location filename="../core/save-html.c" line="535"/>
+        <location filename="../core/save-html.c" line="542"/>
+        <source>Type</source>
+        <translation>類型</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="461"/>
-        <location filename="../core/dive.c" line="28"/>
-        <source>photo</source>
-        <translation>照片</translation>
+        <location filename="../core/save-html.c" line="536"/>
+        <source>Size</source>
+        <translation>容量</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="28"/>
-        <source>video</source>
-        <translation>影片</translation>
+        <location filename="../core/save-html.c" line="537"/>
+        <source>Work pressure</source>
+        <translation>工作壓力</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="435"/>
-        <location filename="../core/dive.c" line="28"/>
-        <source>instructor</source>
-        <translation>教練</translation>
+        <location filename="../core/save-html.c" line="538"/>
+        <source>Start pressure</source>
+        <translation>開始壓力</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="398"/>
-        <location filename="../core/dive.c" line="29"/>
-        <source>deco</source>
-        <translation>減壓</translation>
+        <location filename="../core/save-html.c" line="539"/>
+        <source>End pressure</source>
+        <translation>結束壓力</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="33"/>
-        <source>OC-gas</source>
-        <translation>OC 氣源</translation>
+        <location filename="../core/save-html.c" line="540"/>
+        <source>Gas</source>
+        <translation>氣體</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="33"/>
-        <source>diluent</source>
-        <translation>填充氣體</translation>
+        <location filename="../core/save-html.c" line="541"/>
+        <source>Weight</source>
+        <translation>重量</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="33"/>
-        <location filename="../core/equipment.c" line="88"/>
-        <location filename="../core/planner.c" line="1415"/>
-        <location filename="../core/planner.c" line="1418"/>
-        <source>oxygen</source>
-        <translation>氧氣</translation>
+        <location filename="../core/save-html.c" line="543"/>
+        <source>Events</source>
+        <translation>事件</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="227"/>
-        <source>ℓ</source>
-        <translation>ℓ</translation>
+        <location filename="../core/save-html.c" line="544"/>
+        <source>Name</source>
+        <translation>名字</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="239"/>
+        <location filename="../core/save-html.c" line="545"/>
+        <source>Value</source>
+        <translation>數值</translation>
+    </message>
+    <message>
+        <location filename="../core/save-html.c" line="546"/>
+        <source>Coordinates</source>
+        <translation>座標</translation>
+    </message>
+    <message>
+        <location filename="../core/save-html.c" line="547"/>
+        <source>Dive status</source>
+        <translation>潛水狀態</translation>
+    </message>
+    <message>
+        <location filename="../core/statistics.c" line="242"/>
         <source>more than %d days</source>
         <translation>超過 %d日</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="246"/>
+        <location filename="../core/statistics.c" line="249"/>
         <source>%dd %dh %dmin</source>
         <translation>%dd %dh %dmin</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="249"/>
+        <location filename="../core/statistics.c" line="252"/>
         <source>%dmin %dsecs</source>
         <translation>%dmin %dsecs</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="251"/>
+        <location filename="../core/statistics.c" line="254"/>
         <source>%dh %dmin</source>
         <translation>%dh %dmin</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="263"/>
+        <location filename="../core/statistics.c" line="266"/>
         <source>for dives #</source>
         <translation>針對潛水 #</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="269"/>
+        <location filename="../core/statistics.c" line="272"/>
         <source>for selected dives</source>
         <translation>針對選擇的潛水</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="304"/>
+        <location filename="../core/statistics.c" line="307"/>
         <source>for dive #%d</source>
         <translation>針對潛水 #%d</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="306"/>
+        <location filename="../core/statistics.c" line="309"/>
         <source>for selected dive</source>
         <translation>針對選擇的潛水</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="308"/>
+        <location filename="../core/statistics.c" line="311"/>
         <source>for all dives</source>
         <translation>針對所有潛水</translation>
     </message>
     <message>
-        <location filename="../core/statistics.c" line="310"/>
+        <location filename="../core/statistics.c" line="313"/>
         <source>(no dives)</source>
         <translation>(無潛水)</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Sun</source>
         <translation>周日</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Mon</source>
         <translation>周一</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Tue</source>
         <translation>周二</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Wed</source>
         <translation>周三</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Thu</source>
         <translation>周四</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Fri</source>
         <translation>周五</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="120"/>
+        <location filename="../core/subsurfacestartup.c" line="125"/>
         <source>Sat</source>
         <translation>周六</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Jan</source>
         <translation>1月</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Feb</source>
         <translation>2月</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Mar</source>
         <translation>3月</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Apr</source>
         <translation>4月</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>May</source>
         <translation>5月</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="129"/>
+        <location filename="../core/subsurfacestartup.c" line="134"/>
         <source>Jun</source>
         <translation>6月</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Jul</source>
         <translation>7月</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Aug</source>
         <translation>8月</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Sep</source>
         <translation>9月</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Oct</source>
         <translation>10月</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Nov</source>
         <translation>11月</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="130"/>
+        <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Dec</source>
         <translation>12月</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="191"/>
-        <location filename="../core/parse-xml.c" line="3284"/>
-        <location filename="../core/uemis-downloader.c" line="134"/>
-        <source>unknown</source>
-        <translation>未知</translation>
-    </message>
-    <message>
-        <location filename="../core/uemis-downloader.c" line="467"/>
-        <source>data</source>
-        <translation>資料</translation>
-    </message>
-    <message>
-        <location filename="../core/uemis-downloader.c" line="447"/>
-        <source>%s %s</source>
-        <translation>%s %s</translation>
-    </message>
-    <message>
         <location filename="../core/uemis-downloader.c" line="27"/>
         <source>Uemis Zurich: the file system is almost full.
 Disconnect/reconnect the dive computer
@@ -10075,6 +10533,16 @@ Uemis Zurich 已正確插入？</translation>
         <translation>無潛水記錄可下載. </translation>
     </message>
     <message>
+        <location filename="../core/uemis-downloader.c" line="447"/>
+        <source>%s %s</source>
+        <translation>%s %s</translation>
+    </message>
+    <message>
+        <location filename="../core/uemis-downloader.c" line="467"/>
+        <source>data</source>
+        <translation>資料</translation>
+    </message>
+    <message>
         <location filename="../core/uemis-downloader.c" line="495"/>
         <source>divelog #</source>
         <translation>潛水記錄 #</translation>
@@ -10245,281 +10713,6 @@ Uemis Zurich 已正確插入？</translation>
         <translation>低電量警告</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="469"/>
-        <location filename="../core/save-html.c" line="553"/>
-        <location filename="../core/worldmap-save.c" line="111"/>
-        <source>Can&apos;t open file %s</source>
-        <translation>無法開啟檔案 %s</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="488"/>
-        <source>Number</source>
-        <translation>編號</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="489"/>
-        <source>Date</source>
-        <translation>日期</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="490"/>
-        <source>Time</source>
-        <translation>時間</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="491"/>
-        <source>Location</source>
-        <translation>位置</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="492"/>
-        <source>Air temp.</source>
-        <translation>氣溫</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="493"/>
-        <source>Water temp.</source>
-        <translation>水溫</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="498"/>
-        <source>Statistics</source>
-        <translation>統計</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="502"/>
-        <source>Rating</source>
-        <translation>評分</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="503"/>
-        <source>Visibility</source>
-        <translation>能見度</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="504"/>
-        <source>Duration</source>
-        <translation>區間</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="494"/>
-        <source>Dives</source>
-        <translation>潛水</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="495"/>
-        <source>Expand all</source>
-        <translation>全部展開</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="496"/>
-        <source>Collapse all</source>
-        <translation>全部摺疊</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="497"/>
-        <source>Trips</source>
-        <translation>旅程</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="499"/>
-        <source>Advanced search</source>
-        <translation>進階搜尋</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="505"/>
-        <source>Divemaster</source>
-        <translation>潛導</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="506"/>
-        <source>Buddy</source>
-        <translation>潛伴</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="507"/>
-        <source>Suit</source>
-        <translation>防寒衣</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="508"/>
-        <source>Tags</source>
-        <translation>標籤</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="509"/>
-        <location filename="../smtk-import/smartrak.c" line="251"/>
-        <location filename="../smtk-import/smartrak.c" line="321"/>
-        <source>Notes</source>
-        <translation>記錄</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="510"/>
-        <source>Show more details</source>
-        <translation>顯示更多細節</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="513"/>
-        <source>Yearly statistics</source>
-        <translation>年統計</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="514"/>
-        <source>Year</source>
-        <translation>年</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="515"/>
-        <source>Total time</source>
-        <translation>全部時間</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="516"/>
-        <source>Average time</source>
-        <translation>平均時間</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="517"/>
-        <source>Shortest time</source>
-        <translation>最短時間</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="518"/>
-        <source>Longest time</source>
-        <translation>最長時間</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="519"/>
-        <source>Average depth</source>
-        <translation>平均深度</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="520"/>
-        <source>Min. depth</source>
-        <translation>最小深度</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="521"/>
-        <source>Max. depth</source>
-        <translation>最大深度</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="523"/>
-        <source>Min. SAC</source>
-        <translation>最小SAC</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="524"/>
-        <source>Max. SAC</source>
-        <translation>最大SAC</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="525"/>
-        <source>Average temp.</source>
-        <translation>平均溫度</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="526"/>
-        <source>Min. temp.</source>
-        <translation>最低溫度</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="527"/>
-        <source>Max. temp.</source>
-        <translation>最高溫度</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="528"/>
-        <source>Back to list</source>
-        <translation>回到列表</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="534"/>
-        <source>Dive equipment</source>
-        <translation>潛水裝備</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="537"/>
-        <source>Work pressure</source>
-        <translation>工作壓力</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="538"/>
-        <source>Start pressure</source>
-        <translation>開始壓力</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="539"/>
-        <source>End pressure</source>
-        <translation>結束壓力</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="547"/>
-        <source>Dive status</source>
-        <translation>潛水狀態</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="522"/>
-        <source>Average SAC</source>
-        <translation>平均SAC</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="531"/>
-        <source>Dive No.</source>
-        <translation>潛水編號</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="532"/>
-        <source>Dive profile</source>
-        <translation>潛水摘要</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="533"/>
-        <source>Dive information</source>
-        <translation>潛水資訊</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="535"/>
-        <location filename="../core/save-html.c" line="542"/>
-        <source>Type</source>
-        <translation>類型</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="536"/>
-        <source>Size</source>
-        <translation>容量</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="540"/>
-        <source>Gas</source>
-        <translation>氣體</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="541"/>
-        <source>Weight</source>
-        <translation>重量</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="543"/>
-        <source>Events</source>
-        <translation>事件</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="544"/>
-        <source>Name</source>
-        <translation>名字</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="545"/>
-        <source>Value</source>
-        <translation>數值</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="546"/>
-        <source>Coordinates</source>
-        <translation>座標</translation>
-    </message>
-    <message>
         <location filename="../core/worldmap-save.c" line="39"/>
         <source>Date:</source>
         <translation>日期:</translation>
@@ -10565,110 +10758,6 @@ Uemis Zurich 已正確插入？</translation>
         <translation>記錄:</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="91"/>
-        <location filename="../core/qthelper.cpp" line="226"/>
-        <source>N</source>
-        <translation>N</translation>
-    </message>
-    <message>
-        <location filename="../core/qthelper.cpp" line="91"/>
-        <location filename="../core/qthelper.cpp" line="227"/>
-        <source>S</source>
-        <translation>S</translation>
-    </message>
-    <message>
-        <location filename="../core/qthelper.cpp" line="92"/>
-        <location filename="../core/qthelper.cpp" line="228"/>
-        <source>E</source>
-        <translation>E</translation>
-    </message>
-    <message>
-        <location filename="../core/qthelper.cpp" line="92"/>
-        <location filename="../core/qthelper.cpp" line="229"/>
-        <source>W</source>
-        <translation>W</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="341"/>
-        <source>Remote storage and local data diverged. Error: merge failed (%s)</source>
-        <translation>遠端裝置與本地端資料分歧. 錯誤: 合併失敗 (%s)</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="134"/>
-        <source>Local cache directory %s corrupted - can&apos;t sync with Subsurface cloud storage</source>
-        <translation>本地端暫存目錄 %s 損壞 - 無法與 Subsurface 雲端進行同步</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="157"/>
-        <location filename="../core/git-access.c" line="177"/>
-        <source>Could not update local cache to newer remote data</source>
-        <translation>無法更新本地端暫存來更新遠端資料</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="170"/>
-        <source>Subsurface cloud storage corrupted</source>
-        <translation>Subsurface 雲端裝置中斷</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="285"/>
-        <source>Could not update Subsurface cloud storage, try again later</source>
-        <translation>無法更新 Subsurface 雲端裝置, 請稍待後重試</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="371"/>
-        <source>Remote storage and local data diverged. Cannot combine local and remote changes</source>
-        <translation>遠端裝置與本機端資料分歧. 無法合併本機端與遠端的差異資料</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="405"/>
-        <source>Remote storage and local data diverged</source>
-        <translation>遠端裝置與本機端資料分歧</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="408"/>
-        <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source>
-        <translation>遠端裝置與本機端資料分歧. 錯誤: 寫入資料失敗 (%s)</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="417"/>
-        <source>Problems with local cache of Subsurface cloud data</source>
-        <translation>Subsurface 雲端資料於本機端的暫存錯誤</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="418"/>
-        <source>Moved cache data to %s. Please try the operation again.</source>
-        <translation>搬移暫存資料至 %s. 請再嘗試操作. </translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="737"/>
-        <source>Error connecting to Subsurface cloud storage</source>
-        <translation>錯誤連結至 Subsurface 雲端裝置</translation>
-    </message>
-    <message>
-        <location filename="../core/git-access.c" line="740"/>
-        <source>git clone of %s failed (%s)</source>
-        <translation>git clone %s 失敗 (%s)</translation>
-    </message>
-    <message>
-        <location filename="../core/load-git.c" line="222"/>
-        <location filename="../core/parse-xml.c" line="1300"/>
-        <source>additional name for site: %s
-</source>
-        <translation>潛點別名: %s
-</translation>
-    </message>
-    <message>
-        <location filename="../core/ostctools.c" line="120"/>
-        <location filename="../core/ostctools.c" line="152"/>
-        <source>Unknown DC in dive %d</source>
-        <translation>未知 DC 於潛水 %d</translation>
-    </message>
-    <message>
-        <location filename="../core/ostctools.c" line="165"/>
-        <source>Error - %s - parsing dive %d</source>
-        <translation>錯誤 - %s - 解析潛水 %d</translation>
-    </message>
-    <message>
         <location filename="../smtk-import/smartrak.c" line="247"/>
         <source>Built</source>
         <translation type="unfinished"/>
@@ -10752,155 +10841,120 @@ Uemis Zurich 已正確插入？</translation>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="91"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="103"/>
         <source>Subsurface</source>
         <translation>Subsurface</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="97"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="110"/>
         <source>Dive list</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="112"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="125"/>
         <source>Cloud credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="126"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="139"/>
         <source>Manage dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="138"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="141"/>
         <source>Add dive manually</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="146"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="149"/>
         <source>Manual sync with cloud</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="164"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="167"/>
         <source>Offline mode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="164"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="167"/>
         <source>Enable auto cloud sync</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="182"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="187"/>
         <source>GPS</source>
         <translation>GPS</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="185"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="190"/>
         <source>GPS-tag dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="192"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="197"/>
         <source>Upload GPS data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="199"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="204"/>
         <source>Download GPS data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="206"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="211"/>
         <source>Show GPS fixes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="215"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="220"/>
         <source>Clear GPS cache</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="221"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="226"/>
         <source>Preferences</source>
         <translation>環境設定</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="230"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="237"/>
         <source>Developer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="232"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="239"/>
         <source>App log</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="239"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="246"/>
         <source>Theme information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="246"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="253"/>
         <source>User manual</source>
         <translation>使用者說明</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="252"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="259"/>
         <source>About</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="283"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="304"/>
         <source>Run location service</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="283"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="304"/>
         <source>No GPS source available</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="295"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="316"/>
         <source>Actions</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="9"/>
-        <source>Hello World</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="13"/>
-        <source>File</source>
-        <translation>檔案</translation>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="15"/>
-        <source>&amp;Open</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="19"/>
-        <source>Exit</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="27"/>
-        <source>Button 1 pressed</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="28"/>
-        <source>Button 2 pressed</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="33"/>
-        <source>May I have your attention, please?</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>plannerDetails</name>
@@ -10978,6 +11032,24 @@ p, li { white-space: pre-wrap; }
         <translation>m/min</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="121"/>
+        <location filename="../build/ui_plannerSettings.h" line="425"/>
+        <source>75% to 50% avg. depth</source>
+        <translation>75% ~ 50% 的平均深度</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="138"/>
+        <location filename="../build/ui_plannerSettings.h" line="427"/>
+        <source>50% avg. depth to 6m</source>
+        <translation>50% avg. depth to 6m</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="155"/>
+        <location filename="../build/ui_plannerSettings.h" line="429"/>
+        <source>6m to surface</source>
+        <translation>水面下 6m</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="175"/>
         <location filename="../build/ui_plannerSettings.h" line="431"/>
         <source>Descent</source>
@@ -11001,12 +11073,35 @@ p, li { white-space: pre-wrap; }
         <translation>VPM-B 減壓</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="268"/>
+        <source>Bühlmann deco</source>
+        <translation>Bühlmann 減壓</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="278"/>
         <location filename="../build/ui_plannerSettings.h" line="445"/>
         <source>Reserve gas</source>
         <translation>預留氣源</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="288"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="549"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="578"/>
+        <location filename="../build/ui_plannerSettings.h" line="446"/>
+        <location filename="../build/ui_plannerSettings.h" line="459"/>
+        <location filename="../build/ui_plannerSettings.h" line="461"/>
+        <source>bar</source>
+        <translation>bar</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="307"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="416"/>
+        <location filename="../build/ui_plannerSettings.h" line="437"/>
+        <location filename="../build/ui_plannerSettings.h" line="440"/>
+        <source>%</source>
+        <translation>%</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="320"/>
         <location filename="../build/ui_plannerSettings.h" line="449"/>
         <source>Postpone gas change if a stop is not required</source>
@@ -11025,12 +11120,10 @@ p, li { white-space: pre-wrap; }
         <translation>低 GF</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="307"/>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="416"/>
-        <location filename="../build/ui_plannerSettings.h" line="437"/>
-        <location filename="../build/ui_plannerSettings.h" line="440"/>
-        <source>%</source>
-        <translation>%</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="353"/>
+        <location filename="../build/ui_plannerSettings.h" line="436"/>
+        <source>Plan backgas breaks</source>
+        <translation>計畫後氣瓶中斷點</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="360"/>
@@ -11039,10 +11132,10 @@ p, li { white-space: pre-wrap; }
         <translation>高 GF</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="429"/>
-        <location filename="../build/ui_plannerSettings.h" line="441"/>
-        <source>Drop to first depth</source>
-        <translation>下降至第 1 深度</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="370"/>
+        <location filename="../build/ui_plannerSettings.h" line="453"/>
+        <source>min</source>
+        <translation>min</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="389"/>
@@ -11051,163 +11144,139 @@ p, li { white-space: pre-wrap; }
         <translation>Last stop at 6m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="353"/>
-        <location filename="../build/ui_plannerSettings.h" line="436"/>
-        <source>Plan backgas breaks</source>
-        <translation>計畫後氣瓶中斷點</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="396"/>
+        <source>Maximize bottom time allowed by gas and no decompression limits</source>
+        <translation>由氣體與減壓限制決定最大置底時間</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="515"/>
-        <location filename="../build/ui_plannerSettings.h" line="455"/>
-        <source>Gas options</source>
-        <translation>氣體選項</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="399"/>
+        <location filename="../build/ui_plannerSettings.h" line="443"/>
+        <source>Recreational mode</source>
+        <translation>休閒潛水模式</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="594"/>
-        <location filename="../build/ui_plannerSettings.h" line="456"/>
-        <source>Bottom SAC</source>
-        <translation>水底耗氣率</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="429"/>
+        <location filename="../build/ui_plannerSettings.h" line="441"/>
+        <source>Drop to first depth</source>
+        <translation>下降至第 1 深度</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="692"/>
-        <location filename="../build/ui_plannerSettings.h" line="457"/>
-        <source>Deco SAC</source>
-        <translation>減壓 SAC</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="436"/>
+        <location filename="../build/ui_plannerSettings.h" line="452"/>
+        <source>Min. switch duration</source>
+        <translation>最短交換時間</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="601"/>
-        <location filename="../build/ui_plannerSettings.h" line="458"/>
-        <source>Bottom pO₂</source>
-        <translation>水底 pO₂</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="459"/>
+        <location filename="../build/ui_plannerSettings.h" line="444"/>
+        <source>Safety stop</source>
+        <translation>安全停留</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="685"/>
-        <location filename="../build/ui_plannerSettings.h" line="460"/>
-        <source>Deco pO₂</source>
-        <translation>減壓 pO₂</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="495"/>
+        <source>Conservatism level</source>
+        <translation>保守等級</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="515"/>
+        <location filename="../build/ui_plannerSettings.h" line="455"/>
+        <source>Gas options</source>
+        <translation>氣體選項</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="565"/>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="672"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="698"/>
         <location filename="../build/ui_plannerSettings.h" line="462"/>
         <location filename="../build/ui_plannerSettings.h" line="463"/>
         <source>ℓ/min</source>
         <translation>ℓ/min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="632"/>
-        <location filename="../build/ui_plannerSettings.h" line="468"/>
-        <source>Display runtime</source>
-        <translation>顯示運作時間</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="645"/>
-        <location filename="../build/ui_plannerSettings.h" line="472"/>
-        <source>Display segment duration</source>
-        <translation>顯示分段區間</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="655"/>
-        <location filename="../build/ui_plannerSettings.h" line="476"/>
-        <source>Display transitions in deco</source>
-        <translation>在減壓中顯示禁飛時間</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="662"/>
-        <location filename="../build/ui_plannerSettings.h" line="477"/>
-        <source>Verbatim dive plan</source>
-        <translation>逐步潛水計畫</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="288"/>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="549"/>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="578"/>
-        <location filename="../build/ui_plannerSettings.h" line="446"/>
-        <location filename="../build/ui_plannerSettings.h" line="459"/>
-        <location filename="../build/ui_plannerSettings.h" line="461"/>
-        <source>bar</source>
-        <translation>bar</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="121"/>
-        <location filename="../build/ui_plannerSettings.h" line="425"/>
-        <source>75% to 50% avg. depth</source>
-        <translation>75% ~ 50% 的平均深度</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="138"/>
-        <location filename="../build/ui_plannerSettings.h" line="427"/>
-        <source>50% avg. depth to 6m</source>
-        <translation>50% avg. depth to 6m</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="155"/>
-        <location filename="../build/ui_plannerSettings.h" line="429"/>
-        <source>6m to surface</source>
-        <translation>水面下 6m</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="268"/>
-        <source>Bühlmann deco</source>
-        <translation>Bühlmann 減壓</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="370"/>
-        <location filename="../build/ui_plannerSettings.h" line="453"/>
-        <source>min</source>
-        <translation>min</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="396"/>
-        <source>Maximize bottom time allowed by gas and no decompression limits</source>
-        <translation>由氣體與減壓限制決定最大置底時間</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="594"/>
+        <source>m</source>
+        <translation>m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="399"/>
-        <location filename="../build/ui_plannerSettings.h" line="443"/>
-        <source>Recreational mode</source>
-        <translation>休閒潛水模式</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="606"/>
+        <source>Used to calculate best mix. Select best mix depth in &apos;Available gases&apos; table by entering gas depth, followed by &quot;B&quot; (best trimix mix) or &quot;BN&quot; (best nitrox mix)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="436"/>
-        <location filename="../build/ui_plannerSettings.h" line="452"/>
-        <source>Min. switch duration</source>
-        <translation>最短交換時間</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="613"/>
+        <location filename="../build/ui_plannerSettings.h" line="456"/>
+        <source>Bottom SAC</source>
+        <translation>水底耗氣率</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="459"/>
-        <location filename="../build/ui_plannerSettings.h" line="444"/>
-        <source>Safety stop</source>
-        <translation>安全停留</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="620"/>
+        <location filename="../build/ui_plannerSettings.h" line="458"/>
+        <source>Bottom pO₂</source>
+        <translation>水底 pO₂</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="495"/>
-        <source>Conservatism level</source>
-        <translation>保守等級</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="627"/>
+        <source>Best mix END</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="608"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="634"/>
         <location filename="../build/ui_plannerSettings.h" line="464"/>
         <source>Notes</source>
         <translation>記錄</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="629"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="655"/>
         <location filename="../build/ui_plannerSettings.h" line="466"/>
         <source>In dive plan, show runtime (absolute time) of stops</source>
         <translation>在潛水計畫中，顯示停留的操作時間 (絕對時間) 。</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="642"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="658"/>
+        <location filename="../build/ui_plannerSettings.h" line="468"/>
+        <source>Display runtime</source>
+        <translation>顯示運作時間</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="668"/>
         <location filename="../build/ui_plannerSettings.h" line="470"/>
         <source>In dive plan, show duration (relative time) of stops</source>
         <translation>在潛水計畫中，顯示停留的時間 (相對時間) 。</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="652"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="671"/>
+        <location filename="../build/ui_plannerSettings.h" line="472"/>
+        <source>Display segment duration</source>
+        <translation>顯示分段區間</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="678"/>
         <location filename="../build/ui_plannerSettings.h" line="474"/>
         <source>In diveplan, list transitions or treat them as implicit</source>
         <translation>在潛水計畫中，列出禁飛時間或標記為提示</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="681"/>
+        <location filename="../build/ui_plannerSettings.h" line="476"/>
+        <source>Display transitions in deco</source>
+        <translation>在減壓中顯示禁飛時間</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="688"/>
+        <location filename="../build/ui_plannerSettings.h" line="477"/>
+        <source>Verbatim dive plan</source>
+        <translation>逐步潛水計畫</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="711"/>
+        <location filename="../build/ui_plannerSettings.h" line="460"/>
+        <source>Deco pO₂</source>
+        <translation>減壓 pO₂</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="718"/>
+        <location filename="../build/ui_plannerSettings.h" line="457"/>
+        <source>Deco SAC</source>
+        <translation>減壓 SAC</translation>
+    </message>
 </context>
 </TS>
\ No newline at end of file